diff --git a/.changeset/go-client-cancel-turn.md b/.changeset/go-client-cancel-turn.md deleted file mode 100644 index 050a187f..00000000 --- a/.changeset/go-client-cancel-turn.md +++ /dev/null @@ -1,21 +0,0 @@ ---- -"@smooai/smooth-operator": patch ---- - -feat(go): client-initiated turn cancellation — Client.Cancel() + MessageTurn.Cancel() - -The wire protocol and all five servers already honor the `cancel` frame / `cancelled` -event, but the Go client had no way to send it. Add the missing client surface, mirroring -the TypeScript reference (#459): - -- `Client.Cancel(CancelParams{RequestID, SessionID?})` sends the `cancel` frame. -- `MessageTurn.Cancel()` is the ergonomic "stop THIS turn" convenience — it cancels using - the turn's own requestId + originating sessionId. Fire-and-forget, idempotent. -- A terminal `cancelled` event settles the matching turn as a user-stop: the event is - delivered on `Events()`, the channel closes cleanly, `Wait` resolves WITHOUT an error, - and `MessageTurn.Cancelled()` reports `true` so a UI tells a user-stop apart from a - failure. Errors still go the error path. -- `cancel` is now first-class in the `ActionType` set and `cancelled` in the `EventType` - set (with `ServerEvent.AsCancelled()`), not stringly-typed. -- Idempotent: a cancel with no active turn, or a `cancelled` with no matching turn, is a - harmless no-op. diff --git a/.changeset/ts-server-cancel-unpark-confirmation.md b/.changeset/ts-server-cancel-unpark-confirmation.md deleted file mode 100644 index b6037df9..00000000 --- a/.changeset/ts-server-cancel-unpark-confirmation.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -"@smooai/smooth-operator-server": patch ---- - -fix(ts): cancel discards a HITL-parked confirmation so the parked turn drops cleanly - -Cancelling a turn parked at a write-confirmation (HITL) freed the slot and emitted `cancelled` -correctly, but the park in `turnRunner.ts` awaits a bare deferred from `ConfirmationRegistry.register` -(`const approved = await verdict`) that the turn's `cancelSignal` abort does NOT itself complete. The -cancel path already discarded it via a connection-wide `confirmations.rejectAll()`, but that is a -broader sweep than the cancel needs. - -`FrameDispatcher.cancelActiveTurn` now discards precisely the cancelled turn's pending confirmation -(`confirmations.resolve(turn.sessionId, false)`) after aborting the controller, so the parked await -unblocks immediately (resolves denied; the result is dropped because the sink is gagged and the slot -is already cleared). `activeTurn` now carries a `sessionId`, stamped where the turn is created in the -`send_message` handler. The disconnect path still rejects every outstanding confirmation separately -via `rejectPendingConfirmations`, so nothing dangles there. Mirrors the Rust reference dropping the -confirmation future on abort and the .NET fix (#460). No behavior change for a non-parked cancel or -the no-active-turn no-op. - -Adds a parity test (mirroring the .NET `CancelUnparkTests`) that drives a turn to -`write_confirmation_required`, cancels it, and asserts `cancelled` is emitted, a later -`confirm_tool_action` returns `NO_PENDING_CONFIRMATION`, the slot is freed (a new `send_message` is -accepted), and no stray events leak from the abandoned turn. diff --git a/dotnet/server/aspnetcore/SmooAI.SmoothOperator.Server.AspNetCore.csproj b/dotnet/server/aspnetcore/SmooAI.SmoothOperator.Server.AspNetCore.csproj index acf38ad2..3540c11c 100644 --- a/dotnet/server/aspnetcore/SmooAI.SmoothOperator.Server.AspNetCore.csproj +++ b/dotnet/server/aspnetcore/SmooAI.SmoothOperator.Server.AspNetCore.csproj @@ -15,7 +15,7 @@ attribute. (Keep the element-form version out of comments: the sync regex replaces the first element-form match in the file.) --> SmooAI.SmoothOperator.Server.AspNetCore - 1.52.0 + 1.52.1 SmooAI ai;agent;llm;chat;smooth-operator;server;aspnetcore;websocket;smooai MIT diff --git a/dotnet/server/postgres/src/SmooAI.SmoothOperator.Server.Postgres.csproj b/dotnet/server/postgres/src/SmooAI.SmoothOperator.Server.Postgres.csproj index 8090a7e6..36467974 100644 --- a/dotnet/server/postgres/src/SmooAI.SmoothOperator.Server.Postgres.csproj +++ b/dotnet/server/postgres/src/SmooAI.SmoothOperator.Server.Postgres.csproj @@ -15,7 +15,7 @@ attribute. (Keep the element-form version out of comments: the sync regex replaces the first element-form match in the file.) --> SmooAI.SmoothOperator.Server.Postgres - 1.52.0 + 1.52.1 SmooAI ai;agent;llm;chat;smooth-operator;server;postgres;pgvector;smooai MIT diff --git a/dotnet/server/src/SmooAI.SmoothOperator.Server.csproj b/dotnet/server/src/SmooAI.SmoothOperator.Server.csproj index 7bcecc74..770be5d9 100644 --- a/dotnet/server/src/SmooAI.SmoothOperator.Server.csproj +++ b/dotnet/server/src/SmooAI.SmoothOperator.Server.csproj @@ -14,7 +14,7 @@ scripts/sync-versions.mjs (do NOT confuse with the SmooAI.SmoothOperator.Core PackageReference version below, which tracks the separately-published engine). --> SmooAI.SmoothOperator.Server - 1.52.0 + 1.52.1 SmooAI ai;agent;llm;chat;smooth-operator;server;websocket;smooai MIT diff --git a/examples/web-chat/CHANGELOG.md b/examples/web-chat/CHANGELOG.md index 4bff51c7..a5bc2073 100644 --- a/examples/web-chat/CHANGELOG.md +++ b/examples/web-chat/CHANGELOG.md @@ -1,5 +1,12 @@ # @smooai/smooth-operator-web-chat-example +## 0.0.89 + +### Patch Changes + +- Updated dependencies [888cbef] + - @smooai/smooth-operator@1.52.1 + ## 0.0.88 ### Patch Changes diff --git a/examples/web-chat/package.json b/examples/web-chat/package.json index 8bbcb1cd..5bfb2d95 100644 --- a/examples/web-chat/package.json +++ b/examples/web-chat/package.json @@ -1,6 +1,6 @@ { "name": "@smooai/smooth-operator-web-chat-example", - "version": "0.0.88", + "version": "0.0.89", "private": true, "description": "A smooth-web-like Vite + React chat client that drives a running smooth-operator server over its WebSocket protocol — token streaming, inline tool-call/result blocks, a conversation sidebar, and oldest-first history, all on top of the published @smooai/smooth-operator SDK.", "type": "module", diff --git a/go/version.go b/go/version.go index a62915ec..630d2801 100644 --- a/go/version.go +++ b/go/version.go @@ -5,4 +5,4 @@ package e2e // language artifacts. The real Go "publish" is a git tag (go/v); this // constant is the anchor that scripts/sync-versions.mjs keeps in sync with the // canonical npm version on every changeset release. -const Version = "1.52.0" +const Version = "1.52.1" diff --git a/python/pyproject.toml b/python/pyproject.toml index eb09c981..94e34857 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "smooai-smooth-operator" -version = "1.52.0" +version = "1.52.1" description = "Python protocol types and native async WebSocket client for the smooth-operator protocol. Generated from the language-neutral JSON Schemas in spec/." readme = "README.md" license = { text = "MIT" } diff --git a/python/server/pyproject.toml b/python/server/pyproject.toml index a65efcd0..c08494b7 100644 --- a/python/server/pyproject.toml +++ b/python/server/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "smooai-smooth-operator-server" -version = "1.52.0" +version = "1.52.1" description = "Native async WebSocket server for the smooth-operator protocol — parity with the Rust and C# reference servers, consuming the in-process smooai-smooth-operator-core engine." readme = "README.md" license = { text = "MIT" } diff --git a/rust/Cargo.lock b/rust/Cargo.lock index b1abb50f..14fef1ce 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -4099,7 +4099,7 @@ checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" [[package]] name = "smooai-smooth-operator" -version = "1.52.0" +version = "1.52.1" dependencies = [ "anyhow", "async-trait", @@ -4133,7 +4133,7 @@ dependencies = [ [[package]] name = "smooai-smooth-operator-adapter-backplane-nats" -version = "1.52.0" +version = "1.52.1" dependencies = [ "anyhow", "async-nats", @@ -4149,7 +4149,7 @@ dependencies = [ [[package]] name = "smooai-smooth-operator-adapter-backplane-redis" -version = "1.52.0" +version = "1.52.1" dependencies = [ "anyhow", "async-trait", @@ -4165,7 +4165,7 @@ dependencies = [ [[package]] name = "smooai-smooth-operator-adapter-dynamodb" -version = "1.52.0" +version = "1.52.1" dependencies = [ "anyhow", "async-trait", @@ -4186,7 +4186,7 @@ dependencies = [ [[package]] name = "smooai-smooth-operator-adapter-memory" -version = "1.52.0" +version = "1.52.1" dependencies = [ "anyhow", "async-trait", @@ -4199,7 +4199,7 @@ dependencies = [ [[package]] name = "smooai-smooth-operator-adapter-postgres" -version = "1.52.0" +version = "1.52.1" dependencies = [ "anyhow", "async-trait", @@ -4290,7 +4290,7 @@ dependencies = [ [[package]] name = "smooai-smooth-operator-ingestion" -version = "1.52.0" +version = "1.52.1" dependencies = [ "anyhow", "async-trait", @@ -4337,7 +4337,7 @@ dependencies = [ [[package]] name = "smooai-smooth-operator-server" -version = "1.52.0" +version = "1.52.1" dependencies = [ "anyhow", "async-trait", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index ad610420..8470241f 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -40,7 +40,7 @@ smooai-smooth-operator-core = "1.8.0" # Intra-workspace dep on the reference lib carries its version so the adapters / # ingestion / server that depend on it are publishable (path = local dev, # version = the crates.io requirement). -smooth-operator = { package = "smooai-smooth-operator", path = "smooth-operator", version = "1.52.0" } +smooth-operator = { package = "smooai-smooth-operator", path = "smooth-operator", version = "1.52.1" } async-trait = "0.1" anyhow = "1" diff --git a/rust/adapters/backplane-nats/Cargo.toml b/rust/adapters/backplane-nats/Cargo.toml index 48be7ab6..a77bd4ad 100644 --- a/rust/adapters/backplane-nats/Cargo.toml +++ b/rust/adapters/backplane-nats/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "smooai-smooth-operator-adapter-backplane-nats" -version = "1.52.0" +version = "1.52.1" edition.workspace = true license.workspace = true repository.workspace = true diff --git a/rust/adapters/backplane-redis/Cargo.toml b/rust/adapters/backplane-redis/Cargo.toml index 75b7dd37..21cd3976 100644 --- a/rust/adapters/backplane-redis/Cargo.toml +++ b/rust/adapters/backplane-redis/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "smooai-smooth-operator-adapter-backplane-redis" -version = "1.52.0" +version = "1.52.1" edition.workspace = true license.workspace = true repository.workspace = true diff --git a/rust/adapters/dynamodb/Cargo.toml b/rust/adapters/dynamodb/Cargo.toml index 0ad148fe..3bffa305 100644 --- a/rust/adapters/dynamodb/Cargo.toml +++ b/rust/adapters/dynamodb/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "smooai-smooth-operator-adapter-dynamodb" -version = "1.52.0" +version = "1.52.1" edition.workspace = true license.workspace = true repository.workspace = true @@ -19,7 +19,7 @@ s3-vectors = ["dep:aws-sdk-s3vectors", "dep:aws-smithy-types"] smooth-operator = { workspace = true } smooai-smooth-operator-core = { workspace = true } # IndexingStore / IndexingRun for the persistent admin indexing-runs store. -smooai-smooth-operator-ingestion = { path = "../../ingestion", version = "1.52.0" } +smooai-smooth-operator-ingestion = { path = "../../ingestion", version = "1.52.1" } async-trait = { workspace = true } anyhow = { workspace = true } chrono = { workspace = true } diff --git a/rust/adapters/in-memory/Cargo.toml b/rust/adapters/in-memory/Cargo.toml index f68abb2d..6af14b62 100644 --- a/rust/adapters/in-memory/Cargo.toml +++ b/rust/adapters/in-memory/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "smooai-smooth-operator-adapter-memory" -version = "1.52.0" +version = "1.52.1" edition.workspace = true license.workspace = true repository.workspace = true diff --git a/rust/adapters/postgres/Cargo.toml b/rust/adapters/postgres/Cargo.toml index 1399c232..1a540772 100644 --- a/rust/adapters/postgres/Cargo.toml +++ b/rust/adapters/postgres/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "smooai-smooth-operator-adapter-postgres" -version = "1.52.0" +version = "1.52.1" edition.workspace = true license.workspace = true repository.workspace = true @@ -15,7 +15,7 @@ smooth-operator = { workspace = true } # `postgres` feature pulls in PostgresCheckpointStore (sync r2d2 path). smooai-smooth-operator-core = { workspace = true, features = ["postgres"] } # IndexingStore / IndexingRun for the persistent admin indexing-runs store. -smooai-smooth-operator-ingestion = { path = "../../ingestion", version = "1.52.0" } +smooai-smooth-operator-ingestion = { path = "../../ingestion", version = "1.52.1" } async-trait = { workspace = true } anyhow = { workspace = true } chrono = { workspace = true } diff --git a/rust/ingestion/Cargo.toml b/rust/ingestion/Cargo.toml index 1c5e4962..89a70d63 100644 --- a/rust/ingestion/Cargo.toml +++ b/rust/ingestion/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "smooai-smooth-operator-ingestion" -version = "1.52.0" +version = "1.52.1" edition.workspace = true license.workspace = true repository.workspace = true diff --git a/rust/smooth-operator-server/Cargo.toml b/rust/smooth-operator-server/Cargo.toml index 88b2524f..59baa2e3 100644 --- a/rust/smooth-operator-server/Cargo.toml +++ b/rust/smooth-operator-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "smooai-smooth-operator-server" -version = "1.52.0" +version = "1.52.1" edition.workspace = true license.workspace = true repository.workspace = true @@ -35,22 +35,22 @@ smooth-operator = { workspace = true } smooai-smooth-operator-core = { workspace = true } # In-memory storage + backplane — ALWAYS included. The local-flavor default and # the lean (`--no-default-features`) build run entirely on these. -smooai-smooth-operator-adapter-memory = { path = "../adapters/in-memory", version = "1.52.0" } +smooai-smooth-operator-adapter-memory = { path = "../adapters/in-memory", version = "1.52.1" } # Persistent storage + admin-store backends, selected at runtime to match the # configured storage backend (Postgres / DynamoDB; default in-memory). Optional: # gated behind the `postgres` / `dynamodb` features so a lean local/embed build # can exclude tokio-postgres / the AWS SDK. The `postgres` crate also provides the # gateway-backed embedder/reranker, so the `postgres` feature additionally enables # the semantic-retrieval path in `embedder.rs` / `reranker.rs`. -smooai-smooth-operator-adapter-postgres = { path = "../adapters/postgres", version = "1.52.0", optional = true } -smooai-smooth-operator-adapter-dynamodb = { path = "../adapters/dynamodb", version = "1.52.0", optional = true } +smooai-smooth-operator-adapter-postgres = { path = "../adapters/postgres", version = "1.52.1", optional = true } +smooai-smooth-operator-adapter-dynamodb = { path = "../adapters/dynamodb", version = "1.52.1", optional = true } # Distributed Backplane backends for horizontal scale-out, selected at runtime # via SMOOTH_AGENT_BACKPLANE (default in-memory / single-process). Optional: gated # behind the `redis` / `nats` features so a lean build excludes their drivers. -smooai-smooth-operator-adapter-backplane-redis = { path = "../adapters/backplane-redis", version = "1.52.0", optional = true } -smooai-smooth-operator-adapter-backplane-nats = { path = "../adapters/backplane-nats", version = "1.52.0", optional = true } +smooai-smooth-operator-adapter-backplane-redis = { path = "../adapters/backplane-redis", version = "1.52.1", optional = true } +smooai-smooth-operator-adapter-backplane-nats = { path = "../adapters/backplane-nats", version = "1.52.1", optional = true } # Admin API surfaces indexing-run status via the ingestion crate's IndexingStore. -smooai-smooth-operator-ingestion = { path = "../ingestion", version = "1.52.0" } +smooai-smooth-operator-ingestion = { path = "../ingestion", version = "1.52.1" } async-trait = { workspace = true } anyhow = { workspace = true } diff --git a/rust/smooth-operator/Cargo.toml b/rust/smooth-operator/Cargo.toml index e5e4af3b..9b1827b0 100644 --- a/rust/smooth-operator/Cargo.toml +++ b/rust/smooth-operator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "smooai-smooth-operator" -version = "1.52.0" +version = "1.52.1" edition.workspace = true license.workspace = true repository.workspace = true diff --git a/typescript/CHANGELOG.md b/typescript/CHANGELOG.md index 749def67..661abf43 100644 --- a/typescript/CHANGELOG.md +++ b/typescript/CHANGELOG.md @@ -1,5 +1,27 @@ # @smooai/smooth-operator +## 1.52.1 + +### Patch Changes + +- 888cbef: feat(go): client-initiated turn cancellation — Client.Cancel() + MessageTurn.Cancel() + + The wire protocol and all five servers already honor the `cancel` frame / `cancelled` + event, but the Go client had no way to send it. Add the missing client surface, mirroring + the TypeScript reference (#459): + + - `Client.Cancel(CancelParams{RequestID, SessionID?})` sends the `cancel` frame. + - `MessageTurn.Cancel()` is the ergonomic "stop THIS turn" convenience — it cancels using + the turn's own requestId + originating sessionId. Fire-and-forget, idempotent. + - A terminal `cancelled` event settles the matching turn as a user-stop: the event is + delivered on `Events()`, the channel closes cleanly, `Wait` resolves WITHOUT an error, + and `MessageTurn.Cancelled()` reports `true` so a UI tells a user-stop apart from a + failure. Errors still go the error path. + - `cancel` is now first-class in the `ActionType` set and `cancelled` in the `EventType` + set (with `ServerEvent.AsCancelled()`), not stringly-typed. + - Idempotent: a cancel with no active turn, or a `cancelled` with no matching turn, is a + harmless no-op. + ## 1.52.0 ### Minor Changes diff --git a/typescript/package.json b/typescript/package.json index 84c1777c..b139d2f4 100644 --- a/typescript/package.json +++ b/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@smooai/smooth-operator", - "version": "1.52.0", + "version": "1.52.1", "description": "TypeScript SDK for the smooth-operator WebSocket protocol: the native client (`.`), React bindings (`./react`), and the embeddable web-component chat widget (`./widget`). Generated from the language-neutral JSON Schemas in spec/.", "license": "MIT", "type": "module", diff --git a/typescript/server/CHANGELOG.md b/typescript/server/CHANGELOG.md index 9d772b7f..116a0a40 100644 --- a/typescript/server/CHANGELOG.md +++ b/typescript/server/CHANGELOG.md @@ -1,5 +1,31 @@ # @smooai/smooth-operator-server +## 1.12.1 + +### Patch Changes + +- 89c5ca7: fix(ts): cancel discards a HITL-parked confirmation so the parked turn drops cleanly + + Cancelling a turn parked at a write-confirmation (HITL) freed the slot and emitted `cancelled` + correctly, but the park in `turnRunner.ts` awaits a bare deferred from `ConfirmationRegistry.register` + (`const approved = await verdict`) that the turn's `cancelSignal` abort does NOT itself complete. The + cancel path already discarded it via a connection-wide `confirmations.rejectAll()`, but that is a + broader sweep than the cancel needs. + + `FrameDispatcher.cancelActiveTurn` now discards precisely the cancelled turn's pending confirmation + (`confirmations.resolve(turn.sessionId, false)`) after aborting the controller, so the parked await + unblocks immediately (resolves denied; the result is dropped because the sink is gagged and the slot + is already cleared). `activeTurn` now carries a `sessionId`, stamped where the turn is created in the + `send_message` handler. The disconnect path still rejects every outstanding confirmation separately + via `rejectPendingConfirmations`, so nothing dangles there. Mirrors the Rust reference dropping the + confirmation future on abort and the .NET fix (#460). No behavior change for a non-parked cancel or + the no-active-turn no-op. + + Adds a parity test (mirroring the .NET `CancelUnparkTests`) that drives a turn to + `write_confirmation_required`, cancels it, and asserts `cancelled` is emitted, a later + `confirm_tool_action` returns `NO_PENDING_CONFIRMATION`, the slot is freed (a new `send_message` is + accepted), and no stray events leak from the abandoned turn. + ## 1.12.0 ### Minor Changes diff --git a/typescript/server/package.json b/typescript/server/package.json index 3301a80c..f9af4302 100644 --- a/typescript/server/package.json +++ b/typescript/server/package.json @@ -1,6 +1,6 @@ { "name": "@smooai/smooth-operator-server", - "version": "1.12.0", + "version": "1.12.1", "private": true, "description": "Native TypeScript smooth-operator server: a WebSocket service that speaks the smooth-operator wire protocol and runs the @smooai/smooth-operator-core engine in-process per turn. The TS sibling of the Rust (rust/smooth-operator-server) and C# (dotnet/server) servers; the client lives in ../src and is untouched.", "license": "MIT",