@@ -26,7 +26,7 @@ Spec:  https://agentclientprotocol.com
 > protocol (`Agent.v2()`, `V2ConnectionTo`) sits behind the `unstable_protocol_v2`
 > feature and siGit does not enable it.
 
-siGit's entire ACP server lives in `src/main.rs` (`run_acp_server`, the
+siGit's entire ACP server lives in `crates/cli/src/main.rs` (`run_acp_server`, the
 `SiGitAgent` struct, and its `handle_*` methods). Read it alongside this skill.
 
 ---
@@ -202,11 +202,12 @@ the connection and the agent anymore. Don't reintroduce the mpsc forwarder patte
 | `NewSessionRequest` | `handle_new_session` | sets cwd, resets history, advertises commands + config options |
 | `LoadSessionRequest` | `handle_load_session` | like new_session; gated by `load_session(true)` capability |
 | `ForkSessionRequest` | `handle_fork_session` | gated by `unstable_session_fork` + `SessionForkCapabilities` |
-| `ListSessionsRequest` | `handle_list_sessions` | the editor's "Import Threads" picker; gated by `SessionListCapabilities` |
+| `ListSessionsRequest` | `handle_list_sessions` | the editor's "Import Threads" picker; gated by `SessionListCapabilities`; paged with `cursor` / `nextCursor` |
 | `PromptRequest` | `handle_prompt` | the turn: parse blocks → slash commands or tool-calling loop |
 | `SetSessionConfigOptionRequest` | `handle_set_session_config_option` | the Zed model picker — switches/downloads models |
 | `SetSessionModeRequest` | `handle_set_session_mode` | legacy mode selector; same Manual/Auto/Plan state as the Permissions config option |
 | `CancelNotification` | `handle_cancel` | notification, no response |
+| `$/cancel_request` | `responder.cancellation()` | not a registered handler: the SDK tracks it per request, and the prompt and `authenticate` closures read the marker |
 
 Everything else is left to the SDK default (method not found).
 
@@ -594,14 +595,14 @@ Editor                                Agent
 
 ## Where to look in the code
 
-Everything ACP lives in `src/main.rs`:
+Everything ACP lives in `crates/cli/src/main.rs`:
 
 - `run_acp_server` — builder wiring + transport.
 - `SiGitAgent` + `handle_*` — the handlers.
 - `build_model_config_options` / `resolve_model_config` — picker.
 - `parse_slash` / `exec_slash_acp` — slash commands.
 - `handle_response` — the `Responder` helper.
 
-`src/backend.rs` holds the `InferenceBackend` trait (`LocalBackend` /
-`OpenAiBackend`) used by `handle_prompt`'s tool-calling loop; `src/tools.rs`
+`crates/cli/src/backend.rs` holds the `InferenceBackend` trait (`LocalBackend` /
+`OpenAiBackend`) used by `handle_prompt`'s tool-calling loop; `crates/cli/src/tools.rs`
 defines the agent tools and `execute_tool`.
@@ -94,7 +94,7 @@ tmux kill-session -t sigit
 ## Run (human path)
 
 ```bash
-cargo run                                # stdin is your TTY → launches the TUI
+cargo run -p sigit # stdin is your TTY → launches the TUI
 ```
 
 A full-screen chat opens; type a message or `/help`, Ctrl+C to quit. Useless
 
@@ -17,20 +17,20 @@ Use this skill when preparing a release for this repository.
 ## Working approach
 
 1. Read the files that define the release version and distribution metadata before proposing any changes.
-2. Treat `Cargo.toml` as the primary release version source for the Rust crate and the PyPI package in this repository.
+2. Treat `[workspace.package].version` in the root `Cargo.toml` as the primary release version source for the Rust crate and the PyPI package in this repository.
 3. Check how the release workflows rewrite or derive versions before editing checked-in npm or Python metadata.
 4. Prefer targeted verification commands that match CI or packaging workflows already present in the repository.
 5. Report blockers clearly: failed checks, version mismatches, missing changelog entries, or unpublished packaging changes.
 
 ## Repo-specific release rules
 
-- Bump the crate version in `Cargo.toml`.
+- Bump `[workspace.package].version` in the root `Cargo.toml`; every workspace crate inherits it.
 - Update the root `sigit` package entry in `Cargo.lock` when the crate version changes.
 - Add or update the top changelog entry in `CHANGELOG.md` for the release being cut.
 - Do not treat `npm/sigit/package.json` `0.0.0-dev` as a bug by default. The npm release workflow rewrites it at publish time using `npm/scripts/render-main-package.cjs` and the release tag.
 - Every npm package publishes twice, under `@getsigit` and under `@smbcloud`. `@smbcloud` is the pre-1.5.5 name, mirrored so an install predating the rename keeps updating; `@getsigit` is canonical and is what the README, the Homebrew tap, and the ACP registry entry point at. All fourteen names (two base packages, twelve platform packages) publish over OIDC and each needs its own Trusted Publisher on npm pointing at `release-npm.yml`.
 - The scope is a render-time argument, not a second copy of the packaging: `render-platform-package.cjs` takes it as a fifth argument, and the base package picks it up from `package-main.json.tmpl` versus `package-compat.json.tmpl`. `npm/sigit/src/index.ts` is built once and shipped under both names — it reads its own `package.json` at runtime to decide which scope to resolve the platform binary from, and prints the migration notice only when it finds itself running as `@smbcloud/sigit`.
-- Do not add a hardcoded version to `pypi/pyproject.toml` for normal releases. PyPI uses `maturin` with `dynamic = ["version"]` and derives the published package version from `Cargo.toml`.
+- Do not add a hardcoded version to `pypi/pyproject.toml` for normal releases. PyPI uses `maturin` with `dynamic = ["version"]` and derives the published package version from `crates/cli/Cargo.toml`, which inherits the workspace version.
 - Release workflows are tag-driven. `release-github.yml`, `release-npm.yml`, `release-pypi.yml`, `release-crates.yml`, `release-homebrew.yml`, `release-nuget.yml`, and `release-mcp-registry.yml` all derive `RELEASE_VERSION` from a `v*.*.*` tag or a manually supplied tag input.
 - The crate is published to crates.io (`release-crates.yml`) and the Homebrew tap is updated (`release-homebrew.yml`) as part of the tag-driven flow. Per the siGit release flow, Homebrew is auto-triggered — do not dispatch it manually.
 - `release-github.yml` builds the binaries, attaches them (plus a `.deb`/`.rpm` per Linux target built with nfpm from `packaging/nfpm.yaml`) to the GitHub release, then dispatches `release-homebrew`, `release-scoop`, `release-winget`, and `release-aur`. A dispatch failure in any one of those four is logged as a warning, not a hard failure — an unconfigured channel doesn't block the rest of the release. `release-nuget.yml` and `release-mcp-registry.yml`, by contrast, are tag-triggered directly like the other language-registry workflows, not dispatched from `release-github.yml`.
 
@@ -13,7 +13,7 @@ Tool calling spans these layers:
 
 ```
 siGit (agent loop + tool execution)
-  → InferenceBackend (src/backend.rs — LocalBackend or OpenAiBackend/cloud)
+  → InferenceBackend (crates/cli/src/backend.rs — LocalBackend or OpenAiBackend/cloud)
     → onde ChatEngine (tool-aware API)   ── for LocalBackend
       → mistral.rs (model inference + tool call parsing)
     └ OpenAI-compatible HTTP endpoint    ── for OpenAiBackend (siGit Code Cloud)
@@ -31,7 +31,7 @@ a remote OpenAI-compatible endpoint (the siGit Code Cloud tiers). Both implement
 Tool calling needs a model mistral.rs has a tool-call parser for. The supported
 set is the **Qwen 3 family** (`<tool_call>...</tool_call>` XML) plus **Qwen 2.5
 Coder 7B**. Plain Qwen 2.5 and the smaller Qwen 2.5 Coder variants do NOT support
-tool calling. The authoritative list is `is_tool_calling()` in `src/models.rs`.
+tool calling. The authoritative list is `is_tool_calling()` in `crates/cli/src/models.rs`.
 
 | Model | Constructor | Size | Tool calling |
 |-------|-----------|------|:---:|
@@ -54,7 +54,7 @@ fallback. Users pick a tool-calling model via the `/models` picker.
 
 ### max_tokens
 
-`max_tokens_for()` in `src/models.rs` gives tool-calling models **4096** tokens
+`max_tokens_for()` in `crates/cli/src/models.rs` gives tool-calling models **4096** tokens
 and non-tool models **512** (tool models need headroom because `<think>` blocks
 eat the budget). The TUI startup load in `run_interactive` overrides this to
 **8192**. Don't assume a single value.
@@ -139,7 +139,7 @@ In ACP mode, `handle_prompt` currently always passes the full tool set (`agent_t
 | `send_message_with_tools(msg, &[ToolDefinition])` | Returns `ToolAwareResult` with possible tool calls |
 | `send_tool_results(Vec<ToolResult>, Option<&[ToolDefinition]>)` | Feed results back; `None` forces text response |
 
-#### Layer 2.5: the `InferenceBackend` abstraction (`src/backend.rs`)
+#### Layer 2.5: the `InferenceBackend` abstraction (`crates/cli/src/backend.rs`)
 
 siGit doesn't call the engine directly from the agent loop — it goes through the
 `InferenceBackend` trait so on-device and cloud inference share one code path:
@@ -155,7 +155,7 @@ siGit doesn't call the engine directly from the agent loop — it goes through t
 `handle_prompt` snapshots `self.backend.lock().await.clone()` once per turn so a
 mid-turn model/tier switch can't split the conversation across backends. When
 `backend.is_remote()` it skips the local model load + readiness wait. Cloud tiers
-(`fast`, `balanced`, `large`) come from `src/provider.rs` and are sign-in gated.
+(`fast`, `balanced`, `large`) come from `crates/cli/src/provider.rs` and are sign-in gated.
 
 #### Internal details
 
@@ -167,7 +167,7 @@ mid-turn model/tier switch can't split the conversation across backends. When
 
 ### Layer 3: siGit (agent-level)
 
-#### ACP session handling (`src/main.rs`)
+#### ACP session handling (`crates/cli/src/main.rs`)
 
 All session handlers (`load_session`, `fork_session`, `new_session`) do:
 
@@ -252,7 +252,7 @@ Models are stored in the shared Onde App Group container on macOS:
 
 ## Adding a New Tool
 
-1. Add an `AgentTool` entry to `all_tools()` in `src/tools.rs`
+1. Add an `AgentTool` entry to `all_tools()` in `crates/cli/src/tools.rs`
 2. Add a match arm to `execute_tool()` — use `spawn_blocking` if the implementation blocks
 3. Write `exec_your_tool(arguments: &str) -> String`
 4. Update `test_all_tools_count` test (currently expects 9)
 
@@ -55,7 +55,51 @@ jobs:
         with:
           key: crates-publish
 
-      - name: Check whether version already exists on crates.io
+      # sigit depends on sigit-agent, so the library goes first, each behind its own
+      # "already published" check: a re-run publishes only what is missing.
+      - name: Check whether sigit-agent already exists on crates.io
+        id: agent-check
+        shell: bash
+        run: |
+          VERSION=$(cargo metadata --no-deps --format-version 1 | \
+            python3 -c "import sys,json; pkgs=json.load(sys.stdin)['packages']; \
+            print(next(p['version'] for p in pkgs if p['name']=='sigit-agent'))")
+          echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
+
+          # crates.io answers 403 to requests without a descriptive
+          # User-Agent, so curl's default one makes this look like a 404 and
+          # the publish below runs into "crate already exists on the index".
+          # Branch on the status code rather than on curl's exit status, so an
+          # answer we do not understand stops the job instead of quietly
+          # degrading into that same failure.
+          # Retry first, so a timeout or a 5xx costs a few seconds instead of
+          # the whole release.
+          STATUS=$(curl -sS -o /dev/null -w '%{http_code}' \
+            --retry 3 --retry-delay 2 --retry-all-errors \
+            -H "User-Agent: ${GITHUB_REPOSITORY} release workflow (https://github.com/${GITHUB_REPOSITORY})" \
+            "https://crates.io/api/v1/crates/sigit-agent/${VERSION}")
+
+          case "$STATUS" in
+            200)
+              echo "sigit-agent ${VERSION} already exists on crates.io, skipping publish"
+              echo "exists=true" >> "$GITHUB_OUTPUT"
+              ;;
+            404)
+              echo "exists=false" >> "$GITHUB_OUTPUT"
+              ;;
+            *)
+              echo "Unexpected ${STATUS} from crates.io while checking whether sigit-agent ${VERSION} is published" >&2
+              exit 1
+              ;;
+          esac
+
+      - name: Publish sigit-agent to crates.io
+        if: steps.agent-check.outputs.exists != 'true'
+        env:
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+        run: cargo publish --locked -p sigit-agent
+
+      - name: Check whether sigit already exists on crates.io
         id: crates-check
         shell: bash
         run: |
@@ -91,8 +135,8 @@ jobs:
               ;;
           esac
 
-      - name: Publish to crates.io
+      - name: Publish sigit to crates.io
         if: steps.crates-check.outputs.exists != 'true'
         env:
           CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
-        run: cargo publish --locked
+        run: cargo publish --locked -p sigit
@@ -94,7 +94,7 @@ jobs:
 
       - name: Build binary
         shell: bash
-        run: cargo build --locked --release --target ${{ matrix.target }}
+        run: cargo build --locked --release -p sigit --target ${{ matrix.target }}
 
       - name: Check Windows binary has no VC++ runtime dependency
         if: contains(matrix.target, 'windows')
 
@@ -81,8 +81,8 @@ jobs:
 
           # Homebrew formula for siGit Code (\`sigit\` binary).
           class Sigit < Formula
-            desc 'AI coding agent powered by local LLM via Onde Inference'
-            homepage 'https://github.com/getsigit/sigit'
+            desc 'A modular local inference LLM coding agent. Core component of siGit Factory.'
+            homepage 'https://sigit.si/code'
             version '${VERSION}'
             license 'Apache-2.0'
 
 
@@ -101,7 +101,7 @@ jobs:
 
       - name: Build binary
         shell: bash
-        run: cargo build --locked --release --target ${{ matrix.build.TARGET }}
+        run: cargo build --locked --release -p sigit --target ${{ matrix.build.TARGET }}
 
       - name: Install Node
         uses: actions/setup-node@v6
 
@@ -90,7 +90,7 @@ jobs:
 
       - name: Build binary
         shell: bash
-        run: cargo build --locked --release --target ${{ matrix.build.TARGET }}
+        run: cargo build --locked --release -p sigit --target ${{ matrix.build.TARGET }}
 
       - name: Prepare artifact
         shell: bash