@plurnk/plurnk-mcp 1.17.0 → 1.19.0

package/.env.defaults

@@ -1,11 +1,16 @@
-# @plurnk/plurnk-mcp — Worker MCP attachments.
+# @plurnk/plurnk-mcp — workspace MCP servers.
 # Alias blocks make servers available; ENABLED selects initial attachments.
-# A Worker can add/enable/disable/remove attachments through its Functionality controls.
+# An empty alias target masks its definition, companions and ENABLED/EXPANDED selections.
+# Workers manage the shared servers through the mcp Functionality controls.
 
-# Connection and protocol-discovery deadline, positive ms.
+# Connection deadline and complete catalog/list-walk deadline, positive ms each.
 PLURNK_MCP_CONNECT_TIMEOUT=30000
-# Individual operation deadline, positive ms; caller cancellation still applies.
+# Whole-operation deadline including client input, positive ms; caller cancellation still applies.
 PLURNK_MCP_REQUEST_TIMEOUT=86400000
+# First delay before the adapter retries a dropped subscription or a failed catalog refresh, positive ms; it doubles per attempt.
+PLURNK_MCP_RETRY_FLOOR_MS=250
+# Ceiling of that doubling delay, positive ms, at least the floor.
+PLURNK_MCP_RETRY_CEILING_MS=5000
 # Initially enabled aliases, JSON array; [] = none.
 PLURNK_MCP_ENABLED=[]
 # Expand these servers' tool lists in turn 0; otherwise show one row per server.
@@ -19,7 +24,8 @@ PLURNK_MCP_ENABLED=[]
 
 # --- stdio target ---
 # One exact executable (not a shell command); ARGS is a literal JSON array.
-# CWD is optional; ENV overlays the subprocess environment, resolving ${NAME} references.
+# CWD defaults to per-workspace server state under XDG_STATE_HOME (normally ~/.local/state).
+# Explicit CWD is honored; ENV overlays the subprocess environment, resolving ${NAME} references.
 # PLURNK_MCP_browser=node
 # PLURNK_MCP_browser_ARGS=["/absolute/path/to/browser-server.mjs"]
 # PLURNK_MCP_browser_CWD=/absolute/working/directory

package/README.md

@@ -60,10 +60,10 @@ published by the coordinator and the two continuations by this module:
 | `workspace.mcp.oauth.complete` | `alias`, complete `callbackUrl` |
 | `workspace.mcp.complete` | `server`, completion `ref` and `argument`; optional `context` |
 
-The model manages the same family through ```` ```mcp (list|discover|add|enable|disable|remove) ````.
+The model manages the same family through ````` ````mcp (list|discover|add|enable|disable|remove) `````.
 
 Tool discovery uses ordinary `FIND (worker:///_plurnk/tools/*.md)` and READ.
-Each server's document lists enabled EXEC calls with required-field previews
+Each server's document lists enabled tool calls with required-field previews
 and links to full input schemas under `tools/<server>/<encoded-tool>.md`.
 The manager uses the same layout under `plurnk/mcp.md` and `plurnk/mcp/`;
 schema documents preserve descriptions and constraints without adding them to
@@ -78,15 +78,15 @@ can provide the executable while one project's `.env` supplies its identity:
 
 ```text
 # $XDG_CONFIG_HOME/plurnk/.env, read by the service
-PLURNK_MCP_GITEA=/usr/local/bin/possumtech-gitea-mcp
+PLURNK_MCP_project=/opt/mcp/current-server
 PLURNK_MCP_ENABLED=[]
 
 # <project>/.env, read by the client
-PLURNK_MCP_GITEA_ARGS=["plurnk_pk"]
+PLURNK_MCP_project_ARGS=["--stdio","--project","example"]
 ```
 
 The client carries its raw declarations while listing and enabling. Listing is
-inert. `/mcp enable gitea` (or `plurnk mcp enable gitea` in a bound conversation)
+inert. `/mcp enable project` (or `plurnk mcp enable project` in a bound conversation)
 composes service, durable workspace, client, and optional command-file fields
 in that order, prepares the connection, then persists the complete unexpanded
 workspace definition. Arrays and maps replace rather than append or merge.
@@ -98,7 +98,7 @@ the same workspace alias requires explicit removal before replacement.
 Web discovery is an ordinary MCP attachment ({§web-search-retrieval}); the demo
 tier exercises search through a documented fixture rather than an owned
 runtime. Two service-owned definitions are permitted to participate in demos
-of MCP and model behavior — Gitea (above) and Brave Search:
+of MCP and model behavior — Gitea and Brave Search:
 
 ```text
 # $XDG_CONFIG_HOME/plurnk/.env, read by the service — demo fixtures; never default-enabled
@@ -152,6 +152,13 @@ whitespace. Arguments are a JSON array; the module never parses or invokes a
 shell command. `${NAME}` references resolve from the daemon's inherited
 environment only while preparing a connection.
 
+Without `CWD`, a local server uses its own workspace directory under
+`$XDG_STATE_HOME/plurnk` (normally `~/.local/state/plurnk`), not the daemon's
+launch directory. State survives reconnects and disable/remove; discovery
+scratch is removed after its probe closes. Use absolute project paths or an
+explicit `CWD` for servers that operate on a project. This default does not
+confine arbitrary subprocess writes.
+
 `PLURNK_MCP_<server>_TOOLS` is an optional JSON array of exact names. Absence
 enables every listed server tool; an array enables exactly those names; `[]`
 enables none. `PLURNK_MCP_<server>_READ` is an exact enabled-tool subset whose
@@ -166,7 +173,7 @@ Portable timeouts and complete examples live in [`.env.defaults`](./.env.default
 | MCP surface | Plurnk surface |
 |---|---|
 | Server tools | `worker:///_plurnk/tools/<server>.md` family summary |
-| Enabled tool | Exact `worker:///_plurnk/tools/<server>/<encoded-tool>.md` document and ```` ```server (tool) ```` |
+| Enabled tool | Exact `worker:///_plurnk/tools/<server>/<encoded-tool>.json` document and ````` ````server (tool) ````` |
 | Resource catalog | `server:///` or `server:///resources` |
 | Resource | `server:///resources/<encoded-uri>` through ordinary `FIND` and `READ` |
 | Prompt catalog | `server:///prompts` |

package/SPEC.md

@@ -1,6 +1,6 @@
 # Plurnk MCP host specification
 
-## §mcp-role Host boundary
+## Host boundary
 
 `@plurnk/plurnk-mcp` is an MCP **host/client** that projects trusted remote
 servers into Plurnk. It does not implement an MCP server or authorization
@@ -34,8 +34,8 @@ per-connection and absent from a legacy peer.
 ## §mcp-core-matrix Core capability matrix
 
 The accountable capability matrix lives in `capabilityMatrix.ts`
-({§mcp-capability-matrix}); this section states the core surface contract the
-matrix rows cite.
+({§mcp-capability-matrix}). This table describes the pinned revision;
+{§mcp-authority} owns the SDK-negotiated older-peer surface.
 
 | Surface | Upstream contract | Plurnk host disposition |
 |---|---|---|
@@ -64,6 +64,28 @@ Pagination, caching, and the cap remain the SDK's; a converging server's pages a
 before. This is a host guard over an upstream behavior, not a second paginator; the upstream
 report is #601's to file.
 
+§mcp-catalog-deadline `PLURNK_MCP_CONNECT_TIMEOUT` bounds connection setup and,
+separately, each complete catalog/list walk, including parallel collections and
+all pagination. Failure cancels unfinished sibling lists; it never publishes a
+partial catalog. Caller cancellation and connection shutdown still apply.
+Tool calls, resource reads, prompt retrieval, and their client-input waits retain
+`PLURNK_MCP_REQUEST_TIMEOUT`; discovery does not borrow that operation allowance.
+
+§mcp-retry-pacing Every retry the adapter schedules on its own — reopening a dropped
+subscription, refreshing a catalog a server announced as changed — waits
+`PLURNK_MCP_RETRY_FLOOR_MS`, doubling per attempt up to `PLURNK_MCP_RETRY_CEILING_MS`.
+One pacing serves them all; a ceiling beneath the floor fails configuration. The
+deadlines above bound an attempt; this paces the next one.
+
+§mcp-catalog-list-absence **An unsupported list method does not disable the server.**
+At the first page of `tools/list`, `resources/list`, `resources/templates/list`, or
+`prompts/list`, JSON-RPC `-32601` yields an empty collection for that method and an
+availability detail naming the unsupported method. This is host tolerance, not
+a claim that the server satisfies its advertised capabilities. The empty result
+is immediately stale; a later successful listing clears the diagnostic. An error
+after the first page, any other protocol error, transport/authentication failure,
+or non-convergence remains a failure. SDK pagination and caching retain ownership.
+
 ## §mcp-tasks Tasks extension
 
 Tasks is the optional `io.modelcontextprotocol/tasks` extension, never core
@@ -81,22 +103,30 @@ interaction per observed input set. A completed Task is validated as the
 originating tool result; a failed Task preserves its JSON-RPC error.
 Handle ownership and the restart journey are bounded in {§tasks-lifetime}.
 
-## §tasks-lifetime Tasks lifetime and re-run
+§mcp-subscription-ownership Notification filters belong to the shared connection,
+not an individual operation. Acquiring or releasing Task interest schedules a
+filter update without blocking Task polling, settlement, or cancellation; the
+ordinary `tasks/get` path remains available before acknowledgement and during
+watch recovery. A resource READ may await cache-watch setup, but owner
+cancellation ends only that caller's wait. It neither cancels another caller's
+setup nor closes the connection. Filter acknowledgement, overlap replacement,
+retry, and teardown retain one connection-level owner.
+
+## §tasks-lifetime Tasks lifetime
 
-Task handles are owned in-process by the connection and operation that created
-them; Plurnk deliberately declines durable task-handle recovery. A durable
-handle would need a persisted scheduler and a home for a result whose owning
-operation does not outlive the daemon; the ordinary Plurnk journey is that a
-restart re-runs the operation, which drives a fresh task. The server's own
-persistence of task state is respected only within one connection lifetime;
-nothing task-shaped is written to SQLite and no MCP sidecar lifecycle exists.
+Task handles belong to the connection and operation that created them. They
+are process-local, never persisted or automatically replayed. Ordinary host
+lifecycle owns interruption and recovery ({§worker-lifecycle-restart-recovery});
+MCP adds no second scheduler or client-disconnect policy.
 
 | Boundary | Behaviour |
 |---|---|
-| Client disconnect | The daemon-owned operation and its task keep running; the client reattaches to the operation, not the task. |
-| Daemon restart | The connection and every in-flight task handle die with it; the tool call fails like any interrupted operation, the loop re-runs, and the tool call creates a fresh task. |
-| Workspace reactivation | The attachment reconstructs from its durable definition; in-flight tasks on the replaced connection are abandoned, not resumed. |
-| Expiry | The owning operation deadline bounds polling; a non-converging task fails at the standard round bound and is cancelled. |
+| Client interrupt / reattach | The live operation retains its pending input across the intentional Run boundary; synchronization re-presents it ({§agui-conversation-sync}). |
+| Client hangup | Inherits the owning client's cancellation or observer-detachment semantics; MCP does not change them. |
+| Graceful shutdown | Aborts and settles owned work before closing its protocol connection ({§mcp-connection-shutdown}). |
+| Restart after owner loss | No Task resume or automatic tool replay; core reconciles the interrupted operation and its durable evidence. |
+| Workspace reactivation | Reconstructs the attachment from its definition, not an old Task handle. Active Tasks retain workspace residency ({§module-workspace-residency}). |
+| Expiry | The owning operation deadline also bounds client-input waits ({§mcp-input-deadline}); expiry cancels the Task before settling the failed operation. MRTR retains its separate round bound. |
 | Cancellation | Owner abort cancels the task before settling; the handle is then terminal. |
 | Already terminal | Terminal results and errors are consumed by the drive loop; a completed or failed task is never re-polled or re-resumed. |
 
@@ -107,7 +137,7 @@ nothing task-shaped is written to SQLite and no MCP sidecar lifecycle exists.
 | Deprecated | Roots, Sampling, Logging | Do not advertise or implement; use explicit resources/tool arguments, Plurnk's provider layer, and stderr/OpenTelemetry respectively |
 | Deprecated | HTTP+SSE transport; Sampling `includeContext` values | Do not adopt; use Streamable HTTP and no Sampling |
 | Deprecated fallback | OAuth Dynamic Client Registration | Prefer pre-registration, then CIMD when advertised; use DCR only when authorization-server metadata advertises `registration_endpoint`; otherwise fail without probing an inferred endpoint |
-| Removed | `initialize`, `notifications/initialized`, `Mcp-Session-Id`, HTTP GET event stream | Reject the legacy lifecycle; every request is stateless and self-contained |
+| Removed at pinned revision | `initialize`, `notifications/initialized`, `Mcp-Session-Id`, HTTP GET event stream | Absent on modern connections; the negotiated older-peer lifecycle remains SDK-owned ({§mcp-authority}) |
 | Removed | `ping`, `logging/setLevel`, `notifications/roots/list_changed` | Do not send, handle, or teach |
 | Removed | `resources/subscribe`, `resources/unsubscribe`, SSE resumption and `Last-Event-ID` | Use `subscriptions/listen`; reissue a lost request with a new ID |
 | Removed | Legacy Tasks `tasks/list`, `tasks/result`, and task-augmentation request fields | Use only the negotiated final Tasks extension |
@@ -131,7 +161,7 @@ The static wire advertisement is derived from the matrix by construction
 row says `always`, and a `conditional` extension is added only by its owning
 connection logic ({§oauth-client-credentials}). The matrix unit tests enforce
 unique identities, no excluded row advertising, supported rows citing evidence,
-composed coverage for interactive advertised rows, and exact reconciliation
+composed coverage for every advertised row, and exact reconciliation
 between the matrix and the derived advertisement. Official required
 conformance stays a separate named gate, never folded into a matrix row.
 
@@ -140,14 +170,14 @@ conformance stays a separate named gate, never folded into a matrix row.
 | Binding | Contract |
 |---|---|
 | stdio | Spawn one exact executable with an explicit argument array and no shell; newline-delimited JSON-RPC is the only stdout/stdin traffic; stderr is diagnostic; shutdown closes stdin, waits, then terminates if necessary |
-| Streamable HTTP | Send one POST per request or notification; accept JSON or SSE responses; close the response stream to cancel; never open the removed general GET stream |
+| Streamable HTTP | Send one POST per request or notification; accept JSON or SSE responses; close the response stream to cancel; modern connections never open the removed general GET stream |
 
 §mcp-stdio-process-ownership A stdio connection owns the complete process group
 created for its server. Ordinary closure forwards stdin EOF and permits a
 bounded graceful exit; an expired shutdown bound or disappearance of the host
 process forcibly terminates the group, including descendants.
 
-Every HTTP request carries matching `MCP-Protocol-Version` and `Mcp-Method`
+At the pinned revision, HTTP requests carry matching `MCP-Protocol-Version` and `Mcp-Method`
 headers. Named requests also carry `Mcp-Name`; declared primitive tool
 parameters carry validated `Mcp-Param-*` headers. Header names compare
 case-insensitively, and body/header disagreement fails instead of guessing.
@@ -194,7 +224,7 @@ unavailable candidate without changing durable state.
 
 | Variable | Contract |
 |---|---|
-| `PLURNK_MCP_<server>` | HTTP(S) URL or exact stdio executable |
+| `PLURNK_MCP_<server>` | HTTP(S) URL or exact stdio executable; empty masks the definition ({§mcp-configuration-cascade}) |
 | `PLURNK_MCP_<server>_ARGS` | JSON string array for stdio |
 | `PLURNK_MCP_<server>_CWD` | Working directory for stdio |
 | `PLURNK_MCP_<server>_ENV` | JSON string map for stdio |
@@ -204,7 +234,7 @@ unavailable candidate without changing durable state.
 | `PLURNK_MCP_<server>_READ` | JSON string array forming an exact subset of enabled tools that the operator classifies as read-only; every other enabled tool retains the conservative `host` effect |
 | `PLURNK_MCP_<server>_SUMMARY` | Authored one-line server orientation ({§mcp-summary-derivation}) |
 | `PLURNK_MCP_<server>_<tool>_SUMMARY` | Authored one-line tool orientation; tool names fold the same way and may contain underscores |
-| `PLURNK_MCP_ENABLED` | JSON array of exact configured server aliases enabled by default; absent or `[]` enables none |
+| `PLURNK_MCP_ENABLED` | JSON array of exact configured server aliases enabled by default. `[]` is the one spelling of none: the panel states it, and an absent or empty key is refused by name |
 | `PLURNK_MCP_EXPANDED` | JSON array subset of enabled servers whose every tool is surveyed at turn 0 — one FIND row per executable block of the family document, with aside and signature ({§tools-resource-materialization}); never a document delivered unasked; absent or `[]` expands none |
 | `PLURNK_MCP_CONNECT_TIMEOUT` | Positive integer milliseconds |
 | `PLURNK_MCP_REQUEST_TIMEOUT` | Positive integer milliseconds |
@@ -217,18 +247,25 @@ executable string even when its path contains whitespace; arguments never hide
 inside it. Bearer authentication and a case-insensitive `Authorization` entry
 in `_HEADERS` are mutually exclusive.
 
-§mcp-summary-derivation **Every orientation line derives from authored
-metadata — never a container template.** The runtime declaration's summary
-resolves in order: the `_SUMMARY` companion, the server's own
-`serverInfo.description`, its display `title` (both spec metadata — a title
-like "Chrome DevTools MCP server" is already a one-liner), the first sentence
-of its `instructions` essay, then a factual tool-name list derived from the
-effective admitted tool registry. Each tool's one-liner
-resolves: its `_<server>_<tool>_SUMMARY` companion, `annotations.title`, the
-first sentence of its `description` (capped), then the tool name. The family
-doc's Summary section and the survey row carry the server one-liner; the tool
+§mcp-summary-derivation **Orientation prefers authored purpose over display
+labels; no capabilities are inferred.** Blank values fall through:
+
+| Summary | Precedence, highest first |
+|---|---|
+| Server | `_SUMMARY` → `serverInfo.description` → `instructions` → `serverInfo.title` → effective admitted tool-name list → server alias |
+| Tool | `_<server>_<tool>_SUMMARY` → `description` → `title` → `annotations.title` → tool name |
+
+Derived prose is whitespace-normalized, limited to its first sentence, and
+clipped within 80 characters plus an ellipsis, preferring a word boundary. Explicit
+one-line overrides remain intact. Full server instructions remain authored
+Markdown in the family document's runtime `details`, available on demand;
+turn0 surveys only the compact summary/invocations. Full tool descriptions
+remain in the linked input-contract documents. With tools, the runtime declares
+`{ from: "tools", description }`: purpose annotates rather than replaces the
+complete effective menu in the family Summary and survey row
+({§scheme-catalog-aside}). Without authored purpose the menu stands alone. The tool
 doc's Summary section IS the invocation form
-```` ```server (tool) <!-- one-liner --> ````, so the discovery row teaches the
+````` ````server (tool) <!-- one-liner --> `````, so the discovery row teaches the
 call ({§tools-resource-materialization}). Summary companions expand `${NAME}`
 references like every other companion.
 
@@ -265,6 +302,11 @@ transport-inapplicable options before any connection work.
 §mcp-configuration-cascade MCP server configuration has one field-wise
 precedence order: service environment, then the workspace's durable definition.
 Arrays and maps replace their lower value instead of appending or merging.
+An explicitly empty environment target omits that service definition, its
+companions (including summaries), and its inherited `ENABLED`/`EXPANDED`
+selections. Companion values are neither parsed nor expanded. It does not
+remove a workspace-owned definition or prohibit adding one. Genuinely undeclared
+aliases and case-fold collisions still fail validation.
 Client configuration is not a live layer: the contracts-owned
 `{§mcp-configuration-overlay}` enters only as the `configuration` of a
 `discover` query, is parsed by the same owner and path as service environment
@@ -276,6 +318,41 @@ the service at connection preparation.
 
 ### §mcp-module The MCP family beneath the coordinator
 
+§mcp-launch-environment Discovery and stdio connection preparation use the workspace
+environment supplied by Core ({§workspace-env}), never the invoking worker's overrides.
+The admitted workspace environment reaches the actual subprocess; explicit definition
+launch options override it. Symbolic references resolve against the operator environment
+with the same workspace entries and masks applied. Resolved ambient values are never
+copied into durable definitions.
+
+An `env` header option on `mcp (add)` becomes that definition's retained stdio launch
+override, with the definition's existing symbolic-reference semantics. On `discover`
+it applies to the probe and its returned candidate. HTTP servers
+have no local process environment and refuse these stdio launch overrides; ordinary
+HTTP authorization/header references may use workspace values. A running server keeps
+its launch environment. Use ordinary `disable` and `enable` to restart it after an env
+change; there is no automatic restart or stale-configuration state.
+
+§mcp-working-storage **A local server never implicitly inherits the daemon's
+working directory.** The common connection boundary requires an explicit CWD
+or a host-supplied default. Missing or unusable storage fails connection
+preparation; it never falls back to the project.
+
+| Connection | Working directory and lifetime |
+| --- | --- |
+| Attached stdio server without `cwd` | `servers/<alias>` under the module directory from {§module-workspace-directory}; created lazily with mode `0700`, retained across disable/enable, removal, cooling, and daemon restart. |
+| Direct stdio discovery | A unique `discover-*` directory beneath that same module root; removed only after the probe connection closes, including unsuccessful probes. It is never persisted in the candidate definition. |
+| Explicit `cwd` | Honored without creation or cleanup. Relative values resolve against the launcher's CWD, not the default storage directory. |
+| HTTP | No local working directory is allocated. |
+
+Host-owned storage does not replace `HOME`, credentials, XDG environment values,
+tool arguments, or the project CWD of ordinary executors. Executables and file
+arguments needing a particular project must name it explicitly or configure
+`cwd`. Stored streams/resources retain their existing ownership. This is a
+default-placement contract, not filesystem confinement or a promise to
+redirect a third-party server's absolute writes. No server-specific flags or
+deprecated roots capability are introduced.
+
 §mcp-management-actions MCP is one family of workspace Functionality
 ({§functionality-coordinator}): the coordinator publishes `workspace.mcp.list |
 discover | add | enable | disable | remove` and the model's `mcp` executable fence
@@ -355,7 +432,7 @@ as an accidental failure.
 | Pending authorization | One pending candidate per `(workspace, alias)`; a new add or customized enable cancels and replaces it. A callback from a superseded attempt fails state validation instead of cross-completing. |
 | Client disconnect | Does not touch the pending candidate; it can still be completed, or replaced by a fresh request. |
 | Daemon restart during pending | The candidate is lost: nothing was durable, no attachment publishes, and `oauth.complete` answers `404 oauth-not-pending`. Start authorization again. |
-| Daemon restart after authorization | The durable definition rehydrates but tokens are gone; the attachment publishes `authorization-required` and enable returns a fresh `{ status: 202, authorization: { url } }`. The operator reauthorizes. |
+| Daemon restart after authorization | The durable definition rehydrates but tokens are gone; the attachment publishes `authorization-required` and enable returns status `202` with `definition.authorization.url` in the common mutation result. The operator reauthorizes. |
 | Token expiry | An expired access token surfaces as one unauthorized response; the SDK re-acquires via `refresh_token` when one was issued, otherwise re-enters interactive authorization. |
 | Refresh | Happens only against the issuer bound during the original authorization; the refreshed token replaces the in-memory token. |
 | Workspace disable/remove | Closes the attachment and clears its pending candidate; no durable secret deletion is needed because nothing secret is durable. |
@@ -421,7 +498,19 @@ duplicate remote name, an enabled name not representable as a Plurnk target,
 or a `read` name outside the enabled set fails that workspace activation. No
 partial namespace is published and every acquired candidate closes.
 
-- §mcp-catalog-refresh-in-place **A catalog change refreshes in place.** When a server announces a changed catalog, the alias is dirty and its executor is rebuilt on the next preparation — on the connection the alias already holds, never by spawning a second server: with an unchanged definition and a live connection, preparation re-lists the catalog over that connection, so neither an aborted attempt nor a commit has anything of the alias to close, and a failed re-listing leaves the current catalog in service. (#429's root: the SDK's negotiated connect probes a stdio server on a disposable sibling process before the real connect, so every stdio connect starts the server twice and the sibling exits on its own schedule — a test that reads "any exit" as "the committed server was closed" flakes under load. The committed server is the last one started; the refresh-in-place rule keeps it so.) Covered: `Module.test.ts` — one process ever, no close marker across the refresh.
+§mcp-catalog-refresh-in-place **A catalog change refreshes in place.** An unchanged
+definition re-lists over its existing connection and atomically republishes its
+executor, documents, and resource facet through {§functionality-publication}.
+SDK cache invalidation and the host's publication acknowledgement are separate
+boundaries; neither closes or replaces the committed connection.
+
+| Refresh boundary | Pending invalidation |
+|---|---|
+| Notification | Marks the alias immediately; notifications coalesce under the existing refresh timer. |
+| Successful publication | Acknowledges only the invalidation captured by that preparation. A newer notification remains pending. |
+| Failed listing | Keeps the previous usable snapshot and retries pending work with bounded backoff. |
+| Aborted publication | Does not acknowledge the unpublished catalog. |
+| Disable/remove, workspace cooling, or shutdown | Retires obsolete refresh timers and invalidations. |
 
 MCP participates in core Functionality residency ({§module-workspace-residency}).
 Every tool call and Task retains the workspace from executor entry through its
@@ -444,13 +533,15 @@ commit leaves the durable definition, connection, Registry, docs, and resource
 authority unchanged. Materialization and registration inspect the complete
 owning operation result; a non-success preserves its original Problem.
 
-Shutdown first prevents new serialized work, cancels infrastructure watches,
-and closes every acquired connection—including a candidate still negotiating.
-That cancellation reaches pending OAuth, active requests, and Tasks. It then
-waits active mutations to settle, discards process-local snapshots, and reports
-every close failure. Whole-connection shutdown retires subscription work before
-closing its transport; it does not first issue a redundant per-listen
-cancellation.
+§mcp-connection-shutdown Shutdown prevents new work and aborts each connection's
+active requests, including client-input waits. Their protocol cleanup settles
+before the extension channel or connected transport closes, so a created Task
+can receive `tasks/cancel`. Concurrent closers await the same settlement.
+Candidates still negotiating and standalone OAuth transports close immediately.
+Infrastructure watches retire without a redundant per-listen cancellation;
+active mutations settle, process-local snapshots are discarded, and close
+failures are reported. Core's shutdown deadline remains the outer bound
+({§crash-only-stop}).
 
 ## §mcp-host-composition Protocol-to-Plurnk composition
 
@@ -460,22 +551,31 @@ workspace attachment. The host does not reproduce SDK protocol machinery.
 
 | Protocol event | Plurnk composition |
 |---|---|
-| `tools/call` progress | Writes ordinary transient progress on the owning EXEC stream; it creates no log sibling or polling vocabulary. |
-| Operation cancellation | The owning EXEC abort signal closes the HTTP request stream or sends the stdio cancellation notification. |
+| `tools/call` progress | Writes ordinary transient progress on the owning execution stream; it creates no log sibling or polling vocabulary. |
+| Operation cancellation | The owning execution's abort signal closes the HTTP request stream or sends the stdio cancellation notification. |
 | `input_required` | Batches all embedded requests from one result into one atomic client interaction. Opaque `requestState` remains private to the connection and only the originating request is reissued after a complete response. |
-| Elicitation form / URL | Validates the response against the requested form or URL action contract. Client cancellation becomes the standard `cancel` action; unsupported families or modes fail before any interaction or retry. |
-| Task handle | Keeps the original EXEC stream active, follows `tasks/get` and selected Task notifications, and settles that same stream with the terminal result or error. |
+| Elicitation form / URL | Validates the response against the requested form or URL action contract. Each response-schema property's `description` carries its request message and, for URL mode, the browser URL; a generic schema renderer can present the decision without decoding MCP arguments. Client cancellation becomes the standard `cancel` action; unsupported families or modes fail before any interaction or retry. |
+| Task handle | Keeps the original execution stream active, follows `tasks/get` and selected Task notifications, and settles that same stream with the terminal result or error. |
 | Task input | Routes through the operation's client interaction, then sends `tasks/update`; it never asks the model to manufacture protocol state. |
-| Task cancellation | The owning EXEC cancellation invokes `tasks/cancel` before settling the ordinary stream cancellation. |
-| List/resource invalidation | List changes invalidate SDK catalogs and atomically refresh the attachment snapshot. Updates to selected resource URIs invalidate their SDK cache entries; private entries remain authorization-partitioned. |
+| Task cancellation | The owning execution's cancellation invokes `tasks/cancel` before settling the ordinary stream cancellation. |
+| List invalidation | Invalidates SDK catalogs and atomically refreshes the attachment snapshot. |
+| Selected resource update | Invalidates that URI's SDK cache entry; a subsequent READ acquires current content. Private entries remain authorization-partitioned. Earlier READ receipts stay unchanged; ordinary remote changes neither broadcast nor wake workers ({§actor-boundary-lineage-attention}). |
 | Prompt get / completion | Serves ordinary resource-authority reads and host interactions from negotiated prompt/template definitions; no prompt becomes an executable tool. |
 
 The general executor interaction contract, not this package, owns client
-interrupt durability and AG-UI presentation. A disconnect re-surfaces its
-pending client-owned interaction exactly as proposal review does. MRTR round
+interrupt durability and AG-UI presentation. Reattachment re-surfaces input
+only while its originating operation remains live. MRTR round
 limits, request timeout, cancellation, and Task terminal state are one
 operation lifecycle; none becomes a hidden retry loop.
 
+§mcp-input-deadline Client-input waits consume the remaining owning operation
+budget (`PLURNK_MCP_REQUEST_TIMEOUT`); each MRTR round or Task input set does not
+start a fresh budget. Expiry aborts the input's ordinary Core waiter, removes it
+from pending/reconnect discovery, and enters the same bounded protocol cleanup
+as other operation failures. A late response is no longer pending. No response
+or tool replay is fabricated; the failed operation remains available to the
+worker for recovery. SDK wire-leg timeouts retain ownership of transport waits.
+
 §mcp-tool-replay A tool call is effectful unless host policy proves otherwise.
 After dispatch, a transport failure cannot prove that the MCP server did not
 apply the call, so `tool-call-failed` is non-retryable and never recommends
@@ -487,6 +587,12 @@ remote diagnostic as structured extensions. Their prose states only the failed
 boundary fact; it neither repeats those fields nor infers whether the remote
 effect occurred.
 
+§mcp-trailing-aside A tool call's body is one JSON object. HTML comments after
+that object are the writer's aside, not arguments: when the body does not parse
+as written, trailing `<!-- … -->` comments are removed and the object is read.
+Any other trailing text is still `invalid-tool-arguments`. Nothing teaches the
+tolerance (#758).
+
 ## §mcp-result-content Passive result content
 
 The default output channel carries the tool's result, not its transport envelope:
@@ -509,7 +615,8 @@ complete result, including metadata and annotations, remains available in
 Unnamed resources receive eight-character hexadecimal identifiers, not ordinal
 labels. No binary base64 is copied into the default result body. Listing a
 resource creates no native model attachment; READ uses {§packet-attachment-parts},
-including scoped byte reads, supported modalities, and single-request delivery.
+including scoped byte reads, supported modalities, and the owning READ's retention
+and curation lifecycle.
 Resource publication is passive; completion of the originating execution retains
 its ordinary wake semantics. A single `resources/read` content item becomes the
 resource's typed body; multiple items become named children under its `resources/`
@@ -522,13 +629,23 @@ standalone `blob` content block is not a modern `tools/call` content member
 protocol-invalid. Size limits and MIME trust remain ordinary channel and
 entry policy, not MCP-specific rules.
 
+§mcp-prompt-content Retrieved prompts retain their ordered message list, roles,
+text, and metadata as data, not conversation injections. The same content
+projection used for tools replaces non-text parts with resource links: embedded
+content becomes typed snapshots under the prompt's `resources/` folder; remote
+links resolve through the server resource authority. Reading a snapshot does
+not retrieve the prompt again or discard its arguments. A missing snapshot is
+not found, never an implicit prompt re-execution. The prompt's `#json` preserves
+the complete original response. Media acquisition, native delivery, retention,
+and curation use the ordinary READ contract, not a separate prompt lifecycle.
+
 ## §mcp-apps-exclusion MCP Apps exclusion
 
 Plurnk does not advertise or implement MCP Apps. An Apps host must sandbox
 render third-party HTML/JavaScript, enforce CSP and `_meta.ui` permissions,
 mediate a `postMessage` JSON-RPC `ui/` dialect, proxy app-initiated tool
 calls with consent, and own teardown. No Plurnk client can enforce that
-sandbox today (terminal and Neovim cannot), the daemon is not a second
+sandbox today (the terminal cannot), the daemon is not a second
 application platform, and AG-UI has no standard Apps projection — inventing
 a private event stream to carry Apps is rejected. Tool descriptions carrying
 `_meta.ui` metadata project into Plurnk without it: model-facing summaries
@@ -538,12 +655,24 @@ non-advertised ({§mcp-capability-matrix}). Re-evaluate only when a
 sandbox-capable client exists and a standard AG-UI projection is agreed;
 even then the capability would be per-client-advertised, never daemon-wide.
 
+## §mcp-skills-deferral Skills extension adoption boundary
+
+Plurnk does not advertise or implement `io.modelcontextprotocol/skills`.
+[SEP-2640](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/seps/2640-skills-extension.md)
+is Final, with a
+[stable extension specification](https://github.com/modelcontextprotocol/ext-skills/blob/main/specification/stable/skills.mdx).
+Deferral concerns host integration, not standards maturity: origin-qualified
+identities, manifest verification, content-bound approval, and activation
+must compose with the existing skills, resource, and proposal owners before
+adoption. Reading an MCP resource does not claim extension support or activate
+it as a skill. The design review is tracked in #654.
+
 ## §mcp-model-projection Model-facing projection
 
 | MCP surface | Plurnk surface |
 |---|---|
 | Server | One registered executor family, `worker:///_plurnk/tools/<server>.md`, and matching resource scheme |
-| Enabled tool | One annotated call in the compact family document plus one exact `worker:///_plurnk/tools/<server>/<encoded-tool>.md` input-contract document |
+| Enabled tool | One annotated call in the compact family document plus one exact `worker:///_plurnk/tools/<server>/<encoded-tool>.json` input-contract document |
 | Tool survey | Ordinary FIND summary metadata from the standard executable-tool resource tree |
 | Resource catalog | `<server>:///` and `<server>:///resources` |
 | Resources | `<server>:///resources` and encoded resource-URI descendants |
@@ -566,9 +695,7 @@ The compact family document contains annotated, copyable tool invocations with
 shallow required-field previews and alias-scoped schema links. Each linked child
 preserves the complete remote description and raw input schema, without
 reconstructing property tables or expanding nested constraints into the preview.
-A missing remote description falls back to the tool name rather than an invented
-capability claim. Output schemas
-do not enter model teaching; the returned value remains ordinary evidence. Disabled names
+Output schemas do not enter model teaching; the returned value remains ordinary evidence. Disabled names
 appear in neither discovery nor admission, and there is no MCP-specific FIND,
 READ, authority-root, or other model discovery mechanism for tools.
 
@@ -591,6 +718,10 @@ target is an internal contract violation rather than a conservative guess.
 Protocol conformance runs through official
 `@modelcontextprotocol/conformance@0.2.0-alpha.11`, whose immutable
 `2026-07-28` requirement manifest freezes the release-time alpha.10 scenario
-set. The core client leg must pass; supported extension scenarios run and
-report separately because Tasks cannot alter the core pass rate. Atlas and
-third-party stdio/Streamable HTTP servers are composition evidence only.
+set. Its required client leg must pass; `not_scored` probes remain visible
+without changing that verdict. The adopted `auth/client-credentials-basic`
+extension runs as a separate named gate requiring successful grant and bearer
+checks; an empty or skipped report never passes. Extension scenarios have no
+dated-spec filter and do not alter the core pass rate. The JWT arm remains
+excluded under {§oauth-client-credentials}. Atlas and third-party
+stdio/Streamable HTTP servers are composition evidence only.

package/dist/ContentProjection.d.ts

@@ -0,0 +1,11 @@
+import type { ContentBlock, ResourceLink, TextContent } from "@modelcontextprotocol/client";
+import type { EntryData } from "@plurnk/plurnk-schemes";
+interface ResourceProjection {
+    address(uri: string): string | Promise<string>;
+    publish?(channel: EntryData["channels"][string], name?: string): Promise<string>;
+}
+export default class ContentProjection {
+    static project(part: ContentBlock, resources: ResourceProjection): Promise<TextContent | ResourceLink>;
+}
+export {};
+//# sourceMappingURL=ContentProjection.d.ts.map

package/dist/ContentProjection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ContentProjection.d.ts","sourceRoot":"","sources":["../src/ContentProjection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC5F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGxD,UAAU,kBAAkB;IACxB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/C,OAAO,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACpF;AAED,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAClC,OAAa,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,GAAG,YAAY,CAAC,CAgB3G;CACJ"}

package/dist/ContentProjection.js

@@ -0,0 +1,24 @@
+import ResourceContent from "./ResourceContent.js";
+export default class ContentProjection {
+    static async project(part, resources) {
+        if (part.type === "text")
+            return part;
+        if (part.type === "resource_link")
+            return { ...part, uri: await resources.address(part.uri) };
+        if (resources.publish === undefined)
+            throw new Error("MCP content requires a resource publisher.");
+        const name = part.type === "resource" ? ResourceContent.name(part.resource) : undefined;
+        const channel = part.type === "resource" ? ResourceContent.channel(part.resource)
+            : { content: "", bytes: Buffer.from(part.data, "base64"), mimetype: part.mimeType };
+        const uri = await resources.publish(channel, name);
+        return {
+            type: "resource_link",
+            uri,
+            name: name ?? decodeURIComponent(new URL(uri).pathname.split("/").at(-1)),
+            mimeType: channel.mimetype,
+            ...(part.annotations === undefined ? {} : { annotations: part.annotations }),
+            ...(part._meta === undefined ? {} : { _meta: part._meta }),
+        };
+    }
+}
+//# sourceMappingURL=ContentProjection.js.map

package/dist/ContentProjection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ContentProjection.js","sourceRoot":"","sources":["../src/ContentProjection.ts"],"names":[],"mappings":"AAEA,OAAO,eAAe,MAAM,sBAAsB,CAAC;AAOnD,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAClC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAkB,EAAE,SAA6B;QAClE,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM;YAAE,OAAO,IAAI,CAAC;QACtC,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe;YAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9F,IAAI,SAAS,CAAC,OAAO,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QACnG,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACxF,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC7E,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACxF,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACnD,OAAO;YACH,IAAI,EAAE,eAAe;YACrB,GAAG;YACH,IAAI,EAAE,IAAI,IAAI,kBAAkB,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC;YAC1E,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,GAAG,CAAC,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC;YAC5E,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;SAC7D,CAAC;IACN,CAAC;CACJ"}

package/dist/McpExecutor.d.ts

@@ -14,7 +14,7 @@ export declare const toolResultBody: (result: ToolResultShape, runtime: string,
     content: string;
     mimetype: string;
 }>;
-export declare const runtimeDecl: (name: string, summary: RuntimeSummaryDecl, expandTools: boolean) => RuntimeDecl;
+export declare const runtimeDecl: (name: string, summary: RuntimeSummaryDecl, expandTools: boolean, instructions?: string) => RuntimeDecl;
 export default class McpExecutor extends BaseExecutor {
     #private;
     constructor(metadata: {

package/dist/McpExecutor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"McpExecutor.d.ts","sourceRoot":"","sources":["../src/McpExecutor.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,YAAY,EAKf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EACR,WAAW,EACX,MAAM,EACN,QAAQ,EACR,UAAU,EAEV,mBAAmB,EACnB,WAAW,EACX,kBAAkB,EAClB,mBAAmB,EACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,gBAAgB,EAAE,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAkB,MAAM,8BAA8B,CAAC;AAGjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAiC9C,eAAO,MAAM,aAAa,SAChB,MAAM,WACH,aAAa,GAAG,SAAS,YACxB,MAAM,GAAG,SAAS,KAC7B,MAOF,CAAC;AAIF,eAAO,MAAM,oBAAoB,SACvB,MAAM,WACH,aAAa,GAAG,SAAS,YACxB,MAAM,GAAG,SAAS,KAC7B,kBAIF,CAAC;AAMF,MAAM,MAAM,eAAe,GAAG;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAC3C,QAAQ,CAAC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IACrC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,cAAc,WAAkB,eAAe,WAAW,MAAM,UAAU,QAAQ,CAAC,OAAO,CAAC,KAAG,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAyBvJ,CAAC;AAEF,eAAO,MAAM,WAAW,SAAU,MAAM,WAAW,kBAAkB,eAAe,OAAO,KAAG,WAc5F,CAAC;AAuBH,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,YAAY;;IASjD,YACI,QAAQ,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAC5C,UAAU,EAAE,gBAAgB,EAC5B,eAAe,EAAE,MAAM,MAAM,IAAI,EACjC,MAAM,GAAE,OAAO,CAAC,UAAU,CAAM,EAChC,aAAa,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EAQ9C;IAED,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAOpD;IAEQ,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAK7C;IAED,IAAa,gBAAgB,IAAI,MAAM,CAEtC;IAgCD,YAAY,IAAI,mBAAmB,CAKlC;IAED,IAAI,OAAO,IAAI,aAAa,CAK3B;IAEc,KAAK,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAgBvE;IAEK,gBAAgB,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAqBzE;IAEK,GAAG,CAAC,EACN,OAAO,EACP,IAAI,EACJ,MAAM,EACN,MAAM,EACN,KAAK,EACL,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,KAAK,GACR,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CA2HhC;CACJ"}
+{"version":3,"file":"McpExecutor.d.ts","sourceRoot":"","sources":["../src/McpExecutor.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,YAAY,EAKf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EACR,WAAW,EACX,MAAM,EACN,QAAQ,EACR,UAAU,EAEV,mBAAmB,EACnB,WAAW,EACX,kBAAkB,EAClB,mBAAmB,EACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,gBAAgB,EAAE,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAkB,MAAM,8BAA8B,CAAC;AAGjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAiB9C,eAAO,MAAM,aAAa,SAChB,MAAM,WACH,aAAa,GAAG,SAAS,YACxB,MAAM,GAAG,SAAS,KAC7B,MAOF,CAAC;AAGF,eAAO,MAAM,oBAAoB,SACvB,MAAM,WACH,aAAa,GAAG,SAAS,YACxB,MAAM,GAAG,SAAS,KAC7B,kBAKF,CAAC;AAMF,MAAM,MAAM,eAAe,GAAG;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAC3C,QAAQ,CAAC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IACrC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,cAAc,WAAkB,eAAe,WAAW,MAAM,UAAU,QAAQ,CAAC,OAAO,CAAC,KAAG,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAqBvJ,CAAC;AAEF,eAAO,MAAM,WAAW,SAAU,MAAM,WAAW,kBAAkB,eAAe,OAAO,iBAAiB,MAAM,KAAG,WAenH,CAAC;AAuBH,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,YAAY;;IAoBjD,YACI,QAAQ,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAC5C,UAAU,EAAE,gBAAgB,EAC5B,eAAe,EAAE,MAAM,MAAM,IAAI,EACjC,MAAM,GAAE,OAAO,CAAC,UAAU,CAAM,EAChC,aAAa,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EAQ9C;IAED,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAOpD;IAEQ,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAK7C;IAED,IAAa,gBAAgB,IAAI,MAAM,CAEtC;IAgCD,YAAY,IAAI,mBAAmB,CAKlC;IAED,IAAI,OAAO,IAAI,aAAa,CAK3B;IAEc,KAAK,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAgBvE;IAEK,gBAAgB,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAwBzE;IAEK,GAAG,CAAC,EACN,OAAO,EACP,IAAI,EACJ,MAAM,EACN,MAAM,EACN,KAAK,EACL,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,KAAK,GACR,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CA2HhC;CACJ"}