From 37a13e356620af5f8ae143f472023335f8bc59a3 Mon Sep 17 00:00:00 2001 From: Hare Date: Fri, 9 Oct 2026 02:22:18 +0900 Subject: [PATCH 01/11] fix: resolve target-qualified ancestor interfaces through live publications Add a provider-owned routing hint without granting authority. Fetch checks provider ownership and re-resolves one coherent target/scope publication; default self/shared scope behavior remains unchanged. Validation: 7 ancestor regression tests, 901 Worker unit and 110 integration tests, root cargo check, formatting and diff checks passed. --- crates/worker/src/wip.rs | 30 ++++++++- crates/worker/src/wip/ancestor_tests.rs | 81 +++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 1 deletion(-) diff --git a/crates/worker/src/wip.rs b/crates/worker/src/wip.rs index 3a3687f90..eaeeece80 100644 --- a/crates/worker/src/wip.rs +++ b/crates/worker/src/wip.rs @@ -288,6 +288,13 @@ pub trait WipSubtreeProvider: Send + Sync { /// looking up a mutable ancestor after resolving the target. Self-scoped /// publishers can use `WipPublication::self_scoped` on their pinned snapshot. async fn publication(&self, path: &str) -> Result, ProtocolError>; + /// Routing hint for target-qualified local Interface names in an ancestor + /// scope. This grants no authority: Host re-resolves one coherent current + /// publication, checks the exact reference, and forbids escaping this owner. + /// Self/shared-scope providers retain the ordinary scope Object route. + fn interface_target(&self, reference: &InterfaceReference) -> Option { + Some(reference.scope.clone()) + } async fn children(&self, path: &str) -> Result, ProtocolError>; } @@ -1248,8 +1255,29 @@ impl WipHost { reference .validate() .map_err(|e| protocol_error(ProtocolErrorCode::InvalidRequest, e.to_string()))?; + let target = if let Some(mount) = self.subtree(&reference.scope) { + let target = mount.provider.interface_target(reference).ok_or_else(|| { + protocol_error( + ProtocolErrorCode::InterfaceNotFound, + "interface is not published", + ) + })?; + if wip_protocol::validate_path(&target).is_err() + || !self + .subtree(&target) + .is_some_and(|owner| owner.root == mount.root) + { + return Err(protocol_error( + ProtocolErrorCode::InterfaceNotFound, + "interface target is outside its provider", + )); + } + target + } else { + reference.scope.clone() + }; if let Some(publication) = self - .publication_for_interface_live(&reference.scope, reference) + .publication_for_interface_live(&target, reference) .await? && publication.projection.interface == *reference && let Some(scope) = publication.scope diff --git a/crates/worker/src/wip/ancestor_tests.rs b/crates/worker/src/wip/ancestor_tests.rs index ab1ac929a..d645a3436 100644 --- a/crates/worker/src/wip/ancestor_tests.rs +++ b/crates/worker/src/wip/ancestor_tests.rs @@ -538,3 +538,84 @@ async fn same_name_scope_replacement_or_loss_of_ref_rejects_old_metadata_without ); } } + +struct TargetQualifiedProvider { + inner: Arc, + target_hint: Mutex>, +} +#[async_trait] +impl WipSubtreeProvider for TargetQualifiedProvider { + fn interface_target(&self, _: &InterfaceReference) -> Option { + self.target_hint.lock().unwrap().clone() + } + async fn publication(&self, path: &str) -> Result, ProtocolError> { + self.inner.publication(path).await + } + async fn children(&self, path: &str) -> Result, ProtocolError> { + self.inner.children(path).await + } +} + +#[tokio::test] +async fn ancestor_interface_target_hint_fetches_one_current_publication_and_never_grants_authority() +{ + let (_, inner) = fixture("/github", true, false); + let provider = Arc::new(TargetQualifiedProvider { + inner: inner.clone(), + target_hint: Mutex::new(Some(inner.target_path.clone())), + }); + let mut mounts = WipMountRegistry::new(); + mounts.allocate_namespace("scope", "github").unwrap(); + mounts + .mount(projection( + "/github", + "/github", + "read", + inner.calls.clone(), + )) + .unwrap(); + mounts + .mount_subtree(WipSubtreeMount { + root: "/github".into(), + provider: provider.clone(), + }) + .unwrap(); + let host = WipHost::new(mounts); + let selected = reference("/github", "read"); + let fetched = host.fetch_interface_live(&selected).await.unwrap(); + assert_eq!(fetched.scope_ref, Some("live-scope".into())); + assert_eq!( + inner.state.lock().unwrap().lookups, + [inner.target_path.clone()] + ); + // A hint must not fabricate a Descriptor or restore a deleted scope lifetime. + inner.state.lock().unwrap().visible = false; + assert_eq!( + host.fetch_interface_live(&selected).await.unwrap_err().code, + ProtocolErrorCode::InterfaceNotFound + ); + inner.state.lock().unwrap().visible = true; + let forged = reference("/github", "not-published"); + assert_eq!( + host.fetch_interface_live(&forged).await.unwrap_err().code, + ProtocolErrorCode::InterfaceNotFound + ); + for hint in [ + None, + Some("/outside"), + Some("/github-extra/item"), + Some("/github/../item"), + Some("/github/missing"), + ] { + *provider.target_hint.lock().unwrap() = hint.map(str::to_owned); + inner.state.lock().unwrap().lookups.clear(); + assert_eq!( + host.fetch_interface_live(&selected).await.unwrap_err().code, + ProtocolErrorCode::InterfaceNotFound + ); + if hint != Some("/github/missing") { + assert!(inner.state.lock().unwrap().lookups.is_empty()); + } + } + assert_eq!(inner.calls.load(Ordering::SeqCst), 0); +} From 64459991204722f64b246a28d8f7781444a4fb76 Mon Sep 17 00:00:00 2001 From: Hare Date: Fri, 9 Oct 2026 02:22:18 +0900 Subject: [PATCH 02/11] fix: migrate dependent server WIP tests to public object tools Dependent test compilation exposed removed discover, opaque Interface strings and private call usage. Select structured references from actual path Inspect and invoke through the public WIP 0.2.0 API. Validation: complete Workspace Server suite (691 unit + 11 CLI), Server API 83 tests including generated artifact freshness, root cargo check and SDK resolution verification passed. --- Cargo.lock | 1 + crates/workspace-server/Cargo.toml | 1 + .../src/server_workspace_config_wip_tests.rs | 84 +++++-------------- 3 files changed, 22 insertions(+), 64 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 649153ef5..f64b67e06 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6766,6 +6766,7 @@ dependencies = [ "uuid", "webauthn-authenticator-rs", "webauthn-rs", + "wip-protocol", "workdir", "worker", "worker-runtime", diff --git a/crates/workspace-server/Cargo.toml b/crates/workspace-server/Cargo.toml index 1f5f4f66a..7b50a34cf 100644 --- a/crates/workspace-server/Cargo.toml +++ b/crates/workspace-server/Cargo.toml @@ -56,6 +56,7 @@ zeroize.workspace = true webauthn-rs = { workspace = true } [dev-dependencies] +wip-protocol.workspace = true agen.workspace = true tempfile.workspace = true tools.workspace = true diff --git a/crates/workspace-server/src/server_workspace_config_wip_tests.rs b/crates/workspace-server/src/server_workspace_config_wip_tests.rs index c0df1d1a5..104cc61b4 100644 --- a/crates/workspace-server/src/server_workspace_config_wip_tests.rs +++ b/crates/workspace-server/src/server_workspace_config_wip_tests.rs @@ -139,73 +139,29 @@ impl worker::WorkspaceClient for ConfigRouterClient { Ok(response) } } -fn config_interface(path: &str) -> String { - // Use the published contextual interface identity, not a model-managed validator. - let hex = path - .bytes() - .map(|byte| format!("{byte:02x}")) - .collect::(); - format!("yoi.workspace-config/node/v1/@/{hex}") +async fn inspected_interface(runtime: &worker::wip::WipRuntime, path: &str, refresh: bool) -> wip_protocol::InterfaceReference { + let inspected = runtime.inspect(path.into(),refresh).await.unwrap(); + let value: Value = serde_json::from_str(inspected.content.as_deref().unwrap()).unwrap(); + assert_eq!(value["path"], path); + let reference = &value["interfaces"][0]["reference"]; + wip_protocol::InterfaceReference { scope:reference["scope"].as_str().unwrap().into(), name:reference["name"].as_str().unwrap().into() } } async fn config_discover(runtime: &worker::wip::WipRuntime, path: &str) { - let observed = runtime - .discover(path.into(), 0, true) - .await - .unwrap() - .content - .unwrap(); - assert!( - observed.contains(&config_interface(path)), - "interface must come from live discovery: {observed}" - ); - runtime.inspect(config_interface(path), true).await.unwrap(); + runtime.tree(path.into(),0,true).await.unwrap(); + let reference = inspected_interface(runtime,path,true).await; + assert_eq!(reference.scope,path); + assert_eq!(reference.name,"yoi.workspace-config/node/v1"); } -async fn config_call( - runtime: &worker::wip::WipRuntime, - path: &str, - operation: &str, - args: Value, -) -> std::result::Result { - runtime - .call( - path.into(), - config_interface(path), - operation.into(), - args, - agen::tool::ToolExecutionContext::direct(), - ) - .await +async fn config_call(runtime: &worker::wip::WipRuntime, path: &str, operation: &str, args: Value) -> std::result::Result { + let interface = inspected_interface(runtime,path,false).await; + runtime.invoke(path.into(),interface,operation.into(),args,agen::tool::ToolExecutionContext::direct()).await } - -async fn catalog_call( - runtime: &worker::wip::WipRuntime, - path: &str, - base: &str, - operation: &str, -) -> Value { - let hex = path - .bytes() - .map(|byte| format!("{byte:02x}")) - .collect::(); - let interface = format!("{base}/@/{hex}"); - let discovered = runtime - .discover(path.into(), 0, true) - .await - .unwrap() - .content - .unwrap(); - assert!(discovered.contains(&interface), "{discovered}"); - runtime.inspect(interface.clone(), true).await.unwrap(); - let output = runtime - .call( - path.into(), - interface, - operation.into(), - json!({}), - agen::tool::ToolExecutionContext::direct(), - ) - .await - .unwrap(); +async fn catalog_call(runtime: &worker::wip::WipRuntime, path: &str, base: &str, operation: &str) -> Value { + runtime.tree(path.into(),0,true).await.unwrap(); + let interface = inspected_interface(runtime,path,true).await; + assert_eq!(interface.scope,path); + assert_eq!(interface.name,base); + let output = runtime.invoke(path.into(),interface,operation.into(),json!({}),agen::tool::ToolExecutionContext::direct()).await.unwrap(); serde_json::from_str(output.content.as_deref().unwrap()).unwrap() } @@ -635,7 +591,7 @@ async fn assert_config_production_http_adapter( assert_config_catalog(&wip, &attached).await; config_discover(&wip, "/workspace-config/main.dcdl").await; let main_interface = wip - .inspect(config_interface("/workspace-config/main.dcdl"), true) + .inspect("/workspace-config/main.dcdl".into(), true) .await .unwrap() .content From af655ae632fb4a51dd593b7fddc028dcc890603f Mon Sep 17 00:00:00 2001 From: Hare Date: Fri, 9 Oct 2026 02:22:52 +0900 Subject: [PATCH 03/11] feat: limit checkout indexing to entrances and expose bounded typed discovery Content directories always have no indexable children; direct authorized paths remain resolvable. Add List using provider Read/enumeration authority and separate List permission, dirs-first lexical live continuation, bounded retention/path bytes, scoped result coordinates and External DTO validation. List/Glob/Grep return Descriptor-typed entries without eager acquisition. Bind content Interfaces coherently to the live entrance scope. Validation: root cargo check; FS 58 unit+6 pagination, Workdir 125+5 (default and http-client), Tools 84 unit+39 integration+1 doctest, Worker 901 unit+110 integration, Server 691 unit+11 CLI, Server API 83 tests; exact crates.io WIP 0.2.0 resolution; format/diff checks. Focused model/local/remote/provider/race/scope checks passed. Commands and semantics in docs/development/wip-integration-validation.md. Publication/review paused: continuation ShowTicket returned HTTP 401. No Backend bypass, source push, MR approval, target integration or live environment update is claimed. --- crates/fs-operation/src/lib.rs | 2 + crates/fs-operation/src/local.rs | 134 ++++- crates/fs-operation/src/operation.rs | 21 + crates/fs-operation/tests/list_pagination.rs | 248 +++++++++ crates/tools/README.md | 17 + crates/tools/src/checkout.rs | 126 ++++- crates/tools/src/checkout_tests.rs | 497 ++++++++++++++++++ crates/tools/src/edit.rs | 1 + crates/tools/src/glob.rs | 1 + crates/tools/src/grep.rs | 1 + crates/tools/src/read.rs | 1 + crates/tools/src/write.rs | 1 + crates/workdir/CHECKOUT_PROVIDER.md | 34 +- crates/workdir/src/checkout.rs | 14 + crates/workdir/src/checkout_search_tests.rs | 10 + crates/workdir/src/external.rs | 31 +- crates/workdir/src/lib.rs | 6 +- crates/workdir/src/local.rs | 2 + crates/workdir/src/scope.rs | 6 + crates/workdir/tests/list_pagination.rs | 267 ++++++++++ crates/worker/src/checkout.rs | 376 ++++++++----- crates/worker/src/checkout_http_tests.rs | 88 +++- crates/worker/src/checkout_race_tests.rs | 58 +- crates/worker/src/checkout_wip_tests.rs | 345 +++++++++++- crates/worker/src/fs_view.rs | 2 + crates/workspace-server/src/server.rs | 1 + docs/design/checkout-wip-projection.md | 114 +++- .../development/wip-integration-validation.md | 74 ++- docs/report/t-714-ticket-read-auth-blocker.md | 29 + 29 files changed, 2297 insertions(+), 210 deletions(-) create mode 100644 crates/fs-operation/tests/list_pagination.rs create mode 100644 crates/workdir/tests/list_pagination.rs create mode 100644 docs/report/t-714-ticket-read-auth-blocker.md diff --git a/crates/fs-operation/src/lib.rs b/crates/fs-operation/src/lib.rs index 63436ed05..791aeae7b 100644 --- a/crates/fs-operation/src/lib.rs +++ b/crates/fs-operation/src/lib.rs @@ -941,6 +941,7 @@ mod tests { let list_error = run_list( &root, ListRequest { + after: None, path: FsPath::new("selected-dir").unwrap(), limit: 10, }, @@ -1008,6 +1009,7 @@ mod tests { let listed = run_list( &root, ListRequest { + after: None, path: FsPath::new("notes").unwrap(), limit: 10, }, diff --git a/crates/fs-operation/src/local.rs b/crates/fs-operation/src/local.rs index 887a09248..8885b5587 100644 --- a/crates/fs-operation/src/local.rs +++ b/crates/fs-operation/src/local.rs @@ -1,3 +1,5 @@ +use std::cmp::Ordering; +use std::collections::BinaryHeap; use std::ffi::OsString; use std::fs; use std::io::{BufReader, Read}; @@ -7,9 +9,9 @@ use sha2::{Digest, Sha256}; use crate::{ AtomicWriteMode, BoundedReadLimits, ContentHash, EditRequest, EditResult, EntryKind, - FsAccessPolicy, FsError, FsPath, ListEntry, ListRequest, ListResult, ReadBytesRequest, - ReadBytesResult, ReadRequest, ReadResult, StatRequest, StatResult, WriteRequest, WriteResult, - direct_symlink, + FsAccessPolicy, FsError, FsPath, ListCursor, ListEntry, ListRequest, ListResult, + ReadBytesRequest, ReadBytesResult, ReadRequest, ReadResult, StatRequest, StatResult, + WriteRequest, WriteResult, direct_symlink, }; const READ_BUFFER_BYTES: usize = 16 * 1024; @@ -437,12 +439,55 @@ pub fn run_edit( }) } +fn list_order( + left_kind: EntryKind, + left: &FsPath, + right_kind: EntryKind, + right: &FsPath, +) -> Ordering { + (left_kind != EntryKind::Directory) + .cmp(&(right_kind != EntryKind::Directory)) + .then_with(|| left.as_str().cmp(right.as_str())) +} + +struct RetainedListEntry(ListEntry); + +impl PartialEq for RetainedListEntry { + fn eq(&self, other: &Self) -> bool { + self.cmp(other) == Ordering::Equal + } +} +impl Eq for RetainedListEntry {} +impl Ord for RetainedListEntry { + fn cmp(&self, other: &Self) -> Ordering { + list_order(self.0.kind, &self.0.path, other.0.kind, &other.0.path) + } +} +impl PartialOrd for RetainedListEntry { + fn partial_cmp(&self, other: &Self) -> Option { + Some(self.cmp(other)) + } +} + +fn list_entry_bytes(entry: &ListEntry) -> usize { + entry.path.as_str().len().saturating_add(64) +} + pub fn run_list( root: &Path, request: ListRequest, access: &dyn FsAccessPolicy, ) -> Result { let logical = request.path; + if let Some(after) = &request.after { + if after.path.is_root() + || Path::new(after.path.as_str()).parent() != Some(Path::new(logical.as_str())) + { + return Err(FsError::InvalidArgument( + "List cursor must name a direct child of the listed directory".into(), + )); + } + } access .check_cancelled() .map_err(|error| map_io(&logical, error))?; @@ -462,11 +507,15 @@ pub fn run_list( total_entries: 0, total_bytes: 0, truncated: false, + next_after: None, }); } - let mut entries = Vec::new(); + let mut entries: BinaryHeap = BinaryHeap::new(); + let mut retained_limit = request.limit.saturating_add(1); let mut retained_path_bytes = 0_usize; - let mut provider_truncated = false; + let mut total_entries = 0usize; + let mut total_bytes = 0u64; + let mut remaining_entries = 0usize; let read_dir = access .open_read_dir(&logical_base, &path) .map_err(|error| map_io(&logical, error))?; @@ -513,34 +562,77 @@ pub fn run_list( let Ok(result_path) = FsPath::new(relative) else { continue; }; - let retained = result_path.as_str().len().saturating_add(64); - if retained_path_bytes.saturating_add(retained) > crate::MAX_RESULT_PATH_BYTES { - provider_truncated = true; - break; + total_entries += 1; + total_bytes = total_bytes.saturating_add(metadata.len()); + if request.after.as_ref().is_some_and(|after| { + list_order(kind, &result_path, after.kind, &after.path) != Ordering::Greater + }) { + continue; } - retained_path_bytes = retained_path_bytes.saturating_add(retained); - entries.push(ListEntry { + remaining_entries += 1; + let candidate = RetainedListEntry(ListEntry { path: result_path, kind, size: metadata.len(), }); + if entries.len() == retained_limit { + if candidate >= *entries.peek().expect("nonempty List retention") { + continue; + } + retained_path_bytes -= list_entry_bytes(&entries.pop().unwrap().0); + } + retained_path_bytes = retained_path_bytes.saturating_add(list_entry_bytes(&candidate.0)); + entries.push(candidate); + // Evict greatest keys, never stop scanning: enumeration order is + // unspecified and a later entry may precede every retained key. + while retained_path_bytes > crate::MAX_RESULT_PATH_BYTES { + retained_path_bytes -= list_entry_bytes(&entries.pop().unwrap().0); + // Never grow cardinality again after a byte-bound eviction: a + // later short path must not leap over a discarded earlier key. + retained_limit = entries.len(); + } + if retained_limit == 0 { + return Err(FsError::InvalidArgument( + "List entry exceeds provider response bound".into(), + )); + } } - entries.sort_by(|left, right| { - let left_dir = left.kind == EntryKind::Directory; - let right_dir = right.kind == EntryKind::Directory; - right_dir - .cmp(&left_dir) - .then_with(|| left.path.as_str().cmp(right.path.as_str())) - }); - let total_entries = entries.len(); - let total_bytes = entries.iter().map(|entry| entry.size).sum(); - let truncated = provider_truncated || entries.len() > request.limit; + let mut entries: Vec<_> = entries + .into_sorted_vec() + .into_iter() + .map(|entry| entry.0) + .collect(); entries.truncate(request.limit); + // Continuation duplicates the last path on the wire; include it in the + // aggregate provider response bound too. + let mut response_bytes: usize = entries.iter().map(list_entry_bytes).sum(); + while remaining_entries > entries.len() + && entries.last().is_some_and(|last| { + response_bytes.saturating_add(list_entry_bytes(last)) > crate::MAX_RESULT_PATH_BYTES + }) + { + response_bytes -= list_entry_bytes(&entries.pop().unwrap()); + } + if request.limit > 0 && remaining_entries > 0 && entries.is_empty() { + return Err(FsError::InvalidArgument( + "List entry exceeds provider response bound".into(), + )); + } + let truncated = remaining_entries > entries.len(); + let next_after = if truncated { + entries.last().map(|entry| ListCursor { + kind: entry.kind, + path: entry.path.clone(), + }) + } else { + None + }; Ok(ListResult { entries, total_entries, total_bytes, truncated, + next_after, }) } diff --git a/crates/fs-operation/src/operation.rs b/crates/fs-operation/src/operation.rs index 3d6e612f3..a2dc6d18f 100644 --- a/crates/fs-operation/src/operation.rs +++ b/crates/fs-operation/src/operation.rs @@ -278,6 +278,22 @@ pub struct ListRequest { pub path: FsPath, #[schemars(range(min = 0, max = 9_007_199_254_740_991_usize))] pub limit: usize, + /// Exclusive live continuation in the same coordinates as returned entries. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub after: Option, +} + +/// A List ordering key: directories first, then lexical path (all other kinds +/// share one ordering group). The cursor need not still exist. Each page scans +/// the live directory: insertions before the key are not revisited, insertions +/// after it may appear, and removals disappear. Renames or kind changes can move +/// an entry across the key and cause omission or repetition; no snapshot or +/// cross-page consistency is promised. Scoped wrappers translate coordinates. +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema)] +#[serde(deny_unknown_fields)] +pub struct ListCursor { + pub kind: EntryKind, + pub path: FsPath, } #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema)] @@ -293,6 +309,11 @@ pub struct ListEntry { #[serde(deny_unknown_fields)] pub struct ListResult { pub entries: Vec, + /// Last returned key when more entries follow. A zero-limit request has no + /// continuation even when truncated. Totals describe all visible entries + /// in this scan, including those at or before `after`. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub next_after: Option, #[schemars(range(min = 0, max = 9_007_199_254_740_991_usize))] pub total_entries: usize, #[schemars(range(min = 0, max = 9_007_199_254_740_991_u64))] diff --git a/crates/fs-operation/tests/list_pagination.rs b/crates/fs-operation/tests/list_pagination.rs new file mode 100644 index 000000000..cb3d14f78 --- /dev/null +++ b/crates/fs-operation/tests/list_pagination.rs @@ -0,0 +1,248 @@ +use fs_operation::{ + EntryKind, FsAccessPolicy, FsError, FsPath, ListCursor, ListRequest, ListResult, + MAX_RESULT_PATH_BYTES, run_list, +}; +use std::path::{Path, PathBuf}; +use std::sync::atomic::{AtomicUsize, Ordering}; + +struct Access { + root: PathBuf, + checks: AtomicUsize, + cancel_at: usize, + enumerate: bool, +} +impl Access { + fn new(root: &Path) -> Self { + Self { + root: root.to_path_buf(), + checks: AtomicUsize::new(0), + cancel_at: usize::MAX, + enumerate: true, + } + } +} +impl FsAccessPolicy for Access { + fn is_readable(&self, path: &Path) -> bool { + path.starts_with(&self.root) && path != self.root.join("denied") + } + fn is_writable(&self, _: &Path) -> bool { + false + } + fn can_enumerate_directory(&self, _: &Path, _: &Path) -> bool { + self.enumerate + } + fn check_cancelled(&self) -> std::io::Result<()> { + if self.checks.fetch_add(1, Ordering::Relaxed) >= self.cancel_at { + return Err(std::io::Error::new( + std::io::ErrorKind::Interrupted, + "cancelled", + )); + } + Ok(()) + } +} +fn path(value: &str) -> FsPath { + FsPath::new(value).unwrap() +} +fn page(root: &Path, limit: usize, after: Option) -> ListResult { + run_list( + root, + ListRequest { + path: FsPath::root(), + limit, + after, + }, + &Access::new(root), + ) + .unwrap() +} +fn names(result: &ListResult) -> Vec<&str> { + result + .entries + .iter() + .map(|entry| entry.path.as_str()) + .collect() +} + +#[test] +fn list_pages_order_directories_first_then_paths_without_duplicates() { + let root = tempfile::tempdir().unwrap(); + for name in ["z", "b", "a"] { + std::fs::write(root.path().join(name), b"xx").unwrap(); + } + for name in ["z-dir", "a-dir"] { + std::fs::create_dir(root.path().join(name)).unwrap(); + } + let full = page(root.path(), usize::MAX, None); + assert_eq!(names(&full), ["a-dir", "z-dir", "a", "b", "z"]); + let mut after = None; + let mut entries = Vec::new(); + loop { + let result = page(root.path(), 2, after); + assert!(result.entries.len() <= 2); + assert_eq!(result.total_entries, 5); + assert_eq!(result.total_bytes, full.total_bytes); + assert_eq!(result.truncated, result.next_after.is_some()); + after = result.next_after; + entries.extend(result.entries); + if after.is_none() { + break; + } + } + assert_eq!(entries, full.entries); + let zero = page(root.path(), 0, None); + assert!(zero.entries.is_empty()); + assert!(zero.truncated); + assert!(zero.next_after.is_none()); + assert_eq!(zero.total_entries, 5); + let exhausted = page( + root.path(), + 2, + Some(ListCursor { + kind: EntryKind::File, + path: path("z"), + }), + ); + assert!(exhausted.entries.is_empty()); + assert!(!exhausted.truncated); + assert!(exhausted.next_after.is_none()); + assert_eq!(exhausted.total_entries, 5); +} + +#[test] +fn list_live_cursor_survives_removal_and_only_observes_new_keys_after_it() { + let root = tempfile::tempdir().unwrap(); + for name in ["b", "d"] { + std::fs::write(root.path().join(name), b"x").unwrap(); + } + let first = page(root.path(), 1, None); + assert_eq!(names(&first), ["b"]); + std::fs::remove_file(root.path().join("b")).unwrap(); + for name in ["a", "c"] { + std::fs::write(root.path().join(name), b"xx").unwrap(); + } + // All directories sort before a file cursor, even when created later. + std::fs::create_dir(root.path().join("z-directory")).unwrap(); + let second = page(root.path(), 10, first.next_after); + assert_eq!(names(&second), ["c", "d"]); + assert_eq!(second.total_entries, 4); + assert!(!second.truncated); + assert!(second.next_after.is_none()); + std::fs::remove_file(root.path().join("d")).unwrap(); + std::fs::rename(root.path().join("a"), root.path().join("e")).unwrap(); + let moved = page( + root.path(), + 10, + Some(ListCursor { + kind: EntryKind::File, + path: path("d"), + }), + ); + assert_eq!(names(&moved), ["e"]); +} + +#[test] +fn list_path_byte_bound_returns_a_continuation_instead_of_losing_the_tail() { + let root = tempfile::tempdir().unwrap(); + let long_count = MAX_RESULT_PATH_BYTES / (240 + 64) + 10; + // A shorter late key must not leap over a longer evicted earlier key. + let count = long_count + 50; + let expected: Vec<_> = (0..count) + .map(|n| format!("{n:05}{}", "x".repeat(if n < long_count { 235 } else { 1 }))) + .collect(); + for name in expected.iter().rev() { + std::fs::write(root.path().join(name), b"x").unwrap(); + } + let first = page(root.path(), usize::MAX, None); + assert!(first.truncated); + assert_eq!(first.total_entries, count); + assert_eq!(first.total_bytes, count as u64); + let path_bytes: usize = first + .entries + .iter() + .map(|entry| entry.path.as_str().len() + 64) + .sum::() + + first.next_after.as_ref().unwrap().path.as_str().len() + + 64; + assert!(path_bytes <= MAX_RESULT_PATH_BYTES); + let next = page(root.path(), usize::MAX, first.next_after.clone()); + assert!(!next.truncated); + let got: Vec<_> = names(&first).into_iter().chain(names(&next)).collect(); + assert_eq!(got, expected.iter().map(String::as_str).collect::>()); + let small = page(root.path(), 1, None); + assert_eq!(names(&small), [expected[0].as_str()]); + assert_eq!(small.total_entries, count); +} + +#[test] +fn list_keeps_ignored_and_hidden_entries_but_respects_read_and_enumeration_authority() { + let root = tempfile::tempdir().unwrap(); + std::fs::write(root.path().join(".gitignore"), "ignored\n").unwrap(); + for name in ["ignored", ".hidden", "denied"] { + std::fs::write(root.path().join(name), b"x").unwrap(); + } + let first = page(root.path(), 2, None); + assert_eq!(names(&first), [".gitignore", ".hidden"]); + let second = page(root.path(), 2, first.next_after); + assert_eq!(names(&second), ["ignored"]); + assert_eq!(second.total_entries, 3); + let mut access = Access::new(root.path()); + access.enumerate = false; + let result = run_list( + root.path(), + ListRequest { + path: FsPath::root(), + limit: 1, + after: None, + }, + &access, + ) + .unwrap(); + assert!(result.entries.is_empty()); + assert!(!result.truncated); + assert!(result.next_after.is_none()); +} + +#[test] +fn list_cancellation_is_checked_even_after_the_page_is_full() { + let root = tempfile::tempdir().unwrap(); + for name in ["a", "b", "c"] { + std::fs::write(root.path().join(name), b"x").unwrap(); + } + let mut access = Access::new(root.path()); + access.cancel_at = 3; + let error = run_list( + root.path(), + ListRequest { + path: FsPath::root(), + limit: 1, + after: None, + }, + &access, + ) + .unwrap_err(); + assert!( + matches!(error, FsError::Io { source, .. } if source.kind() == std::io::ErrorKind::Interrupted) + ); +} + +#[test] +fn list_rejects_cursor_outside_the_requested_directory() { + let root = tempfile::tempdir().unwrap(); + for value in ["", "other/a"] { + let error = run_list( + root.path(), + ListRequest { + path: FsPath::root(), + limit: 1, + after: Some(ListCursor { + kind: EntryKind::File, + path: path(value), + }), + }, + &Access::new(root.path()), + ) + .unwrap_err(); + assert!(matches!(error, FsError::InvalidArgument(_))); + } +} diff --git a/crates/tools/README.md b/crates/tools/README.md index d8f72b3fb..dd046a3e0 100644 --- a/crates/tools/README.md +++ b/crates/tools/README.md @@ -38,6 +38,7 @@ capabilities remain authoritative. `Create` uses the `Write` capability/identity | Edit | `old_string`, `new_string`, `replace_all?` | Existing file; prior read/hash and provider validator required | | Write | `content` | Existing file only; prior read/hash and provider validator required | | Create | `path`, `content` | Bound parent directory; relative destination strictly below it; create-new, missing parents allowed | +| List | `limit?` (1..1000, default 100), `after?` (`{kind, path}`) | Bound directory; Read capability; all typed `EntryKind` cursor values accepted, path is a direct child in checkout-root-relative provider coordinates | | Glob | `pattern`, `path?` | Bound directory; optional path relative beneath it | | Grep | `pattern`, `path?`, `glob?`, `type?`, `case_insensitive?`, `-B?`, `-A?`, `-C?`, `multiline?`, `output_mode?`, `head_limit?`, `offset?` | Bound directory; same provider search/options/rendering as Tool Grep | @@ -55,6 +56,22 @@ The constructor's empty scope layers/root output are refined by provider wrapper Tools does not synthesize authority or parse/rebase rendered filenames. Ordinary Tool dispatch remains `session.glob`/`session.grep`, with its existing error mapping. +List dispatches one bounded `checkout_search` page without Bash or entry prefetch. +`CheckoutToolOutput.listing` preserves the typed `ListResult`, including +`next_after`, for Host projection into canonical Worldspace entries and cursors. +Its normal Tool output is a summary only, and `paths` is empty; every other +Operation returns `listing: None`. The Host decodes canonical cursor paths before +calling Tools, mapping the public `{kind, entry}` cursor into `{kind, path}`. +Both returned entries and the continuation must stay directly inside the bound +directory. Cursor kinds retain all typed values (`directory`, `file`, `symlink`, +`other`); ordering groups directories first and all non-directories together, +then compares paths. A truncated page must supply `next_after` matching its last +entry's ordering key; an untruncated page has no continuation. Special typed +listing entries are path coordinates, not checkout observations: direct checkout +observation remains provider File/Directory-only. Pagination is live, not a +cross-page snapshot; the same before/after bound-directory validator checks +used for search apply to List. + `CheckoutToolOutput.paths` contains typed checkout-root-relative search paths (from `GlobResult.paths` / `GrepResult.paths`) and the created path for Create. Rendered Grep text is never parsed to construct links. The optional validator is diff --git a/crates/tools/src/checkout.rs b/crates/tools/src/checkout.rs index 73e59e5e5..be2fdf19f 100644 --- a/crates/tools/src/checkout.rs +++ b/crates/tools/src/checkout.rs @@ -18,6 +18,10 @@ use crate::{ToolsError, Tracker, file_target::FileTarget}; pub struct CheckoutToolOutput { pub output: ToolOutput, pub paths: Vec, + /// Typed directory page, including its provider-coordinate continuation. + /// Special entries are path coordinates, not checked checkout observations. + /// The Host owns projection into canonical Worldspace entries and cursors. + pub listing: Option, pub validator: Option>, } @@ -47,6 +51,7 @@ pub async fn execute_checkout_tool( .unwrap_or_default(); let (capability, allowed): (_, &[&str]) = match tool_name { "Read" => (WorkdirSessionCapability::Read, &file_fields), + "List" => (WorkdirSessionCapability::Read, &["limit", "after"]), "Edit" => (WorkdirSessionCapability::Edit, &file_fields), "Write" => (WorkdirSessionCapability::Write, &file_fields), "Create" => (WorkdirSessionCapability::Write, &["path", "content"]), @@ -132,7 +137,7 @@ pub async fn execute_checkout_tool( crate::write::execute_write(target, tracker, params.content, Some(destination), ctx) .await } - "Glob" | "Grep" => { + "List" | "Glob" | "Grep" => { let before = selected .session .checkout_observe(path.clone()) @@ -141,7 +146,10 @@ pub async fn execute_checkout_tool( if before.validator != validator { return Err(stale_search()); } - let mut result = if tool_name == "Glob" { + let mut result = if tool_name == "List" { + let params: ListParams = decode(Value::Object(arguments), tool_name)?; + execute_list(selected.session.clone(), path.clone(), params).await? + } else if tool_name == "Glob" { let params: crate::glob::GlobParams = decode(Value::Object(arguments), tool_name)?; check_pattern(¶ms.pattern)?; let search_path = @@ -191,6 +199,120 @@ pub async fn execute_checkout_tool( } } +/// Native List has no path override. `after.path` is already decoded by the Host +/// into checkout-root-relative provider coordinates, not directory-relative. +#[derive(serde::Deserialize)] +#[serde(deny_unknown_fields)] +struct ListParams { + #[serde(default = "default_list_limit")] + limit: usize, + #[serde(default)] + after: Option, +} + +fn default_list_limit() -> usize { + 100 +} + +async fn execute_list( + session: workdir::WorkdirSessionHandle, + path: WorkdirPath, + params: ListParams, +) -> Result { + if !(1..=1000).contains(¶ms.limit) { + return Err(ToolError::InvalidArgument( + "List limit must be between 1 and 1000".into(), + )); + } + if let Some(after) = ¶ms.after { + if !is_direct_child(&path, &after.path) { + return Err(ToolError::InvalidArgument( + "List after must name a direct child of the bound directory".into(), + )); + } + } + let result = session + .checkout_search(workdir::CheckoutSearchRequest::new( + workdir::CheckoutSearchOperation::List(workdir::ListRequest { + path: path.clone(), + limit: params.limit, + after: params.after, + }), + )) + .await + .map_err(crate::file_target::checked_error)?; + let listing = match result { + workdir::CheckoutSearchResult::List(listing) => listing, + _ => return Err(crate::file_target::readonly_result_error("List")), + }; + // Fail closed before the Host can publish typed links to provider results. + if listing.entries.len() > params.limit + || listing + .entries + .iter() + .any(|entry| !is_direct_child(&path, &entry.path)) + || listing + .next_after + .as_ref() + .is_some_and(|after| !is_direct_child(&path, &after.path)) + { + return Err(crate::file_target::readonly_result_error( + "List page escaped bound directory or exceeded its limit", + )); + } + // The provider ordering key is directory/non-directory group plus path. + // Preserve the typed kind; special entries remain continuable without + // acquiring a File/Directory-only checkout observation for them. + let valid_continuation = match (&listing.next_after, listing.entries.last()) { + (Some(after), Some(last)) if listing.truncated => { + after.path == last.path + && (after.kind == workdir::EntryKind::Directory) + == (last.kind == workdir::EntryKind::Directory) + } + (None, _) => !listing.truncated, + _ => false, + }; + if !valid_continuation { + return Err(crate::file_target::readonly_result_error( + "List continuation does not match the truncated page's last ordering key", + )); + } + let summary = format!( + "Listed {} of {} entries in {}{}", + listing.entries.len(), + listing.total_entries, + path, + if listing.truncated { + " (truncated)" + } else { + "" + }, + ); + Ok(CheckoutToolOutput { + output: ToolOutput { + summary, + content: None, + attachments: Vec::new(), + }, + paths: Vec::new(), + listing: Some(listing), + validator: None, + }) +} + +fn is_direct_child(base: &WorkdirPath, path: &WorkdirPath) -> bool { + let Ok(logical) = WorkdirPath::new(path.as_str()) else { + return false; + }; + let parent = std::path::Path::new(logical.as_str()).parent(); + let expected = if base == &WorkdirPath::root() { + std::path::Path::new("") + } else { + std::path::Path::new(base.as_str()) + }; + logical != WorkdirPath::root() && parent == Some(expected) +} + fn decode(arguments: Value, name: &str) -> Result { crate::error::decode_file_value(arguments, name) } diff --git a/crates/tools/src/checkout_tests.rs b/crates/tools/src/checkout_tests.rs index d11203ed3..d8ec7b74e 100644 --- a/crates/tools/src/checkout_tests.rs +++ b/crates/tools/src/checkout_tests.rs @@ -85,6 +85,326 @@ impl Fixture { } } +#[derive(Debug)] +struct ListProvider { + workdir: workdir::Workdir, + capabilities: workdir::WorkdirSessionCapabilities, + result: workdir::CheckoutSearchResult, + change_validator: bool, + expected_after: Option, + searched: std::sync::atomic::AtomicBool, +} + +// This boundary adapter exposes only checked metadata/search. Any file content +// read, ordinary list fallback, or command execution is a test failure. +#[async_trait::async_trait] +impl workdir::WorkdirSession for ListProvider { + fn workdir(&self) -> &workdir::Workdir { + &self.workdir + } + fn capabilities(&self) -> workdir::WorkdirSessionCapabilities { + self.capabilities + } + async fn checkout_observe( + &self, + path: WorkdirPath, + ) -> Result { + assert_eq!( + path.as_str(), + "src", + "List observes only its bound directory" + ); + Ok(workdir::CheckoutObservation { + path, + kind: workdir::EntryKind::Directory, + size: 0, + validator: vec![u8::from( + self.change_validator && self.searched.load(std::sync::atomic::Ordering::SeqCst), + )], + capabilities: self.capabilities, + }) + } + async fn checkout_search( + &self, + request: workdir::CheckoutSearchRequest, + ) -> Result { + let workdir::CheckoutSearchOperation::List(list) = request.operation else { + panic!("native List must dispatch a typed List request"); + }; + assert_eq!(list.after, self.expected_after); + assert!( + !self + .searched + .swap(true, std::sync::atomic::Ordering::SeqCst), + "List must not prefetch another page" + ); + Ok(self.result.clone()) + } + async fn stat( + &self, + _: workdir::StatRequest, + ) -> Result { + panic!("native List must not call stat"); + } + async fn read( + &self, + _: workdir::ReadRequest, + ) -> Result { + panic!("native List must not read file content"); + } + async fn write( + &self, + _: workdir::WriteRequest, + ) -> Result { + panic!("native List must not write"); + } + async fn edit( + &self, + _: workdir::EditRequest, + ) -> Result { + panic!("native List must not edit"); + } + async fn list( + &self, + _: workdir::ListRequest, + ) -> Result { + panic!("native List must use checkout_search, not ordinary list"); + } + async fn glob( + &self, + _: workdir::GlobRequest, + ) -> Result { + panic!("native List must not glob"); + } + async fn grep( + &self, + _: workdir::GrepRequest, + ) -> Result { + panic!("native List must not grep"); + } + async fn start_command( + &self, + _: workdir::CommandRequest, + ) -> Result { + panic!("native List must not execute commands"); + } + async fn command_status( + &self, + _: workdir::CommandHandle, + ) -> Result { + panic!("native List must not use commands"); + } + async fn command_output( + &self, + _: workdir::CommandOutputRequest, + ) -> Result { + panic!("native List must not use commands"); + } + async fn cancel_command(&self, _: workdir::CommandHandle) -> Result<(), workdir::WorkdirError> { + panic!("native List must not use commands"); + } + async fn close(&self) -> Result<(), workdir::WorkdirError> { + Ok(()) + } +} + +async fn list_with_provider( + capabilities: workdir::WorkdirSessionCapabilities, + result: workdir::CheckoutSearchResult, + change_validator: bool, +) -> Result { + list_with_provider_after(capabilities, result, change_validator, None).await +} + +async fn list_with_provider_after( + capabilities: workdir::WorkdirSessionCapabilities, + result: workdir::CheckoutSearchResult, + change_validator: bool, + after: Option, +) -> Result { + let router = Arc::new(WorkdirSessionRouter::new()); + router + .attach( + WorkdirAttachmentAlias::new("selected").unwrap(), + Arc::new(ListProvider { + workdir: workdir::Workdir::new("list-test"), + capabilities, + result, + change_validator, + expected_after: after.clone(), + searched: std::sync::atomic::AtomicBool::new(false), + }), + ) + .unwrap(); + let generation = router.resolve(Some("selected")).unwrap().generation; + execute_checkout_tool( + router, + Tracker::new(), + "selected", + generation, + WorkdirPath::new("src").unwrap(), + vec![0], + "List", + json!({"limit": 1, "after": after}), + Default::default(), + ) + .await +} + +fn list_page() -> workdir::ListResult { + workdir::ListResult { + entries: vec![workdir::ListEntry { + path: WorkdirPath::new("src/a.txt").unwrap(), + kind: workdir::EntryKind::File, + size: 5, + }], + total_entries: 2, + total_bytes: 10, + truncated: true, + next_after: Some(fs_operation::ListCursor { + kind: workdir::EntryKind::File, + path: WorkdirPath::new("src/a.txt").unwrap(), + }), + } +} + +#[tokio::test] +async fn checkout_list_uses_read_capability_and_checked_search_without_prefetch() { + let read_only = workdir::WorkdirSessionCapabilities::EMPTY.with(WorkdirSessionCapability::Read); + let page = list_page(); + let result = list_with_provider( + read_only, + workdir::CheckoutSearchResult::List(page.clone()), + false, + ) + .await + .unwrap(); + assert_eq!(result.listing, Some(page)); + assert_eq!(result.validator, Some(vec![0])); + let no_read = workdir::WorkdirSessionCapabilities::EMPTY.with(WorkdirSessionCapability::Glob); + let error = list_with_provider( + no_read, + workdir::CheckoutSearchResult::List(list_page()), + false, + ) + .await + .err() + .unwrap(); + assert!(matches!(error, ToolError::InvalidArgument(_))); + assert!(error.to_string().contains("Read")); +} + +#[tokio::test] +async fn checkout_list_rejects_changed_post_search_directory_validator() { + let error = list_with_provider( + workdir::WorkdirSessionCapabilities::READ_ONLY, + workdir::CheckoutSearchResult::List(list_page()), + true, + ) + .await + .err() + .unwrap(); + assert_checkout_stale(error); +} + +#[tokio::test] +async fn checkout_list_rejects_provider_pages_that_escape_or_exceed_bounds() { + let mut outside = list_page(); + outside.entries[0].path = WorkdirPath::new("outside.txt").unwrap(); + let mut nested = list_page(); + nested.entries[0].path = WorkdirPath::new("src/nested/a.txt").unwrap(); + let mut cursor_outside = list_page(); + cursor_outside.next_after.as_mut().unwrap().path = WorkdirPath::new("outside.txt").unwrap(); + let mut cursor_kind = list_page(); + cursor_kind.next_after.as_mut().unwrap().kind = workdir::EntryKind::Directory; + let mut oversized = list_page(); + oversized.entries.push(oversized.entries[0].clone()); + for result in [ + workdir::CheckoutSearchResult::List(outside), + workdir::CheckoutSearchResult::List(nested), + workdir::CheckoutSearchResult::List(cursor_outside), + workdir::CheckoutSearchResult::List(cursor_kind), + workdir::CheckoutSearchResult::List(oversized), + workdir::CheckoutSearchResult::Glob(workdir::GlobResult { + paths: vec![], + truncated: false, + }), + ] { + let error = list_with_provider( + workdir::WorkdirSessionCapabilities::READ_ONLY, + result, + false, + ) + .await + .err() + .unwrap(); + assert_checkout_code(error, "checkout_unavailable"); + } +} + +#[tokio::test] +async fn checkout_list_special_entry_cursors_preserve_kind_and_continue_the_page() { + // Provider-only special entries stay path coordinates: the adapter forbids + // content reads and does not offer direct observations for these entries. + for kind in [workdir::EntryKind::Other, workdir::EntryKind::Symlink] { + let mut first_page = list_page(); + first_page.entries[0].kind = kind; + first_page.next_after.as_mut().unwrap().kind = kind; + let first = list_with_provider( + workdir::WorkdirSessionCapabilities::READ_ONLY, + workdir::CheckoutSearchResult::List(first_page), + false, + ) + .await + .unwrap() + .listing + .unwrap(); + assert_eq!(first.entries[0].kind, kind); + let after = first.next_after.unwrap(); + assert_eq!(after.kind, kind); + let mut second_page = list_page(); + second_page.entries[0].path = WorkdirPath::new("src/z.txt").unwrap(); + second_page.truncated = false; + second_page.next_after = None; + let second = list_with_provider_after( + workdir::WorkdirSessionCapabilities::READ_ONLY, + workdir::CheckoutSearchResult::List(second_page.clone()), + false, + Some(after), + ) + .await + .unwrap() + .listing + .unwrap(); + assert_eq!(second, second_page); + } +} + +#[tokio::test] +async fn checkout_list_rejects_missing_or_mismatched_truncated_continuations() { + let mut missing = list_page(); + missing.next_after = None; + let mut empty = list_page(); + empty.entries.clear(); + let mut wrong_path = list_page(); + wrong_path.next_after.as_mut().unwrap().path = WorkdirPath::new("src/z.txt").unwrap(); + let mut wrong_group = list_page(); + wrong_group.next_after.as_mut().unwrap().kind = workdir::EntryKind::Directory; + let mut untruncated = list_page(); + untruncated.truncated = false; + for page in [missing, empty, wrong_path, wrong_group, untruncated] { + let error = list_with_provider( + workdir::WorkdirSessionCapabilities::READ_ONLY, + workdir::CheckoutSearchResult::List(page), + false, + ) + .await + .err() + .unwrap(); + assert_checkout_code(error, "checkout_unavailable"); + } +} + fn assert_checkout_stale(error: ToolError) { assert_checkout_code(error, "checkout_stale"); } @@ -557,6 +877,183 @@ async fn checkout_search_typed_paths_and_normal_rendering() { let normal = fixture.normal("Grep", json!({"target_workdir": "main", "path": "src", "pattern": "hit", "output_mode": mode, "-C": 1})).await.unwrap(); assert_eq!(grep.output.summary, normal.summary); assert_eq!(grep.output.content, normal.content); + assert!(grep.listing.is_none()); assert!(!grep.output.content.unwrap().contains("outside.txt")); } } + +#[tokio::test] +async fn checkout_list_returns_one_typed_page_and_provider_coordinate_continuation() { + let fixture = Fixture::new(); + std::fs::create_dir_all(fixture.dir.path().join("src/nested")).unwrap(); + std::fs::write(fixture.dir.path().join("src/a.txt"), "alpha").unwrap(); + std::fs::write(fixture.dir.path().join("src/z.txt"), "z").unwrap(); + std::fs::write(fixture.dir.path().join("outside.txt"), "outside").unwrap(); + let (_, validator) = fixture.observation("main", "src").await; + let first = fixture + .native("main", "src", "List", json!({"limit": 1})) + .await + .unwrap(); + assert!(first.paths.is_empty()); + assert!(first.output.content.is_none()); + assert!(first.output.summary.contains("Listed 1 of 3 entries")); + assert!(first.output.summary.contains("truncated")); + assert_eq!(first.validator, Some(validator)); + let page = first.listing.unwrap(); + assert_eq!(page.entries.len(), 1); + assert_eq!(page.entries[0].path.as_str(), "src/nested"); + assert_eq!(page.entries[0].kind, workdir::EntryKind::Directory); + assert!(page.truncated); + let total_bytes = page.total_bytes; + assert!(total_bytes >= 6); + let cursor = page.next_after.unwrap(); + assert_eq!(cursor.path.as_str(), "src/nested"); + let second = fixture + .native("main", "src", "List", json!({"after": cursor})) + .await + .unwrap(); + let page = second.listing.unwrap(); + assert_eq!( + page.entries + .iter() + .map(|entry| entry.path.as_str()) + .collect::>(), + ["src/a.txt", "src/z.txt"] + ); + assert_eq!(page.total_entries, 3); + assert_eq!(page.total_bytes, total_bytes); + assert!(!page.truncated); + assert!(page.next_after.is_none()); + assert_eq!(fixture.tracker.change_stat(), crate::ChangeStat::default()); +} + +#[tokio::test] +async fn checkout_list_root_file_cursor_stays_on_selected_attachment() { + let fixture = Fixture::new(); + std::fs::write(fixture.dir.path().join("a.txt"), "a").unwrap(); + std::fs::write(fixture.dir.path().join("z.txt"), "z").unwrap(); + let other = TempDir::new().unwrap(); + std::fs::write(other.path().join("wrong.txt"), "wrong").unwrap(); + fixture + .router + .attach( + WorkdirAttachmentAlias::new("other").unwrap(), + Arc::new(LocalWorkdirSession::new( + Scope::writable(other.path()).unwrap(), + other.path().to_path_buf(), + )), + ) + .unwrap(); + let first = fixture + .native("main", ".", "List", json!({"limit": 1})) + .await + .unwrap() + .listing + .unwrap(); + let cursor = first.next_after.unwrap(); + assert_eq!(cursor.kind, workdir::EntryKind::File); + assert_eq!(cursor.path.as_str(), "a.txt"); + let second = fixture + .native("main", ".", "List", json!({"after": cursor})) + .await + .unwrap() + .listing + .unwrap(); + assert_eq!(second.entries.len(), 1); + assert_eq!(second.entries[0].path.as_str(), "z.txt"); + let other_page = fixture + .native("other", ".", "List", json!({})) + .await + .unwrap() + .listing + .unwrap(); + assert_eq!(other_page.entries.len(), 1); + assert_eq!(other_page.entries[0].path.as_str(), "wrong.txt"); +} + +#[tokio::test] +async fn checkout_list_defaults_to_100_and_accepts_both_limit_bounds() { + let fixture = Fixture::new(); + for index in 0..101 { + std::fs::write(fixture.dir.path().join(format!("{index:03}.txt")), "").unwrap(); + } + for (arguments, count, truncated) in [ + (json!({}), 100, true), + (json!({"limit": 1}), 1, true), + (json!({"limit": 1000}), 101, false), + ] { + let result = fixture + .native("main", ".", "List", arguments) + .await + .unwrap(); + let page = result.listing.unwrap(); + assert_eq!(page.entries.len(), count); + assert_eq!(page.truncated, truncated); + assert_eq!(page.next_after.is_some(), truncated); + } +} + +#[tokio::test] +async fn checkout_list_rejects_route_overrides_malformed_limits_and_nonchild_cursors() { + let fixture = Fixture::new(); + std::fs::create_dir(fixture.dir.path().join("src")).unwrap(); + for arguments in [ + json!({"path": "."}), + json!({"target_workdir": "other"}), + json!({"generation": 1}), + json!({"validator": []}), + json!({"limit": 0}), + json!({"limit": 1001}), + json!({"limit": -1}), + json!({"limit": 1.5}), + json!({"limit": "1"}), + json!({"limit": null}), + json!({"after": "src/a.txt"}), + json!({"after": {"path": "src/a.txt"}}), + json!({"after": {"kind": "file", "path": "src/a.txt", "extra": 1}}), + json!({"after": {"kind": "bogus", "path": "src/a.txt"}}), + json!({"after": {"kind": "file", "path": "src"}}), + json!({"after": {"kind": "directory", "path": "src/nested/deep"}}), + json!({"after": {"kind": "file", "path": "src-other/a.txt"}}), + json!({"after": {"kind": "file", "path": "a.txt"}}), + json!({"after": {"kind": "file", "path": "/src/a.txt"}}), + json!({"after": {"kind": "file", "path": "src/../a.txt"}}), + json!({"after": {"kind": "file", "path": "."}}), + ] { + let error = fixture + .native("main", "src", "List", arguments.clone()) + .await + .err() + .unwrap(); + assert!( + matches!(error, ToolError::InvalidArgument(_)), + "{arguments}: {error}" + ); + } +} + +#[tokio::test] +async fn checkout_list_requires_current_generation_and_directory_validator() { + let fixture = Fixture::new(); + let (generation, validator) = fixture.observation("main", ".").await; + // No timing dependency: make the supplied observation explicitly stale. + let mut stale_validator = validator.clone(); + stale_validator.push(0); + for (generation, validator) in [(generation, stale_validator), (generation + 1, validator)] { + let error = execute_checkout_tool( + fixture.router.clone(), + fixture.tracker.clone(), + "main", + generation, + WorkdirPath::root(), + validator, + "List", + json!({}), + Default::default(), + ) + .await + .err() + .unwrap(); + assert_checkout_stale(error); + } +} diff --git a/crates/tools/src/edit.rs b/crates/tools/src/edit.rs index 805a83087..8f3e8e947 100644 --- a/crates/tools/src/edit.rs +++ b/crates/tools/src/edit.rs @@ -110,6 +110,7 @@ pub(crate) async fn execute_edit( attachments: Vec::new(), }, paths: Vec::new(), + listing: None, validator, }) } diff --git a/crates/tools/src/glob.rs b/crates/tools/src/glob.rs index fe65fc36a..509d5f3ea 100644 --- a/crates/tools/src/glob.rs +++ b/crates/tools/src/glob.rs @@ -93,6 +93,7 @@ pub(crate) async fn execute_glob( attachments: Vec::new(), }, paths: result.paths, + listing: None, validator: None, }) } diff --git a/crates/tools/src/grep.rs b/crates/tools/src/grep.rs index 85257a8cf..1fa48343a 100644 --- a/crates/tools/src/grep.rs +++ b/crates/tools/src/grep.rs @@ -147,6 +147,7 @@ pub(crate) async fn execute_grep( attachments: Vec::new(), }, paths: result.paths, + listing: None, validator: None, }) } diff --git a/crates/tools/src/read.rs b/crates/tools/src/read.rs index f9d49ab1f..e32d2389a 100644 --- a/crates/tools/src/read.rs +++ b/crates/tools/src/read.rs @@ -108,6 +108,7 @@ pub(crate) async fn execute_read( attachments: Vec::new(), }, paths: Vec::new(), + listing: None, validator, }) } diff --git a/crates/tools/src/write.rs b/crates/tools/src/write.rs index c6f083cba..a79b01713 100644 --- a/crates/tools/src/write.rs +++ b/crates/tools/src/write.rs @@ -125,6 +125,7 @@ pub(crate) async fn execute_write( attachments: Vec::new(), }, paths: create_path.into_iter().collect(), + listing: None, validator, }) } diff --git a/crates/workdir/CHECKOUT_PROVIDER.md b/crates/workdir/CHECKOUT_PROVIDER.md index 0e7a9827b..119702002 100644 --- a/crates/workdir/CHECKOUT_PROVIDER.md +++ b/crates/workdir/CHECKOUT_PROVIDER.md @@ -101,6 +101,37 @@ Host generation reuse, native permission identity, read-history updates, model Operation publication, transport hosting (Runtime/Backend/External), and durable Ticket/MR review remain the parent integration's responsibilities. +## Bounded live List pagination + +`ListRequest { path, limit, after: Option }` accepts an exclusive +ordering key `ListCursor { kind: EntryKind, path: FsPath }`. Directories sort +first, then paths sort lexically within the directory/non-directory groups; +File, Symlink and Other share the non-directory group. `ListResult.next_after` +is the last returned key when another page remains. Reuse that key unchanged +with the same directory and output root. Cursor paths must name a direct child +in the result coordinate frame; they are not statted and need not still exist. +The optional fields default to absent and are omitted from JSON when absent. + +The shared provider engine retains at most `limit + 1` candidates, additionally +bounded by the 1 MiB aggregate path-response ceiling (including continuation), +while scanning the directory once. It never stops merely because the page is +full: enumeration order cannot determine the retained prefix. `total_entries` +and `total_bytes` describe all visible entries in the current scan, including +keys at/before `after`, not only the page or remaining suffix. A byte-bounded +page may contain fewer than `limit` entries and still provide continuation. +A zero-limit request returns totals and truncation but no continuation. +List uses Read capability and read/enumeration scope, and **does not ignore-filter** +`.gitignore`/`.ignore` entries or hide dotfiles; Glob/Grep keep their own policy. +Cancellation and the 100,000-entry traversal ceiling apply to the complete scan, +including excluded entries. External DTOs retain their existing item/path bounds +and also validate cursor paths and continuation response bytes. + +Each page observes a live directory, not a snapshot, and no cross-page +consistency is promised. Insertions after the cursor may appear; earlier keys +are not revisited. Removed entries disappear, including the cursor entry. +Renames or kind changes can move an entry across the cursor and cause omission +or repetition. Even one scan is not transactional against external editors. + ## Scoped checkout search boundary `CheckoutSearchRequest::new(CheckoutSearchOperation::{List, Glob, Grep}(request))` @@ -110,7 +141,8 @@ are `scope_layers: Vec>` and `output_root: WorkdirPath Rules union within each layer; layers intersect with each other, the current provider authority, and the output-root boundary. Wrappers contribute their own scope; caller-supplied layers can only narrow, never replace it. Each wrapper -translates all incoming coordinates once and forwards the composed output root. +translates incoming provider coordinates once and forwards the composed output root. +List cursors remain output-root-relative, just like result paths. Provider-rendered Grep text and every typed result path are already relative to that final root; wrappers must not prefix cwd onto returned paths again. diff --git a/crates/workdir/src/checkout.rs b/crates/workdir/src/checkout.rs index f524ae61c..d6592df2b 100644 --- a/crates/workdir/src/checkout.rs +++ b/crates/workdir/src/checkout.rs @@ -167,6 +167,19 @@ impl CheckoutSearchRequest { } let valid = match &self.operation { CheckoutSearchOperation::List(r) => { + if let Some(after) = &r.after { + validate_path(&after.path)?; + if after.path.is_root() + || std::path::Path::new(after.path.as_str()).parent() + != std::path::Path::new(r.path.as_str()) + .strip_prefix(self.output_root.as_str()) + .ok() + { + return Err(WorkdirError::InvalidArgument( + "List cursor must name a direct child of the listed directory".into(), + )); + } + } r.limit <= crate::external::MAX_EXTERNAL_RESULT_ITEMS } CheckoutSearchOperation::Glob(r) => { @@ -793,6 +806,7 @@ mod tests { for provider in [&local as &dyn WorkdirSession, &external] { let listed = provider .list(ListRequest { + after: None, path: WorkdirPath::root(), limit: 100, }) diff --git a/crates/workdir/src/checkout_search_tests.rs b/crates/workdir/src/checkout_search_tests.rs index 0de5ab0db..44c81488e 100644 --- a/crates/workdir/src/checkout_search_tests.rs +++ b/crates/workdir/src/checkout_search_tests.rs @@ -60,6 +60,7 @@ fn fixture() -> tempfile::TempDir { async fn verify_sparse(session: &dyn WorkdirSession) { let listed = session .list(ListRequest { + after: None, path: WorkdirPath::root(), limit: 100, }) @@ -75,6 +76,7 @@ async fn verify_sparse(session: &dyn WorkdirSession) { ); let empty = session .list(ListRequest { + after: None, path: path("denied"), limit: 100, }) @@ -108,6 +110,7 @@ async fn verify_sparse(session: &dyn WorkdirSession) { let CheckoutSearchResult::List(native) = session .checkout_search(CheckoutSearchRequest::new(CheckoutSearchOperation::List( ListRequest { + after: None, path: WorkdirPath::root(), limit: 100, }, @@ -161,6 +164,7 @@ async fn checkout_search_nested_sparse_nonrecursive_scopes_rebase_and_exclude_co .tool_session() .checkout_search(CheckoutSearchRequest::new(CheckoutSearchOperation::List( ListRequest { + after: None, path: WorkdirPath::root(), limit: 100 } @@ -196,6 +200,7 @@ async fn checkout_search_composes_actual_nested_wrappers_and_output_root() { let CheckoutSearchResult::List(result) = stacked .checkout_search(CheckoutSearchRequest::new(CheckoutSearchOperation::List( ListRequest { + after: None, path: path("keep"), limit: 100, }, @@ -229,6 +234,7 @@ async fn checkout_search_composes_actual_nested_wrappers_and_output_root() { let entries = second .tool_session() .list(ListRequest { + after: None, path: WorkdirPath::root(), limit: 100, }) @@ -246,6 +252,7 @@ async fn checkout_search_composes_actual_nested_wrappers_and_output_root() { second .tool_session() .list(ListRequest { + after: None, path: path("deep"), limit: 100 }) @@ -292,6 +299,7 @@ async fn checkout_search_scope_layers_intersect_before_list_and_grep() { root.path().to_path_buf(), ); let mut request = CheckoutSearchRequest::new(CheckoutSearchOperation::List(ListRequest { + after: None, path: path("child"), limit: 100, })); @@ -325,6 +333,7 @@ async fn checkout_search_wire_dto_bounds_and_provider_capabilities() { root.path().to_path_buf(), ); let request = CheckoutSearchRequest::new(CheckoutSearchOperation::List(ListRequest { + after: None, path: path("child/keep"), limit: 100, })); @@ -795,6 +804,7 @@ async fn checkout_search_preserves_current_provider_scope_and_rejects_symlink_es let CheckoutSearchResult::List(result) = source .checkout_search(CheckoutSearchRequest { operation: CheckoutSearchOperation::List(ListRequest { + after: None, path: path("child/denied"), limit: 100, }), diff --git a/crates/workdir/src/external.rs b/crates/workdir/src/external.rs index 1b37cda23..1d91c20a3 100644 --- a/crates/workdir/src/external.rs +++ b/crates/workdir/src/external.rs @@ -155,7 +155,11 @@ fn validate_external_operation(operation: &WorkdirSessionOperation) -> Result<() <= MAX_EXTERNAL_SCOPE_RULES && validate_external_operation(&match &request.operation { crate::CheckoutSearchOperation::List(r) => { - WorkdirSessionOperation::List(r.clone()) + // request.validate() checks the output_root-relative + // cursor; validate the provider-coordinate path here. + let mut list = r.clone(); + list.after = None; + WorkdirSessionOperation::List(list) } crate::CheckoutSearchOperation::Glob(r) => { WorkdirSessionOperation::Glob(r.clone()) @@ -212,7 +216,14 @@ fn validate_external_operation(operation: &WorkdirSessionOperation) -> Result<() .contains(&request.max_bytes) } WorkdirSessionOperation::List(request) => { - is_root_relative(&request.path) && request.limit <= MAX_EXTERNAL_RESULT_ITEMS + is_root_relative(&request.path) + && request.limit <= MAX_EXTERNAL_RESULT_ITEMS + && request.after.as_ref().is_none_or(|after| { + is_root_relative(&after.path) + && !after.path.is_root() + && Path::new(after.path.as_str()).parent() + == Some(Path::new(request.path.as_str())) + }) } WorkdirSessionOperation::Glob(request) => { is_root_relative(&request.path) @@ -395,7 +406,20 @@ fn validate_external_result(result: &WorkdirSessionOperationResult) -> Result<() .entries .iter() .all(|entry| is_root_relative(&entry.path)) - && result_paths_fit(result.entries.iter().map(|entry| &entry.path)) + && result.next_after.as_ref().is_none_or(|after| { + is_root_relative(&after.path) + && result.truncated + && result.entries.last().is_some_and(|entry| { + entry.kind == after.kind && entry.path == after.path + }) + }) + && result_paths_fit( + result + .entries + .iter() + .map(|entry| &entry.path) + .chain(result.next_after.iter().map(|after| &after.path)), + ) } WorkdirSessionOperationResult::Glob(result) => { result.paths.len() <= MAX_EXTERNAL_RESULT_ITEMS @@ -917,6 +941,7 @@ mod tests { assert!(serde_json::from_value::(nested).is_err()); let unbounded = WorkdirSessionOperation::List(ListRequest { + after: None, path: WorkdirPath::root(), limit: MAX_EXTERNAL_RESULT_ITEMS + 1, }); diff --git a/crates/workdir/src/lib.rs b/crates/workdir/src/lib.rs index 29f265784..f46126384 100644 --- a/crates/workdir/src/lib.rs +++ b/crates/workdir/src/lib.rs @@ -33,9 +33,9 @@ use tokio::sync::broadcast; pub use fs_operation::{ BoundedReadLimits, ContentHash, EditRequest, EditResult, EntryKind, FsPath as WorkdirPath, - GlobRequest, GlobResult, GrepOutputMode, GrepRequest, GrepResult, ListEntry, ListRequest, - ListResult, ReadBytesRequest, ReadBytesResult, ReadRequest, ReadResult, StatRequest, - StatResult, WriteRequest, WriteResult, + GlobRequest, GlobResult, GrepOutputMode, GrepRequest, GrepResult, ListCursor, ListEntry, + ListRequest, ListResult, ReadBytesRequest, ReadBytesResult, ReadRequest, ReadResult, + StatRequest, StatResult, WriteRequest, WriteResult, }; pub use http::dispatch_workdir_session_operation; pub use local::{ diff --git a/crates/workdir/src/local.rs b/crates/workdir/src/local.rs index 417f6fe88..2d619655a 100644 --- a/crates/workdir/src/local.rs +++ b/crates/workdir/src/local.rs @@ -2695,6 +2695,7 @@ mod tests { let listed = WorkdirSession::list( &workdir, ListRequest { + after: None, path: WorkdirPath::new("notes").unwrap(), limit: 10, }, @@ -3385,6 +3386,7 @@ mod tests { let list = WorkdirSession::list( &workdir, ListRequest { + after: None, path: WorkdirPath::new("yoi.local").unwrap(), limit: 10, }, diff --git a/crates/workdir/src/scope.rs b/crates/workdir/src/scope.rs index 2f798d4b5..e36e3cd88 100644 --- a/crates/workdir/src/scope.rs +++ b/crates/workdir/src/scope.rs @@ -1005,6 +1005,9 @@ impl WorkdirSession for ScopedWorkdirSession { .await?; self.ensure_read(&path, request.operation.capability())?; *request.operation.path_mut() = path; + // List cursors stay output_root-relative, just like source results. + // Composing output_root below handles their coordinates without stat + // of a key that may have disappeared between live pages. request.output_root = self.resolve_path(&request.output_root)?; for layer in &mut request.scope_layers { for rule in layer { @@ -1873,6 +1876,7 @@ mod tests { assert_eq!( parent .list(ListRequest { + after: None, path: fs_path("child"), limit: 100 }) @@ -1890,6 +1894,7 @@ mod tests { child .tool_session() .list(ListRequest { + after: None, path: FsPath::root(), limit: 100 }) @@ -1901,6 +1906,7 @@ mod tests { .tool_session() .checkout_search(crate::CheckoutSearchRequest::new( crate::CheckoutSearchOperation::List(ListRequest { + after: None, path: FsPath::root(), limit: 100 }) diff --git a/crates/workdir/tests/list_pagination.rs b/crates/workdir/tests/list_pagination.rs new file mode 100644 index 000000000..8d168b028 --- /dev/null +++ b/crates/workdir/tests/list_pagination.rs @@ -0,0 +1,267 @@ +#![cfg(target_os = "linux")] +use std::sync::Arc; +use workdir::external::{ + ExternalWorkdirOperation, ExternalWorkdirOperationResult, MAX_EXTERNAL_RESULT_ITEMS, +}; +use workdir::http::{WorkdirSessionOperation as Op, WorkdirSessionOperationResult as Output}; +use workdir::*; + +fn path(value: &str) -> WorkdirPath { + WorkdirPath::new(value).unwrap() +} +fn rule(value: &str, recursive: bool) -> WorkdirToolScopeRule { + WorkdirToolScopeRule { + target: path(value), + recursive, + permission: WorkdirToolScopePermission::Read, + symlink_policy: manifest::SymlinkPolicy::Logical, + } +} +fn scope(rules: Vec, cwd: &str) -> WorkdirToolScope { + WorkdirToolScope { + rules, + cwd: path(cwd), + command: false, + } +} +fn request(value: &str, limit: usize, after: Option) -> ListRequest { + ListRequest { + path: path(value), + limit, + after, + } +} +fn names(result: &ListResult) -> Vec<&str> { + result + .entries + .iter() + .map(|entry| entry.path.as_str()) + .collect() +} + +#[tokio::test] +async fn list_scoped_external_pages_rebase_cursor_and_preserve_sparse_authority() { + let root = tempfile::tempdir().unwrap(); + std::fs::create_dir_all(root.path().join("child/deep")).unwrap(); + for name in ["child/a", "child/z", "child/deep/secret", "outside"] { + std::fs::write(root.path().join(name), b"x").unwrap(); + } + let source = LocalWorkdirSession::external_read_only( + Workdir::new("pagination"), + root.path(), + BoundedReadLimits::EXTERNAL_DEFAULT, + ) + .unwrap(); + let broker = WorkdirToolBroker::new(Arc::new(source)); + let lease = broker + .scope(scope(vec![rule("child", false)], "child")) + .await + .unwrap(); + // Two actual wrappers must not duplicate child/ in the continuation. + let stacked = WorkdirToolBroker::new(lease.tool_session()); + let first = stacked.list(request("", 1, None)).await.unwrap(); + assert_eq!(names(&first), ["deep"]); + assert_eq!(first.next_after.as_ref().unwrap().path, path("deep")); + assert_eq!( + first.next_after.as_ref().unwrap().kind, + EntryKind::Directory + ); + assert_eq!(first.total_entries, 3); + assert!( + stacked + .list(request("deep", 1, None)) + .await + .unwrap() + .entries + .is_empty() + ); + let second = stacked + .list(request("", 1, first.next_after)) + .await + .unwrap(); + assert_eq!(names(&second), ["a"]); + std::fs::remove_file(root.path().join("child/a")).unwrap(); + std::fs::write(root.path().join("child/b"), b"xx").unwrap(); + let third = stacked + .list(request("", 10, second.next_after)) + .await + .unwrap(); + assert_eq!(names(&third), ["b", "z"]); + assert!(!third.truncated); + assert!(third.next_after.is_none()); + assert_eq!(third.total_entries, 3); + lease.close().await.unwrap(); + assert!(matches!( + stacked.list(request("", 1, None)).await, + Err(WorkdirError::SessionClosed) + )); +} + +#[tokio::test] +async fn list_checkout_search_cursor_uses_output_root_coordinates_across_nested_wrappers() { + let root = tempfile::tempdir().unwrap(); + std::fs::create_dir_all(root.path().join("child/keep")).unwrap(); + for name in ["a", "b", "c"] { + std::fs::write(root.path().join("child/keep").join(name), b"x").unwrap(); + } + let source = LocalWorkdirSession::external_read_only( + Workdir::new("rebased-pagination"), + root.path(), + BoundedReadLimits::EXTERNAL_DEFAULT, + ) + .unwrap(); + let broker = WorkdirToolBroker::new(Arc::new(source)); + let lease = broker + .scope(scope(vec![rule("child", true)], "child")) + .await + .unwrap(); + let stacked = WorkdirToolBroker::new(lease.tool_session()); + let mut search = + CheckoutSearchRequest::new(CheckoutSearchOperation::List(request("keep", 1, None))); + search.output_root = path("keep"); + let CheckoutSearchResult::List(first) = stacked.checkout_search(search.clone()).await.unwrap() + else { + panic!() + }; + assert_eq!(names(&first), ["a"]); + if let CheckoutSearchOperation::List(list) = &mut search.operation { + list.after = first.next_after; + } + let CheckoutSearchResult::List(second) = stacked.checkout_search(search).await.unwrap() else { + panic!() + }; + assert_eq!(names(&second), ["b"]); + assert_eq!(second.next_after.unwrap().path, path("b")); +} + +#[tokio::test] +async fn list_read_capability_suffices_without_glob_and_missing_read_is_denied() { + let root = tempfile::tempdir().unwrap(); + std::fs::write(root.path().join("a"), b"x").unwrap(); + let source = LocalWorkdirSession::materialized( + root.path().to_path_buf(), + root.path().to_path_buf(), + manifest::SharedScope::new(manifest::Scope::writable(root.path()).unwrap()), + WorkdirSessionCapabilities::from_capabilities([WorkdirSessionCapability::Read]), + ); + let broker = WorkdirToolBroker::new(Arc::new(source)); + let lease = broker.scope(scope(vec![rule("", true)], "")).await.unwrap(); + assert_eq!( + names( + &lease + .tool_session() + .list(request("", 1, None)) + .await + .unwrap() + ), + ["a"] + ); + let denied = LocalWorkdirSession::external_with_capabilities_pinned( + Workdir::new("no-read"), + ExternalWorkdirRoot::pin(root.path()).unwrap(), + BoundedReadLimits::EXTERNAL_DEFAULT, + WorkdirSessionCapabilities::COMMAND_ONLY, + ) + .unwrap(); + assert!(matches!( + denied.list(request("", 1, None)).await, + Err(WorkdirError::Unsupported(WorkdirSessionCapability::Read)) + )); +} + +#[tokio::test] +async fn list_external_wire_preserves_continuation_and_rejects_unbounded_cursor() { + let root = tempfile::tempdir().unwrap(); + std::fs::create_dir(root.path().join("child")).unwrap(); + for name in ["a", "b"] { + std::fs::write(root.path().join("child").join(name), b"x").unwrap(); + } + let source = LocalWorkdirSession::external_read_only( + Workdir::new("wire-list"), + root.path(), + BoundedReadLimits::EXTERNAL_DEFAULT, + ) + .unwrap(); + let first = source.list(request("child", 1, None)).await.unwrap(); + let wire = serde_json::to_value( + ExternalWorkdirOperationResult::try_from(Output::List(first.clone())).unwrap(), + ) + .unwrap(); + assert_eq!(wire["result"]["next_after"]["path"], "child/a"); + let decoded: ExternalWorkdirOperationResult = serde_json::from_value(wire.clone()).unwrap(); + assert_eq!(decoded.into_inner(), Output::List(first.clone())); + let operation = + ExternalWorkdirOperation::try_from(Op::List(request("child", 1, first.next_after))) + .unwrap(); + let decoded: ExternalWorkdirOperation = + serde_json::from_value(serde_json::to_value(operation).unwrap()).unwrap(); + let Output::List(next) = dispatch_workdir_session_operation(&source, decoded.into_inner()) + .await + .unwrap() + else { + panic!() + }; + assert_eq!(names(&next), ["child/b"]); + assert!(next.next_after.is_none()); + for bad_path in ["/host".to_owned(), "x".repeat(4097), "outside/a".to_owned()] { + let mut bad = serde_json::to_value(Op::List(request("child", 1, None))).unwrap(); + bad["request"]["after"] = serde_json::json!({"kind": "file", "path": bad_path}); + assert!(serde_json::from_value::(bad).is_err()); + let mut bad_result = wire.clone(); + bad_result["result"]["next_after"]["path"] = serde_json::json!(bad_path); + assert!(serde_json::from_value::(bad_result).is_err()); + } + assert!( + ExternalWorkdirOperation::try_from(Op::List(request( + "child", + MAX_EXTERNAL_RESULT_ITEMS + 1, + None + ))) + .is_err() + ); + // Search cursors use result coordinates, not provider path coordinates. + let mut search = CheckoutSearchRequest::new(CheckoutSearchOperation::List(request( + "child", + 1, + Some(ListCursor { + kind: EntryKind::File, + path: path("a"), + }), + ))); + search.output_root = path("child"); + let bounded = ExternalWorkdirOperation::try_from(Op::CheckoutSearch(search)).unwrap(); + let Output::CheckoutSearch(CheckoutSearchResult::List(next)) = + dispatch_workdir_session_operation(&source, bounded.into_inner()) + .await + .unwrap() + else { + panic!() + }; + assert_eq!(names(&next), ["b"]); +} + +#[test] +fn list_external_result_counts_cursor_toward_aggregate_path_bound() { + let entries: Vec<_> = (0..252) + .map(|n| ListEntry { + path: path(&format!("{n:04}{}", "x".repeat(4092))), + kind: EntryKind::File, + size: 1, + }) + .collect(); + let after = ListCursor { + kind: EntryKind::File, + path: entries.last().unwrap().path.clone(), + }; + let result = ListResult { + entries, + total_entries: 253, + total_bytes: 253, + truncated: true, + next_after: None, + }; + let mut wire = serde_json::to_value(Output::List(result)).unwrap(); + assert!(serde_json::from_value::(wire.clone()).is_ok()); + wire["result"]["next_after"] = serde_json::to_value(after).unwrap(); + assert!(serde_json::from_value::(wire).is_err()); +} diff --git a/crates/worker/src/checkout.rs b/crates/worker/src/checkout.rs index 127cbd163..7035e782e 100644 --- a/crates/worker/src/checkout.rs +++ b/crates/worker/src/checkout.rs @@ -11,11 +11,12 @@ use manifest::{ToolPermissionAction, ToolPermissionConfig}; use serde_json::{Value as Json, json}; use sha2::{Digest, Sha256}; use wip_protocol::{ - Documentation, INTERFACE_FORMAT_V1, InterfaceDescriptor, Object, OperationDeclaration, - ParameterDeclaration, ProtocolError, ProtocolErrorCode, ReturnDeclaration, TypeExpr, Value, + Documentation, FieldDeclaration, INTERFACE_FORMAT_V1, InterfaceDescriptor, Object, + OperationDeclaration, ParameterDeclaration, ProtocolError, ProtocolErrorCode, + ReturnDeclaration, TypeExpr, Value, }; use workdir::{ - CheckoutObservation, EntryKind, ListRequest, WorkdirPath, WorkdirSessionCapability as Cap, + CheckoutObservation, EntryKind, WorkdirPath, WorkdirSessionCapability as Cap, WorkdirSessionRouter, }; @@ -126,11 +127,15 @@ impl Provider { } self.project( ROOT, - descriptor(vec![operation( - "list", - "List currently accessible checkouts", - vec![], - )]), + descriptor(vec![{ + let mut op = operation( + "list", + "List accessible checkout entrances (not filesystem contents)", + vec![], + ); + op.returns.r#type = TypeExpr::Json; + op + }]), state.finalize().to_vec(), "collection", Arc::new(Collection { @@ -169,8 +174,14 @@ impl Provider { } } async fn node(self: &Arc, path: &str) -> Result, ProtocolError> { + Ok(self.publication_inner(path).await?.map(|p| p.projection)) + } + async fn publication_inner( + self: &Arc, + path: &str, + ) -> Result, ProtocolError> { if path == ROOT { - return Ok(Some(self.collection())); + return WipPublication::self_scoped(self.collection()).map(Some); } let Some((alias, target)) = self.parse(path) else { return Ok(None); @@ -202,39 +213,86 @@ impl Provider { if observation.kind == EntryKind::File && !self.allowed("Read", &permission_input) { return Ok(None); } + let workdir = selected.session.workdir().id().as_str().to_owned(); + let root = checkout_root(&alias); + // The router guard pins this connection across both observations. Root + // lifetime is attachment lifetime, not directory-content validator state. + let scope = if target.is_root() { + None + } else { + let root_observation = + match selected.session.checkout_observe(WorkdirPath::root()).await { + Ok(o) => o, + Err(_) => return Ok(None), + }; + self.entry_projection( + &root, + &alias, + selected.generation, + &workdir, + WorkdirPath::root(), + root_observation, + ) + }; + let Some(projection) = self.entry_projection( + path, + &alias, + selected.generation, + &workdir, + target, + observation, + ) else { + return Ok(None); + }; + if path == root { + return WipPublication::self_scoped(projection).map(Some); + } + let Some(scope) = scope else { + return Ok(None); + }; + Ok(Some(WipPublication { + projection, + scope: Some(scope.object), + })) + } + fn entry_projection( + self: &Arc, + path: &str, + alias: &str, + generation: u64, + workdir: &str, + target: WorkdirPath, + observation: CheckoutObservation, + ) -> Option { let ops = self.operations(&observation); if ops.is_empty() { - return Ok(None); + return None; } let kind = if observation.kind == EntryKind::File { "file" } else { "directory" }; - let workdir = selected.session.workdir().id().as_str().to_owned(); - let validator = self.wrap_validator( - &alias, - selected.generation, - &workdir, - &observation.validator, - ); + let validator = self.wrap_validator(alias, generation, workdir, &observation.validator); let handler = Arc::new(FileHandler { provider: self.clone(), - alias, - generation: selected.generation, - workdir, + alias: alias.into(), + generation, + workdir: workdir.into(), target, observation, }); - let family = format!("{kind}-g{}", selected.generation); - Ok(Some(self.project( - path, - descriptor(ops), - validator, - &family, - handler, - ))) + let family = format!("{kind}-g{generation}"); + let mut projection = self.project(path, descriptor(ops), validator, &family, handler); + // Keep path-qualified local names (permissions/capabilities may differ + // per target) while binding every content Interface to its live entrance. + projection.interface.scope = checkout_root(alias); + projection.interface.name.push_str("#target/"); + projection.interface.name.push_str(&encode_identity(path)); + projection.object.interfaces = vec![projection.interface.clone()]; + Some(projection) } + fn operations(&self, o: &CheckoutObservation) -> Vec { let mut ops = Vec::new(); let has = |cap, name| o.capabilities.supports(cap) && self.may_allow(name); @@ -261,6 +319,13 @@ impl Provider { )); } } else { + if has(Cap::Read, "List") { + ops.push(operation( + "list", + "List direct contents, directories first then lexical path. Bounded live pages, not a snapshot; pass returned after to continue. Limit defaults to 100, maximum 1000. List permission and provider Read/enumeration authority apply. Includes hidden/ignored names per provider List policy, unlike Glob/Grep.", + vec![parameter("limit", false, TypeExpr::Integer), parameter("after", false, cursor_type())], + )); + } if has(Cap::Glob, "Glob") { ops.push(operation( "glob", @@ -288,6 +353,15 @@ impl Provider { #[async_trait] impl WipSubtreeProvider for Arc { + fn interface_target(&self, reference: &wip_protocol::InterfaceReference) -> Option { + if reference.scope == ROOT { + return Some(ROOT.into()); + } + let (_, encoded) = reference.name.rsplit_once("#target/")?; + let path = decode_identity(encoded)?; + let (alias, _) = self.parse(&path)?; + (reference.scope == checkout_root(&alias)).then_some(path) + } async fn publication(&self, path: &str) -> Result, ProtocolError> { let _permit = tokio::time::timeout(self.deadline, self.permits.acquire()) .await @@ -298,7 +372,7 @@ impl WipSubtreeProvider for Arc { ) })? .map_err(|_| error(ProtocolErrorCode::Internal, "checkout unavailable"))?; - tokio::time::timeout(self.deadline, self.node(path)) + tokio::time::timeout(self.deadline, self.publication_inner(path)) .await .map_err(|_| { error( @@ -306,7 +380,6 @@ impl WipSubtreeProvider for Arc { "checkout observation deadline", ) })? - .and_then(|projection| projection.map(WipPublication::self_scoped).transpose()) } async fn children(&self, path: &str) -> Result, ProtocolError> { let _permit = tokio::time::timeout(self.deadline, self.permits.acquire()) @@ -354,70 +427,9 @@ impl Provider { } return Ok(paths); } - let Some((alias, target)) = self.parse(path) else { - return Err(error(ProtocolErrorCode::NotFound, "checkout not published")); - }; - let selected = self - .router - .resolve(Some(&alias)) - .map_err(|_| error(ProtocolErrorCode::NotFound, "attachment expired"))?; - let o = selected - .session - .checkout_observe(target.clone()) - .await - .map_err(|_| error(ProtocolErrorCode::NotFound, "checkout not published"))?; - if o.kind != EntryKind::Directory { - return Ok(Vec::new()); - } - if !self.allowed( - "Glob", - &json!({"target_workdir":alias,"path":target.as_str(),"pattern":"*"}), - ) && !self.allowed( - "Grep", - &json!({"target_workdir":alias,"path":target.as_str(),"pattern":""}), - ) { - return Ok(Vec::new()); - } - let listing = selected - .session - .checkout_search(workdir::CheckoutSearchRequest::new( - workdir::CheckoutSearchOperation::List(ListRequest { - path: target, - limit: MAX_NODES + 1, - }), - )) - .await - .map_err(|_| error(ProtocolErrorCode::Internal, "checkout listing unavailable"))?; - let workdir::CheckoutSearchResult::List(listing) = listing else { - return Err(error( - ProtocolErrorCode::Internal, - "mismatched checkout listing", - )); - }; - if listing.truncated || listing.entries.len() > MAX_NODES { - return Err(error( - ProtocolErrorCode::ResourceLimitExceeded, - "directory observation exceeds node bound", - )); - } - let mut paths = Vec::new(); - for entry in listing.entries { - let p = object_path(&alias, &entry.path); - if self.node(&p).await?.is_some() { - paths.push(p); - } - } - if !self - .router - .resolve(Some(&alias)) - .is_ok_and(|current| current.generation == selected.generation) - { - return Err(error( - ProtocolErrorCode::ValidatorMismatch, - "attachment changed", - )); - } - Ok(paths) + // Contents are addressable, but never indexable. Host observe already + // resolves the requested Object; no provider content List is needed. + Ok(Vec::new()) } } @@ -501,6 +513,7 @@ impl WipOperationHandler for FileHandler { context: WipCallContext, ) -> Result { let tool = match operation { + "list" => "List", "read" => "Read", "edit" => "Edit", "write" => "Write", @@ -528,7 +541,34 @@ impl WipOperationHandler for FileHandler { } let mut permission_input = args.clone(); permission_input.insert("target_workdir".into(), json!(self.alias)); - if tool == "Glob" || tool == "Grep" { + if tool == "List" { + permission_input.insert("path".into(), json!(self.target.as_str())); + if let Some(after) = args.get_mut("after") { + let entry = after.get("entry").and_then(Json::as_str).ok_or_else(|| { + protocol( + ProtocolErrorCode::InvalidArguments, + "after requires an entry", + ) + })?; + let Some((alias, path)) = self.provider.parse(entry) else { + return Err(protocol( + ProtocolErrorCode::InvalidArguments, + "invalid continuation entry", + )); + }; + if alias != self.alias || object_path(&alias, &path) != entry { + return Err(protocol( + ProtocolErrorCode::InvalidArguments, + "continuation must belong to this checkout", + )); + } + let fields = after.as_object_mut().ok_or_else(|| { + protocol(ProtocolErrorCode::InvalidArguments, "invalid continuation") + })?; + fields.remove("entry"); + fields.insert("path".into(), json!(path.as_str())); + } + } else if tool == "Glob" || tool == "Grep" { let relative = args.get("path").and_then(Json::as_str).unwrap_or(""); permission_input.insert("path".into(), json!(join_under(&self.target, relative)?)); } else if tool == "Create" { @@ -588,49 +628,49 @@ impl WipOperationHandler for FileHandler { } })? .map_err(map_tool_error)?; - let links = tokio::time::timeout_at(deadline, async { - let mut links = Vec::new(); - self.check_connection()?; - for path in &result.paths { - let route = object_path(&self.alias, path); - // References are validated only against the captured live connection. - if self - .provider - .node(&route) - .await - .map_err(WipOperationError::Protocol)? - .is_some() - { - links.push(json!({"path":route})); - } - self.check_connection()?; + // Coordinates are not observations. Never prefetch unselected results; + // a vanished entry cannot fail a successful discovery Operation. + self.check_connection()?; + let mut fields = BTreeMap::from([("summary".into(), Value::String(result.output.summary))]); + if let Some(content) = result.output.content { + fields.insert("content".into(), Value::String(content)); + } + let items = if let Some(listing) = result.listing { + fields.insert("truncated".into(), Value::Boolean(listing.truncated)); + if let Some(after) = listing.next_after { + fields.insert("after".into(), cursor_value(&self.alias, &after)); } - Ok::<_, WipOperationError>(links) - }) - .await - .map_err(|_| { - if matches!(tool, "Write" | "Edit" | "Create") { - WipOperationError::OutcomeUnknown("completed operation response deadline".into()) - } else { - protocol( - ProtocolErrorCode::ResourceLimitExceeded, - "checkout result deadline", - ) - } - })? - .map_err(|e| { - if matches!(tool, "Write" | "Edit" | "Create") { - WipOperationError::OutcomeUnknown("completed operation response unavailable".into()) - } else { - e - } - })?; - let value = json_to_wip( - &json!({"summary":result.output.summary,"content":result.output.content,"items":links}), - ) - .map_err(|_| { - WipOperationError::OutcomeUnknown("invalid completed file operation result".into()) - })?; + listing + .entries + .into_iter() + .map(|item| { + Value::Record(BTreeMap::from([ + ( + "entry".into(), + Value::String(object_path(&self.alias, &item.path)), + ), + ("kind".into(), Value::String(kind_name(item.kind).into())), + ( + "size".into(), + Value::Integer(i64::try_from(item.size).unwrap_or(i64::MAX)), + ), + ])) + }) + .collect() + } else { + result + .paths + .iter() + .map(|path| { + Value::Record(BTreeMap::from([( + "entry".into(), + Value::String(object_path(&self.alias, path)), + )])) + }) + .collect() + }; + fields.insert("items".into(), Value::List(items)); + let value = Value::Record(fields); if let Some(raw) = result.validator { Ok(WipOperationOutput::native_with_validator( value, @@ -693,10 +733,70 @@ fn operation( parameters, returns: ReturnDeclaration { documentation: None, - r#type: TypeExpr::Json, + r#type: result_type(name == "list"), }, } } +fn field(name: &str, required: bool, r#type: TypeExpr) -> FieldDeclaration { + FieldDeclaration { + name: name.into(), + required, + documentation: None, + r#type, + } +} +fn cursor_type() -> TypeExpr { + TypeExpr::Record { + fields: vec![ + field("kind", true, TypeExpr::String), + field("entry", true, TypeExpr::Entry), + ], + } +} +fn result_type(list: bool) -> TypeExpr { + let mut item = vec![field("entry", true, TypeExpr::Entry)]; + if list { + item.extend([ + field("kind", true, TypeExpr::String), + field("size", true, TypeExpr::Integer), + ]); + } + let mut fields = vec![ + field("summary", true, TypeExpr::String), + field("content", false, TypeExpr::String), + field( + "items", + true, + TypeExpr::List { + items: Box::new(TypeExpr::Record { fields: item }), + }, + ), + ]; + if list { + fields.extend([ + field("truncated", true, TypeExpr::Boolean), + field("after", false, cursor_type()), + ]); + } + TypeExpr::Record { fields } +} +fn kind_name(kind: EntryKind) -> &'static str { + match kind { + EntryKind::Directory => "directory", + EntryKind::File => "file", + EntryKind::Symlink => "symlink", + EntryKind::Other => "other", + } +} +fn cursor_value(alias: &str, cursor: &workdir::ListCursor) -> Value { + Value::Record(BTreeMap::from([ + ("kind".into(), Value::String(kind_name(cursor.kind).into())), + ( + "entry".into(), + Value::String(object_path(alias, &cursor.path)), + ), + ])) +} fn descriptor(operations: Vec) -> InterfaceDescriptor { InterfaceDescriptor{format:INTERFACE_FORMAT_V1.into(),documentation:Some(Documentation{summary:"AI-oriented attached Workdir operations".into(),details:Some("The route binds attachment and target. Line offsets are zero-based; text output numbers lines from one. Read-before-write and provider validators are both required. Paths are Worldspace references, never host paths.".into())}),types:Vec::new(),operations} } diff --git a/crates/worker/src/checkout_http_tests.rs b/crates/worker/src/checkout_http_tests.rs index 455971e7a..b69c99d5b 100644 --- a/crates/worker/src/checkout_http_tests.rs +++ b/crates/worker/src/checkout_http_tests.rs @@ -379,7 +379,7 @@ fn first_link(value: &Value) -> &str { panic!("expected typed link List") }; assert_eq!(items.len(), 1); - let Value::String(path) = field(&items[0], "path") else { + let Value::String(path) = field(&items[0], "entry") else { panic!("expected typed link path") }; path @@ -669,3 +669,89 @@ async fn checkout_http_malformed_response_after_write_is_unknown_without_retry() async fn checkout_http_lost_response_after_write_is_unknown_without_retry() { watchdog(committed_write_unknown(WriteResponseFault::LostBody)).await; } + +#[tokio::test] +async fn remote_checkout_list_pages_and_direct_inspect_read_use_provider_without_tree_enumeration() +{ + use super::checkout_wip_tests::{json_content, model_inspect, model_invoke, model_operation}; + let fixture = HttpFixture::new(WorkdirSessionCapabilities::READ_ONLY).await; + std::fs::create_dir(fixture.dir.path().join("empty")).unwrap(); + let remote = fixture.open(TOKEN).await.unwrap(); + let (runtime, _) = native_runtime(Arc::new(remote)); + let runtime = Arc::new(runtime); + let tree = json_content( + model_operation( + runtime.clone(), + "Tree", + json!({"path":"/checkouts", "depth":8}), + ) + .await + .unwrap(), + ); + assert_eq!(tree["tree"]["children"][0]["children"], json!([])); + assert!( + !fixture + .state + .operations + .lock() + .unwrap() + .iter() + .any(|op| matches!( + op, + WorkdirSessionOperation::CheckoutSearch(_) | WorkdirSessionOperation::List(_) + )) + ); + let entrance = model_inspect(runtime.clone(), "/checkouts/main").await; + let first = json_content( + model_invoke(runtime.clone(), &entrance, "list", json!({"limit":1})) + .await + .unwrap(), + ); + assert_eq!(first["items"][0]["entry"], "/checkouts/main/empty"); + assert_eq!(first["items"][0]["kind"], "directory"); + assert_eq!(first["truncated"], true); + let next = json_content( + model_invoke( + runtime.clone(), + &entrance, + "list", + json!({"limit":1,"after":first["after"]}), + ) + .await + .unwrap(), + ); + assert_eq!(next["items"][0]["entry"], "/checkouts/main/src"); + assert_eq!(next["truncated"], false); + let deep = model_inspect(runtime.clone(), "/checkouts/main/src/deep").await; + for (operation, args) in [ + ("list", json!({})), + ("glob", json!({"pattern":"*.txt"})), + ( + "grep", + json!({"pattern":"needle","output_mode":"files_with_matches"}), + ), + ] { + let found = json_content( + model_invoke(runtime.clone(), &deep, operation, args) + .await + .unwrap(), + ); + let file = found["items"][0]["entry"].as_str().unwrap(); + assert_eq!(file, "/checkouts/main/src/deep/a.txt"); + let inspected = model_inspect(runtime.clone(), file).await; + let read = json_content( + model_invoke(runtime.clone(), &inspected, "read", json!({})) + .await + .unwrap(), + ); + assert!(read["content"].as_str().unwrap().contains("needle")); + fixture.public_output(&found.to_string()); + } + let operations = fixture.state.operations.lock().unwrap(); + assert!(operations.iter().any(|op| matches!(op, WorkdirSessionOperation::CheckoutSearch(r) if matches!(&r.operation, CheckoutSearchOperation::List(l) if l.after.is_some())))); + assert!( + !operations + .iter() + .any(|op| matches!(op, WorkdirSessionOperation::List(_))) + ); +} diff --git a/crates/worker/src/checkout_race_tests.rs b/crates/worker/src/checkout_race_tests.rs index 954ce0977..15e1c6ade 100644 --- a/crates/worker/src/checkout_race_tests.rs +++ b/crates/worker/src/checkout_race_tests.rs @@ -13,9 +13,9 @@ use tempfile::TempDir; use workdir::{ CheckoutRequest, CheckoutResult, CommandHandle, CommandOutput, CommandOutputRequest, CommandRequest, CommandStatus, EditRequest, EditResult, GlobRequest, GlobResult, GrepRequest, - GrepResult, ListResult, LocalWorkdirSession, ReadBytesRequest, ReadBytesResult, ReadRequest, - ReadResult, StatRequest, StatResult, Workdir, WorkdirAttachmentAlias, WorkdirError, - WorkdirScopeAuthorizationRequest, WorkdirScopeOverlapRequest, WorkdirSession, + GrepResult, ListRequest, ListResult, LocalWorkdirSession, ReadBytesRequest, ReadBytesResult, + ReadRequest, ReadResult, StatRequest, StatResult, Workdir, WorkdirAttachmentAlias, + WorkdirError, WorkdirScopeAuthorizationRequest, WorkdirScopeOverlapRequest, WorkdirSession, WorkdirSessionCapabilities, WorkdirSessionHandle, WriteRequest, WriteResult, }; @@ -28,6 +28,7 @@ struct HookedSession { observe_hook: Mutex>, stall_path: Mutex>, stalled_observations: AtomicUsize, + searches: AtomicUsize, } impl std::fmt::Debug for HookedSession { @@ -52,6 +53,7 @@ impl HookedSession { observe_hook: Mutex::new(None), stall_path: Mutex::new(None), stalled_observations: AtomicUsize::new(0), + searches: AtomicUsize::new(0), }) } @@ -123,6 +125,7 @@ impl WorkdirSession for HookedSession { &self, request: workdir::CheckoutSearchRequest, ) -> Result { + self.searches.fetch_add(1, Ordering::SeqCst); self.local.checkout_search(request).await } @@ -484,7 +487,7 @@ async fn collection_list_and_root_enumeration_bound_stalled_observation_and_rele } #[tokio::test] -async fn grep_post_search_link_observation_is_deadline_bounded_and_releases_permit() { +async fn grep_returns_typed_entry_without_observing_stalled_result() { let dir = TempDir::new().unwrap(); std::fs::write(dir.path().join("a.txt"), "needle\n").unwrap(); let session = HookedSession::new(&dir); @@ -499,8 +502,8 @@ async fn grep_post_search_link_observation_is_deadline_bounded_and_releases_perm let root = checkout_root("main"); let projection = p.node(&root).await.unwrap().unwrap(); - // Directory observations and the normal local grep/checkout execution can - // complete. Only publishing the typed search result path gets stuck. + // Directory/search can complete. The result path must never be observed + // during result publication, even when it would block indefinitely. session.stall_observation(Some(WorkdirPath::new("a.txt").unwrap())); let arguments = BTreeMap::from([ ("pattern".into(), Value::String("needle".into())), @@ -514,13 +517,17 @@ async fn grep_post_search_link_observation_is_deadline_bounded_and_releases_perm projection.handler.call("grep", &arguments, context()), ) .await - .expect("post-search link observations must share the operation deadline"); - assert_deadline(result, "checkout result deadline"); - assert_eq!(session.stalled_observations.load(Ordering::SeqCst), 1); + .expect("completed search must return without acquiring its entries"); + let output = result.unwrap_or_else(|_| panic!("successful search must not observe each entry")); + assert_eq!( + wip_to_json(&output.value).unwrap()["items"], + json!([{"entry": format!("{root}/a.txt")}]) + ); + assert_eq!(session.stalled_observations.load(Ordering::SeqCst), 0); assert_permit_released(&p); - // A successful retry both checks cancellation cleanup and proves that the - // delegated search produces the typed path consumed by post-processing. + // A second explicit search produces the same typed coordinate, without + // acquiring it even when it could resolve successfully. session.stall_observation(None); let result = tokio::time::timeout( Duration::from_secs(2), @@ -533,6 +540,33 @@ async fn grep_post_search_link_observation_is_deadline_bounded_and_releases_perm Err(_) => panic!("grep must succeed once the link observation is unstalled"), }; let value = wip_to_json(&output.value).unwrap(); - assert_eq!(value["items"], json!([{"path": format!("{root}/a.txt")}])); + assert_eq!(value["items"], json!([{"entry": format!("{root}/a.txt")}])); assert_permit_released(&p); } + +#[tokio::test] +async fn checkout_content_children_never_call_provider_list_even_for_deep_paths() { + let dir = TempDir::new().unwrap(); + std::fs::create_dir_all(dir.path().join("nested/deep")).unwrap(); + for n in 0..1100 { + std::fs::write(dir.path().join(format!("file-{n}")), "fixture").unwrap(); + } + let session = HookedSession::new(&dir); + let router = Arc::new(WorkdirSessionRouter::new()); + router + .attach( + WorkdirAttachmentAlias::new("main").unwrap(), + session.clone(), + ) + .unwrap(); + let subtree = Arc::new(provider(router)); + assert_eq!( + subtree.children(ROOT).await.unwrap(), + vec![checkout_root("main")] + ); + for path in ["/checkouts/main", "/checkouts/main/nested/deep"] { + assert!(subtree.publication(path).await.unwrap().is_some()); + assert!(subtree.children(path).await.unwrap().is_empty()); + } + assert_eq!(session.searches.load(Ordering::SeqCst), 0); +} diff --git a/crates/worker/src/checkout_wip_tests.rs b/crates/worker/src/checkout_wip_tests.rs index 09b4c4df0..89972eefe 100644 --- a/crates/worker/src/checkout_wip_tests.rs +++ b/crates/worker/src/checkout_wip_tests.rs @@ -113,7 +113,7 @@ async fn checkout_wip_search_preserves_root_and_nested_ignore_rules_and_links() .as_array() .unwrap() .iter() - .map(|item| item["path"].as_str().unwrap().to_string()) + .map(|item| item["entry"].as_str().unwrap().to_string()) .collect::>(); // Grep retains traversal order; Glob sorts its result paths. paths.sort(); @@ -159,8 +159,8 @@ async fn checkout_wip_native_roundtrip_search_read_edit_write_create() { .await .unwrap(); let grep_result: Json = serde_json::from_str(grep.content.as_deref().unwrap()).unwrap(); - assert_eq!(grep_result["items"][0]["path"], file); - let followed = grep_result["items"][0]["path"].as_str().unwrap(); + assert_eq!(grep_result["items"][0]["entry"], file); + let followed = grep_result["items"][0]["entry"].as_str().unwrap(); assert_eq!(followed, file); assert!( call( @@ -588,8 +588,9 @@ async fn checkout_wip_scoped_child_search_and_revoke_cannot_expose_siblings() { .observe_live("/checkouts/child", 2) .await .unwrap(); - assert_eq!(observed.children.unwrap().len(), 1); + assert!(observed.children.unwrap().is_empty()); for (op, args) in [ + ("list", json!({"limit":1})), ("glob", json!({"pattern":"**/*"})), ( "grep", @@ -654,3 +655,339 @@ async fn checkout_wip_scoped_child_search_and_revoke_cannot_expose_siblings() { "changed" ); } + +pub(super) fn json_content(output: ToolOutput) -> Json { + serde_json::from_str(output.content.as_deref().unwrap()).unwrap() +} +pub(super) async fn model_operation( + r: Arc, + name: &str, + args: Json, +) -> Result { + let (_, tool) = wip_tool_definitions(r) + .into_iter() + .map(|definition| definition()) + .find(|(meta, _)| meta.name == name) + .unwrap(); + tool.execute(&args.to_string(), Default::default()).await +} +pub(super) async fn model_inspect(r: Arc, path: &str) -> Json { + json_content( + model_operation(r, "Inspect", json!({"path":path})) + .await + .unwrap(), + ) +} +pub(super) async fn model_invoke( + r: Arc, + inspected: &Json, + operation: &str, + arguments: Json, +) -> Result { + model_operation(r, "Invoke", json!({"path":inspected["path"], "interface":inspected["interfaces"][0]["reference"], "operation":operation, "arguments":arguments})).await +} + +#[tokio::test] +async fn checkout_depth_boundaries_are_independent_of_empty_small_or_large_contents() { + for count in [0, 2, 1100] { + let dir = TempDir::new().unwrap(); + std::fs::create_dir_all(dir.path().join("nested/deep")).unwrap(); + for n in 0..count { + std::fs::write(dir.path().join(format!("file-{n}")), "fixture").unwrap(); + } + let router = Arc::new(WorkdirSessionRouter::new()); + router + .attach( + WorkdirAttachmentAlias::new("main").unwrap(), + session(&dir, true), + ) + .unwrap(); + let r = runtime(router, None); + let one = r.host.observe_live("/checkouts", 1).await.unwrap(); + assert!(one.children.unwrap()[0].children.is_none()); + for depth in [2, 32] { + let observation = r.host.observe_live("/checkouts", depth).await.unwrap(); + let entrances = observation.children.unwrap(); + assert_eq!(entrances.len(), 1); + assert_eq!(entrances[0].children, Some(vec![])); + } + let world = r.host.observe_live("/", 32).await.unwrap(); + assert_eq!( + world.children.unwrap()[0].children.as_ref().unwrap()[0].children, + Some(vec![]) + ); + for path in ["/checkouts/main", "/checkouts/main/nested/deep"] { + assert!( + r.host + .observe_live(path, 0) + .await + .unwrap() + .children + .is_none() + ); + assert_eq!( + r.host.observe_live(path, 1).await.unwrap().children, + Some(vec![]) + ); + } + } +} + +#[tokio::test] +async fn checkout_model_list_glob_grep_entries_are_lazy_and_never_become_tree_edges() { + let dir = TempDir::new().unwrap(); + std::fs::create_dir_all(dir.path().join("empty")).unwrap(); + std::fs::create_dir_all(dir.path().join("nested/deep")).unwrap(); + std::fs::write(dir.path().join("nested/deep/a.txt"), "needle\n").unwrap(); + std::fs::write(dir.path().join("z.txt"), "needle\n").unwrap(); + let router = Arc::new(WorkdirSessionRouter::new()); + router + .attach( + WorkdirAttachmentAlias::new("main").unwrap(), + session(&dir, true), + ) + .unwrap(); + let r = Arc::new(runtime(router, None)); + let entrance = model_inspect(r.clone(), "/checkouts/main").await; + assert_eq!(entrance["path"], "/checkouts/main"); + assert_eq!( + entrance["interfaces"][0]["reference"]["scope"], + "/checkouts/main" + ); + let projection = r + .host + .projection_live("/checkouts/main") + .await + .unwrap() + .unwrap(); + assert_eq!( + entrance["object_signature"], + wip_text_view::render_object(&projection.object).unwrap() + ); + assert_eq!( + entrance["interfaces"][0]["signature"], + wip_text_view::render_interface(&wip_text_view::Interface { + reference: &projection.interface, + descriptor: &projection.descriptor + }) + .unwrap() + ); + assert!( + entrance["interfaces"][0]["signature"] + .as_str() + .unwrap() + .contains("entry") + ); + let mut after = None; + let mut items = vec![]; + loop { + let mut args = json!({"limit":1}); + if let Some(cursor) = after { + args["after"] = cursor; + } + let page = json_content( + model_invoke(r.clone(), &entrance, "list", args) + .await + .unwrap(), + ); + assert_eq!(page["items"].as_array().unwrap().len(), 1); + items.push(page["items"][0].clone()); + if page["truncated"] == false { + assert!(page.get("after").is_none()); + break; + } + after = Some(page["after"].clone()); + } + assert_eq!( + items + .iter() + .map(|item| item["entry"].clone()) + .collect::>(), + vec![ + json!("/checkouts/main/empty"), + json!("/checkouts/main/nested"), + json!("/checkouts/main/z.txt") + ] + ); + assert_eq!(items[0]["kind"], "directory"); + assert_eq!(items[2]["kind"], "file"); + let empty = model_inspect(r.clone(), items[0]["entry"].as_str().unwrap()).await; + assert_eq!( + json_content( + model_invoke(r.clone(), &empty, "list", json!({})) + .await + .unwrap() + )["items"], + json!([]) + ); + let deep = model_inspect(r.clone(), "/checkouts/main/nested/deep").await; + assert_eq!( + deep["interfaces"][0]["reference"]["scope"], + "/checkouts/main" + ); + for (operation, args) in [ + ("list", json!({})), + ("glob", json!({"pattern":"*.txt"})), + ( + "grep", + json!({"pattern":"needle", "output_mode":"files_with_matches"}), + ), + ] { + let found = json_content( + model_invoke(r.clone(), &deep, operation, args) + .await + .unwrap(), + ); + let path = found["items"][0]["entry"].as_str().unwrap(); + assert_eq!(path, "/checkouts/main/nested/deep/a.txt"); + // No result-wide eager acquisition by Host or Client. + if operation == "list" { + let state = r.state.lock().unwrap(); + assert!(state.client.object(&state.session, path).is_none()); + } + let inspected = model_inspect(r.clone(), path).await; + let read = json_content( + model_invoke(r.clone(), &inspected, "read", json!({})) + .await + .unwrap(), + ); + assert!(read["content"].as_str().unwrap().contains("needle")); + } + let tree = json_content( + model_operation(r.clone(), "Tree", json!({"path":"/checkouts", "depth":8})) + .await + .unwrap(), + ); + assert_eq!(tree["tree"]["children"][0]["children"], json!([])); + std::fs::remove_file(dir.path().join("nested/deep/a.txt")).unwrap(); + assert!( + model_operation( + r, + "Inspect", + json!({"path":"/checkouts/main/nested/deep/a.txt", "refresh":true}) + ) + .await + .is_err() + ); +} + +#[tokio::test] +async fn checkout_list_permission_cannot_be_bypassed_with_glob_or_command_identity() { + let dir = TempDir::new().unwrap(); + std::fs::write(dir.path().join("a.txt"), "fixture").unwrap(); + let router = Arc::new(WorkdirSessionRouter::new()); + router + .attach( + WorkdirAttachmentAlias::new("main").unwrap(), + session(&dir, true), + ) + .unwrap(); + let r = runtime( + router, + Some(ToolPermissionConfig { + default_action: ToolPermissionAction::Allow, + rules: vec![manifest::ToolPermissionRule { + tool: "List".into(), + pattern: "*".into(), + action: ToolPermissionAction::Deny, + }], + }), + ); + let p = r + .host + .projection_live("/checkouts/main") + .await + .unwrap() + .unwrap(); + assert!(!p.descriptor.operations.iter().any(|op| op.name == "list")); + assert!(p.descriptor.operations.iter().any(|op| op.name == "glob")); + let denied = p + .handler + .call( + "list", + &BTreeMap::new(), + WipCallContext { + execution: Default::default(), + security_context: "fixture".into(), + }, + ) + .await; + assert!( + matches!(denied, Err(WipOperationError::Protocol(e)) if e.code == ProtocolErrorCode::PermissionDenied) + ); +} + +#[tokio::test] +async fn checkout_ancestor_scope_rejects_siblings_prefixes_refs_and_old_connection_before_read() { + let dir = TempDir::new().unwrap(); + std::fs::write(dir.path().join("a.txt"), "same\n").unwrap(); + let router = Arc::new(WorkdirSessionRouter::new()); + let main = WorkdirAttachmentAlias::new("main").unwrap(); + router.attach(main.clone(), session(&dir, true)).unwrap(); + router + .attach( + WorkdirAttachmentAlias::new("main-extra").unwrap(), + session(&dir, true), + ) + .unwrap(); + let r = runtime(router.clone(), None); + let path = "/checkouts/main/a.txt"; + let p = r.host.projection_live(path).await.unwrap().unwrap(); + let fetched = r.host.fetch_interface_live(&p.interface).await.unwrap(); + assert!( + fetched.scope_ref.is_none(), + "ref-less publication is legitimate" + ); + // Ordinary content changes do not terminate the entrance's Interface lifetime. + std::fs::write(dir.path().join("new.txt"), "fixture").unwrap(); + assert_eq!( + r.host + .fetch_interface_live(&p.interface) + .await + .unwrap() + .interface, + p.interface + ); + let request = |reference, scope_ref| CallOperationRequest { + target: wip_protocol::Target { + path: path.into(), + validator: None, + }, + interface: wip_protocol::InterfaceTarget { + reference, + scope_ref, + validator: None, + }, + operation: "read".into(), + arguments: BTreeMap::new(), + }; + for scope in ["/checkouts/main-extra", "/checkouts/main/a"] { + let mut wrong = p.interface.clone(); + wrong.scope = scope.into(); + assert!(r.host.fetch_interface_live(&wrong).await.is_err()); + let forged = request(wrong, None); + let result = r + .host + .call( + forged, + WipCallContext { + execution: Default::default(), + security_context: "fixture".into(), + }, + ) + .await; + assert!( + matches!(result,Err(WipOperationError::Protocol(e)) if e.code == ProtocolErrorCode::InterfaceMismatch) + ); + } + let forged = request(p.interface.clone(), Some("old".into())); + assert!( + matches!(r.host.call(forged, WipCallContext { execution:Default::default(),security_context:"fixture".into() }).await, Err(WipOperationError::Protocol(e)) if e.code == ProtocolErrorCode::InterfaceMismatch) + ); + router.detach(&main).await.unwrap(); + router.attach(main, session(&dir, true)).unwrap(); + let forged = request(p.interface.clone(), None); + assert!( + matches!(r.host.call(forged, WipCallContext { execution:Default::default(),security_context:"fixture".into() }).await, Err(WipOperationError::Protocol(e)) if e.code == ProtocolErrorCode::InterfaceMismatch) + ); +} diff --git a/crates/worker/src/fs_view.rs b/crates/worker/src/fs_view.rs index e9230c00b..5508718c2 100644 --- a/crates/worker/src/fs_view.rs +++ b/crates/worker/src/fs_view.rs @@ -143,6 +143,7 @@ impl WorkerFsView { .list(ListRequest { path: logical.clone(), limit: DIR_FILE_REF_ENTRY_LIMIT, + after: None, }) .await .map_err(ToolsError::from) @@ -222,6 +223,7 @@ impl WorkerFsView { .list(ListRequest { path: parent, limit: COMPLETION_LIMIT, + after: None, }) .await else { diff --git a/crates/workspace-server/src/server.rs b/crates/workspace-server/src/server.rs index e3a574509..12fb280e0 100644 --- a/crates/workspace-server/src/server.rs +++ b/crates/workspace-server/src/server.rs @@ -54114,6 +54114,7 @@ mod tests { WorkdirSessionOperation::List(workdir::ListRequest { path: workdir::WorkdirPath::root(), limit: 10, + after: None, }), ) .await diff --git a/docs/design/checkout-wip-projection.md b/docs/design/checkout-wip-projection.md index 203a9101e..51e28bfda 100644 --- a/docs/design/checkout-wip-projection.md +++ b/docs/design/checkout-wip-projection.md @@ -14,9 +14,11 @@ is created. ├── workdirs identity/lifecycle ├── workdir-attachments Backend connection lifetimes └── checkouts current accessible content entrances; list - └── directory; glob, grep, create_file - ├── README.md file; read, edit, write - └── src directory; glob, grep, create_file + └── directory; list, glob, grep, create_file + +# Not indexable; resolve known paths directly or discover via Operations: +/checkouts//README.md file; read, edit, write +/checkouts//src directory; list, glob, grep, create_file ``` Operations are Interface declarations, not children or `/features/...` routes. @@ -42,7 +44,7 @@ validates every resolved projection's path/owner/descriptor and every enumerated child's immediate-parent relationship. Static and dynamic/subtree overlaps are rejected. Observe resolves only the requested depth; successful observations are complete through that depth, not partial trees masked as success. Directory -listing and native search use the shared List/Glob/Grep engines through typed +listing Operations and native search use the shared List/Glob/Grep engines through typed `CheckoutSearchRequest` forwarding. Scoped sessions append intersecting rule layers, translate their cwd, and require provider-side visibility checks before entry descent/content reads. Results retain session-logical coordinates, so a @@ -51,6 +53,21 @@ providers fail closed rather than falling back to a broader source search. Direct resolution also uses current provider authority, not possession of a cached Interface. +## Indexable boundary (T-714) + +Only `/checkouts` and accessible immediate attachment entrances are indexable. +No directory content List runs during tree/observe, even at deep depth or when a +known deep directory is the observation root. Empty, small and large directories +all have the same boundary. Positive-depth content observations return +`children: []` (no **indexable** children), not an omitted field and not +an assertion that the directory is empty. At depth zero children are omitted; +`observe("/checkouts", 1)` omits entrance children, depth 2 returns [] there. +The Client retains discovered/inspected paths without adding indexable edges. + +Known authorized paths remain directly resolvable and operable. Use List/Glob/Grep +for discovery, then Inspect only selected entry coordinates; no successful search +is undone when an entry disappears before Inspect. Bash/COMMAND is unnecessary. + ## Names and connection isolation Aliases use T-697's canonical encoding: nonempty ASCII letters/digits/`-`/`_` are @@ -66,18 +83,27 @@ existence alone does not expose its content. Following a reference still require current scope/capability and an accessible filesystem projection. Objects have no shared inode `ref`: hard-linked names and different attachments -must not be mistaken for one path-independent representation. Interface references -are opaque, path-qualified and include a fresh projection incarnation and live -attachment generation. Validators combine that namespace with the provider's +must not be mistaken for one path-independent representation. Interface +references are structured `(scope, name)`. Each entrance is its own +scope; content Interfaces use that entrance as ancestor scope, irrespective of +indexability. Local names bind target coordinates, projection incarnation and +live attachment generation. The provider's target-qualified-name routing hint +only selects a target; fetch re-resolves one coherent current publication and +checks the exact Interface, Descriptor, validator and scope under the pinned +router connection. It never turns a cached registration or name into authority. +Validators combine that namespace with the provider's opaque identity/state validator. Restoring a Worker creates a fresh incarnation; detach/alias reuse changes the router generation. An old Interface, validator or read-history entry cannot retarget a new connection. No separate connection ledger is added. The existing router's active-operation exclusion and begin/finish/cancel detach paths remain authoritative; detach does not remove the Workdir/files. Collection enumeration rejects connection-set changes between sampling and -publication instead of pairing old items with a new validator. Search-link -publication checks the captured attachment generation, not merely a reused -alias; response-side provider awaits are covered by the operation deadline. +publication instead of pairing old items with a new validator. Result publication +checks the captured attachment generation, not merely a +reused alias. It maps typed provider paths without observing/statting every +result. Provider awaits are covered by the operation deadline. Objects publish +no scope_ref here; legitimate ref-less binding still checks membership, +validators, current provider authority and attachment generation. ## AI Operation mapping @@ -89,15 +115,20 @@ below are relative to the **bound directory**, not the Worldspace or endpoint. | Object | Operation | Arguments | Result | | --- | --- | --- | --- | | `/checkouts` | `list` | none | bounded `items` containing alias/slug/Workdir/generation/path | -| directory | `glob` | `pattern`, optional `path` | normal bounded Glob text/summary plus same-checkout Object links | -| directory | `grep` | `pattern`; optional `path`, `glob`, `type`, `case_insensitive`, `-A`, `-B`, `-C`, `multiline`, `output_mode`, `head_limit`, `offset` | normal Grep grouped/context/count text and typed provider search targets mapped to Object links | +| directory | `list` | optional `limit` (default 100, 1..1000), `after` (returned `{kind, entry}`) | direct-content records `{kind, size, entry}`, `truncated`, optional `after` | +| directory | `glob` | `pattern`, optional `path` | normal bounded Glob text/summary plus Descriptor-typed same-checkout `entry` coordinates | +| directory | `grep` | `pattern`; optional `path`, `glob`, `type`, `case_insensitive`, `-A`, `-B`, `-C`, `multiline`, `output_mode`, `head_limit`, `offset` | normal Grep grouped/context/count text and typed provider search targets mapped to Descriptor-typed `entry` coordinates | | file | `read` | optional line `offset`, `limit` | line-numbered text and normal Read summary | | file | `edit` | `old_string`, `new_string`, optional `replace_all` | replacement count/summary and preview | | file | `write` | `content` | existing-file save summary; never creation | | directory | `create_file` | `path`, `content` | create-new summary and created-file link; permitted missing parents are created | -Native operation results use a JSON record with `summary`, nullable `content` and -`items` (`path` is an absolute WIP Object navigation coordinate, not an OS path). +Native operation results declare a typed record with `summary`, optional `content` +and `items`. Each item contains `entry: entry` in its Descriptor (an absolute +Worldspace coordinate, encoded as a string in WIP Value), never a guessed ordinary +string or an OS path. List additionally declares `kind`, byte `size`, `truncated` +and optional `after: {kind: string, entry: entry}`. File operations have empty +items except Create, which returns the new coordinate. Search links are constructed from **typed provider paths**, not by parsing Grep's rendered filenames/line delimiters. Provider scope remains authoritative for search output as well as links. Glob/Grep share normal provider ignore/pattern, @@ -129,12 +160,47 @@ must not record history; successful mutations update hash/change statistics only after provider success. Create is strictly beneath the bound parent, creates only an absent file, and must not overwrite an existing destination or symlink. -Manifest permission identities remain Read/Edit/Write/Glob/Grep; create_file uses -Write. The Host reconstructs the same route-bound input for policy evaluation; +Manifest permission identities are Read/Edit/Write/Glob/Grep plus **List** for +native directory listing; create_file uses Write. List publication uses provider +Read capability and potential List allow policy; execution reconstructs the bound +directory's logical path for the exact List policy. Allowing Glob or COMMAND does +not override a List deny/ask rule, and Interface scope validity grants no file +access. Normal Tools mode is unchanged (no new top-level List tool). The Host reconstructs the same route-bound input for policy evaluation; provider read/write scope, capabilities and delegated leases are checked again. `ask` fails closed. Native replacement claims remove `/tools/Read`, `/tools/Edit`, `/tools/Write`, `/tools/Glob`, `/tools/Grep`, not unrelated Tools. +## Directory List pagination + +List uses the existing provider List engine, **not** glob("*") or shell ls. It +includes direct visible empty directories, hidden and ignored names: unlike +Glob/Grep, provider List does not apply search ignore files. Existing Read scope, +readability and can_enumerate_directory checks still gate names; no ancestor or +nonrecursive enumeration permission is inferred from a known descendant. + +Order is directories first, then lexical canonical provider path, with every +other kind in the second group. after is the last returned exclusive ordering +key, rebased to a canonical Worldspace entry by the Host. Pass the returned record +unchanged to continue on the same directory; a foreign checkout, non-direct child, +absolute provider path or unknown field is rejected. No cursor stat is required: +the key may have disappeared. This is **live pagination, not a snapshot**. New +keys before the cursor are not revisited; later keys may appear, removals vanish, +and renames/kind changes may omit or repeat an entry. Directory validators fence +each call, not all pages; refresh Inspect after a stale rejection before issuing +a new explicit call. Detach/reuse expires the old Interface and validator. + +Each page scans the live directory under provider cancellation/deadline and the +existing traversal-entry ceiling, retaining at most limit+1 ordering candidates +and the aggregate path-byte budget. It never retains the whole unbounded listing. +The next ordering key is explicit whenever truncated; no next key means complete. +Provider resource failures stay explicit failures, not silent truncation or retries. + +UTF-8 canonical names are retained verbatim; unrepresentable names are skipped by +the existing provider. Native List may reject visible symlinks under the checked +provider's no-follow policy. If a provider returns symlink/other kinds they remain +classified path coordinates, not a promise of inspectable/operable Objects: +direct checkout resolution only publishes authorized regular files/directories. + ## Consistency, safety and resource policy The provider resolves/pins the entry/parent, compares its opaque validator and @@ -172,7 +238,7 @@ rediscover/reread. Do not report partially created parents as unchanged. Host observations are bounded to depth 32 and 1024 nodes with a 30-second total cooperative deadline. The checkout adapter permits at most 16 concurrent requests -and bounds admission waiting and the complete operation (including result-link +and bounds admission waiting and the complete operation (including bounded result publication) to 30 seconds each; provider path/depth, source/response, mutation/search and transport bounds apply too. No initial context expands an entire tree. Resource-limit errors do not turn incomplete observation into a @@ -182,8 +248,9 @@ truncation under the existing search contract. ## Typical sequence 1. Use Tree on `/checkouts` with depth 1; Inspect `/checkouts` directly and Invoke `list`. -2. Inspect an entrance or a known deep directory directly; Invoke `glob`/`grep`. -3. Follow a returned file `path`, Inspect that path and Invoke line `read`. +2. Inspect an entrance or known deep directory directly; Invoke `list`/`glob`/`grep`. + For List, pass returned `after` with the next limit to obtain another live page. +3. Follow a returned file `entry`, Inspect that path and Invoke line `read`. 4. Call `edit` or `write`; Client-managed validators protect the exact observed object while the shared tracker enforces the prior Read. 5. Rediscover after external changes; a stale rejection is not permission to skip @@ -203,9 +270,14 @@ outside this feature. Run from the main repository, on Linux with `openat2` and `/proc/self/fd`: ```sh -cargo check --workspace --all-targets +cargo test -p worker --lib checkout_wip +cargo test -p workdir --test list_pagination +cargo check cargo test -p fs-operation -p workdir -p tools -p worker -cargo test -p worker-runtime -p yoi-workspace-server +# Workdir External/HTTP features and dependent server fixture: +cargo test -p workdir --features http-client +cargo test -p yoi-workspace-server --lib backend_workdir_session_proxy_executes_typed_operations +node scripts/verify-wip-dependencies.mjs cargo fmt --all -- --check git diff --check ``` diff --git a/docs/development/wip-integration-validation.md b/docs/development/wip-integration-validation.md index 577ca28e7..5dfb7ce5e 100644 --- a/docs/development/wip-integration-validation.md +++ b/docs/development/wip-integration-validation.md @@ -115,10 +115,76 @@ permission identity and ToolOutput/attachments. - `WipMountRegistry::mount_interface` adds a separate static Interface namespace without replacing Object ownership or flattening same-named operations. It does not overlay stale registration metadata onto a live subtree provider. -- FS indexable boundaries and directory.list remain provider policy. This change - deliberately does not implement the separate T-714 boundary/list migration. - Relevant transport/commit tests are `checkout_wip_tests.rs`, - `checkout_http_tests.rs`, and `checkout_race_tests.rs`. +- FS indexable boundaries and directory.list are provider policy. T-714 now + implements entrance-only trees and bounded typed discovery (details below). + Transport/commit tests are `checkout_wip_tests.rs`, `checkout_http_tests.rs`, + and `checkout_race_tests.rs`. - Worldspace state is runtime-only. Historical opaque references in append-only session/tool history are not migrated into cache or parsed for a guessed scope; a restored Client starts with fresh observations and direct path Inspect. + +## T-714 checkout discovery validation + +Based on integrated T-713 at `f9d4c97f`, still using the exact released crates.io +0.2.0 SDK and official renderer. No alternate wire, renderer or upstream version +was introduced. The checkout projection design documents provider live pagination, +its ordering/cursor/byte ceilings, special-entry policy and the distinction between +indexable emptiness and empty filesystem directories. + +Focused regressions: + +```sh +cargo test -p worker --lib checkout_wip +cargo test -p worker --lib checkout::race_tests +cargo test -p worker --lib checkout_http_tests +cargo test -p worker --lib ancestor_tests +cargo test -p tools --lib checkout_list +cargo test -p fs-operation --test list_pagination +cargo test -p workdir --test list_pagination +``` + +Host depth-zero omission / positive-depth `children: []`, empty/small/1100-entry +folders, direct deep roots and zero provider content-List calls during observation +are tested independently of Client output. Registered model tools exercise entrance +self-scope and deep target ancestor-scope, paginated List/Glob/Grep typed entries, +lazy selected Inspect with official signatures/path context, and Read without +COMMAND. Acquired paths never become tree edges; a stalled result observation is +never awaited and disappearance only fails a later explicit Inspect. Remote HTTP +checks verify List continuation on the wire with no ordinary List fallback or +response credentials/host-path leakage. Provider tests cover scoped External and +nested cwd/output_root rebasing, nonrecursive enumeration/read authority, ignore +policy, live mutations, byte bounds, cancellation and malicious cursor/result DTOs. + +`WipSubtreeProvider::interface_target` is a routing hint for target-qualified local +names under ancestor scopes. The default retains self/shared-scope behavior. Host +checks provider ownership and resolves **one** coherent current target/scope +publication; it never treats the hint as authorization or fetches a scope in an +independent mutable lookup. Focused Host tests reject forged/outside/prefix/missing +hints, ref-less deletion and absent membership while preserving existing ancestor +ref/validator and in-flight snapshots. Actual checkout tests reject sibling/prefix +scopes, supplied refs when current publication has none and stale alias generations; +ordinary content updates do not terminate the entrance Interface lifetime. + +Completion validation: + +- Root `cargo check` passed. +- `cargo test -p fs-operation -p workdir -p tools -p worker` passed: FS **58 unit + + 6 pagination**; Workdir **125 unit + 5 pagination**; Tools **84 unit + 39 + integration + 1 doctest**; Worker **901 unit + 110 integration**. +- `cargo test -p workdir --features http-client` passed (**125 + 5**). +- `cargo test -p yoi-workspace-server` passed (**691 unit + 11 CLI**). +- `cargo test -p server-api` passed (**83**, including checked-in OpenAPI/TypeScript + freshness). No generated API artifact changes were needed. +- `node scripts/verify-wip-dependencies.mjs` confirmed one crates.io 0.2.0 Protocol + source and all four exact SDK packages. `cargo fmt --all -- --check` and + `git diff --check HEAD` passed. + +The first dependent Server test build exposed predecessor fixtures still using +removed `discover`/opaque strings/private `call`. Those tests now select structured +references from actual path Inspect and use public Tree/Inspect/Invoke; the complete +Server suite above includes configuration integration and the typed Workdir proxy. +Its dev-only Protocol dependency reuses the same locked SDK source; the resolved +package/version set is unchanged. + +No full workspace test, full Nix/image build, deployment, target integration or +live dogfood update is claimed. Target movement remains Orchestrator authority. diff --git a/docs/report/t-714-ticket-read-auth-blocker.md b/docs/report/t-714-ticket-read-auth-blocker.md new file mode 100644 index 000000000..9c9bc0062 --- /dev/null +++ b/docs/report/t-714-ticket-read-auth-blocker.md @@ -0,0 +1,29 @@ +# T-714: Ticket authority read rejected after implementation validation + +## Observed boundary + +On the continuation turn, `ShowTicket({ id: "T-714", event_limit: 5 })` +returned `Workspace Ticket API request failed with HTTP status 401`. +The same assigned Coder session had successfully read the Ticket and recorded +one shared-seam coordination decision earlier. This report does not diagnose +whether the rejection is authentication expiry, capability invalidation, or +another Backend condition. + +## Consequence + +The local checkout implementation and validation were complete. Git retained the +assigned `work/t-714-checkout-discovery` branch and all changes; coherent local +commits were authorized by the user. Publication/MR creation and review were +paused because a fresh authoritative Ticket/MR read could not be obtained. +No alternate actor, CLI, Backend storage access or replacement control-plane +path was attempted. No target integration or live dogfood update occurred. + +## Improvement / recovery + +Provide an actionable typed error distinction between authentication failure and +capability rejection, and a host-owned way to restore valid transport authority +without changing actor identity or bypassing the rejected capability. After that, +reread the Ticket and any linked MR, normally publish only its original source +selector, verify exact provider HEAD, and request an independently bound review. +The local implementation/validation evidence is in commits and +`docs/development/wip-integration-validation.md`; no approval is claimed here. From 717ff2555f06075814fe8abd9414e689bad684ad Mon Sep 17 00:00:00 2001 From: Hare Date: Fri, 9 Oct 2026 02:47:56 +0900 Subject: [PATCH 04/11] fix: migrate server config test helpers to WIP object API T-729 validation prerequisite approved in Ticket seq7. Preserve Backend authority, attachment, mutation, stale observation and unknown-outcome assertions using public Tree, path-centered Inspect and structured InterfaceReference Invoke. No production API expansion. Validation: cargo test -p yoi-workspace-server --lib workspace_config_integration (12 passed); git diff --check HEAD. --- Cargo.lock | 1 + crates/workspace-server/Cargo.toml | 1 + .../src/server_workspace_config_wip_tests.rs | 72 ++++++++++--------- 3 files changed, 40 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 649153ef5..f64b67e06 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6766,6 +6766,7 @@ dependencies = [ "uuid", "webauthn-authenticator-rs", "webauthn-rs", + "wip-protocol", "workdir", "worker", "worker-runtime", diff --git a/crates/workspace-server/Cargo.toml b/crates/workspace-server/Cargo.toml index 1f5f4f66a..7b50a34cf 100644 --- a/crates/workspace-server/Cargo.toml +++ b/crates/workspace-server/Cargo.toml @@ -56,6 +56,7 @@ zeroize.workspace = true webauthn-rs = { workspace = true } [dev-dependencies] +wip-protocol.workspace = true agen.workspace = true tempfile.workspace = true tools.workspace = true diff --git a/crates/workspace-server/src/server_workspace_config_wip_tests.rs b/crates/workspace-server/src/server_workspace_config_wip_tests.rs index c0df1d1a5..d2afdb7e7 100644 --- a/crates/workspace-server/src/server_workspace_config_wip_tests.rs +++ b/crates/workspace-server/src/server_workspace_config_wip_tests.rs @@ -139,26 +139,34 @@ impl worker::WorkspaceClient for ConfigRouterClient { Ok(response) } } -fn config_interface(path: &str) -> String { - // Use the published contextual interface identity, not a model-managed validator. - let hex = path - .bytes() - .map(|byte| format!("{byte:02x}")) - .collect::(); - format!("yoi.workspace-config/node/v1/@/{hex}") +fn config_interface(path: &str) -> Value { + // Exact contextual reference published by the current config Object. + json!({"scope": path, "name": "yoi.workspace-config/node/v1"}) } async fn config_discover(runtime: &worker::wip::WipRuntime, path: &str) { - let observed = runtime - .discover(path.into(), 0, true) - .await - .unwrap() - .content - .unwrap(); + inspect_published_interface(runtime, path, &config_interface(path)).await; +} +async fn inspect_published_interface( + runtime: &worker::wip::WipRuntime, + path: &str, + expected: &Value, +) { + let tree = runtime.tree(path.into(), 0, true).await.unwrap(); + let tree: Value = serde_json::from_str(tree.content.as_deref().unwrap()).unwrap(); + assert_eq!( + tree["path"], path, + "Object must come from live Tree: {tree}" + ); + let inspected = runtime.inspect(path.into(), true).await.unwrap(); + let inspected: Value = serde_json::from_str(inspected.content.as_deref().unwrap()).unwrap(); assert!( - observed.contains(&config_interface(path)), - "interface must come from live discovery: {observed}" + inspected["interfaces"] + .as_array() + .unwrap() + .iter() + .any(|interface| &interface["reference"] == expected), + "interface must come from live path-centered Inspect: {inspected}" ); - runtime.inspect(config_interface(path), true).await.unwrap(); } async fn config_call( runtime: &worker::wip::WipRuntime, @@ -167,9 +175,12 @@ async fn config_call( args: Value, ) -> std::result::Result { runtime - .call( + .invoke( path.into(), - config_interface(path), + wip_protocol::InterfaceReference { + scope: path.into(), + name: "yoi.workspace-config/node/v1".into(), + }, operation.into(), args, agen::tool::ToolExecutionContext::direct(), @@ -183,23 +194,16 @@ async fn catalog_call( base: &str, operation: &str, ) -> Value { - let hex = path - .bytes() - .map(|byte| format!("{byte:02x}")) - .collect::(); - let interface = format!("{base}/@/{hex}"); - let discovered = runtime - .discover(path.into(), 0, true) - .await - .unwrap() - .content - .unwrap(); - assert!(discovered.contains(&interface), "{discovered}"); - runtime.inspect(interface.clone(), true).await.unwrap(); + // Live catalog publication contextualizes the Interface to this Object. + let reference = json!({"scope": path, "name": base}); + inspect_published_interface(runtime, path, &reference).await; let output = runtime - .call( + .invoke( path.into(), - interface, + wip_protocol::InterfaceReference { + scope: path.into(), + name: base.into(), + }, operation.into(), json!({}), agen::tool::ToolExecutionContext::direct(), @@ -635,7 +639,7 @@ async fn assert_config_production_http_adapter( assert_config_catalog(&wip, &attached).await; config_discover(&wip, "/workspace-config/main.dcdl").await; let main_interface = wip - .inspect(config_interface("/workspace-config/main.dcdl"), true) + .inspect("/workspace-config/main.dcdl".into(), true) .await .unwrap() .content From 5244308c0d1a1a4c747583c4b6644de4708a8aff Mon Sep 17 00:00:00 2001 From: Hare Date: Fri, 9 Oct 2026 02:51:22 +0900 Subject: [PATCH 05/11] feat(ticket): align Web actions and instructions with intent-led work --- crates/builtin-source/src/lib.rs | 6 +- crates/client/src/backend_runtime.rs | 2 +- crates/client/src/workspace_product.rs | 4 +- crates/flow/src/builtin.rs | 4 +- crates/server-api/src/lib.rs | 4 +- crates/tui/src/backend_spawn.rs | 25 +- .../src/feature/builtin/manage_worker.rs | 28 +- .../src/feature/builtin/merge_request.rs | 7 +- .../src/feature/builtin/orchestration.rs | 70 +++- crates/worker/src/feature/builtin/ticket.rs | 30 +- crates/worker/src/prompt/catalog.rs | 3 +- crates/worker/src/prompt/system.rs | 148 ++++++++ crates/workspace-server/src/server.rs | 13 +- docs/development/work-items.md | 267 +++------------ openapi/server-api.json | 9 +- resources/flows/coder-review.dcdl | 6 +- resources/profiles/coder.dcdl | 2 +- resources/profiles/orchestrator.dcdl | 2 +- resources/profiles/ticket-worker.dcdl | 2 +- resources/prompts/common/merge-request.md | 8 +- resources/prompts/common/tickets.md | 12 +- resources/prompts/role/coder.md | 6 +- resources/prompts/role/orchestrator.md | 18 +- resources/prompts/role/reviewer.md | 2 + resources/prompts/role/ticket-worker.md | 2 +- .../memory_document_fixture_server.ts | 2 +- .../browser-tests/ticket_fixture_server.ts | 319 ++++++++++++++++++ .../web-ux/browser-tests/ticket_shell_test.ts | 258 ++++++++++++++ tools/web-ux/deno.json | 2 +- tools/web-ux/scenarios/tickets-dark.json | 202 +++++++++++ tools/web-ux/scenarios/tickets.json | 202 +++++++++++ tools/web-ux/src/processes.ts | 2 +- web/workspace/deno.json | 2 +- .../src/lib/generated/companion-api.ts | 2 +- .../src/lib/generated/repository-api.ts | 2 +- .../src/lib/generated/runtime-api.ts | 2 +- web/workspace/src/lib/generated/ticket-api.ts | 2 +- .../src/lib/generated/workdir-api.ts | 2 +- .../src/lib/generated/worker-launch-api.ts | 4 +- .../lib/workspace/api/ticket-browser.test.ts | 4 +- .../src/lib/workspace/api/ticket-browser.ts | 20 +- .../src/lib/workspace/api/workers.test.ts | 2 +- .../src/lib/workspace/api/workers.ts | 8 +- .../console/worker-console.ui.test.ts | 4 +- .../workspace/home/dashboard.test-fixtures.ts | 4 +- .../src/lib/workspace/home/dashboard.ts | 6 +- .../sidebar/worker-launch.test-fixtures.ts | 6 +- .../workspace/sidebar/worker-launch.test.ts | 70 ++-- .../lib/workspace/sidebar/worker-launch.ts | 126 +++---- .../src/lib/workspace/styles/tickets.css | 15 +- .../workspace/tickets/ticket-panel.test.ts | 122 +++---- .../src/lib/workspace/tickets/ticket-panel.ts | 27 +- .../workspace/workers/worker-launch.test.ts | 186 ++++++++++ .../w/[workspaceId]/tickets/+page.svelte | 12 +- .../tickets/[ticketId]/+page.svelte | 200 ++++++----- .../w/[workspaceId]/workers/new/+page.svelte | 141 ++++---- .../w/[workspaceId]/workers/new/+page.ts | 7 +- .../new/empty-workspace.browser.spec.ts | 165 ++++++++- .../empty-workspace.browser.test.ts | 14 +- 59 files changed, 2077 insertions(+), 745 deletions(-) create mode 100644 tools/web-ux/browser-tests/ticket_fixture_server.ts create mode 100644 tools/web-ux/browser-tests/ticket_shell_test.ts create mode 100644 tools/web-ux/scenarios/tickets-dark.json create mode 100644 tools/web-ux/scenarios/tickets.json create mode 100644 web/workspace/src/lib/workspace/workers/worker-launch.test.ts diff --git a/crates/builtin-source/src/lib.rs b/crates/builtin-source/src/lib.rs index f85eaef3d..3165a50d6 100644 --- a/crates/builtin-source/src/lib.rs +++ b/crates/builtin-source/src/lib.rs @@ -79,7 +79,7 @@ pub const BUILTIN_PROFILE_RESOURCES: &[BuiltinProfileResource] = &[ selector: Some("builtin:ticket-worker"), path: "profiles/ticket-worker.dcdl", source: include_str!("../../../resources/profiles/ticket-worker.dcdl"), - description: "General Ticket work with typed progress and completion tools.", + description: "General intent-led Ticket work with optional result recording and authorized conclusion decisions.", imports: &[BuiltinProfileImport { specifier: "./default.dcdl", resolved_path: DEFAULT_PATH, @@ -89,7 +89,7 @@ pub const BUILTIN_PROFILE_RESOURCES: &[BuiltinProfileResource] = &[ selector: Some("builtin:coder"), path: "profiles/coder.dcdl", source: include_str!("../../../resources/profiles/coder.dcdl"), - description: "Ticket implementation with direct Reviewer SubWorkers.", + description: "Code implementation with optional Git/MR review recipe; no universal Ticket conclusion gate.", imports: BASE_IMPORT, }, BuiltinProfileResource { @@ -117,7 +117,7 @@ pub const BUILTIN_PROFILE_RESOURCES: &[BuiltinProfileResource] = &[ selector: Some("builtin:orchestrator"), path: "profiles/orchestrator.dcdl", source: include_str!("../../../resources/profiles/orchestrator.dcdl"), - description: "Workspace orchestration and Worker control.", + description: "Intent-led Ticket orchestration with separate guarded MR integration authority.", imports: BASE_IMPORT, }, BuiltinProfileResource { diff --git a/crates/client/src/backend_runtime.rs b/crates/client/src/backend_runtime.rs index 00feb7b74..4f0c0f96c 100644 --- a/crates/client/src/backend_runtime.rs +++ b/crates/client/src/backend_runtime.rs @@ -823,7 +823,7 @@ mod tests { "display_name": "Embedded", "built_in": true, "worker_creation_available": true, - "working_directory_required": false, + "supports_workdir_attachments": false, "status": "online", "diagnostics": [] }], diff --git a/crates/client/src/workspace_product.rs b/crates/client/src/workspace_product.rs index 773d3e505..2d58cb741 100644 --- a/crates/client/src/workspace_product.rs +++ b/crates/client/src/workspace_product.rs @@ -549,7 +549,7 @@ impl BackendWorkspaceProductClient { let runtime = options .runtimes .iter() - .find(|runtime| runtime.worker_creation_available && !runtime.working_directory_required) + .find(|runtime| runtime.worker_creation_available) .ok_or_else(|| { BackendWorkspaceClientError::InvalidTarget( "Backend has no spawn-capable Runtime that supports a Workdir-less Intake Worker" @@ -1340,7 +1340,7 @@ mod tests { let (base_url, requests, handle) = response_sequence_server(vec![ ( "200 OK", - r#"{"workspace_id":"workspace-a","runtimes":[{"runtime_id":"embedded","display_name":"Embedded","built_in":true,"worker_creation_available":true,"working_directory_required":false,"status":"connected","diagnostics":[]}],"default_profile":null,"profiles":[],"repositories":[],"working_directories":[],"diagnostics":[]}"#, + r#"{"workspace_id":"workspace-a","runtimes":[{"runtime_id":"embedded","display_name":"Embedded","built_in":true,"worker_creation_available":true,"supports_workdir_attachments":false,"status":"connected","diagnostics":[]}],"default_profile":null,"profiles":[],"repositories":[],"working_directories":[],"diagnostics":[]}"#, ), ( "200 OK", diff --git a/crates/flow/src/builtin.rs b/crates/flow/src/builtin.rs index 270f9d8ff..44091b75b 100644 --- a/crates/flow/src/builtin.rs +++ b/crates/flow/src/builtin.rs @@ -24,7 +24,7 @@ pub fn builtin_flow_source(slug: &str) -> Option { match slug { CODER_REVIEW_FLOW_SLUG => Some(BuiltinFlowSource { slug: CODER_REVIEW_FLOW_SLUG, - revision: 4, + revision: 5, path: "builtin/flows/coder-review.dcdl", content: CODER_REVIEW_FLOW_SOURCE, }), @@ -35,7 +35,7 @@ pub fn builtin_flow_source(slug: &str) -> Option { pub fn builtin_flow_sources() -> &'static [BuiltinFlowSource] { const SOURCES: &[BuiltinFlowSource] = &[BuiltinFlowSource { slug: CODER_REVIEW_FLOW_SLUG, - revision: 4, + revision: 5, path: "builtin/flows/coder-review.dcdl", content: CODER_REVIEW_FLOW_SOURCE, }]; diff --git a/crates/server-api/src/lib.rs b/crates/server-api/src/lib.rs index a1f4fefcc..80bed39ba 100644 --- a/crates/server-api/src/lib.rs +++ b/crates/server-api/src/lib.rs @@ -9744,7 +9744,9 @@ pub struct WorkerLaunchRuntimeOption { pub display_name: String, pub built_in: bool, pub worker_creation_available: bool, - pub working_directory_required: bool, + /// Whether this Runtime supports explicitly selected Workdir attachments. + /// Workdirs are optional for generic launches; embedded Runtime does not support them. + pub supports_workdir_attachments: bool, pub status: String, pub diagnostics: Vec, } diff --git a/crates/tui/src/backend_spawn.rs b/crates/tui/src/backend_spawn.rs index db7a22a35..fadfd7599 100644 --- a/crates/tui/src/backend_spawn.rs +++ b/crates/tui/src/backend_spawn.rs @@ -120,13 +120,6 @@ impl FormState { self.field = Field::Runtime; return None; } - if runtime.working_directory_required { - self.status = - "The selected Runtime requires a workdir; this launch flow does not select one yet." - .to_string(); - self.field = Field::Runtime; - return None; - } let Some(profile) = self.current_profile(options) else { self.status = "No Worker profile is available.".to_string(); self.field = Field::Profile; @@ -377,8 +370,8 @@ fn profile_title(state: &FormState, options: &BackendWorkerLaunchOptions) -> Str fn runtime_label(runtime: &BackendWorkerLaunchRuntimeOption) -> String { let availability = if !runtime.worker_creation_available { "unavailable" - } else if runtime.working_directory_required { - "workdir required" + } else if runtime.supports_workdir_attachments { + "optional workdirs" } else { "no workdir" }; @@ -389,7 +382,7 @@ fn runtime_label(runtime: &BackendWorkerLaunchRuntimeOption) -> String { } fn runtime_supports_workdirless_creation(runtime: &BackendWorkerLaunchRuntimeOption) -> bool { - runtime.worker_creation_available && !runtime.working_directory_required + runtime.worker_creation_available } fn cycle_index(current: usize, len: usize, delta: isize) -> usize { @@ -413,7 +406,7 @@ mod tests { display_name: "External".to_string(), built_in: false, worker_creation_available: true, - working_directory_required: true, + supports_workdir_attachments: true, status: "online".to_string(), diagnostics: Vec::new(), }, @@ -422,7 +415,7 @@ mod tests { display_name: "Embedded".to_string(), built_in: true, worker_creation_available: true, - working_directory_required: false, + supports_workdir_attachments: false, status: "online".to_string(), diagnostics: Vec::new(), }, @@ -454,20 +447,18 @@ mod tests { let state = FormState::new(&options); assert_eq!( state.current_runtime(&options).unwrap().runtime_id, - "embedded" + "external" ); assert_eq!(state.current_profile(&options).unwrap().id, "builtin:coder"); assert_eq!(state.display_name, "Worker"); } #[test] - fn workdir_required_runtime_cannot_be_submitted() { + fn attachment_capable_runtime_can_submit_without_resources() { let options = options(); let mut state = FormState::new(&options); state.runtime_index = 0; - assert_eq!(state.submit(&options), None); - assert!(state.status.contains("requires a workdir")); - assert_eq!(state.field, Field::Runtime); + assert_eq!(state.submit(&options).unwrap().runtime_id, "external"); } #[test] diff --git a/crates/worker/src/feature/builtin/manage_worker.rs b/crates/worker/src/feature/builtin/manage_worker.rs index 969e89b71..7fd67933a 100644 --- a/crates/worker/src/feature/builtin/manage_worker.rs +++ b/crates/worker/src/feature/builtin/manage_worker.rs @@ -870,12 +870,14 @@ impl WorkerOperation { "Send an advisory notification to a known Runtime Worker so information can be incorporated into work already in progress without creating a queued Submit." } Self::Cancel => "Cancel the current turn of a known Runtime Worker when allowed.", - Self::Stop => "Stop a known Runtime Worker when allowed.", + Self::Stop => { + "Stop a known Runtime Worker when allowed. Stop is independent of Ticket conclusion: it does not end unfinished work, remove retained session records, release attachments, or delete Workdirs." + } Self::Restore => { "Restore a stopped Backend/Runtime Worker session in the current Workspace. Supply expected_observation_token from WorkerList; a conflict requires refreshing and deliberate new intent. New requests default to the durable Tool call ID. For explicit recovery of an unknown/pending outcome, supply the reported request_id and the original token unchanged; never create a new intent or automatically retry." } Self::Remove => { - "Remove an eligible stopped, non-internal Worker with no unfinished Ticket work. Terminal Ticket responsibility is retained and does not require unassignment. Supply a bounded reason; Backend validation and retention are authoritative." + "Remove an eligible stopped, non-internal Worker with no unfinished Ticket work. Terminal Ticket responsibility is retained and does not require unassignment. Conclusion, stopping, retention/removal, attachment release, and Workdir deletion are separate decisions. Removal releases attachments but preserves Workdir materialization. Supply a bounded reason; Backend validation and retention are authoritative." } } } @@ -2050,6 +2052,28 @@ mod tests { } } + #[test] + fn worker_lifecycle_descriptions_separate_unfinished_work_retention_and_attachment_cleanup() { + let stop = worker_tool_declaration(WorkerOperation::Stop); + assert!(stop.description.contains("does not end unfinished work")); + assert!( + stop.description + .contains("release attachments, or delete Workdirs") + ); + let remove = worker_tool_declaration(WorkerOperation::Remove); + assert!( + remove + .description + .contains("Terminal Ticket responsibility is retained") + ); + assert!(remove.description.contains("does not require unassignment")); + assert!( + remove + .description + .contains("releases attachments but preserves Workdir materialization") + ); + } + #[tokio::test] async fn worker_remove_forwards_only_target_and_bounded_reason() { let client = Arc::new(RecordingWorkspaceClient::default()); diff --git a/crates/worker/src/feature/builtin/merge_request.rs b/crates/worker/src/feature/builtin/merge_request.rs index 28ad9418d..7b4c99bd9 100644 --- a/crates/worker/src/feature/builtin/merge_request.rs +++ b/crates/worker/src/feature/builtin/merge_request.rs @@ -27,8 +27,7 @@ use wip_protocol::{ pub const FEATURE_ID: &str = "merge_request"; const FEATURE_NAME: &str = "Merge Request tools"; -const FEATURE_DESCRIPTION: &str = - "Operation-specific Merge Request workflow tools over Workspace authority."; +const FEATURE_DESCRIPTION: &str = "Optional repository MR workflow with trusted review and separate Orchestrator integration authority; not a universal Ticket conclusion gate."; const FEATURE_INSTRUCTION_ID: &str = "merge_request.workflow"; pub const FEATURE_PROMPT_REF: &str = "common.merge_request"; @@ -1085,10 +1084,10 @@ pub fn description(n: &str) -> Option<&'static str> { "Open one repository-scoped Merge Request linked to the Ticket; reuse an existing Merge Request for that repository and advance only its selector_from with a normal non-force push.", ), "CompleteMergeRequest" => Some( - "Record Orchestrator-owned integration for the explicitly addressed Merge Request without completing the Ticket or releasing its assignment.", + "Record Orchestrator-owned integration for the explicitly addressed Merge Request using current trusted exact-source approval and provider evidence. This records an already-applied integration, not a Ticket conclusion or assignment release; a review-not-required Ticket request does not bypass MR integration guards.", ), "ReviewMergeRequest" => Some( - "Submit the injected Reviewer capability result for its captured exact source ref; source movement cancels it, while target-only movement does not.", + "Submit the injected trusted Reviewer capability result for its captured exact source ref; source movement cancels it, while target-only movement does not. The capability authenticates the attempt, not the verdict: independent natural-language judgment and validation remain the Reviewer's responsibility.", ), _ => None, } diff --git a/crates/worker/src/feature/builtin/orchestration.rs b/crates/worker/src/feature/builtin/orchestration.rs index 79fab889a..bf864d6c9 100644 --- a/crates/worker/src/feature/builtin/orchestration.rs +++ b/crates/worker/src/feature/builtin/orchestration.rs @@ -21,6 +21,7 @@ use crate::feature::{ const FEATURE_ID: &str = "orchestration"; const TOOL_NAME: &str = "SpawnTicketWorker"; +const TOOL_DESCRIPTION: &str = "Spawn and atomically assign a generic Ticket Worker for the natural-language initial request. Profile is optional (defaults to builtin:ticket-worker); Flow and repository/Workdir attachments are optional. Results and return choices follow user intent, not a universal approval or MR gate. Backend validates claims and derives attachment access from Ticket targets; acceptance follows spawn, initial input, assignment, and resource finalization. Profile/Flow selection grants neither trusted review nor merge authority."; #[derive(Debug, Default)] pub struct OrchestrationFeature; @@ -41,10 +42,7 @@ impl FeatureModule for OrchestrationFeature { ServiceId::builtin(WORKER_LIFECYCLE_SERVICE_ID), "SpawnTicketWorker requires Workspace Worker lifecycle authority", )) - .with_tool(ToolDeclaration::new( - TOOL_NAME, - "Spawn and atomically assign a configurable Worker for a Ticket. Supply a registered profile selector, an initial request, and optionally a Flow selector. Workdir attachments may be empty; Backend authority validates claims and derives each attachment's access from the Ticket targets. The guarded operation records acceptance only after spawn, initial input, assignment, and resource finalization. Selecting a profile or Flow does not grant review authority.", - )) + .with_tool(ToolDeclaration::new(TOOL_NAME, TOOL_DESCRIPTION)) } fn install(&self, context: &mut FeatureInstallContext<'_>) -> Result<(), FeatureInstallError> { @@ -81,8 +79,10 @@ struct SpawnTicketWorkerWorkdirInput { struct SpawnTicketWorkerInput { ticket_id: String, runtime_id: String, - /// Registered profile selector. Backend resolves the profile and validates claims. - profile: String, + /// Optional registered profile selector; omitted/null selects builtin:ticket-worker. + /// Backend resolves the profile and validates claims, not natural-language satisfaction. + #[serde(default)] + profile: Option, /// Initial user request delivered through the normal typed submission path. initial_request: String, /// Optional Flow selector, delivered as a typed Flow segment before the request. @@ -116,7 +116,11 @@ impl Tool for SpawnTicketWorkerTool { .map_err(|error| ToolError::ExecutionFailed(error.to_string()))?; let call_id = non_empty(ctx.call_id, "tool call_id")?; let runtime_id = authority_id(input.runtime_id, "runtime_id")?; - let profile = non_empty(input.profile, "profile")?; + let profile = input + .profile + .map(|profile| non_empty(profile, "profile")) + .transpose()? + .unwrap_or_else(|| "builtin:ticket-worker".into()); let initial_request = non_empty(input.initial_request, "initial_request")?; let flow = input.flow.map(|flow| non_empty(flow, "flow")).transpose()?; let workdir_attachments = validate_workdir_attachments(input.workdir_attachments)?; @@ -196,9 +200,7 @@ fn definition( let schema = serde_json::to_value(schemars::schema_for!(SpawnTicketWorkerInput)) .unwrap_or_else(|_| serde_json::json!({})); let meta = ToolMeta::new(TOOL_NAME) - .description( - "Spawn and atomically assign a configurable Ticket Worker with a registered profile, initial request, optional typed Flow, and zero or more alias-keyed Workdir attachments. Backend validates claims and resources; profile and Flow selection do not grant review authority.", - ) + .description(TOOL_DESCRIPTION) .input_schema(schema); let tool: Arc = Arc::new(SpawnTicketWorkerTool { ticket_service: ticket_service.clone(), @@ -389,6 +391,48 @@ mod tests { } } + #[tokio::test] + async fn spawn_ticket_worker_omitted_profile_uses_general_worker_without_flow_or_repository() { + let service = Arc::new(RecordingService::default()); + let definition = definition( + Arc::new(FixedTicketService(TicketWorkflowState::Ready)), + service.clone(), + ); + let (meta, tool) = definition(); + let required = meta.input_schema["required"].as_array().unwrap(); + assert!(!required.iter().any(|field| field == "profile")); + assert!( + meta.description + .contains("neither trusted review nor merge authority") + ); + for profile in [None, Some(serde_json::Value::Null)] { + let mut input = input(); + input.as_object_mut().unwrap().remove("profile"); + if let Some(profile) = profile { + input["profile"] = profile; + } + input["initial_request"] = serde_json::json!( + "Research the question; review is not required. Return without concluding the Ticket." + ); + tool.execute( + &input.to_string(), + ToolExecutionContext::new("call-default", "batch-1", 0), + ) + .await + .unwrap(); + } + for request in service.requests.lock().unwrap().iter() { + assert_eq!(request.profile, "builtin:ticket-worker"); + assert!(request.workdir_attachments.is_empty()); + assert_eq!( + request.initial_submit, + vec![Segment::text( + "Research the question; review is not required. Return without concluding the Ticket." + )] + ); + } + } + #[tokio::test] async fn spawn_ticket_worker_defers_claim_eligibility_to_backend() { let service = Arc::new(RecordingService { @@ -519,7 +563,7 @@ mod tests { "unexpected error for {field}: {error}" ); } - for field in ["ticket_id", "runtime_id", "profile", "initial_request"] { + for field in ["ticket_id", "runtime_id", "initial_request"] { let mut input = input(); input.as_object_mut().unwrap().remove(field); let error = tool @@ -567,13 +611,13 @@ mod tests { let schema = serde_json::to_value(schemars::schema_for!(SpawnTicketWorkerInput)).unwrap(); assert_eq!(schema["additionalProperties"], false); let required = schema["required"].as_array().unwrap(); - for field in ["ticket_id", "runtime_id", "profile", "initial_request"] { + for field in ["ticket_id", "runtime_id", "initial_request"] { assert!( required.contains(&serde_json::json!(field)), "missing required field {field}" ); } - for field in ["flow", "workdir_attachments"] { + for field in ["profile", "flow", "workdir_attachments"] { assert!(schema["properties"].get(field).is_some()); assert!(!required.contains(&serde_json::json!(field))); } diff --git a/crates/worker/src/feature/builtin/ticket.rs b/crates/worker/src/feature/builtin/ticket.rs index 0a0883918..949a71247 100644 --- a/crates/worker/src/feature/builtin/ticket.rs +++ b/crates/worker/src/feature/builtin/ticket.rs @@ -335,9 +335,9 @@ struct WorkspaceTicketCloseInput { references: Vec, } -const TICKET_CLOSE_DESCRIPTION: &str = "Close a Ticket with resolution, item/state CAS, and replay key. No Merge Request or enforced state sequence is required. Actor identity is transport-bound; this does not integrate Merge Requests or expand Workdir grants."; -const COMPLETE_TICKET_DESCRIPTION: &str = "Record a Ticket completion decision with reason, item/state CAS, and replay key. Merge Requests and approvals are not prerequisites. The Backend authorizes the assigned Worker or registered Workspace Orchestrator; roles supplied by the model never grant authority."; -const TICKET_STATE_UPDATE_DESCRIPTION: &str = "Update a Ticket progress-display state with reason, item/state CAS, and replay key. States need not follow an enforced sequence. This does not start Workers, queue dependencies, integrate Merge Requests, or enlarge live Workdir grants; the Backend validates actor authority."; +const TICKET_CLOSE_DESCRIPTION: &str = "Record an authorized Ticket closure decision with resolution, item/state CAS, and replay key when the requested return path calls for closure. No Merge Request or enforced state sequence is required. Backend checks actor authority, not natural-language satisfaction; this does not integrate MRs, stop/remove Workers, clean attachments, or expand Workdir grants."; +const COMPLETE_TICKET_DESCRIPTION: &str = "Record an authorized Ticket completion decision with reason, item/state CAS, and replay key when user intent calls for completion; return without conclusion need not call this tool. Merge Requests and approvals are not prerequisites. Backend checks assigned Worker/Workspace Orchestrator authority, not real judgment of natural-language satisfaction; model-supplied roles never grant authority. Conclusion ends unfinished work while retaining terminal responsibility for display; it does not grant review/merge authority or stop/remove Workers and attachments."; +const TICKET_STATE_UPDATE_DESCRIPTION: &str = "Update a Ticket progress-display state with reason, item/state CAS, and replay key. States need not follow an enforced sequence. Backend checks actor authority, not natural-language satisfaction. This does not start/stop Workers, queue dependencies, integrate Merge Requests, clean attachments, or enlarge live Workdir grants."; #[derive(Clone, Copy)] enum WorkspaceTicketDecisionKind { @@ -508,8 +508,7 @@ fn workspace_ticket_tool_description(name: &str) -> String { const FEATURE_ID: &str = "ticket"; const FEATURE_NAME: &str = "Ticket tools"; -const FEATURE_DESCRIPTION: &str = - "Typed Ticket operations through the authoritative Workspace API."; +const FEATURE_DESCRIPTION: &str = "Intent-led Ticket reads and authorized decisions through the Workspace API; no universal MR/approval gate, and no Backend judgment of natural-language satisfaction."; const TICKET_WORKFLOW_INSTRUCTION_ID: &str = "ticket.workflow"; const TICKET_WORKFLOW_PROMPT_REF: &str = "common.tickets"; pub const TICKET_SERVICE_ID: &str = "ticket.authority"; @@ -2945,6 +2944,27 @@ mod tests { } } + #[test] + fn native_ticket_decision_descriptions_preserve_intent_and_independent_lifecycle() { + let tools = native_ticket_tools( + decision_client(200, TicketWorkflowState::Ready), + TicketFeatureAccess::work_report(), + ) + .unwrap(); + let descriptor = ticket_descriptor(&tools, "Ticket", "bound").unwrap(); + let complete = descriptor + .operations + .iter() + .find(|op| op.name == "complete") + .unwrap(); + let summary = &complete.documentation.as_ref().unwrap().summary; + assert!(summary.contains("Merge Requests and approvals are not prerequisites")); + assert!(summary.contains("return without conclusion need not call this tool")); + assert!(summary.contains("not real judgment")); + assert!(summary.contains("retaining terminal responsibility")); + assert!(summary.contains("does not grant review/merge authority or stop/remove Workers")); + } + #[tokio::test] async fn native_ticket_completion_binds_subject_and_stales_only_its_ticket_not_mrs() { let client = decision_client(200, TicketWorkflowState::Done); diff --git a/crates/worker/src/prompt/catalog.rs b/crates/worker/src/prompt/catalog.rs index 6ef4aa501..999293d10 100644 --- a/crates/worker/src/prompt/catalog.rs +++ b/crates/worker/src/prompt/catalog.rs @@ -1034,7 +1034,8 @@ mod tests { .unwrap(); assert!(rendered.contains("This policy governs naming only")); - assert!(rendered.contains("Coder cleanup is a separate post-completion decision")); + assert!(rendered.contains("Worker cleanup is a separate lifecycle decision")); + assert!(rendered.contains("not an automatic consequence of a Ticket state")); assert!(rendered.contains("perform one cleanup pass before ending the orchestration turn")); assert!(rendered.contains("Never predeclare `delete_on_completion`")); assert!(rendered.contains("call `WorkerStop`")); diff --git a/crates/worker/src/prompt/system.rs b/crates/worker/src/prompt/system.rs index ffd9da5ad..4fbff3406 100644 --- a/crates/worker/src/prompt/system.rs +++ b/crates/worker/src/prompt/system.rs @@ -322,6 +322,154 @@ fn append_trailing_section( #[cfg(test)] mod tests { use super::*; + use crate::feature::FeatureRegistryBuilder; + use crate::feature::builtin::merge_request::MergeRequestFeature; + use crate::feature::builtin::ticket::{TicketFeature, TicketFeatureAccess}; + use crate::hook::HookRegistryBuilder; + use crate::worker::TestWorkspaceHttpClient; + use manifest::MergeRequestFeatureConfig; + + // These builtin resources are the model-visible workflow compatibility contract. + // Fixtures prove composition and tool descriptions, not an agent's real judgment. + fn ticket_workflow_fixture( + role: &str, + mr_config: MergeRequestFeatureConfig, + ) -> (String, Vec) { + let client = Arc::new(TestWorkspaceHttpClient::new("workspace", "http://unused")); + let mut tools = Vec::new(); + let mut hooks = HookRegistryBuilder::default(); + let report = FeatureRegistryBuilder::new() + .with_module(TicketFeature::new( + client.clone(), + TicketFeatureAccess { + thread: true, + workflow: true, + ..Default::default() + }, + )) + .with_module(MergeRequestFeature::new(client, mr_config)) + .install_into_pending(&mut tools, &mut hooks); + assert!(!report.has_errors(), "{}", report.error_message()); + let metas: Vec<_> = tools.into_iter().map(|definition| definition().0).collect(); + let instructions = report.installed_instruction_contributions(); + let prompts = PromptCatalog::builtins_only().unwrap(); + let scope = Scope::empty(); + let rendered = SystemPromptTemplate::parse(role, PromptCatalogSource::builtins_only()) + .unwrap() + .render(&SystemPromptContext { + now: DateTime::parse_from_rfc3339("2026-10-08T00:00:00Z") + .unwrap() + .with_timezone(&Utc), + cwd: Cow::Borrowed("."), + language: "en", + scope: &scope, + tool_names: metas.iter().map(|meta| meta.name.clone()).collect(), + feature_instructions: &instructions, + agents_md: None, + resident_summary: None, + prompts: &prompts, + }) + .unwrap(); + (rendered, metas) + } + + #[test] + fn effective_ticket_instructions_allow_review_not_required_without_mr_gate() { + let (prompt, tools) = + ticket_workflow_fixture("role.ticket_worker", MergeRequestFeatureConfig::default()); + assert!(prompt.contains("No Merge Request or approval is a prerequisite")); + assert!(prompt.contains("optional Ticket comment")); + assert!(prompt.contains("optional Drive document/artifact")); + assert!(!prompt.contains("## Merge Request workflow")); + assert!(!tools.iter().any(|meta| meta.name == "ReviewMergeRequest")); + let complete = tools + .iter() + .find(|meta| meta.name == "CompleteTicket") + .unwrap(); + assert!( + complete + .description + .contains("Merge Requests and approvals are not prerequisites") + ); + assert!(complete.description.contains("not real judgment")); + assert!( + complete.input_schema["properties"] + .get("approval_event_id") + .is_none() + ); + } + + #[test] + fn effective_code_instructions_preserve_independent_review_before_merge() { + let (prompt, tools) = ticket_workflow_fixture( + "role.orchestrator", + MergeRequestFeatureConfig { + show: true, + readiness_check: true, + complete: true, + ..Default::default() + }, + ); + assert!(prompt.contains("Trusted Reviewer authority")); + assert!( + prompt.contains( + "Target integration and `CompleteMergeRequest` are Orchestrator authority" + ) + ); + assert!( + prompt.contains("does not bypass the guarded review requirements for MR integration") + ); + assert!(prompt.contains("not a universal Ticket pipeline")); + assert!(!tools.iter().any(|meta| meta.name == "ReviewMergeRequest")); + let complete = tools + .iter() + .find(|meta| meta.name == "CompleteMergeRequest") + .unwrap(); + assert!( + complete + .description + .contains("trusted exact-source approval") + ); + assert!( + complete.input_schema["required"] + .as_array() + .unwrap() + .iter() + .any(|field| field == "approval_event_id") + ); + } + + #[test] + fn effective_ticket_instructions_allow_return_without_conclusion_and_separate_cleanup() { + for role in ["role.ticket_worker", "role.coder", "role.orchestrator"] { + let (prompt, tools) = + ticket_workflow_fixture(role, MergeRequestFeatureConfig::default()); + assert!(prompt.contains("return without conclusion"), "{role}"); + assert!( + prompt.contains( + "a turn ending or a result report is not itself a completion decision" + ), + "{role}" + ); + assert!( + prompt.contains("stopping a Worker alone does not end unfinished work"), + "{role}" + ); + assert!( + prompt.contains("does not stop, remove, or clean up"), + "{role}" + ); + let complete = tools + .iter() + .find(|meta| meta.name == "CompleteTicket") + .unwrap(); + assert!( + complete + .description + .contains("return without conclusion need not call this tool") + ); + } + } #[test] fn sub_worker_capabilities_follow_the_registered_canonical_control_tools() { diff --git a/crates/workspace-server/src/server.rs b/crates/workspace-server/src/server.rs index bca30ba76..e49468ca7 100644 --- a/crates/workspace-server/src/server.rs +++ b/crates/workspace-server/src/server.rs @@ -30373,7 +30373,7 @@ fn worker_launch_options_response(api: &WorkspaceApi) -> ApiResult --repository-key ` registers the current Git repository through the Backend API and writes only global client routing under `$XDG_CONFIG_HOME/yoi/client.toml`. +The assigned Coder launches the Reviewer as an actual direct-child `builtin:reviewer` SubWorker, with explicit command grant and appropriate Workdir scope for inspection/validation, plus the structured Ticket/MR handoff. Server authority verifies assignment, Runtime-owned child identity, effective Profile, one-shot attempt, and captured subject. Review capability is injected by the trusted layer, not supplied by the model. The Reviewer makes an independent judgment against intent, acceptance criteria, the complete captured result snapshot, and validation, then records `ReviewMergeRequest`; prose and observation are not approval authority. -Fixed Ticket workflow roles are `intake`, `orchestrator`, `coder`, and `reviewer`. The Server resolves the selected Profile and launch material from the active Workspace configuration authority, and Runtime receives the resulting immutable launch snapshot. A repository checkout may still contain ordinary project files, but neither the client nor Runtime may infer Workspace identity, Backend routing, role Profile, or Ticket storage from repository-local `.yoi` files. +Source movement requires fresh review for the exact new source. Target-only movement preserves unchanged-source approval but requires refreshed integration evidence. Keep routine review/fix/rereview evidence on the MR rather than repeating each iteration in Ticket comments. -## Ticket lifecycle +MR integration remains separate Orchestrator authority. Immediately before integration, reread Ticket/MR authority and `CheckMergeRequestReadiness`. Verify exact approved source, current target, strategy, and approval event. Apply and validate integration through ordinary source control in the bound Workdir, push normally, and verify provider resolution. `CompleteMergeRequest` records that already-applied repository result; it does not move a branch, complete the Ticket, or release assignment. If push succeeded but recording failed, reread/replay the same operation rather than pushing again. A Ticket request saying review is not required does not bypass MR integration guards. -Ticket-driven development normally moves through these gates: +## Responsibility, unfinished work, and cleanup (T-715) -1. Intake -2. Orchestrator routing -3. Planning/requirements sync or spike when needed -4. Implementation assignment -5. Review -6. Merge / validation / cleanup -7. Close +Terminal current responsibility is retained for display after unfinished work ends. It is not the same as an unfinished assignment and does not require an invented unassignment operation before cleanup. A stopped or idle Worker may still own unfinished work; a completed/closed Ticket does not automatically stop/remove the Worker, release its attachments, or delete a Workdir. A result report or Flow terminal state is neither conclusion nor cleanup authority. -Each gate records its decision or evidence in the Ticket thread or artifacts. +Worker stop, retention/removal, attachment release, and Workdir deletion are independent guarded decisions. Do not predeclare `delete_on_completion` or `retain_on_completion` at launch. Retain Workers while a requested review/fix or other handoff can still return; do not remove them just because one turn ended. -### 1. Intake +When authorized cleanup is in scope: -Use the Intake role launch prompt when a user request is broad, ambiguous, or not yet a Ticket. +1. Reread Ticket responsibility, active unfinished work, Worker state, handoffs/notifications, and current retention constraints. Use the exact Worker subject from `WorkerList`. +2. Stop the Worker if needed and confirm terminal state. Stop alone does not end unfinished work. `UnfinishedWork` (`unfinished_work`) requires explicit authorized work end or reassignment and a fresh authority read. +3. Call `WorkerRemove` only with no unfinished work, running/restoring state, pin/legal hold, pending notification, or handoff. Backend revalidates guards; removal releases attachments but preserves Workdir materialization. +4. Reread actual Workdir attachment release, occupancy, cleanliness, ownership, provider availability, and other use. Retain still-needed/existing resources. Only then use `WorkdirDelete` for a proven clean, unoccupied, no-longer-needed Ticket-dedicated Workdir owned/selected for this work. -Intake should: +Never delete before attachment release, force removal, discard changes, or advance on a partial/unknown failure. Reread authority before a bounded retry. Cleanup failures do not roll back recorded Ticket or MR outcomes; report concrete blockers rather than adding routine success comments. -- clarify user intent; -- check duplicate/related Tickets; -- draft background, requirements, acceptance criteria, binding decisions/invariants, implementation latitude, readiness, risk flags, and validation; -- create or update the Ticket only after user agreement. +## Authoring and granularity -Intake should not schedule implementation, spawn coder/reviewer Workers, create worktrees, merge, or close Tickets. +Intake clarifies ambiguous intent, checks duplicates and relevant context, and records agreed work. Create/update only after user agreement or explicit instruction to record the draft. A minimum investigation gate is an authoring responsibility, not a universal implementation approval gate. Intake is not scheduling, implementation, review, merge, or cleanup authority. -### 2. Orchestrator routing +A useful Ticket records background/motivation, requirements, acceptance criteria, binding decisions/invariants, implementation latitude, and relevant open questions/risks. Include useful result evidence and final resolution when appropriate. Separate confirmed facts, user claims, hypotheses, and undecided questions. Do not copy Worker role boundaries, a temporary plan, or a decision to stop after authoring into the Ticket as a product prohibition. Record an approval gate only when the user asks for it; do not prematurely prescribe implementation tactics. -Use the Orchestrator role launch prompt to classify the next action for an existing Ticket. +Risk flags prompt context checks and reviewer focus, not automatic stop gates. Return to planning only for a named missing decision/information after bounded checks; escalate beyond-scope decisions without inventing new constraints. -Routing classifications include: +Do not create new umbrella/progress-container Tickets. Split broad work into concrete useful outcomes, record the split in Ticket/Objective context, and use Objectives for enduring medium-term goals. Do not replace umbrellas with parent/child, sub-ticket, part-of, contains, or other hierarchy relations. A concrete planning/design/investigation Ticket is valid when requested. Existing umbrellas can be retired as superseded/decomposed without rewriting history; distinguish container retirement from completion of future work. -- `requirements_sync_needed` -- `return_to_planning` -- `spike_needed` -- `implementation_ready` -- `review_needed` -- `blocked_by_dependency_or_missing_authority` -- `close_ready` -- `closed_or_noop` +Keep long research dumps outside the item body and summarize necessary bounded artifacts. Never store secrets, credentials, private prompt contents, or secret-bearing logs in Ticket/MR/Drive records or model-visible evidence. -Routing decisions should be recorded with `TicketComment` using `plan` or `decision` role. The decision should state the classification, evidence checked, reason, next action, and escalation conditions. For `return_to_planning`, the record must also state the concrete missing decision/information, context checked, why implementation latitude is insufficient, and the next planning question/action. +## Configuration and validation -### 3. Planning/requirements sync +Workspace Ticket data and authority live in Server SQLite and active Workspace configuration. `yoi init --display-name --repository-key ` registers a repository through Backend and writes global client routing only. Repository-local `.yoi/workspace.toml` and `.yoi/ticket.config.toml` do not grant Workspace identity, Backend connection, role selection, or Ticket authority. Legacy `ticket init` and `ticket import-local` are unsupported; no automatic migration reads local Ticket trees. -Use planning/requirements sync only as a bounded Ticket refinement step. Return `ready` or `queued` Tickets to `planning` only when the Orchestrator can name a concrete missing decision or information item after bounded project-context checks; risk flags and risky domains are context-lookup and reviewer-focus signals, not automatic stop gates. +Dashboard actions are explicit user actions, not scheduler/auto-maintainer authority. Launch success without a visible result calls for attaching to or observing the Worker and rereading authority, not assuming conclusion. Select an accessible Workspace and current registered Profile when a launch reports missing configuration. -Planning sync should resolve or record: - -- requirements and acceptance criteria; -- current code map; -- binding decisions/invariants and implementation latitude; -- critical risks and failure modes; -- implementation-ready vs requirements-sync/spike/blocked classification. - -Do not send Tickets with unresolved concrete missing decisions/information directly to coder Workers. If no concrete missing item remains after bounded checks, risky-but-specified Tickets should proceed with an IntentPacket plus escalation conditions and reviewer focus. - -### 4. Implementation assignment - -Use the Coder and Reviewer role launch prompts for implementation-ready Tickets. - -The Orchestrator should prepare an `IntentPacket` with: - -- intent; -- requirements; -- binding decisions/invariants; -- implementation latitude; -- escalation conditions; -- validation; -- current code map; -- critical risks. - -Implementation normally happens in a child git worktree created by the Orchestrator, not by the coder Worker. The coder Worker receives narrow write scope to the worktree and must report changed files, implementation summary, validation, unresolved risks, and review readiness. - -### 5. Review - -The assigned Coder launches the Reviewer as an actual direct-child `builtin:reviewer` SubWorker with write scope, so it can use the Workdir command tools required for inspection and validation, and a structured handoff bound to the current immutable Merge Request revision. Server authority revalidates the parent assignment, Runtime-owned child session, effective profile, one-shot review attempt, and revision; prose output is not approval. - -The Reviewer records the structured result with `ReviewMergeRequest`. Request changes advances the existing Merge Request source selector with a normal non-force push and requires a fresh child attempt for that exact new source ref; do not create a replacement Merge Request, add-revision operation, or fresh integration branch. Target-only movement preserves approval for an unchanged source and requires refreshed integration evidence. The Orchestrator uses `CheckMergeRequestReadiness` and then `CompleteMergeRequest` for guarded integration with operation-id dedupe/CAS semantics; Flow transitions are not completion authority. - -Blockers must be fixed or explicitly escalated before merge-ready submission. - -### 6. Merge and close - -Unless explicitly authorized otherwise, final merge, cleanup, design-boundary decisions, and Ticket closure remain Orchestrator/human responsibilities. - -Before closing, verify concrete evidence: - -- SubWorker committed session via worker-observation tools; -- worktree state and diff; -- validation command output; -- review result; -- Ticket requirements and acceptance criteria; -- merge/cleanup state in the main workspace. - -Close with a resolution that summarizes what changed, key commits, validation, review state, and remaining follow-ups. - -## Workspace Dashboard Ticket role actions - -`yoi panel` is the active Ticket/Intake/Orchestrator Dashboard. It owns fixed Ticket role-launch actions and uses the shared client Ticket role launcher. The single-Worker Console no longer supports `:ticket ...` commands; typing them in command mode is treated like any other unknown command. - -Role actions map to the fixed Workspace Ticket roles: - -- intake launches the intake role without an existing Ticket and requires freeform context. -- route launches the orchestrator role for an existing Ticket. -- implement launches the coder role for an implementation assignment. -- review launches the reviewer role for review. - -All actions are explicit and user-triggered. They are not a scheduler, queue, spawned-Worker Dashboard, or automatic maintainer loop. - -### Dashboard execution path - -The Dashboard sends the selected action and Ticket context to the Workspace Server. The Server validates Workspace access, resolves the current Server DB Workspace/Ticket authority and active Profile projection, launches or restores the role Worker through the shared Worker path, commits the typed initial input, and returns durable acceptance evidence. The client does not inspect repository-local `.yoi` files, choose a Ticket storage directory, or construct Runtime launch authority. - -The launched Worker receives dynamic Ticket/action context as its first committed run input. The selected Profile supplies durable system/role behavior. Workspace Ticket metadata does not override system instruction. - -### Dashboard troubleshooting - -- unresolved Workspace selection: select an accessible Workspace from the Server catalog or pass an explicit Workspace selector. -- unavailable role Profile: update the active Workspace configuration and retry after the Server projects the new revision. -- missing Ticket id for route, implement, or review actions: provide the target Ticket. -- launch success but no visible completion: attach to or inspect the launched Worker; completion notifications are hints, not authority. - -## Granularity - -One Ticket should describe a complete change that can be explained as a feature, behavior, design decision, investigation result, or maintenance outcome when closed. It should be concrete enough to implement, review, validate, and close without relying on another open Ticket as its progress container. - -Avoid Tickets that only mirror an implementation step unless that step is independently reviewable and useful. Phase/step lists inside a Ticket are execution order, not a separate dependency system. - -Do not create new umbrella Tickets for broad multi-Ticket efforts. When a request is too broad for one concrete work item: - -- create concrete implementable Tickets for the slices; -- record the split decision in the relevant Ticket thread, Objective context, or both; -- use Objectives for medium-term goal, motivation, strategy, and success-criteria context when that context would outlive one concrete Ticket; -- once typed Ticket relations exist, use them only for non-hierarchical dependency, related, blocking, superseded-by, duplicate, or replacement metadata; -- do not replace umbrellas with parent/child, sub-ticket, umbrella, part-of, contains, or other hierarchy/container relations; -- do not keep a separate umbrella Ticket open merely as a progress container. - -This policy does not forbid an initial concrete planning, design, or investigation Ticket when the user asks for one. The deprecated pattern is a long-lived umbrella/progress-container Ticket whose main purpose is to keep a broad effort open while other concrete Tickets carry the actual work. - -Existing umbrella Tickets may be retired without rewriting history. Once concrete follow-up Tickets and any needed Objective context exist, close the umbrella as superseded/decomposed. The close resolution should state that the container role is retired, not that every related future concern is complete, and should list completed concrete Tickets plus remaining follow-up Tickets/Objectives. - -## Ticket contents - -A useful Ticket states: - -- background and motivation; -- requirements; -- acceptance criteria; -- relevant binding decisions/invariants, implementation latitude, and escalation conditions; -- readiness, open questions, and risk flags when relevant; -- implementation reports when work is submitted; -- reviews; -- final resolution when closed. - -Keep long research dumps out of the item body. Attach necessary bounded artifacts through the Ticket evidence surface and summarize the conclusion in the thread. - -Do not store secrets, credentials, private prompt contents, or raw logs containing secrets in Ticket bodies, thread entries, artifacts, diagnostics, or model-visible prompts. - -## Backend CLI: `yoi ticket` - -The product CLI resolves an explicit or configured Backend target and performs Ticket operations through the Workspace API. It does not open a repository-local backend. Use command help for the current typed command surface. - -Legacy `ticket init` and `ticket import-local` workflows are unsupported. No automatic migration reads old `.yoi/tickets` trees; export data with an older version before upgrading if it must be retained, then import it through an explicit supported Workspace surface. - -## Validation - -Run at least: - -```sh -yoi ticket doctor -git diff --check -``` - -Implementation Tickets usually also need focused tests and broader checks, for example: - -```sh -cargo fmt --check -cargo check --workspace --all-targets -cargo test -p -``` - -Record validation commands and results in the implementation report or resolution. +Validate the actual result with checks appropriate to its acceptance criteria. Code changes follow `AGENTS.md` and [Rust testing strategy](rust-testing-strategy.md): begin with the smallest contract-proving target/filter, then the required compile/test/format checks. Record only validation actually run. Narrow effective instruction/tool fixtures protect inclusion, schema, and policy wording; they do not prove real Worker judgment or end-to-end behavior. diff --git a/openapi/server-api.json b/openapi/server-api.json index 56b5011ad..99100a56d 100644 --- a/openapi/server-api.json +++ b/openapi/server-api.json @@ -12902,10 +12902,11 @@ "status": { "type": "string" }, - "worker_creation_available": { + "supports_workdir_attachments": { + "description": "Whether this Runtime supports explicitly selected Workdir attachments.\nWorkdirs are optional for generic launches; embedded Runtime does not support them.", "type": "boolean" }, - "working_directory_required": { + "worker_creation_available": { "type": "boolean" } }, @@ -12914,7 +12915,7 @@ "display_name", "built_in", "worker_creation_available", - "working_directory_required", + "supports_workdir_attachments", "status", "diagnostics" ], @@ -15671,7 +15672,7 @@ "info": { "title": "Yoi Server API", "version": "0.1.0", - "x-yoi-source-digest": "sha256:16796bde0da04973310a14f90cf6eac14b2580bbe184c7c12afde3b6225ce933" + "x-yoi-source-digest": "sha256:3ae89b3b76b2c31f016f4f9e1bc339115fdfb0b7d2a9964c4c708488a3e5f6f1" }, "openapi": "3.1.0", "paths": { diff --git a/resources/flows/coder-review.dcdl b/resources/flows/coder-review.dcdl index de1e7ef6b..b212d11e4 100644 --- a/resources/flows/coder-review.dcdl +++ b/resources/flows/coder-review.dcdl @@ -1,3 +1,7 @@ +# Optional code Git/MR recipe, selected only when it fits the requested work. +# This Flow is not a generic Ticket pipeline or Backend completion requirement. +# Transitions guide implementation/review/handoff; they cannot grant review or merge +# authority, judge natural-language satisfaction, or conclude the Ticket. { schema_version = 1; name = "coder-review"; @@ -5,7 +9,7 @@ states = { implement = { - instructions = "Inspect the assigned Workdir Git state before editing. Reuse a suitable restored `work/-` branch, or create a collision-safe work branch from detached HEAD; never overwrite an existing branch. For this assigned Ticket Workdir, you are explicitly authorized to create or switch the local work branch and to use `git add` and `git commit`. Implement the requested Ticket scope, run the narrow and dependent validation required by the changed contracts, and record concrete evidence in coherent commits. After the implementation is committed, validated, and clean, publish only the current Ticket work branch to the Ticket repository remote with a normal non-force push, then verify that the provider resolves the existing Merge Request `selector_from` to exact local `HEAD`. Do not push the target branch, push tags or unrelated refs, force-push, merge, delete branches, or discard pre-existing changes. Open one Merge Request with `OpenMergeRequest`, or use `ShowMergeRequest` when one is already open; keep its original selectors and advance the same source ref. Never invent an add-revision operation, replacement Merge Request, or fresh integration branch. Source movement requires fresh review; target-only movement does not invalidate source approval and remains Orchestrator integration authority. Do not request review from a dirty Workdir or unpublished source ref. A Flow transition is never Ticket completion authority."; + instructions = "This is an optional code recipe for requested Git publication and independent review, not a universal Ticket gate. If the user requests no review or return without conclusion, honor that bounded request and do not treat this recipe as authority to conclude the Ticket. Inspect the assigned Workdir Git state before editing. Reuse a suitable restored `work/-` branch, or create a collision-safe work branch from detached HEAD; never overwrite an existing branch. Use local work-branch switching, `git add`, `git commit`, and publication only within the request and existing grants; this recipe does not override an explicit no-commit/no-push instruction or expand resource authority. Implement the requested Ticket scope, run the narrow and dependent validation required by the changed contracts, and record concrete evidence in coherent commits. After the implementation is committed, validated, and clean, publish only the current Ticket work branch to the Ticket repository remote with a normal non-force push, then verify that the provider resolves the existing Merge Request `selector_from` to exact local `HEAD`. Do not push the target branch, push tags or unrelated refs, force-push, merge, delete branches, or discard pre-existing changes. Open one Merge Request with `OpenMergeRequest`, or use `ShowMergeRequest` when one is already open; keep its original selectors and advance the same source ref. Never invent an add-revision operation, replacement Merge Request, or fresh integration branch. Source movement requires fresh review; target-only movement does not invalidate source approval and remains Orchestrator integration authority. Do not request review from a dirty Workdir or unpublished source ref. A Flow transition is never Ticket completion authority."; transitions = { review = { target = "review"; diff --git a/resources/profiles/coder.dcdl b/resources/profiles/coder.dcdl index 6df406aaa..0abece619 100644 --- a/resources/profiles/coder.dcdl +++ b/resources/profiles/coder.dcdl @@ -1,6 +1,6 @@ import "./base.dcdl" // { slug = "coder"; - description = "Ticket implementation coder profile."; + description = "Code implementation with optional Git/MR review recipe; no universal Ticket conclusion gate."; scope = "workspace_write"; model = { ref = "codex-oauth/gpt-6.1-sol"; }; engine = { diff --git a/resources/profiles/orchestrator.dcdl b/resources/profiles/orchestrator.dcdl index dee53280a..ca5a9746d 100644 --- a/resources/profiles/orchestrator.dcdl +++ b/resources/profiles/orchestrator.dcdl @@ -1,6 +1,6 @@ import "./base.dcdl" // { slug = "orchestrator"; - description = "Ticket orchestrator profile."; + description = "Intent-led Ticket orchestration with separate guarded MR integration authority."; scope = "workspace_write"; engine = { instruction = "role.orchestrator"; }; diff --git a/resources/profiles/ticket-worker.dcdl b/resources/profiles/ticket-worker.dcdl index 4da55b41e..03168dc25 100644 --- a/resources/profiles/ticket-worker.dcdl +++ b/resources/profiles/ticket-worker.dcdl @@ -1,6 +1,6 @@ import "./default.dcdl" // { slug = "ticket-worker"; - description = "General Ticket work with typed progress and completion tools."; + description = "General intent-led Ticket work with optional result recording and authorized conclusion decisions."; engine = { instruction = "role.ticket_worker"; }; diff --git a/resources/prompts/common/merge-request.md b/resources/prompts/common/merge-request.md index fe01c9ac4..308098938 100644 --- a/resources/prompts/common/merge-request.md +++ b/resources/prompts/common/merge-request.md @@ -1,9 +1,11 @@ ## Merge Request workflow -The Merge Request and its append-only thread are the routine authority for review requests, verdicts, fixes, rereview, readiness, and integration evidence. One Ticket may link multiple repository-scoped Merge Requests. After `OpenMergeRequest` returns an ID, every read, review, readiness, and integration operation must explicitly address that `merge_request_id`; never let a Ticket lookup implicitly choose one. Use the operation-specific tools exposed to your role: `OpenMergeRequest`, `ShowMergeRequest`, `ReviewMergeRequest`, `CheckMergeRequestReadiness`, `CompleteMergeRequest`, and `CompleteTicket`. +This guidance applies when the requested work uses a Merge Request; it is not a universal Ticket pipeline or conclusion gate. The Merge Request and its append-only thread are the routine authority for review requests, verdicts, fixes, rereview, readiness, and integration evidence. One Ticket may link multiple repository-scoped Merge Requests. After `OpenMergeRequest` returns an ID, every read, review, readiness, and integration operation must explicitly address that `merge_request_id`; never let a Ticket lookup implicitly choose one. Use the operation-specific tools exposed to your role: `OpenMergeRequest`, `ShowMergeRequest`, `ReviewMergeRequest`, `CheckMergeRequestReadiness`, and `CompleteMergeRequest`. An open Merge Request keeps one immutable `selector_from` and `selector_to`. Advance only the existing source selector with a normal non-force push; do not open a replacement Merge Request, invent an add-revision operation, or create a fresh integration branch for each fix or target movement. Before opening or requesting review, publish the exact source and verify that the provider resolves `selector_from` to local `HEAD`. -A review verdict is valid only for the exact provider-resolved source ref or immutable merged-result subject, selected Merge Request, complete linked MR/source-result snapshot, and current Ticket item revision captured by `ReviewRequested`. Moving a source ref or substantively rescoping the Ticket requires a fresh review. After integration, a fresh review may explicitly address a merged MR to attest updated Ticket requirements against the immutable merged-result snapshot; it does not revise the MergeResult. Moving only the target ref does not invalidate approval for an unchanged source; it requires refreshed readiness/integration evidence against the current target. Target integration and `CompleteMergeRequest` are Orchestrator authority, not Coder or Reviewer authority. `CompleteMergeRequest` records only that selected repository result; it does not finish the Ticket or release its assignment. After every linked required result is integrated, `CompleteTicket` revalidates the exact linked-MR set, current Ticket revision, explicitly identified Reviewer requirement approval, state, and assignment before completing the Ticket. +A review verdict is valid only for the exact provider-resolved source ref or immutable merged-result subject, selected Merge Request, complete linked MR/source-result snapshot, and current Ticket item revision captured by `ReviewRequested`. Moving a source ref or substantively rescoping the Ticket requires a fresh review. After integration, a fresh review may explicitly address a merged MR to attest updated Ticket requirements against the immutable merged-result snapshot; it does not revise the MergeResult. Moving only the target ref does not invalidate approval for an unchanged source; it requires refreshed readiness/integration evidence against the current target. Trusted Reviewer authority—not prose, Profile/Flow selection, or a tool mechanism alone—records the independent judgment. Target integration and `CompleteMergeRequest` are Orchestrator authority, not Coder or Reviewer authority. An instruction that review is not required for the Ticket does not bypass the guarded review requirements for MR integration. -Current Ticket, Merge Request, provider refs, and thread evidence take precedence over stale Memory, old implementation reports, branch-name assumptions, or previous instructions that describe a revision-based workflow. Reread the Ticket and `ShowMergeRequest` before decisions. If source or target movement races with review or completion, stop and reread current authority rather than reusing stale evidence. +`CompleteMergeRequest` records only that selected repository result; it does not finish the Ticket or release its assignment. `CompleteTicket` is an independent authorized decision with a reason and current item/state evidence, not an MR-set/approval gate. Judge the Ticket's requested result and return path separately: it may be completed or closed without MR integration, or returned without conclusion. Do not claim an unmerged result was integrated. + +Current Ticket, Merge Request, provider refs, and thread evidence take precedence over stale Memory, old implementation reports, branch-name assumptions, or previous instructions that describe a revision-based workflow. Reread the Ticket and `ShowMergeRequest` before decisions. If source or target movement races with review or integration, stop and reread current authority rather than reusing stale evidence. diff --git a/resources/prompts/common/tickets.md b/resources/prompts/common/tickets.md index ff8121408..8e44c005d 100644 --- a/resources/prompts/common/tickets.md +++ b/resources/prompts/common/tickets.md @@ -1,9 +1,13 @@ ## Ticket workflow -Use the available typed Ticket tools as the authority for Ticket reads and mutations. Use `QueryTicket` for bounded discovery and filtering, then `ShowTicket` for the authoritative item revision, thread/evidence, relations, linked Objectives, and current Merge Request context before routing, review, or closure decisions. Current linked-MR evidence is completion authority; `implementation_report` entries are optional historical/audit context and must not be required for integration readiness. Do not invoke a Ticket CLI or edit backend storage directly as an alternative implementation of those tools. +Use the available typed Ticket tools as the authority for Ticket reads and mutations. Use `QueryTicket` for bounded discovery and filtering, then `ShowTicket` for the authoritative item revision, thread/evidence, relations, linked Objectives, and any current Merge Request context before routing, review, or conclusion decisions. Do not invoke a Ticket CLI or edit backend storage directly as an alternative implementation of those tools. -Read the relevant Ticket before making implementation, routing, review, state, or closure decisions. Do not infer the current contract from an id, title, notification, or remembered summary alone. Check related or potentially duplicate Tickets when creating or materially rescoping work. +Read the relevant Ticket before making implementation, routing, review, state, or conclusion decisions. Natural-language user intent, requirements, acceptance criteria, and binding decisions govern the work; a Ticket is not necessarily code or a fixed implementation/review/merge pipeline. Do not infer the current contract from an id, title, notification, or remembered summary alone. Check related or potentially duplicate Tickets when creating or materially rescoping work. -Keep durable Ticket records centered on user intent, confirmed background, requirements, acceptance criteria, binding decisions, and implementation/review evidence. Do not copy your own role boundary, current-turn plan, work report, or decision to stop after Ticket authoring into the Ticket as a product prohibition or execution constraint. Do not add constraints the user did not request; record an approval gate only when the user places that gate on the Ticket itself. These are authoring rules that you apply with the request context, not facts for an independent text-only checker to infer. For implementation and review workflows, keep routine revision, verdict, fix, and rereview evidence on the Merge Request; use Ticket comments only for blockers or decisions requiring orchestration attention and the final approved handoff. Use `QueryObjective` for bounded Objective discovery and `ShowObjective` for authoritative revision and linked-Ticket context when coordinating broader work. Separate confirmed facts from user claims, hypotheses, and open questions. Avoid prematurely turning implementation tactics into requirements. +Keep durable Ticket records centered on user intent, confirmed background, requirements, acceptance criteria, binding decisions, and useful evidence. Do not copy your own role boundary, current-turn plan, work report, or decision to stop after Ticket authoring into the Ticket as a product prohibition or execution constraint. Do not add constraints the user did not request; record an approval gate only when the user places that gate on the Ticket itself. These are authoring rules that you apply with the request context, not facts for an independent text-only checker to infer. Separate confirmed facts from user claims, hypotheses, and open questions. Avoid prematurely turning implementation tactics into requirements. Use `QueryObjective` for bounded Objective discovery and `ShowObjective` for authoritative revision and linked-Ticket context when coordinating broader work. -Treat workflow states and relations as typed domain data rather than filesystem layout or naming conventions. Distinguish implementation completion from review and closure, and perform only lifecycle actions supported by the tools and authority available to the current Worker. +Choose a result and return path suited to the request: conversation, an optional Ticket comment, an optional Drive document/artifact when that surface is available, or a repository result. Results need not be persisted as comments or artifacts when the request does not require it. In an MR workflow, keep routine review requests, verdicts, fixes, and rereview evidence on the explicitly addressed MR rather than duplicating each iteration on the Ticket. Do not require an `implementation_report` or treat linked-MR evidence as universal Ticket completion authority. + +Use authorized `TicketWorkflowState`, `CompleteTicket`, or `TicketClose` decisions with current item/state evidence and a reason when the request calls for them. Backend tools enforce actor authority, CAS, replay, and resource boundaries, not natural-language satisfaction or a universal state sequence. No Merge Request or approval is a prerequisite for a generic Ticket decision. Default code Git/MR practices remain separate from these Backend requirements; they do not grant review or merge authority. A request may require independent review before merge, no review, completion/closure without integration, or return without concluding the Ticket. Respect the selected return path: a turn ending or a result report is not itself a completion decision. Mechanism and recorded evidence are not a substitute for real judgment about whether the requested work is satisfied. + +Treat workflow states and relations as typed domain data rather than filesystem layout or naming conventions. Distinguish a result report, Ticket conclusion, MR review/integration, unfinished assignment, and Worker lifecycle. Terminal current responsibility can remain for display after unfinished work ends; stopping a Worker alone does not end unfinished work, and Ticket conclusion alone does not stop, remove, or clean up its Worker or attachments. Perform only lifecycle actions supported by the tools and authority available to the current Worker. diff --git a/resources/prompts/role/coder.md b/resources/prompts/role/coder.md index 2d78b1f9c..743d20f41 100644 --- a/resources/prompts/role/coder.md +++ b/resources/prompts/role/coder.md @@ -1,8 +1,10 @@ -You are the assigned Coder. Implement the requested scope in the provided Workdir and keep durable evidence on the Ticket and its Merge Request. +You are the assigned Coder. Implement the requested scope in the provided Workdir. Follow natural-language user intent and the requested return path rather than imposing a universal review, merge, or Ticket conclusion gate. The following Git/MR practices are the default code recipe unless the bounded request or return path says otherwise, not Backend prerequisites for every Ticket. The optional `builtin:coder-review` Flow guides that recipe and does not grant authority. A request for no review or return without conclusion must not silently become a review cycle or `CompleteTicket` decision; independent review before merge still requires the trusted Reviewer path, and merge remains Orchestrator authority. + +Return the implementation summary, changed files, validation, and limitations in conversation and optionally a Ticket comment or available Drive result when useful or requested. Ticket conclusion is a separate authorized decision based on actual satisfaction and user intent, not an automatic result of a commit, approval, or terminal Flow state. Use each existing repository-scoped Merge Request as the routine authority for its review requests, verdicts, fixes, and rereview cycles. A Ticket may have multiple Merge Requests, but at most one open Merge Request for a given repository. `OpenMergeRequest` creates that repository's selector-based Merge Request; if one already exists, use its explicit ID with `ShowMergeRequest`, keep its original selectors, and advance only that same source ref with a normal non-force push. Never invent an add-revision operation, replacement Merge Request, or fresh integration branch. Source movement requires fresh review of the exact new ref. Target-only movement does not invalidate source approval and is handled later by Orchestrator integration authority. -Do not add a Ticket comment for each review or fix iteration. Add a Ticket comment only when a blocker or decision requires Orchestrator attention, or once after approval to hand off the final implementation and validation evidence. +Do not add a Ticket comment for each review or fix iteration. An optional Ticket comment can record a blocker or decision requiring Orchestrator attention or concise final implementation and validation evidence when useful or requested; an approved handoff is not mandatory for every task. Treat the first committed user message as the bounded Ticket/action context and do not infer control-plane identity from prose. When multiple Workdirs are attached, route every Workdir tool call by its stable alias. Every declared `read_write` target is an authorized implementation/publish/Merge Request repository, but writable targets are not automatically mandatory deliverables; `read_only` targets are reference material and must never be modified or used as a command target. Treat a Backend capability rejection as authority rather than attempting another path to write. diff --git a/resources/prompts/role/orchestrator.md b/resources/prompts/role/orchestrator.md index bfb556b66..4bcaad8c0 100644 --- a/resources/prompts/role/orchestrator.md +++ b/resources/prompts/role/orchestrator.md @@ -2,9 +2,13 @@ You are the Ticket Orchestrator role. {% include "common.git" %} -Keep durable orchestration behavior here and treat the first committed user message as concrete Ticket/action context only. Use typed Ticket tools and current repository state as authority. Explicitly start bounded Ticket work with `SpawnTicketWorker`, selecting a registered `profile`, an `initial_request`, an optional `flow`, and alias-keyed `workdir_attachments`. Work assignment is independent from the selected Profile: ordinary investigation can use `builtin:default` without a Flow or Workdir; Git implementation can select `builtin:coder` with `builtin:coder-review`. Repository attachments must match declared Ticket targets and Backend derives their capabilities; explicit ExternalGrants retain their own grant ceilings. Never request attachment capabilities or infer review/merge authority from a Profile, Flow, or launch text. Do not first record `inprogress`: the guarded operation accepts initial input, assignment, and attachment finalization before recording start. A state change alone does not launch a Worker. If any Runtime, assignment, or finalization step fails or has an unknown outcome, reread durable operation evidence rather than creating a replacement Worker or reporting acceptance. After start, reread the Ticket and verify `inprogress` and `current_worker` before routing further work. Stop when the Ticket explicitly records a separate approval gate or execution requires a new decision outside its bounded scope. +Keep durable orchestration behavior here and treat the first committed user message as concrete Ticket/action context only. Read the Ticket and follow its natural-language intent and requested return path; do not impose implementation, review, merge, approval, or conclusion on every Ticket. Work may be investigation, analysis, planning, documentation, or code. Results may be returned in conversation, optionally recorded in a Ticket comment or available Drive surface, or published to a repository as requested. Complete, close, continue, or return without conclusion according to the request and actual result, using only authorized typed tools. Tool mechanisms enforce authority, not real judgment of whether requirements are satisfied. -The assigned Coder owns its review/fix loop and launches Reviewer SubWorkers itself. Do not spawn, restore, assign, or route work to Backend/Runtime Reviewer Workers, and do not select a Reviewer profile through the generic WorkerSpawn path. If durable `Review` evidence for the current provider-resolved `selector_from` subject is missing, indeterminate, revoked, cancelled, or requests changes, keep the Ticket in progress and return the requirement to the same assigned Coder; never compensate by creating an independent Reviewer Worker. +Explicitly start bounded Ticket work with `SpawnTicketWorker`, an `initial_request`, and optional registered `profile`, `flow`, and alias-keyed `workdir_attachments`. Omitting the profile selects the general `builtin:ticket-worker`; no Flow or repository attachment is required. Assignment is independent from Profile: choose another registered Profile when its tools and instructions fit the task. Git implementation can select `builtin:coder` and the optional `builtin:coder-review` recipe. Repository attachments must match declared Ticket targets and Backend derives their capabilities; explicit ExternalGrants retain their own grant ceilings. Never request attachment capabilities or infer review/merge authority from a Profile, Flow, or launch text. Recording `inprogress` is not a launch prerequisite: the guarded operation accepts initial input, assignment, and attachment finalization before recording start. A state change alone does not launch a Worker. If any Runtime, assignment, or finalization step fails or has an unknown outcome, reread durable operation evidence rather than creating a replacement Worker or reporting acceptance. After start, reread the Ticket and verify `inprogress` and `current_worker` before routing further work. Stop when the Ticket explicitly records a separate approval gate or execution requires a new decision outside its bounded scope. + +The following Git/MR practices apply to code work using that recipe, not to generic Ticket completion. A review-not-required request does not by itself authorize bypassing guarded MR integration. + +The assigned Coder owns its review/fix loop and launches Reviewer SubWorkers itself. Do not spawn, restore, assign, or route work to Backend/Runtime Reviewer Workers, and do not select a Reviewer profile through the generic WorkerSpawn path. If durable `Review` evidence for the current provider-resolved `selector_from` subject is missing, indeterminate, revoked, cancelled, or requests changes, do not integrate that MR; return the review requirement to the same assigned Coder when that work is requested. Never compensate by creating an independent Reviewer Worker or treating review status alone as a Ticket-state requirement. Treat every linked Merge Request as an explicitly addressed implementation result; never invent a primary MR. For each open MR, a current provider-resolved source ref, repository evidence, an effective approval for that exact subject and current Ticket item revision, and no unresolved request-changes are required before integration. Do not require an `implementation_report`. Reviewer authority—not Backend parsing—judges whether the natural-language Ticket requirements and validation evidence are satisfied. Recheck `ShowTicket`, each `ShowMergeRequest`, and each `CheckMergeRequestReadiness` immediately before guarded integration. Source movement requires a fresh Reviewer attempt. Target-only movement preserves source approval and requires refreshed integration evidence against the current target. @@ -14,16 +18,16 @@ Perform integration through normal source-control operations in the bound Orches Push the resulting `merge_to` branch through its configured normal push path. Preserve repository consistency guards: never rewrite history, bypass branch or Worktree safety, update an unrelated ref, or integrate a source revision different from the reviewed subject. Treat an integration blocker as authoritative only when supported by a concrete source-control or provider failure; before proposing a new control-plane capability, verify that the required operation cannot be expressed through the existing bound Workdir and repository provider. -After each repository push, verify the provider resolves `merge_to` exactly to `target_ref_after`, then call `CompleteMergeRequest` with that explicit MR ID, before/after evidence, authoritative approval event, and merge strategy. `CompleteMergeRequest` records and verifies only that already-applied repository integration; it does not update the branch itself, and it does not complete the Ticket. Partial integration is valid: keep the Ticket and assignment in progress while remaining linked MRs are implemented, reviewed, or integrated. +After each repository push, verify the provider resolves `merge_to` exactly to `target_ref_after`, then call `CompleteMergeRequest` with that explicit MR ID, before/after evidence, authoritative approval event, and merge strategy. `CompleteMergeRequest` records and verifies only that already-applied repository integration; it does not update the branch itself, and it does not complete the Ticket. Partial integration is valid: accurately report remaining linked MRs and follow the requested continuation or return path; do not claim they were integrated. -If a repository push succeeds but MR completion recording fails, do not push again or invent a new result. Retry the same `CompleteMergeRequest` operation and evidence. Once every linked required result is recorded, reread the latest Ticket item revision and exact linked MR/source-result set, identify the effective Reviewer approval that attests that exact snapshot and judges the requirements satisfied, then call `CompleteTicket` with the item revision, MR IDs, and that requirement approval event ID. If the Ticket was rescoped after partial or full integration, obtain a fresh Reviewer attestation against the immutable merged-result subjects through an explicitly addressed merged MR; this post-integration review updates requirement judgment without rewriting any MergeResult. `CompleteTicket` alone moves the Ticket to `done` and releases unfinished work atomically while retaining current responsibility for display; MR-set changes, rescope, review revocation, stale assignment/state, or an unmerged result must fail closed. Retry an already-recorded operation only with the same fingerprint. +If a repository push succeeds but MR completion recording fails, do not push again or invent a new result. Retry the same `CompleteMergeRequest` operation and evidence. Separately judge whether the Ticket's requested result has been satisfied and whether the user requested completion, closure, continuation, or return without conclusion. For an authorized completion decision, reread `ShowTicket` and call `CompleteTicket` with current item revision, expected state, a stable operation key, a reason, and optional supporting references. Generic Ticket completion does not require an MR, integration, or Reviewer approval and does not authorize any of them. The Backend validates actor authority and item/state CAS; it does not judge natural-language satisfaction. Retry an already-recorded operation only with the same fingerprint. Terminal Ticket responsibility remains visible after unfinished work ends. Do not create or delegate an implementation worktree/branch until the Ticket records enough agreed intent, requirements, and acceptance criteria to bound the work. Workspace roots, cwd, profile selector, and launch-prompt configuration are control-plane/environment facts rather than user instructions. If the launch input names explicit Git/worktree operation targets, use those paths only for that operation and do not substitute heuristic roots. -Use `WorkerRemove` only for a terminal or authoritatively reassigned non-internal Coder after implementation, review, fix, merge/commit, and report handoffs are complete. Do not remove a Coder merely because one turn completed or it is temporarily idle; retain it while review or request-changes work can still return. The Worker must already be stopped, must not be restoring, must have no unfinished Ticket work, pending notification, Reviewer handoff, legal hold, or pin, and must not be this Orchestrator. Immediately before removal, reread authoritative Ticket state, assignment, thread/review evidence, and the target Worker through `WorkerList`, then call `WorkerRemove` with a concise reason. Backend authority captures the current Worker revision internally and revalidates removal guards; do not guess policy or supply lifecycle authority in model input. After removal, reread the Worker catalog and attachment state. Treat unfinished-work, running/restoring, retention-policy, attachment-close, and attachment-release conflicts as authoritative failures. `WorkerRemove` releases the Worker attachment but deliberately preserves the Workdir materialization. +Use `WorkerRemove` only for an eligible terminal or authoritatively reassigned non-internal Worker after its requested work and handoffs are complete; implementation, review, integration, and reporting matter only when requested for that work. Do not remove a Worker merely because one turn completed or it is temporarily idle; retain it while requested continuation, review, or request-changes work can still return. The Worker must already be stopped, must not be restoring, must have no unfinished Ticket work, pending notification, Reviewer handoff, legal hold, or pin, and must not be this Orchestrator. Immediately before removal, reread authoritative Ticket state, assignment, thread/review evidence, and the target Worker through `WorkerList`, then call `WorkerRemove` with a concise reason. Backend authority captures the current Worker revision internally and revalidates removal guards; do not guess policy or supply lifecycle authority in model input. After removal, reread the Worker catalog and attachment state. Treat unfinished-work, running/restoring, retention-policy, attachment-close, and attachment-release conflicts as authoritative failures. `WorkerRemove` releases the Worker attachment but deliberately preserves the Workdir materialization. -Coder cleanup is a separate post-completion decision owned by this Orchestrator. Never predeclare `delete_on_completion`, `retain_on_completion`, or equivalent retention policy when launching or reserving a Coder. After all `CompleteMergeRequest` operations and guarded `CompleteTicket`, perform one cleanup pass before ending the orchestration turn: reread the current Ticket and `WorkerList`, verify completion is authoritative and the Coder has no unfinished Ticket work (terminal current responsibility may remain), then inspect the Coder Worker, Workdir attachment and occupancy, repository cleanliness, ownership, provider availability, and any other current use of that Workdir. For Worker control, use the exact subject returned by `WorkerList`. If the Coder is active, call `WorkerStop` and reread its terminal status before `WorkerRemove`; idle status, Coder self-report, or review approval alone is not removal authority. Retain an existing or still-needed Workdir. Delete only a Ticket-dedicated Workdir that this Orchestrator created or selected and current authority proves is no longer needed, clean, and unoccupied. +Worker cleanup is a separate lifecycle decision owned by this Orchestrator, not an automatic consequence of a Ticket state, result report, or Flow transition. Never predeclare `delete_on_completion`, `retain_on_completion`, or equivalent retention policy when launching or reserving a Worker. When the requested handoff and any authorized conclusion are complete, perform one cleanup pass before ending the orchestration turn if cleanup is in scope: reread the current Ticket and `WorkerList`, verify the assigned Worker has no unfinished Ticket work (terminal current responsibility may remain), then inspect its Worker state, Workdir attachment and occupancy, repository cleanliness, ownership, provider availability, and any other current use of that Workdir. For Worker control, use the exact subject returned by `WorkerList`. If the Worker is active, call `WorkerStop` and reread its terminal status before `WorkerRemove`; idle status, Worker self-report, or review approval alone is not removal authority. Retain an existing or still-needed Workdir. Delete only a Ticket-dedicated Workdir that this Orchestrator created or selected and current authority proves is no longer needed, clean, and unoccupied. -For Ticket-dedicated cleanup, preserve this guarded order: stop the Coder if needed and confirm it is terminal; verify there is no unfinished Ticket work; call `WorkerRemove`; use `WorkdirList` to reread the actual Workdir and confirm attachment release, clean state, and no occupancy; only then call `WorkdirDelete`. Terminal Ticket responsibility is retained for display and does not require unassignment before cleanup. Never delete a Workdir before Worker removal has released its attachment, and never invent an unassignment operation or bypass when the required authority is unavailable. `UnfinishedWork` (`unfinished_work` on the wire) requires explicit work end or reassignment through available guarded authority, then rereading before retrying `WorkerRemove`; idle or stopped status does not end unfinished work. Running, restoring, pinned, legal hold, occupied, dirty, blocked, provider-unavailable, ownership-unknown, still-needed, or uncertain state means retain the resource and report the concrete bounded blocker. If stop, work end/reassignment, removal, attachment release, or deletion reports a partial failure, do not infer success or advance to the next step; reread current Ticket, active unfinished work, Worker, and Workdir authority before a bounded safe retry. Cleanup failure never rolls back an already completed Merge Request or Ticket. Do not add routine cleanup success comments; report only blockers that require human or Orchestrator judgment. Never force removal, discard changes, or retry from stale assumptions. +For Ticket-dedicated cleanup, preserve this guarded order: stop the Worker if needed and confirm it is terminal; verify there is no unfinished Ticket work; call `WorkerRemove`; use `WorkdirList` to reread the actual Workdir and confirm attachment release, clean state, and no occupancy; only then call `WorkdirDelete`. Terminal Ticket responsibility is retained for display and does not require unassignment before cleanup. Never delete a Workdir before Worker removal has released its attachment, and never invent an unassignment operation or bypass when the required authority is unavailable. `UnfinishedWork` (`unfinished_work` on the wire) requires explicit work end or reassignment through available guarded authority, then rereading before retrying `WorkerRemove`; idle or stopped status does not end unfinished work. Running, restoring, pinned, legal hold, occupied, dirty, blocked, provider-unavailable, ownership-unknown, still-needed, or uncertain state means retain the resource and report the concrete bounded blocker. If stop, work end/reassignment, removal, attachment release, or deletion reports a partial failure, do not infer success or advance to the next step; reread current Ticket, active unfinished work, Worker, and Workdir authority before a bounded safe retry. Cleanup failure never rolls back an already completed Merge Request or Ticket. Do not add routine cleanup success comments; report only blockers that require human or Orchestrator judgment. Never force removal, discard changes, or retry from stale assumptions. diff --git a/resources/prompts/role/reviewer.md b/resources/prompts/role/reviewer.md index b1a25d6b7..8ea4beb7c 100644 --- a/resources/prompts/role/reviewer.md +++ b/resources/prompts/role/reviewer.md @@ -1,5 +1,7 @@ You are the Ticket Reviewer role running as an actual Runtime-owned direct child of the assigned Coder. +This role is the trusted independent review path for an explicitly requested MR review, not a prerequisite for every Ticket conclusion. Review capability authenticates the recorded attempt; it does not supply the verdict or replace real judgment. + Keep role behavior here and treat the first committed user message as bounded Ticket/Merge Request context only, never as a supplied verdict. Review the host-captured explicit Merge Request, `ReviewRequested.subject_ref`, `ticket_item_revision`, and exact linked Merge Request subject snapshot against Ticket intent, binding decisions/invariants, acceptance criteria, and project design boundaries. When a Ticket has multiple MRs, judge the selected MR in the context of that complete linked result set without reusing another MR's approval; an `approve` decision attests that the captured full snapshot satisfies the current Ticket requirements and reported validation, not merely that the selected diff is locally acceptable. Use the available Workdir inspection and command tools for focused validation, but do not intentionally modify implementation files, merge, close, update a repository ref, or take over implementation. Your prose response is not review authority. Before finishing, call `ReviewMergeRequest` exactly once with `approve` or `request_changes`, a bounded evidence summary, and concrete structured findings. Capability authority and subject identity are injected by your child Workspace client and are not model inputs. For an open MR, the Server re-resolves `selector_from`; if it moved, submission records cancellation and fails rather than approving stale work. For an explicitly addressed merged MR, the captured subject is the immutable MergeResult source and the review provides fresh requirement judgment after rescope without changing integration evidence. A verdict applies only to that captured subject; target-only movement does not invalidate approval for an unchanged source, and target integration remains Orchestrator authority. diff --git a/resources/prompts/role/ticket-worker.md b/resources/prompts/role/ticket-worker.md index ad39a3415..a992b6c4b 100644 --- a/resources/prompts/role/ticket-worker.md +++ b/resources/prompts/role/ticket-worker.md @@ -2,6 +2,6 @@ You are the assigned Ticket Worker. Carry out the user's requested work and keep Read the current Ticket with `ShowTicket` before acting. Follow user intent and the Ticket's requirements and acceptance criteria without inventing deliverables or approval gates. The committed user request supplies bounded action context, not control-plane identity or authority. Use only explicitly granted resources and available typed tools. Assignment and Profile selection do not expand resource grants; the typed Backend is authoritative for actor identity, current assignment, Ticket decisions, and resource access. Treat a Backend rejection as authoritative rather than trying a CLI, direct storage access, or another path around it. -Use `TicketComment` for useful natural-language progress, results, blockers, and decisions that need attention. Use `TicketWorkflowState` for authorized progress-display updates with an explanation; it does not launch work, enforce a state sequence, or grant additional resources. When the requested work meets its acceptance criteria, use `CompleteTicket` with a natural-language reason describing the result and supporting evidence, and optional typed references when relevant. Use the current item revision and expected state from `ShowTicket` and a stable operation key for exact replay of each decision; reread after a conflict rather than guessing. +Choose the requested return path rather than always concluding the Ticket. Return results in conversation, optionally use `TicketComment` for useful progress, results, blockers, or decisions, and optionally publish an available Drive document/artifact when useful or requested. No comment or artifact is universally required. Use `TicketWorkflowState` for authorized progress-display updates with an explanation; it does not launch work, enforce a state sequence, or grant additional resources. When the work meets its acceptance criteria and the request calls for completion, use `CompleteTicket` with a natural-language reason describing the result and optional supporting references. Use authorized `TicketClose` for requested closure when available. A request to return without conclusion must not become an automatic completion or closure decision. Use the current item revision and expected state from `ShowTicket` and a stable operation key for exact replay of each decision; reread after a conflict rather than guessing. The Backend checks authority and CAS, not real judgment of natural-language satisfaction. Completion evidence should describe what was done, how it was checked, and any remaining limitations. A commit, Merge Request, approval, or fixed workflow sequence is not a prerequisite for Ticket progress or completion. Do not claim work or validation that did not occur. Ticket completion is separate from Merge Request review or integration and does not confer either authority. If the request needs unavailable resources or authority, report the blocker and ask for the missing grant rather than assuming it. diff --git a/tools/web-ux/browser-tests/memory_document_fixture_server.ts b/tools/web-ux/browser-tests/memory_document_fixture_server.ts index 4fdb49d4a..d4de0cc06 100644 --- a/tools/web-ux/browser-tests/memory_document_fixture_server.ts +++ b/tools/web-ux/browser-tests/memory_document_fixture_server.ts @@ -418,7 +418,7 @@ Deno.serve({ hostname: "127.0.0.1", port }, async (request) => { display_name: "Embedded Runtime", built_in: true, worker_creation_available: true, - working_directory_required: false, + supports_workdir_attachments: false, status: "active", diagnostics: [], }], diff --git a/tools/web-ux/browser-tests/ticket_fixture_server.ts b/tools/web-ux/browser-tests/ticket_fixture_server.ts new file mode 100644 index 000000000..2d7934930 --- /dev/null +++ b/tools/web-ux/browser-tests/ticket_fixture_server.ts @@ -0,0 +1,319 @@ +// Synthetic API fixture serving the production static UI; no Worker/Git execution. +import { extname, join, normalize } from "jsr:@std/path@1.1.4"; +import { + fixtureDetail, + fixturePage, +} from "../../../web/workspace/src/lib/workspace/home/dashboard.test-fixtures.ts"; +import type { TicketDetail } from "../../../web/workspace/src/lib/generated/ticket-api.ts"; +import { emptyLaunchOptions } from "../../../web/workspace/src/lib/workspace/sidebar/worker-launch.test-fixtures.ts"; +const port = Number(Deno.args[0]); +const root = Deno.args[1]; +const legacy = Deno.args.includes("--legacy"); +const tickets = new Map(); +const bodies: unknown[] = []; +function ticket(key: string) { + if (!tickets.has(key)) { + const value: TicketDetail = fixtureDetail(key); + value.state = "planning"; + value.title = key === "T-2" + ? "Read-only investigation" + : key === "T-3" + ? "Independent review before merge" + : "Compare options without deciding"; + value.body = key === "T-2" + ? "Investigate using read-only sources; review is not required." + : key === "T-3" + ? "Implement the change, then independent review before merge." + : "Return options to the user. Do not draw a conclusion."; + value.action_eligibility.can_queue = true; + value.action_eligibility.queue_tickets = [key]; + value.action_eligibility.can_start_manual_worker = true; + if (key === "T-2") { + value.targets = [{ repository_key: "main", ref_selector: "develop", access: "read_only" }]; + } + if (key === "T-3") { + value.merge_requests = [{ + merge_request_id: "mr-1", + repository_key: "main", + state: "open", + selector_from: "work/fixture", + selector_to: "develop", + review_status: "none", + source_ref_observation: { status: "unavailable", code: "provider_unavailable" }, + current_subject_ref: null, + review_subject_ref: null, + review_excerpt: null, + integration_evidence_error: null, + updated_at: "2026-01-02T00:00:00Z", + }]; + } + tickets.set(key, value); + } + const value = structuredClone(tickets.get(key)!); + if (legacy) { + const wire = value as unknown as Record; + wire.current_coder = wire.current_worker; + delete wire.current_worker; + const actions = wire.action_eligibility as Record; + actions.can_start_manual_coder = actions.can_start_manual_worker; + delete actions.can_start_manual_worker; + } + return value; +} +Deno.serve({ hostname: "127.0.0.1", port }, async (request) => { + const url = new URL(request.url); + if (url.pathname === "/health") return new Response("ok"); + if (url.pathname === "/fixture-state") return Response.json(bodies); + if (url.pathname === "/api/workspaces") { + return Response.json([{ + workspace_id: "tickets", + display_name: "Shared investigation", + owner_account_id: "owner", + state: "active", + created_at: "2026-01-01T00:00:00Z", + updated_at: "2026-01-02T00:00:00Z", + }]); + } + const match = url.pathname.match(/^\/api\/w\/([^/]+)(\/.*)$/); + if (match) { + const [, id, path] = match; + if (path === "/workspace") { + return Response.json({ + workspace_id: id, + display_name: "Shared investigation", + record_authority: "fixture", + schema_version: 1, + auth: { + Passkey: { + rp_id: "127.0.0.1", + origin: url.origin, + public_base_url: url.origin, + cookie_name: "fixture", + }, + }, + permissions: { + manage_repositories: false, + manage_secrets: false, + manage_runtimes: false, + delete_workspace: false, + }, + extension_points: { + store: "fixture", + event_stream: { status: "ready", note: "fixture", diagnostics: [] }, + host_worker_bridge: { status: "ready", note: "fixture", diagnostics: [] }, + companion_console: { status: "ready", note: "fixture", diagnostics: [] }, + }, + }); + } + if (path === "/repositories") { + return Response.json({ + workspace_id: id, + items: [{ + repository_key: "main", + default_selector: "develop", + kind: "git", + provider: "git", + source: { kind: "local_path", uri: "/fixture/main" }, + source_revision: 1, + source_fingerprint: "fixture", + observed_status: "ready", + record_authority: "fixture", + }], + source: "fixture", + diagnostics: [], + }); + } + if (path === "/orchestrator") { + return Response.json({ + workspace_id: id, + online: false, + disposition: "offline", + worker: null, + diagnostics: [], + }); + } + if (path === "/workers/launch-options") { + const options = emptyLaunchOptions(id); + options.default_profile = "builtin:ticket-worker"; + options.profiles = [{ + id: "builtin:ticket-worker", + label: "Ticket Worker", + description: "Intent-led work", + feature_connections: { subjektiv: false }, + }, { + id: "builtin:coder", + label: "Coder", + description: "Code recipe", + feature_connections: { subjektiv: false }, + }]; + options.working_directories = [{ + working_directory_id: "read-only-sources", + source: { + kind: "external_grant", + grant_id: "fixture-grant", + grant_permissions: { read: true, write: false, command: false }, + }, + materializer_kind: "client_hosted_external", + status: "active", + cleanliness: "unknown", + }]; + if (legacy) { + for (const runtime of options.runtimes) { + const wire = runtime as unknown as Record; + wire.working_directory_required = wire.supports_workdir_attachments; + delete wire.supports_workdir_attachments; + } + } + return Response.json(options); + } + if (path === "/workers") { + return Response.json({ + workspace_id: id, + items: [], + diagnostics: [], + limit: 100, + source: "fixture", + }); + } + if (path === "/working-directories") { + return Response.json({ workspace_id: id, items: [], diagnostics: [] }); + } + if (path === "/protocol/ws" && request.headers.get("upgrade") === "websocket") { + const { socket, response } = Deno.upgradeWebSocket(request); + socket.onmessage = (event) => { + const frame = JSON.parse(String(event.data)); + if (frame?.message?.method === "subscribe_events") { + socket.send(JSON.stringify({ + protocol_version: 2, + frame: "response", + message: { + result: "subscribed", + payload: { + request_id: frame.message.params.request_id, + subscription_id: "fixture-workers", + selector: { topic: "workspace_workers" }, + snapshot: { topic: "workers", data: { workers: [] } }, + }, + }, + })); + } + }; + return response; + } + if (path === "/tickets" && request.method === "POST") { + const body = await request.json(); + bodies.push({ path, body }); + ticket("T-4"); + const created = tickets.get("T-4")!; + created.title = body.title; + created.body = body.body; + created.targets = body.targets ?? []; + return Response.json({ + id: created.id, + resource_key: "T-4", + slug: "fixture", + status: "Open", + }); + } + if (path === "/tickets") { + const items = ["T-1", "T-2", "T-3"].map(ticket).filter((t) => + !url.searchParams.has("states") || + url.searchParams.get("states")!.split(",").includes(t.state) + ); + return Response.json({ + workspace_id: id, + items: items.map((t) => ({ + id: t.id, + resource_key: t.resource_key, + title: t.title, + state: t.state, + priority: t.priority, + updated_at: t.updated_at, + queued_at: t.queued_at, + queued_by: t.queued_by, + record_source: "fixture", + workspace_action_priority: "background", + })), + invalid_records: [], + record_authority: "fixture", + limit: 30, + page: fixturePage(items.length), + }); + } + const tm = path.match(/^\/tickets\/([^/]+)(.*)$/); + if (tm) { + const key = decodeURIComponent(tm[1]).match(/T-\d+/)?.[0] ?? "T-1"; + if (request.method !== "GET") { + const body = await request.json(); + bodies.push({ path, body }); + if (url.searchParams.get("failure")) { + return Response.json({ message: "Outcome unknown; refresh before retry" }, { + status: 503, + }); + } + const stored = tickets.get(key) ?? (ticket(key), tickets.get(key)!); + if (body.expected_item_revision && body.expected_item_revision !== stored.item_revision) { + return Response.json({ message: "Ticket revision conflict; refresh" }, { status: 409 }); + } + if (tm[2] === "/state") { + stored.state = body.state; + stored.events.push({ + sequence: stored.events.length, + kind: "state_changed", + body: body.body, + reason: body.reason, + from: body.expected_state, + to: body.state, + references: [], + attributes: {}, + event_ref: `event-${stored.events.length}`, + }); + } else if (tm[2] === "/events") { + stored.events.push({ + sequence: stored.events.length, + kind: body.role, + body: body.body, + references: [], + attributes: {}, + event_ref: `event-${stored.events.length}`, + }); + } else if (tm[2] === "/close") { + stored.state = "closed"; + stored.resolution = body.resolution; + } else if (tm[2] === "/ready") stored.state = "ready"; + else if (tm[2] === "/queue") { + stored.state = "queued"; + return Response.json({ requested_ticket: key, queued_tickets: [key] }); + } else if (request.method === "PATCH") { + if (body.target) stored.targets = body.target.targets ?? []; + if (body.title) stored.title = body.title; + if (body.body) stored.body = body.body; + } + stored.item_revision += "x"; + stored.event_count = stored.events.length; + } + return Response.json(ticket(key)); + } + return Response.json({ message: "Unavailable fixture resource" }, { status: 404 }); + } + const relative = normalize(url.pathname.replace(/^\/+/, "") || "index.html"); + if (relative.startsWith("..")) return new Response("not found", { status: 404 }); + const mime: Record = { + ".html": "text/html", + ".js": "text/javascript", + ".css": "text/css", + ".woff2": "font/woff2", + ".svg": "image/svg+xml", + }; + let file = join(root, relative); + try { + if ((await Deno.stat(file)).isDirectory) file = join(file, "index.html"); + return new Response(await Deno.readFile(file), { + headers: { "content-type": mime[extname(file)] ?? "application/octet-stream" }, + }); + } catch { + return new Response(await Deno.readFile(join(root, "index.html")), { + headers: { "content-type": "text/html" }, + }); + } +}); diff --git a/tools/web-ux/browser-tests/ticket_shell_test.ts b/tools/web-ux/browser-tests/ticket_shell_test.ts new file mode 100644 index 000000000..b6ef1df4a --- /dev/null +++ b/tools/web-ux/browser-tests/ticket_shell_test.ts @@ -0,0 +1,258 @@ +import { assert, assertEquals } from "jsr:@std/assert@1.0.19"; +import { chromium } from "npm:playwright@1.59.1"; +import { loadScenario } from "../src/scenario.ts"; +import { startOwnedProcesses, stopOwnedProcesses } from "../src/processes.ts"; + +// Browser boundary over the production static build and synthetic loopback API. +// No Backend, Worker, Repository, review or integration operation is executed. +Deno.test("Ticket progress, comment results and reopen work without Git while real MR evidence stays separate", async () => { + const scenarioPath = new URL("../scenarios/tickets.json", import.meta.url).pathname; + const scenario = await loadScenario(scenarioPath); + const listener = Deno.listen({ hostname: "127.0.0.1", port: 0 }); + const port = (listener.addr as Deno.NetAddr).port; + listener.close(); + scenario.baseUrl = `http://127.0.0.1:${port}`; + scenario.processes![0].args![4] = String(port); + scenario.processes![0].readyUrl = `${scenario.baseUrl}/health`; + const output = new URL("../../../target/web-ux/t720-browser/", import.meta.url).pathname; + const processes = await startOwnedProcesses( + scenario.processes!, + scenarioPath, + `${output}/logs`, + [], + ); + const browser = await chromium.launch({ headless: true }); + try { + for (const colorScheme of ["light", "dark"] as const) { + for (const width of [1440, 768, 390]) { + const context = await browser.newContext({ + viewport: { width, height: 900 }, + colorScheme, + reducedMotion: "reduce", + }); + try { + const page = await context.newPage(); + const unexpected: string[] = []; + page.on("pageerror", (e) => unexpected.push(String(e))); + await page.goto(`${scenario.baseUrl}/w/tickets/tickets`); + const addTicket = page.getByRole("button", { name: "Add Ticket", exact: true }); + await addTicket.waitFor(); + const action = await addTicket.boundingBox(); + assert(action && action.x >= 0 && action.x + action.width <= width && action.y < 900); + assertEquals( + await page.evaluate("document.documentElement.scrollWidth > innerWidth"), + false, + ); + await addTicket.click(); + await page.locator(".ticket-create-form").waitFor(); + assertEquals(await page.locator(".ticket-target-row").count(), 0); + assertEquals( + await page.evaluate("document.documentElement.scrollWidth > innerWidth"), + false, + ); + await page.goto( + `${scenario.baseUrl}/w/tickets/tickets/T-1-compare-options-without-deciding`, + ); + await page.locator(".ticket-detail-header").waitFor(); + // Intent comes first at one-column widths, unlike the former controls-first layout. + if (width < 1024) { + const intent = await page.getByRole("heading", { name: "Intent", exact: true }) + .boundingBox(); + const progress = await page.getByRole("heading", { name: "Progress decision" }) + .boundingBox(); + assert(intent && progress && intent.y < progress.y); + } + const state = page.getByRole("combobox", { name: "State", exact: true }); + await state.waitFor(); + assertEquals(await state.locator("option").allTextContents(), [ + "planning", + "ready", + "queued", + "inprogress", + "done", + "closed", + ]); + await state.selectOption("inprogress"); + await page.getByLabel("Reason", { exact: true }).first().fill( + "Investigating options directly", + ); + await page.getByRole("button", { name: "Apply state", exact: true }).click(); + await page.locator('.ticket-detail-kicker [data-status="inprogress"]').waitFor(); + await page.getByText("Record result or comment", { exact: true }).click(); + await page.getByLabel("Body", { exact: true }).fill( + `Option A and B are available; return to the user without a conclusion (${colorScheme}/${width}).`, + ); + await page.getByRole("button", { name: "Append event" }).click(); + await page.getByText( + `Option A and B are available; return to the user without a conclusion (${colorScheme}/${width}).`, + { exact: true }, + ).waitFor(); + await state.selectOption("done"); + await page.getByLabel("Reason", { exact: true }).first().fill( + "Requested comparison returned", + ); + await page.getByLabel("Result, references, and remaining work (optional)").fill( + "Result: timeline comment. [Reference](https://example.com/options). Remaining: user choice.", + ); + await page.getByRole("button", { name: "Complete Ticket", exact: true }).click(); + await page.locator('.ticket-detail-kicker [data-status="done"]').waitFor(); + assertEquals( + await page.getByRole("heading", { name: "MR requirement evidence" }).count(), + 0, + ); + assert(await page.getByText("No Merge Requests linked.", { exact: false }).isVisible()); + await state.selectOption("planning"); + await page.getByLabel("Reason", { exact: true }).first().fill( + "User requests another comparison", + ); + await page.getByRole("button", { name: "Reopen / apply state" }).click(); + await page.locator('.ticket-detail-kicker [data-status="planning"]').waitFor(); + await page.getByRole("button", { name: "Request Orchestrator (queue)" }).click(); + await page.locator('.ticket-detail-kicker [data-status="queued"]').waitFor(); + await page.locator(".ticket-close-card > summary").click(); + await page.getByLabel("Resolution").fill("Discussion returned; no code or MR required"); + await page.getByRole("button", { name: "Close ticket", exact: true }).click(); + await page.locator('.ticket-detail-kicker [data-status="closed"]').waitFor(); + await page.goto(`${scenario.baseUrl}/w/tickets/tickets/T-2-read-only-investigation`); + await page.locator(".ticket-detail-header").waitFor(); + assertEquals( + await page.getByRole("combobox", { name: "Access", exact: true }).inputValue(), + "read_only", + ); + assert(await page.getByRole("button", { name: "Mark ready", exact: true }).isEnabled()); + await page.getByRole("button", { name: "Mark ready", exact: true }).click(); + await page.locator('.ticket-detail-kicker [data-status="ready"]').waitFor(); + assert(await page.getByRole("combobox", { name: "Repository", exact: true }).isEnabled()); + await page.getByRole("button", { name: "Save targets", exact: true }).click(); + await page.getByRole("button", { name: "Save targets", exact: true }).waitFor({ + state: "visible", + }); + await page.goto( + `${scenario.baseUrl}/w/tickets/tickets/T-3-independent-review-before-merge`, + ); + await page.locator(".ticket-detail-header").waitFor(); + await state.selectOption("done"); + await page.getByLabel("Reason", { exact: true }).first().fill( + "Progress decision is separate from review", + ); + await page.getByRole("button", { name: "Complete Ticket" }).click(); + await page.locator('.ticket-detail-kicker [data-status="done"]').waitFor(); + assert(await page.getByText("main: open", { exact: true }).isVisible()); + assert( + await page.getByText("Ticket completion is not MR approval or integration.", { + exact: true, + }).isVisible(), + ); + assertEquals(await page.getByText("main: merged", { exact: true }).count(), 0); + // Member normal operations do not enable owner configuration controls. + assertEquals(await page.getByRole("link", { name: "Secrets", exact: true }).count(), 0); + assertEquals( + await page.evaluate("document.documentElement.scrollWidth > innerWidth"), + false, + ); + await Deno.mkdir(output, { recursive: true }); + await page.screenshot({ + path: `${output}/${colorScheme}-${width}-mr-done.png`, + fullPage: true, + }); + assertEquals(unexpected, []); + // Reset synthetic records for the next viewport using the fixture's ordinary state API. + for (const key of ["T-1", "T-2", "T-3"]) { + const detail = + await (await context.request.get(`${scenario.baseUrl}/api/w/tickets/tickets/${key}`)) + .json(); + await context.request.post(`${scenario.baseUrl}/api/w/tickets/tickets/${key}/state`, { + data: { + state: "planning", + reason: "Fixture reset", + expected_state: detail.state, + expected_item_revision: detail.item_revision, + }, + }); + } + } finally { + await context.close(); + } + } + } + const context = await browser.newContext(); + try { + const page = await context.newPage(); + await page.goto(`${scenario.baseUrl}/w/tickets/tickets`); + await page.getByRole("button", { name: "Add Ticket", exact: true }).click(); + await page.getByLabel("Title", { exact: true }).fill("Repository-free investigation"); + await page.getByLabel("Body", { exact: true }).fill( + "Compare options and return without conclusion; review is unnecessary.", + ); + await page.getByRole("button", { name: "Create Ticket", exact: true }).click(); + await page.getByRole("heading", { name: "Repository-free investigation", exact: true }) + .waitFor(); + assert(await page.getByText("No repository targets.", { exact: true }).isVisible()); + // Generic remote launch: a natural request, not an inferred code/review pipeline. + await page.goto( + `${scenario.baseUrl}/w/tickets/workers/new?ticketId=T-4&initialInput=Return%20without%20conclusion.%20Review%20is%20unnecessary.`, + ); + await page.locator(".worker-launch-form").waitFor(); + await page.getByRole("combobox", { name: "Runtime", exact: true }).selectOption("remote"); + const launches: Record[] = []; + await page.route("**/api/w/tickets/workers", async (route) => { + launches.push(route.request().postDataJSON()); + await route.fulfill({ + status: 403, + json: { error: "permission_denied", message: "Permission denied", diagnostics: [] }, + }); + }); + await page.getByRole("button", { name: "Start Worker", exact: true }).click(); + await page.getByText("permission_denied: Permission denied", { exact: true }).waitFor(); + assertEquals(launches.length, 1); + assertEquals(launches[0].workdir_attachments, []); + assertEquals(launches[0].profile, null); + assertEquals(launches[0].initial_submit, [{ + kind: "text", + content: "Return without conclusion. Review is unnecessary.", + }]); + assertEquals((launches[0].ticket_assignment as { ticket_id: string }).ticket_id, "T-4"); + await page.unroute("**/api/w/tickets/workers"); + for ( + const [status, message] of [[409, "Update conflict."], [403, "Permission denied."], [ + 503, + "Outcome unknown or request rejected.", + ]] as const + ) { + await page.goto( + `${scenario.baseUrl}/w/tickets/tickets/T-1-compare-options-without-deciding`, + ); + await page.locator(".ticket-detail-header").waitFor(); + await page.route( + "**/tickets/*/state", + (route) => route.fulfill({ status, json: { error: "failure", message } }), + ); + await page.getByRole("combobox", { name: "State", exact: true }).selectOption("done"); + await page.getByLabel("Reason", { exact: true }).first().fill( + "Keep this draft on rejection", + ); + await page.getByRole("button", { name: "Complete Ticket" }).click(); + await page.getByRole("alert").getByText(message, { exact: false }).waitFor(); + assertEquals( + await page.getByLabel("Reason", { exact: true }).first().inputValue(), + "Keep this draft on rejection", + ); + assert(await page.locator('.ticket-detail-kicker [data-status="planning"]').isVisible()); + assert(await page.getByRole("button", { name: "Refresh Ticket status" }).isEnabled()); + await page.unroute("**/tickets/*/state"); + } + } finally { + await context.close(); + } + const requests = await (await fetch(`${scenario.baseUrl}/fixture-state`)).json(); + assert( + requests.some((r: { body: { body?: string } }) => + r.body.body?.includes("Remaining: user choice") + ), + ); + assert(!requests.some((r: { path: string }) => /merge|review|workers/.test(r.path))); + } finally { + await browser.close(); + await stopOwnedProcesses(processes); + } +}); diff --git a/tools/web-ux/deno.json b/tools/web-ux/deno.json index 1ca411068..e3e278be5 100644 --- a/tools/web-ux/deno.json +++ b/tools/web-ux/deno.json @@ -11,7 +11,7 @@ "web-ux": "deno run --allow-env --allow-net --allow-read --allow-write --allow-run --allow-sys cli.ts", "check": "deno check cli.ts src/*.ts tests/*.ts browser-tests/*.ts", "test": "deno test --allow-env --allow-read --allow-write --allow-run --allow-sys tests", - "test:browser": "deno test --allow-env --allow-net --allow-read --allow-write --allow-run --allow-sys browser-tests/capture_smoke_test.ts browser-tests/memory_document_shell_test.ts browser-tests/console_history_shell_test.ts browser-tests/workspace_home_shell_test.ts browser-tests/workspace_settings_shell_test.ts browser-tests/console_pending_shell_test.ts browser-tests/console_live_shell_test.ts browser-tests/console_live_admission_shell_test.ts" + "test:browser": "deno test --allow-env --allow-net --allow-read --allow-write --allow-run --allow-sys browser-tests/ticket_shell_test.ts browser-tests/capture_smoke_test.ts browser-tests/memory_document_shell_test.ts browser-tests/console_history_shell_test.ts browser-tests/workspace_home_shell_test.ts browser-tests/workspace_settings_shell_test.ts browser-tests/console_pending_shell_test.ts browser-tests/console_live_shell_test.ts browser-tests/console_live_admission_shell_test.ts" }, "fmt": { "lineWidth": 100, diff --git a/tools/web-ux/scenarios/tickets-dark.json b/tools/web-ux/scenarios/tickets-dark.json new file mode 100644 index 000000000..74b0e2ffe --- /dev/null +++ b/tools/web-ux/scenarios/tickets-dark.json @@ -0,0 +1,202 @@ +{ + "schemaVersion": 1, + "id": "tickets-dark", + "title": "Flexible Ticket progress and optional resources", + "baseUrl": "http://127.0.0.1:15289", + "colorScheme": "dark", + "reducedMotion": "reduce", + "personas": [ + { + "id": "member", + "label": "Workspace member, not settings owner", + "auth": { + "kind": "anonymous" + } + } + ], + "viewports": [ + { + "label": "desktop", + "width": 1440, + "height": 900 + }, + { + "label": "narrow", + "width": 768, + "height": 900 + }, + { + "label": "mobile", + "width": 390, + "height": 844 + } + ], + "routes": [ + { + "id": "options", + "label": "Return options without conclusion", + "path": "/w/tickets/tickets/T-1", + "goal": "Read intent, record results and progress without a repository", + "dataState": "No repository or MR", + "ready": { + "kind": "selector", + "selector": ".ticket-detail-header" + }, + "capturePoints": [ + { + "id": "initial", + "label": "Ticket detail", + "fullPage": true + }, + { + "id": "resolution", + "label": "Resolution and MR state", + "interaction": [ + { + "action": "click", + "selector": ".ticket-close-card > summary" + }, + { + "action": "click", + "selector": ".ticket-close-card textarea" + } + ], + "fullPage": true + } + ] + }, + { + "id": "read-only", + "label": "Investigation without review", + "path": "/w/tickets/tickets/T-2", + "goal": "Use read-only resources without requiring write or MR", + "dataState": "Read-only target", + "ready": { + "kind": "selector", + "selector": ".ticket-detail-header" + }, + "capturePoints": [ + { + "id": "initial", + "label": "Ticket detail", + "fullPage": true + }, + { + "id": "resolution", + "label": "Resolution and MR state", + "interaction": [ + { + "action": "click", + "selector": ".ticket-close-card > summary" + }, + { + "action": "click", + "selector": ".ticket-close-card textarea" + } + ], + "fullPage": true + } + ] + }, + { + "id": "review", + "label": "Independent review before merge", + "path": "/w/tickets/tickets/T-3", + "goal": "Separate progress from actual MR review and integration", + "dataState": "Open MR, unavailable source observation", + "ready": { + "kind": "selector", + "selector": ".ticket-detail-header" + }, + "capturePoints": [ + { + "id": "initial", + "label": "Ticket detail", + "fullPage": true + }, + { + "id": "resolution", + "label": "Resolution and MR state", + "interaction": [ + { + "action": "click", + "selector": ".ticket-close-card > summary" + }, + { + "action": "click", + "selector": ".ticket-close-card textarea" + } + ], + "fullPage": true + } + ] + }, + { + "id": "launch", + "label": "Natural request with optional recipe and resources", + "path": "/w/tickets/workers/new?ticketId=T-1&ticketTitle=Compare%20options%20without%20deciding&initialInput=Return%20options%20without%20a%20conclusion.%20Review%20is%20unnecessary.", + "goal": "Choose the general Ticket worker, no mandatory repository or Flow", + "dataState": "Member with embedded and remote Runtimes, read-only external grant available but not claimed", + "ready": { + "kind": "selector", + "selector": ".worker-launch-form" + }, + "capturePoints": [ + { + "id": "initial", + "label": "Ticket launch", + "fullPage": true + } + ] + }, + { + "id": "list", + "label": "Member creates a repository-free Ticket", + "path": "/w/tickets/tickets", + "goal": "Create work from intent with optional resources, not a fixed delivery pipeline", + "dataState": "Three lightweight progress lanes, member normal operations", + "ready": { + "kind": "selector", + "selector": ".ticket-kanban" + }, + "capturePoints": [ + { + "id": "initial", + "label": "Progress lanes", + "fullPage": true + }, + { + "id": "create", + "label": "Optional resources", + "interaction": [ + { + "action": "click", + "selector": "button:has-text(\"Add Ticket\")" + } + ], + "ready": { + "kind": "selector", + "selector": ".ticket-create-form" + }, + "fullPage": true + } + ] + } + ], + "processes": [ + { + "id": "ticket-fixture", + "command": "deno", + "cwd": "..", + "args": [ + "run", + "--allow-net", + "--allow-read", + "browser-tests/ticket_fixture_server.ts", + "15289", + "../../web/workspace/build" + ], + "readyUrl": "http://127.0.0.1:15289/health" + } + ] +} diff --git a/tools/web-ux/scenarios/tickets.json b/tools/web-ux/scenarios/tickets.json new file mode 100644 index 000000000..3b94ce688 --- /dev/null +++ b/tools/web-ux/scenarios/tickets.json @@ -0,0 +1,202 @@ +{ + "schemaVersion": 1, + "id": "tickets", + "title": "Flexible Ticket progress and optional resources", + "baseUrl": "http://127.0.0.1:15289", + "colorScheme": "light", + "reducedMotion": "reduce", + "personas": [ + { + "id": "member", + "label": "Workspace member, not settings owner", + "auth": { + "kind": "anonymous" + } + } + ], + "viewports": [ + { + "label": "desktop", + "width": 1440, + "height": 900 + }, + { + "label": "narrow", + "width": 768, + "height": 900 + }, + { + "label": "mobile", + "width": 390, + "height": 844 + } + ], + "routes": [ + { + "id": "options", + "label": "Return options without conclusion", + "path": "/w/tickets/tickets/T-1", + "goal": "Read intent, record results and progress without a repository", + "dataState": "No repository or MR", + "ready": { + "kind": "selector", + "selector": ".ticket-detail-header" + }, + "capturePoints": [ + { + "id": "initial", + "label": "Ticket detail", + "fullPage": true + }, + { + "id": "resolution", + "label": "Resolution and MR state", + "interaction": [ + { + "action": "click", + "selector": ".ticket-close-card > summary" + }, + { + "action": "click", + "selector": ".ticket-close-card textarea" + } + ], + "fullPage": true + } + ] + }, + { + "id": "read-only", + "label": "Investigation without review", + "path": "/w/tickets/tickets/T-2", + "goal": "Use read-only resources without requiring write or MR", + "dataState": "Read-only target", + "ready": { + "kind": "selector", + "selector": ".ticket-detail-header" + }, + "capturePoints": [ + { + "id": "initial", + "label": "Ticket detail", + "fullPage": true + }, + { + "id": "resolution", + "label": "Resolution and MR state", + "interaction": [ + { + "action": "click", + "selector": ".ticket-close-card > summary" + }, + { + "action": "click", + "selector": ".ticket-close-card textarea" + } + ], + "fullPage": true + } + ] + }, + { + "id": "review", + "label": "Independent review before merge", + "path": "/w/tickets/tickets/T-3", + "goal": "Separate progress from actual MR review and integration", + "dataState": "Open MR, unavailable source observation", + "ready": { + "kind": "selector", + "selector": ".ticket-detail-header" + }, + "capturePoints": [ + { + "id": "initial", + "label": "Ticket detail", + "fullPage": true + }, + { + "id": "resolution", + "label": "Resolution and MR state", + "interaction": [ + { + "action": "click", + "selector": ".ticket-close-card > summary" + }, + { + "action": "click", + "selector": ".ticket-close-card textarea" + } + ], + "fullPage": true + } + ] + }, + { + "id": "launch", + "label": "Natural request with optional recipe and resources", + "path": "/w/tickets/workers/new?ticketId=T-1&ticketTitle=Compare%20options%20without%20deciding&initialInput=Return%20options%20without%20a%20conclusion.%20Review%20is%20unnecessary.", + "goal": "Choose the general Ticket worker, no mandatory repository or Flow", + "dataState": "Member with embedded and remote Runtimes, read-only external grant available but not claimed", + "ready": { + "kind": "selector", + "selector": ".worker-launch-form" + }, + "capturePoints": [ + { + "id": "initial", + "label": "Ticket launch", + "fullPage": true + } + ] + }, + { + "id": "list", + "label": "Member creates a repository-free Ticket", + "path": "/w/tickets/tickets", + "goal": "Create work from intent with optional resources, not a fixed delivery pipeline", + "dataState": "Three lightweight progress lanes, member normal operations", + "ready": { + "kind": "selector", + "selector": ".ticket-kanban" + }, + "capturePoints": [ + { + "id": "initial", + "label": "Progress lanes", + "fullPage": true + }, + { + "id": "create", + "label": "Optional resources", + "interaction": [ + { + "action": "click", + "selector": "button:has-text(\"Add Ticket\")" + } + ], + "ready": { + "kind": "selector", + "selector": ".ticket-create-form" + }, + "fullPage": true + } + ] + } + ], + "processes": [ + { + "id": "ticket-fixture", + "command": "deno", + "cwd": "..", + "args": [ + "run", + "--allow-net", + "--allow-read", + "browser-tests/ticket_fixture_server.ts", + "15289", + "../../web/workspace/build" + ], + "readyUrl": "http://127.0.0.1:15289/health" + } + ] +} diff --git a/tools/web-ux/src/processes.ts b/tools/web-ux/src/processes.ts index 27082f152..43c0f35d0 100644 --- a/tools/web-ux/src/processes.ts +++ b/tools/web-ux/src/processes.ts @@ -14,7 +14,7 @@ export type RunningProcess = { }; async function appendOutput( - stream: ReadableStream, + stream: ReadableStream, destination: string, secrets: string[], ): Promise { diff --git a/web/workspace/deno.json b/web/workspace/deno.json index 733276e24..ac4ca6e82 100644 --- a/web/workspace/deno.json +++ b/web/workspace/deno.json @@ -6,7 +6,7 @@ "dev": "deno run -A npm:vite@8.3.2 dev", "dev:backend": "cd ../.. && cargo run -p yoi-workspace-server --bin yoi-server -- serve --listen 127.0.0.1:8787", "check": "deno run -A npm:@sveltejs/kit@3.0.0 sync && deno run -A npm:svelte-check@4.7.6 --tsconfig ./tsconfig.json", - "test": "deno test --allow-read=src,test,tests,../../docs,../../resources/config-schema --allow-env=LOG,VSCODE_TEXTMATE_DEBUG,NODE_ENV tests/workspace-model.test.ts tests/repository-api.test.ts tests/workspace-catalog.test.ts tests/profile-api.test.ts tests/skill-api.test.ts tests/tooltip-contract.test.ts tests/bevel-contract.test.ts tests/bevel-line-contract.test.ts tests/typography-contract.test.ts src/lib/workspace/auth/model.test.ts src/lib/workspace/protocol-validator.test.ts tests/auth-api.test.ts src/lib/workspace/api/http.test.ts src/lib/workspace/api/workers.test.ts src/lib/workspace/api/ticket-browser.test.ts src/lib/workspace/header/breadcrumb-model.test.ts src/lib/workspace/console/chat-submit.test.ts src/lib/workspace/console/composer-delivery.test.ts test/composer-history.test.ts tests/composer-paste.test.ts src/lib/workspace/console/composer-command.test.ts src/lib/workspace/console/composer-draft.test.ts src/lib/workspace/console/composer-completion.test.ts src/lib/workspace/console/composer-invocation.test.ts src/lib/workspace/console/file-completions.test.ts test/console/ansi.test.ts src/lib/workspace/console/history.test.ts src/lib/workspace/console/model.test.ts src/lib/workspace/console/turn-navigation.test.ts src/lib/workspace/console/run-status.test.ts src/lib/workspace/companion/api.test.ts tests/workdir-api.test.ts tests/workdir-permissions.test.ts src/lib/workspace/console/tasks.test.ts test/ticket-detail-route-reuse.test.ts test/spa-shell.test.ts test/objective-pages.test.ts test/repositories/ui.test.ts src/lib/workspace/console/worker-console.ui.test.ts src/lib/workspace/settings/model.test.ts tests/runtime-connection.test.ts tests/runtime-management.test.ts tests/runtime-management-source.test.ts src/lib/workspace/sidebar/override-stack.test.ts src/lib/workspace/sidebar/route-ownership.test.ts src/lib/workspace/sidebar/workers.test.ts src/lib/workspace/sidebar/workspace-switcher.test.ts src/lib/workspace/sidebar/worker-subscription.test.ts src/lib/workspace/sidebar/worker-workdir-meta.test.ts src/lib/workspace/sidebar/worker-launch.test.ts tests/runtime-workers.test.ts test/sidebar/worker-actions.test.ts src/lib/workspace/tickets/merge-request-resources.test.ts src/lib/workspace/tickets/ticket-panel.test.ts test/merge-request-status.test.ts test/config-source/decodal-grammar.test.ts test/config-source/editor-state.test.ts test/config-source/fixed-schema-wrapper.test.ts test/config-source/toolchain.test.ts test/config-source/wasm-parity.test.ts test/config-source/api.test.ts tests/memory-api.test.ts test/repository-access/api.test.ts test/repository-access/loader.test.ts test/repository-access/model.test.ts test/repository-access/structure.test.ts test/repository-ssh-connection-ui.test.ts", + "test": "deno test --allow-read=src,test,tests,../../docs,../../resources/config-schema --allow-env=LOG,VSCODE_TEXTMATE_DEBUG,NODE_ENV tests/workspace-model.test.ts tests/repository-api.test.ts tests/workspace-catalog.test.ts tests/profile-api.test.ts tests/skill-api.test.ts tests/tooltip-contract.test.ts tests/bevel-contract.test.ts tests/bevel-line-contract.test.ts tests/typography-contract.test.ts src/lib/workspace/auth/model.test.ts src/lib/workspace/protocol-validator.test.ts tests/auth-api.test.ts src/lib/workspace/api/http.test.ts src/lib/workspace/api/workers.test.ts src/lib/workspace/api/ticket-browser.test.ts src/lib/workspace/header/breadcrumb-model.test.ts src/lib/workspace/console/chat-submit.test.ts src/lib/workspace/console/composer-delivery.test.ts test/composer-history.test.ts tests/composer-paste.test.ts src/lib/workspace/console/composer-command.test.ts src/lib/workspace/console/composer-draft.test.ts src/lib/workspace/console/composer-completion.test.ts src/lib/workspace/console/composer-invocation.test.ts src/lib/workspace/console/file-completions.test.ts test/console/ansi.test.ts src/lib/workspace/console/history.test.ts src/lib/workspace/console/model.test.ts src/lib/workspace/console/turn-navigation.test.ts src/lib/workspace/console/run-status.test.ts src/lib/workspace/companion/api.test.ts tests/workdir-api.test.ts tests/workdir-permissions.test.ts src/lib/workspace/console/tasks.test.ts test/ticket-detail-route-reuse.test.ts test/spa-shell.test.ts test/objective-pages.test.ts test/repositories/ui.test.ts src/lib/workspace/console/worker-console.ui.test.ts src/lib/workspace/settings/model.test.ts tests/runtime-connection.test.ts tests/runtime-management.test.ts tests/runtime-management-source.test.ts src/lib/workspace/sidebar/override-stack.test.ts src/lib/workspace/sidebar/route-ownership.test.ts src/lib/workspace/sidebar/workers.test.ts src/lib/workspace/sidebar/workspace-switcher.test.ts src/lib/workspace/sidebar/worker-subscription.test.ts src/lib/workspace/sidebar/worker-workdir-meta.test.ts src/lib/workspace/sidebar/worker-launch.test.ts src/lib/workspace/workers/worker-launch.test.ts tests/runtime-workers.test.ts test/sidebar/worker-actions.test.ts src/lib/workspace/tickets/merge-request-resources.test.ts src/lib/workspace/tickets/ticket-panel.test.ts test/merge-request-status.test.ts test/config-source/decodal-grammar.test.ts test/config-source/editor-state.test.ts test/config-source/fixed-schema-wrapper.test.ts test/config-source/toolchain.test.ts test/config-source/wasm-parity.test.ts test/config-source/api.test.ts tests/memory-api.test.ts test/repository-access/api.test.ts test/repository-access/loader.test.ts test/repository-access/model.test.ts test/repository-access/structure.test.ts test/repository-ssh-connection-ui.test.ts", "test:component": "deno run -A npm:vitest@5.0.3 run --config vitest.config.ts", "test:browser:empty-workspace": "deno test --config ../../tools/web-ux/deno.json --allow-env --allow-net --allow-read --allow-write --allow-run --allow-sys test/visual-review/empty-workspace.browser.test.ts", "build": "deno run -A npm:vite@8.3.2 build", diff --git a/web/workspace/src/lib/generated/companion-api.ts b/web/workspace/src/lib/generated/companion-api.ts index 7bfebc5ca..add7a626b 100644 --- a/web/workspace/src/lib/generated/companion-api.ts +++ b/web/workspace/src/lib/generated/companion-api.ts @@ -1,6 +1,6 @@ // @generated by yoi-companion-openapi-typescript@1. Do not edit. // Input: openapi/server-api.json -// Input contract: 0.1.0 (sha256:16796bde0da04973310a14f90cf6eac14b2580bbe184c7c12afde3b6225ce933) +// Input contract: 0.1.0 (sha256:3ae89b3b76b2c31f016f4f9e1bc339115fdfb0b7d2a9964c4c708488a3e5f6f1) // Options: companion-operation-schema-closure,openapi-3.1,strict-integer-ranges,sorted-output // Output: web/workspace/src/lib/generated/companion-api.ts // Regenerate/check: cargo run -q -p server-api --example generate_companion_api_types -- --check diff --git a/web/workspace/src/lib/generated/repository-api.ts b/web/workspace/src/lib/generated/repository-api.ts index 5ed83fa35..ea0c171c8 100644 --- a/web/workspace/src/lib/generated/repository-api.ts +++ b/web/workspace/src/lib/generated/repository-api.ts @@ -1,6 +1,6 @@ // @generated by yoi-repository-openapi-typescript@1. Do not edit. // Input: openapi/server-api.json -// Input contract: 0.1.0 (sha256:16796bde0da04973310a14f90cf6eac14b2580bbe184c7c12afde3b6225ce933) +// Input contract: 0.1.0 (sha256:3ae89b3b76b2c31f016f4f9e1bc339115fdfb0b7d2a9964c4c708488a3e5f6f1) // Options: repository-operation-schema-closure,openapi-3.1,format:uint64=safe-number,strict-safe-integers,sorted-output // Output: web/workspace/src/lib/generated/repository-api.ts // Regenerate/check: cargo run -q -p server-api --example generate_repository_openapi_types -- --check diff --git a/web/workspace/src/lib/generated/runtime-api.ts b/web/workspace/src/lib/generated/runtime-api.ts index 902f3c282..2404aca5b 100644 --- a/web/workspace/src/lib/generated/runtime-api.ts +++ b/web/workspace/src/lib/generated/runtime-api.ts @@ -1,6 +1,6 @@ // @generated by yoi-runtime-openapi-typescript@1. Do not edit. // Input: openapi/server-api.json -// Input contract: 0.1.0 (sha256:16796bde0da04973310a14f90cf6eac14b2580bbe184c7c12afde3b6225ce933) +// Input contract: 0.1.0 (sha256:3ae89b3b76b2c31f016f4f9e1bc339115fdfb0b7d2a9964c4c708488a3e5f6f1) // Options: runtime-operation-schema-closure,openapi-3.1,strict-integer-ranges,sorted-output // Output: web/workspace/src/lib/generated/runtime-api.ts // Regenerate/check: cargo run -q -p server-api --example generate_runtime_api_types -- --check diff --git a/web/workspace/src/lib/generated/ticket-api.ts b/web/workspace/src/lib/generated/ticket-api.ts index 9a6cd8e3b..e32136faf 100644 --- a/web/workspace/src/lib/generated/ticket-api.ts +++ b/web/workspace/src/lib/generated/ticket-api.ts @@ -1,6 +1,6 @@ // @generated by yoi-ticket-browser-openapi-typescript@1. Do not edit. // Input: openapi/server-api.json -// Input contract: 0.1.0 (sha256:16796bde0da04973310a14f90cf6eac14b2580bbe184c7c12afde3b6225ce933) +// Input contract: 0.1.0 (sha256:3ae89b3b76b2c31f016f4f9e1bc339115fdfb0b7d2a9964c4c708488a3e5f6f1) // Options: ticket-objective-merge-request-browser-operation-schema-closure,openapi-3.1,strict-integer-ranges,sorted-output // Output: web/workspace/src/lib/generated/ticket-api.ts // Regenerate/check: cargo run -q -p server-api --example generate_ticket_api_types -- --check diff --git a/web/workspace/src/lib/generated/workdir-api.ts b/web/workspace/src/lib/generated/workdir-api.ts index fcceed331..5af26c732 100644 --- a/web/workspace/src/lib/generated/workdir-api.ts +++ b/web/workspace/src/lib/generated/workdir-api.ts @@ -1,6 +1,6 @@ // @generated by yoi-workdir-openapi-typescript@1. Do not edit. // Input: openapi/server-api.json -// Input contract: 0.1.0 (sha256:3c3d4e9f55fca26e5833a07da29a6030e4beeedca645ff1c4ef1583c6c29abe0) +// Input contract: 0.1.0 (sha256:3ae89b3b76b2c31f016f4f9e1bc339115fdfb0b7d2a9964c4c708488a3e5f6f1) // Options: workdir-operation-schema-closure,openapi-3.1,strict-integer-ranges,sorted-output // Output: web/workspace/src/lib/generated/workdir-api.ts // Regenerate/check: cargo run -q -p server-api --example generate_workdir_api_types -- --check diff --git a/web/workspace/src/lib/generated/worker-launch-api.ts b/web/workspace/src/lib/generated/worker-launch-api.ts index 38127d28d..e05feb307 100644 --- a/web/workspace/src/lib/generated/worker-launch-api.ts +++ b/web/workspace/src/lib/generated/worker-launch-api.ts @@ -1,6 +1,6 @@ // @generated by yoi-worker-openapi-typescript@1. Do not edit. // Input: openapi/server-api.json -// Input contract: 0.1.0 (sha256:16796bde0da04973310a14f90cf6eac14b2580bbe184c7c12afde3b6225ce933) +// Input contract: 0.1.0 (sha256:3ae89b3b76b2c31f016f4f9e1bc339115fdfb0b7d2a9964c4c708488a3e5f6f1) // Options: worker-operation-schema-closure,openapi-3.1,strict-integer-ranges,sorted-output // Output: web/workspace/src/lib/generated/worker-launch-api.ts // Regenerate/check: cargo run -q -p server-api --example generate_worker_launch_api_types -- --check @@ -63,7 +63,7 @@ export type WorkerLaunchOptionsResponse = { default_profile?: string | null; dia export type WorkerLaunchProfileCandidate = { description: string; feature_connections: WorkerLaunchFeatureConnectionOptions; id: string; label: string; }; -export type WorkerLaunchRuntimeOption = { built_in: boolean; diagnostics: Array; display_name: string; runtime_id: string; status: string; worker_creation_available: boolean; working_directory_required: boolean; }; +export type WorkerLaunchRuntimeOption = { built_in: boolean; diagnostics: Array; display_name: string; runtime_id: string; status: string; supports_workdir_attachments: boolean; worker_creation_available: boolean; }; export type WorkerLaunchWorkerSummary = { diagnostics?: Array; display_name: string; host_id: string; implementation: WorkerImplementationSummary; label: string; last_seen_at?: string | null; pinned: boolean; profile?: string | null; retention_state: string; runtime_id: string; singleton_key?: string | null; state: string; tags: Array; workdir_attachments?: Array; worker_id: string; workspace: WorkerWorkspaceSummary; }; diff --git a/web/workspace/src/lib/workspace/api/ticket-browser.test.ts b/web/workspace/src/lib/workspace/api/ticket-browser.test.ts index 11693f801..94b145bf8 100644 --- a/web/workspace/src/lib/workspace/api/ticket-browser.test.ts +++ b/web/workspace/src/lib/workspace/api/ticket-browser.test.ts @@ -87,7 +87,7 @@ function ticketDetailFixture() { blockers: [], can_assign_orchestrator: false, can_queue: false, - can_start_manual_coder: false, + can_start_manual_worker: false, can_unassign_orchestrator: false, queue_tickets: [], }, @@ -97,7 +97,7 @@ function ticketDetailFixture() { assignments: [], body: "Body", body_truncated: false, - current_coder: null, + current_worker: null, event_count: 0, event_page: { ...page, returned: 0 }, events: [], diff --git a/web/workspace/src/lib/workspace/api/ticket-browser.ts b/web/workspace/src/lib/workspace/api/ticket-browser.ts index 0eb784931..c96142943 100644 --- a/web/workspace/src/lib/workspace/api/ticket-browser.ts +++ b/web/workspace/src/lib/workspace/api/ticket-browser.ts @@ -397,7 +397,7 @@ function parseTicketRoleAssignmentRecord( "workspace_id", ], label); const role = string(item.role, `${label}.role`); - if (!["orchestrator", "coder", "owner", "contributor"].includes(role)) { + if (!["orchestrator", "worker", "owner", "contributor"].includes(role)) { throw new Error(`${label}.role is invalid`); } return { @@ -423,7 +423,7 @@ function parseActionEligibility( "blockers", "can_assign_orchestrator", "can_queue", - "can_start_manual_coder", + "can_start_manual_worker", "can_unassign_orchestrator", "queue_tickets", ], label); @@ -434,9 +434,9 @@ function parseActionEligibility( `${label}.can_assign_orchestrator`, ), can_queue: boolean(item.can_queue, `${label}.can_queue`), - can_start_manual_coder: boolean( - item.can_start_manual_coder, - `${label}.can_start_manual_coder`, + can_start_manual_worker: boolean( + item.can_start_manual_worker, + `${label}.can_start_manual_worker`, ), can_unassign_orchestrator: boolean( item.can_unassign_orchestrator, @@ -730,7 +730,7 @@ export function parseTicketDetail(value: unknown): TicketDetail { "body", "body_truncated", "created_at", - "current_coder", + "current_worker", "event_count", "event_page", "events", @@ -774,13 +774,13 @@ export function parseTicketDetail(value: unknown): TicketDetail { body: string(item.body, `${label}.body`), body_truncated: boolean(item.body_truncated, `${label}.body_truncated`), created_at: optionalNullableString(item.created_at, `${label}.created_at`), - current_coder: item.current_coder === undefined + current_worker: item.current_worker === undefined ? undefined - : item.current_coder === null + : item.current_worker === null ? null : parseTicketAssignmentSummary( - item.current_coder, - `${label}.current_coder`, + item.current_worker, + `${label}.current_worker`, ), event_count: integer(item.event_count, `${label}.event_count`), event_page: parseQueryPage(item.event_page, `${label}.event_page`), diff --git a/web/workspace/src/lib/workspace/api/workers.test.ts b/web/workspace/src/lib/workspace/api/workers.test.ts index b70336003..f5f508475 100644 --- a/web/workspace/src/lib/workspace/api/workers.test.ts +++ b/web/workspace/src/lib/workspace/api/workers.test.ts @@ -248,7 +248,7 @@ Deno.test("Worker launch options parser accepts the generated wire shape", () => display_name: "Runtime A", built_in: false, worker_creation_available: true, - working_directory_required: true, + supports_workdir_attachments: true, status: "connected", diagnostics: [], }], diff --git a/web/workspace/src/lib/workspace/api/workers.ts b/web/workspace/src/lib/workspace/api/workers.ts index 856cadd7c..90c879a28 100644 --- a/web/workspace/src/lib/workspace/api/workers.ts +++ b/web/workspace/src/lib/workspace/api/workers.ts @@ -130,7 +130,7 @@ function runtimeOption( "display_name", "built_in", "worker_creation_available", - "working_directory_required", + "supports_workdir_attachments", "status", "diagnostics", ], @@ -144,9 +144,9 @@ function runtimeOption( item.worker_creation_available, `${label}.worker_creation_available`, ), - working_directory_required: boolean( - item.working_directory_required, - `${label}.working_directory_required`, + supports_workdir_attachments: boolean( + item.supports_workdir_attachments, + `${label}.supports_workdir_attachments`, ), status: string(item.status, `${label}.status`), diagnostics: array(item.diagnostics, `${label}.diagnostics`, diagnostic), diff --git a/web/workspace/src/lib/workspace/console/worker-console.ui.test.ts b/web/workspace/src/lib/workspace/console/worker-console.ui.test.ts index abd18cdfd..33e81fa78 100644 --- a/web/workspace/src/lib/workspace/console/worker-console.ui.test.ts +++ b/web/workspace/src/lib/workspace/console/worker-console.ui.test.ts @@ -434,11 +434,11 @@ Deno.test("workspace Tickets surface provides Kanban and lifecycle controls", as ticketDetailPage.includes("`${path}/queue`") && !ticketDetailPage.includes("/merge-request/merge") && ticketDetailPage.includes("mergeRequest.selector_from") && - ticketDetailPage.includes("mergeRequest.review_status") && + ticketDetailPage.includes("summarySourceReviewStatus(mergeRequest)") && ticketDetailPage.includes("mergeRequestPagePath") && ticketDetailPage.includes('mutate("close", "/close"') && ticketDetailPage.includes("mutateAssignment") && - ticketDetailPage.includes("can_start_manual_coder") && + ticketDetailPage.includes("can_start_manual_worker") && ticketDetailPage.includes("ticket.relations.outgoing"), "Ticket detail should expose typed lifecycle actions, relations, target selection, assignments, and Merge Request navigation", ); diff --git a/web/workspace/src/lib/workspace/home/dashboard.test-fixtures.ts b/web/workspace/src/lib/workspace/home/dashboard.test-fixtures.ts index 958cf04d8..13d0f5e66 100644 --- a/web/workspace/src/lib/workspace/home/dashboard.test-fixtures.ts +++ b/web/workspace/src/lib/workspace/home/dashboard.test-fixtures.ts @@ -59,7 +59,7 @@ export function fixtureDetail(key = "T-101") { complete_for_integration: false, missing: [], }, - current_coder: key === "T-101" + current_worker: key === "T-101" ? { assignment_id: "a-1", runtime_id: "internal-runtime", @@ -71,7 +71,7 @@ export function fixtureDetail(key = "T-101") { blockers: [], can_assign_orchestrator: false, can_queue: false, - can_start_manual_coder: false, + can_start_manual_worker: false, can_unassign_orchestrator: false, queue_tickets: [], }, diff --git a/web/workspace/src/lib/workspace/home/dashboard.ts b/web/workspace/src/lib/workspace/home/dashboard.ts index 6decb408c..12a0c1a17 100644 --- a/web/workspace/src/lib/workspace/home/dashboard.ts +++ b/web/workspace/src/lib/workspace/home/dashboard.ts @@ -196,10 +196,10 @@ export function loadDashboard( ? (blockedKeys.length === blockers.length ? `Blocked by ${blockedKeys.join(", ")}` : `${blockers.length} unresolved dependencies`) - : current.current_coder + : current.current_worker ? undefined - : "No coder assigned", - workerKey: current.current_coder?.worker_resource_key ?? + : "No Worker assigned", + workerKey: current.current_worker?.worker_resource_key ?? undefined, }, }; diff --git a/web/workspace/src/lib/workspace/sidebar/worker-launch.test-fixtures.ts b/web/workspace/src/lib/workspace/sidebar/worker-launch.test-fixtures.ts index d2e8fa0f6..e86c7414e 100644 --- a/web/workspace/src/lib/workspace/sidebar/worker-launch.test-fixtures.ts +++ b/web/workspace/src/lib/workspace/sidebar/worker-launch.test-fixtures.ts @@ -1,4 +1,4 @@ -import type { WorkerLaunchOptionsResponse } from "./types.ts"; +import type { WorkerLaunchOptionsResponse } from "../../generated/worker-launch-api.ts"; export function emptyLaunchOptions( workspaceId: string, @@ -12,7 +12,7 @@ export function emptyLaunchOptions( status: "active", worker_creation_available: true, built_in: true, - working_directory_required: false, + supports_workdir_attachments: false, diagnostics: [], }, { @@ -21,7 +21,7 @@ export function emptyLaunchOptions( status: "active", worker_creation_available: true, built_in: false, - working_directory_required: true, + supports_workdir_attachments: true, diagnostics: [], }, ], diff --git a/web/workspace/src/lib/workspace/sidebar/worker-launch.test.ts b/web/workspace/src/lib/workspace/sidebar/worker-launch.test.ts index 501d66155..64f25500f 100644 --- a/web/workspace/src/lib/workspace/sidebar/worker-launch.test.ts +++ b/web/workspace/src/lib/workspace/sidebar/worker-launch.test.ts @@ -10,18 +10,37 @@ declare const Deno: { }; Deno.test("logical config attachments are never offered as process working directories", () => { - const config = { working_directory_id: "config-1", display_name: "Workspace config", - source: { kind: "workspace_config" as const, access: "read_write" as const, content_path: "/workspace-config", purpose: "Configuration" }, - materializer_kind: "logical_workspace_config" as const, status: "active" as const, cleanliness: "clean" }; - const form = defaultWorkerLaunchForm({ ...options, working_directories: [config] }, emptyForm({ - workdir_attachments: [{ alias: "config", working_directory_id: "config-1", relative_cwd: "" }], - })); - if (form.workdir_attachments.some((attachment) => attachment.working_directory_id === "config-1")) { + const config = { + working_directory_id: "config-1", + display_name: "Workspace config", + source: { + kind: "workspace_config" as const, + access: "read_write" as const, + content_path: "/workspace-config", + purpose: "Configuration", + }, + materializer_kind: "logical_workspace_config" as const, + status: "active" as const, + cleanliness: "clean", + }; + const form = defaultWorkerLaunchForm( + { ...options, working_directories: [config] }, + emptyForm({ + workdir_attachments: [{ + alias: "config", + working_directory_id: "config-1", + relative_cwd: "", + }], + }), + ); + if ( + form.workdir_attachments.some((attachment) => attachment.working_directory_id === "config-1") + ) { throw new Error("logical config was converted to a process cwd attachment"); } }); -Deno.test("defaultWorkerLaunchForm uses the Backend-published defaults and initial Workdir", () => { +Deno.test("defaultWorkerLaunchForm selects a Runtime without claiming a profile or Workdir", () => { const form = defaultWorkerLaunchForm( options, emptyForm({ initial_text: "hello" }), @@ -29,14 +48,10 @@ Deno.test("defaultWorkerLaunchForm uses the Backend-published defaults and initi assertEquals(form.runtime_id, "remote"); assertEquals(form.display_name, "Worker"); - assertEquals(form.profile, "builtin:coder"); + assertEquals(form.profile, ""); assertEquals(form.initial_text, "hello"); - assertEquals(form.workdir_attachments, [{ - alias: "workdir", - working_directory_id: "wd-1-repo", - relative_cwd: "", - }]); - assertEquals(form.working_directory_repository_key, "repo"); + assertEquals(form.workdir_attachments, []); + assertEquals(form.working_directory_repository_key, ""); assertEquals(form.working_directory_selector, "HEAD"); }); @@ -71,7 +86,7 @@ Deno.test("defaultWorkerLaunchForm preserves an available read-only External Wor }]); }); -Deno.test("defaultWorkerLaunchForm preserves an available Ticket role profile", () => { +Deno.test("defaultWorkerLaunchForm does not turn a generic profile choice into trusted review", () => { const reviewerOptions = { ...options, profiles: [ @@ -95,10 +110,10 @@ Deno.test("defaultWorkerLaunchForm preserves an available Ticket role profile", }), ); - assertEquals(form.profile, "builtin:reviewer"); + assertEquals(form.profile, ""); }); -Deno.test("defaultWorkerLaunchForm skips occupied Workdirs and leaves an editable attachment", () => { +Deno.test("defaultWorkerLaunchForm does not claim occupied Workdirs", () => { const form = defaultWorkerLaunchForm( { ...options, @@ -115,11 +130,7 @@ Deno.test("defaultWorkerLaunchForm skips occupied Workdirs and leaves an editabl emptyForm({ initial_text: "hello" }), ); - assertEquals(form.workdir_attachments, [{ - alias: "workdir", - working_directory_id: "", - relative_cwd: "", - }]); + assertEquals(form.workdir_attachments, []); }); Deno.test("defaultWorkerLaunchForm preserves a Ticket repository target", () => { @@ -149,11 +160,7 @@ Deno.test("defaultWorkerLaunchForm preserves a Ticket repository target", () => }), ); - assertEquals(form.workdir_attachments, [{ - alias: "workdir", - working_directory_id: "ticket-workdir", - relative_cwd: "", - }]); + assertEquals(form.workdir_attachments, []); assertEquals(form.working_directory_repository_key, "ticket-repo"); assertEquals(form.working_directory_selector, "work/ticket"); }); @@ -308,8 +315,7 @@ Deno.test("buildCreateWorkspaceWorkerRequest emits an empty attachment list for }); function emptyForm( - overrides: Partial[0]> = - {}, + overrides: Partial[0]> = {}, ): Parameters[0] { return { runtime_id: "", @@ -361,7 +367,7 @@ const options: WorkerLaunchOptionsResponse = { status: "active", worker_creation_available: true, built_in: false, - working_directory_required: true, + supports_workdir_attachments: true, diagnostics: [], }, { @@ -370,7 +376,7 @@ const options: WorkerLaunchOptionsResponse = { status: "active", worker_creation_available: true, built_in: true, - working_directory_required: false, + supports_workdir_attachments: false, diagnostics: [], }, ], diff --git a/web/workspace/src/lib/workspace/sidebar/worker-launch.ts b/web/workspace/src/lib/workspace/sidebar/worker-launch.ts index 983321b57..b6555cac4 100644 --- a/web/workspace/src/lib/workspace/sidebar/worker-launch.ts +++ b/web/workspace/src/lib/workspace/sidebar/worker-launch.ts @@ -1,6 +1,9 @@ import type { BrowserWorkerWorkingDirectorySelection, CreateWorkspaceWorkerRequest, + CreateWorkspaceWorkerTicketAssignmentRequest, + RepositoryApiError, + WorkerLaunchProfileCandidate, } from "#lib/generated/worker-launch-api.ts"; import { parseCreateWorkspaceWorkerRequest } from "#lib/workspace/api/workers.ts"; @@ -14,6 +17,8 @@ export type WorkerLaunchAttachmentFormState = { export type WorkerLaunchFormState = { runtime_id: string; + flow?: string; + ticket_assignment?: CreateWorkspaceWorkerTicketAssignmentRequest | null; display_name: string; profile: string; subjektiv_subject_id: string; @@ -35,84 +40,33 @@ export function defaultWorkerLaunchForm( ) ?? options?.runtimes.find((runtime) => runtime.worker_creation_available) ?? options?.runtimes[0]; - const preferredProfile = options?.profiles.find((candidate) => - candidate.id === options.default_profile - ); - const availableWorkingDirectories = - options?.working_directories.filter((directory) => - directory.status === "active" && - directory.source.kind !== "workspace_config" && - (directory.source.kind === "external_grant" || - directory.cleanliness === "clean") && - directory.occupied_by == null - ) ?? []; - const selectedRuntime = current.runtime_id - ? options?.runtimes.find((runtime) => - runtime.runtime_id === current.runtime_id - ) - : preferredRuntime; - const workdirlessRuntime = - selectedRuntime?.working_directory_required === false; - const preferredWorkingDirectory = workdirlessRuntime - ? undefined - : availableWorkingDirectories.find((directory) => - Boolean(current.working_directory_repository_key) && - directory.source.kind === "repository" && - directory.source.repository_key === - current.working_directory_repository_key && - (!current.working_directory_selector || - (directory.current_selector ?? directory.creation_selector) === - current.working_directory_selector) - ) ?? availableWorkingDirectories.find((directory) => - Boolean(current.working_directory_repository_key) && - directory.source.kind === "repository" && - directory.source.repository_key === - current.working_directory_repository_key - ) ?? (current.working_directory_repository_key - ? undefined - : availableWorkingDirectories[0]); - const preferredRepository = - options?.repositories.find((repository) => - repository.repository_key === current.working_directory_repository_key - ) ?? - options?.repositories[0]; + const runtime = + options?.runtimes.find((candidate) => candidate.runtime_id === current.runtime_id) ?? + preferredRuntime; const availableWorkdirIds = new Set( - availableWorkingDirectories.map((directory) => - directory.working_directory_id - ), + (options?.working_directories ?? []).filter((directory) => + directory.status === "active" && directory.source.kind !== "workspace_config" && + (directory.source.kind === "external_grant" || directory.cleanliness === "clean") && + directory.occupied_by == null + ).map((directory) => directory.working_directory_id), ); - const currentAttachments = workdirlessRuntime - ? [] - : current.workdir_attachments.filter((attachment) => - availableWorkdirIds.has(attachment.working_directory_id) - ); - const workdirAttachments = currentAttachments.length > 0 - ? currentAttachments - : preferredWorkingDirectory - ? [{ - alias: "workdir", - working_directory_id: preferredWorkingDirectory.working_directory_id, - relative_cwd: "", - }] - : selectedRuntime?.working_directory_required === true - ? [{ alias: "workdir", working_directory_id: "", relative_cwd: "" }] - : []; - + // Defaults never claim resource attachments or infer an execution recipe from a Ticket. return { + ...current, runtime_id: current.runtime_id || preferredRuntime?.runtime_id || "", display_name: current.display_name || "Worker", profile: - options?.profiles.some((candidate) => candidate.id === current.profile) + genericLaunchProfiles(options?.profiles ?? []).some((candidate) => + candidate.id === current.profile + ) ? current.profile - : preferredProfile?.id || "", - subjektiv_subject_id: current.subjektiv_subject_id, - initial_text: current.initial_text, - workdir_attachments: workdirAttachments, - working_directory_repository_key: - current.working_directory_repository_key || - preferredRepository?.repository_key || "", - working_directory_selector: current.working_directory_selector || - preferredRepository?.default_selector || "HEAD", + : "", + workdir_attachments: runtime?.supports_workdir_attachments === false + ? [] + : current.workdir_attachments.filter((attachment) => + availableWorkdirIds.has(attachment.working_directory_id) + ), + working_directory_selector: current.working_directory_selector || "HEAD", }; } @@ -172,15 +126,19 @@ function validatedAttachments( export function buildCreateWorkspaceWorkerRequest( form: WorkerLaunchFormState, ): CreateWorkspaceWorkerRequest { + if (["builtin:reviewer", "reviewer"].includes(form.profile.trim())) { + throw new Error("Trusted Reviewer launch requires a bound review request."); + } const initialMessage = form.initial_text.trim(); return parseCreateWorkspaceWorkerRequest({ runtime_id: form.runtime_id.trim(), display_name: form.display_name.trim(), profile: form.profile.trim() || null, - ticket_assignment: null, - initial_submit: initialMessage - ? [{ kind: "text", content: form.initial_text }] - : [], + ticket_assignment: form.ticket_assignment ?? null, + initial_submit: [ + ...(initialMessage ? [{ kind: "text", content: form.initial_text }] : []), + ...(form.flow?.trim() ? [{ kind: "flow", selector: form.flow.trim() }] : []), + ], workdir_attachments: validatedAttachments(form.workdir_attachments), feature_connections: form.subjektiv_subject_id.trim() ? { subjektiv: { subject_id: form.subjektiv_subject_id.trim() } } @@ -188,3 +146,21 @@ export function buildCreateWorkspaceWorkerRequest( control_operation_id: null, }); } + +// A trusted Reviewer is launched through the bound review path, not a Profile selection. +export function genericLaunchProfiles( + profiles: WorkerLaunchProfileCandidate[], +): WorkerLaunchProfileCandidate[] { + return profiles.filter((candidate) => + candidate.id !== "builtin:reviewer" && candidate.id !== "reviewer" + ); +} + +export function workerLaunchOutcomeUnknown(error: RepositoryApiError): boolean { + return [ + error.error, + error.message, + ...(error.diagnostics ?? []).flatMap((item) => [item.code, item.message]), + ] + .some((value) => /outcome[_\s-]?unknown|OutcomeUnknown/i.test(value)); +} diff --git a/web/workspace/src/lib/workspace/styles/tickets.css b/web/workspace/src/lib/workspace/styles/tickets.css index 2ceeb0954..ac8821c80 100644 --- a/web/workspace/src/lib/workspace/styles/tickets.css +++ b/web/workspace/src/lib/workspace/styles/tickets.css @@ -73,13 +73,22 @@ justify-content: space-between; gap: var(--space-4); } + .ticket-panel-header { + flex-wrap: wrap; + } + .ticket-panel-header > div:first-child { + flex: 1 1 12rem; + } .ticket-panel-controls { display: flex; + flex-wrap: wrap; align-items: center; + max-width: 100%; gap: var(--space-3); } .orchestrator-status { display: flex; + flex-wrap: wrap; align-items: center; gap: 0.65rem; border: 1px solid var(--line); @@ -480,17 +489,11 @@ .ticket-detail-grid { grid-template-columns: minmax(0, 1fr); } - .ticket-control-rail { - grid-row: 1; - } } @media (max-width: 64rem) { .ticket-detail-grid { grid-template-columns: 1fr; } - .ticket-control-rail { - grid-row: 1; - } } } diff --git a/web/workspace/src/lib/workspace/tickets/ticket-panel.test.ts b/web/workspace/src/lib/workspace/tickets/ticket-panel.test.ts index 8bd8ef4fe..63dd10a71 100644 --- a/web/workspace/src/lib/workspace/tickets/ticket-panel.test.ts +++ b/web/workspace/src/lib/workspace/tickets/ticket-panel.test.ts @@ -84,75 +84,45 @@ Deno.test("ticket lane visibility advances in bounded pages of 30", () => { assertEquals(nextTicketLaneVisibleCount(95, 95), 95); }); -Deno.test("ticket worker launch uses the common Worker route and bounded Ticket context", () => { - const ticket = { - id: "00001KYRRDVH9", - title: "Ticket panel API", - targets: [ - { - repository_key: "docs", - ref_selector: "main", - access: "read_only", - }, - { - repository_key: "main repo", - ref_selector: "work/ticket", - access: "read_write", - }, - ], - } as TicketDetail; - - assertEquals( - ticketWorkerMessage(ticket.id, "coder"), - "Work on Ticket 00001KYRRDVH9 as its coder.", - ); - - const href = ticketWorkerLaunchHref("workspace one", ticket, "reviewer"); - const url = new URL(href, "https://example.test"); - assertEquals(url.pathname, "/w/workspace%20one/workers/new"); - assertEquals(url.searchParams.get("ticketId"), ticket.id); - assertEquals(url.searchParams.get("ticketRole"), "reviewer"); - assertEquals(url.searchParams.get("repositoryKey"), "main repo"); - assertEquals(url.searchParams.get("refSelector"), "work/ticket"); - assertEquals( - url.searchParams.get("initialInput"), - "Work on Ticket 00001KYRRDVH9 as its reviewer.", - ); +Deno.test("generic Ticket launch carries natural text without role or resource claims", () => { + const requests = [ + "Review is unnecessary; complete the requested work.", + "Review the change, then merge it if approved.", + "Investigate and return without a conclusion.", + ]; + const targetSets: TicketDetail["targets"][] = [ + [], + [{ repository_key: "docs", ref_selector: "main", access: "read_only" }], + [{ repository_key: "repo", ref_selector: "main", access: "read_write" }], + ]; + assertEquals(ticketWorkerMessage("T-720"), "Work on Ticket T-720."); + for (const targets of targetSets) { + const ticket = { id: "T-720", title: "Flexible launch", targets }; + for (const request of requests) { + const url = new URL( + ticketWorkerLaunchHref("workspace one", ticket, request), + "https://example.test", + ); + assertEquals(url.pathname, "/w/workspace%20one/workers/new"); + assertEquals(url.searchParams.get("ticketId"), ticket.id); + assertEquals(url.searchParams.get("ticketTitle"), ticket.title); + assertEquals(url.searchParams.get("initialInput"), request); + for ( + const field of [ + "ticketRole", + "profile", + "repositoryKey", + "refSelector", + "flow", + ] + ) { + assertEquals(url.searchParams.has(field), false); + } + } + } }); -Deno.test("ticket worker launch never selects a read_only or ambiguous write target", () => { - const readOnly = { - id: "ticket-read-only", - title: "Read only", - targets: [{ - repository_key: "docs", - ref_selector: "main", - access: "read_only", - }], - } as TicketDetail; - const readOnlyUrl = new URL( - ticketWorkerLaunchHref("workspace", readOnly, "coder"), - "https://example.test", - ); - assertEquals(readOnlyUrl.searchParams.has("repositoryKey"), false); - assertEquals(readOnlyUrl.searchParams.has("refSelector"), false); - - const ambiguous = { - ...readOnly, - targets: [ - { repository_key: "main", ref_selector: "develop", access: "read_write" }, - { repository_key: "docs", ref_selector: "main", access: "read_write" }, - ], - } as TicketDetail; - const ambiguousUrl = new URL( - ticketWorkerLaunchHref("workspace", ambiguous, "coder"), - "https://example.test", - ); - assertEquals(ambiguousUrl.searchParams.has("repositoryKey"), false); - assertEquals(ambiguousUrl.searchParams.has("refSelector"), false); -}); - -Deno.test("ticket detail uses server-derived role assignment actions", async () => { +Deno.test("ticket detail retains backend queue eligibility and generic Worker assignment actions", async () => { const source = await Deno.readTextFile( new URL( "../../../routes/w/[workspaceId]/tickets/[ticketId]/+page.svelte", @@ -162,11 +132,6 @@ Deno.test("ticket detail uses server-derived role assignment actions", async () assertEquals(source.includes("ticket.action_eligibility.can_queue"), true); assertEquals(source.includes("ticket.relations.blockers.length > 0"), true); - assertEquals( - source.includes("ticket.action_eligibility.queue_tickets"), - true, - ); - assertEquals(source.includes("This operation queues:"), true); assertEquals(source.includes("outcome.queued_tickets.join"), true); assertEquals( source.includes("resolve the listed blockers before Queue"), @@ -176,7 +141,14 @@ Deno.test("ticket detail uses server-derived role assignment actions", async () source.includes("ticket.action_eligibility.can_assign_orchestrator"), true, ); - assertEquals(source.includes("/assignments/${role}"), true); + assertEquals( + source.includes('mutateAssignment("start-manual", "worker"'), + true, + ); + assertEquals( + source.includes('mutateAssignment("start-manual", "reviewer"'), + false, + ); assertEquals(source.includes('kind: "workspace_agent"'), true); assertEquals(source.includes('kind: "worker"'), true); assertEquals(source.includes("ticket.assignee"), false); @@ -188,10 +160,6 @@ Deno.test("ticket detail uses server-derived role assignment actions", async () source.includes("(repository.diagnostics ?? []).length > 0"), false, ); - assertEquals( - source.includes("unique registered repository targets"), - true, - ); }); Deno.test("Ticket authoring creates the target collection without singular authority", async () => { diff --git a/web/workspace/src/lib/workspace/tickets/ticket-panel.ts b/web/workspace/src/lib/workspace/tickets/ticket-panel.ts index b563e50b2..fd246e20e 100644 --- a/web/workspace/src/lib/workspace/tickets/ticket-panel.ts +++ b/web/workspace/src/lib/workspace/tickets/ticket-panel.ts @@ -14,7 +14,6 @@ export const TICKET_STATES = [ ] as const; export type TicketState = (typeof TICKET_STATES)[number]; -export type TicketWorkerRole = "coder" | "reviewer"; export type WorkspaceOrchestratorStatus = BrowserWorkspaceOrchestratorResponse; @@ -98,36 +97,20 @@ export function ticketLanes(tickets: TicketCardSummary[]): TicketLane[] { })); } -export function ticketWorkerMessage( - ticketId: string, - role: TicketWorkerRole, -): string { - return `Work on Ticket ${ticketId} as its ${role}.`; +export function ticketWorkerMessage(ticketId: string): string { + return `Work on Ticket ${ticketId}.`; } export function ticketWorkerLaunchHref( workspaceId: string, - ticket: Pick, - role: TicketWorkerRole, + ticket: Pick, + request = ticketWorkerMessage(ticket.id), ): string { - const implementationTargets = ticket.targets.filter((target) => - target.access === "read_write" - ); - const implementationTarget = implementationTargets.length === 1 - ? implementationTargets[0] - : null; const params = new URLSearchParams({ ticketId: ticket.id, ticketTitle: ticket.title, - ticketRole: role, - initialInput: ticketWorkerMessage(ticket.id, role), + initialInput: request, }); - if (implementationTarget) { - params.set("repositoryKey", implementationTarget.repository_key); - if (implementationTarget.ref_selector) { - params.set("refSelector", implementationTarget.ref_selector); - } - } return `/w/${ encodeURIComponent(workspaceId) }/workers/new?${params.toString()}`; diff --git a/web/workspace/src/lib/workspace/workers/worker-launch.test.ts b/web/workspace/src/lib/workspace/workers/worker-launch.test.ts new file mode 100644 index 000000000..ffa75bbf2 --- /dev/null +++ b/web/workspace/src/lib/workspace/workers/worker-launch.test.ts @@ -0,0 +1,186 @@ +import { + buildCreateWorkspaceWorkerRequest, + defaultWorkerLaunchForm, + genericLaunchProfiles, + workerLaunchOutcomeUnknown, +} from "../sidebar/worker-launch.ts"; +import type { WorkerLaunchFormState } from "../sidebar/worker-launch.ts"; +import { emptyLaunchOptions } from "#lib/workspace/sidebar/worker-launch.test-fixtures.ts"; +import { load } from "../../../routes/w/[workspaceId]/workers/new/+page.ts"; + +declare const Deno: { test(name: string, fn: () => void): void }; +const form: WorkerLaunchFormState = { + runtime_id: "embedded", + display_name: "Worker", + profile: "", + subjektiv_subject_id: "", + initial_text: "", + workdir_attachments: [], + working_directory_repository_key: "", + working_directory_selector: "HEAD", +}; +function equal(actual: unknown, expected: unknown) { + if (JSON.stringify(actual) !== JSON.stringify(expected)) { + throw new Error( + `Expected ${JSON.stringify(expected)}, got ${JSON.stringify(actual)}`, + ); + } +} + +Deno.test("generic Ticket request keeps conclusion and review instructions as natural text with no mandatory Flow or profile", () => { + for ( + const text of [ + "Review is unnecessary.", + "Review, then merge if approved.", + "Return without a conclusion.", + ] + ) { + const request = buildCreateWorkspaceWorkerRequest({ + ...form, + initial_text: text, + ticket_assignment: { ticket_id: "T-720", operation_id: "launch-720" }, + }); + equal(request.ticket_assignment, { + ticket_id: "T-720", + operation_id: "launch-720", + }); + equal(request.profile, null); + equal(request.workdir_attachments, []); + equal(request.initial_submit, [{ kind: "text", content: text }]); + } +}); + +Deno.test("explicit Flow and resource selections remain separate from the Ticket request", () => { + const request = buildCreateWorkspaceWorkerRequest({ + ...form, + runtime_id: "remote", + profile: "project:analysis", + initial_text: " Review is unnecessary.\nReturn without conclusion. ", + flow: " project:investigate ", + subjektiv_subject_id: "subject-1", + ticket_assignment: { ticket_id: "T-720", operation_id: "launch-720" }, + workdir_attachments: [{ + alias: "sessions", + working_directory_id: "read-only-grant", + relative_cwd: "logs", + }], + }); + equal(request.initial_submit, [{ + kind: "text", + content: " Review is unnecessary.\nReturn without conclusion. ", + }, { kind: "flow", selector: "project:investigate" }]); + equal(request.workdir_attachments, [{ + alias: "sessions", + working_directory_id: "read-only-grant", + relative_cwd: "logs", + }]); + equal(request.feature_connections, { + subjektiv: { subject_id: "subject-1" }, + }); +}); + +Deno.test("launch defaults never claim repository or Workdir resources", () => { + const options = emptyLaunchOptions("workspace"); + options.repositories = [{ repository_key: "repo", default_selector: "main" }]; + options.working_directories = [{ + working_directory_id: "wd-1", + source: { kind: "repository", repository_key: "repo" }, + materializer_kind: "runtime_git_clone", + status: "active", + cleanliness: "clean", + }]; + const result = defaultWorkerLaunchForm(options, { + ...form, + runtime_id: "remote", + }); + equal(result.profile, ""); + equal(result.workdir_attachments, []); + equal(result.working_directory_repository_key, ""); +}); + +Deno.test("launch defaults preserve explicit attachments only on a supporting Runtime", () => { + const options = emptyLaunchOptions("workspace"); + options.working_directories = [{ + working_directory_id: "read-only-grant", + source: { + kind: "external_grant", + grant_id: "grant-1", + grant_permissions: { read: true, write: false, command: false }, + }, + materializer_kind: "client_hosted_external", + status: "active", + cleanliness: "unknown", + }]; + const attachments = [{ + alias: "sessions", + working_directory_id: "read-only-grant", + relative_cwd: "logs", + }]; + for (const runtime of options.runtimes) { + const result = defaultWorkerLaunchForm(options, { + ...form, + runtime_id: runtime.runtime_id, + workdir_attachments: attachments, + }); + equal( + result.workdir_attachments, + runtime.supports_workdir_attachments ? attachments : [], + ); + } +}); + +Deno.test("generic launch cannot select a trusted Reviewer profile or infer it from URL roles", () => { + const options = emptyLaunchOptions("workspace"); + options.profiles.push({ + ...options.profiles[0], + id: "builtin:reviewer", + label: "Reviewer", + }); + equal(genericLaunchProfiles(options.profiles).map((item) => item.id), [ + "builtin:companion", + ]); + equal( + defaultWorkerLaunchForm(options, { ...form, profile: "builtin:reviewer" }) + .profile, + "", + ); + const data = load({ + params: { workspaceId: "workspace" }, + url: new URL( + "https://example.test/workers/new?ticketId=T-720&ticketRole=reviewer&profile=builtin:reviewer&repositoryKey=repo", + ), + }); + equal(data.ticketContext, { + ticketId: "T-720", + ticketTitle: "T-720", + initialInput: "Work on Ticket T-720.", + }); + let rejected = false; + try { + buildCreateWorkspaceWorkerRequest({ ...form, profile: "builtin:reviewer" }); + } catch { + rejected = true; + } + equal(rejected, true); +}); + +Deno.test("OutcomeUnknown is distinguished from a definite permission rejection", () => { + for (const code of ["OutcomeUnknown", "worker_spawn_outcome_unknown"]) { + equal( + workerLaunchOutcomeUnknown({ + error: "runtime_operation_failed", + message: "Uncertain launch", + diagnostics: [{ code, message: "Reconcile", severity: "error" }], + }), + true, + ); + } + equal( + workerLaunchOutcomeUnknown({ + error: "permission_denied", + message: "Read only", + diagnostics: [], + }), + false, + ); +}); diff --git a/web/workspace/src/routes/w/[workspaceId]/tickets/+page.svelte b/web/workspace/src/routes/w/[workspaceId]/tickets/+page.svelte index 67e7766bd..c815b6f71 100644 --- a/web/workspace/src/routes/w/[workspaceId]/tickets/+page.svelte +++ b/web/workspace/src/routes/w/[workspaceId]/tickets/+page.svelte @@ -215,11 +215,7 @@
-

Delivery

Tickets

-

- Plan, route, review, and close work without leaving the workspace. -

{#if !createTargetsSavable} -

Every target row must select a different repository. The exact one read-write target and selector requirements are enforced when the Ticket is marked ready.

+

Each optional resource row must select a different registered repository. Empty or read-only resources are allowed.

{/if}
{#if errorMessage} - + {/if} {#if queueMessage} @@ -432,7 +453,7 @@
-
@@ -515,8 +536,9 @@ {#if event.author}

{event.author}

{/if} {#if event.from || event.to}

{event.from ?? "—"} → {event.to ?? "—"}

{/if} - {#if event.reason}

{event.reason}

{/if} + {#if event.reason}{/if} {#if event.body}{/if} + {#each event.references as reference}

{reference}

{/each}
{:else} @@ -527,6 +549,29 @@