diff --git a/AGENTS.md b/AGENTS.md index 80c696d..8c4867b 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -64,6 +64,34 @@ domain model. Public API changes regenerate OpenAPI and browser types together; worker-wire changes regenerate worker OpenAPI separately. Worker credentials and lifecycle routes never enter the browser generator. +## Change ownership and acceptance + +Before implementation, state the user-visible outcome, the owner of every +decision, and one end-to-end acceptance scenario. Trace that scenario through +Web, Core, the durable job input, the worker, and the returned artifact before +choosing files to change. Existing code placement is evidence, not proof of +correct ownership. + +Core owns admission, authorization, immutable capture of project-owned input, +job state, leases, quotas, and artifacts. A worker owns processor-specific +semantics, toolchains, dependency and package resolution, caches, and output +diagnostics. Immutable capture means project files, assets, settings, and +source identity; it does not make Core a second compiler or package resolver. +Distribution configuration may enable a neutral operation and describe its +user-facing inputs, but must not introduce processor-specific source analysis +into Core. + +When a policy is removed, search the whole execution path and remove the +enforcement, derived capability state, capture logic, protocol fields, tests, +and documentation that existed only for that policy. Do not retain a lower +layer of the same assumption after removing its UI or configuration gate. + +Type checks, contract hashes, worker registration, health endpoints, and queue +state are necessary infrastructure checks, not feature acceptance. A processing +change is complete only after a representative project creates a job, reaches +the real processor, and produces a downloadable artifact or the intended +structured failure. + Community begins with immutable `202607120001_baseline.sql` and does not support in-place upgrades from earlier histories. Never edit, renumber, delete, or consolidate a published migration. Add forward migrations and validate fresh diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 3c12b0a..4a2389f 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -944,12 +944,11 @@ dependencies = [ "tempfile", "thiserror 2.0.18", "tokio", - "toml 1.1.2+spec-1.1.0", + "toml", "tower", "tower-http 0.7.0", "tracing", "tracing-subscriber", - "typst-syntax", "url", "utoipa", "uuid", @@ -1032,25 +1031,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossbeam-deque" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5181e0de7b61eb03a81e347d6dd8797bae9da5146707b51077e2d71a54ec0ceb" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-queue" version = "0.3.13" @@ -1285,15 +1265,6 @@ dependencies = [ "spki", ] -[[package]] -name = "ecow" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78e4f79b296fbaab6ce2e22d52cb4c7f010fe0ebe7a32e34fa25885fd797bd02" -dependencies = [ - "serde", -] - [[package]] name = "ed25519" version = "2.2.3" @@ -2604,12 +2575,6 @@ dependencies = [ "universal-hash", ] -[[package]] -name = "portable-atomic" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d20d5497ef88037a52ff98267d066e7f11fcc5e99bbfbd58a42336193aacec3" - [[package]] name = "potential_utf" version = "0.1.5" @@ -2814,26 +2779,6 @@ dependencies = [ "rand_core 0.10.1", ] -[[package]] -name = "rayon" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - [[package]] name = "redox_syscall" version = "0.5.18" @@ -3215,15 +3160,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_spanned" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" -dependencies = [ - "serde", -] - [[package]] name = "serde_spanned" version = "1.1.1" @@ -3362,12 +3298,6 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" -[[package]] -name = "siphasher" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649" - [[package]] name = "slab" version = "0.4.12" @@ -3692,12 +3622,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "thin-vec" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0f7e269b48f0a7dd0146680fa24b50cc67fc0373f086a5b2f99bd084639b482" - [[package]] name = "thiserror" version = "1.0.69" @@ -3875,18 +3799,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml" -version = "0.8.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" -dependencies = [ - "serde", - "serde_spanned 0.6.9", - "toml_datetime 0.6.11", - "toml_edit", -] - [[package]] name = "toml" version = "1.1.2+spec-1.1.0" @@ -3895,20 +3807,11 @@ checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee" dependencies = [ "indexmap 2.14.0", "serde_core", - "serde_spanned 1.1.1", - "toml_datetime 1.1.1+spec-1.1.0", + "serde_spanned", + "toml_datetime", "toml_parser", "toml_writer", - "winnow 1.0.3", -] - -[[package]] -name = "toml_datetime" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" -dependencies = [ - "serde", + "winnow", ] [[package]] @@ -3920,35 +3823,15 @@ dependencies = [ "serde_core", ] -[[package]] -name = "toml_edit" -version = "0.22.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" -dependencies = [ - "indexmap 2.14.0", - "serde", - "serde_spanned 0.6.9", - "toml_datetime 0.6.11", - "toml_write", - "winnow 0.7.15", -] - [[package]] name = "toml_parser" version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" dependencies = [ - "winnow 1.0.3", + "winnow", ] -[[package]] -name = "toml_write" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" - [[package]] name = "toml_writer" version = "1.1.1+spec-1.1.0" @@ -4124,54 +4007,6 @@ version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20" -[[package]] -name = "typst-syntax" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22bf7f87450e5841debd4986b0f912b0f7a2251e600c08aca406305ff52c67b4" -dependencies = [ - "ecow", - "rustc-hash", - "serde", - "toml 0.8.23", - "typst-timing", - "typst-utils", - "unicode-ident", - "unicode-math-class", - "unicode-script", - "unicode-segmentation", - "unscanny", -] - -[[package]] -name = "typst-timing" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab6ee5110f671a23164c61caa85dbc476043d503103dedd36f16d93f970f3f59" -dependencies = [ - "parking_lot", - "serde", - "serde_json", -] - -[[package]] -name = "typst-utils" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b33ad1675497b45ae9d960a16e95207c35c2c46330d1a6249a9a977670c8c160" -dependencies = [ - "libm", - "once_cell", - "portable-atomic", - "rayon", - "rustc-hash", - "semver", - "siphasher", - "smallvec", - "thin-vec", - "unicode-math-class", -] - [[package]] name = "unicase" version = "2.9.0" @@ -4190,12 +4025,6 @@ version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" -[[package]] -name = "unicode-math-class" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65" - [[package]] name = "unicode-normalization" version = "0.1.25" @@ -4211,18 +4040,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" -[[package]] -name = "unicode-script" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "383ad40bb927465ec0ce7720e033cb4ca06912855fc35db31b5755d0de75b1ee" - -[[package]] -name = "unicode-segmentation" -version = "1.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8" - [[package]] name = "universal-hash" version = "0.6.1" @@ -4233,12 +4050,6 @@ dependencies = [ "ctutils", ] -[[package]] -name = "unscanny" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" - [[package]] name = "untrusted" version = "0.9.0" @@ -4598,15 +4409,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "winnow" -version = "0.7.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" -dependencies = [ - "memchr", -] - [[package]] name = "winnow" version = "1.0.3" diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 995c13a..dd91d67 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -49,7 +49,6 @@ toml = "1" tower-http = { version = "0.7", features = ["trace", "fs", "request-id", "set-header"] } tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } -typst-syntax = "=0.15.0" utoipa = { version = "5", features = ["chrono", "preserve_order", "preserve_path_order", "uuid"] } url = "2" uuid = { version = "1", features = ["v4", "serde"] } diff --git a/backend/src/document_processing/model.rs b/backend/src/document_processing/model.rs index 02093a2..9c4f4b2 100644 --- a/backend/src/document_processing/model.rs +++ b/backend/src/document_processing/model.rs @@ -173,7 +173,6 @@ text_enum! { pub enum ProjectProcessingCapabilityState { Available => "available", Waiting => "waiting", - Inapplicable => "inapplicable", } } diff --git a/backend/src/document_processing/project_input.rs b/backend/src/document_processing/project_input.rs index 5e7358d..a958a4f 100644 --- a/backend/src/document_processing/project_input.rs +++ b/backend/src/document_processing/project_input.rs @@ -4,10 +4,6 @@ use super::persistence::{pin_project_assets, release_project_asset_pins}; use super::ProcessingOperation; use crate::collaboration::{CollaborationContext, FlushProjectCollaborationError}; use crate::object_storage::ObjectStorage; -use crate::typst_runtime::{ - analyze_project_dependencies, resolve_processing_package_closure, - ResolveProcessingPackagesError, ResolvedTypstPackage, -}; use crate::workspace::{ load_project_content_asset_bytes, lock_processing_project_snapshot, lock_project_content_exclusively, LatexEngine, LoadProjectContentAssetError, @@ -20,7 +16,6 @@ use sha2::{Digest, Sha256}; use sqlx::PgPool; use std::collections::HashSet; use std::io::Write; -use std::path::Path; use thiserror::Error; use uuid::Uuid; @@ -40,11 +35,10 @@ pub(super) struct CapturedProjectBundle { pub latex_engine: Option, } -pub(super) struct TypstProjectBundleCapture<'a> { +pub(super) struct ProjectBundleCapture<'a> { pub db: &'a PgPool, pub storage: Option<&'a ObjectStorage>, pub collaboration: &'a CollaborationContext, - pub builtin_dir: &'a Path, pub operation: ProcessingOperation, pub job_id: Uuid, pub project_id: Uuid, @@ -63,8 +57,6 @@ pub(super) enum CaptureProjectBundleError { TooManyFiles, #[error("project input exceeds the configured processing limit")] TooLarge, - #[error(transparent)] - Package(#[from] ResolveProcessingPackagesError), #[error("collaboration state could not be captured")] Collaboration(#[source] FlushProjectCollaborationError), #[error("Workspace capture failed")] @@ -105,8 +97,6 @@ struct ProjectBundleManifest { content_generation: i64, source_epoch: i64, files: Vec, - #[serde(skip_serializing_if = "Vec::is_empty")] - packages: Vec, } #[derive(Serialize)] @@ -117,22 +107,6 @@ struct ProjectBundleFile { sha256: String, } -#[derive(Serialize)] -struct ProjectBundlePackage { - namespace: String, - name: String, - version: String, - archive_sha256: String, - files: Vec, -} - -#[derive(Serialize)] -struct ProjectBundlePackageFile { - path: String, - size_bytes: usize, - sha256: String, -} - struct BundleFile { path: String, kind: &'static str, @@ -140,60 +114,27 @@ struct BundleFile { } pub(super) async fn capture_project_bundle( - db: &PgPool, - storage: Option<&ObjectStorage>, - collaboration: &CollaborationContext, - job_id: Uuid, - project_id: Uuid, - max_input_bytes: i64, + capture: ProjectBundleCapture<'_>, ) -> Result { - let snapshot = capture_project_snapshot(db, collaboration, job_id, project_id).await?; - let contract = ProcessingOperation::LatexCompilePdfV1.contract(); - let result = materialize_bundle( - storage, - snapshot, - Vec::new(), - contract.input_schema, - contract.input_media_type, - max_input_bytes, - ) - .await; - release_pins(db, job_id).await; - result -} - -pub(super) async fn capture_typst_project_bundle( - capture: TypstProjectBundleCapture<'_>, -) -> Result { - let TypstProjectBundleCapture { + let ProjectBundleCapture { db, storage, collaboration, - builtin_dir, operation, job_id, project_id, max_input_bytes, } = capture; let snapshot = capture_project_snapshot(db, collaboration, job_id, project_id).await?; - let dependencies = analyze_project_dependencies(&snapshot.entry_file_path, &snapshot.documents); - let result = - match resolve_processing_package_closure(builtin_dir, &dependencies, max_input_bytes).await - { - Ok(packages) => { - let contract = operation.contract(); - materialize_bundle( - storage, - snapshot, - packages, - contract.input_schema, - contract.input_media_type, - max_input_bytes, - ) - .await - } - Err(error) => Err(error.into()), - }; + let contract = operation.contract(); + let result = materialize_bundle( + storage, + snapshot, + contract.input_schema, + contract.input_media_type, + max_input_bytes, + ) + .await; release_pins(db, job_id).await; result } @@ -246,7 +187,6 @@ async fn release_pins(db: &PgPool, job_id: Uuid) { async fn materialize_bundle( storage: Option<&ObjectStorage>, snapshot: ProjectContentSnapshot, - packages: Vec, schema: &'static str, media_type: &'static str, max_input_bytes: i64, @@ -273,17 +213,7 @@ async fn materialize_bundle( }) .chain(asset_files) .collect::>(); - let package_file_count = packages - .iter() - .try_fold(0_usize, |total, package| { - total.checked_add(package.files.len()) - }) - .ok_or(CaptureProjectBundleError::TooManyFiles)?; - if files - .len() - .checked_add(package_file_count) - .is_none_or(|count| count > MAX_PROJECT_FILES) - { + if files.len() > MAX_PROJECT_FILES { return Err(CaptureProjectBundleError::TooManyFiles); } files.sort_by(|left, right| left.path.cmp(&right.path)); @@ -300,19 +230,15 @@ async fn materialize_bundle( { return Err(CaptureProjectBundleError::EntryFileNotFound); } - let expanded_bytes = files - .iter() - .map(|file| file.bytes.len()) - .chain( - packages - .iter() - .flat_map(|package| package.files.iter().map(|file| file.bytes.len())), - ) - .try_fold(0_i64, |total, size| { - i64::try_from(size) - .ok() - .and_then(|size| total.checked_add(size)) - }); + let expanded_bytes = + files + .iter() + .map(|file| file.bytes.len()) + .try_fold(0_i64, |total, size| { + i64::try_from(size) + .ok() + .and_then(|size| total.checked_add(size)) + }); if expanded_bytes.is_none_or(|size| size > max_input_bytes) { return Err(CaptureProjectBundleError::TooLarge); } @@ -333,29 +259,11 @@ async fn materialize_bundle( sha256: hex::encode(Sha256::digest(&file.bytes)), }) .collect(), - packages: packages - .iter() - .map(|package| ProjectBundlePackage { - namespace: package.namespace.clone(), - name: package.name.clone(), - version: package.version.clone(), - archive_sha256: package.archive_sha256.clone(), - files: package - .files - .iter() - .map(|file| ProjectBundlePackageFile { - path: file.path.clone(), - size_bytes: file.bytes.len(), - sha256: hex::encode(Sha256::digest(&file.bytes)), - }) - .collect(), - }) - .collect(), }; let manifest_bytes = serde_json::to_vec(&manifest).map_err(CaptureProjectBundleError::Manifest)?; - let bytes = build_bundle_zip(&manifest_bytes, files, packages) - .map_err(CaptureProjectBundleError::Archive)?; + let bytes = + build_bundle_zip(&manifest_bytes, files).map_err(CaptureProjectBundleError::Archive)?; if i64::try_from(bytes.len()).map_or(true, |size| size > max_input_bytes) { return Err(CaptureProjectBundleError::TooLarge); } @@ -377,7 +285,6 @@ async fn materialize_bundle( fn build_bundle_zip( manifest: &[u8], files: Vec, - packages: Vec, ) -> Result, BundleArchiveError> { let cursor = std::io::Cursor::new(Vec::::new()); let mut zip = zip::ZipWriter::new(cursor); @@ -390,15 +297,6 @@ fn build_bundle_zip( let archive_path = format!("project/{}", file.path); write_entry(&mut zip, &archive_path, &file.bytes, options)?; } - for package in packages { - for file in package.files { - let archive_path = format!( - "packages/{}/{}/{}/{}", - package.namespace, package.name, package.version, file.path - ); - write_entry(&mut zip, &archive_path, &file.bytes, options)?; - } - } zip.finish() .map(|cursor| cursor.into_inner()) .map_err(BundleArchiveError::Finish) @@ -436,8 +334,8 @@ mod tests { }] }; assert_eq!( - build_bundle_zip(br#"{"schema":"project-bundle/v1"}"#, files(), Vec::new())?, - build_bundle_zip(br#"{"schema":"project-bundle/v1"}"#, files(), Vec::new())? + build_bundle_zip(br#"{"schema":"project-bundle/v1"}"#, files())?, + build_bundle_zip(br#"{"schema":"project-bundle/v1"}"#, files())? ); Ok(()) } diff --git a/backend/src/document_processing/public_http.rs b/backend/src/document_processing/public_http.rs index 1590ae3..76bcae5 100644 --- a/backend/src/document_processing/public_http.rs +++ b/backend/src/document_processing/public_http.rs @@ -12,8 +12,7 @@ use super::persistence::{ }; use super::pptx::{validate_pptx, PptxValidationError}; use super::project_input::{ - capture_project_bundle, capture_typst_project_bundle, CaptureProjectBundleError, - CapturedProjectBundle, TypstProjectBundleCapture, + capture_project_bundle, CaptureProjectBundleError, CapturedProjectBundle, ProjectBundleCapture, }; use crate::access::{ ensure_project_role, ensure_project_role_for_user, required_request_user_id, AccessNeed, @@ -22,10 +21,7 @@ use crate::access::{ use crate::app_state::AppState; use crate::http_response::ApiError; use crate::protocol::ApiErrorCode; -use crate::typst_runtime::{analyze_project_dependencies, ResolveProcessingPackagesError}; -use crate::workspace::{ - load_project_content_snapshot, load_project_entry_point, ProjectName, ProjectType, -}; +use crate::workspace::{load_project_entry_point, ProjectName, ProjectType}; use axum::body::{Body, Bytes}; use axum::extract::{Path, Query, State}; use axum::http::{header, HeaderMap, StatusCode}; @@ -75,14 +71,15 @@ pub(crate) async fn create_latex_pdf_build( let bundle = capture_or_fail( &state, reserved.job_id, - capture_project_bundle( - &state.db, - state.storage.as_ref(), - &state.collaboration, - reserved.job_id, + capture_project_bundle(ProjectBundleCapture { + db: &state.db, + storage: state.storage.as_ref(), + collaboration: &state.collaboration, + operation, + job_id: reserved.job_id, project_id, - state.processing.config.max_input_bytes, - ) + max_input_bytes: state.processing.config.max_input_bytes, + }) .await, ) .await?; @@ -123,11 +120,10 @@ pub(crate) async fn create_typst_pptx_export( let bundle = capture_or_fail( &state, reserved.job_id, - capture_typst_project_bundle(TypstProjectBundleCapture { + capture_project_bundle(ProjectBundleCapture { db: &state.db, storage: state.storage.as_ref(), collaboration: &state.collaboration, - builtin_dir: &state.typst_builtin_dir, operation, job_id: reserved.job_id, project_id, @@ -577,50 +573,27 @@ pub(crate) async fn project_processing_capabilities( Path(project_id): Path, ) -> Result, ApiError> { ensure_project_role(&state.db, &headers, project_id, AccessNeed::Read).await?; - let snapshot = load_project_content_snapshot(&state.db, project_id) - .await - .map_err(|error| { - processing_unavailable("project processing capability could not be read", error) - })? - .ok_or_else(|| { - ApiError::new( - StatusCode::NOT_FOUND, - ApiErrorCode::ProjectNotFound, - "Project was not found", - ) - })?; - let dependencies = (snapshot.project_type == ProjectType::Typst) - .then(|| analyze_project_dependencies(&snapshot.entry_file_path, &snapshot.documents)); + let entry_point = load_project_entry_point(&state.db, project_id).await?; let mut capabilities = Vec::new(); for operation in state .processing .configured_operations() .into_iter() .filter(|operation| state.distribution.supports_processing_operation(*operation)) - .filter(|operation| operation.project_type() == Some(snapshot.project_type)) + .filter(|operation| operation.project_type() == Some(entry_point.project_type)) { - let dynamic_dependency = dependencies - .as_ref() - .is_some_and(|dependencies| dependencies.has_dynamic_imports); - let (capability_state, reason) = if dynamic_dependency { + let stats = capability_stats(&state.db, operation) + .await + .map_err(|error| { + processing_unavailable("project processing capability could not be read", error) + })?; + let (capability_state, reason) = if stats.healthy_sessions == 0 { ( - ProjectProcessingCapabilityState::Inapplicable, - Some("dynamic_typst_dependency".to_string()), + ProjectProcessingCapabilityState::Waiting, + Some("worker_temporarily_offline".to_string()), ) } else { - let stats = capability_stats(&state.db, operation) - .await - .map_err(|error| { - processing_unavailable("project processing capability could not be read", error) - })?; - if stats.healthy_sessions == 0 { - ( - ProjectProcessingCapabilityState::Waiting, - Some("worker_temporarily_offline".to_string()), - ) - } else { - (ProjectProcessingCapabilityState::Available, None) - } + (ProjectProcessingCapabilityState::Available, None) }; capabilities.push(ProjectProcessingCapability { operation, @@ -867,21 +840,6 @@ fn capture_failure(error: &CaptureProjectBundleError) -> (&'static str, &'static "input_too_large", "Project exceeds the processing input limit", ), - CaptureProjectBundleError::Package( - ResolveProcessingPackagesError::TooManyPackages - | ResolveProcessingPackagesError::TooLarge, - ) => ( - "input_too_large", - "Project dependencies exceed the processing input limit", - ), - CaptureProjectBundleError::Package(ResolveProcessingPackagesError::DynamicDependency) => ( - "dynamic_typst_dependency", - "Project contains a dynamic Typst dependency", - ), - CaptureProjectBundleError::Package(_) => ( - "package_capture_failed", - "Typst package dependencies could not be captured", - ), CaptureProjectBundleError::Collaboration(_) | CaptureProjectBundleError::Persistence(_) | CaptureProjectBundleError::Asset(_) @@ -914,28 +872,6 @@ fn capture_error(error: CaptureProjectBundleError) -> ApiError { "Project exceeds the processing input limit", ) } - CaptureProjectBundleError::Package( - ResolveProcessingPackagesError::TooManyPackages - | ResolveProcessingPackagesError::TooLarge, - ) => ApiError::new( - StatusCode::PAYLOAD_TOO_LARGE, - ApiErrorCode::ProcessingInputTooLarge, - "Project dependencies exceed the processing input limit", - ), - CaptureProjectBundleError::Package( - ResolveProcessingPackagesError::DynamicDependency - | ResolveProcessingPackagesError::LocalPackageNotFound { .. } - | ResolveProcessingPackagesError::UnsafeArchive { .. } - | ResolveProcessingPackagesError::Manifest { .. } - | ResolveProcessingPackagesError::DuplicateFile { .. }, - ) => ApiError::new( - StatusCode::UNPROCESSABLE_ENTITY, - ApiErrorCode::ProcessingInputInvalid, - "Typst package dependencies cannot be processed", - ), - failure @ CaptureProjectBundleError::Package(_) => { - processing_unavailable("Typst package dependencies could not be captured", failure) - } failure @ (CaptureProjectBundleError::Collaboration(_) | CaptureProjectBundleError::Persistence(_) | CaptureProjectBundleError::Asset(_) diff --git a/backend/src/typst_runtime/dependencies.rs b/backend/src/typst_runtime/dependencies.rs deleted file mode 100644 index ddcd32f..0000000 --- a/backend/src/typst_runtime/dependencies.rs +++ /dev/null @@ -1,159 +0,0 @@ -//! Static Typst package discovery for project applicability and input capture. - -use super::PackageSpec; -use std::collections::{HashMap, HashSet, VecDeque}; -use std::path::{Component, Path, PathBuf}; -use std::str::FromStr; -use typst_syntax::ast::{Expr, ModuleImport, ModuleInclude}; -use typst_syntax::package::PackageSpec as SyntaxPackageSpec; -use typst_syntax::SyntaxNode; - -#[derive(Clone, Debug, Default, Eq, PartialEq)] -pub(crate) struct TypstProjectDependencies { - pub packages: HashSet, - pub has_dynamic_imports: bool, -} - -pub(crate) fn analyze_project_dependencies( - entry_file_path: &str, - documents: &HashMap, -) -> TypstProjectDependencies { - let mut dependencies = TypstProjectDependencies::default(); - let mut pending = VecDeque::from([entry_file_path.to_string()]); - let mut visited = HashSet::new(); - while let Some(path) = pending.pop_front() { - if !visited.insert(path.clone()) { - continue; - } - let Some(source) = documents.get(&path) else { - continue; - }; - let root = typst_syntax::parse(source); - visit_imports(&root, &path, documents, &mut dependencies, &mut pending); - } - dependencies -} - -fn visit_imports( - node: &SyntaxNode, - current_path: &str, - documents: &HashMap, - dependencies: &mut TypstProjectDependencies, - pending: &mut VecDeque, -) { - let source = node - .cast::() - .map(ModuleImport::source) - .or_else(|| node.cast::().map(ModuleInclude::source)); - if let Some(source) = source { - match source { - Expr::Str(value) => { - let value = value.get(); - if value.starts_with('@') { - if let Some(package) = parse_package_spec(value.as_str()) { - dependencies.packages.insert(package); - } else { - dependencies.has_dynamic_imports = true; - } - } else if let Some(path) = resolve_project_import(current_path, value.as_str()) { - if documents.contains_key(&path) { - pending.push_back(path); - } - } - } - _ => dependencies.has_dynamic_imports = true, - } - } - for child in node.children() { - visit_imports(child, current_path, documents, dependencies, pending); - } -} - -fn parse_package_spec(value: &str) -> Option { - let parsed = SyntaxPackageSpec::from_str(value).ok()?; - PackageSpec::parse( - parsed.namespace.to_string(), - parsed.name.to_string(), - parsed.version.to_string(), - ) -} - -fn resolve_project_import(current_path: &str, imported: &str) -> Option { - if imported.is_empty() || imported.contains('\\') || imported.chars().any(char::is_control) { - return None; - } - let imported = Path::new(imported); - let candidate = if imported.is_absolute() { - imported.strip_prefix("/").ok()?.to_path_buf() - } else { - Path::new(current_path) - .parent() - .unwrap_or_else(|| Path::new("")) - .join(imported) - }; - normalize_relative_path(&candidate) -} - -fn normalize_relative_path(path: &Path) -> Option { - let mut normalized = PathBuf::new(); - for component in path.components() { - match component { - Component::CurDir => {} - Component::Normal(value) => normalized.push(value), - Component::ParentDir => { - if !normalized.pop() { - return None; - } - } - Component::RootDir | Component::Prefix(_) => return None, - } - } - let value = normalized.to_str()?; - (!value.is_empty()).then(|| value.to_string()) -} - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn follows_reachable_local_imports_and_collects_exact_packages() { - let documents = HashMap::from([ - ( - "main.typ".to_string(), - "#import \"lib/slides.typ\": *\n#show: deck".to_string(), - ), - ( - "lib/slides.typ".to_string(), - "#import \"@local/slides:0.7.0\": *".to_string(), - ), - ( - "unused.typ".to_string(), - "#import \"@preview/unused:1.0.0\": *".to_string(), - ), - ]); - - let dependencies = analyze_project_dependencies("main.typ", &documents); - - assert_eq!(dependencies.packages.len(), 1); - assert!(dependencies.packages.iter().any(|package| { - package.namespace() == "local" - && package.name() == "slides" - && package.version() == "0.7.0" - })); - assert!(!dependencies.has_dynamic_imports); - } - - #[test] - fn rejects_project_escape_and_marks_dynamic_imports() { - let documents = HashMap::from([( - "nested/main.typ".to_string(), - "#include \"../../outside.typ\"\n#let module = \"lib.typ\"\n#import module".to_string(), - )]); - - let dependencies = analyze_project_dependencies("nested/main.typ", &documents); - - assert!(dependencies.packages.is_empty()); - assert!(dependencies.has_dynamic_imports); - } -} diff --git a/backend/src/typst_runtime/mod.rs b/backend/src/typst_runtime/mod.rs index b71cd3a..56a68e3 100644 --- a/backend/src/typst_runtime/mod.rs +++ b/backend/src/typst_runtime/mod.rs @@ -3,18 +3,12 @@ mod archive; mod cache; mod catalog; -mod dependencies; mod http; mod package; -mod processing_packages; mod universe; -pub(crate) use dependencies::{analyze_project_dependencies, TypstProjectDependencies}; pub(crate) use http::{typst_builtin_asset, typst_package_proxy}; pub(crate) use package::PackageSpec; -pub(crate) use processing_packages::{ - resolve_processing_package_closure, ResolveProcessingPackagesError, ResolvedTypstPackage, -}; use archive::{validate_package_bytes, PackageValidationError}; use cache::read_cached_package; diff --git a/backend/src/typst_runtime/package.rs b/backend/src/typst_runtime/package.rs index 36b2a6c..e456b24 100644 --- a/backend/src/typst_runtime/package.rs +++ b/backend/src/typst_runtime/package.rs @@ -30,18 +30,6 @@ impl PackageSpec { pub(super) fn is_local(&self) -> bool { self.namespace == "local" } - - pub(crate) fn namespace(&self) -> &str { - &self.namespace - } - - pub(crate) fn name(&self) -> &str { - &self.name - } - - pub(crate) fn version(&self) -> &str { - &self.version - } } #[derive(Clone, Copy)] diff --git a/backend/src/typst_runtime/processing_packages.rs b/backend/src/typst_runtime/processing_packages.rs deleted file mode 100644 index 1a602b1..0000000 --- a/backend/src/typst_runtime/processing_packages.rs +++ /dev/null @@ -1,261 +0,0 @@ -//! Exact package closure materialization for durable Typst processing inputs. - -use super::archive::archive_path_is_safe; -use super::{ - analyze_project_dependencies, load_dynamic_package, package_cache_config, read_cached_package, - read_catalog_package, universe_config, CatalogPackageError, LoadDynamicPackageError, - PackagePayload, PackageSpec, UniverseConfigError, -}; -use flate2::read::MultiGzDecoder; -use serde::Deserialize; -use std::collections::{HashMap, HashSet, VecDeque}; -use std::io::Read; -use std::path::{Component, Path}; -use tar::Archive; -use thiserror::Error; - -const MAX_PROCESSING_PACKAGES: usize = 128; - -pub(crate) struct ResolvedTypstPackage { - pub namespace: String, - pub name: String, - pub version: String, - pub archive_sha256: String, - pub files: Vec, -} - -pub(crate) struct ResolvedTypstPackageFile { - pub path: String, - pub bytes: Vec, -} - -#[derive(Debug, Error)] -pub(crate) enum ResolveProcessingPackagesError { - #[error("Typst dependency is dynamic and cannot be captured")] - DynamicDependency, - #[error("Typst package closure contains too many packages")] - TooManyPackages, - #[error("Typst package closure exceeds the processing input limit")] - TooLarge, - #[error("local Typst package {package} was not found")] - LocalPackageNotFound { package: String }, - #[error("Typst Universe package resolution is disabled")] - UniverseDisabled, - #[error("Typst Universe configuration is invalid")] - UniverseConfig { - #[source] - source: Box, - }, - #[error("built-in Typst package resolution failed")] - Catalog { - #[source] - source: Box, - }, - #[error("Typst Universe package download failed")] - DynamicPackage { - #[source] - source: Box, - }, - #[error("Typst package {package} archive could not be read")] - Archive { - package: String, - #[source] - source: std::io::Error, - }, - #[error("Typst package {package} archive contains an unsafe entry")] - UnsafeArchive { package: String }, - #[error("Typst package {package} manifest is missing or invalid")] - Manifest { package: String }, - #[error("Typst package {package} contains duplicate files")] - DuplicateFile { package: String }, -} - -#[derive(Deserialize)] -struct PackageManifest { - package: PackageManifestEntry, -} - -#[derive(Deserialize)] -struct PackageManifestEntry { - entrypoint: String, -} - -pub(crate) async fn resolve_processing_package_closure( - builtin_dir: &Path, - roots: &super::TypstProjectDependencies, - max_expanded_bytes: i64, -) -> Result, ResolveProcessingPackagesError> { - if roots.has_dynamic_imports { - return Err(ResolveProcessingPackagesError::DynamicDependency); - } - let mut pending = roots.packages.iter().cloned().collect::>(); - let mut visited = HashSet::new(); - let mut resolved = Vec::new(); - let mut expanded_bytes = 0_i64; - while let Some(spec) = pending.pop_front() { - if !visited.insert(spec.clone()) { - continue; - } - if visited.len() > MAX_PROCESSING_PACKAGES { - return Err(ResolveProcessingPackagesError::TooManyPackages); - } - let payload = resolve_package(builtin_dir, &spec).await?; - let (files, manifest) = extract_package_files(&spec, &payload, &mut expanded_bytes)?; - if expanded_bytes > max_expanded_bytes { - return Err(ResolveProcessingPackagesError::TooLarge); - } - let documents = files - .iter() - .filter(|file| file.path.to_ascii_lowercase().ends_with(".typ")) - .filter_map(|file| { - std::str::from_utf8(&file.bytes) - .ok() - .map(|source| (file.path.clone(), source.to_string())) - }) - .collect::>(); - let dependencies = analyze_project_dependencies(&manifest.package.entrypoint, &documents); - if dependencies.has_dynamic_imports { - return Err(ResolveProcessingPackagesError::DynamicDependency); - } - pending.extend(dependencies.packages); - resolved.push(ResolvedTypstPackage { - namespace: spec.namespace().to_string(), - name: spec.name().to_string(), - version: spec.version().to_string(), - archive_sha256: payload.sha256, - files, - }); - } - resolved.sort_by(|left, right| { - (&left.namespace, &left.name, &left.version).cmp(&( - &right.namespace, - &right.name, - &right.version, - )) - }); - Ok(resolved) -} - -async fn resolve_package( - builtin_dir: &Path, - spec: &PackageSpec, -) -> Result { - let cache = package_cache_config(); - if let Some(payload) = read_catalog_package(builtin_dir, spec, cache.limits) - .await - .map_err( - |source: CatalogPackageError| ResolveProcessingPackagesError::Catalog { - source: Box::new(source), - }, - )? - { - return Ok(payload); - } - if spec.is_local() { - return Err(ResolveProcessingPackagesError::LocalPackageNotFound { - package: spec.key(), - }); - } - let universe = universe_config().map_err(|source: UniverseConfigError| { - ResolveProcessingPackagesError::UniverseConfig { - source: Box::new(source), - } - })?; - if let Some(payload) = read_cached_package(&universe.cache, spec).await { - return Ok(payload); - } - if !universe.enabled { - return Err(ResolveProcessingPackagesError::UniverseDisabled); - } - load_dynamic_package(&universe, spec) - .await - .map_err( - |source: LoadDynamicPackageError| ResolveProcessingPackagesError::DynamicPackage { - source: Box::new(source), - }, - ) -} - -fn extract_package_files( - spec: &PackageSpec, - payload: &PackagePayload, - expanded_bytes: &mut i64, -) -> Result<(Vec, PackageManifest), ResolveProcessingPackagesError> { - let package = spec.key(); - let decoder = MultiGzDecoder::new(payload.bytes.as_slice()); - let mut archive = Archive::new(decoder); - let entries = archive - .entries() - .map_err(|source| ResolveProcessingPackagesError::Archive { - package: package.clone(), - source, - })?; - let mut files = Vec::new(); - let mut paths = HashSet::new(); - let mut manifest = None::; - for entry in entries { - let mut entry = entry.map_err(|source| ResolveProcessingPackagesError::Archive { - package: package.clone(), - source, - })?; - if entry.header().entry_type().is_dir() { - continue; - } - let path = entry - .path() - .map_err(|source| ResolveProcessingPackagesError::Archive { - package: package.clone(), - source, - })? - .into_owned(); - if !entry.header().entry_type().is_file() || !archive_path_is_safe(&path) { - return Err(ResolveProcessingPackagesError::UnsafeArchive { package }); - } - let path = normalized_archive_path(&path).ok_or_else(|| { - ResolveProcessingPackagesError::UnsafeArchive { - package: package.clone(), - } - })?; - if !paths.insert(path.clone()) { - return Err(ResolveProcessingPackagesError::DuplicateFile { package }); - } - let declared_size = - i64::try_from(entry.size()).map_err(|_| ResolveProcessingPackagesError::TooLarge)?; - *expanded_bytes = expanded_bytes - .checked_add(declared_size) - .ok_or(ResolveProcessingPackagesError::TooLarge)?; - let mut bytes = Vec::with_capacity(usize::try_from(entry.size()).unwrap_or(0)); - entry.read_to_end(&mut bytes).map_err(|source| { - ResolveProcessingPackagesError::Archive { - package: package.clone(), - source, - } - })?; - if path == "typst.toml" { - manifest = std::str::from_utf8(&bytes) - .ok() - .and_then(|source| toml::from_str(source).ok()); - } - files.push(ResolvedTypstPackageFile { path, bytes }); - } - files.sort_by(|left, right| left.path.cmp(&right.path)); - let manifest = manifest.ok_or(ResolveProcessingPackagesError::Manifest { package })?; - if !paths.contains(&manifest.package.entrypoint) { - return Err(ResolveProcessingPackagesError::Manifest { - package: spec.key(), - }); - } - Ok((files, manifest)) -} - -fn normalized_archive_path(path: &Path) -> Option { - let parts = path - .components() - .filter_map(|component| match component { - Component::CurDir => None, - Component::Normal(value) => value.to_str(), - Component::ParentDir | Component::RootDir | Component::Prefix(_) => None, - }) - .collect::>(); - (!parts.is_empty()).then(|| parts.join("/")) -} diff --git a/docs/community/architecture/document-processing.md b/docs/community/architecture/document-processing.md index 98f0e07..78e0314 100644 --- a/docs/community/architecture/document-processing.md +++ b/docs/community/architecture/document-processing.md @@ -268,12 +268,11 @@ without holding the editor still for the duration of a build. The manifest includes schema, project type, entry path, operation-relevant settings, Workspace version, content generation, and sorted file records with -kind, length, and SHA-256. A Typst processing bundle additionally carries the -exact reachable `@local` and `@preview` package closure. Dynamic imports are -rejected because they cannot produce a coherent immutable input. -The `input_digest` covers the canonical manifest and all file and package -content. It is distinct from the browser's local `CompileWorld` and from a -user-created named snapshot. +kind, length, and SHA-256. It contains only project-owned documents and assets; +compiler packages and other runtime dependencies belong to the processor +contract and its package store. The `input_digest` covers the canonical +manifest and all project content. It is distinct from the browser's local +`CompileWorld` and from a user-created named snapshot. Job identifiers, queue timestamps, and other volatile submission metadata do not enter the content digest. If a processor consumes a source epoch, that @@ -335,11 +334,9 @@ capability projection. Their live state is: An absent operation is not enabled by this deployment. It is not represented as a third `unavailable` worker-health state. -Project capability queries add applicability to the same projection. A -configured project operation is `inapplicable` when its project type or exact -package policy is not satisfied; live worker health cannot make an -inapplicable project eligible. Submission captures a fresh coherent snapshot -and rechecks the policy, so the query is guidance rather than authorization. +Project capability queries filter the same projection by project type. The +query is guidance rather than authorization; submission checks the project +type again and captures a fresh coherent snapshot. A waiting operation may accept a bounded, expiring job while workers are temporarily offline. The frontend presents that condition before submission diff --git a/docs/community/reference/api.md b/docs/community/reference/api.md index 5c4d919..e58526b 100644 --- a/docs/community/reference/api.md +++ b/docs/community/reference/api.md @@ -212,10 +212,9 @@ A new job returns `202`, while an exact replay returns the existing job. The global capability response contains only distribution-allowed, deployment-configured operations and distinguishes `available` from -configured-but-offline `waiting`. The project capability route also returns -`inapplicable` when an operation's exact project/package policy is not met. -Submission rechecks that policy against the captured snapshot. An absent -operation is not enabled. +configured-but-offline `waiting`. The project capability route filters by +project type and reports the current worker availability. An absent operation +is not enabled. PPTX import uses a bounded raw PPTX body. A distribution may advertise a closed set of input profiles through processing capabilities; clients omit diff --git a/docs/community/reference/worker-protocol.md b/docs/community/reference/worker-protocol.md index 4cb9528..9ffbdef 100644 --- a/docs/community/reference/worker-protocol.md +++ b/docs/community/reference/worker-protocol.md @@ -258,16 +258,17 @@ The SDK verifies transfer size and SHA-256 before materializing one closed input variant: - `project-bundle/v1` contains a project tree and manifest; -- `typst-project-bundle/v1` additionally contains the exact verified Typst - package closure below `packages/{namespace}/{name}/{version}`; +- `typst-project-bundle/v1` contains the same project-owned data with a + Typst-specific schema identity; - `pptx-input/v1` contains the already validated presentation bytes. Archive paths, file kinds, counts, expanded bytes, manifest records, entry -files, package identities, and every declared digest are rechecked before a -processor receives the input. Binary input is never written under a -server-supplied filename by the SDK; the processor chooses its private sandbox -path. A processor receives exactly one typed input variant and cannot access -the transfer credential used to obtain it. +files, and every declared digest are rechecked before a processor receives the +input. Runtime dependencies such as compiler packages belong to the processor +environment and are not embedded in project bundles. Binary input is never +written under a server-supplied filename by the SDK; the processor chooses its +private sandbox path. A processor receives exactly one typed input variant and +cannot access the transfer credential used to obtain it. ## Lease and heartbeat diff --git a/protocol/openapi.json b/protocol/openapi.json index 40519c0..195ad21 100644 --- a/protocol/openapi.json +++ b/protocol/openapi.json @@ -7809,8 +7809,7 @@ "type": "string", "enum": [ "available", - "waiting", - "inapplicable" + "waiting" ] }, "ProjectRole": { diff --git a/web/src/lib/api/generated.ts b/web/src/lib/api/generated.ts index d358cef..e8f4642 100644 --- a/web/src/lib/api/generated.ts +++ b/web/src/lib/api/generated.ts @@ -2356,7 +2356,7 @@ export interface components { state: components["schemas"]["ProjectProcessingCapabilityState"]; }; /** @enum {string} */ - ProjectProcessingCapabilityState: "available" | "waiting" | "inapplicable"; + ProjectProcessingCapabilityState: "available" | "waiting"; /** @enum {string} */ ProjectRole: "Owner" | "ReadWrite" | "ReadOnly"; ProjectRoleBinding: { diff --git a/web/src/lib/i18n.ts b/web/src/lib/i18n.ts index a4cefaf..c14155b 100644 --- a/web/src/lib/i18n.ts +++ b/web/src/lib/i18n.ts @@ -87,7 +87,6 @@ const messages: Record> = { "processing.importPptxAction": "Import PPTX", "processing.pptxFile": "PowerPoint file", "processing.reason.workerOffline": "The converter is temporarily offline. The task will wait for capacity.", - "processing.reason.dynamicDependency": "This project uses a dynamic import that cannot be captured for background processing.", "processing.reason.unavailable": "This conversion is unavailable for the current project.", "processing.openProject": "Open project", "processing.openProjectFailed": "Unable to open the imported project", @@ -996,7 +995,6 @@ const messages: Record> = { "processing.importPptxAction": "导入 PPTX", "processing.pptxFile": "PowerPoint 文件", "processing.reason.workerOffline": "转换服务暂时离线,任务会等待可用容量。", - "processing.reason.dynamicDependency": "项目使用了后台处理无法捕获的动态导入。", "processing.reason.unavailable": "当前项目无法使用此转换能力。", "processing.openProject": "打开项目", "processing.openProjectFailed": "无法打开导入后的项目", diff --git a/web/src/pages/processing/model.ts b/web/src/pages/processing/model.ts index f54205e..9c8e027 100644 --- a/web/src/pages/processing/model.ts +++ b/web/src/pages/processing/model.ts @@ -41,8 +41,6 @@ export function processingCapabilityReasonLabel( switch (reason) { case "worker_temporarily_offline": return t("processing.reason.workerOffline"); - case "dynamic_typst_dependency": - return t("processing.reason.dynamicDependency"); default: return t("processing.reason.unavailable"); } diff --git a/web/src/pages/workspace/components/PptxExportControl.tsx b/web/src/pages/workspace/components/PptxExportControl.tsx index a3b6b08..f234c8f 100644 --- a/web/src/pages/workspace/components/PptxExportControl.tsx +++ b/web/src/pages/workspace/components/PptxExportControl.tsx @@ -5,7 +5,7 @@ import { processingCapabilityReasonLabel } from "@/pages/processing/model"; export type PptxExportAction = { visible: boolean; - state: "available" | "waiting" | "inapplicable" | "loading" | "error"; + state: "available" | "waiting" | "loading" | "error"; reason: string | null; submit: () => Promise; pending: boolean; @@ -22,7 +22,7 @@ export function PptxExportControl({ }) { if (!action.visible) return null; - const unavailable = ["inapplicable", "loading", "error"].includes(action.state); + const unavailable = ["loading", "error"].includes(action.state); const label = action.pending ? t("processing.submitting") : action.state === "waiting" diff --git a/workers/latex/processor-contract.json b/workers/latex/processor-contract.json index 44ea595..6c8947e 100644 --- a/workers/latex/processor-contract.json +++ b/workers/latex/processor-contract.json @@ -4,7 +4,7 @@ "input_schema": "project-bundle/v1", "adapter_revision": 1, "worker_sdk_protocol": 1, - "implementation_sha256": "4d04985c773c86ce19809d22b6d2a72221bacb75d6d3175de0187c013e5da504", + "implementation_sha256": "94aeaaa467112f6fd1c4eec5926db53126754b9a95fd278d928ab2e5962d3872", "runtime": { "image": "texlive/texlive@sha256:d39efa547acfa518072600315280f92357ca8e0b9e295e09b6ccd5f5d82a1373", "tex_live_release": "2026", diff --git a/workers/latex/src/processor.rs b/workers/latex/src/processor.rs index f1c7e7c..e01dd59 100644 --- a/workers/latex/src/processor.rs +++ b/workers/latex/src/processor.rs @@ -240,7 +240,6 @@ fn validate_options(request: &ProcessorRequest) -> Result, - #[serde(default)] - pub packages: Vec, } #[derive(Clone, Deserialize)] +#[serde(deny_unknown_fields)] pub struct ProjectBundleFile { pub path: String, pub kind: String, @@ -37,22 +37,6 @@ pub struct ProjectBundleFile { pub sha256: String, } -#[derive(Clone, Deserialize)] -pub struct ProjectBundlePackage { - pub namespace: String, - pub name: String, - pub version: String, - pub archive_sha256: String, - pub files: Vec, -} - -#[derive(Clone, Deserialize)] -pub struct ProjectBundlePackageFile { - pub path: String, - pub size_bytes: i64, - pub sha256: String, -} - pub enum ProcessorInput { Project(ProjectInput), Binary(BinaryInput), @@ -61,7 +45,6 @@ pub enum ProcessorInput { pub struct ProjectInput { _root: TempDir, pub project_dir: PathBuf, - pub packages_dir: PathBuf, pub manifest: ProjectBundleManifest, } @@ -123,9 +106,7 @@ fn verify_and_extract_project( ) -> Result { let root = tempfile::tempdir().map_err(InputError::Io)?; let project_dir = root.path().join("project"); - let packages_dir = root.path().join("packages"); fs::create_dir(&project_dir).map_err(InputError::Io)?; - fs::create_dir(&packages_dir).map_err(InputError::Io)?; let mut archive = zip::ZipArchive::new(Cursor::new(content)).map_err(|_| InputError::Archive)?; if archive.is_empty() || archive.len() > MAX_BUNDLE_FILES + 1 { @@ -166,19 +147,14 @@ fn verify_and_extract_project( manifest_bytes = Some(bytes); continue; } - let (materialization_root, relative, package_file) = - if let Some(relative) = name.strip_prefix("project/") { - (&project_dir, relative, false) - } else if let Some(relative) = name.strip_prefix("packages/") { - (&packages_dir, relative, true) - } else { - return Err(InputError::UnsafePath); - }; + let relative = name + .strip_prefix("project/") + .ok_or(InputError::UnsafePath)?; if relative.is_empty() { continue; } let relative_path = Path::new(relative); - let destination = materialization_root.join(relative_path); + let destination = project_dir.join(relative_path); if entry.is_dir() { if entry.size() != 0 { return Err(InputError::Archive); @@ -197,27 +173,16 @@ fn verify_and_extract_project( actual_expanded = actual_expanded .checked_add(written) .ok_or(InputError::Limit)?; - materialized_files.insert(if package_file { - format!("packages/{relative}") - } else { - format!("project/{relative}") - }); + materialized_files.insert(format!("project/{relative}")); } let manifest: ProjectBundleManifest = serde_json::from_slice(manifest_bytes.as_deref().ok_or(InputError::Manifest)?) .map_err(|_| InputError::Manifest)?; - validate_manifest( - &manifest, - input_schema, - &project_dir, - &packages_dir, - &materialized_files, - )?; + validate_manifest(&manifest, input_schema, &project_dir, &materialized_files)?; Ok(ProjectInput { _root: root, project_dir, - packages_dir, manifest, }) } @@ -226,27 +191,14 @@ fn validate_manifest( manifest: &ProjectBundleManifest, input_schema: &str, project_dir: &Path, - packages_dir: &Path, materialized_files: &HashSet, ) -> Result<(), InputError> { - let package_file_count = manifest - .packages - .iter() - .try_fold(0_usize, |total, package| { - total.checked_add(package.files.len()) - }) - .ok_or(InputError::ManifestMismatch)?; if manifest.schema != input_schema || !matches!( manifest.schema.as_str(), "project-bundle/v1" | "typst-project-bundle/v1" ) - || (manifest.schema == "project-bundle/v1" && !manifest.packages.is_empty()) - || manifest - .files - .len() - .checked_add(package_file_count) - .is_none_or(|count| count != materialized_files.len()) + || manifest.files.len() != materialized_files.len() || !safe_relative_path(&manifest.entry_file_path) || manifest.workspace_version < 0 || manifest.content_generation < 0 @@ -272,7 +224,6 @@ fn validate_manifest( return Err(InputError::ManifestMismatch); } } - validate_packages(&manifest.packages, packages_dir, materialized_files)?; let entry_is_document = manifest .files .iter() @@ -280,14 +231,6 @@ fn validate_manifest( let expected_paths = paths .into_iter() .map(|path| format!("project/{path}")) - .chain(manifest.packages.iter().flat_map(|package| { - package.files.iter().map(|file| { - format!( - "packages/{}/{}/{}/{}", - package.namespace, package.name, package.version, file.path - ) - }) - })) .collect::>(); if expected_paths != *materialized_files || !entry_is_document @@ -298,68 +241,6 @@ fn validate_manifest( Ok(()) } -fn validate_packages( - packages: &[ProjectBundlePackage], - packages_dir: &Path, - materialized_files: &HashSet, -) -> Result<(), InputError> { - let mut identities = HashSet::new(); - for package in packages { - let identity = format!("{}/{}/{}", package.namespace, package.name, package.version); - if !matches!(package.namespace.as_str(), "local" | "preview") - || !safe_segment(&package.name) - || !safe_version(&package.version) - || package.archive_sha256.len() != 64 - || !package - .archive_sha256 - .bytes() - .all(|byte| byte.is_ascii_hexdigit()) - || !identities.insert(identity.clone()) - { - return Err(InputError::ManifestMismatch); - } - let mut package_paths = HashSet::new(); - for file in &package.files { - let materialized = format!("packages/{identity}/{}", file.path); - if !safe_relative_path(&file.path) - || !package_paths.insert(file.path.clone()) - || !materialized_files.contains(&materialized) - || file.size_bytes < 0 - || file.sha256.len() != 64 - { - return Err(InputError::ManifestMismatch); - } - let bytes = - fs::read(packages_dir.join(&identity).join(&file.path)).map_err(InputError::Io)?; - if i64::try_from(bytes.len()).ok() != Some(file.size_bytes) - || hex::encode(Sha256::digest(&bytes)) != file.sha256 - { - return Err(InputError::ManifestMismatch); - } - } - if package_paths.is_empty() { - return Err(InputError::ManifestMismatch); - } - } - Ok(()) -} - -fn safe_segment(value: &str) -> bool { - !value.is_empty() - && value.len() <= 64 - && value.bytes().all(|byte| { - byte.is_ascii_lowercase() || byte.is_ascii_digit() || matches!(byte, b'-' | b'_') - }) -} - -fn safe_version(value: &str) -> bool { - !value.is_empty() - && value.len() <= 64 - && value - .bytes() - .all(|byte| byte.is_ascii_alphanumeric() || matches!(byte, b'.' | b'-' | b'+')) -} - fn safe_archive_name(name: &str) -> bool { if name.is_empty() || name.starts_with('/') @@ -428,15 +309,17 @@ mod tests { use std::io::Write as _; fn project_bundle( + schema: &str, + project_type: &str, kind: &str, source_epoch: i64, ) -> Result, Box> { let source = b"Hello from LaTeX"; let manifest = serde_json::to_vec(&json!({ - "schema": "project-bundle/v1", - "project_type": "latex", + "schema": schema, + "project_type": project_type, "entry_file_path": "main.tex", - "latex_engine": "pdftex", + "latex_engine": (project_type == "latex").then_some("pdftex"), "workspace_version": 7, "content_generation": 3, "source_epoch": source_epoch, @@ -459,9 +342,9 @@ mod tests { Ok(writer.finish()?.into_inner()) } - fn claim_for(content: &[u8]) -> WorkerClaimInput { + fn claim_for(content: &[u8], schema: &str) -> WorkerClaimInput { WorkerClaimInput { - schema: "project-bundle/v1".to_string(), + schema: schema.to_string(), size_bytes: i64::try_from(content.len()).unwrap_or(i64::MAX), sha256: hex::encode(Sha256::digest(content)), download_url: "/unused".to_string(), @@ -484,8 +367,10 @@ mod tests { #[test] fn verifies_the_core_project_bundle_shape() -> Result<(), Box> { - let bundle = project_bundle("document", 1_700_000_000)?; - let ProcessorInput::Project(verified) = verify_input(&bundle, &claim_for(&bundle))? else { + let schema = "project-bundle/v1"; + let bundle = project_bundle(schema, "latex", "document", 1_700_000_000)?; + let ProcessorInput::Project(verified) = verify_input(&bundle, &claim_for(&bundle, schema))? + else { return Err("project bundle was materialized as a binary input".into()); }; assert_eq!(verified.manifest.content_generation, 3); @@ -493,21 +378,34 @@ mod tests { std::fs::read(verified.project_dir.join("main.tex"))?, b"Hello from LaTeX" ); - assert!(verified.packages_dir.is_dir()); + Ok(()) + } + + #[test] + fn verifies_typst_bundles_without_runtime_packages() -> Result<(), Box> { + let schema = "typst-project-bundle/v1"; + let bundle = project_bundle(schema, "typst", "document", 1_700_000_000)?; + let ProcessorInput::Project(verified) = verify_input(&bundle, &claim_for(&bundle, schema))? + else { + return Err("Typst bundle was materialized as a binary input".into()); + }; + assert_eq!(verified.manifest.project_type, "typst"); + assert!(verified.project_dir.join("main.tex").is_file()); Ok(()) } #[test] fn rejects_unknown_file_kinds_and_invalid_source_epochs( ) -> Result<(), Box> { - let unknown_kind = project_bundle("executable", 1_700_000_000)?; + let schema = "project-bundle/v1"; + let unknown_kind = project_bundle(schema, "latex", "executable", 1_700_000_000)?; assert!(matches!( - verify_input(&unknown_kind, &claim_for(&unknown_kind)), + verify_input(&unknown_kind, &claim_for(&unknown_kind, schema)), Err(InputError::ManifestMismatch) )); - let negative_epoch = project_bundle("document", -1)?; + let negative_epoch = project_bundle(schema, "latex", "document", -1)?; assert!(matches!( - verify_input(&negative_epoch, &claim_for(&negative_epoch)), + verify_input(&negative_epoch, &claim_for(&negative_epoch, schema)), Err(InputError::ManifestMismatch) )); Ok(()) diff --git a/workers/processing-sdk/src/lib.rs b/workers/processing-sdk/src/lib.rs index 4998943..8d77336 100644 --- a/workers/processing-sdk/src/lib.rs +++ b/workers/processing-sdk/src/lib.rs @@ -11,6 +11,6 @@ pub use agent::{ }; pub use input::{ safe_relative_path, BinaryInput, ProcessorInput, ProjectBundleFile, ProjectBundleManifest, - ProjectBundlePackage, ProjectBundlePackageFile, ProjectInput, + ProjectInput, }; pub use protocol::{WorkerClaimLimits, WorkerFailureClass};