@cursor/july 0.1.102 → 0.1.104

package/docs/design/filesystem.md

@@ -0,0 +1,376 @@
+# One FileSystem for every Agent SDK agent
+
+> **Status:** first implementation, this PR. `@cursor/july` only.
+> No Cursor SDK change.
+> **Audience:** Agent SDK maintainers.
+
+Every local turn binds a **FileSystem** and synthesizes native file
+tools from it. There is no "is there an override?" branch on the
+tool path. Authors pick the tree with `root`. Omit `root` and the
+tree is the host disk, through internal `localFileSystem`.
+
+```ts
+// Host disk. Relative paths resolve against the harness cwd.
+export default defineAgent({
+  name: "reviewer",
+});
+
+// Override. The model sees only this tree. Paths are posix `/`.
+export default defineAgent({
+  name: "notes",
+  root: tempFs({ "/notes.md": "hello" }),
+});
+```
+
+---
+
+## Names
+
+| Name | Kind | Meaning |
+| --- | --- | --- |
+| `FileSystem` | Type on `@cursor/july` | Path verbs. Authors provide this. |
+| `root` | Field on `defineAgent` | The FileSystem the agent runs on. Omit it and the root is the host disk. |
+
+No `root()` method and no public `Workspace` type.
+`local.workspaceDir` stays the harness cwd. `workspaceFiles` stays
+per-send seed files. Those names are not the path namespace.
+
+Do not pass `local.root` into `Agent.create`. The published SDK
+does not have that field.
+
+---
+
+## FileSystem
+
+```ts
+interface FileSystem {
+  list(prefix?: string): AsyncIterable<DirEntry>;
+  stat(path: string): Promise<FileInfo>;
+  glob(pattern: string, dir?: string): AsyncIterable<DirEntry>;
+  read(path: string): Promise<string | Uint8Array>;
+  grep(query: GrepQuery): AsyncIterable<GrepResult>;
+  write(path: string, contents: string): Promise<void>;
+  delete(path: string): Promise<void>;
+  search(query: SearchQuery): AsyncIterable<SearchResult>;
+}
+```
+
+Every method is required. A tree without an index yields nothing
+from `search`. Methods do not fall back to the host tree.
+Diagnostics are not a FileSystem verb.
+
+Path verbs take a path (and contents for `write`). Bags with two
+or more independent options (`grep`, `search`) take a
+named query object.
+
+`read` returns text as a string, or image bytes as a
+`Uint8Array` (`jpeg` / `png` / `gif` / `webp`). Native Read
+applies `offset` / `limit` and numbers lines on text. Images
+become a base64 image content part, the same shape the Cursor
+harness sends the model.
+
+FileSystem methods throw; they do not return a status envelope.
+`@cursor/july` does not export `FileSystemResult`.
+
+### Paths
+
+Authored `root` (`tempFs`, `unionFs`, `overlayFs`, `hostFs`, a custom tree) is one posix
+namespace rooted at `/`. Query paths and yielded paths are
+absolute (`/src/a.ts`). No trailing slash except `/`. `""`, `"/"`,
+and an omitted optional scope mean the root. Prefix tests are
+path-segment: `/agent` matches `/agent/skills`, not
+`/agent-tools`. `normalizeFsPath` resolves `..`. `/tmp` is
+reserved for turn-local scratch. See `/tmp` scratch.
+
+Host-default `localFileSystem` follows Cursor SDK natives:
+relative paths resolve against the harness cwd; absolute paths
+are used as-is. Yielded paths are host paths, not rewritten to
+`/`. `search` is empty (no host index).
+
+### Iterators
+
+Async iterators are already sorted. `unionFs` k-way merges them
+and does not re-sort a source.
+
+- `list` / `glob`: lexicographic by `path`. Paths are unique.
+- `grep`: by `path`, then `lineNumber` ascending. Keep every hit.
+- `search`: by `score` descending, then `path` ascending.
+
+A file is not under itself, so listing a file path is empty.
+Empty `list` is not "missing"; `stat` answers that.
+
+`glob(pattern, dir?)` matches relative to `dir`, not
+basename-anywhere (`*.ts` under `/src` is `/src/a.ts`, not
+`/src/nested/c.ts`).
+
+`grep` has no `output_mode` or `offset`. A slash-free `glob`
+(`*.ts`) matches the basename at any depth under `path`.
+`grep` / `search` take optional `maxResults` as predicate
+pushdown; implementations should stop after that many hits.
+Composers push the same cap to children and apply it again
+after the merge.
+
+Native-tool pagination (`head_limit`, `offset`, `output_mode`,
+`numResults`) stays on synthesized tools. Native `LS` is built
+from `list` + `stat`; there is no `ls` method.
+
+### Errors
+
+FileSystem methods throw `PathError`. `path` is the absolute
+posix path the error is about. Messages stay these contract
+strings so synthesized tools can show them as-is.
+
+- `list` / `stat` / `glob` must not throw for a missing path.
+  Missing is an empty iterator or `{ kind: "missing" }`.
+- `read` / `delete` missing file: `FileNotFoundError`
+  (`not found: ${path}`).
+- `write` has no `not found`. I/O uses the OS message or
+  `WriteFailedError` (`write failed: ${path}`). A read-only
+  mount uses `ReadOnlyMountError` (`read-only mount: ${path}`).
+- Synthesized StrReplace is `read` + exact replace + `write`.
+  Uniqueness failures throw `EditError` (`oldText is empty`,
+  `oldText and newText are exactly the same`, `The string to
+  replace was not found in the file`, and `The string to replace
+  was found multiple times in the file. Use replace_all to replace
+  all occurrences, or include more context to only edit one
+  occurrence.`). Write-back failures are `WriteFailedError`.
+- `grep` throws `InvalidGrepPatternError`
+  (`invalid grep pattern: ${pattern}`). A missing host search
+  root throws. A missing virtual path yields nothing.
+- `search` without an index is empty success.
+- `unionFs` with no mount throws `NoMountError`
+  (`no mount for path: ${path}`) on `read` / `write` /
+  `delete`. Walk verbs stay empty or missing.
+- `unionFs` catches `PathError` from a child and rethrows
+  `error.withPath(mountPrefix + childPath)`. Untyped `Error` still
+  gets a best-effort message rewrite.
+
+Invoke wraps FileSystem throws into the executor success / error
+envelope.
+
+### Write and StrReplace
+
+`write(path, contents)` creates or overwrites a file. Success is
+empty. Native Write maps `fileText` onto `contents` and prints
+`Wrote contents to ${path}`.
+
+StrReplace is not a FileSystem verb. The synthesized tool reads
+the file, applies an exact non-overlapping replace, and writes
+the result. It fails when `oldText` is empty, equals `newText`,
+is missing, or occurs more than once without `replaceAll`.
+Success is `{ occurrencesModified }`. Splice is literal; do not
+use `String.prototype.replace`. Native aliases (`old_string`,
+`new_string`, `replace_all`) map onto those fields at invoke
+time.
+
+---
+
+## Helpers
+
+| Helper | Role |
+| --- | --- |
+| `emptyFs()` | No files. Overlay leaf or missing catalog. Reads miss; writes are read-only. |
+| `tempFs(files)` | In-memory snapshot. Tests and fixtures. |
+| `unionFs({ "/repo": a, "/plans": b })` | Longest-prefix compose, path-segment match. Children are FileSystems rooted at `/`; `unionFs` strips the mount prefix on the way in and re-prefixes yields. List and glob use `unique` so an earlier mount shadows a later one. Grep and search keep every hit. Grep and search at `/` fan out to every child. |
+| `overlayFs([upper, lower])` | Same-root overlay. Earlier layers win. Read-only. A downed layer costs its own files, not the overlay — `stat` / `grep` / `search` only fail when no layer served. |
+| `hostFs(files, scope)` | `HostFilesApi` as a FileSystem rooted at `/`. Mount with `unionFs({ "/host": hostFs(files, scope) })`. `search` is empty (no index). Write without a cached etag is unconditional; after a successful read or write, write is CAS on that etag. |
+
+`localFileSystem({ cwd })` is the host-default handle. It is not
+exported from `@cursor/july`. Name helpers and `mergeSorted`
+stay private. `emptyFs`, `tempFs`, `unionFs`, `overlayFs`, `hostFs`, and
+the `PathError` classes (`FileNotFoundError`,
+`ReadOnlyMountError`, `NoMountError`, `InvalidGrepPatternError`,
+`WriteFailedError`, `EditError`,
+`DeleteNotSupportedError`) are the public helpers.
+
+---
+
+## Tool synthesis
+
+Local turns synthesize these natives from the bound FileSystem:
+`Read`, `LS`, `Grep`, `Glob`, `Write`, `StrReplace`, `Delete`,
+`SemanticSearch`. `list` + `stat` synthesize `LS`. `search`
+synthesizes `SemanticSearch`. `StrReplace` is `read` + exact
+replace + `write`. Other execute bodies call the matching
+FileSystem method.
+
+Authored `tools` can filter that set. `tools: ["read", "shell"]`
+on a host-default agent synthesizes `Read` only.
+`tools: ["edit"]` synthesizes `Write` and `StrReplace`.
+`tools: ["semSearch"]` synthesizes `SemanticSearch`.
+`tools: []` synthesizes nothing.
+
+Host-default does not synthesize `SemanticSearch`. Native
+`semSearch` stays on so the host index can run;
+`localFileSystem.search` is empty. Authored `root` synthesizes
+`SemanticSearch` from `FileSystem.search` and does not advertise
+native `semSearch`. `search` is not an allowlist alias, so an
+authored `search` tool is not treated as SemanticSearch.
+`ReadLints` is not a FileSystem verb. Authored
+`tools: ["readLints"]` fails closed so the host language service
+cannot run.
+
+Do not also ship `agent/tools/Read.ts` (and the other synthesized
+names). Discovery fails closed on that clash for host-default and
+authored `root`.
+
+A factory root re-resolves the handle before a turn. The session
+cache is the handle, not a tree snapshot. Unscoped `callTool`
+uses the invocation id and does not cache, so factories cannot
+share one tree across callers. A static `root` is the authored
+object on every session — Write / StrReplace / Delete /
+`workspaceFiles` are shared. Return a new handle from
+`(ctx) => …` when a session should have its own tree. A factory
+that returns the same object still shares.
+
+Per-send `workspaceFiles` write through the FileSystem.
+`memory/` is reserved (same as the host-default workspace
+symlink into durable agent memory) and is refused after
+normalize, including `./memory/x` and `foo/../memory/x`.
+Host-default `list` / `glob` / `grep` do not follow directory
+symlinks, including `memory/` — same as native LS/Glob/Grep.
+Exact-path `read` / `stat` still follow.
+
+Authored `root` skips session-directory materialize, git init,
+and host-cwd checks. First turns prepend `buildAgentsMdContent`
+and print `Workspace Path: /`. Host-default agents keep today's
+materialize path.
+
+---
+
+## Allowlist
+
+| `root` | `tools` | Model-facing harness |
+| --- | --- | --- |
+| omitted | omitted | The seven host-disk file tools (no synthesized `SemanticSearch`). Host shell / webSearch / sandbox / native `semSearch` stay. Host file natives are hidden with `disallowedTools: ["read","ls","grep","glob","edit","delete"]`. |
+| omitted | `["read", "shell"]` | Synthesized `Read` + SDK `shell` + `mcp`. |
+| omitted | `[]` | No synthesized file tools. |
+| set | omitted | All eight synthesized file tools (including `SemanticSearch`) + webSearch + webFetch + updateTodos + readTodos + `mcp`. Bind `/tmp` scratch. Not the host-default full catalog (no shell / sandbox / task / native semSearch). |
+| set | `["updateTodos"]` | All eight synthesized file tools + `updateTodos` + `mcp`. |
+| set | `["semSearch"]` | Synthesized `SemanticSearch` + `mcp`. Native host index stays off. |
+| set | `[]` | No synthesized file tools. Legal and empty. |
+| set | `["shell"]` / `["task"]` / `["readLints"]` | Fail closed. |
+| set | `["webSearch"]` / `["webFetch"]` | All eight synthesized file tools + the listed web tool + `mcp`. Bind `/tmp` scratch. |
+
+`mcp` is granted when any tools ride that path. File-family
+allowlist names are omitted from the SDK allowlist; the
+synthesized tools replace them.
+
+`local.sandbox` is Cursor's process sandbox around child
+processes on the host-default path. It is not a FileSystem.
+
+---
+
+## Fail closed
+
+| Combination | Result |
+| --- | --- |
+| `root` + `local.cwd` / `workspaceDir` / `sandbox` | Fail closed |
+| `root` + `runtime: "cloud"` or `"grokbot"` | Fail closed |
+| `root` + `tools` containing `"shell"` | Fail closed |
+| `root` + `tools` containing `"task"` | Fail closed. A child keeps the host toolset. Sharing `root` needs a Cursor SDK inherit, not an overridden Task. |
+| `root` + `tools` containing `"readLints"` | Fail closed. Diagnostics are not a FileSystem verb. |
+| `agent/tools/Read.ts` (etc.) | Fail closed on host-default and authored `root`. |
+
+---
+
+## `/tmp` scratch for webSearch and webFetch
+
+Native `WebSearch` and `WebFetch` stay native. They still scratch
+large output to `{harnessCwd}/agent-tools/{uuid}.txt` on the host
+disk. Under `root`, the turn composes
+`unionFs({ "/": authored, "/tmp": tempFs() })`, copies only the file
+the native tool wrote this turn, and drops that composed root at
+end of turn.
+
+### Why `/tmp`
+
+The FileSystem is the model's disk. Host `{cwd}/agent-tools/` is a
+harness path. Under `root`, the model never sees it.
+
+`/tmp` is the reserved scratch prefix. An authored `/tmp` is
+shadowed. Do not put durable files there. `{cwd}/agent-tools/` and
+`/tmp` are different namespaces.
+
+`/agent-tools` is not reserved. Prefix `/agent` does not cover
+`/agent-tools`. Those notes are path-prefix tests, not a mount.
+
+Process or VM death also loses `/tmp`. Same as POSIX `/tmp`. That
+is acceptable. Do not persist scratch across turns or process
+restarts.
+
+### Overlay
+
+| Piece | Rule |
+| --- | --- |
+| Native tool | Still searches and fetches. |
+| Bind | Per turn: `unionFs({ "/": authored, "/tmp": tempFs() })`. `/tmp` is a mount, not a FileSystem type. |
+| Session cache | Authored handle may stay cached. The composed root does not. |
+| Drop | End of turn. Next turn gets a new empty `/tmp`. |
+| Small results | Stay inline. No disk, no rewrite. |
+| Copy | Only a file the native tool wrote this turn under `{cwd}/agent-tools/`. |
+| Dest | `/tmp/{uuid}.txt`. Same uuid as the host file. |
+| Host file | Delete after copy. |
+| Other paths | Ignore. Do not copy from the result text at large. |
+
+Do not put that composed root on the session handle. A later turn
+must not read another turn's `/tmp`.
+
+### Result rewrite
+
+Keep the native tool descriptions. They do not mention spill.
+
+This package does not change the Cursor SDK. Native WebSearch /
+WebFetch results land in the AgentService conversation inside
+the local executor. That transcript is not rewritten here.
+
+What this package rewrites:
+
+| Surface | Overlay (`root` set) |
+| --- | --- |
+| `webSearch` / `webFetch` result | Host path and follow-up, in strings or structured fields (`output_location`). Other tools are untouched. |
+| Synthesized Read / Grep input | `{cwd}/agent-tools/{uuid}.txt` → `/tmp/{uuid}.txt` |
+
+| Field | Host path (`root` unset) | Overlay (`root` set) |
+| --- | --- | --- |
+| Path | `{cwd}/agent-tools/{uuid}.txt` | `/tmp/{uuid}.txt` |
+| Follow-up | Native text (today: shell / grep / `read_file`) | Read / Grep |
+
+Two modes, two paths. Do not invent a third.
+
+WebFetch proto has `output_location`. WebSearch only embeds the
+path in the chunk string. Rewrite whichever form the native tool
+used.
+
+The model follow path is Read / Grep on `/tmp/{uuid}.txt`,
+including when the model still holds the host path.
+
+### Out of scope here
+
+MCP `spillLargeMcpTextOutput` uses the same host `agent-tools`
+directory. The same overlay can cover it later. This section is
+webSearch and webFetch only.
+
+---
+
+## Live `root`
+
+When the tree depends on the conversation, pass a factory. The
+factory returns a handle. Agent SDK may reuse the object for the
+session. Reuse is not a snapshot of mount contents.
+
+```ts
+export default defineAgent({
+  name: "notes",
+  root: (ctx) => notesForSession(ctx.sessionId),
+});
+```
+
+```ts
+interface RootContext {
+  sessionId: string;
+  agentName?: string;
+  continuationKey?: string;
+  host?: { files: HostFilesApi; reminders?: ReminderHostApi };
+}
+```

package/docs/design/runtime-abstraction.md

@@ -5,8 +5,8 @@
 > until this document has been reviewed.
 > **Audience:** Agent SDK and cursor-sdk maintainers; change-monitor as the
 > first consumer that is already faking a third runtime.
-> **Companions:** [cloud-runtime.md](../guides/cloud-runtime.md) (today's
-> user-facing contract),
+> **Companions:** [agent-config.md](../reference/agent-config.md#choose-a-runtime)
+> (today's user-facing contract),
 > [factory/change-monitor/docs/tools.md](../../../../factory/change-monitor/docs/tools.md)
 > (why change-monitor is pinned to local),
 > [factory/change-monitor/docs/computer-use.md](../../../../factory/change-monitor/docs/computer-use.md)
@@ -1604,7 +1604,6 @@ sandbox })`, next to `cloudRuntime({ repos })`. Sibling
 | Page | Change |
 |---|---|
 | [reference/agent-config.md](../reference/agent-config.md) | `runtime` type becomes constructors **or** the deprecated string. Table + "Choose a runtime" show `localRuntime(opts)` / `cloudRuntime(opts)` / `virtualRuntime(fs)` first. Move cwd / sandbox / workspaceDir onto the `localRuntime` section. Mark sibling `local` / `cloud` and string `runtime` deprecated. |
-| [guides/cloud-runtime.md](../guides/cloud-runtime.md) | Open with `cloudRuntime({ repos })`. Keep `runtime: "cloud"` as the still-supported form. Cloud is a turn host, not a filesystem. Hybrid is `send({ runtime: cloudRuntime(opts) })`; local overlay is `send({ runtime: localRuntime(opts) })`. `send({ cloud })` / `send({ workspaceDir })` deprecated. |
 | [concepts.md](../concepts.md) | Local vs cloud table: same facts, constructor names. Add one line that `virtualRuntime` is local-with-your-files, not a third host. |
 
 **New page**

package/docs/evals.md

@@ -157,17 +157,19 @@ Drive the agent with `t.send(message, options?)`. It runs one turn and
 waits for the session to park or fail. Multiple sends in one case share
 the session, which is how you write multi-turn evals.
 
-Each `t.send` resolves to a turn result with `message`, `sessionId`,
-`events`, `toolCalls`, `ok`, and `index`. The turn carries the same
-assertion vocabulary as `t`, scoped to that turn, so you can grade an
-intermediate turn before the next send overwrites `t.reply`.
-`turn.expectOk()` throws when the turn failed, for later steps that
-depend on it.
+Each `t.send` resolves to a turn result with `message`,
+`sessionId`, `events`, `toolCalls`, `ok`, and `index`. The turn carries
+the same assertion vocabulary as `t`, scoped to that turn, so you can
+grade an intermediate turn before the next send overwrites `t.reply`.
+`turn.expectOk()` throws when the turn failed, for later
+steps that depend on it.
 
 Read the full case state with `t.reply` (the last assistant text),
 `t.events` (session events captured so far), `t.turns` (settled
 turns, oldest first), and `t.sessionId`. `t.signal` aborts when the
-case hits its timeout; pass it to your own async work.
+case hits its timeout; pass it to your own async work. A thrown
+[turn result](./reference/result.md) `commit` fails the turn, so
+`t.succeeded()` fails too.
 
 Assert with the gates:
 

package/docs/guides/cloud-agents.md

@@ -13,7 +13,8 @@ questions in the meantime. A Slack triage agent turns a bug report into
 a PR, a planner fans a refactor out across repositories, a reviewer asks
 a cloud agent to address its own comments.
 
-This is different from the [cloud runtime](./cloud-runtime.md). The
+This is different from
+[`runtime: "cloud"`](../reference/agent-config.md#choose-a-runtime). The
 runtime moves *this* agent's turns onto a cloud VM. The extension keeps
 the agent where it is and lets it start *other* cloud agents.
 
@@ -38,9 +39,8 @@ Launches run under the host's signed-in account (`agent-sdk login` or
 repositories the agent may target, and keep approval on when you can't.
 
 Mount it on an agent that runs on the local runtime; that is where
-launches park for approval. On the
-[cloud runtime](./cloud-runtime.md#what-changes-on-cloud) approvals
-don't resolve.
+launches park for approval. On the cloud runtime approvals don't
+resolve.
 
 ## What the agent can do
 
@@ -94,5 +94,3 @@ Continue with these pages:
   overrides work
 - [Human-in-the-loop approvals](./human-in-the-loop.md): where parked
   launches get approved
-- [Cloud runtime](./cloud-runtime.md): run the agent's own turns on
-  cloud agents instead

package/docs/guides/github.md

@@ -260,6 +260,11 @@ behavior. Reactions still default on; set `reactions: false` when the
 eyes emoji is noise. Descriptions are optional; defaults derive from
 `botName` or the check `context`.
 
+To match dashboard automations, set `detailsUrl(sessionId)`,
+`summaryLinkText: "View agent"`, and `outputTitle: "context"` so the
+check title is the check name, the summary includes `[View agent](…)`,
+and Details opens the session.
+
 A comment-only first wake has no head SHA, so the check waits for a
 PR or CI event. The banner still posts. A later turn on the same SHA
 creates a new check run; GitHub cannot reopen a completed run.
@@ -275,6 +280,5 @@ key. Handlers you author replace the matching defaults (same as
 - [Webhooks and custom channels](./webhooks.md): the HTTP mechanism under
   this pack
 - [Evals](../evals.md): turn replay snapshots into regression fixtures
-- [Cloud runtime](./cloud-runtime.md): attach PRs to cloud VMs
 - [Hooks](../reference/hooks.md): observe-only; use channel `progress` for
   GitHub surfaces

package/docs/guides/opentelemetry.md

@@ -8,7 +8,7 @@ description: "Push session, turn, and tool traces from the serve process to an O
 Agent SDK can push traces, metrics, and logs from the serve process to
 an OTLP collector you run. Point the process at the collector with
 standard `OTEL_EXPORTER_OTLP_*` env, or author `agent/otel.ts`. Traces
-cover the inbound request, the session, each turn, and every tool call.
+cover the inbound request, each turn, and every tool call.
 
 Export is opt-in. Nothing leaves the process until you set an endpoint
 or a `defineOtel` config.
@@ -17,7 +17,7 @@ or a `defineOtel` config.
 
 | Signal | Default | What you get |
 | --- | --- | --- |
-| Traces | on | `agent_sdk.http` → `agent_sdk.session` → `agent_sdk.turn` → `agent_sdk.tool` / `agent_sdk.subagent` |
+| Traces | on | `agent_sdk.http` (per request) and `agent_sdk.turn` → `agent_sdk.tool` / `agent_sdk.subagent` |
 | Metrics | on | `cursor.token.usage`, `cursor.tool.calls`, `cursor.cost.usage`, plus `agent_sdk.*` session and turn counts |
 | Logs | off | Session events as log records. Prompt text, tool payloads, and failure messages stay off unless you opt in |
 
@@ -89,7 +89,17 @@ destination with `signals: ["traces"]`.
 
 You can also pass the same object to `serve(dir, { otel })`. Precedence
 is `serve({ otel })` over `agent/otel.ts` over env. An empty
-`defineOtel()` still enables export when `OTEL_EXPORTER_OTLP_*` is set.
+`defineOtel()` still records traces; export starts when
+`OTEL_EXPORTER_OTLP_*` or a factory-returned `exporters` list appears.
+
+Hosted v2 binds deployment secrets after bake, onto the already-listening
+process. Pass a factory so flush can re-read them. Spans record from
+bake; the hosted handler flush constructs the OTLP client and sends the
+queued batch.
+
+```ts
+export default defineOtel(() => resolveMyOtelConfig());
+```
 
 The companion skill is [`skills/otel/SKILL.md`](../skills/otel.md).
 
@@ -97,17 +107,23 @@ The companion skill is [`skills/otel/SKILL.md`](../skills/otel.md).
 
 ```text
 agent_sdk.http          inbound channel request (W3C traceparent)
-  └─ agent_sdk.session  cursor.conversation.id = session id
-       └─ agent_sdk.turn
-            ├─ agent_sdk.tool
-            └─ agent_sdk.subagent
-                 └─ agent_sdk.tool
+agent_sdk.turn          one root per turn (`agent_sdk.session_id` = session id)
+  ├─ agent_sdk.tool
+  └─ agent_sdk.subagent
+       └─ agent_sdk.tool
 ```
 
-Inbound HTTP extracts W3C `traceparent`, so a channel request parents
-the session span when the turn starts in that request. Turns that
-resume after restore, or a direct `callTool` with no `turn.started` in
-this process, open a synthetic turn span so tool calls still nest.
+Conversational sessions stay on `session.waiting` and can take more
+turns, so there is no `agent_sdk.session` span — it would never end
+and OTel only exports ended spans. Each turn is its own root. Inbound
+HTTP is a separate SERVER span (it extracts W3C `traceparent`) and
+does not parent the turn, so the turn tree can export when the turn
+ends. Hosted flush ends that SERVER span before the one-shot export so
+`agent_sdk.http` is in the same batch.
+
+Turns that resume after restore, or a direct `callTool` with no
+`turn.started` in this process, open a synthetic turn span so tool
+calls still nest.
 
 ## Which attributes land on the wire?
 
@@ -118,6 +134,12 @@ Every signal carries these resource attributes:
 - `cursor.surface=unspecified`
 - `agent_sdk.framework=@cursor/july`
 
+Span attributes (not process resource attributes — one serve process
+handles many sessions):
+
+- `agent_sdk.session_id` / `cursor.conversation.id`: the session id.
+  Search all turns for one conversation with `@agent_sdk.session_id`.
+
 Shared names (same keys as enterprise export):
 
 - `cursor.conversation.id`: the session id
@@ -128,22 +150,24 @@ Shared names (same keys as enterprise export):
   `cursor.tool.status`
 - `cursor.cost.usage` (USD)
 
-Agent SDK only (`agent_sdk.*`): agent name, turn id, channel, call id,
-subagent name, session mode, and HTTP duration (`agent_sdk.http.duration`).
+Agent SDK only (`agent_sdk.*`): session id, agent name, turn id, channel,
+call id, subagent name, session mode, and HTTP duration
+(`agent_sdk.http.duration`).
 
 ## How do I emit my own metrics?
 
 `ctx.host.otel` is always present on tools, hooks, and channel
 handlers. Counters and histograms no-op when no meter is running.
-`setAttributes` still tags the open session when a collector is
+`setAttributes` still tags open turn/tool spans when a collector is
 attached.
 
 Prefix metric names with your team or agent. First-party names
 (`cursor.token.usage`, `cursor.tool.calls`, `cursor.cost.usage`,
 `agent_sdk.session.count`, `agent_sdk.turn.count`,
 `agent_sdk.subagent.count`, `agent_sdk.http.duration`) and join keys
-(`cursor.conversation.id`, `agent_sdk.agent`, `agent_sdk.turn_id`,
-`agent_sdk.framework`) are reserved. Custom spans are not on this
+(`cursor.conversation.id`, `agent_sdk.session_id`, `agent_sdk.agent`,
+`agent_sdk.turn_id`, `agent_sdk.framework`) are reserved. Custom spans
+are not on this
 surface.
 
 ```ts

package/docs/reference/agent-config.md

@@ -82,11 +82,10 @@ the first prompt, because the local session workspace is not the cloud
 VM.
 
 `validate` warns when `runtime: "cloud"` is combined with agent tools
-or sandbox seeds (they only materialize into local session workspaces),
-when skills are present (they sync onto an Agent Store for native
-discovery rather than the session workspace), and when the `cloud`
-block is missing. The full capability matrix and the patterns that hold
-up are in the [Cloud runtime guide](../guides/cloud-runtime.md).
+(they are described on the first prompt instead of written to the VM),
+when skills or sandbox seeds are present (they sync onto an Agent Store
+rather than the session workspace), and when the `cloud` block is
+missing.
 
 ## Local options
 
@@ -172,9 +171,8 @@ set `local: { sandbox: true }`.
 Cloud agent defaults forwarded to the Cursor SDK: `repos` (each
 `{ url, startingRef? }`), environment selection, `envVars`, and the
 rest. A local agent uses the same block as the base config when a
-channel opens a cloud-attached session per send. That hybrid pattern is
-covered in
-[Cloud runtime](../guides/cloud-runtime.md#hybrid-local-agent-cloud-sessions).
+channel opens a cloud-attached session per send (the `cloud` option on
+[`send`](./channels.md#handler-arguments)).
 
 ## Concurrency
 
@@ -251,6 +249,4 @@ Continue with these pages:
 
 - [Instructions](./instructions.md): the required half of a minimal
   agent
-- [Cloud runtime](../guides/cloud-runtime.md): when and how to leave
-  the host
 - [CLI](./cli.md): the `serve` flags `serve()` accepts