fix(cli): pre-send warning and clearer error for over-long /goal objectives (#2928)

* fix(cli): warn on over-long /goal objectives before sending and keep the input

- Show a live footer warning in the TUI while a typed /goal objective
  exceeds the 4000-character limit, measuring paste-expanded text only
  when the input can be a /goal command.
- Restore the rejected /goal input into the editor instead of losing it.
- Include the file-reference workaround in the GOAL_OBJECTIVE_TOO_LONG
  error messages (TUI, goal queue, agent-core, agent-core-v2).

* fix(cli): keep the /goal length warning in its own footer slot

A transient hint (exit confirm, detach, image paste) that displaced the
warning previously left the footer blank after clearing, because no
editor change re-applied it. The footer now renders the warning from a
dedicated slot whenever no transient hint is active, so the warning
returns on its own.

* fix(cli): gate the /goal length warning on trimmed text

Submitted text is trimmed before slash-command dispatch, so leading
whitespace still runs /goal — normalize with trimStart in the gate and
in the length check to match.

* fix(cli): restore input rejected by the slash-command busy gate

An idle-only command submitted while streaming/compacting was rejected
after the editor buffer had already been cleared, losing hand-typed
input (e.g. an over-long /goal objective that never reached the local
validation).

* fix(cli): restore input at the post-creation busy re-check

The lazy-session race rejects an idle-only command after a first prompt
has already started a turn; the editor buffer is long cleared by then,
so give the submitted input back like the dispatch blocked branch does.

* fix(cli): close the remaining input-loss and gate gaps around /goal

- Restore the submitted input when lazy session creation fails before a
  session-requiring command runs.
- Restore only into a still-empty editor after async gates, so a draft
  typed while creation was pending is never overwritten.
- Expand pastes that can complete a partially typed /goal command
  (e.g. /go[paste #1 …]) in the length-warning gate.

* fix(cli): never displace newer UI state with a delayed input restore

A session-less /goal submission restores its input only after an async
gap (lazy session creation). If the user opened an editor-replacement
panel meanwhile, restoring would tear it down (and leave activeDialog
inconsistent). Track editorReplacementMounted in TUIState and gate all
delayed restores through canRestoreSubmittedInput.

* refactor(cli): move canRestoreSubmittedInput into commands/resolve

Avoids the goal.ts <-> dispatch.ts runtime import cycle flagged by
import/no-cycle; the helper takes a structural host shape instead.

* fix(cli): match the slash parser's delimiter in the /goal length warning

parseSlashInput splits the command name at a literal space only, so a
newline or tab after /goal dispatches as a plain message — the warning
must not fire for inputs the dispatcher will not treat as a goal.

.agents/skills/agent-core-dev/SKILL.md

@@ -0,0 +1,70 @@
+---
+name: agent-core-dev
+description: Use when developing in packages/agent-core-v2 (the DI × Scope agent engine) — adding or modifying a domain Service, choosing a LifecycleScope, wiring DI dependencies, splitting a domain across scopes, owning or migrating a config section, gating behavior behind an experimental flag, raising coded errors, working on the permission system, writing DI/Scope tests, porting business logic from agent-core (v1) to v2, triaging a main-branch commit against v2, or exposing a v2 domain over server-v2 while keeping the /api/v1 wire contract compatible with released clients. Self-contained guide organized by development stage (orient → design → implement → test → verify) plus align workflows for v1→v2 migration, main-branch commit triage, and server-v2 wire exposure; each file carries the rules, examples, and red lines for its step.
+---
+
+# agent-core-dev
+
+> Develop `packages/agent-core-v2` by lifecycle stage. This skill is **self-contained**: every rule, recipe, and red line lives in the stage files below — it does not delegate to `packages/agent-core-v2/docs/`.
+
+`agent-core-v2` is the new agent engine built on the **DI × Scope** architecture (a port of `packages/agent-core`). Everything resolves through the container: a service declares an **identity**, its **dependencies**, and a **lifetime**; the container decides construction, singleton-per-scope, ordering, and disposal. The stage files restate the rules in imperative form so you can work without reading the source docs.
+
+## Lifecycle at a glance
+
+```text
+Orient → Design → Implement → Test → Verify
+  │        │          │          │        │
+  │        │          │          │        └─ lint:imports · typecheck · test · dep graph · red lines
+  │        │          │          └─ test.md
+  │        │          └─ implement.md (+ errors.md · flags.md · permission.md)
+  │        └─ design.md
+  └─ orient.md
+```
+
+Stages are ordered but not strictly linear: a test failure (stage 4) that reveals a wrong scope sends you back to design (stage 2); a `CyclicDependencyError` sends you to `design.md` §dependency-direction and `implement.md` §cycles.
+
+## Workflows
+
+End-to-end procedures that span the stages. Reach for these before reading the stage files individually.
+
+- [Align (port `agent-core` → `agent-core-v2`)](align.md): split a v1 class into semantic units, fix each unit's domain / scope / Service / dependencies, then migrate the logic and tests. Use when the task is "move feature X from v1 to v2" or "port `IXxxService` to v2".
+- [Commit align (triage a `main` commit against v2)](commit-align.md): given one `main` commit hash + a short note, find the v1 logic it changed, check whether v2 already has the corresponding implementation, bucket it (aligned / partial / missing / not-applicable), and recommend a minimal fix. Use in the `kimi-code-v2`-catching-up-to-`main` phase, for one commit at a time; escalate to [align.md](align.md) if the gap is a whole domain.
+- [Server align (expose `agent-core-v2` over `server-v2`)](server-align.md): wire a v2 domain into `packages/kap-server` over `/api/v2` (native) and `/api/v1` (v1-compatible mirror), keep the wire schema byte-compatible with the established v1 contract by sharing the `@moonshot-ai/protocol` schema, and isolate v1-only behavior in a `<domain>Legacy` edge adapter instead of distorting the native v2 Service. Use when the task is "expose the new v2 Service on the server", "add a route to the `/api/v1` surface", or "keep server-v2 wire-compatible with released v1 clients".
+
+## Stages
+
+- [Stage 1 — Orient](orient.md): the DI black box (identity / dependencies / lifetime), the four `LifecycleScope` tiers and visibility, and the file-header comment convention. Read before touching business code.
+- [Stage 2 — Design a service](design.md): pick a scope, split a domain across scopes, choose a calling style (direct call vs event vs hook), and direct dependencies. Decide *where things live and who knows whom* before coding.
+  - Topic: [Domain boundaries vs Scope](domain-boundaries.md) — keep `session` / `agent` / `turn` from becoming god objects; data-ownership test and their split conclusions.
+  - Topic: [Persistence layering](persistence.md) — the three-layer `Store → Storage → backend` model, naming Stores by access pattern, and which layer business code should depend on.
+  - Topic: [Edge exposure — `resource:action` + WS events](edge-exposure.md) — which Services are exposed over `/api/v2` (per-scope action map) and which events stream over WS; what to wrap in a facade.
+- [Stage 3 — Implement](implement.md): the standard Service recipe and the DI building blocks — interface + identity, constructor injection, scoped registration, `Disposable`, eager vs delayed, `invokeFunction`, `createInstance`, child scopes, and the cycle-refactor playbook.
+  - Topic: [Service authoring](service-authoring.md) — file layout, naming, contract vs impl contents, interface style, constructor/field conventions, events, multi-Service domains, comment rules.
+  - Topic: [Config](config.md) — the section-registry model, App vs Session split, owning a config section, the TOML format, and the env overlay.
+  - Topic: [Errors](errors.md) — co-located `XxxError`, the central code registry, wire serialization, boundary translation.
+  - Topic: [Flags](flags.md) — `registerFlagDefinition`, `IFlagService.enabled(id)`, the `[experimental]` config section, resolution precedence.
+  - Topic: [Permission](permission.md) — risk-only chain-of-responsibility kernel, harness constraints and product reviews as domain `onBeforeExecuteTool` veto listeners (`veto` / `allow` / `pass` / cold `waitUntil` factories), shared `toolApproval` round-trip, policy registry + composer, `modes`/`agentTypes` metadata, `resolveExecution`/`accesses`.
+  - Topic: [Telemetry](telemetry.md) — emitting events via `ITelemetryService`, context propagation, and appender destinations (`ConsoleAppender` / `CloudAppender`).
+- [Stage 4 — Test](test.md): resolve the system under test by interface, pick `TestInstantiationService` vs `createScopedTestHost`, shared stubs, service groups, teardown.
+- [Stage 5 — Verify & submit](verify.md): `lint:imports`, `typecheck`, `test`, and the pre-submit checklist.
+
+## How to use this skill
+
+Jump to the stage you are in and read that one file; each is self-contained and ends with its own red lines. Skim the global red lines below before submitting — they catch most mistakes across every stage. The repo's source of truth remains the code in `packages/agent-core-v2/src/`; this skill codifies the same rules so you do not have to re-derive them.
+
+## Global red lines
+
+Invariants that hold across every stage. Each is expanded in the stage file noted.
+
+1. No `new` on a class whose constructor carries `@IService` deps — inject with `@IX` or `accessor.get(IX)`. (implement.md)
+2. `@IX` decorates constructor parameters only; parameter order depends on construction (static-first for `createInstance`, `@IX`-first for scoped services). (service-authoring.md)
+3. Both interface and impl carry `_serviceBrand`; the `createDecorator` name is globally unique. (implement.md)
+4. Parent scope never depends on child scope — short-lived may inject long-lived, never the reverse. (orient.md)
+5. No cyclic dependencies — refactor (extract a third Service / use an event / re-scope); activation timing does not break dependency cycles. (design.md, implement.md)
+6. `ServicesAccessor` is valid only during `invokeFunction` — never stash it for async use. (implement.md)
+7. Scope follows state identity — no `Map<sessionId, …>` at `App` to fake per-session state. (design.md)
+8. Foundational layers never know upstream ones; business code never depends on the edge layer (`gateway`/`rpc`). (design.md)
+9. Throw coded errors; register codes centrally; branch on `code` across the wire, never `instanceof`. (errors.md)
+10. Gate unreleased behavior behind a flag contributed via `registerFlagDefinition` and resolved through `IFlagService.enabled(id)`; no ad-hoc env toggles. (flags.md)
+11. Tests resolve the SUT by interface; shared stubs live under `test/`, never `src/`. (test.md)
+12. Config is the preference registry: only preferences that are persistable, schema'd, and user/operator-facing go in `IConfigService`. Domain-specific config (including env-only operational toggles) goes through `registerConfigSection` + `envOverlay`. Facts → `IBootstrapService`, and host invocation arguments (CLI flags, host identity headers, prompt identity) → `BootstrapInput.args` / `IBootstrapService.args` — never new per-domain runtime-options services; domain runtime state (cron/flags/model) never goes onto `IBootstrapService`; session state → Session scope; constants → code. Business domains never call `IBootstrapService.getEnv()` directly. (config.md)

.agents/skills/agent-core-dev/align.md

@@ -0,0 +1,235 @@
+# Subskill — Align (port `agent-core` → `agent-core-v2`)
+
+Port business logic from `packages/agent-core` (v1) into `packages/agent-core-v2` (v2) by **splitting semantics, then fixing the domain, scope, Service, and dependency relationships**, and finally migrating the logic and tests.
+
+Use this when the task is "move feature X from v1 to v2", "port `IXxxService` to v2", or "align a v1 domain with the v2 architecture". It complements the stage files: orient / design / implement / test explain the *target* architecture; this file explains how to get there *from v1*.
+
+## The one-paragraph mental model
+
+v1 is a **VSCode-style singleton container**: services self-register with `registerSingleton`, resolve as singleton-per-container, and have no explicit lifetime tier — so a single `ISessionService` / `IToolService` tends to accumulate global, per-session, and per-agent state in one class. v2 is a **DI × Scope tree**: every service binds to one of `App` / `Session` / `Agent`, and a domain with state at several lifetimes is split into several Services. Porting is therefore **not** a file copy — it is "find each lifetime of state hiding in the v1 class, give each its own v2 Service at the right scope, then re-wire the dependencies".
+
+## v1 → v2 at a glance
+
+| Concern | v1 (`agent-core`) | v2 (`agent-core-v2`) |
+|---|---|---|
+| Registration | `registerSingleton(IX, X, InstantiationType.Delayed)` | `registerScopedService(LifecycleScope.X, IX, X, ScopeActivation.OnDemand, 'domain')` |
+| DI import | `from '../../di'` | `from '#/_base/di/scope'` / `'#/_base/di/instantiation'` / `'#/_base/di/lifecycle'` |
+| Lifetime | implicit singleton-per-container | explicit `LifecycleScope` (App/Workspace/Session/Agent) — see orient.md |
+| Domain granularity | coarse (`session`, `tool`, `loop`) | fine, split by scope + responsibility |
+| Test import | `from '@moonshot-ai/agent-core/di/test'` | `from '#/_base/di/test'` |
+| Resolve SUT in tests | `ix.createInstance(Impl)` (common) | `ix.get(IX)` by interface — see test.md |
+| Scope tests | none | `createScopedTestHost` — see test.md |
+| Errors | `from '../../errors'` (central `KimiError`, `ErrorCodes`) | `from '#/_base/errors'` + domain co-located `XxxError` — see errors.md |
+| Flags | `flags/` (process-global `FlagResolver`) | `flag/` (App-scope `IFlagService`) — see flags.md |
+| Permission | `agent/permission/` (hardcoded chain) | `permission*` (registry + composer) — see permission.md |
+
+## The align workflow
+
+```text
+Read v1 → Semantic split → Map domain → Assign scope → Shape Services
+        → Direct dependencies → Port logic → Port tests → Verify
+```
+
+Each step below states the goal and the concrete action, then points to the stage file that goes deeper. Do them in order; a later step often sends you back to an earlier one (a scope that does not fit means the semantic split was wrong).
+
+### 1. Read v1
+
+**Goal:** build an accurate inventory of what the v1 code actually owns. Read the v1 *source*, not v1 docs.
+
+Actions:
+
+- Locate the v1 entry: contract (`<domain>/<domain>.ts`) + impl (`<domain>/<domain>Service.ts`), plus any helpers under the same folder.
+- Inventory three things from the impl:
+  - **State** — every field / `Map` / cache the class holds. For each, note its *identity* (global? keyed by `sessionId`? by `agentId`?).
+  - **Behavior** — every public method; group them by which state they touch.
+  - **Dependencies** — every `@IFoo` constructor injection and every cross-domain relative import (`from '../<other>/...'`).
+- Note the v1 registration line (`registerSingleton(...)`) and any `services.set(IX, ...)` overrides at bootstrap (these reveal runtime static args or prebuilt instances the port must preserve).
+
+Do not start splitting yet — an accurate inventory prevents the common mistake of porting the class shape instead of the semantics.
+
+### 2. Semantic split
+
+**Goal:** break one v1 class into independent semantic units, each owning state at exactly one lifetime. This is the heart of the port.
+
+Method — for each piece of state from the inventory, ask:
+
+1. **What is it keyed by?** nothing → a global unit; `sessionId` → a per-session unit; `agentId` → a per-agent unit.
+2. **When should it die?** with the process / the session / the agent. State that must outlive its neighbors is a different unit.
+3. **Which methods touch only this state?** they travel with the unit.
+
+Worked example — v1 `ISessionService` (one class, ~600 lines) holds:
+
+- a global index of all sessions → **global** unit → v2 `sessionStore` (`ISessionStore`, App);
+- this session's metadata → **per-session** unit → v2 `sessionMetaStore` (`ISessionMetaStore`, Session);
+- this session's activity / status → **per-session** unit → v2 `sessionActivity`;
+- this session's context projection → **per-session** unit → v2 `sessionContext`;
+- child-agent lifecycle driven by a session → **per-session** unit → v2 `agentLifecycle`; create/close/archive/fork of the session itself → **per-workspace** unit → v2 `sessionLifecycle` (Workspace, one per live workspace handler).
+
+A v1 class that maps cleanly to one v1 decorator often becomes **three to five** v2 Services. That is expected and correct — do not try to keep the v1 class shape.
+
+Red lines:
+
+- If two pieces of state have different identities, they belong in different units — do not keep them together "because v1 did".
+- Do not split by method count or file aesthetics; split by state identity (design.md §3).
+- If a unit has no mutable state (pure behavior), defer its scope decision to step 4 (it is pulled down by its shortest-lived dependency).
+
+### 3. Map to v2 domain
+
+**Goal:** assign each semantic unit to a v2 domain — an existing one if it fits, a new one only if none does.
+
+Actions:
+
+- Search v2 `src/` for an existing domain that owns the same responsibility. Prefer joining an existing domain over creating a new one.
+- If creating a domain, name it after the responsibility (camelCase folder, e.g. `sessionActivity`), not after the v1 file.
+- Keep a domain's public surface to one contract file (`<domain>.ts`) plus its impl(s).
+
+Reference mapping (a **starting point**, not gospel — verify against the current v2 `src/`, which is the source of truth):
+
+| v1 location | v2 domain(s) |
+|---|---|
+| `services/session/`, `session/` | `session`, `sessionStore`, `sessionMetaStore`, `sessionActivity`, `sessionContext`, `agentLifecycle` |
+| `services/tool/`, `tools/`, `agent/tool/` | `toolRegistry`, `toolStore`, `toolExecutor`, `tooldedup`, `userTool` |
+| `loop/`, `agent/` (turn loop) | `loop`, `llmRequester`, `llmRequestLog`, `turn` |
+| `agent/context/`, `agent/compaction/` | `contextMemory`, `contextProjector`, `contextSize`, `fullCompaction`, `dynamicInjector` |
+| `agent/permission/` | `permission`, `permissionMode`, `permissionPolicy`, `permissionRules`, `approval`, `externalHooks` |
+| `agent/goal/`, `agent/plan/`, `agent/swarm/`, `agent/cron/`, `agent/background/` | `goal`, `plan`, `swarm`, `cron`, `background`, `subagentHost` |
+| `services/config/`, `agent/config/` | `config` |
+| `services/event/`, `base/common/event` | `event`, `eventBus` |
+| `services/logger/`, `logging/` | `log` |
+| `services/fileStore/` | `filestore`, `blobStore` |
+| `services/fs/`, `services/workspace/` | `fs`, `workspace` |
+| `services/auth/`, `services/oauth/` | `auth` |
+| `services/environment/` | `environment` |
+| `services/terminal/` | `terminal` |
+| `services/question/`, `services/approval/` | `question`, `approval` |
+| `services/prompt/`, `agent/injection/` | `prompt`, `dynamicInjector` |
+| `services/mcp/`, `mcp/` | `mcp` |
+| `plugin/`, `profile/`, `skill/` | `plugin`, `profile`, `skill` |
+| `rpc/`, `services/coreProcess/` | `rpc`, `gateway` |
+| `di/` | `_base/di` |
+| `errors/`, `errors.ts` | `_base/errors` + co-located domain errors |
+| `flags/` | `flag` |
+| `telemetry.ts` | `telemetry` |
+| `agent/records/` | (records split) — verify in v2 `src/` |
+
+When the table says "verify", or when v1 and v2 have diverged, **read the v2 `src/` tree and decide from the code** — do not invent a mapping.
+
+### 4. Assign scope
+
+For each semantic unit, fix its `LifecycleScope` from the identity you found in step 2. Follow design.md §2 verbatim:
+
+- global → `App`; per `sessionId` → `Session`; per `agentId` → `Agent`.
+- Stateless unit → default to `App`, pulled down only by a shorter-lived dependency.
+- Self-check: "when this scope is disposed, should this state disappear with it?"
+
+This is the decision v1 never had to make — get it right before writing any v2 code, because the scope is fixed at registration and changing it later ripples through every consumer.
+
+### 5. Shape Services
+
+Decide the Service shape per unit, following design.md §3:
+
+- A unit that owns **one instance's** state → a single per-instance Service (`ISessionXxx` / `IAgentXxx`).
+- A unit that owns a **global view plus per-instance** state → split into an `App` registry/factory (`XxxStore` / `XxxRegistry` / `XxxCatalog`) **and** a per-instance Service. The `App` half creates or locates the per-instance half.
+- Do not pre-split a unit that has state at only one lifetime.
+
+Most consumers inject the per-instance Service; inject the `App` factory only for genuine cross-instance management.
+
+### 6. Direct dependencies
+
+Re-wire the dependencies you inventoried in step 1, now across the new v2 Services. Follow design.md §4–§5:
+
+- **Calling style** — need a result / I orchestrate → direct call (`@IX` injection); stating a fact → event; ordered participation that may veto → hook.
+- **Scope direction** — a Service may inject only its own scope or an ancestor. If an `App` Service needs something from a `Session` Service, the dependency is backwards: re-scope or invert into an event.
+- **Domain direction** — foundational layers must not know upstream ones. A cycle means a v1 relative import is now pointing the wrong way; extract a third Service or invert the notification into an event.
+- **Durable facts** — state changes that must be recorded / replayed / projected across agents go on the wire (`wireRecord`), not a direct call alone.
+
+Run `lint:imports` (verify.md) as soon as the dependencies compile — it catches v1 imports and kosong boundary violations early.
+
+### 7. Port the business logic
+
+Move the behavior into the shaped v2 Services, applying the mechanical conversions below. Follow implement.md for the recipe.
+
+**Registration:**
+
+```ts
+// v1
+import { InstantiationType, registerSingleton } from '../../di';
+registerSingleton(IXxxService, XxxService, InstantiationType.Delayed);
+
+// v2
+import { LifecycleScope } from '#/app/scopes';
+import { ScopeActivation, registerScopedService } from '#/_base/di/scope';
+registerScopedService(LifecycleScope.Session, IXxxService, XxxService, ScopeActivation.OnDemand, 'xxx');
+```
+
+**Imports:**
+
+```ts
+// v1
+import { createDecorator, Disposable, IInstantiationService } from '../../di';
+import { KimiError, ErrorCodes } from '../../errors';
+
+// v2
+import { createDecorator, type ServiceIdentifier } from '#/_base/di/instantiation';
+import { Disposable } from '#/_base/di/lifecycle';
+import { IInstantiationService } from '#/_base/di/instantiation';
+import { KimiError, type ErrorCode } from '#/_base/errors';
+```
+
+**Constructor injection** — unchanged in shape (`@IX` on constructor params, service params after static params). Verify each dependency is resolvable from the new scope (step 6).
+
+**Errors** — move any shared error into a co-located `XxxError extends KimiError` with a registered `code` (errors.md). Do not keep throwing v1's central error codes from a v2 domain.
+
+**Flags** — replace any `FlagResolver` / env check with `IFlagService.enabled(id)`; contribute new flags from the owning domain's `flag.ts` via `registerFlagDefinition` (flags.md).
+
+**Events** — v1's `Emitter` / `Event` from `base/common/event` maps to v2's `event` / `eventBus` domains. Read existing v2 usage in neighboring domains and match it; do not import v1's `Emitter`.
+
+**Runtime static args / prebuilt instances** — if v1 bootstrap did `services.set(IX, new SyncDescriptor(C, [bag]))` or set a prebuilt instance, preserve that behavior at the v2 composition root (the scope that owns the Service). Do not silently drop it.
+
+Red lines:
+
+- Do not copy a v1 file and "fix imports". Re-split first (steps 2–6); a straight copy carries v1's implicit-singleton assumptions into v2 and creates the `Map<sessionId, …>`-at-`App` anti-pattern.
+- Do not leave v1 relative imports (`from '../x/...'`) in v2 — use the `#/...` alias.
+- Do not preserve a v1 behavior just because it exists; if the split reveals it was a workaround for the missing scope tree, drop it.
+
+### 8. Port the tests
+
+Convert v1 tests to the v2 harness, following test.md:
+
+```ts
+// v1
+import { TestInstantiationService } from '@moonshot-ai/agent-core/di/test';
+const svc = ix.createInstance(XxxService, 'static-arg');
+
+// v2
+import { createServices } from '#/_base/di/test';
+// in additionalServices:
+reg.define(IXxxService, XxxService);
+// in the test body:
+const svc = ix.get(IXxxService);
+```
+
+- Resolve the SUT by interface (`ix.get(IX)`), never `new` a `@IService`-carrying impl, and prefer `ix.get(IX)` over `ix.createInstance(Impl)`.
+- Move shared stubs into `test/<domain>/stubs.ts`; import by relative path, never `#/...`.
+- If the port introduced scope-layer behavior, add a `createScopedTestHost` test that asserts resolution from the correct scope (with `_clearScopedRegistryForTests()` + explicit re-registration in `beforeEach`).
+- Keep v1's behavioral assertions where they still describe observable behavior; delete assertions that only checked v1's internal class shape.
+
+## Migration checklist
+
+Before submitting a port:
+
+- [ ] Every piece of v1 state landed in a v2 Service whose scope matches its identity (no `Map<sessionId, …>` at `App`).
+- [ ] Each v1 dependency now points in the right scope direction; `lint:imports` passes.
+- [ ] Registrations use `registerScopedService` with an explicit scope and domain name; no `registerSingleton` remains.
+- [ ] Imports use the `#/...` alias; no v1 relative (`../../di`, `../../errors`) imports remain.
+- [ ] Errors are co-located coded errors; flags go through `IFlagService`.
+- [ ] Tests resolve the SUT by interface; scope behavior is asserted via `createScopedTestHost`; teardown goes through one `DisposableStore`.
+- [ ] v1 bootstrap overrides (`services.set(...)`) are preserved at the v2 composition root.
+
+## Red lines (this subskill)
+
+- Porting is semantic splitting, not file copying — never preserve a v1 class shape in v2.
+- Decide scope from state identity before writing v2 code; the scope is fixed at registration.
+- Verify the domain mapping against current v2 `src/`; the table here is a starting point, not authority.
+- One Service owns state at exactly one lifetime; split global-view + per-instance into registry + per-instance.
+- A dependency cycle introduced by the port means a v1 import is now backwards — refactor it; activation timing cannot break the cycle.

.agents/skills/agent-core-dev/close-vs-dispose.md

@@ -0,0 +1,155 @@
+# Topic — Close vs Dispose
+
+How to shut down a scoped service in `agent-core-v2`: when `dispose()` is enough, when to add an async `close()`, and where cancellation / abort belongs. Read this before putting business shutdown logic into a `Disposable`.
+
+## The one-sentence rule
+
+> **`close()` is async business shutdown; `dispose()` is synchronous resource cleanup.**
+
+`close()` finishes a domain's work: stop in-flight operations, apply shutdown policy, flush persistence, release async resources. `dispose()` releases object resources: event subscriptions, timers, hook registrations, and child disposables.
+
+## Why they must stay separate
+
+`IDisposable.dispose()` is synchronous:
+
+```ts
+export interface IDisposable {
+  dispose(): void;
+}
+```
+
+The container calls it during scope teardown. Disposal order is deterministic (orient.md): child scopes first, then reverse construction order within a scope. Nothing awaits a Promise returned from `dispose()`.
+
+Business shutdown is usually async. It may need to:
+
+- stop in-flight tasks and wait for settlement;
+- decide policy (`kill` vs `keepAliveOnExit` vs `markLost`);
+- flush write queues and persistence;
+- emit final records / events / telemetry;
+- close sockets, child processes, or external clients.
+
+If that logic lives in `dispose()`, it becomes fire-and-forget: the scope keeps tearing down, dependencies may be disposed immediately afterward, and the async continuation can run against a half-dead object graph.
+
+## What `close()` owns
+
+Add `close(): Promise<void>` when a service owns async shutdown work:
+
+```ts
+export interface IXxxService {
+  readonly _serviceBrand: undefined;
+  close(reason?: string): Promise<void>;
+}
+```
+
+A good `close()`:
+
+- is idempotent — repeated calls return the same Promise or no-op;
+- is called by lifecycle code **before** `scope.dispose()`;
+- rejects new work after it starts;
+- applies shutdown policy explicitly;
+- awaits the work it starts;
+- leaves `dispose()` with only synchronous cleanup.
+
+Sketch:
+
+```ts
+class XxxService extends Disposable implements IXxxService {
+  declare readonly _serviceBrand: undefined;
+  private closed = false;
+
+  async close(reason = 'scope closed'): Promise<void> {
+    if (this.closed) return;
+    this.closed = true;
+
+    await this.stopInFlightWork(reason);
+    await this.flushPersistence();
+  }
+
+  override dispose(): void {
+    this.closed = true;
+    // synchronous cleanup only: clear timers, remove listeners, release handles.
+    super.dispose();
+  }
+}
+```
+
+`flush()` is different from `close()`: `flush()` persists buffered state while the service stays open; `close()` is terminal.
+
+## What `dispose()` owns
+
+`dispose()` releases resources owned by the object instance:
+
+```ts
+class WSBroadcastService extends Disposable implements IWSBroadcastService {
+  declare readonly _serviceBrand: undefined;
+
+  constructor(@IEventService event: IEventService) {
+    super();
+    this._register(event.subscribe(() => { /* … */ }));
+  }
+}
+```
+
+Use `dispose()` to:
+
+- `_register(...)` event subscriptions and hook registrations;
+- clear timers;
+- remove signal listeners;
+- dispose child `IDisposable`s;
+- detach from synchronous handles.
+
+`dispose()` must be idempotent and should avoid throwing. If `close()` was already called, `dispose()` should be a no-op for business work and only clean resources.
+
+## Where abort / cancellation belongs
+
+Cancellation is not the same thing as graceful shutdown.
+
+For an operation-scoped object, a cancellation trigger can be disposed:
+
+```ts
+const tokenSource = new CancellationTokenSource();
+store.add(toDisposable(() => tokenSource.cancel()));
+```
+
+This is fine when the contract is **fire-and-forget cancel**: the operation observes the token and settles asynchronously; disposal does not wait for completion.
+
+For a manager/service that owns many tasks and their state, do not use `dispose()` as the graceful abort path. Expose `stop()` / `stopAll()` / `close()` and let lifecycle code await the one it needs.
+
+Background-specific rule: a `background`-style service may use `AbortController` internally to propagate cancellation to process / agent / question tasks, but manager shutdown belongs in `close()` or explicit `stopAll()`. `dispose()` may best-effort abort controllers only as a safety net; it must not be the mechanism that decides terminal status, persistence, or notifications.
+
+## Decision tree
+
+```text
+What does the service own?
+  │
+  ├─ only event subscriptions / timers / disposable handles?
+  │     └─ extend Disposable; no close() needed.
+  │
+  ├─ async work, in-flight tasks, persistence buffers, sockets, child processes?
+  │     └─ add close(): Promise<void>; call it before scope.dispose().
+  │
+  ├─ a single operation that callers may cancel?
+  │     └─ expose an AbortSignal / CancellationToken or a fire-and-forget cancel handle.
+  │
+  └─ both async shutdown and disposable resources?
+        └─ close() for business shutdown; dispose() for resource cleanup.
+```
+
+## VSCode parallel
+
+VSCode uses the same split:
+
+- `src/vs/base/common/lifecycle.ts` — `IDisposable.dispose(): void` for synchronous cleanup.
+- `src/vs/base/parts/storage/common/storage.ts` — `close(): Promise<void>` flushes and closes the database.
+- `src/vs/base/common/cancellation.ts` — `CancellationTokenSource.dispose(true)` / `cancelOnDispose()` cancels operation-scoped work without awaiting it.
+
+The lesson is not "never cancel in dispose". It is: **disposal may trigger cancellation for a scoped operation, but service shutdown policy stays in an explicit async close path.**
+
+## Red lines (this topic)
+
+- Do not put business shutdown in `dispose()` — `dispose()` is synchronous and is not awaited.
+- Do not `await` inside `dispose()`.
+- Do not rely on `dispose()` to flush persistence, emit final events, wait for tasks, or send notifications.
+- Add `close(): Promise<void>` for async shutdown and call it before `scope.dispose()`.
+- Keep `close()` and `dispose()` idempotent; `dispose()` after `close()` must be safe.
+- Use disposal as a cancellation trigger only for operation-scoped work, not as a manager/service shutdown policy.

.agents/skills/agent-core-dev/commit-align.md

@@ -0,0 +1,78 @@
+# Subskill — Commit align (triage a `main` commit against v2)
+
+Context: you are on the `kimi-code-v2` branch, in the phase of catching it up to **new commits that landed on `main`**. Those commits change `packages/agent-core` (v1); the job is to decide, for one commit at a time, whether v2 (`packages/agent-core-v2`) already has the corresponding logic — and if not, what the minimal fix is.
+
+Use this when the user hands you **one commit hash plus a short description** ("look at `<commit>` — it fixed the steering race"). It is the small, per-commit sibling of [align.md](align.md): `align.md` ports a whole v1 domain into v2; this file triages a single `main` commit and says *port / adapt / skip*. If the triage reveals a whole missing domain, stop and switch to [align.md](align.md).
+
+## The one-paragraph mental model
+
+A `main` commit edits v1's singleton-container code. The same behavior in v2 lives behind a scoped Service, so a commit lands in one of four buckets: **already-aligned** (v2 has it, possibly by construction), **partial** (v2 has a nearby version whose semantics drift), **missing** (v2 has nothing), or **not-applicable** (the v2 architecture removed the very problem the commit fixes). Your output is a bucket assignment plus evidence, then a fix sized to that bucket — never a blind port of the diff.
+
+## The workflow
+
+```text
+Read the commit + the user's note → Locate the v1 logic → Map to a v2 domain
+→ Check v2 for a corresponding implementation → Bucket it → Recommend a fix → Verify
+```
+
+### 1. Read the commit and the note
+
+**Goal:** know exactly what changed in v1 and *why*. The user's one-liner gives the intent; the diff gives the facts.
+
+Actions:
+
+- Inspect the change scoped to v1: `git show <commit> -- packages/agent-core` (and `--stat` first to see the blast radius).
+- From the diff, list: touched files, changed functions/methods, and the observable behavior delta (before → after).
+- Reconcile with the user's note: is this a bugfix, a semantic correction, new behavior, or a refactor? The *why* decides whether v2 even needs the change.
+
+Do not skim the user's sentence and guess — the diff is the spec for what "aligned" means here.
+
+### 2. Locate the v1 logic
+
+Pin the change to a v1 place: the contract (`<domain>/<domain>.ts`) + impl (`<domain>/<domain>Service.ts`), or the helper/handler the commit touched. Note which state it reads/writes and which other v1 services it calls — this is the same inventory as [align.md](align.md) §1, scoped to the commit's footprint.
+
+### 3. Map to a v2 domain
+
+Use the v1 → v2 domain table in [align.md](align.md) §3 as a starting point, then **verify against the current `packages/agent-core-v2/src/` tree** — it is the source of truth. Identify the candidate v2 Service(s) that would own this behavior, and their `LifecycleScope`.
+
+### 4. Check v2 and assign a bucket
+
+Search the candidate domain in v2 (Grep the method name, the state field, the error code). For each piece of the commit's behavior delta, decide:
+
+- **Already-aligned** — v2 produces the same observable result (sometimes for free, because the v2 design never had the bug). Cite the v2 file:line.
+- **Partial** — v2 has a near miss: same method, different guard/ordering/error; or the state lives at a different scope. Name the exact drift.
+- **Missing** — no v2 Service owns this behavior. Confirm it is a single-Service gap, not a whole-domain gap (latter → [align.md](align.md)).
+- **Not-applicable** — the v2 architecture removed the condition the commit fixes (e.g. the scope tree already serializes what v1 patched with a lock). Explain why, so a reviewer trusts the skip.
+
+Every claim needs a citation (`path:line`) on both sides; "I couldn't find it" is a finding only after you name where you looked.
+
+### 5. Recommend a fix (sized to the bucket)
+
+- **Already-aligned** — say so and stop; reference the v2 location. No code change.
+- **Partial** — propose the smallest edit that closes the drift: which Service, which method, which guard. Stay inside v2 rules — scope/domain direction, no `Map<sessionId, …>` at `App` (see [align.md](align.md) §6–§7 red lines).
+- **Missing** — sketch the port at commit granularity: target domain + scope, the Service/method to add or extend, the dependency direction, and which [align.md](align.md) §7 conversions apply (registration, `#/…` imports, co-located coded error, `IFlagService` for any gate). If it needs a new scope or a wire change, flag it.
+- **Not-applicable** — recommend no v2 change, but call out any test worth adding so the gap stays closed.
+
+Keep the recommendation to the commit's footprint. If it keeps growing, that is the signal to hand off to [align.md](align.md) for a full domain port.
+
+### 6. Verify
+
+Point at the checks that cover the fix, per [verify.md](verify.md): `lint:imports`, `typecheck`, and the relevant `test`. Note the expected outcome rather than asserting you ran it if you did not.
+
+## Output shape
+
+When triaging, answer in this order so the user can act on it directly:
+
+1. **Commit + intent** — one line restating what the commit changed and why (from the note + diff).
+2. **v1 location** — file(s) and the behavior delta.
+3. **v2 status** — one of the four buckets, with `path:line` evidence on both sides.
+4. **Recommendation** — the concrete fix (or the justified skip), scoped to the commit; name the target Service / scope / dependency direction.
+5. **Verify** — which checks should pass, and whether to escalate to [align.md](align.md).
+
+## Red lines (this subskill)
+
+- Read the diff and the note before judging v2; never infer "aligned" from the description alone.
+- Do not copy a v1 diff into v2. Decide the bucket first; a bugfix commit often maps to **not-applicable** because the v2 design already removed the defect.
+- Cite `path:line` on both sides. A recommendation without evidence is a guess.
+- Stay in the commit's footprint. Growing scope means "switch to [align.md](align.md)", not "keep porting here".
+- Do not break v2 invariants to chase v1 parity — scope direction, domain direction, and no `Map<sessionId, …>` at `App` still hold ([align.md](align.md) red lines).

.agents/skills/agent-core-dev/config.md

@@ -0,0 +1,312 @@
+# Topic — Config
+
+How the `config` domain works and how a domain owns its configuration section. Covers the section-registry model, the App vs Session split, the TOML on-disk format, and the recipe for adding or migrating a config section.
+
+The `config` domain is a thin registry + loader: it does **not** know the shape of any individual section. Each domain owns the schema (and, where needed, the TOML transform) for the config it consumes, contributes the section (statically at module load via `registerConfigSection`, or at runtime as a `ConfigSectionContribution` collection record), and reads it through `IConfigService`. There is no whole-config object passed around.
+
+## What belongs in Config
+
+`IConfigService` is the **preference registry**: it holds values a user or
+operator *chooses*, each with a schema and a default, that *can* be persisted to
+`config.toml`. It is not a grab-bag for every value a domain needs. Before
+registering a section, classify the value along three axes — **decision-maker**,
+**preference vs fact**, **mutability / persistence**:
+
+| Type | Decision-maker | Preference/Fact | Persisted? | Examples | Home |
+|---|---|---|---|---|---|
+| User preference | user | preference | ✅ config.toml | model, theme, log level | **Config** |
+| Operational override | operator/deployer | preference | ❌ env / flag | `KIMI_MODEL_*`, `KIMI_LOG_*` | **Config** (env overlay) |
+| Per-run intent | invoker | preference | ❌ ephemeral | CLI `--model`, `--config` | **Config** (Memory layer) |
+| Host fact | host | fact | ❌ | platform, CI, proxy, home dir | **Bootstrap** |
+| Derived convention | code | fact (derived) | ❌ | `configPath`, `logsDir` | **Bootstrap / code** |
+| Session runtime state | session/agent | state | ✅ session meta | active model, plan mode | **Session scope** |
+| Tuning constant | developer | preference | ❌ compile-time | retry backoffs, buffer sizes | **code** |
+
+A value belongs in Config **iff** it satisfies all of:
+
+1. **Preference** — a choice among valid values, not an observed fact.
+2. **Persistable** — it *can* be written to `config.toml`, even when a given
+   value arrives via env or CLI.
+3. **Schema + default** — registerable as a section with validation.
+4. **User- or operator-facing** — meaningful to set as a preference.
+
+If it fails any rule, it is not Config:
+
+- **Fact** (CI, platform, proxy, `HOME`) → a structured fact on
+  `IBootstrapService` (the startup snapshot), not Config.
+- **Derived convention** (`configPath`, `logsDir`) → `IBootstrapService` / code.
+- **Session runtime state** (active model, plan mode) → a Session-scoped
+  service in the owning domain (e.g. `IProfileService`), not `config`.
+- **Tuning constant** (retry config, buffer sizes) → domain code; promote to
+  Config only when it becomes user-tunable.
+
+**`IBootstrapService` is domain-agnostic.** It holds only generic facts shared by
+all domains — the env bag, resolved paths, and host facts (`platform`, `arch`,
+`cwd`, `osHomeDir`, `isCI`, …) — plus the host's process-level invocation
+arguments in `args` (explicit `agentFiles` / `skillDirs`, `requestHeaders`,
+prompt identity). `args` mirrors VS Code's `NativeParsedArgs` on the
+environment service: the host states them once via `BootstrapInput.args` at
+the composition root, and downstream services read them from
+`IBootstrapService.args` instead of through per-domain runtime-options
+services (do not add new `IXxxRuntimeOptions` services or seed functions for
+host parameters). What must **never** land on `IBootstrapService` is state
+tied to a specific upper domain (no `cron`, no `flags`, no feature-specific
+fields): that couples the foundational layer to an upstream one.
+
+Any value that belongs to a specific domain — including env-only operational
+toggles (`KIMI_CRON_*`, `KIMI_CODE_EXPERIMENTAL_*`), model parameters, or feature
+flags — goes through **Config registration**: the owning domain registers a
+section with a declarative `envBindings` map (and a `stripEnv` when the value must
+not be persisted) and reads it via `config.get(...)`. Each config value declares
+an optional env binding (`{ field: 'ENV_VAR' }`, with optional `parse`/`default`);
+IConfig resolves each field by `env > config.toml > default` automatically. This
+keeps every domain's config in one registry and keeps Bootstrap free of upstream
+knowledge.
+
+Operational env overrides and per-run intent live *inside* Config as layers over
+the same persistable key: `model` can be set in `config.toml`, via `KIMI_MODEL_*`,
+or via CLI `--model`. They are not separate abstractions — see "Reads vs writes"
+and "Layered resolution" below.
+
+Env access is encapsulated: business domains read `config.get(...)` or structured
+`IBootstrapService` facts; only the `config` domain reads the raw env bag (from
+`IBootstrapService`) to build its overlays. Business domains must not call
+`IBootstrapService.getEnv()` directly.
+
+## Layered resolution
+
+`IConfigService` resolves a key by precedence across layers, lowest to highest:
+
+```text
+Default   registered defaultValue (and code constants promoted to a section)
+   ↓
+User      config.toml (persisted user preferences)
+   ↓
+Operational env overlay (e.g. KIMI_MODEL_*, KIMI_CODE_EXPERIMENTAL_*)
+   ↓
+Memory    per-run intent (CLI flags); never persisted; highest
+```
+
+`set(domain, patch, target?)` writes the `User` layer (persisted) by default;
+pass `ConfigTarget.Memory` for a per-run override that is never written to disk.
+`inspect(domain)` reports the value at each layer.
+
+## Layout
+
+- `src/app/config/config.ts` — `IConfigRegistry` / `IConfigService` tokens, `ConfigSection`, `ConfigEffectiveOverlay`, event types.
+- `src/app/config/configService.ts` — `ConfigRegistry` + `ConfigService` impl; self-registers at App scope. The registry is also the fold of the `ConfigSectionContribution` collection: it drains the module-level contributions at construction, then refolds incrementally (`added` → `registerSection`, `removed` → `unregisterSection`).
+- `src/app/config/configSectionContributions.ts` — the `ConfigSectionContribution` collection token (the runtime channel: a unit contributes with `this.provide(ConfigSectionContribution, …)`) plus the module-level `registerConfigSection` collector (the static channel, import = register).
+- `src/app/config/configOverlayContributions.ts` — the module-level `registerConfigOverlay` collector for `ConfigEffectiveOverlay`s (drained at construction like the sections).
+- `src/app/config/toml.ts` — generic snake_case ↔ camelCase machinery plus the registry-aware `transformTomlData` / `applySectionToToml` entry points. Per-domain normalization lives in the section owner's `configSection.ts` (registered as `fromToml` / `toToml`); this module stays free of any other domain's semantics.
+- `src/kosong/model/thinking.ts` (owner domain, not `config`) — the `resolveThinkingEffort` helper and the authoritative `ThinkingConfig` type (the `thinking` section itself registers from `src/app/kosongConfig/configSection.ts`).
+- `src/app/config/configPure.ts` — `isPlainObject`, `deepMerge`, `omitUndefined`, `describeUnknownError`.
+
+A domain that owns a section keeps the schema in its own `configSection.ts` (e.g. `src/app/flag/flag.ts` for `experimental`, `src/agent/loop/configSection.ts` for `loopControl`). Exception: kosong-owned sections (`providers`, `models`, `thinking`) — kosong is a pure, persistence-free abstraction layer that defines only the types (`src/kosong/{provider,model}`); the section constants, the zod schemas (re-derived from those types and compile-time pinned via `AssertExact<Equal<z.infer<typeof Schema>, Type>>`, see `_base/utils/typeEquality.ts`), the registrations, env bindings, and TOML transforms all live in the persistence wrapper `src/app/kosongConfig/configSection.ts`. (`modelCatalog` has no kosong-side type at all — its section is fully self-contained in `app/kosongConfig`, types derived from the schema.) A cross-section env overlay (e.g. the `KIMI_MODEL_*` synthesis in `src/app/kosongConfig/envOverlay.ts`) lives in the wrapper too and is registered via module-level `registerConfigOverlay`. The session subagent domain owns two sections in `src/session/subagent/configSection.ts`: `[subagent]` (`timeout_ms` on disk) and `[secondary_model]` (`default_model` plus the `[secondary_model.models]` pool, with a lone legacy v1 `model` key honored as a fallback default below `default_model`); neither carries a cross-section overlay. Cross-field pool validation (default present / in-pool / every key resolvable) runs at session creation in `subagentModelsValidationService.ts`, not in the schema. The two-way sync between config sections and kosong's in-memory registries is owned by `IKosongConfigService` (`src/app/kosongConfig/kosongConfigService.ts`).
+
+## Scope
+
+- `IConfigRegistry` / `IConfigService` — **App** scope, process-global. One registry of sections; one loader reading `~/.kimi-code/config.toml` (path from `IBootstrapService.configPath`).
+
+All config reads go through `IConfigService` (global config). Per-session runtime state (active model, thinking level, etc.) lives in the owning Session-scoped service (e.g. `IProfileService`), not in `config`.
+
+## The section-registry model
+
+A config section is identified by a camelCase domain key (`'providers'`, `'thinking'`, `'loopControl'`). Each section has:
+
+- `schema?: ConfigSchema<T>` — zod schema used to validate the value (absent ⇒ passthrough).
+- `defaultValue?: T` — filled when the file has no value for the domain.
+- `merge?: ConfigMerge<T>` — how `set(domain, patch)` combines base + patch (default `deepMerge`).
+- `fromToml?: ConfigFromToml` — read-path transform (snake_case file value → in-memory shape). Defaults to a plain key-casing pass; owners register one when the on-disk shape needs custom normalization (record key preservation, nested object conversion, array entries, key renames, reshapes).
+- `toToml?: ConfigToToml` — write-path transform (in-memory value → snake_case file value). Defaults to a plain camelCase→snake_case key mapping.
+
+Two contribution channels:
+
+- **Static (import = register)** — the owning domain calls `registerConfigSection(domain, schema, options)` at the top level of its `configSection.ts`; `ConfigRegistry` drains the collected contributions when it is constructed. Every in-repo section uses this channel.
+- **Runtime (collection record)** — a unit contributes `this.provide(ConfigSectionContribution, { domain, schema, options })` (e.g. a feature assembled through `IFeatureManager`); the `ConfigRegistry` fold registers the section when the record lands and unregisters it when the record is withdrawn (provider disposed). User TOML values survive a withdrawal — they just stop being validated and effective.
+
+Ownership rules:
+
+- **One owner per section.** `registerSection` throws if a domain is registered twice — the static channel fails fast when `ConfigRegistry` drains it; a conflicting runtime record is reported through `onUnexpectedError` and the first registration wins (the fold is an event path and never throws).
+- **The domain that consumes a config owns its schema.** This is what keeps `config` from depending on its consumers: `config` must not import `externalHooks` / `permissionRules` / `provider` / `kosong` / etc. for a section's schema. If a schema needs a domain's types, the schema lives in that domain.
+- **Demand-driven.** Do not register sections for config that no domain reads yet; a section appears (with its schema in the owning domain) only when a consumer appears.
+
+## Env bindings
+
+A section can declare how its fields are read from environment variables, so the
+value resolves through `config.get(...)` rather than ad-hoc `process.env` reads.
+Declare the bindings with `envBindings(schema, { … })` — the field names are
+type-checked against the schema (no magic strings), and nested schemas recurse:
+
+```ts
+registerConfigSection('thinking', ThinkingConfigSchema, {
+  env: envBindings(ThinkingConfigSchema, {
+    effort: 'KIMI_MODEL_THINKING_EFFORT',
+  }),
+});
+
+// nested / record section — outer key is a runtime constant, inner fields are
+// checked against the value schema:
+registerConfigSection('providers', ProvidersSectionSchema, {
+  env: envBindings(ProvidersSectionSchema, {
+    [ENV_MODEL_PROVIDER_KEY]: envBindings(ProviderConfigSchema, {
+      apiKey: 'KIMI_MODEL_API_KEY',
+      type:   'KIMI_MODEL_PROVIDER_TYPE',
+      baseUrl:'KIMI_MODEL_BASE_URL',
+    }),
+  }),
+  stripEnv: stripProvidersEnv,
+});
+```
+
+Each field is an `EnvBinding` — a string (env var name) or
+`{ env, deprecatedEnv?, parse?, default? }`. IConfig resolves every field by
+`env > config.toml > default`, sets it on the effective value, and validates the
+section. Empty nested entries (no field resolved) are omitted, so a synthetic
+entry like `__kimi_env__` only appears when at least one of its env vars is set.
+When `deprecatedEnv` is set and `env` itself is absent or fails `parse`, the
+deprecated var still supplies the value and a warning diagnostic is reported —
+use it to rename an env var without breaking existing setups.
+
+`stripEnv(value, raw?, getEnv?)` removes env-derived fields before `set`/`replace`
+persists, so env overrides never leak into `config.toml`. `raw` is the section's
+env-free camelCase base (already `fromToml`-normalized), and `getEnv` reads the
+live env bag. For fields that are **both
+user-persistable and env-overridable**, register
+`stripEnv: stripEnvBoundFields(sectionEnvBindings)` (from `#/app/config/config`)
+— it derives the guard from the same bindings the read path uses: while a
+field's env var resolves to a value, writes restore the field's raw-base value
+(or drop it) instead of persisting an echoed env value; an env value that
+fails the binding's `parse` owns nothing, so writes pass through. Env-only
+fields/sections need no env check — strip them unconditionally (e.g. thinking's
+`forcedEffort`, cron's whole-section `() => undefined`).
+
+Business domains read `config.get('section')`; they never read env directly, and
+never write their own env-merge logic.
+
+## Add a config section (recipe)
+
+1. Define the schema in the owning domain, e.g. `src/<domain>/configSection.ts`:
+   ```ts
+   export const MY_SECTION = 'mySection';
+   export const MySectionSchema = z.object({ /* ... */ });
+   export type MySection = z.infer<typeof MySectionSchema>;
+   ```
+2. Register it at the top level of the same module (import = register):
+   ```ts
+   // src/<domain>/configSection.ts
+   import { registerConfigSection } from '#/app/config/configSectionContributions';
+
+   registerConfigSection(MY_SECTION, MySectionSchema, { defaultValue: {} });
+   ```
+   `ConfigRegistry` drains module-level contributions when it is constructed, so the section exists before any consumer resolves `IConfigService` — no owning Service needs to be constructed first. Make sure `src/index.ts` imports the leaf so the top-level call runs.
+3. (Runtime variant) a dynamically loaded unit (e.g. one assembled through `IFeatureManager`) contributes the section as a collection record instead:
+   ```ts
+   this.provide(ConfigSectionContribution, { domain: MY_SECTION, schema: MySectionSchema, options: { defaultValue: {} } });
+   ```
+   The `ConfigRegistry` fold registers it incrementally and unregisters it when the unit is retracted (user TOML values survive) — see "Late registration".
+4. Read it anywhere via `IConfigService`:
+   ```ts
+   constructor(@IConfigService private readonly config: IConfigService) {}
+   // ...
+   const value = this.config.get<MySection>(MY_SECTION);
+   ```
+5. React to edits by subscribing `IConfigService.onDidChange` and filtering on `e.domain === MY_SECTION` (see `FlagService`).
+6. Write it only through `IConfigService.set(domain, patch)` (merge) or `.replace(domain, value)` (wholesale). Never write `config.toml` directly.
+
+## Reads vs writes
+
+Data flow is one-way by default — reading config never touches the file:
+
+```text
+config.toml  ──load──▶  IConfigService.effective  ──get──▶  services read
+   ▲                                                          │
+   └────────  IConfigService.set/replace  ◀────  only on explicit writes
+```
+
+- **Read path** (startup, every service): `config.toml` is loaded into `IConfigService` once; services read via `get()`. This path **never writes the file**.
+- **Write path** (rare): `config.toml` is rewritten only when something explicitly calls `IConfigService.set/replace`. The only production writers today are provider CRUD (`ProviderService.set/delete`, e.g. provisioning a provider after OAuth login).
+
+**Runtime service state is not config.** Mutating a service at runtime does **not** rewrite `config.toml`:
+
+- `ProfileService.configure(...)` / `update(...)` / `setModel(...)` / `setThinking(...)` only change **in-memory** fields and append to the session **wireRecord** (for replay). They never call `IConfigService.set`.
+- Switching model or thinking level mid-session is session runtime state, not a config edit — the user's `config.toml` is left untouched.
+
+So `configure(...)` never overwrites the local file. Treat `config.toml` as the user's static config; runtime overrides live in memory and the session record.
+
+## Late registration
+
+`ConfigService` loads in its constructor (first `get(IConfigService)`). Static sections are drained before that, but a runtime-contributed section (a `ConfigSectionContribution` record) can register at any later moment. To keep validation and defaults correct:
+
+- `IConfigRegistry` emits `onDidRegisterSection` whenever a section is registered (and `onDidUnregisterSection` when a runtime record is withdrawn).
+- `ConfigService` subscribes and, on registration, re-validates the already-loaded raw value for that domain, applies the default if the raw value is absent, re-runs the env overlay, and fires `onDidChange` if the effective value changed. On unregistration it devalidates the domain — `get(domain)` falls back to the raw value.
+- Before a section is registered, `get(domain)` returns the raw (transformed, unvalidated) value; consumers that need validated values should read after the section lands, or react to `onDidChange`.
+
+This means registration order is never a correctness concern — you do not need an eager bootstrap.
+
+## TOML on-disk format
+
+`config.toml` stores keys in **snake_case**; in-memory values are **camelCase**. `ConfigService` converts both ways by dispatching to each section's registered transform:
+
+- **Read**: `transformTomlData(fileData, registry)` maps each top-level key to a domain and applies that domain's `fromToml` hook (or a plain key-casing pass when none is registered). Owner domains register their own normalization — e.g. provider `oauth`/`env`/`customHeaders`, permission `deny/allow/ask` → `rules`, `experimental` keys preserved verbatim. When a section registers after the initial load, `ConfigService` re-applies its `fromToml` against the preserved snake_case raw value (see "Late registration"), so registration order is never a correctness concern.
+- **Write**: `applySectionToToml(rawSnake, domain, value, registry)` applies the domain's `toToml` hook (or a plain camelCase→snake_case mapping) into a raw clone of the file, preserving unknown top-level keys and unknown sub-fields (lossless round-trip).
+
+`ConfigService` keeps four views:
+
+- `rawSnake` — snake_case clone of the file; the write base, never carries the env overlay.
+- `raw` — camelCase, env-free; the read/set/replace base.
+- `validated` — validated `raw`, env-free; the base every live env re-application starts from, so a degraded or removed env value falls back to the file instead of a stale overlay.
+- `effective` — `validated` plus the env overlay, recomputed on load/set; `get()`/`getAll()` re-apply the overlay on a fresh `validated` copy per read rather than caching it.
+
+### Renaming config keys and env vars (deprecations)
+
+Renames are declared once on the section, never hand-rolled in `fromToml`:
+
+```ts
+registerSection(MY_SECTION, MySectionSchema, {
+  deprecations: [{ key: 'old_key', replacement: 'new_key' }], // snake_case, on-disk
+  env: envBindings(MySectionSchema, {
+    newKey: { env: 'KIMI_NEW_KEY', deprecatedEnv: 'KIMI_OLD_KEY', parse },
+  }),
+});
+```
+
+- A deprecated TOML key is **ignored** (its value no longer applies — the schema only knows the new key) and reports a warning `ConfigDiagnostic` while present; the file is never rewritten, so the warning is the migration guide. Diagnostics are recomputed on every load/reload and surface to clients via `IConfigService.diagnostics()` and `onDidChangeDiagnostics` (kap-server republishes them as the global `event.config.warning` WS event).
+- A deprecated env var still **resolves** as a fallback (new var first), with the same warning treatment, and `stripEnvBoundFields` treats it as env-owned for writes.
+- See `src/agent/loop/configSection.ts` for a worked example (`max_retries_per_step` → `max_attempts_per_step`).
+
+### `KIMI_MODEL_*` env overlay
+
+When `KIMI_MODEL_NAME` is set, the `kosongConfig` wrapper's `kimiModelEnvOverlay` (`src/app/kosongConfig/envOverlay.ts`) injects a reserved model alias (`__kimi_env_model__`) into `effective`, points `defaultModel` at it, and merges the request `modelOverrides`; the reserved provider (`__kimi_env__`) comes from the `providers` section env bindings. The overlay is registered via module-level `registerConfigOverlay` and applied **only to `effective`**, never to `rawSnake`, so it is never persisted. Its `strip` (plus the providers section `stripEnv`) is the final guard so a caller that read `effective` (with the overlay) cannot write the reserved entries or the shell API key back to disk. `config` itself only runs registered overlays — it does not know the `KIMI_MODEL_*` semantics.
+
+## Owner-owned sections
+
+`config` holds no monolithic config schema and no whole-config object. Every section is owned by the domain that consumes it: the schema (and any `fromToml` / `toToml` normalization and `stripEnv`) lives in that domain's `configSection.ts`, and the domain contributes it via module-level `registerConfigSection` (or a runtime `ConfigSectionContribution` record). Cross-section env behavior (e.g. `KIMI_MODEL_*`) lives in an owner-registered `ConfigEffectiveOverlay` (module-level `registerConfigOverlay`). To add a section, follow "Add a config section" above in the owning domain — never add schema or normalization to `config` itself.
+
+## Ownership map (generated)
+
+The authoritative, always-current list of registered sections — rendered in the on-disk `config.toml` shape, with owner file, scope, defaults, env bindings, and schema fields — is generated from the live registry:
+
+- `packages/agent-core-v2/docs/config-manifest.toml` (checked in; do not edit by hand).
+- Regenerate with `pnpm --filter @moonshot-ai/agent-core-v2 gen:config-manifest` (add `--check` for a freshness check; `test/app/config/configManifest.test.ts` enforces it in CI).
+
+`config` must not import from any of these owner domains; that is the whole reason the schemas, TOML normalization, and env overlays live with their owners.
+
+## Scope & dependencies
+
+- `config` is a low-level capability: domains that own sections import `config` (for `IConfigRegistry` / `IConfigService`), never the reverse — section schemas live in the owning domain.
+- Cross-domain type sharing for a config type: prefer importing the type from the owning domain over re-declaring it (e.g. `plugin` imports `McpServerConfig` from the MCP config schema).
+- `IConfigRegistry` / `IConfigService` are **App**. Agent scope services may inject App services via ancestor lookup.
+- `config` never imports a higher domain and holds no section schemas of its own; if a section needs a type from another domain, that schema lives in that domain.
+
+## Red lines (this topic)
+
+- One owner per section: a duplicate static registration throws when `ConfigRegistry` drains it; a conflicting runtime record is logged (`onUnexpectedError`) and the first registration wins.
+- `config` never imports the domains that consume it — keep section schemas in the owning domain.
+- Config is the **preference registry**: register only values that are preferences, persistable, schema'd, and user/operator-facing. Facts → `IBootstrapService`; session state → Session scope; constants → code.
+- Business domains read `config.get(...)` or structured `IBootstrapService` facts; never call `IBootstrapService.getEnv()` directly — only `config` reads the raw env bag to build overlays.
+- Keep `IBootstrapService` domain-agnostic: host invocation arguments (CLI flags, host identity headers, prompt identity) go into `BootstrapInput.args` / `IBootstrapService.args` — never into new per-domain runtime-options services; domain runtime state (cron, flags, model params, …) never goes onto `IBootstrapService` at all. Domain-specific config goes through `registerConfigSection` + `envBindings`, read via `config.get(...)`.
+- Do not pass a whole config bag via options; read each section through `IConfigService`. There is no `KimiConfig` object — config is a registry of owner-owned sections.
+- `config.toml` is snake_case on disk, camelCase in memory — never write camelCase keys to disk, and never write to `config.toml` except through `IConfigService.set/replace`.
+- Reading config / calling `configure(...)` / switching model at runtime must not rewrite `config.toml`; runtime state lives in memory and the session wireRecord, not the file.
+- Never persist env overlays (`__kimi_env__` / `__kimi_env_model__` / shell API key / experimental env); overlays live only in `effective` / `Memory`.
+- Runtime contribution (a `ConfigSectionContribution` record from a unit at any scope) is fine — the late-registration mechanism keeps validation correct; the static channel needs no eager bootstrap (import = register, drained at `ConfigRegistry` construction).

.agents/skills/agent-core-dev/design.md

@@ -0,0 +1,289 @@
+# Stage 2 — Design a service
+
+Decide *where things live and who knows whom* before writing code. Every rule here derives from two questions:
+
+1. **What is the identity of the state it owns?** → decides the **Scope**.
+2. **Who owns the decision, and who needs the result?** → decides the **calling style** and **dependency direction**.
+
+## 1. What a Service is
+
+A Service = a bundle of **state** + a set of **behaviors**, bound to a **lifetime**.
+
+- **Behavior** is almost free — the same logic runs anywhere, so it does not by itself decide a scope.
+- **State** pins a Service to a scope. State has an **identity** (what it is keyed by) and a **lifetime** (when it is born, when it dies).
+- **Dependencies / calling style** answer a different question: who controls whom, and who knows whom.
+
+## 2. Choosing a scope
+
+> Scope = the identity + lifetime of the owned state.
+
+| Scope | State identity (keyed by) | Lifetime |
+|---|---|---|
+| `App` | none (single global instance) | the process |
+| `Workspace` | `workspaceId` | one workspace handler (materialized once per workspace, never closed — dies with the process) |
+| `Session` | `sessionId` | one session |
+| `Agent` | `agentId` | one agent |
+
+### Decision tree
+
+**Q1. Does it own mutable state?**
+
+- No (pure behavior) → jump to Q3.
+- Yes → Q2.
+
+**Q2. What is the identity of that state?**
+
+- one global instance → **`App`**
+- one per workspace (shared by every session of that workspace) → **`Workspace`**
+- one per session → **`Session`**
+- one per agent → **`Agent`**
+- a mix (a global registry *and* per-instance state) → **split it** (see §3).
+
+**Q3 (stateless). What is the shortest-lived dependency it must inject?**
+
+A stateless Service is pulled *down* by its shortest-lived dependency: if it injects an `Agent`-scoped Service, it cannot be `App`. Among the scopes that still satisfy every dependency, **default to the longest-lived one** (usually `App`) to maximize reuse. Push it down only when it must inject a shorter-lived Service, or when you want to limit its visibility.
+
+### The core anti-pattern (a litmus test)
+
+> **Do not store per-session state in a `Map<sessionId, …>` inside an `App` Service.**
+
+This is the tell-tale sign of "should have been `Session`-scoped but was parked at `App`". Consequences: nobody cleans the entry up when the session ends (leak); every consumer threads `sessionId` around (loss of type safety); it cannot inject `Session`/`Agent`-scoped collaborators.
+
+### One-sentence self-check
+
+> "When this scope is disposed, should this state disappear with it?"
+>
+> - Yes → the scope is right.
+> - It must outlive the scope → too short; move up one tier.
+> - It should be one-per-unit but is shared → too long; move down one tier.
+
+## Scope is not a domain
+
+Scope answers **lifetime and visibility**. Domain answers **responsibility and data ownership**. A Service registered at `Session` or `Agent` scope is not automatically part of the `session` or `agent` domain, and an entity Service must not be named `I{Scope}EntityService` just because its data is scoped that way.
+
+Use the data-ownership test and the `session` / `agent` / `turn` split conclusions in [domain-boundaries.md](domain-boundaries.md) before naming a Service or adding `I{Domain}EntityService`.
+
+## 3. Multi-Scope splitting
+
+> One Service owns state at exactly one identity / lifetime. If a domain owns state at several lifetimes, split it along those boundaries — one Service per lifetime.
+
+The standard split is "global registry / factory" + "per-instance":
+
+| Tier | Role | Naming tends to |
+|---|---|---|
+| `App` | global registry / catalog / factory — knows "all of them" and how to create one | `XxxStore` / `XxxRegistry` / `XxxCatalog` |
+| `Workspace` / `Session` / `Agent` | one instance — only the state of "this one" | `XxxService` / `IWorkspaceXxx` / `ISessionXxx` / `IAgentXxx` |
+
+Canonical splits in the codebase:
+
+- **`records`** — `ISessionStore` (`App`) + `ISessionMetaStore` (`Session`) + `IAgentRecords` (`Agent`).
+- **`config`** — `IConfigRegistry` / `IConfigService` (`App`).
+- **`kosong`** — `IProtocolHandlerRegistry` (`App`) + `IProviderManager` (`Session`). Generation is driven by `ILLMRequester` (`Agent`) in the `llmRequester` domain.
+- **`tool`** — `IToolDefinitionRegistry` (`App`) + `IToolService` (`Agent`).
+
+Split when the domain genuinely has both a global view and per-instance state. Do **not** split when state lives at only one lifetime (e.g. purely `App` like `log`; purely `Agent` like `prompt`). Do not pre-split for symmetry.
+
+After the split, the `App` Service usually plays the **factory**; most consumers inject the **per-instance** Service. Inject the `App` factory only when you genuinely need cross-instance management.
+
+## 4. Choosing a calling style
+
+Three mechanisms answer three different questions:
+
+| Mechanism | Nature | Coupling | Returns a value? | Consumers |
+|---|---|---|---|---|
+| **Direct call** | command: A tells B to do | A → B | yes | one (known) |
+| **Event** | fact: A announces "X happened" | both depend only on the bus | no | zero / one / many (unknown) |
+| **Hook** (`onWill` / `onDid`, `OrderedHookSlot`) | participation: observers step into an operation, in order | both depend only on the bus | can observe / veto | many, but ordered |
+
+### Decision tree
+
+**Q1. Does A need a return value from B?** → Yes: **direct call**. Events cannot return a value (request/reply over events is an anti-pattern).
+
+**Q2. Is B's reaction part of A's responsibility, or B's own concern?**
+
+- A's responsibility *includes* B's behavior (A orchestrates B) → **direct call**. E.g. `session` drives `agentLifecycle`; `loop` drives `llmRequester` / `toolExecutor`.
+- B's reaction is B's own concern, A merely states a fact → **event**. E.g. `flag` reacts to `config.onDidChange`.
+
+**Q3. How many consumers?**
+
+- exactly one, known → **direct call**.
+- zero / one / many, producer should not know → **event**.
+
+**Q4. Would a direct A→B call create a cycle or violate scope direction?** → A *consequence check*, not a primary reason. Decide by Q1–Q3 first; do not turn a genuine direct call into an event just to break a cycle.
+
+**Q5. Is this fact part of the durable record / replay / cross-agent projection?** → Yes: **emit it on the wire** (`wireRecord`). State changes that must be recorded, replayed, or synchronized across agents are projected onto the wire, not handled by a direct call alone (`permission.set_mode`, `goal.create/update/clear`, `plan_mode.enter/exit`). The wire is the *durable record*, not the live notification channel.
+
+### One-sentence rule
+
+> "I am telling you to do this, and I may need the result" → **direct call.**
+> "I am announcing that something happened; react if you care" → **event.**
+> "I am announcing something, and you may step in, in order, possibly to veto" → **hook.**
+
+### As extension points (open-closed)
+
+The three mechanisms above are also where a domain accepts new behavior without being edited. When adding a scenario would otherwise require changing this domain's `if/else`, expose the right extension point instead:
+
+| Need | Extension point | Typical scope |
+|---|---|---|
+| Register a new implementation / definition | a **registry / catalog** the domain queries | `App` |
+| React to a fact the domain announces | an **event** on the bus | the announcing scope |
+| Step into an operation in order / veto | a **hook** (`onWill`/`onDid`, `OrderedHookSlot`) | the owning scope |
+| Swap a backend (File ↔ DB ↔ S3) | a **Store / Storage token** at the byte layer (see persistence.md) | `App` (composition root) |
+
+The standard shape of a "registry / catalog the domain queries" row is an L3 contribution point: the target domain owns a `collection<T>` token, contributors call `this.provide(token, record)` from a unit, and a fold service in the target domain injects the `CollectionView` (incremental `onDidChange`; provider death withdraws the record). The four in-repo seams are `ConfigSectionContribution` → `ConfigRegistry`, `AgentToolContribution` → `AgentToolActivationService`, `AgentProfileContribution` → `IAgentProfileRegistry`, and `WireModelContribution` → `WireService` (file-level pointers: `packages/agent-core-v2/AGENTS.md` §Units and contribution points).
+
+Closed-for-modification means: the domain's own file is not where new scenarios branch. If a new scenario forces an edit here, an extension point is missing or misplaced.
+
+## 5. Dependency direction
+
+Two layers are involved:
+
+- **Scope direction**: short-lived → long-lived, **enforced by the container** (see orient.md).
+- **Domain direction**: which domain may depend on which — **a matter of judgment**, not enforced by the container.
+
+> **A depends on B iff A needs B's data or behavior to do its own job.**
+
+Add one anti-rot heuristic to keep the graph from collapsing into a clique:
+
+> **Do not let a more foundational / more-reused Service come to know a more specific / more-upstream one.**
+
+Once a foundational component knows about an upstream scenario, it can no longer be reused by other scenarios and will almost always create a cycle.
+
+### The boundaries of this repo
+
+`agent-core-v2` has no mechanical domain-layer numbering — dependency direction is the judgment rule above, applied per domain. What remains enforceable is a small set of specific boundaries (`lint:imports`, `scripts/check-import-boundaries.mjs`):
+
+- v2 never imports v1 (`@moonshot-ai/agent-core`).
+- The kosong subtree keeps its strict internal order (`contract ← protocol ← provider/model`, purity bans, the `provider/bases` registration boundary).
+
+Two standing red lines on top of that:
+
+- The **base substrate** (`_base`, errors, wire types) never depends on any business domain.
+- Business logic never depends on the **edge** (`gateway`, `rpc`, the `*Legacy` v1 adapters) — business code should not know REST / WebSocket exist.
+- A cycle means knowledge was placed backwards: extract a third, more foundational Service, or invert the "notification" half into an event.
+
+> Capability → orchestrator (e.g. `prompt → turn`) is allowed and present in this repo; the real red line is *inverted reuse* — a foundational / lower Service depending on a specific / upper one.
+
+> When a Service is meant to be reached over the wire (`/api/v2`, WS), see [edge-exposure.md](edge-exposure.md) for the per-scope `resource:action` map, which Services may be exposed directly vs wrapped in a facade, and how events stream.
+
+## 6. New-Service checklist
+
+1. **What does it remember, and what is the state's identity?** → pick the scope (§2).
+2. **What is the shortest-lived dependency it must inject?** → the scope cannot be longer than that.
+3. **Does it own state at both a global and a per-instance lifetime?** → if yes, split Multi-Scope (§3).
+4. **For each collaborator: am I commanding it, notifying it, or letting it participate?** → pick the calling style (§4).
+5. **Does each dependency arrow make a more foundational thing know a more specific thing?** → if yes, invert it (§5).
+
+## 7. Render the placement tree
+
+After the checklist, render the result as a plaintext tree — the deliverable reviewers read. Keep it in the design doc or PR description.
+
+```text
+domain: `<name>`   (owning scope: <Scope>)
+├─ serves (who uses me)              tag = HOW they reach me
+│   ├─ (inject)   <ConsumerDomain>   @<Scope>   — <what they use me for>
+│   └─ (accessor) <ConsumerDomain>   @<Scope>   — <what they use me for>
+├─ exposes (interfaces I provide, by scope)
+│   ├─ App       : <IXxxRegistry>   — <role>
+│   ├─ Workspace : <IWorkspaceXxx>  — <role>
+│   ├─ Session   : <ISessionXxx>    — <role>
+│   └─ Agent     : <IAgentXxx>      — <role>
+└─ depends (what I inject)           tag = calling style
+    └─ <DepDomain>  @<Scope>   direct/event/hook  — <what for>
+```
+
+Conventions:
+
+- List **only real interfaces**; write `—` for a scope with no exposed interface. Most domains are single-scope — do not invent symmetry.
+- On `depends`, tag each arrow with its calling style: `direct`, `event`, or `hook`.
+- On `serves`, tag each consumer with its **access mechanism**, grouped `inject` first then `accessor`:
+  - `inject` — a descendant or peer scope DI-injects me. Resolved by the container; lifetime-safe.
+  - `accessor` — an ancestor or edge scope borrows me through `IScopeHandle.accessor.get(...)`. Valid only while this scope lives; never cache the result; must run before the child scope is disposed. See the cross-scope borrow diagram below.
+- An empty `(inject)` group with a non-empty `(accessor)` group is a signal: the interface is currently an edge / lifecycle command surface — check it is not leaking internals.
+- A consumer is upstream of you. If you cannot name one business consumer, the domain may be dead or mis-scoped.
+
+### Cross-scope borrow diagram
+
+When a domain has `accessor` consumers, draw the reverse-direction borrow next to the tree so it is never mistaken for injection:
+
+```text
+App scope
+  <AncestorService> ──holds──► IScopeHandle(<id>)
+                                      │
+                                      │  accessor.get(<IMyService>)
+                                      │   └── resolve runs inside the child scope
+                                      ▼
+                                <Child> scope (<id>)
+                                  <MyService>  ← the interface lives here
+```
+
+Read it as:
+
+- `──holds──►` = the ancestor owns a handle to the child scope (it stores the key, not the service). DI allows this.
+- `accessor.get(...)` = a **runtime borrow**, not a dependency edge. It must cross an `IScopeHandle`, run on demand, never be cached, and finish before the child scope is disposed.
+
+Worked example — `sessionLifecycle`:
+
+```text
+domain: `sessionLifecycle`   (owning scope: Workspace)
+├─ serves (who uses me)
+│   ├─ (inject)   — (none)
+│   └─ (accessor)
+│       ├─ sessionLegacy     @App(edge)  — v1-compatible create/fork/archive/…
+│       └─ gateway / rpc     @App(edge)  — native v2 session lifecycle actions
+├─ exposes (interfaces I provide, by scope)
+│   ├─ Workspace : ISessionLifecycleService — owns this workspace's live session scope tree
+│   ├─ Session   : —                    — (per-session state lives in sessionMetadata / agentLifecycle / …)
+│   └─ Agent     : —                    — (per-agent state lives in agentLifecycle)
+└─ depends (what I inject)
+    ├─ workspaceContext  @Workspace  seed    — handler identity + persistence scope
+    ├─ bootstrap         @App        direct  — addresses session storage
+    ├─ hostEnvironment   @App        direct  — gates scope creation on the probe
+    ├─ sessionIndex      @App        direct  — persisted read model for cold resumes
+    ├─ storage           @App        direct  — atomic docs + append logs
+    ├─ workspaceDirs / workspaceSkillCatalog / workspaceMcp / …
+    │                    @Workspace  direct  — the handler's shared resource services
+    └─ event             @App        direct  — broadcasts session-level facts (e.g. archived)
+```
+
+Cross-scope borrow for `sessionLifecycle`:
+
+```text
+App scope
+  WorkspaceLifecycleService ──holds──► IScopeHandle(workspaceId)   (one per live handler)
+                                            │
+                                            │  accessor.get(ISessionLifecycleService)
+                                            │   └── resolve runs inside the Workspace scope
+                                            ▼
+                                      Workspace scope (workspaceId)
+                                        SessionLifecycleService ──holds──► IScopeHandle(sessionId)
+                                                                              │
+                                                                              │  accessor.get(ISessionMetadata) …
+                                                                              │   └── resolve runs inside the Session scope
+                                                                              ▼
+                                                                        Session scope (sessionId)
+                                                                          sessionMetadata / agentLifecycle / …  ← per-session services live here
+```
+
+How the three lenses shaped it:
+
+- **Scope (§2)** → the live registry of one workspace's session scopes is per-handler, so it is Workspace-scoped; the process-wide handler registry lives in the App-scoped `workspaceLifecycle`; per-session data stays in Session-scoped services, reached through the handle's `accessor`.
+- **Dependency direction (§5)** → `sessionLifecycle` is consumed by the edge via `accessor` borrows; it never imports the edge. Every downward arrow lands on a peer or a more foundational Service.
+- **Extension points (§4)** → new per-session behavior plugs into the Session-scoped services (`sessionMetadata`, `agentLifecycle`, `sessionActivity`); new transports stay at the edge. Neither edits `sessionLifecycle`.
+
+For a multi-scope split, the `exposes` block fills more than one scope — see the `records` pattern in §3.
+
+## Red lines (this stage)
+
+- Scope is not a domain; ownership follows write authority and invariants, not read consumption.
+- Do not create `I{Scope}EntityService` bundles (`IAgentEntityService`, `ISessionEntityService`) that re-merge multiple domains.
+- No `Map<sessionId, …>` at `App` to fake per-session state.
+- Scope follows state identity; stateless Services are pulled down by their shortest-lived dependency, otherwise default to `App`.
+- Do not pre-split a domain that has state at only one lifetime.
+- Need a result / I orchestrate → direct call; stating a fact → event; ordered participation / may veto → hook.
+- Foundational layers never know upstream ones; business code never depends on the edge layer.
+- A cycle means knowledge is placed backwards — refactor, do not route around it.
+- Render the placement tree with real interfaces only — never pad an empty scope for symmetry.
+- Tag `serves` consumers with `inject` / `accessor`; an empty `inject` group is a signal to check the interface is not leaking internals.
+- An `accessor` consumer is a runtime borrow across a scope boundary, not DI injection — never cache the result and finish before the child scope disposes.
+- A `serves` list with no business consumer (or only edge consumers) signals a dead or leaking interface.

.agents/skills/agent-core-dev/domain-boundaries.md

@@ -0,0 +1,203 @@
+# Topic — Domain boundaries vs Scope
+
+How to keep `agent-core-v2` from recreating a god object after splitting one. Read this before naming a Service, adding an `I{Domain}EntityService`, or deciding whether data belongs to `session`, `agent`, or `turn`.
+
+## The one-sentence rule
+
+> **Scope is a lifetime and visibility boundary; a domain is a responsibility and data-ownership boundary.**
+
+A Service registered at `LifecycleScope.Session` or `LifecycleScope.Agent` is **not automatically in the `session` or `agent` domain**. Scope says when an instance is born, when it dies, and who can see it. Domain says which business responsibility it owns and which data it is allowed to mutate.
+
+## Definitions
+
+| Term | Meaning |
+|---|---|
+| **Scope** | Lifetime / visibility tier. Current code registers Services at `App`, `Session`, or `Agent`. |
+| **Domain** | A cohesive business responsibility with its own model, invariants, and write authority. |
+| **Entity** | Data with identity and lifecycle, usually suitable for `get/list/create/update/delete` semantics. |
+| **Aggregate** | A consistency boundary: the owner that enforces invariants over a cluster of data. |
+| **Read model / projection** | Derived data built for queries; it may be shaped like a domain, but it is not the write authority. |
+| **Runtime state** | Ephemeral data that dies with its scope; it should not be forced into an entity store. |
+
+## The data-ownership test
+
+Do not ask "does Session / Agent / Turn use this data?". Most data is used by several of them. Ask these instead:
+
+1. **What is the data's identity?** `sessionId`, `agentId`, `turnId`, `taskId`, `workspaceId`, `providerName`, or something else?
+2. **Who is the only writer?** The writer is usually the owner. Readers and projectors are not owners.
+3. **Who enforces the invariants?** The domain that decides valid transitions owns the model.
+4. **What is the authoritative source?** Atomic document, append-log / event stream, blob, query projection, config, or runtime memory?
+5. **Can it be named without `Session` / `Agent` / `Turn`?** If yes, it probably deserves its own domain.
+
+Examples:
+
+- `PermissionRules` are Agent-scoped, but `permission` owns rule changes and evaluation.
+- `BackgroundTask` is spawned by an Agent, but `background` owns task state and output.
+- `ContextMessage` is consumed by the Agent loop, but `contextMemory` / `wireRecord` owns history and replay.
+- `SessionMeta` is about a Session, but it is owned by `sessionMetadata`, not by a broad `session` data bag.
+
+## Persistence models are not all entity CRUD
+
+Before introducing `I{Domain}EntityService`, classify the persistence model:
+
+| Persistence model | Use when | Examples |
+|---|---|---|
+| **Atomic document** | One typed document per key | `SessionMeta`, `config.toml` |
+| **Append-log / event-sourced** | The authoritative record is "what happened" | `wireRecord`, `contextMemory`, `goal`, `plan`, `permission` transitions |
+| **Blob / key-value** | Large or content-addressed bytes | media offload, blob store |
+| **Indexed query / read model** | Derived, queryable view | `sessionIndex`, future `IQueryStore` projections |
+| **Registry / catalog** | Global or scoped known items | `workspace`, `toolRegistry` |
+| **Ephemeral runtime state** | No durable entity | active turn handle, pending interactions, terminal handles |
+
+See [persistence.md](persistence.md) for the `Store → Storage → backend` rules. A domain EntityService is a business facade over those stores; it is not a replacement for the store layer.
+
+## Naming consequence
+
+Do not name Services after a scope or a god-object-shaped concept:
+
+- ❌ `IAgentEntityService`
+- ❌ `IAgentDataService`
+- ❌ `ISessionEntityService`
+- ❌ `ITurnEntityService` that bundles context, tools, permissions, and telemetry
+
+Name Services after the real owning domain:
+
+- ✅ `ISessionMetadata`
+- ✅ `ISessionIndex`
+- ✅ `IAgentLifecycleService`
+- ✅ `ITurnService`
+- ✅ `IBackgroundTaskEntityService`
+- ✅ `ICronTaskEntityService`
+- ✅ `IPermissionRulesService`
+
+`Session` and `Agent` are valid scope names. They are usually **not** good data-owner names.
+
+## Split conclusion — `session`
+
+`session` is both a Scope and a narrow Domain. Keep the Domain small.
+
+The `session` domain owns only Session-level identity, metadata, lifecycle commands, and Session-level read views:
+
+| Concern | Owner | Notes |
+|---|---|---|
+| `sessionId`, `workspaceId`, `sessionDir`, `metaScope` | `sessionContext` | Seeded facts; no IO |
+| `SessionMeta` | `sessionMetadata` | Durable atomic document; entity-like |
+| Open session scope registry | `sessionLifecycle` | Workspace-scope live handles, one registry per workspace handler (the process-wide handler registry is `workspaceLifecycle`); not the persisted entity table |
+| Session commands such as `archive()` | `session` | Orchestrates metadata, agent teardown, and events |
+| Persisted session list / get / count | `sessionIndex` | Backend-neutral read model |
+| Running / idle / awaiting status | `sessionActivity` | Derived from interactions and active turns; owns no state |
+
+`session` must not reabsorb these:
+
+| Data | Real owner |
+|---|---|
+| Agent instances / handles | `agentLifecycle` |
+| Turns | `turn` |
+| Context messages | `contextMemory` / `wireRecord` |
+| Tool state | `toolStore` / `tool` |
+| Permission rules / mode | `permission` |
+| Profile / model | `profile` |
+| Goal / Plan | `goal` / `plan` |
+| Background tasks | `background` |
+| Cron tasks | `cron` |
+| Pending approvals / questions | `interaction` / `approval` / `question` |
+| Workspace | `workspace` |
+| Provider / config | `provider` / `config` |
+
+Entity-service conclusion for `session`:
+
+- ✅ `ISessionMetadata` is already an entity-document Service.
+- ✅ `ISessionIndex` is a query/read-model Service.
+- ❌ Do not create a broad `ISessionEntityService` that owns agents, turns, records, interactions, logs, workspace, and config.
+
+## Split conclusion — `agent`
+
+`agent` is primarily a Scope and composition boundary, not a large data Domain.
+
+Strictly, the `agent` domain owns only Agent-instance concerns:
+
+| Concern | Owner | Notes |
+|---|---|---|
+| Agent instance identity / handle | `agentLifecycle` | Owns live Agent scope handles |
+| Agent creation / removal | `agentLifecycle` | Lifecycle, not a data bag |
+| Parent / child relationship | `session` / `agentLifecycle` depending on current code | Do not duplicate it into a new Agent data service |
+| Active turn reference | `turn` | Turn is its own domain even though it is Agent-scoped |
+
+Many Agent-scoped Services are **not** in the `agent` domain:
+
+| Data / capability | Real owner | Persistence model |
+|---|---|---|
+| Wire records | `wireRecord` | Append-log |
+| Context messages | `contextMemory` | Event-sourced through `wireRecord` |
+| Profile / model config | `profile` | Config + wire records |
+| Tool definitions / registry | `toolRegistry` | Runtime registry |
+| Tool mutable state | `toolStore` | Wire records |
+| Permission mode / rules | `permissionMode` / `permissionRules` | Wire records + config |
+| Goal | `goal` | Wire records |
+| Plan | `plan` | Wire records + plan file |
+| Skill activation | `skill` | Wire records |
+| Background tasks | `background` | Task records / output logs, candidate for entity service |
+| Cron tasks | `cron` | Task records, candidate for entity service |
+
+Entity-service conclusion for `agent`:
+
+- ✅ Keep `IAgentLifecycleService` for Agent instance lifecycle.
+- ✅ If a persisted Agent identity registry is ever needed, name it after that narrow concern, e.g. `IAgentInstanceRegistry`.
+- ❌ Do not create `IAgentEntityService` or `IAgentDataService` that bundles profile, records, tools, permission, goal, plan, background, cron, and turn.
+
+## Split conclusion — `turn`
+
+`turn` is a Domain, but it is **not** currently a separate `LifecycleScope` in code; `ITurnService` is registered at `Agent` scope.
+
+`turn` owns one execution round's runtime state and turn-level facts:
+
+| Concern | Owner | Notes |
+|---|---|---|
+| Active `Turn` handle | `turn` | `id`, `abortController`, `ready`, `result` |
+| Turn id allocation | `turn` | Restored from `turn.prompt` records and `context.append_loop_event` turn ids |
+| Turn lifecycle hooks | `turn` | `onLaunched`, `onEnded`, `beforeStep`, `afterStep` |
+| `turn.started` / `turn.ended` live events | `turn` | Live event stream |
+
+`turn` must not own these:
+
+| Data / capability | Real owner |
+|---|---|
+| Prompt and context messages | `contextMemory` |
+| Append-only record log mechanics | `wireRecord` |
+| Step loop | `loop` |
+| Tool execution | `toolExecutor` / `tool` |
+| Permission decisions | `permission` |
+| External hook policy | `externalHooks` |
+| Telemetry pipeline | `telemetry` |
+| Event transport | `eventSink` |
+
+Entity-service conclusion for `turn`:
+
+- ✅ Keep `ITurnService` as a runtime orchestrator.
+- ✅ Add a Turn read model / projection only if history queries are needed.
+- ❌ Do not create `ITurnEntityService` with `create/update/delete/list` over a turn table as the authoritative model.
+
+## Migration recipe
+
+When moving data out of a v1 god object or reviewing a proposed EntityService:
+
+1. **Name the data without using `Session`, `Agent`, or `Turn`.** If you cannot, the domain is probably unclear.
+2. **Find the writer.** The exclusive writer is the likely owner.
+3. **Find the invariant.** The Service that rejects invalid transitions owns the model.
+4. **Classify the persistence model.** Atomic document, append-log, blob, query projection, registry, or runtime-only.
+5. **Pick the Service shape.**
+   - Entity document / record → `I{Domain}EntityService` or domain-specific CRUD Service.
+   - Event-sourced → behavior Service + `wireRecord` record types + optional projection.
+   - Derived query → read-model Service, not a write authority.
+   - Runtime-only → scoped Service with no entity store.
+6. **Choose the Scope by state identity.** Scope follows what the state is keyed by; it does not decide the domain name.
+7. **Render the placement tree** from [design.md §7](design.md#7-render-the-placement-tree).
+
+## Red lines (this topic)
+
+- Scope is not a domain. `Session` / `Agent` scopes do not make data `session` / `agent` owned.
+- Ownership follows write authority and invariants, not read consumption.
+- Do not create `I{Scope}EntityService` bundles (`IAgentEntityService`, `ISessionEntityService`, `ITurnEntityService`) that re-merge multiple domains.
+- Event-sourced domains keep behavior Services and append-log records; do not replace them with arbitrary CRUD.
+- Read models may be shaped like a domain, but they are projections, not write authorities.
+- A dependency is not ownership. A Service may inject another domain without owning that domain's data.

.agents/skills/agent-core-dev/edge-exposure.md

@@ -0,0 +1,183 @@
+# Edge exposure — `resource:action` + WS events
+
+How a domain's Services become the wire surface (`/api/v2`) and WebSocket events. This is a **design-time** decision: which Services are exposed, under what public `resource:action` name, and which events stream.
+
+The transport (`/api/v2` over HTTP + WS) lives in the **edge** layer (`gateway`/`rpc`/`transport`). It borrows business Services by interface; business code never imports it.
+
+## 1. The edge model
+
+Four scopes, four URL shapes, one dispatcher:
+
+```text
+GET|POST /api/v2/:sa                                       Core
+GET|POST /api/v2/workspace/:workspace_id/:sa               Workspace
+GET|POST /api/v2/session/:session_id/:sa                   Session
+GET|POST /api/v2/session/:session_id/agent/:agent_id/:sa   Agent
+```
+
+`:sa` is a single path segment of the form `<resource>:<action>` (e.g.
+`sessions:list`, `session:read`, `profile:getModel`).
+
+- `:resource` is a **public** name (`sessions`, `session`, `profile`), never an internal domain token (`ISessionMetadata`).
+- `:action` is the method. `GET` for reads, `POST` for writes.
+- Body = the method's single argument (JSON), omitted for no-arg.
+- Response = the project envelope `{ code, msg, data, request_id, details? }`.
+- The dispatcher resolves the **scope** from the URL, the **Service** from an `actionMap`, calls the method, wraps the result.
+
+```ts
+// actionMap — the allowlist; hides internal domain names.
+const actionMap = {
+  core:      { 'sessions:list': { service: ISessionIndex, method: 'list' }, ... },
+  workspace: { 'skills:list':   { service: IWorkspaceSkillCatalog, method: 'list' }, ... },
+  session:   { 'session:read':  { service: ISessionMetadata, method: 'read' }, ... },
+  agent:     { 'profile:getModel': { service: IProfileService, method: 'getModel' }, ... },
+};
+```
+
+The `actionMap` is the single allowlist: only mapped `resource:action` pairs are callable; unknown → `40001`.
+
+## 2. What may be exposed directly
+
+A Service method is directly exposable iff **all** hold:
+
+1. Args are JSON-serializable (no live objects, `AbortSignal`, callbacks, resumer fns).
+2. Return is JSON-serializable data or `void` (no `IScopeHandle`, `Turn`, `IProcess`, `AsyncIterable`, `IDisposable`, `Event`).
+3. Errors are `KimiError` (coded).
+4. It is a command/query, not a factory, stream, byte-store, or sink.
+
+If any fail → add a wire-safe orchestration method to the owning domain Service (e.g. `IAgentPromptService.submit` settles `{turn_id}` instead of returning the live `PromptHandle`) or compose several domain Services at the edge — kap-server's `routes/prompts.ts` is the reference for edge-side composition.
+
+## 3. Per-scope `resource:action` map
+
+Read = `GET`, write = `POST`. `sid` = `session_id`, `aid` = `agent_id`.
+
+### Core (`/api/v2/:resource:action`)
+
+| resource | action | Service.method | verb |
+|---|---|---|---|
+| `sessions` | `listRecent` | ISessionIndex.listRecent | GET |
+| `sessions` | `get` | ISessionIndex.get | GET |
+| `sessions` | `count` | ISessionIndex.count | GET |
+| `workspaces` | `list` | IWorkspaceService.list | GET |
+| `workspaces` | `get` | IWorkspaceService.get | GET |
+| `workspaces` | `createOrTouch` | IWorkspaceService.createOrTouch | POST |
+| `workspaces` | `update` | IWorkspaceService.update | POST |
+| `workspaces` | `delete` | IWorkspaceService.delete | POST |
+| `config` | `get` / `getAll` / `inspect` | IConfigService.* | GET |
+| `config` | `set` / `replace` / `reload` | IConfigService.* | POST |
+| `providers` | `list` / `get` | IProviderService.* | GET |
+| `providers` | `set` / `delete` | IProviderService.* | POST |
+| `oauth` | `startLogin` / `cancelLogin` / `logout` | IOAuthService.* | POST |
+| `oauth` | `getFlow` / `status` | IOAuthService.* | GET |
+| `auth` | `summarize` | IAuthSummaryService.summarize | GET |
+| `auth` | `ensureReady` | IAuthSummaryService.ensureReady | POST |
+| `flags` | `snapshot` / `enabled` / `explain` / `explainAll` | IFlagService.* | GET |
+| `fs` | `browse` / `home` | IHostFolderBrowser.* | GET |
+| `meta` | `getEnv` / `detect` | IBootstrapService.* | GET |
+
+### Session (`/api/v2/session/:sid/:resource:action`)
+
+| resource | action | Service.method | verb |
+|---|---|---|---|
+| `session` | `read` | ISessionMetadata.read | GET |
+| `session` | `update` | ISessionMetadata.update | POST |
+| `session` | `setTitle` | ISessionMetadata.setTitle | POST |
+| `session` | `setArchived` | ISessionMetadata.setArchived | POST |
+| `session` | `status` | ISessionActivity.status | GET |
+| `session` | `isIdle` | ISessionActivity.isIdle | GET |
+| `session` | `archive` | ISessionLifecycleService.archive | POST |
+| `approvals` | `listPending` | IApprovalService.listPending | GET |
+| `approvals` | `decide` | IApprovalService.decide | POST |
+| `questions` | `listPending` | IQuestionService.listPending | GET |
+| `questions` | `answer` | IQuestionService.answer | POST |
+| `interactions` | `listPending` | IInteractionService.listPending | GET |
+| `interactions` | `respond` | IInteractionService.respond | POST |
+| `workspace` | `workDir` / `additionalDirs` / `resolve` | ISessionWorkspaceContext.* | GET |
+
+### Agent (`/api/v2/session/:sid/agent/:aid/:resource:action`)
+
+| resource | action | Service.method | verb |
+|---|---|---|---|
+| `goal` | `get` | IGoalService.getGoal | GET |
+| `goal` | `create` / `pause` / `resume` / `cancel` | IGoalService.* | POST |
+| `plan` | `status` | IPlanService.status | GET |
+| `plan` | `enter` / `exit` / `cancel` / `clear` | IPlanService.* | POST |
+| `tasks` | `list` / `get` / `readOutput` | IBackgroundService.* | GET |
+| `tasks` | `stop` / `detach` | IBackgroundService.* | POST |
+| `usage` | `status` | IUsageService.status | GET |
+| `context` | `status` | IAgentTokenCountingService.get | GET |
+| `swarm` | `isActive` | ISwarmService.isActive | GET |
+| `swarm` | `enter` / `exit` | ISwarmService.* | POST |
+| `permission` | `getMode` | IPermissionModeService.mode | GET |
+| `permission` | `setMode` | IPermissionModeService.setMode | POST |
+| `permissionRules` | `list` | IPermissionRulesService.rules | GET |
+| `permissionRules` | `addRules` | IPermissionRulesService.addRules | POST |
+| `profile` | `get` / `getModel` / `getSystemPrompt` / `getActiveToolNames` | IProfileService.* | GET |
+| `profile` | `setModel` / `setThinking` | IProfileService.* | POST |
+| `messages` | `list` | IContextMemory.get | GET |
+| `messages` | `splice` | IContextMemory.splice | POST |
+| `toolStore` | `get` / `data` | IToolStoreService.* | GET |
+| `toolStore` | `set` | IToolStoreService.set | POST |
+| `mcp` | `list` | IMcpService.list | GET |
+| `mcp` | `reconnect` | IMcpService.reconnect | POST |
+| `tools` | `list` | IToolRegistry.list | GET |
+
+## 4. Facade-needed (wrap before exposing)
+
+These fail §2 and must be wrapped in a facade that takes ids and returns data:
+
+| Service | Why not direct | Facade shape |
+|---|---|---|
+| ISessionLifecycleService | returns `IScopeHandle` | `sessions.create` / `fork` / `close` / `archive` → wire Session |
+| IAgentPromptService / IAgentTurnService | returns `Turn` handle | `prompts.submit` / `steer` / `abort` / `undo` |
+| ILLMRequester | `AsyncIterable` stream | stream over WS, not RPC |
+| ISubagentHost | `SubagentHandle` | `subagents.spawn` / `resume` → info |
+| IProcessRunner | `IProcess` streams | terminal (separate WS protocol) |
+| Storage / Store (IFileSystemStorageService / IAppendLogStore / IAtomicDocumentStore / IBlobStore) | bytes / streams | not for RPC |
+| IAgentFileSystem | `withCwd` handle | `fs.read` / `write` → text/bytes |
+| IExternalHooksService | server-side outbound | not exposed |
+| IWireRecord | write-ahead log | internal |
+
+## 5. WS events
+
+A single WebSocket endpoint multiplexes RPC `call`s and event `listen`s over a JSON protocol (the lean counterpart of VSCode's `IMessagePassingProtocol`, carrying the same safety features — see §6):
+
+```text
+WS /api/v2/ws
+```
+
+Client → server: `hello` (auth), `call` (scope + `resource:action` + arg), `cancel`, `listen` (scope + event), `unlisten`, `pong`.
+Server → client: `ready`, `result`, `error`, `event`, `ping`.
+
+`call` reuses the same dispatcher as the HTTP routes (scope + `actionMap`). `listen` subscribes to an `Event<T>` source and forwards each emission as an `event` message, keyed by the client-chosen `id`.
+
+The `eventMap` binds a public event name to the scope's `Event` source (analogous to the `actionMap`):
+
+| Scope | event | Source |
+|---|---|---|
+| Core | `events` | `IEventService.subscribe` (process-wide `DomainEvent` bus) |
+| Agent | `events` | `IEventSink.on` (per-agent `AgentEvent` stream) |
+
+Session-level `onDidChange` sources (metadata / interactions) carry no payload today, so they are not exposed until there is a concrete consumer.
+
+Safety / reliability (carried over from `packages/server/src/ws/connection.ts` and VSCode's `ChannelServer`):
+
+- request ids + active-request table — `cancel` / `unlisten` disposes them;
+- heartbeat — `ping` every 30s, `pong` timeout 10s → `terminate`;
+- schema validation — invalid frames are dropped, not fatal;
+- graceful close — dispose listeners, cancel pending, reject in-flight calls;
+- no stack traces over the wire;
+- non-serializable event payloads are dropped, never fatal.
+
+Cursor / replay / resync for events is a future addition (a separate `call` before `listen`); the raw stream is the foundation.
+
+## 6. Red lines (edge exposure)
+
+- Never expose an internal domain token (`ISessionMetadata`) as a URL segment — use a public `resource` name + `action`.
+- Never expose a method that returns a handle / stream / bytes / disposable — wrap in a facade.
+- Never expose a method that takes a live object / `AbortSignal` / callback / resumer fn — wrap in a facade.
+- Session / Agent Services are reached by `accessor.get` with the id from the URL — never cache the result; finish before the scope disposes.
+- The `actionMap` is the allowlist — only mapped `resource:action` pairs are callable; unknown → `40001`.
+- Events stream over WS (`listen`), never RPC (`call`).
+- Business code never imports the edge (`gateway` / `rpc` / `transport`) — the edge borrows business Services by interface.
+- Read = `GET`, write = `POST`; do not overload `POST` for reads when caching / browser-friendliness matters.

.agents/skills/agent-core-dev/errors.md

@@ -0,0 +1,40 @@
+# Topic — Errors
+
+Error infrastructure for agent-core-v2: base classes, the per-domain code contract, wire serialization, and the conventions domains follow when raising errors. The package-level reference is `packages/agent-core-v2/docs/errors.md`; this topic summarizes the hot-path rules.
+
+Base classes and serialization are **centralized** in `_base/errors`; error **codes** are **decentralized** — each domain owns an `errors.ts` that self-registers its codes and metadata, and the `src/errors.ts` facade aggregates them into the unified `ErrorCodes` const.
+
+## Where things live
+
+- `src/_base/errors/errors.ts`: base classes — `Error2`, `ExpectedError`, `ErrorNoTelemetry`, `BugIndicatingError`, `NotImplementedError`, plus `isError2` and `unwrapErrorCause`.
+- `src/_base/errors/codes.ts`: the `ErrorDomain` contract, the registry (`registerErrorDomain` / `errorInfo` / `isErrorCode`), and `CoreErrors` (`internal`, `not_implemented`). The `ErrorCode` union type is derived by `#/errors` from the aggregated domain definitions.
+- `src/_base/errors/serialize.ts`: `ErrorPayload`, `isCodedError`, `toErrorPayload`, `fromErrorPayload`. Wire-facing names (`KimiErrorPayload`, `toKimiErrorPayload`) mirror the protocol and are kept as-is.
+- `src/_base/errors/unexpectedError.ts`: `onUnexpectedError` / `setUnexpectedErrorHandler` (global handler).
+- `src/<domain>/errors.ts`: the domain's `XxxErrors` descriptor (codes + retryable list + per-code info overrides), self-registered on import.
+- `src/errors.ts`: the **facade** — imports every domain's `errors.ts`, builds `ErrorCodes`, re-exports the primitives. Throw sites import from here.
+
+## Conventions (hard rules)
+
+- **Throw a coded error, not a bare string.** `throw new Error2(ErrorCodes.X, …)`. Bare `new Error` only for unreachable guards; `BugIndicatingError` for caller bugs; `NotImplementedError('feature')` for stubs.
+- **Define codes in the owning domain**, in `<domain>/errors.ts` as an `XxxErrors` descriptor (`satisfies ErrorDomain` + `registerErrorDomain`), then wire it into the facade. Never add domain codes to `_base/errors`.
+- **One `code` per failure mode.** Codes read `domain.reason`. The valid code strings are derived from the aggregated domain definitions (`ErrorCode` in `#/errors` is computed from the `ErrorCodes` aggregate): **add new codes to the owning domain's `errors.ts`** — registration throws on cross-domain collisions. Renaming/removing a code is a major.
+- **Translate foreign errors at the boundary.** Provider/HTTP, fs, MCP errors are re-thrown as the owning domain's coded error. `_base/errors` never imports a business domain.
+- **Translation is idempotent and cause-preserving.** Translators (`toHostFsError`, `toStorageIoError`) pass through an already-translated error and always keep the original as `cause`.
+- **`details` is structured and JSON-serializable; `message` is a short human sentence.** Paths/errnos/scope/key go into `details`, not the message.
+- **Cancellation passes through untranslated** (`UserCancellationError` from `_base/utils/abort`) — apply only at boundaries that can actually see cancellation; do not sprinkle the check everywhere.
+- **Classify wrapped errors via `unwrapErrorCause`** — errno/status predicates test the unwrapped cause, not the coded wrapper.
+- **Branch on `code`, never `instanceof`, across the wire.** In-process, `instanceof Error2` / `isCodedError` are fine.
+
+## Reference tiers
+
+- `os.fs` — `HostFsError` via `toHostFsError` (`os/interface/hostFsErrors.ts`): errno → `os.fs.*`, details `{ path, op, errno?, syscall? }`.
+- `os.process` — `HostProcessError`: `spawn_failed` / `kill_failed`, raw error as `cause`.
+- `storage` — `StorageError` (`persistence/interface/storage.ts`): `not_found` / `decode_failed` / `corrupted` / `io_failed` (retryable) / `locked` (retryable). ENOENT keeps absence semantics, never an error. A locked query store throws `storage.locked`; consumers catch it explicitly and fall back — no silent no-op degradation.
+- `wire` — `WireError` (`wire/errors.ts`): `DuplicateOpError`, `CycleError`, and `wire.unknown_record` (replay skips unknown records, reports via `onUnexpectedError`, returns `{ unknownRecords }`).
+
+## Red lines (this topic)
+
+- Throw a coded error with a `code`, not a bare string (except unreachable guards / `BugIndicatingError` / `NotImplementedError`).
+- Codes live in the owning domain's `errors.ts` and self-register; new codes land in the owning domain first.
+- Translate foreign errors at the owning domain's boundary, idempotently, with `cause` and structured `details`; `_base/errors` never imports a business domain.
+- Branch on `code` across the wire, never `instanceof`.

.agents/skills/agent-core-dev/flags.md

@@ -0,0 +1,108 @@
+# Topic — Flags
+
+Experimental feature-flag gating for agent-core-v2 — an App-scope `IFlagService` resolver plus a writable `IFlagRegistry` catalog that domains contribute their flags to, backed by the `[experimental]` config section.
+
+Gate not-yet-public features behind `IFlagService.enabled(id)`, per the repository hard rule that unreleased behavior must be flag-gated. v1 was a process-global `FlagResolver` singleton over a central `FLAG_DEFINITIONS` array; v2 is a scoped DI service whose flag definitions are registered **decentrally** by each owning domain — there is no central catalog to edit.
+
+## Layout
+
+- `src/app/flag/flagRegistry.ts` — `IFlagRegistry` token + `FlagDefinitionInput` / `FlagId` / `FlagSurface` types + `registerFlagDefinition` / `getContributedFlags` (import-time contribution queue).
+- `src/app/flag/flagRegistryService.ts` — `FlagRegistryService` impl; in-memory catalog seeded from import-time contributions; App scope.
+- `src/app/flag/flag.ts` — `IFlagService` token + resolver types (`ExperimentalFlagMap`, `ExperimentalFlagConfig`, `ExperimentalFlagSource`, `ExperimentalFeatureState`) + `EXPERIMENTAL_SECTION` (`experimental`) / `ExperimentalConfigSchema` (zod) + the module-level `registerConfigSection(EXPERIMENTAL_SECTION, …)` call that owns the section.
+- `src/app/flag/flagService.ts` — `FlagService` impl + `MASTER_ENV` (`KIMI_CODE_EXPERIMENTAL_FLAG`); reads definitions from `IFlagRegistry` and overrides from `IConfigService`; self-registers at App scope.
+- `src/app/flag/index.ts` — **removed (no barrel)**; `src/index.ts` imports the `flag` leafs precisely instead (e.g. `import './app/flag/flagService'`).
+- `src/<domain>/flag.ts` — each domain that owns a flag declares it here and calls `registerFlagDefinition` at the module top level (e.g. `src/agent/toolSelect/flag.ts`). The directory already names the domain, so the file is just `flag.ts`.
+
+## Public surface
+
+- `IFlagService` (DI token, App scope): `enabled(id)`, `explain(id)`, `snapshot()`, `enabledIds()`, `explainAll()`, `setConfigOverrides(overrides)`, `registry`.
+- `IFlagRegistry` (DI token, App scope): `register(definition)`, `get(id)`, `list()` — writable catalog. `register` is the **runtime** path (tests, dynamic registration); `IFlagService.registry` exposes the same instance for hosts/UI to enumerate flags without resolving them.
+- `registerFlagDefinition(definition)` — the **import-time** path. Domains call this from their `flag.ts` top level; contributions are queued and drained by `FlagRegistryService` when it is instantiated.
+- `FlagService` / `FlagRegistryService`: exported for tests and hosts that construct them directly.
+
+## Resolution precedence
+
+Highest wins; env is read live on every call (nothing cached):
+
+1. Master env `KIMI_CODE_EXPERIMENTAL_FLAG` truthy → every flag on.
+2. Per-feature `def.env` (e.g. `KIMI_CODE_EXPERIMENTAL_MY_FEATURE`) → forces on/off.
+3. `[experimental]` config section per-flag override.
+4. Registry `default`.
+
+`explain(id)` returns the winning `source` (`master-env` | `env` | `config` | `default`) plus the effective `configValue`. `explain(id)` returns `undefined` (and `enabled(id)` returns `false`) for an id that no domain has registered.
+
+## Config integration
+
+- The flag domain owns the `[experimental]` section: `src/app/flag/flag.ts` registers it at module load via `registerConfigSection(EXPERIMENTAL_SECTION, ExperimentalConfigSchema, { fromToml, toToml })` (import = register, drained by `ConfigRegistry` at construction); `FlagService` reads overrides from `IConfigService`.
+- It subscribes `IConfigService.onDidChange` and refreshes overrides whenever the `experimental` domain changes, so config edits apply live.
+- `ConfigRegistry.registerSection` throws if a domain is registered twice — `experimental` is owned exclusively by the flag domain.
+- `setConfigOverrides(overrides)` is an imperative escape hatch for tests and hosts without an `IConfigService`; hosts on `IConfigService` should set the `[experimental]` section instead.
+
+Config shape:
+
+```toml
+[experimental]
+my_feature = false
+```
+
+Keys are intentionally loose (`z.record(z.string(), z.boolean())`), so obsolete flags stay inert config.
+
+## Add a flag
+
+Declare the definition in the owning domain's `flag.ts` and call `registerFlagDefinition` at the module top level. There is no central catalog to edit.
+
+`src/<domain>/flag.ts`:
+
+```ts
+import { type FlagDefinitionInput, registerFlagDefinition } from '#/app/flag/flagRegistry';
+
+export const myFeatureFlag: FlagDefinitionInput = {
+  id: 'my_feature',
+  title: 'My feature',
+  description: '...',
+  env: 'KIMI_CODE_EXPERIMENTAL_MY_FEATURE',
+  default: false,
+  surface: 'both',
+};
+
+registerFlagDefinition(myFeatureFlag);
+```
+
+Then ensure the package entry `src/index.ts` imports the flag leaf precisely so the top-level call runs at import time — there is no `src/<domain>/index.ts` barrel:
+
+```ts
+// src/index.ts
+import './<domain>/flag';
+```
+
+`src/index.ts` imports every domain's leaf files precisely (one line per leaf), so the contribution runs during bootstrap, before any scope is created — and therefore before any consumer resolves `IFlagService`.
+
+- `env` must start with `KIMI_CODE_EXPERIMENTAL_`, be unique, and not equal `KIMI_CODE_EXPERIMENTAL_FLAG`.
+- `id` must not be `flag`. A duplicate `id` throws when `FlagRegistryService` drains the contributions.
+- `FlagId` is `string`, not a literal union: with no central catalog there is nothing to derive it from, so `enabled()` has no compile-time typo-checking. Cover gated behavior with tests instead.
+- `surface`: `core` | `tui` | `both` (documentation/grouping only; not used in resolution).
+
+## Consume a flag
+
+Inject `IFlagService` and gate on it. It is resolvable from any scope (App ancestor):
+
+```ts
+constructor(@IFlagService private readonly flags: IFlagService) {}
+// ...
+if (!this.flags.enabled('my_feature')) return;
+```
+
+## Layering & scope
+
+- Domain `flag` imports only `config` downward.
+- It cannot live in `_base`: registering/reading the config section requires importing `config`, and `_base` is pure infrastructure that must not know any business domain.
+- Scope: `IFlagRegistry` and `IFlagService` are both `App`. Env + config are process-global inputs, so there is no per-session/agent state. Flag definitions are contributed at **import time** (top-level `registerFlagDefinition` calls), so they are queued before any scope is created and drained when `FlagRegistryService` is first instantiated — before `IFlagService` is first resolved.
+- Tests build `FlagService` + `FlagRegistryService` directly with a real `ConfigRegistry`/`ConfigService` and an injected env map, then `register` the flags they exercise.
+
+## Red lines (this topic)
+
+- Gate unreleased behavior behind a registered flag; no ad-hoc env toggles.
+- Contribute each flag from the **owning domain's** `flag.ts` (`src/<domain>/flag.ts`) via a top-level `registerFlagDefinition` call; there is no central catalog to edit. The directory names the domain, so the file is just `flag.ts`.
+- `env` must start with `KIMI_CODE_EXPERIMENTAL_`, be unique, and not equal `KIMI_CODE_EXPERIMENTAL_FLAG`; `id` must not be `flag`.
+- `FlagId` is `string` (decentralized registration) — do not reintroduce a central `FLAG_DEFINITIONS` array or a derived literal union.
+- `flag` lives at `App` scope — never in `_base`, never per-session.

.agents/skills/agent-core-dev/implement.md

@@ -0,0 +1,295 @@
+# Stage 3 — Implement
+
+Write the contract leaf, implementation leaf (with its registration), and the package-entry lines that load them. Each section below introduces one DI building block as you need it. Source lives in `src/_base/di/`.
+
+## Standard recipe for a new `IXxxService`
+
+1. **Contract leaf** — `src/<domain>/<domain>.ts`: interface (with `_serviceBrand`) + `createDecorator` identity.
+2. **Impl leaf** — `src/<domain>/<domain>Service.ts`: class with `@IX` constructor deps; top-level `registerScopedService(scope, IX, Impl, activation, '<domain>')`. The fourth argument is activation; the fifth is the domain.
+3. **Entry** — `src/index.ts`: load each leaf precisely — `export * from './<domain>/<domain>';` for the contract and `import './<domain>/<domain>Service';` for the impl (importing the impl runs the registration). **No `src/<domain>/index.ts` barrel.**
+4. **Tests** — see test.md.
+
+There is **no central wiring file**: bindings live in each domain's impl file and are collected through import side effects.
+
+## §1 Interface + identity (a global service, no deps)
+
+```ts
+// greet/greet.ts
+import { createDecorator, type ServiceIdentifier } from '#/_base/di/instantiation';
+
+export interface IGreeter {
+  readonly _serviceBrand: undefined;   // type marker: tells DI "this is a service"
+  hello(): string;
+}
+
+export const IGreeter: ServiceIdentifier<IGreeter> = createDecorator<IGreeter>('greeter');
+```
+
+`createDecorator(name)` produces a `ServiceIdentifier` that is three things at once: a runtime key, a parameter decorator, and a compile-time carrier of the `IGreeter` type.
+
+> **The identity name is globally unique.** `createDecorator` caches by `name`; two domains using the same string collide and share one identity.
+
+```ts
+// greet/greetService.ts
+import { LifecycleScope } from '#/app/scopes';
+import { registerScopedService, ScopeActivation } from '#/_base/di/scope';
+import { IGreeter } from './greet';
+
+export class Greeter implements IGreeter {
+  declare readonly _serviceBrand: undefined;   // mirrors the interface marker
+  hello(): string { return 'hi'; }
+}
+
+registerScopedService(
+  LifecycleScope.App,               // lifetime: process-wide
+  IGreeter,                          // identity
+  Greeter,                           // implementation
+  ScopeActivation.OnScopeCreated,   // construct when the App scope is created
+  'greet',                           // domain name (for diagnostics)
+);
+```
+
+The scope a class binds to is an **intrinsic property of the class**, decided at the registration point, not the call site.
+
+The impl's top-level `registerScopedService` runs as soon as the module is imported. There is no `greet/index.ts` barrel — instead, add the leafs to the package entry `src/index.ts`, one line per leaf:
+
+```ts
+// src/index.ts
+export * from './greet/greet';
+import './greet/greetService';   // this import runs registerScopedService
+```
+
+Anyone can now `accessor.get(IGreeter)` the single global instance.
+
+## §2 Constructor injection (your service uses others)
+
+```ts
+export class SessionMetadata extends Disposable implements ISessionMetadata {
+  declare readonly _serviceBrand: undefined;
+
+  constructor(
+    @ISessionContext private readonly ctx: ISessionContext,
+    @IAtomicDocumentStore private readonly store: IAtomicDocumentStore,
+    @ILogService private readonly log: ILogService,
+  ) {
+    super();
+  }
+}
+```
+
+`@ISessionContext` records "parameter 0 needs `ISessionContext`" on the class metadata; the container fills it when constructing.
+
+Three inviolable constraints:
+
+1. **Do not `new` a class with `@IService` deps** — `new` bypasses registration, scope, and the singleton cache. Inject with `@IX` or `accessor.get(IX)`.
+2. **`@IX` decorates constructor parameters only.** Decorating a field/method throws at runtime.
+3. **Parameter order depends on how the object is built** — for `createInstance` non-singletons, static params come first (see §7); for scoped services, `@IX` params are conventionally first and any static params need defaults. See service-authoring.md §constructor-conventions.
+
+Consumers resolve by interface and never import the impl class:
+
+```ts
+const meta = accessor.get(ISessionMetadata);   // type is ISessionMetadata
+```
+
+> If you need "a config" rather than "a service", model it as a service (e.g. `IConfigService`) and inject it. If you need a per-turn, parameterized, non-singleton object, see §7.
+
+## §3 Scoped registration (not global)
+
+Swap the `scope` argument to bind to a different tier. Use `ScopeActivation.OnDemand` when the service should be constructed only on its first `get()`:
+
+```ts
+registerScopedService(
+  LifecycleScope.Session,
+  ISessionMetadata,
+  SessionMetadata,
+  ScopeActivation.OnDemand,
+  'sessionMetadata',
+);
+```
+
+Remember the visibility rule from orient.md: a service may inject services from its own scope or any ancestor; never from a descendant.
+
+## §4 Releasing resources (`Disposable`)
+
+For a service that subscribes to events, starts timers, or holds handles:
+
+```ts
+import { Disposable } from '#/_base/di/lifecycle';
+
+export class WSBroadcastService extends Disposable implements IWSBroadcastService {
+  declare readonly _serviceBrand: undefined;
+
+  constructor(@IEventService event: IEventService) {
+    super();
+    this._register(event.subscribe(() => { /* … */ }));   // collect child resources
+  }
+}
+```
+
+- Extend `Disposable`, collect any `IDisposable` with `this._register(d)` (event subscriptions, `toDisposable(fn)`, etc.).
+- The container calls `dispose()` automatically when the service is torn down; child resources release in turn.
+- Disposal order is deterministic (orient.md): child scopes first; within a scope the Ledger (`src/_base/lifecycle/`) tears entries down in strict reverse registration order, serially — `Disposable` / `DisposableStore` delegate to it.
+- Extend `Service` (from `#/_base/di/service`) instead when the unit needs capability calls on `this` (`provide` / `effect` / `on` / `get` / `ref`) — e.g. contributing a record to a `collection` token. `Service` extends `Disposable` (so `_register` is unchanged) and adds the two-phase construction protocol: `provide` / `on` / `effect` calls inside the constructor are buffered and flushed by the kernel after `Reflect.construct`; `get` / `ref` throw inside the constructor — dependencies stay constructor parameters. A manually `new`ed `Service` has no capabilities: every capability call throws.
+
+## §5 Scope activation
+
+`ScopeActivation` is the only construction-timing choice for scoped services:
+
+```ts
+export enum ScopeActivation {
+  OnScopeCreated = 0,
+  OnDemand = 1,
+}
+```
+
+```ts
+// Default: construct the real instance while the App scope is created.
+registerScopedService(
+  LifecycleScope.App,
+  ILogService,
+  LogService,
+  ScopeActivation.OnScopeCreated,
+  'log',
+);
+
+// Construct the real instance on the first get(IScopeRegistry).
+registerScopedService(
+  LifecycleScope.App,
+  IScopeRegistry,
+  ScopeRegistry,
+  ScopeActivation.OnDemand,
+  'gateway',
+);
+```
+
+`ScopeActivation.OnScopeCreated` is the default fourth argument. Scope creation activates every registration using this mode, after constructing its dependencies. An eager constructor failure no longer fails scope creation: the unit lands in sticky `Failed` — scope creation succeeds, resolving the unit rethrows its error, and an explicit `update()` reloads it (see the bootstrap note below). Use it for ordinary services and for constructor side effects that must exist when the scope becomes ready.
+
+`ScopeActivation.OnDemand` stores the descriptor without constructing the service. The first `get()` constructs and caches the real instance directly; later `get()` calls return that same instance. Use it only when construction should wait until the service is actually requested.
+
+Both modes use the same dependency graph and reject cycles with `CyclicDependencyError`.
+
+The complete registration signature is `registerScopedService(scope, id, ctor, activation = ScopeActivation.OnScopeCreated, domain?)`: activation is the fourth argument and domain is the fifth.
+
+**Bootstrap shares the dynamic provide path.** Scope creation (`Scope.createApp` / `Scope.createChild` / `createScopedChildHandle` in `src/_base/di/scope.ts`) submits the scope kind's entire `registerScopedService` batch as ONE cascade transaction via `provideAll`: every token registers before the activation wave runs, so **registration order never matters**, and untracked transitive `createInstance` resolutions succeed inside the batch. A seed occupying a token (the `extra` tuple in `ScopeOptions`) overrides the static registration for that token. `activateScopeServices` is gone — there is no separate static activation path.
+
+## §6 Using a service inside a plain function (`invokeFunction`)
+
+When you do not want a new class and just need a service once, or when you expose a `ServicesAccessor` to the outside:
+
+```ts
+const accessor: ServicesAccessor = {
+  get: <T>(id: ServiceIdentifier<T>): T => instantiation.invokeFunction((a) => a.get(id)),
+};
+```
+
+`invokeFunction(fn)` hands `fn` a `ServicesAccessor` valid **only during that call**.
+
+> **The accessor is valid only during the invocation.** Calling `accessor.get()` after `invokeFunction` returns throws `"service accessor is only valid during the invocation"`. Do not stash it for async use — inject the service in the constructor (§2) if you need it long-term.
+
+## §7 Creating a non-singleton object with deps (`createInstance`)
+
+For a per-turn executor that also has `@IService` deps:
+
+```ts
+class TurnRunner {
+  constructor(
+    private readonly input: string,                 // static param: passed by caller
+    private readonly turn: number,                  // static param: passed by caller
+    @ILogService private readonly log: ILogService, // service param: injected by container
+  ) {}
+}
+
+const runner = instantiation.createInstance(TurnRunner, 'hello', 1);
+```
+
+Static params come first (you pass them), service params follow (the container fills them), then `Reflect.construct` builds the instance. This object is **not** placed in any scope's singleton cache — every call is a fresh instance — and it is not tracked as a cascade unit either: `createInstance` products are cascade-exempt leaves that no cascade tears down or rebuilds; their owner disposes them.
+
+> This is why service params must follow static params **for `createInstance`**: the container sorts by the parameter positions recorded via `@IX`. `_serviceBrand` lets the compiler tell the two kinds apart. Scoped services built by `registerScopedService` follow a different convention (`@IX` params first, optional static params after) — see service-authoring.md §constructor-conventions.
+
+## §8 Spawning a child scope / child container
+
+For a service that "starts a new session / agent" and needs a child scope, inject `IInstantiationService` itself (every container binds itself as `IInstantiationService`):
+
+```ts
+export class ScopeRegistry implements IScopeRegistry {
+  declare readonly _serviceBrand: undefined;
+
+  constructor(@IInstantiationService private readonly instantiation: IInstantiationService) {}
+
+  createSession(opts: CreateSessionOptions): Promise<IScopeHandle> {
+    const collection = new ServiceCollection();
+    for (const entry of getScopedServiceDescriptors(LifecycleScope.Session)) {
+      collection.set(entry.id, entry.descriptor);   // collect Session-tier descriptors
+    }
+    const child = this.instantiation.createChild(collection);   // spawn child container
+    const accessor: ServicesAccessor = {
+      get: <T>(id: ServiceIdentifier<T>): T => child.invokeFunction((a) => a.get(id)),
+    };
+    const handle: IScopeHandle = { id: opts.sessionId, kind: LifecycleScope.Session, accessor };
+    this.sessions.set(opts.sessionId, handle);
+    return Promise.resolve(handle);
+  }
+}
+```
+
+Key points:
+
+- `getScopedServiceDescriptors(scope)` returns every descriptor registered at that tier; load them into a `ServiceCollection`.
+- `instantiation.createChild(collection)` builds a child container whose parent pointer is the current container — so the child resolves upward to `App` services (the visibility rule).
+- Expose the child to the outside by wrapping it in a `ServicesAccessor` via `invokeFunction` (§6).
+
+> Higher-level code usually calls `Scope.createChild(kind, id)` (it does the "filter descriptors + build child" for you, then submits the whole batch through `provideAll` as one cascade transaction — see §5). Drop to the manual `ServiceCollection` form only when you need explicit control; to change bindings on an already-created container, prefer `provide` / `unprovide` / `update` over rebuilding a collection. Before the static batch lands, the scope-creation point runs the kernel's `ScopeUnits` fold (`_base/di/scopeUnits.ts` — materializes the recipes contributed to `ScopeUnits(kind)` as per-scope units) and then the `ScopeOptions.assemble` hook — the session domain uses the hook to construct its seed-adapter units (`session/sessionSeed/sessionSeedAdapters.ts`) so their provided tokens exist before the session services activate.
+
+## §9 Cyclic dependencies (forbidden — refactor)
+
+Business rule: **no cyclic dependencies.** The container rejects them; the correct response is to refactor, not to make it run.
+
+### The container rejects synchronous cycles
+
+If A needs B while being created and B needs A while being created, the container throws `CyclicDependencyError` with a `path` like `['A', 'B', 'A']`. Self-cycles (A depends on itself) are also rejected. This is a protection mechanism telling you the two services' responsibilities are mis-drawn.
+
+### Why cycles are disallowed
+
+- Scope layering makes normal dependencies a DAG (Agent → Session → Workspace → App, resolving upward); a cycle is almost always a design smell.
+- "Making the cycle happen to work" turns construction order into an implicit contract — hard to debug.
+
+v2's stance: **the dependency graph must be acyclic.**
+
+### How to refactor (in priority order)
+
+1. **Extract a third service C.** Move the part A and B both need into C; let A and B both depend on C instead of each other. The most common fix.
+2. **Decouple with an event.** If A only needs to know about a change in B, have B emit via `IEventService` and A subscribe, rather than A holding a reference to B.
+3. **Re-partition scope.** One of them may belong at a different tier — moving it makes the cycle disappear.
+
+### Activation does not break cycles
+
+Both `ScopeActivation.OnScopeCreated` and `ScopeActivation.OnDemand` construct through the same synchronous dependency graph. Changing activation cannot make a cycle valid. On `CyclicDependencyError`, refactor per the above.
+
+## Interface cheat sheet
+
+| Interface | Section | Role |
+|---|---|---|
+| `createDecorator<T>(name)` → `ServiceIdentifier<T>` | §1 | identity (runtime key + compile-time type + param decorator) |
+| `@IService` | §2, §7 | declare a dependency on a constructor param |
+| `registerScopedService(scope, id, ctor, activation, domain)` | §1, §3, §5 | bind an impl to a lifetime tier and construction time |
+| `ServicesAccessor.get(IX)` | §2, §6 | resolve an instance by interface |
+| `IInstantiationService.invokeFunction(fn, …)` | §6, §8 | obtain a temporary accessor inside a function |
+| `IInstantiationService.createInstance(ctor, …args)` | §7 | build a non-singleton object with deps injected |
+| `IInstantiationService.createChild(collection)` | §8 | spawn a child container |
+| `getScopedServiceDescriptors(scope)` | §8 | retrieve all descriptors registered at a tier |
+| `Disposable` / `DisposableStore` / `IDisposable` | §4 | resource management and disposal |
+| `Scope` / `LifecycleScope` | §3, §8 | the lifetime tree |
+| `ScopeActivation` | §3, §5 | choose scope-created or first-`get()` construction |
+| `Service` (`_base/di/service`) | §4 | unit base class — `this.provide/effect/on/get/ref` capabilities, two-phase construction |
+| `collection<T>(name)` / `CollectionView<T>` (`_base/di/collection`) | §4 | contribution-point token + the fold's live view (provider death withdraws the record) |
+| `SyncDescriptor` | (tests / low-level) | package a constructor + static args into a pending descriptor |
+
+> Legacy export (not used in v2, just recognize it): `refineServiceDecorator` is a VS Code leftover DI helper. v2 src/test has zero references; always use `registerScopedService`.
+
+## Red lines (this stage)
+
+- No `new` on a class whose constructor carries `@IService` deps — inject or `accessor.get(IX)`.
+- `@IX` decorates constructor params only; parameter order depends on construction (static-first for `createInstance`, `@IX`-first for scoped services — see service-authoring.md).
+- Both interface and impl carry `_serviceBrand`; the `createDecorator` name is globally unique.
+- `ServicesAccessor` is valid only during `invokeFunction` — never stash it for async use.
+- No cyclic dependencies — refactor (extract / event / re-scope); activation does not change cycle detection.

.agents/skills/agent-core-dev/orient.md

@@ -0,0 +1,110 @@
+# Stage 1 — Orient
+
+Understand the DI × Scope black box and the file conventions before touching business code.
+
+## The DI black box
+
+When writing business code you declare three things; the container handles the rest (when to construct, whether it is the same instance, ordering, disposal):
+
+- **Who am I** — an identity that is both a runtime key and a compile-time type.
+- **Whom do I need** — the dependencies that provide my capabilities.
+- **How long do I live** — which lifetime tier I belong to.
+
+Classes talk only to interfaces and never care how an implementation is constructed.
+
+## The four `LifecycleScope` tiers
+
+Lifetimes form a tree, from longest to shortest:
+
+```text
+App                 process-wide, single global instance
+ └── Workspace        one workspace handler (a materialized workspace root)
+      └── Session       one session
+           └── Agent      one agent
+```
+
+```ts
+// src/app/scopes.ts — the business layer declares the tiers and their order;
+// the DI kernel only knows opaque string kinds plus the declared topology.
+export enum LifecycleScope {
+  App = 'app',
+  Workspace = 'workspace',
+  Session = 'session',
+  Agent = 'agent',
+}
+```
+
+- Later in the topology = shorter life = closer to a leaf.
+- "Singleton" means **one per scope**: `ILogService` is global once; each `Session` scope has its own `ISessionMetadata`.
+- `kind` must advance along the declared topology in the parent→child direction.
+
+### Visibility rule
+
+A child scope sees its ancestors; a parent never sees its children. Resolution walks *up* the tree:
+
+- ✅ An `Agent` service injects a `Session` or `App` service (found upward).
+- ❌ An `App` service injects a `Session` service (the parent does not look down, and the child may not exist yet).
+
+> **Short-lived may inject long-lived; never the reverse.** The tree structure enforces this — it is not a matter of discipline.
+
+### Disposal order
+
+Deterministic: **child scopes die first; within one scope, teardown runs in strict reverse registration order, one entry at a time.** The mechanism is the Ledger (`src/_base/lifecycle/`): ordered effect bookkeeping, dual-track (sync + async disposers), serial reverse-order teardown (never parallel), with the teardown reason (`'scope-close' | 'cascade' | 'unload'`) passed through to every disposer. `Disposable` / `DisposableStore` (`src/_base/di/lifecycle.ts`) delegate to it — "reverse construction order" is a Ledger property, not a container convention. Business code declares which tier it lives in and never disposes by hand.
+
+## Dynamic DI: units and cascades
+
+Registration is not the end of the story. Every unit a container tracks — static registrations and runtime `provide`s alike — lives in a small state machine owned by the scope's cascade engine (`src/_base/di/cascadeEngine.ts`, one per scope container, orchestrating tree-wide). Vocabulary you will meet in errors, tests, and the debug surface:
+
+- **Unit states** — `Pending → Activating → Active`, plus `Unloading` during teardown and a sticky `Failed`. A construction failure parks the unit in `Failed` with no auto-retry: resolving it rethrows its error; an explicit `update()` reloads it.
+- **Waiting area** — a unit whose declared dependencies are missing sits `Pending` and auto-activates when they arrive, including cross-scope wake-up when an ancestor gains the token. An `ondemand` unit counts as available: consumers pull it transitively at materialization.
+- **Cascade transaction** — every `provide` / `unprovide` / `update` runs as one tree-wide transaction: contagion set from the persistent dependency graph (instance edges, child→parent across scopes) → abort hook → global reverse-topo teardown → apply the change → waiting-area recheck fixpoint → history ring. Static bootstrap shares this path: scope creation submits the kind's whole registration batch as one `provideAll`, so registration order never matters.
+
+## Import boundaries
+
+There is no domain-layer numbering — a domain may import any other domain, guided by the dependency-direction judgment in design.md. The only mechanically enforced import boundaries are (`lint:imports`, `scripts/check-import-boundaries.mjs`):
+
+- v2 never imports v1 (`@moonshot-ai/agent-core` or any subpath).
+- The kosong subtree (`src/kosong/{contract,protocol,provider,model}`) keeps its strict internal order (`contract ← protocol ← provider/model`), purity bans (no SDKs in `contract`/`protocol`), and the `provider/bases` registration boundary.
+
+## File-header comment convention
+
+`packages/agent-core-v2/AGENTS.md` mandates a header-only comment style:
+
+- **Header only.** Comments live solely in the top-of-file `/** */` block — never beside functions, methods, or statements. The code is the source of truth for *how*; the header states *what the module exposes and the responsibility it owns*.
+- **Identity line first.** Start with `` `<domain>` domain — <one-line role>. `` Keep an existing `(cross-cutting)` label as-is. Write the role as a responsibility ("drives the turn lifecycle"), not a symbol list.
+- **Scope is in the filename.** `workspace*.ts` = Workspace, `session*.ts` = Session, `agent*.ts` = Agent, no prefix = App (see service-authoring.md). State the same scope in the header so the two never drift.
+- **Interface files** (`<name>.ts`) state the public contract + scope: which `IXxx` they define and what it is for.
+- **Impl files** (`<name>Service.ts`) add collaborators + scope: list every imported cross-domain collaborator as a role ("persists records through `records`"); read scope from `registerScopedService(LifecycleScope.X, …)`.
+- **Contribution files** (`<targetDomain>.ts` / `<what>.contrib.ts`) state what they register into the target domain (e.g. "registers the `log` config section into `config`").
+- **Pure-function / `.types` / `.errors` files** state the responsibility only — they own no scoped state, so no scope line.
+
+Impl file example (`sessionMetadataService.ts`):
+
+```ts
+/**
+ * `sessionMetadata` domain — `ISessionMetadata` implementation.
+ *
+ * Persists the session metadata document (`state.json`) through the `storage`
+ * access-pattern store (`IAtomicDocumentStore`), rooted at the `metaScope`
+ * namespace from `sessionContext`. Loads the existing document on
+ * construction (creating it on first run), and logs through `log`. Bound at
+ * Session scope.
+ */
+```
+
+Contribution file example (`config.ts` inside `log/`):
+
+```ts
+/**
+ * `log` domain — registers the `log` config section into `config`.
+ *
+ * Owns the `log` section schema and its env overlay; imported for the
+ * registration side effect. Bound at App scope.
+ */
+```
+
+## Red lines (this stage)
+
+- Import via the `#/...` alias (mapped to `src/`); never reach into another domain's internals by relative path.
+- Short-lived may inject long-lived; never the reverse.
+- File-header comments describe role and scope only; never narrate implementation beside statements.

.agents/skills/agent-core-dev/permission.md

@@ -0,0 +1,213 @@
+# Topic — Permission
+
+The target design for the agent-core permission system. Read this when touching `permission`, `permissionMode`, `permissionRules`, or when adding a new permission dimension.
+
+> **The permission system should be a composable, registrable chain of responsibility (a microkernel).** The kernel only runs the chain in order, first hit wins; concrete permission dimensions (policies) are contributed by their owning Domain Services through a registry; tools only declare standardized resource access (`accesses`) in `resolveExecution`, and generic dimensions consume that metadata.
+>
+> **The chain adjudicates risk only.** A policy node answers "how dangerous is this call, and may the user override that judgment?" — its `ask`/`deny` outcomes are always user-overridable. **Harness constraints are not permissions**: a mechanism that limits the agent for its own correctness (plan-mode write guard, AgentSwarm batch exclusivity, btw side-question fork, goal budget rejection) produces a hard deny with no ask channel and no per-call user exemption. Those live in their owning domains as `onBeforeExecuteTool` veto listeners that call `event.veto(...)` (precedent: `goalService.ts`'s budget/stale rejection). Product reviews (plan review, goal-start review) are likewise not permissions: the owning domain intercepts its tool with a cold `event.waitUntil(factory)` and drives the shared `IAgentToolApprovalService` round-trip itself, so the review only starts once no other listener vetoed the call.
+>
+> **Do not introduce Casbin** — the hard part here is *decision behavior* (continuations, side effects, RPC, state machines), not "match + scalar decision".
+
+## 1. Problem definition
+
+The permission system answers one question: **for each tool call, in the current agent and current mode — allow / deny / ask the user?** Three traits shape the architecture:
+
+1. **Decisions carry behavior.** Returning `ask` is not an enum value — it is a workflow with an RPC round-trip, hooks, telemetry, state writes, and a continuation; returning `deny` may be the result of running an external hook.
+2. **Heterogeneous policies.** Some check a tool-name set, some count same-batch `AgentSwarm` calls, some run a hook, some inspect the plan state machine — no uniform `(sub, obj, act)` shape.
+3. **Multi-agent × multi-mode × external extension.** Different agents / modes need different permissions, and outsiders (org admins, plugins) must contribute rules or behavior in a decoupled way.
+
+## 2. Current state (v1) at a glance
+
+Code lives in `packages/agent-core/src/agent/permission/`.
+
+- **Architecture: ordered chain of responsibility, first hit wins.** `PermissionManager` holds `PermissionPolicy[]`; evaluation iterates in order, the first non-`undefined` result wins.
+- **`PermissionPolicyResult` is a behavior bundle, not a scalar:** `approve` (with `executionMetadata`), `deny` (with `message`), or `ask` (with `resolveApproval` / `resolveError` continuations).
+- **11 dimensions, 19 policies**, hardcoded in `policies/index.ts#createPermissionDecisionPolicies()`. Order is a high-to-low safety cascade: external force → structural deny → state-machine deny → static deny → mode allow → session-memory allow → static ask → static allow → flow allow → sensitive-path ask → default allow → fallback ask.
+- **Resource-access declaration:** tools declare accessed resources in `resolveExecution(input)` via `accesses` (`ToolAccesses`, currently `file` and `all`); generic dimensions read `context.execution.accesses`.
+
+### v1 pain points the target design fixes
+
+1. The chain is hardcoded — outsiders cannot contribute.
+2. `mode` is an `if` inside each policy (`YoloModeApprove` / `AutoModeApprove` self-guard).
+3. No per-agent chain entry point (only scattered `agent.type === 'sub'` checks).
+4. No external extension point beyond the single `PreToolUse` hook slot.
+
+## 3. Why not Casbin
+
+- **`policy_effect` is unusable** — composition here is a fixed, intentionally hardcoded safety cascade; the real complexity lives in each policy's `evaluate` behavior, which a Casbin expression cannot absorb. Externally tunable safety knobs are already exposed via `mode` + allow/deny/ask rules.
+- **Flexible priority is unusable** — there is no plugin injection point, no multi-subject/RBAC, and a fixed subject (agent/user), so priority collisions do not arise. Casbin's `(sub, obj, act)`, `g()`, and domains would idle.
+- **Fundamental mismatch: decisions are not scalars.** `enforce()` maps a request to an effect; agent-core decisions are behavior bundles (continuations, side effects, synthesized results). Even if Casbin computed `ask`, the surrounding behavior would still need to be rewritten — Casbin would degrade to an enum generator.
+- **When Casbin becomes worth it:** when the hard part is matching semantics itself — role inheritance, domain isolation, ABAC expressions, policies loaded from a DB. Not before.
+
+## 4. Design-pattern placement
+
+Permission orchestration is a layered combination, not a single pattern:
+
+| Layer | Pattern | Role |
+|---|---|---|
+| Runtime decision | **Chain of Responsibility** | multiple candidates in order; first hit wins, rest short-circuit |
+| Single handler | **Strategy** | each policy is an interchangeable "permission adjudication" algorithm |
+| Assembly / external extension | **Plugin / Microkernel** | minimal kernel + explicit extension points + pluggable policies |
+| Landing support | **Registry + Factory** | collect plugins; assemble the chain per `(agent, mode)` on demand |
+
+Casbin = single Strategy + data-driven. This design = multiple Strategies + chain-of-responsibility composition. Behavior-heavy systems must choose the latter — behavior cannot be flattened into data rows.
+
+## 5. Target design
+
+### 5.1 Core principles
+
+1. **The chain encodes "permission dimensions", not "tools".** Adding a tool does not lengthen the chain; only adding a dimension adds a node.
+2. **Two contribution paths:** high-frequency trivial specifics go through the **data path** (rules); low-frequency new dimensions with behavior go through the **code path** (policies).
+3. **Guard/review off-chain, risk on-chain:** harness constraints and product reviews ship with their owning domain as `onBeforeExecuteTool` veto listeners (§5.4); risk dimensions contributed by a domain self-register as chain policies in DI, mirroring v2's "domain self-registers tools".
+4. **Tools declare resources; generic dimensions consume them:** bash/write/read only declare `accesses`; file/security dimensions judge centrally.
+
+### 5.2 Core abstractions
+
+```ts
+type Phase =
+  | 'guard' | 'user-deny' | 'mode' | 'session'
+  | 'user-ask' | 'default' | 'fallback';
+
+interface PermissionPolicyEntry {
+  name: string;
+  phase: Phase;
+  modes?: PermissionMode[];        // declare which modes this applies in (no more in-evaluate if)
+  agentTypes?: AgentType[];
+  factory: (accessor: ServicesAccessor) => PermissionPolicy;
+}
+
+// App scope — collects every domain's registration
+interface IPermissionPolicyRegistry {
+  register(entry: PermissionPolicyEntry): IDisposable;
+  list(): readonly PermissionPolicyEntry[];
+}
+```
+
+`PermissionPolicyService` (Agent scope) changes from a hardcoded list to "assemble by `(agent, mode)`":
+
+```ts
+this.policies = registry.list()
+  .filter(e => !e.modes    || e.modes.includes(mode))
+  .filter(e => !e.agentTypes || e.agentTypes.includes(agentType))
+  .sort(byPhaseThenRegistrationOrder)
+  .map(e => e.factory(accessor));
+```
+
+Key points:
+
+- `modes` / `agentTypes` are **declarations** — they lift the `if (mode !== 'yolo') return` out of `YoloModeApprove` into metadata.
+- `factory`, not `instance`: a node may depend on agent-scoped services (mode, rules) and must be instantiated in the Agent scope — symmetric to `IToolDefinitionRegistry` (App) storing factories and `IToolService` (Agent) instantiating tools.
+- **Different `(agent, mode)` produce differently-shaped chains** — under yolo the ask/fallback phases are physically filtered out.
+
+### 5.3 Two contribution paths
+
+| What is being added | Path | Chain length |
+|---|---|---|
+| New tool, new org rule, new user preference ("deny `Bash(curl *)`") | **Data path**: add a `PermissionRule` to an existing node | unchanged |
+| New cross-cutting behavior (custom approval UI, audit log, new mode) | **Code path**: register a new policy node | +1 |
+
+Most growth goes through the data path — node count is bounded by "kinds of behavior"; rule count grows with specifics (rule matching is a cheap Set/glob).
+
+### 5.4 Domain dimensions: guard/review via the executor veto event, policy registration for risk
+
+**Harness constraints and product reviews no longer live on the chain.** A domain that owns one registers an `onBeforeExecuteTool` veto listener and adjudicates through the event:
+
+```ts
+// src/plan/planService.ts — constructor
+constructor(@IAgentToolExecutorService executor, ...) {
+  executor.onBeforeExecuteTool((event) => this.guardToolExecution(event));
+}
+```
+
+- The veto event carries no id and no ordering contract. Listeners answer with `event.veto(result)` (first one wins, ends adjudication), `event.allow()` (final pass, ends everything including the permission gate's own listener), `event.pass(metadata)` (pass with an `executionMetadata` trace, ends nothing), or `event.waitUntil(factory)` (defer to a cold factory).
+- **Guard** (hard deny): call `event.veto(denyToolExecution(toolApproval.formatDenyMessage(...)))`. An immediate veto suppresses every pending `waitUntil` factory, so a deny can never be preceded by someone else's approval prompt.
+- **Review** (product approval): intercept the tool with `event.waitUntil(() => ...requestToolApproval(event, ask, origin))`. The factory is cold — the executor only invokes it after every listener ran without a veto or an allow, so the review's Interaction starts only once the call is otherwise clear to proceed; abstain (no statement) for every case you do not review so user rules still apply.
+- **Plain allow**: do NOT `allow()` casually — prefer putting the tool in `default-tool-approve`'s whitelist so user deny/ask rules keep their precedence; reserve `allow()` for cases like the plan-file write guard that must bypass even the permission chain.
+
+**Risk dimensions contributed by a domain still go through the chain** (the registry path below): a domain whose state changes the *risk* verdict registers its policy via `IPermissionPolicyRegistry`, mirroring v2's "domain self-registers tools". A complex domain may register a single **composite** node externally and run a small internal chain, hiding its internal order from the global chain.
+
+### 5.5 Tools declare resources at runtime (`resolveExecution` / `accesses`)
+
+In `resolveExecution(input)`, before execution, declare accessed resources with the `ToolAccesses.*` builders:
+
+```ts
+resolveExecution(args: WriteInput): ToolExecution {
+  const path = resolvePathAccessPath(args.path, { kaos, workspace, operation: 'write' });
+  return {
+    accesses: ToolAccesses.writeFile(path),            // declares: write this file
+    approvalRule: literalRulePattern(this.name, path),
+    matchesRule: (ruleArgs) => matchesPathRuleSubject(ruleArgs, path, ...),
+    execute: () => this.execution(args, path),
+  };
+}
+```
+
+Current resource types:
+
+```ts
+type ToolResourceAccess =
+  | { kind: 'file'; operation: 'read'|'write'|'readwrite'|'search'; path: string; recursive?: boolean }
+  | { kind: 'all' };   // non-enumerable side effects (pessimistic, globally exclusive)
+```
+
+Two complementary channels:
+
+- **Enumerable resources** (write/read/edit/grep/glob) → use `accesses`; generic file dimensions cover them automatically.
+- **Non-enumerable resources** (bash running arbitrary commands) → do not declare `accesses`; use the `matchesRule` DSL (e.g. `Bash(rm *)` globs by command string).
+
+**kaos's role:** kaos is the execution-environment abstraction (fs/process/pathClass) used by the file dimension for path normalization and judgment — it is **not** the permission-dimension abstraction itself. Permission semantics live one layer above kaos, at "file access".
+
+**v2 evolution:** extend the `ToolResourceAccess` union so non-file resources can be declared structurally:
+
+```ts
+type ToolResourceAccess =
+  | { kind: 'file';      operation: FileOp; path: string; recursive?: boolean }
+  | { kind: 'network';   operation: 'connect'; host: string }
+  | { kind: 'shell';     command: string }
+  | { kind: 'datastore'; operation: 'read'|'write'; table: string }
+  | { kind: 'all' };
+```
+
+Each new resource kind can pair with a generic dimension that consumes it; tools always only **declare**.
+
+### 5.6 Dimension ownership
+
+| Dimension | Owner | Type |
+|---|---|---|
+| external hook veto | `externalHooks` domain | generic |
+| tool-batch exclusivity | `swarm` domain — `onBeforeExecuteTool` veto listener | harness constraint (off-chain) |
+| plan-mode write guard | `plan` domain — `onBeforeExecuteTool` veto listener | harness constraint (off-chain) |
+| plan review | `plan` domain — same listener's `waitUntil` + `toolApproval` | product review (off-chain) |
+| goal-start review | `goal` domain — veto listener's `waitUntil` + `toolApproval` | product review (off-chain) |
+| goal budget / stale rejection | `goal` domain — `onBeforeExecuteTool` veto listener | harness constraint (off-chain) |
+| btw tool disablement | `btw` domain — veto listener on the fork | harness constraint (off-chain) |
+| runtime-mode posture (auto/yolo) | `permissionMode` domain (chain nodes, pending the level×routing split) | generic |
+| static config rules | `permissionRules` domain | generic (data path) |
+| session approval memory | `permissionRules` domain | generic |
+| sensitive / special paths | generic "file-access/security" dimension | generic (consumes `accesses`) |
+| tool intrinsic risk | core permission (`default-tool-approve`) | generic (consumes tool declarations) |
+| workspace write trust | generic "file-access/security" dimension | generic (consumes `accesses`) |
+| fallback | core permission | generic |
+| approval round-trip | `toolApproval` domain — shared by gate asks and domain reviews | infrastructure |
+
+Pattern: **harness constraints and reviews ship with their owning domain as `onBeforeExecuteTool` veto listeners; risk dimensions ship as chain policies (self-registered once the registry lands); generic dimensions register centrally and apply across tools via the declared `accesses`.**
+
+## 6. Evolution path
+
+Incremental, not big-bang:
+
+1. ~~**Sink domain dimensions.**~~ **Done** — plan guard/review, goal-start review, swarm batch exclusivity, and btw deny-all moved out of the chain into their owning domains as `onBeforeExecuteTool` veto listeners (immediate `veto` / `allow` / `pass` statements plus cold `waitUntil` factories for approval round-trips); the shared approval round-trip was extracted to `IAgentToolApprovalService`; `registerPolicy` was removed (btw was its only production user). The chain now holds 12 risk-adjudication nodes only.
+2. **Level × routing split.** Separate "risk level" (read-only / read-write / yolo posture — what `yolo-mode-approve` really is) from "interaction routing" (what `auto-mode-approve` / `auto-mode-ask-user-question-deny` really are: route permission asks and reviews without the user). The routing layer lands on the `session/approval` broker; the three remaining mode policies leave the chain here.
+3. **Registry + Composer.** Replace the hardcoded `new`s in `PermissionPolicyService` with reads from `IPermissionPolicyRegistry`; lift mode guards into `modes` metadata. Chain shape becomes selectable per `(agent, mode)` and externally extensible.
+4. **(On demand) extend resource types.** When non-file resources (network/DB/shell) need structural dimensions, extend the `ToolResourceAccess` union.
+5. **(On demand) swap the matching kernel for Casbin.** Only when external rules genuinely need RBAC/ABAC semantics, swap the data-path rule-matching kernel for Casbin. Not before.
+
+## Red lines (this topic)
+
+- Do not introduce Casbin — decisions are behavior bundles, not scalar effects.
+- The chain adjudicates risk only. A node whose deny/ask the user cannot per-call exempt is a harness constraint: implement it as an `onBeforeExecuteTool` veto listener in the owning domain (`event.veto(...)` / `event.allow()`), never as a chain policy.
+- Product reviews (plan/goal) are not permissions either: the owning domain intercepts its tool with a cold `event.waitUntil(factory)` and drives `IAgentToolApprovalService` itself; the gate only handles chain asks.
+- The chain encodes dimensions, not tools: a new tool must not lengthen the chain.
+- New specifics go through the data path (rules); only new risk behavior goes through the code path (a policy node).
+- Tools only declare `accesses`; generic dimensions consume them. kaos is the execution environment, not the permission abstraction.
+- Use `factory` (Agent-scope instantiation), not `instance`, for registered policies.

.agents/skills/agent-core-dev/persistence.md

@@ -0,0 +1,204 @@
+# Topic — Persistence layering
+
+How business code persists data in `agent-core-v2`: the three-layer model (`Store → Storage → backend`), the naming rules for each layer, and how to decide which layer a domain should depend on. Read this before adding any persistence to a domain.
+
+A domain `I{Domain}EntityService` is a business facade over these layers, not a replacement for them. Before naming or bundling EntityServices by `session` / `agent` / `turn`, read [domain-boundaries.md](domain-boundaries.md).
+
+## The three-layer model
+
+Persistence is split into three layers, each hiding one kind of change:
+
+```text
+Business Service
+   │ inject
+   ▼
+┌────────────────────────────────────────┐
+│ Store  (semantic layer)                 │  ← access-pattern facade
+│   IAppendLogStore / IAtomicDocumentStore│     append-log / atomic-doc / blob
+└────────────────────────────────────────┘
+   │ inject
+   ▼
+┌────────────────────────────────────────┐
+│ Storage  (byte layer)                   │  ← byte primitives
+│   IFileSystemStorageService            │     read/write/append/list/delete
+└────────────────────────────────────────┘
+   │ implements
+   ▼
+┌────────────────────────────────────────┐
+│ Backend  (deployment-specific)          │  ← File / Postgres / Redis / S3
+│   FileStorageService / PostgresStorage  │
+└────────────────────────────────────────┘
+   │ uses
+   ▼
+┌────────────────────────────────────────┐
+│ Platform primitives                     │  ← hostFs / dbClient / redisClient
+└────────────────────────────────────────┘
+```
+
+Each layer hides exactly one concern:
+
+| Layer | Hides | Business code sees |
+|---|---|---|
+| **Store** | how an access pattern works (append-log reads, atomic-doc serialization) | "append this record" / "save this document" |
+| **Storage** | byte primitives (atomic write, ordered append, prefix list) | `read/write/append/list/delete` over `(scope, key)` |
+| **Backend** | deployment environment (file vs DB vs Redis vs S3) | nothing — chosen at the composition root |
+
+## The one-sentence rule
+
+> **Business code expresses *what* to store or fetch, never *how* to store it.**
+
+If business code contains any "how to persist" detail, it has punched through the layer it should depend on:
+
+| Business code contains | It has punched through | Depend on instead |
+|---|---|---|
+| `INSERT INTO …` / `SELECT …` | Storage + backend | a Store |
+| file paths / `rename` / `fsync` | Storage | Storage or a Store |
+| `JSON.parse` / `JSON.stringify` | Store (serialization) | `IAtomicDocumentStore` |
+| append offsets / sequential cursors | Store (log semantics) | `IAppendLogStore` |
+| `hash(data)` used as a key | Store (blob semantics) | `IBlobStore` |
+| `pathe.join / relative / basename` on `homeDir` etc. | Bootstrap (path layout) | `IBootstrapService.scope(...)` / scope contexts |
+| only `read/write/list/delete` on bytes | nothing — this is the byte layer | `IFileSystemStorageService` directly ✅ |
+
+## Where scopes come from — `IBootstrapService` and scope contexts
+
+Business code **never assembles scope strings from paths**. Scope strings come from three places:
+
+1. **`IBootstrapService.scope(name)`** — well-known top-level scopes (`'config' | 'sessions' | 'blobs' | 'store' | 'logs' | 'cache' | 'credentials'`). App-scope, deployment-agnostic contract.
+2. **`ISessionContext.scope(subKey?)`** — persistence scope rooted at the current session; `scope('agents/main')` etc.
+3. **`IAgentScopeContext.scope(subKey?)`** — persistence scope rooted at the current agent; `scope('cron')`, `scope('blobs')` etc.
+
+The bootstrap layer decides how each semantic scope maps to concrete addressing. In the file deployment, `FileBootstrapService` reads a `ResolvedEnvironment` (the paths bag) and returns homeDir-relative scopes; a server deployment could bind a different `IBootstrapService` implementation that maps `'sessions'` to a DB table without any business change.
+
+```ts
+// ❌ Wrong — path arithmetic on homeDir/sessionDir leaks the file layout
+const scope = relative(bootstrap.homeDir, join(session.sessionDir, 'agents', agentId, 'cron'));
+
+// ✅ Right — the agent already knows its own scope root
+const scope = agentCtx.scope('cron');
+```
+
+Absolute paths (`sessionDir`, `agentHomedir`) are still available on `IBootstrapService` for the very small number of legacy APIs that expose on-disk paths (session log rotation, background task tail file). Prefer scope strings; ask before adding a new absolute-path caller.
+
+## Which layer to depend on — decision tree
+
+```text
+Need to persist
+  │
+  ├─ read-whole / write-whole, JSON-serializable?
+  │     └─ IAtomicDocumentStore
+  │
+  ├─ append-only writes / sequential reads, independent records?
+  │     └─ IAppendLogStore
+  │
+  ├─ large object, addressed by content hash?
+  │     └─ IBlobStore
+  │
+  ├─ custom byte layout (index / cache / binary) that read/write/list cover?
+  │     └─ IFileSystemStorageService directly
+  │
+  ├─ new, reusable access semantics (multi-field query / time-range / graph)?
+  │     └─ add a new Store; business depends on the Store
+  │
+  └─ business-specific, trivial, one or two lines?
+        └─ IFileSystemStorageService directly; if it grows, extract a private Store
+```
+
+## Naming — Store by access pattern, not by business
+
+A Store abstracts an **access pattern**, not a business data type. Name it after the pattern so its reusability is obvious from the name.
+
+| Access pattern | Store name | Backend examples |
+|---|---|---|
+| append-log (append / sequential read) | `IAppendLogStore` | `FileAppendLogStore` / `PostgresAppendLogStore` |
+| atomic-document (read/write whole) | `IAtomicDocumentStore` | `FileDocumentStore` / `RedisDocumentStore` |
+| blob (hash-addressed large object) | `IBlobStore` | `FileBlobStore` / `S3BlobStore` |
+
+**Do not name a generic Store after a business concept.** `IRecordStore` / `IConfigStore` make a reusable access pattern look like a private store for one feature. Any domain that needs an append-log uses `IAppendLogStore`; any domain that needs an atomic document uses `IAtomicDocumentStore`.
+
+**Exception — business-specific Stores are named after the business.** When a Store captures one domain's unique query semantics (not a generic access pattern), name it after the domain:
+
+```text
+ISessionIndex      query / enumerate sessions by workspace   ← business-specific
+```
+
+Test: is the Store's semantics a *generic access pattern* (append-log / atomic-doc / blob) or *one domain's unique query*? Generic → name by pattern; unique → name by domain.
+
+## Storage — a filesystem-specific byte layer
+
+The byte layer is a single `IFileSystemStorageService` interface (read / readStream / write / append / list / delete / watch / flush / close). As the name says, it is **filesystem-specific**: it exposes the two irreducible durable primitives a local filesystem implements optimally — atomic whole-value replacement (`write`, via tmp + rename) and ordered durable extension (`append`, via `open('a')`). The node-fs Store backends (`AppendLogStore`, `JsonAtomicDocumentStore`, `BlobStoreService`) are built on it.
+
+```ts
+export interface IFileSystemStorageService {
+  read(scope: string, key: string): Promise<Uint8Array | undefined>;
+  readStream(scope: string, key: string): AsyncIterable<Uint8Array>;
+  write(scope: string, key: string, data: Uint8Array, options?: { atomic?: boolean }): Promise<void>;
+  append(scope: string, key: string, data: Uint8Array, options?: { durable?: boolean }): Promise<void>;
+  list(scope: string, prefix?: string): Promise<readonly string[]>;
+  delete(scope: string, key: string): Promise<void>;
+  watch?(scope: string, key: string): Event<void>;
+  flush(): Promise<void>;
+  close(): Promise<void>;
+}
+```
+
+Two backends implement it today, both bound at the composition root:
+
+```ts
+// Production — local filesystem rooted at homeDir
+collection.set(IFileSystemStorageService, new FileStorageService(homeDir));
+
+// Tests — in-memory backend seeded by the test harness
+collection.set(IFileSystemStorageService, new InMemoryStorageService());
+```
+
+**Non-filesystem backends (Postgres, S3, Redis) do not implement this interface.** Atomic-rename and byte-append have no native equivalent in those stores, so they implement the **Store** interfaces directly via their own clients instead:
+
+```ts
+// Server profile — append-logs on Postgres, atomic documents on Redis.
+// Each Store is backed by a native client; IFileSystemStorageService is not involved.
+collection.set(IAppendLogStore, new PostgresAppendLogStore(db, 'records'));
+collection.set(IAtomicDocumentStore, new RedisDocumentStore(redis, 'config'));
+```
+
+Use the `scope` parameter to express **business namespace** within a backend. Do not overload `scope` to route backends — bind a different Store implementation at the composition root instead.
+
+## Store `acquire(scope, key)` — flush-on-dispose handle
+
+Stores that buffer writes expose an `acquire(scope, key)` handle so a business can flush them on disposal:
+
+```ts
+export interface IAppendLogStore {
+  // …
+  /**
+   * Acquire a disposable handle for `(scope, key)`. Register it with your
+   * `Disposable` (via `this._register(...)`); when you are disposed, pending
+   * appends for that log are flushed. The shared store itself is not disposed.
+   */
+  acquire(scope: string, key: string): IDisposable;
+}
+```
+
+`IAppendLogStore.acquire` flushes the log's pending appends on dispose — it exists because `append` is fire-and-forget. `IAtomicDocumentStore.acquire` is a no-op today (atomic documents are durable on write) and exists for interface symmetry. Businesses that do not need flush-on-dispose simply do not call `acquire`.
+
+## When the byte layer does not apply
+
+`IFileSystemStorageService` covers only the local-filesystem byte primitives. It is not a universal storage abstraction:
+
+- **Non-filesystem backends** (Postgres / S3 / Redis) implement the **Store** interfaces directly via native clients — they never implement `IFileSystemStorageService`.
+- **Blobs** are a Store-level interface (`IBlobStore`) with their own backends; the node-fs `BlobStoreService` sits on `IFileSystemStorageService`, but an `S3BlobStore` would not.
+- **A backend has a fast primitive the Store interface cannot express** (e.g. Postgres `COPY`) → as an exception, extend that backend's Store implementation directly. This is an exception, not the default.
+
+## Platform primitives are deployment-coupled, not core abstractions
+
+`hostFs` (local filesystem) is a **platform primitive** used only by local backends (`FileStorageService`, `LocalFileSystemBackend`, `LocalSkillCatalog`, `HostFolderBrowser`). It is **not** a core abstraction and must not appear in business-domain dependency graphs. A server deployment swaps those backends for DB / S3 implementations and never registers `hostFs`.
+
+## Red lines (this topic)
+
+- Business code never contains "how to persist" details (serialization / paths / SQL / append offsets) — if it does, drop a layer.
+- Business code never assembles scope strings from paths (`pathe.join / relative / basename` on `homeDir` / `sessionDir` / …). Use `IBootstrapService.scope(name)` for well-known scopes, `ISessionContext.scope(subKey?)` for session-rooted scopes, and `IAgentScopeContext.scope(subKey?)` for agent-rooted scopes.
+- Name generic Stores by access pattern (`IAppendLogStore` / `IAtomicDocumentStore` / `IBlobStore`), never by business concept (`IRecordStore` / `IConfigStore`).
+- Business-specific Stores (unique query semantics) are named after the domain (`ISessionIndex`).
+- `IFileSystemStorageService` is the filesystem byte-layer interface; non-filesystem backends implement the **Store** interfaces directly. Route backends by binding a different Store implementation at the composition root, not by overloading `scope`.
+- `hostFs` is a local-only platform primitive; business domains must not import `node:fs` or `hostFs` directly.
+- Only the file-backed bootstrap (`FileBootstrapService`) and file backends import `pathe`; business domains do not.
+- Do not create a pass-through `Store` that only forwards `read/write` — a Store must hide a real access-pattern concern, or it is noise; use `IFileSystemStorageService` directly instead.

.agents/skills/agent-core-dev/server-align.md

@@ -0,0 +1,253 @@
+# Subskill — Server align (expose `agent-core-v2` over `server-v2`)
+
+Wire a v2 domain into `packages/kap-server`, and — when the endpoint is part of the established `/api/v1` wire contract — keep the wire shape **byte-for-byte compatible** with what released v1 clients expect. This is the server-side counterpart of [align.md](align.md): `align.md` ports v1 *business logic* into v2; this file exposes the v2 result over HTTP / WS, reusing the v1 wire contract where it already exists.
+
+Use this when the task is "expose the new v2 Service on the server", "add a `/sessions/:sid/...` route to the `/api/v1` surface", or "keep server-v2 speaking the same `/api/v1` contract released clients rely on".
+
+## The one-paragraph mental model
+
+`server-v2` serves **two HTTP surfaces** off the same `agent-core-v2` scope tree:
+
+- **`/api/v2/:sa`** — the native v2 RPC surface, driven by the `actionMap` allowlist (`packages/kap-server/src/transport/actionMap.ts`). One `resource:action` segment maps to one `Service.method`. New v2-native capabilities land here. See [edge-exposure.md](edge-exposure.md).
+- **`/api/v1/...`** — the v1-compatible surface, hand-written routes in `packages/kap-server/src/routes/*.ts` that **implement the established v1 wire contract path-for-path and schema-for-schema**, mounted by `registerApiV1Routes.ts`. This surface IS the v1 contract now (the legacy v1 server is gone); it exists so existing v1 clients keep working against server-v2 unchanged.
+
+The two surfaces can point at **different Services** for the same feature. v2's native `IAgentPromptService` serves `/api/v2`; a v1-shaped `IAgentPromptService` serves `/api/v1`. Keeping them separate is what lets v2's domain design stay clean while the wire stays compatible.
+
+## Decision: which surface?
+
+```text
+Is the endpoint part of the established /api/v1 wire contract (protocol schema
++ released-client expectation)?
+├─ YES → /api/v1 mirror route (this file, §schema-fidelity + §legacy-service).
+│         Reuse the protocol schema; add a LegacyService if v2 semantics diverge.
+└─ NO  → /api/v2 native action (edge-exposure.md).
+         Add to actionMap, wrapping in a facade if the method fails §2 there.
+```
+
+A feature often needs **both**: the v1 mirror so old clients keep working, and the v2 action so new clients get the cleaner shape. Do them as two routes / two action-map entries over the same scope tree.
+
+## The server-align workflow
+
+```text
+Pick surface → Read the v1 route (if any) → Reuse / add the protocol schema
+→ Choose native Service vs LegacyService → Wire the route / actionMap entry
+→ Map errors → Test against the v1 wire shape → Verify
+```
+
+### 1. Pick the surface
+
+Apply the decision above. For a v1-matched endpoint, the **spec** is the protocol schema plus the existing mirror routes:
+
+- `packages/kap-server/src/protocol/rest-<resource>.ts` — the wire schema you must match.
+- `packages/kap-server/src/routes/<resource>.ts` — the file you are writing (create it if missing); sibling route files show the conventions.
+
+The protocol schema is the source of truth. Do not re-derive the wire shape from memory or from the v2 domain model.
+
+### 2. Reuse (or add) the protocol schema
+
+The wire schema lives in **`packages/kap-server/src/protocol`** under `rest-<resource>.ts` (e.g. `promptSubmissionSchema`, `promptListResponseSchema`, `configResponseSchema`) — or in the owning `agent-core-v2` domain contract when the engine's service speaks the shape. Every `/api/v1` route in `packages/kap-server` imports from it — that single import is what guarantees the server speaks the same shape released clients expect.
+
+Actions:
+
+- **Schema already in protocol** → import it in the server-v2 route and use it in `defineRoute` (`body`, `success.data`, error `dataSchema` / `detailsSchema`). Do **not** re-declare the schema inline in server-v2.
+- **Schema missing** → add it to `packages/kap-server/src/protocol/rest-<resource>.ts` first (or to the owning v2 domain contract if its service speaks the shape), then consume it from the route. The shared schema is the source of truth; server-v2 never re-declares a v1 wire schema inline.
+- **Schema exists but only v1 uses it** → keep it in `packages/kap-server/src/protocol` and import it into server-v2; do not fork a copy.
+
+#### Schema-fidelity rule (the hard rule)
+
+For a `/api/v1` endpoint, the request and response schemas **must be the established protocol schema** (or a strict superset):
+
+- ✅ **Adding** an optional field is allowed (`field: z.string().optional()`). Old clients ignore it; new clients may send it.
+- ❌ **Renaming** a field, **changing** its type, **tightening** its validation, or **changing its meaning** is a wire break — do not do it in a mirror route. If the v2 domain genuinely needs a different shape, that shape belongs on `/api/v2`, not on the `/api/v1` mirror.
+- ❌ Re-declaring the schema inline in server-v2 (even if it "looks identical") is forbidden — it drifts. One schema, one home: the owning `agent-core-v2` domain contract or `packages/kap-server/src/protocol`.
+
+Self-check: "would a released v1 client get a byte-identical envelope from `packages/kap-server` for this request?" If you cannot answer yes from the shared schema, the route is wrong.
+
+### 3. Choose native Service vs LegacyService
+
+Resolve the v2 Service that will back the route. Two cases:
+
+**Case A — the v2 native Service already matches the v1 contract.** Use it directly. Most data/command Services (`IConfigService`, `IWorkspaceService`, `IApprovalService`, `IQuestionService`, `IFileStore`, …) land here: the route is a thin adapter that resolves the scope, calls the method, and wraps the result. Examples: `routes/config.ts`, `routes/messages.ts`, `routes/questions.ts`, `routes/files.ts`.
+
+**Case B — the v1 contract needs behavior that would distort the v2 domain.** Introduce a **`*LegacyService`** — an edge adapter that implements the v1 contract **on top of** the v2 native Service, leaving the native Service untouched. The v2 native Service keeps serving `/api/v2`; the LegacyService serves `/api/v1`.
+
+Reach for a LegacyService when **any** hold:
+
+- The v1 endpoint carries state the v2 domain deliberately dropped (e.g. a FIFO queue, a `prompt_id`, idempotent `abort`/`steer`, auto-start-next).
+- The v1 method returns a handle/stream that v2 wraps differently, and the v1 clients expect the old envelope shape.
+- Matching v1 would force a `Map<sessionId, …>`-at-`App` anti-pattern or a scope/domain-direction violation into the native Service (see [align.md](align.md) red lines).
+- The native Service's error set / return type would have to grow v1-only branches.
+
+Do **not** put v1 quirks into the native v2 Service "to keep the route simple". That is the conflict this rule exists to prevent: the native Service serves the v2 architecture; the LegacyService serves the wire contract.
+
+#### LegacyService recipe
+
+A LegacyService is a normal v2 Service (service-authoring.md) with one extra convention: its contract is shaped by the **protocol** types, not by the v2 domain model.
+
+```text
+packages/agent-core-v2/src/<domain>Legacy/
+├── <domain>Legacy.ts          ← contract: protocol-typed interface + decorator
+├── <domain>LegacyService.ts   ← impl: delegates to the native v2 Service(s)
+└── errors.ts                  ← v1-compatible error codes (KimiError codes)
+```
+
+Skeleton (matches `prompt/`):
+
+```ts
+// prompt.ts — contract shaped by the v1 wire schema (kap-server/src/protocol)
+import type { PromptSubmitResult, PromptSubmission } from '../../protocol/rest-prompt';
+import { createDecorator, type ServiceIdentifier } from '#/_base/di/instantiation';
+
+export interface IAgentPromptService {
+  readonly _serviceBrand: undefined;
+  submit(body: PromptSubmission): Promise<PromptSubmitResult>;
+  // ...the rest of the v1 contract, typed by protocol
+}
+export const IAgentPromptService: ServiceIdentifier<IAgentPromptService> =
+  createDecorator<IAgentPromptService>('agentPromptLegacyService');
+```
+
+```ts
+// promptService.ts — impl delegates to the native v2 Service
+import { LifecycleScope } from '#/app/scopes';
+import { ScopeActivation, registerScopedService } from '#/_base/di/scope';
+
+constructor(@IAgentPromptService private readonly prompt: IAgentPromptService /*, ... */) {}
+// submit() builds v2-native input, calls the native Service, projects the result
+// back into the protocol PromptSubmitResult.
+
+registerScopedService(
+  LifecycleScope.Agent,            // scope = the lifetime of the legacy state
+  IAgentPromptService,
+  AgentPromptLegacyService,
+  ScopeActivation.OnDemand,
+  'prompt',
+);
+```
+
+Conventions:
+
+- **Name** the domain `<domain>Legacy` and the interface with the scope prefix, `I<Scope><Domain>LegacyService` (e.g. `prompt` / `IAgentPromptService`), per service-authoring.md.
+- **Header comment** must say it is an `edge adapter` and name both the v1 contract it implements and the native v2 Service it leaves untouched (see `prompt.ts`).
+- **Scope** = the lifetime of the *legacy* state it holds (the `prompt` queue is per-agent → `LifecycleScope.Agent`). Apply [orient.md](orient.md) / [design.md](design.md) normally — a LegacyService is not exempt from scope rules.
+- **Delegate, do not duplicate** business logic. The LegacyService translates the v1 contract into native-Service calls and translates results back; the real work stays in the native Service.
+- **Contract types come from the v1 wire schema homes** (the owning v2 domain contract or `kap-server/src/protocol`), so the interface cannot drift from the wire shape.
+
+### 4. Wire the route / actionMap entry
+
+**For `/api/v1` (mirror):** add a route file under `packages/kap-server/src/routes/<resource>.ts` using `defineRoute`, then register it in `registerApiV1Routes.ts`. Resolve the scope from the URL (`session_id` → Session scope, agent → Agent scope via `IAgentLifecycleService.getHandle`), then `accessor.get(IX)` the native or Legacy Service. Match the established verbs, paths (`:sid` / `{session_id}`), and `parseActionSuffix` actions (`:steer`, `:abort`) exactly — sibling routes under `packages/kap-server/src/routes/` are the reference.
+
+```ts
+const route = defineRoute(
+  {
+    method: 'POST',
+    path: '/sessions/{session_id}/prompts',
+    body: promptSubmissionSchema,                 // ← from kap-server/src/protocol
+    params: sessionIdParamSchema,
+    success: { data: promptSubmitResultSchema },  // ← from kap-server/src/protocol
+    errors: {
+      [ErrorCode.SESSION_NOT_FOUND]: {},
+      [ErrorCode.SESSION_BUSY]: {},
+      [ErrorCode.PROMPT_ALREADY_COMPLETED]: { dataSchema: z.object({ aborted: z.literal(false) }) },
+    },
+    operationId: 'submitPrompt',
+    tags: ['prompts'],
+  },
+  async (req, reply) => {
+    try {
+      const result = await resolveLegacy(core, req.params.session_id).submit(req.body);
+      reply.send(okEnvelope(result, req.id));
+    } catch (error) {
+      sendMappedError(reply, req.id, error);
+    }
+  },
+);
+app.post(route.path, route.options, route.handler);
+```
+
+**For `/api/v2` (native):** add a `resource:action` entry to `actionMap` ([edge-exposure.md](edge-exposure.md) §3). If the method fails the direct-exposure rules (returns a handle / stream / bytes, takes a live object), add a wire-safe orchestration method to the owning domain Service first — as `prompts:submit` maps to `IAgentPromptService.submit`, which settles `{turn_id}` engine-side instead of returning the live `PromptHandle`.
+
+### 5. Map errors
+
+The route translates domain `KimiError` codes into protocol `ErrorCode` numbers. Two registries must stay in sync:
+
+- **Domain code** — register in `agent-core-v2/src/errors.ts` (`ErrorCodes`) and throw from the Service (errors.md). Co-located domain errors go in `<domain>Legacy/errors.ts` (e.g. `prompt.not_found`, `session.busy`).
+- **Wire code** — register the matching number in `packages/kap-server/src/protocol/error-codes.ts` and reference it in the route's `errors` map and `sendMappedError`.
+
+```ts
+function sendMappedError(reply, requestId, err) {
+  if (isKimiError(err)) {
+    switch (err.code) {
+      case 'session.not_found':
+      case 'agent.not_found':
+        return reply.send(errEnvelope(ErrorCode.SESSION_NOT_FOUND, err.message, requestId));
+      case 'prompt.not_found':
+        return reply.send(errEnvelope(ErrorCode.PROMPT_NOT_FOUND, err.message, requestId));
+      // ...
+    }
+  }
+  return reply.send(errEnvelope(ErrorCode.INTERNAL_ERROR, String(err), requestId));
+}
+```
+
+Match the v1 route's status codes and idempotent-conflict envelopes (e.g. `prompt.already_completed` → `40903` with `{ data: { aborted: false } }`). The error envelope is part of the wire contract — it is covered by the same schema-fidelity rule.
+
+### 6. Test against the v1 wire shape
+
+Add a `packages/kap-server/test/<resource>.test.ts` that boots the server and hits the route. Assert on the **envelope + protocol shape**, not on the v2 domain internals:
+
+- success envelope `{ code: 0, data: <protocol shape>, request_id }`;
+- each declared error envelope `{ code: <ErrorCode>, msg, data, request_id }`;
+- the fields v1 clients read are present with the same names/types.
+
+Where the route mirrors v1, the test is the regression guard for the schema-fidelity rule: if someone drifts the protocol schema or the projection, this test breaks.
+
+### 7. Verify
+
+- `pnpm -C packages/kap-server test` — server routes green.
+- `pnpm -C packages/kap-server test` — server routes green (incl. any wire-schema guards).
+- `pnpm -C packages/agent-core-v2 test` — native + Legacy Service tests green.
+- `pnpm -C packages/agent-core-v2 run lint:imports` — the import boundaries (v1 ban, kosong subtree) still hold for a LegacyService.
+- `pnpm -C packages/klient test` (optionally with `KIMI_SERVER_URL` for the live legacy suites) when a v1 parity scenario exists.
+
+## Worked example — porting v1 `/sessions/:sid/prompts`
+
+This is the reference alignment (commits `feat(server-v2): port v1 /sessions/:sid/prompts routes`, `feat(server-v2): return turn ids for prompt actions`). It shows all three decisions at once.
+
+**The mismatch.** v1 `IPromptService` is a per-agent *scheduler*: it owns a FIFO queue, assigns `prompt_id`s, supports `steer`/`abort`, and auto-starts the next queued prompt when a turn settles. v2's native `IAgentPromptService` is a *turn driver*: a submission *is* a turn, there is no queue and no `prompt_id`. Forcing the queue into the v2 native Service would distort the v2 domain.
+
+**The split.**
+
+- `/api/v2` keeps the native shape — `prompts:submit` / `steer` / `undo` / `clear` / `cancel` map to the domain Services (`IAgentPromptService.submit` / `submitSteer`, `IAgentConversationUndoService.undo`, `IAgentLoopService.cancelFromUser`) in `actionMap`.
+- `/api/v1` gets an `AgentPromptLegacyService` (`prompt/`, `LifecycleScope.Agent`) that re-implements the v1 scheduler — queue, `prompt_id`, steer/abort, auto-start-next — **on top of** the native `IAgentPromptService`. The `/api/v1` routes consume the LegacyService.
+
+**The schema.** Both surfaces import `promptSubmissionSchema` / `promptSubmitResultSchema` / `promptListResponseSchema` / `promptSteerRequestSchema` / `promptSteerResultSchema` / `promptAbortResponseSchema` from the shared v1 wire schemas (see `packages/kap-server/src/protocol`). The `/api/v1` and `/api/v2` routes are therefore compatible with released clients by construction; the LegacyService projects v2 turn results back into those protocol shapes.
+
+**The errors.** v1 codes (`prompt.not_found`, `session.busy`, `prompt.already_completed`) are registered in `agent-core-v2` (`prompt/errors.ts`) and in `packages/kap-server/src/protocol` (`error-codes.ts`), then mapped in the route's `sendMappedError` — including the idempotent `prompt.already_completed` → `40903 { data: { aborted: false } }`.
+
+**The lesson.** When the v1 contract and the v2 domain disagree, add an adapter (LegacyService) at the edge; do not let the wire contract leak into the native domain. The two surfaces share the protocol schema but not the Service.
+
+## Migration checklist
+
+Before submitting a server-align change:
+
+- [ ] Surface chosen deliberately: `/api/v1` mirror for a v1-matched endpoint, `/api/v2` for a new native capability (both if needed).
+- [ ] For a `/api/v1` mirror, the route matches the established v1 contract (protocol schema + sibling routes) path-for-path, verb-for-verb, action-for-action.
+- [ ] Request and response schemas come from their owning home (the `agent-core-v2` domain contract or `packages/kap-server/src/protocol`); no inline re-declaration in server-v2.
+- [ ] Existing schema fields are unchanged in name, type, and semantics; only optional fields added (if any).
+- [ ] Native v2 Service left clean; v1-only behavior isolated in a `<domain>Legacy` / `I<Domain>LegacyService` edge adapter when the semantics diverge.
+- [ ] LegacyService registered with the correct `LifecycleScope` and a header comment naming it an edge adapter + the native Service it preserves.
+- [ ] Domain error codes registered in `agent-core-v2`; wire codes registered in `packages/kap-server/src/protocol`; route maps them in `sendMappedError`, matching v1's status codes and idempotent envelopes.
+- [ ] Route resolves the scope from the URL by `accessor.get(IX)`; no cached scope; finishes before disposal.
+- [ ] Tests assert the wire envelope + protocol shape; wire-shape guards added/updated where the route mirrors v1.
+- [ ] `lint:imports` passes; the LegacyService did not invert scope direction.
+
+## Red lines (this subskill)
+
+- One wire schema, one home: the owning `agent-core-v2` domain contract or `packages/kap-server/src/protocol`. Never re-declare a v1 wire schema inline in server-v2.
+- A `/api/v1` mirror route must keep every existing schema field's name, type, and semantics; only optional additions are allowed. A different shape belongs on `/api/v2`, not on the mirror.
+- Do not distort the native v2 Service to satisfy a v1 quirk — add a `<domain>Legacy` edge adapter instead. The native Service serves the v2 architecture; the LegacyService serves the wire contract.
+- A LegacyService is still a v2 Service: it follows scope, domain-direction, and DI rules. "Edge adapter" describes its role, not an exemption.
+- The established wire schema (in its owning home — the `agent-core-v2` domain contract or `packages/kap-server/src/protocol`) plus the existing mirror routes are the spec for a `/api/v1` route — match them; do not re-derive the wire shape from the v2 domain model or from memory.
+- Register every new error code in **both** `agent-core-v2` and `packages/kap-server/src/protocol/error-codes.ts`; an unmapped code is a wire break.
+- Events stream over WS (`listen`), never over the REST mirror; do not invent REST polling for something v1 pushed as an event.

.agents/skills/agent-core-dev/service-authoring.md

@@ -0,0 +1,354 @@
+# Topic — Service authoring
+
+How to write a Service in `packages/agent-core-v2`: file layout, naming, what goes in the contract vs the impl, interface style, constructor / field conventions, events, multi-Service domains, and the comment rules. This is the day-to-day reference for stage 3 (implement.md covers the DI *mechanics*; this file covers the *authoring details*).
+
+## File layout
+
+One folder per domain, **camelCase**: `session/`, `sessionActivity/`, `contextMemory/`, `toolDedup/`. Inside, six kinds of files:
+
+```text
+<domain>/
+├── <name>.ts            ← interface file: exactly one IXxx + its createDecorator + the types it owns
+├── <name>Service.ts     ← impl file: exactly one class + exactly one registerScopedService(...)
+├── <concern>.ts         ← pure function(s): no Service suffix, no class, no registration
+├── <targetDomain>.ts    ← contribution file (common): registers into another domain's extension point
+├── <what>.contrib.ts    ← contribution file (uncommon / ad-hoc)
+└── <domain>.types.ts    ← shared types that no single interface owns
+```
+
+- **Strictly one service per file.** An interface file holds exactly one injectable interface and exactly one `createDecorator(...)`; an impl file holds exactly one service implementation class and exactly one `registerScopedService(...)`. No exceptions for "tightly-coupled" groups: even same-scope collaborators each get their own `<name>.ts` + `<name>Service.ts` pair.
+- **Scope is in the filename.** `workspace*.ts` = Workspace, `session*.ts` = Session, `agent*.ts` = Agent, no scope prefix = App (see [Naming](#naming)). The header comment restates the same scope.
+- A domain therefore has as many impl files as it has services (e.g. `logService.ts` for the App `ILogService`, `sessionLogService.ts` for the Session `ISessionLogService`). See [Multi-Service domains](#multi-service-domains).
+
+The package entry `src/index.ts` imports and `export *`s every domain's leaf files precisely (one line per leaf), so importing the package still runs every `registerScopedService(...)` side effect — exactly as the old per-domain barrels did.
+
+## Naming
+
+### Interfaces and classes
+
+| Artifact | Rule | Example |
+|---|---|---|
+| Interface | `I` + scope prefix + PascalCase domain + role suffix. Scope prefix: `Workspace` / `Session` / `Agent` / none (= App). Role suffix is usually `Service`. | `IWorkspaceDirs`, `ISessionLogService`, `IAgentLoopService`, `ILogService` (App) |
+| Class | the interface name minus the leading `I`, plus `Service` if it does not already end in `Service`; `implements` the interface | `SessionLogService implements ISessionLogService`, `AppendLogStoreService implements IAppendLogStore` |
+| Decorator string | lowerCamelCase of the interface name minus the leading `I`; **globally unique and stable** (it surfaces in `CyclicDependencyError.path` and "no service registered" errors) | `createDecorator<ISessionLogService>('sessionLogService')` |
+| Model / non-service types | PascalCase, no `I` prefix | `SessionMeta`, `LogEntry`, `ConfigSection` |
+
+The scope prefix makes a service's lifetime readable from its name. App services carry **no** prefix (App is the default, longest-lived tier); Workspace, Session and Agent services always carry `Workspace` / `Session` / `Agent`. The prefix applies to the interface, the class, and therefore the file names.
+
+> Do **not** use the scope prefix to re-merge domains by lifetime. `IAgentEntityService`, `IAgentDataService`, and `ISessionEntityService` are still banned — the prefix marks lifetime, the rest of the name must still be the real owning domain (`IBackgroundTaskEntityService`, `ISessionMetadata`, `IPermissionRulesService`). See [domain-boundaries.md](domain-boundaries.md).
+
+### File names
+
+File names derive from the interface / class names so that scope and role are visible in the tree:
+
+| File kind | Rule | Example (interface → file) |
+|---|---|---|
+| Interface file | interface name minus leading `I`, minus trailing `Service` if present; acronym-aware lowerCamelCase | `ISessionLogService` → `sessionLog.ts`; `IAppendLogStore` → `appendLogStore.ts`; `ILogService` → `log.ts` |
+| Impl file | the class name; acronym-aware lowerCamelCase | `SessionLogService` → `sessionLogService.ts`; `AppendLogStoreService` → `appendLogStoreService.ts` |
+| Pure-function file | the function / concern name; no `Service` suffix | `formatLogEntry.ts`, `levelEnabled.ts` |
+| Contribution file (common) | the **target** domain name | `config.ts` (registers a config section), `tool.ts`, `flag.ts` |
+| Contribution file (uncommon) | `<what>.contrib.ts` | `slackWebhook.contrib.ts` |
+| Shared-types file | `<domain>.types.ts` | `log.types.ts` |
+| Errors file | `<name>.errors.ts` | `appendLogStore.errors.ts` |
+
+Acronym-aware lowerCamelCase lowercases a leading acronym as a group: `ILLMRequester` → `llmRequester.ts`, `IWSGateway` → `wsGateway.ts`, `IOAuthToolkit` → `oauthToolkit.ts`, `IMcpServerService` → `mcpServerService.ts`.
+
+Because the impl class always ends in `Service` and the interface file never does, the two files of one service never collide — even for `Store` / `Registry` / `Resolver` interfaces (`IAppendLogStore` → `appendLogStore.ts` + `appendLogStoreService.ts`).
+
+## The contract file (`<domain>.ts`)
+
+Holds the public surface of the domain. A typical contract:
+
+```ts
+/**
+ * `greet` domain (Ln) — one-line role.
+ *
+ * Defines the `Greeting` model and the `IGreeter` used by … Bound at … scope.
+ */
+
+import { createDecorator, type ServiceIdentifier } from '#/_base/di/instantiation';
+
+export interface Greeting {              // model — no _serviceBrand
+  readonly message: string;
+}
+
+export interface IGreeter {              // injectable service — carries _serviceBrand
+  readonly _serviceBrand: undefined;
+  hello(): Greeting;
+}
+
+export const IGreeter: ServiceIdentifier<IGreeter> =
+  createDecorator<IGreeter>('greeter');
+```
+
+What belongs here:
+
+- **Model types** (`type` / `interface`) the domain exposes — `SessionMeta`, `LogEntry`, `ConfigSection`.
+- **Service interface(s)** — the contract consumers depend on.
+- **Decorator(s)** — one `createDecorator` per injectable service.
+- **Helper types and pure functions** tightly bound to the contract — e.g. option bags, `satisfies`-checked seeds, predicate functions like `levelEnabled`.
+
+### Which interfaces carry `_serviceBrand`
+
+Only interfaces used as a **DI token** carry `readonly _serviceBrand: undefined`. Everything else does not:
+
+- ✅ Service interface resolved via `@IX` / `accessor.get(IX)` → carries `_serviceBrand`.
+- ❌ Base interface extended by a service (e.g. `ILogger` extended by `ILogService`) → no `_serviceBrand`.
+- ❌ Plain model / data interface (`LogEntry`, `SessionMeta`) → no `_serviceBrand`.
+
+```ts
+export interface ILogger {                        // base interface — no brand
+  info(message: string): void;
+}
+export interface ILogService extends ILogger {    // DI token — branded
+  readonly _serviceBrand: undefined;
+  setLevel(level: LogLevel): void;
+}
+```
+
+## Interface style
+
+- **Sync methods** return a concrete type; **async methods** return `Promise<T>`. Do not wrap a sync return in `Promise`.
+- **Readonly fields** for immutable exposed state: `readonly ready: Promise<void>`, `readonly modelAlias: string | undefined`.
+- **Optional members** with `?`: `flush?(): Promise<void>`, `close?(): Promise<void>`.
+- **Generics** where the caller supplies the shape: `get<T = unknown>(domain: string): T`.
+- **Extend** a base interface to share method groups: `interface ILogService extends ILogger`.
+- **Events** as `readonly onDid…` / `onWill…` properties typed `Event<T>` — see [Events](#events).
+
+```ts
+export interface IConfigService {
+  readonly _serviceBrand: undefined;
+  readonly ready: Promise<void>;
+  readonly onDidChange: Event<ConfigChangedEvent>;
+  get<T = unknown>(domain: string): T;
+  set(domain: string, patch: unknown): Promise<void>;
+  reload(): Promise<void>;
+}
+```
+
+## The impl file (`<domain>Service.ts`)
+
+Holds the concrete class(es) and the top-level registration. A typical impl:
+
+```ts
+/**
+ * `greet` domain (Ln) — `IGreeter` implementation.
+ *
+ * … collaborators as roles ("logs through `log`") … Bound at App scope.
+ */
+
+import { LifecycleScope } from '#/app/scopes';
+import { ScopeActivation, registerScopedService } from '#/_base/di/scope';
+import { ILogService } from '#/log';
+
+import { type Greeting, IGreeter } from './greet';
+
+export class Greeter implements IGreeter {
+  declare readonly _serviceBrand: undefined;
+
+  constructor(@ILogService private readonly log: ILogService) {}
+
+  hello(): Greeting {
+    this.log.info('hello');
+    return { message: 'hi' };
+  }
+}
+
+registerScopedService(LifecycleScope.App, IGreeter, Greeter, ScopeActivation.OnScopeCreated, 'greet');
+```
+
+What belongs here:
+
+- **Imports** — `LifecycleScope` + `ScopeActivation` + `registerScopedService` from `'#/_base/di/scope'`; collaborators via the `#/<domain>` alias; the contract's types + decorator via a relative `./<domain>` import.
+- **Class** — `XxxService implements IXxxService`, with `declare readonly _serviceBrand: undefined`.
+- **Helper classes / functions** used only by this impl (e.g. a built-in writer, an `extractError` helper) — co-located in the same file.
+- **Top-level `registerScopedService(...)`** — one per Service the file owns; importing the impl file runs the registration.
+
+Base class: extend `Service` (from `#/_base/di/service`) when the unit needs capability calls on `this` — `provide` / `effect` / `on` / `get` / `ref` (e.g. contributing a record to a `collection` token). `Service` extends `Disposable`, so `_register` keeps working; constructor-time `provide` / `on` / `effect` calls are buffered and flushed by the kernel after construction, while `get` / `ref` throw inside the constructor (dependencies stay constructor parameters). Otherwise extend `Disposable` — both are full DI units; a service whose own members collide with the `Service` vocabulary (`name` / `state` / `config` / `get`) must stay on `Disposable` (leave a NOTE comment saying so).
+
+## Constructor conventions
+
+- Declare every dependency with `@IX` on a constructor parameter.
+- Use `private readonly` (or `protected readonly`) to store a used dependency as a field.
+- For an injected dependency the class does **not** directly use (e.g. passed through, or only needed to force construction order), drop the visibility modifier and prefix with `_`: `@IEventService _event: IEventService`.
+- Service parameters and static parameters may both appear; the ordering rule depends on how the object is created — see below.
+
+### Parameter order: scoped service vs `createInstance`
+
+- **`registerScopedService` services** — the container injects only the `@IX` parameters; any static parameters must have defaults and are left at their default when the container builds the instance. Order is therefore not enforced by the container, but the common style is **`@IX` parameters first, optional static parameters after**:
+
+  ```ts
+  constructor(
+    @ILogWriterService protected readonly writer: ILogWriterService,
+    private readonly bound: LogContext = {},
+    level: LogLevel = 'info',
+  ) {}
+  ```
+
+- **`createInstance` objects** (non-singletons built with `instantiation.createInstance(Ctor, …staticArgs)`) — static parameters **must come first**, service parameters after, because the caller passes the static prefix positionally:
+
+  ```ts
+  constructor(
+    private readonly input: string,                 // static — passed by caller
+    @ILogService private readonly log: ILogService, // service — injected
+  ) {}
+  ```
+
+### Factory methods
+
+A scoped Service may expose a factory method that returns a **new** instance of itself (or a related class) with extra context bound — e.g. `ILogger.child(ctx)` returns `new LogService(this.writer, { …this.bound, …ctx }, this._level)`. This is not a DI violation: it is an explicit factory, not a request for the container to build a Service. Do not use it to circumvent scope or singleton semantics.
+
+## Fields and state
+
+- `private readonly` for fields set once at construction (injected deps, derived config).
+- `private _name` (underscore prefix) for mutable private state: `private _level: LogLevel`.
+- `readonly` public fields only for immutable exposed state; prefer a getter (`get level()`) when the value can change.
+- Keep state minimal — a Service owns only the state that matches its scope's identity (design.md §2). Anything else belongs in a different Service.
+
+### Runtime state goes into the per-scope state container
+
+Workspace/Session/Agent-scope Services register their runtime state into the scope's state container (`IWorkspaceStateService` / `ISessionStateService` / `IAgentStateService`, all over `_base`'s `StateRegistry`) instead of holding it in bare instance fields, so per-scope state lives in one observable place (`snapshot()` / `onDidChange`) and dies with the scope. Reference: `session/interaction/interactionService.ts`.
+
+- Declare keys in the domain file and export them: `export const interactionPendingKey = defineState<Map<string, Pending>>('interaction.pending', () => new Map())` — `<domain>.<field>` naming, factory initializers.
+- Inject `@ISessionStateService private readonly states` (or the Agent token) and `this.states.register(key)` per key at the top of the constructor.
+- Replace the field with accessors: a getter for collections only mutated in place (`this.foo.add(...)` keeps working — the container stores references, never clones); add a setter routed through `states.set` for reassigned scalars. Call sites stay unchanged.
+- Values must be plain data: scalars, arrays, and literal objects/Maps/Sets built from them. Never register class instances, resource handles (disposables, abort controllers, Promise locks), or objects holding service references — the regression precedent: one registry key whose class instances reached the whole DI graph deep-copied to hundreds of MB on `snapshot()` and OOM-killed the server. This means registries whose entries carry resources (the tool registry, the task map, prompt queues) stay as instance fields alongside Emitters, hook slots, disposable slots, waiter arrays, caches, and queue instances.
+- `snapshot()` additionally recurses plain data only: values with a custom prototype collapse to a `'(ClassName)'` marker — a `_base`-level backstop, not a license to register resource-bearing values.
+- Durable, replayable state does NOT belong here — it stays on wire Models. The container is memory-only.
+
+## Events
+
+v2 has two distinct event mechanisms. Pick by audience:
+
+### `Event<T>` / `Emitter` — typed property on a Service
+
+Use when a Service exposes a typed event its consumers subscribe to. Lives in `'#/_base/event'`.
+
+```ts
+// contract
+import type { Event } from '#/_base/event';
+export interface IConfigService {
+  readonly onDidChange: Event<ConfigChangedEvent>;
+}
+
+// impl
+import { Emitter, type Event } from '#/_base/event';
+export class ConfigService extends Disposable implements IConfigService {
+  private readonly _onDidChange = this._register(new Emitter<ConfigChangedEvent>());
+  readonly onDidChange: Event<ConfigChangedEvent> = this._onDidChange.event;
+
+  private notify(changed: ConfigChangedEvent): void {
+    this._onDidChange.fire(changed);
+  }
+}
+```
+
+Conventions:
+
+- Back the public `Event<T>` with a private `Emitter<T>`, registered with `this._register(...)` so it disposes with the Service.
+- Naming: `onDid…` for "happened" (past tense, after the fact); `onWill…` for "about to happen" (may allow `waitUntil` participation / veto — see `AsyncEmitter` / `IWaitUntil` in `'#/_base/event'`).
+- A service must be constructed before consumers can subscribe to its events. Use the default `OnScopeCreated` activation when subscriptions must be available as soon as the scope is ready.
+
+### `IEventService` — global pub-sub bus
+
+Use to broadcast protocol events across domains. Lives in `'#/event'`.
+
+```ts
+export interface IEventService {
+  readonly _serviceBrand: undefined;
+  publish(event: ProtocolEvent): void;
+  subscribe(handler: (event: ProtocolEvent) => void): IDisposable;
+}
+```
+
+Inject `@IEventService` and `publish(...)`; `subscribe(...)` returns an `IDisposable` to register with `this._register(...)`. This is the bus for "a fact happened, react if you care" (design.md §4) — not for typed per-Service events.
+
+## Multi-Service domains
+
+A domain may define several Services. Each Service gets its own pair of files regardless of scope or coupling:
+
+- **One pair per Service** → `<name>.ts` for the contract + `<name>Service.ts` for the implementation.
+- **Different scopes** → the scope prefix in the Service name makes this obvious (`logService.ts` for App `ILogService`, `sessionLogService.ts` for Session `ISessionLogService`).
+- **Same interface, multiple role tokens** (e.g. `IAtomicDocumentStore` and `IAtomicTomlDocumentStore` share one interface type but are distinct DI tokens) → each token is its own Service identity and must be registered and resolved independently.
+
+There is no `index.ts` barrel: consumers import each contract/impl from its precise leaf path (e.g. `import { ILogService } from '#/log/log'`), never the domain directory.
+
+## No barrel — the package entry loads leafs precisely
+
+A domain has **no `index.ts` barrel**. Its files are the contract leaf (`<name>.ts`) and the impl leaf (`<name>Service.ts`), and consumers import the precise file — never the directory:
+
+```ts
+import { IGreeter, type Greeting } from '#/greet/greet';
+```
+
+Self-registration is unchanged: `greetService.ts` keeps its top-level `registerScopedService(...)`. The package entry `src/index.ts` loads the domain's leafs precisely — `export *` for the contract, a side-effect `import` for the impl — one line per leaf:
+
+```ts
+// src/index.ts
+export * from './greet/greet';
+import './greet/greetService';
+```
+
+Importing the package therefore fires every `register*` side effect, exactly as the old per-domain barrels did. When you add a new domain, write the contract + impl leafs (with their top-level `register*`), then add the leaf path(s) to `src/index.ts`. **Do not create an `index.ts`.**
+
+- Load the impl file too — its top-level `registerScopedService(...)` only runs when the module is imported.
+- `export *` helper modules only if they are part of the domain's public surface.
+- Each leaf's file-header comment still names the domain, scope, and (for impls) the `register*` binding it owns.
+
+## Comments
+
+- **File-header comment is mandatory** and the only place comments live (orient.md). State the identity line, the role, collaborators (impls), and scope.
+- **Methods and fields carry no comments by default.** Well-named identifiers and types say *what*; the code is the source of truth for *how*.
+- Write an inline comment only when the *why* is non-obvious (a hidden constraint, a subtle invariant, a workaround). One short line.
+- For unimplemented stubs, throw `NotImplementedError('feature')` rather than `throw new Error('TODO: …')` (errors.md).
+
+## Complete minimal example
+
+```ts
+// greet/greet.ts
+import { createDecorator, type ServiceIdentifier } from '#/_base/di/instantiation';
+
+export interface Greeting { readonly message: string; }
+
+export interface IGreeter {
+  readonly _serviceBrand: undefined;
+  hello(): Greeting;
+}
+
+export const IGreeter: ServiceIdentifier<IGreeter> = createDecorator<IGreeter>('greeter');
+```
+
+```ts
+// greet/greetService.ts
+import { LifecycleScope } from '#/app/scopes';
+import { ScopeActivation, registerScopedService } from '#/_base/di/scope';
+import { type Greeting, IGreeter } from './greet';
+
+export class Greeter implements IGreeter {
+  declare readonly _serviceBrand: undefined;
+  hello(): Greeting { return { message: 'hi' }; }
+}
+
+registerScopedService(LifecycleScope.App, IGreeter, Greeter, ScopeActivation.OnScopeCreated, 'greet');
+```
+
+```ts
+// src/index.ts
+export * from './greet/greet';
+import './greet/greetService';
+```
+
+## Red lines (this topic)
+
+- One folder per domain, camelCase; one service per file pair: contract `<name>.ts` + impl `<name>Service.ts`; **no `index.ts` barrel** — `src/index.ts` loads each leaf file precisely.
+- Exactly one injectable interface and one `createDecorator(...)` per contract file.
+- Exactly one service implementation class and one `registerScopedService(...)` per impl file.
+- `IXxxService` / `XxxService` naming; decorator string is lowerCamelCase, globally unique, and stable.
+- Name Services by owning domain, never by scope (`IAgentEntityService`, `ISessionEntityService`).
+- `_serviceBrand` only on interfaces used as a DI token — never on base interfaces or plain models.
+- Sync methods return concrete types, async return `Promise<T>`; do not `Promise`-wrap sync work.
+- `createInstance` objects put static parameters before service parameters; scoped services put `@IX` parameters first (static params need defaults).
+- Never `new` a `@IService`-carrying Service — except inside an explicit factory method, which is not a DI request.
+- Events: typed per-Service event → `Event<T>`/`Emitter` from `'#/_base/event'`; cross-domain broadcast → `IEventService` from `'#/event'`.
+- `src/index.ts` must import/export every leaf file (including the impl) so each `register*` side effect runs.
+- File-header comment only; methods/fields carry no comments by default; stubs throw `NotImplementedError`.

.agents/skills/agent-core-dev/telemetry.md

@@ -0,0 +1,97 @@
+# Topic — Telemetry
+
+Telemetry infrastructure for agent-core-v2: how business services emit events, how context propagates, and how events reach a destination through appenders.
+
+Telemetry is a **layer-1 root** domain (alongside `log`): the facade lives at `App` scope (a per-Agent ambient context service is bound at `Agent` scope), stateless, with no business-domain dependencies. It is a thin facade — enrichment, batching, and transport belong to the appenders, not to this layer.
+
+## Where things live
+
+- `src/app/telemetry/telemetry.ts`: contract — `ITelemetryService` (facade), `ITelemetryAppender` (destination), `TelemetryProperties`, `nullTelemetryAppender`, and `TelemetryServiceOptions`.
+- `src/app/telemetry/events.ts`: event registry — `telemetryEventDefinitions` pairs every business event's property type with review metadata (owner / purpose / per-property comment); the single source of truth for `track2`. Agent-scope events register with `defineAgentTelemetryEvent<P>` and compose the ambient `AgentTelemetryEventContext` (`agent_id`) into their wire schema; all other events register with `defineTelemetryEvent<P>`.
+- `src/app/telemetry/telemetryService.ts`: `TelemetryService` impl + `registerScopedService(LifecycleScope.App, …)`.
+- `src/app/telemetry/agentTelemetryContext.ts` + `agentTelemetryContextService.ts`: `IAgentTelemetryContextService` — Agent-scoped mutable request context (`mode` / `provider_type` / `protocol` / `turn_id` / `trace_id`) snapshot into turn telemetry at launch. Agent identity (`agent_id`) is not part of it — identity is bound by the Agent-scoped `ITelemetryService` view.
+- `src/app/telemetry/consoleAppender.ts`: `ConsoleAppender` — echoes events to a log function (dev / debug).
+- `src/app/telemetry/cloudAppender.ts`: `CloudAppender` — sanitizes + PII-cleans properties, batches + enriches + posts to the telemetry endpoint.
+- `src/app/telemetry/cloudTransport.ts`: `CloudTransport` — HTTP transport behind `CloudAppender`.
+- `src/app/telemetry/privacy.ts`: outbound PII redaction (`cleanTelemetryProperties`) — URLs, emails, tokens, and absolute file paths become `<REDACTED: ...>` labels; `node_modules/` tails are kept.
+
+## Emitting events (business services)
+
+Inject `ITelemetryService` and call `track2` with a registered event:
+
+```ts
+import { ITelemetryService } from '#/app/telemetry/telemetry';
+
+constructor(@ITelemetryService private readonly telemetry: ITelemetryService) {}
+
+this.telemetry.track2('cron_fired', { task_id: taskId, coalesced_count: 0, stale: false, buffered: false, recurring: true });
+```
+
+`track2` is checked against the registry in `events.ts` at compile time: the event name must be a key of `telemetryEventDefinitions`, and the properties must match the registered interface exactly (extra or missing keys are compile errors). **New events must be registered first** — add a properties interface, then register it with `defineAgentTelemetryEvent<P>({ owner, comment, properties })` when every emission path goes through an Agent-scoped `ITelemetryService` view, or `defineTelemetryEvent<P>` otherwise (including events with any non-Agent emission path, e.g. `image_compress` from the kap-server prompt routes), documenting every property. For agent-scope events the registered interface is the business payload only: ambient `agent_id` is declared once in `AgentTelemetryEventContext` and composed into the wire schema, so it must not appear in the payload or at call sites. Naming: snake_case for events and properties, unit suffixes (`_ms` / `_count` / `_bytes`), no user content or file paths; `test/app/telemetry/events.test.ts` enforces the conventions. The low-level `track` remains for appender plumbing and tests only.
+
+`TelemetryService.track` merges the bound context into the properties and fans the event out to every registered appender. A single throwing appender is isolated via `onUnexpectedError` and never blocks the rest.
+
+### Context (sessionId / agent_id / turn_id)
+
+The root service carries a bound context (`sessionId`) that is merged into every event, and each Agent scope gets its own telemetry view seeded with `agent_id` (by `agentLifecycle`), so Agent-scoped services emit their identity without call-site plumbing. Mutable per-agent request context (`mode` / `provider_type` / `protocol` / `turn_id` / `trace_id`) lives in `IAgentTelemetryContextService` and is snapshot into a per-turn view at turn launch. Derive a scoped view with `withContext`:
+
+```ts
+const child = telemetry.withContext({ agent_id: 'agent-0' });
+child.track2('tool_call', { turn_id: 1, tool_call_id: 'c1', tool_name: 'bash', outcome: 'success', duration_ms: 12 });   // wire carries sessionId + agent_id
+```
+
+`withContext(patch)` returns a lightweight forwarding view: transport state (appenders, enabled flag) stays with the root, so later `addAppender` / `setEnabled` calls apply to every view, and per-call properties override bound context on key collision. `setContext(patch)` on the root mutates the root context and propagates to appenders that implement `setContext`; on a view it mutates only that view's own context.
+
+## Appenders (destinations)
+
+An appender is the destination an event is fanned out to. It is **not a DI Service** — it is a plain object implementing `ITelemetryAppender`, held by `TelemetryService`.
+
+```ts
+export interface ITelemetryAppender {
+  track(event: string, properties?: TelemetryProperties): void;
+  withContext?(patch: TelemetryContextPatch): ITelemetryAppender;
+  setContext?(patch: TelemetryContextPatch): void;
+  flush?(): Promise<void> | void;
+  shutdown?(): Promise<void> | void;
+}
+```
+
+Built-in appenders:
+
+- `ConsoleAppender` — `[telemetry] <event> <json>` to a log function (default `console.log`); options `prefix` / `pretty` / `log`.
+- `CloudAppender` — batches events, enriches with common context (`app_name` / `version` / `platform` / …), and posts to `https://telemetry-logs.kimi.com/v1/event` through `CloudTransport` (Bearer auth, retry, on-disk fallback). Options: `homeDir` / `deviceId` / `sessionId?` / `appName` / `version` / `uiMode?` / `model?` / `getAccessToken?` / `endpoint?` / `flushThreshold?` / `flushIntervalMs?`.
+
+### Registering appenders (bootstrap)
+
+Appenders are added after the App scope exists, by resolving the service and calling `addAppender`:
+
+```ts
+const app = createAppScope();
+const telemetry = app.accessor.get(ITelemetryService);
+
+telemetry.addAppender(new ConsoleAppender({ prefix: '[dev]' }));   // dev echo
+telemetry.addAppender(new CloudAppender({                          // production
+  homeDir, deviceId, sessionId,
+  appName: 'kimi-code', version, uiMode: 'shell', model,
+  getAccessToken: () => auth.getCachedAccessToken(KIMI_CODE_PROVIDER_NAME),
+}));
+```
+
+`addAppender` returns an `IDisposable` that removes the appender when disposed. `setAppender(appender)` resets to a single appender (mainly for tests). `removeAppender(appender)` drops one.
+
+> There is no production bootstrap wired yet — `TelemetryService` defaults to `[nullTelemetryAppender]`, so `track(...)` is a no-op until `addAppender` is called at startup.
+
+## Lifecycle
+
+- `setEnabled(false)` drops `track` (service-level switch); `setEnabled(true)` resumes. `flush` / `shutdown` are unaffected by the switch.
+- `flush()` / `shutdown()` fan out to all appenders concurrently; a single rejecting appender is swallowed. Await `shutdown()` before process exit so buffered events (e.g. in `CloudAppender`) are sent.
+
+## Red lines (this topic)
+
+- Business services depend only on `ITelemetryService` — never import an appender class.
+- Telemetry is layer-1 root: do not inject any business-domain service into it, and keep the facade at `App` scope (only the ambient context service binds at `Agent`).
+- Appenders are plain `ITelemetryAppender` objects, not DI Services — register them with `addAppender`, never via `registerScopedService`.
+- `track` is fire-and-forget and must not throw; appender `track` must be synchronous — buffer and send asynchronously via `flush` / `shutdown`.
+- Await `telemetry.shutdown()` before process exit when a buffering appender is registered.
+- Keep event names stable; register every business event in `events.ts` and emit via `track2` — properties must be JSON-serializable primitives (non-primitives are dropped with a warning by `CloudAppender`).
+- Agent identity is ambient: agent-scope events go through `defineAgentTelemetryEvent` and get `agent_id` from the scoped telemetry view — do not pass `agent_id` at business call sites (per-event identities such as `subagent_created` and the cron events are the exception).

.agents/skills/agent-core-dev/test.md

@@ -0,0 +1,270 @@
+# Stage 4 — Test
+
+Exercise the **same path production uses**: a service is reached by its interface through the container, its `@IService` dependencies are resolved from the container, and — where the scope layer matters — through the scope tree. Tests that `new` a service and paper over its constructor with hand-rolled objects bypass that path and let the `registerScopedService(IX → Impl)` binding rot untested.
+
+`@IService` parameter decorators run under vitest (the build uses `experimentalDecorators`), so fixtures declare dependencies exactly like production code. There is **no** `param()` helper, no manual `(Id as …)(Ctor, '', 0)`, and no capturing `accessor` inside a constructor to synchronously `.get()` a peer.
+
+## The one rule
+
+**Resolve the system under test by its interface, through the container. Never call `new` on a production service whose constructor carries `@IService` dependencies.**
+
+```ts
+// ✅ resolve by interface — the IX → Sut binding is exercised
+ix.set(IMessageService, new SyncDescriptor(MessageService));
+const svc = ix.get(IMessageService);
+
+// ❌ construct the implementation directly — the registration is never run
+const svc = new MessageService(stubContext);
+```
+
+Resolving by interface is what makes `registerScopedService(ISut, Sut, …)` part of the test. Constructing the class directly (or via `ix.createInstance(Sut)`) tests the class in isolation but leaves the binding, the scope layer, and the delayed/eager flag unverified.
+
+Pure functions, value objects, and services with **no** `@IService` dependencies may be constructed directly.
+
+The only other exception is a test that genuinely needs **two independent instances** of the same service with different dependencies (e.g. constructing two `TurnService`s with different `ILoopRunner`s). A singleton-per-container resolution cannot produce both, so `ix.createInstance(Impl)` is acceptable there — annotate it with a comment explaining why.
+
+## Two harnesses
+
+Pick the harness by *whether the scope layer is part of what you are testing*.
+
+| Under test | Harness | Resolve the SUT with |
+|---|---|---|
+| A single service's behavior (unit) | `TestInstantiationService` (flat) | `ix.get(ISut)` after `ix.set(ISut, new SyncDescriptor(Sut))` |
+| Cross-scope wiring, or which layer a service lives in | `createScopedTestHost` (scope tree) | `host.<scope>.accessor.get(ISut)` |
+
+### Unit harness — `TestInstantiationService`
+
+Default for domain service unit tests. It is an `InstantiationService` that also implements `ServicesAccessor` (so you can `ix.get(...)` directly) and owns sinon (so `dispose()` restores stubs).
+
+```ts
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { DisposableStore } from '#/_base/di/lifecycle';
+import { createServices } from '#/_base/di/test';
+import type { TestInstantiationService } from '#/_base/di/test';
+import { registerRecordsServices } from '../records/stubs';
+
+describe('XxxService', () => {
+  let disposables: DisposableStore;
+  let ix: TestInstantiationService;
+
+  beforeEach(() => {
+    disposables = new DisposableStore();
+    ix = createServices(disposables, {
+      base: [registerRecordsServices],
+      additionalServices: (reg) => {
+        reg.define(IContextService, ContextService);   // 1. real collaborator, by interface
+        reg.define(IXxxService, XxxService);           // 2. system under test, by interface
+      },
+    });
+  });
+  afterEach(() => disposables.dispose());
+
+  it('does the thing', () => {
+    const svc = ix.get(IXxxService);                 // 3. resolve by interface
+    expect(svc.thing()).toBe('…');
+  });
+});
+```
+
+`createServices` builds the container from domain **service groups** plus per-test overrides (see Service groups). Reach for `ix.stub(...)` / `ix.set(...)` directly only inside an `it` when a single test needs to swap a registration:
+
+- whole service, partial object: `ix.stub(IId, { method() { return … } })`;
+- single method: `ix.stub(IId, 'method', value)` returns a sinon stub; `ix.spy(IId, 'method')` returns a spy;
+- a prebuilt instance or descriptor: `ix.set(IId, instance)` / `ix.set(IId, new SyncDescriptor(Impl))`;
+- when a collaborator's behavior must vary per test, model it as a `Test*Service` subclass whose methods read suite-scoped `let` variables rather than rebuilding the container each test.
+
+### Scope harness — `createScopedTestHost`
+
+Reach for this only when *which layer a service lives in* is itself the thing being asserted, or when the SUT reads from parent/child scopes. It builds the real `Scope` tree and resolves through it.
+
+```ts
+import { beforeEach, describe, expect, it } from 'vitest';
+import { LifecycleScope } from '#/app/scopes';
+import {
+  ScopeActivation,
+  _clearScopedRegistryForTests,
+  registerScopedService,
+} from '#/_base/di/scope';
+import { createScopedTestHost, stubPair } from '#/_base/di/test';
+
+describe('XxxService (scoped)', () => {
+  beforeEach(() => {
+    _clearScopedRegistryForTests();
+    registerScopedService(
+      LifecycleScope.Agent,
+      IXxxService,
+      XxxService,
+      ScopeActivation.OnDemand,
+      'xxx',
+    );
+  });
+
+  it('resolves from the Agent scope with ancestor deps injected', () => {
+    const host = createScopedTestHost([stubPair(ILogService, stubLog())]);
+    const agent = host.child(LifecycleScope.Agent, 'main');
+    const svc = agent.accessor.get(IXxxService);   // by interface
+    expect(svc.thing()).toBe('…');
+    host.dispose();
+  });
+});
+```
+
+Always `_clearScopedRegistryForTests()` and re-register explicitly in `beforeEach`. Do not rely on a production module's top-level `registerScopedService(...)` side effect: import order then becomes part of the test, and another suite's `_clearScopedRegistryForTests()` can wipe it.
+
+## Register the SUT by interface
+
+Whichever harness you use, the SUT is registered under its interface (`ix.set(IX, new SyncDescriptor(Impl))` or `registerScopedService(scope, IX, Impl, …)`) and resolved by that interface. This is non-negotiable: it is the only thing that keeps the production registration honest.
+
+A test that does `ix.createInstance(Impl)` is testing the class, not the service. Convert those (see Migration).
+
+## Shared stubs
+
+Hand-rolled stubs (`noopLog`, `noneEvent`, `unusedRecords`, …) must not be copied between test files. Each domain that owns a frequently-stubbed interface exports a stub from a `stubs.ts` **in the `test/` tree**, never from `src/`:
+
+```text
+test/log/stubs.ts         →  stubLog() / stubLogger()
+test/turn/stubs.ts        →  stubTurn()
+test/records/stubs.ts     →  stubAgentRecords()
+test/environment/stubs.ts →  stubEnvironment()
+```
+
+All test support lives under `test/` so test-only code stays out of the production source tree. Because `tsdown` builds from `src/index.ts`, anything under `test/` is unreachable from the entry and is never bundled into `dist/`.
+
+Conventions:
+
+- export a **factory** (`stubXxx()`), not a shared singleton, so tests cannot leak state through a stub;
+- name it `stub<Interface>` — e.g. `stubAgentRecords`;
+- the stub satisfies the full interface so the compiler, not a cast, guarantees it stays in sync;
+- import it with a **relative path** — `./stubs` from the same domain's tests, `../<domain>/stubs` from another domain. Never import stubs from `#/…` (that alias is for production `src/`) and never import one test file from another;
+- a `stubs.ts` may import its domain's production types via `#/<domain>/…`.
+
+If a stub is needed by two test files, it belongs in that domain's `test/<domain>/stubs.ts`.
+
+## Service groups
+
+Most unit tests stub the same handful of collaborators (`ILogService`, `IAgentRecords`, `IConfigService`, `ITelemetryService`, …). Rather than repeat `ix.stub(...)` lines in every `beforeEach`, each domain exports a `register*Services` function from its `stubs.ts` that registers the default test doubles for that domain:
+
+```ts
+// test/log/stubs.ts
+export function registerLogServices(reg: ServiceRegistration): void {
+  reg.defineInstance(ILogService, stubLog());
+}
+```
+
+`createServices(disposables, { base, additionalServices })` composes them:
+
+- `base` — an ordered list of service groups. Each group's registrations are deduped (first writer wins), so groups supply safe defaults without clobbering each other.
+- `additionalServices` — applied after `base`. Registrations here **overwrite** any base default, so a test can swap a stub for a spy, register the system under test, or supply a one-off collaborator.
+
+```ts
+ix = createServices(disposables, {
+  base: [registerLogServices, registerConfigServices, registerRecordsServices],
+  additionalServices: (reg) => {
+    reg.definePartialInstance(IAgentKaos, {});        // one-off collaborator
+    reg.define(IAgentRecords, spyRecords);             // override a base default
+    reg.define(IXxxService, XxxService);               // system under test
+  },
+});
+```
+
+`ServiceRegistration` offers three verbs:
+
+- `define(id, Ctor)` — lazy `SyncDescriptor`; the service is instantiated on first resolve. Use for real collaborators and the system under test.
+- `defineInstance(id, instance)` — a fully-built instance (a fake such as `stubLog()`, or `new ConfigRegistry()`).
+- `definePartialInstance(id, { ... })` — a partial mock; only the supplied members are provided. Use for collaborators the test does not exercise.
+
+Conventions:
+
+- a group registers the domain's services **as dependencies** (a fake, or a `{}` partial when no fake exists yet). When a service is the system under test, the test registers the real implementation via `additionalServices` and does not rely on the group's default for it;
+- keep groups small and domain-local. A service that is almost always the system under test, or that every consumer configures differently, should not have a group — register it inline via `additionalServices`;
+- import groups with a **relative path** (`../<domain>/stubs`), never from `#/…`.
+
+`createServices` defaults to `strict: false` (missing dependencies warn rather than throw), matching `new TestInstantiationService()`. Pass `strict: true` to surface unregistered `@IService` dependencies.
+
+## Declaring dependencies
+
+Always use `@IService` constructor decorators — in fixtures and in production services alike.
+
+```ts
+// ✅
+class Consumer {
+  constructor(@IGreeter private readonly greeter: IGreeter) {}
+}
+
+// ❌ no param() helper, no inline cast
+class Consumer {
+  constructor(private readonly greeter: IGreeter) {}
+}
+param(IGreeter, Consumer, 0);
+```
+
+Because the decorator runs when the class is defined, the `createDecorator` identifier must be initialized **before** the class that uses it. Declare the identifier, then the class:
+
+```ts
+const IDep = createDecorator<IDep>('dep');
+class Consumer {
+  constructor(@IDep private readonly dep: IDep) {}
+}
+```
+
+For two services that depend on each other (a cycle), declare both identifiers first, then both classes, so neither class references an uninitialized binding.
+
+Declare fixtures at module top, interface + decorator + implementation co-located, and keep `_serviceBrand` on the interface when it represents a real service — `GetLeadingNonServiceArgs` relies on the brand to tell service parameters apart from static ones. Pure throwaway fixtures may omit `_serviceBrand`.
+
+## Lifecycle / teardown
+
+One `DisposableStore` per suite. Add the **container** and any event subscriptions to it; dispose in `afterEach`.
+
+```ts
+beforeEach(() => { disposables = new DisposableStore(); /* … */ });
+afterEach(() => disposables.dispose());
+```
+
+Do **not** add the system-under-test itself to the store. `TestInstantiationService` disposes every service it creates when the container is disposed, so `ix.get(IX)` instances are cleaned up automatically via `disposables.add(ix)`. Wrapping the SUT in `disposables.add(...)` would double-dispose it. For the same reason, do not call `svc.dispose()` at the end of a test unless you are asserting something about disposal itself.
+
+Scope-host tests call `host.dispose()` in `afterEach` (or at the end of the `it`). Route teardown through the store so ordering is deterministic and nothing leaks when a test fails mid-way.
+
+## Cascade: asserting unit state
+
+The cascade engine's test vocabulary lives in two files: `test/_base/di/cascade.test.ts` (the mechanism matrix, including cross-scope orchestration) and `test/_base/di/provide.test.ts` (provide/unprovide semantics).
+
+- **Assert unit states, not internals.** Every container exposes its engine as `container.cascade`: `stateOf(IX)` → `'Pending' | 'Activating' | 'Active' | 'Unloading' | 'Failed'`; `failureOf(IX)` → the sticky error of a `Failed` unit; `pendingSnapshot()` → the waiting-area contents.
+- **The waiting area parks units with unregistered dependencies** — a unit whose declared deps are missing stays `Pending` (no throw), so a test must seed the full dependency chain. Example: a root→agent chain with no session container must seed the session-scope dependency explicitly — `ix.set(ISessionStateService, new SessionStateService())` in `test/session/agentLifecycle/agentLifecycle.test.ts` — or the dependent unit never activates.
+- **Eager activation failure is sticky `Failed`, not a scope-creation throw.** Assert state + rethrow: `expect(ix.cascade.stateOf(IX)).toBe('Failed')`, then `expect(() => ix.invokeFunction((a) => a.get(IX))).toThrow(…)`. Do not expect scope/host creation itself to throw for a failing eager constructor.
+
+## Assertions and naming
+
+- One behavior per `it`; describe observable behavior (`child shadows parent registration`), not implementation (`calls _getOrCreateServiceInstance`).
+- For cycles, assert `CyclicDependencyError` and its `path` array (e.g. `['A', 'B', 'A']`), not merely `toThrow`.
+- For disposal order, capture events in an array and assert the sequence (`['C', 'B', 'A']` — children before parents).
+
+## Migrating existing tests
+
+Most legacy tests build the SUT with `ix.createInstance(Impl)`. Converting one is mechanical:
+
+1. import the interface (`IX`) and the descriptor;
+2. register the SUT by interface — `reg.define(IX, Impl)` inside `additionalServices` (or `ix.set(IX, new SyncDescriptor(Impl))`);
+3. replace `ix.createInstance(Impl)` with `ix.get(IX)`;
+4. drop the `disposables.add(...)` wrapper around the SUT and any trailing `svc.dispose()` — the container disposes it;
+5. replace any hand-rolled collaborator object with the domain's shared stub or service group (or add one to `test/<domain>/stubs.ts` if it does not exist);
+6. delete now-unused imports.
+
+Before / after:
+
+```ts
+// before
+const svc = ix.createInstance(MessageService);
+
+// after — registration in beforeEach additionalServices
+reg.define(IMessageService, MessageService);
+// after — resolution in the test body
+const svc = ix.get(IMessageService);
+```
+
+## Red lines (this stage)
+
+- Resolve the SUT by interface — never `new` a production service with `@IService` deps; prefer `ix.get(IX)` over `ix.createInstance(Impl)`.
+- Shared stubs live in `test/<domain>/stubs.ts` (never `src/`); import by relative path, never `#/...`.
+- Scope tests call `_clearScopedRegistryForTests()` and re-register explicitly in `beforeEach`; do not rely on production import-order side effects.
+- One `DisposableStore` per suite; add the container, dispose in `afterEach`; do not add the SUT itself.
+- Declare fixture dependencies with `@IService`; initialize `createDecorator` identifiers before the classes that use them.

.agents/skills/agent-core-dev/verify.md

@@ -0,0 +1,32 @@
+# Stage 5 — Verify & submit
+
+Run the guards and re-scan the red lines before submitting.
+
+## Commands
+
+Run from the package (or with `--filter @moonshot-ai/agent-core-v2`):
+
+- `pnpm --filter @moonshot-ai/agent-core-v2 lint:imports` — import-boundary guard (`scripts/check-import-boundaries.mjs`). Catches v1 imports (`@moonshot-ai/agent-core`) and kosong subtree violations.
+- `pnpm --filter @moonshot-ai/agent-core-v2 typecheck` — `tsc -p tsconfig.json --noEmit`.
+- `pnpm --filter @moonshot-ai/agent-core-v2 test` — `vitest run`.
+
+## Changesets (when the change ships through the CLI)
+
+If the change is user-facing and ships through the CLI, generate a changeset with the repository's `gen-changesets` skill (root `AGENTS.md` workflow). `agent-core-v2` is an internal package; if its change enters the CLI bundle, the changeset lists `@moonshot-ai/kimi-code` and describes the real change — do not present an internal-only change as a user-facing feature. Never write a `major` bump without explicit user confirmation.
+
+## Pre-submit checklist
+
+Walk the stages you touched and confirm:
+
+- **Design** — scope follows state identity; no `Map<sessionId, …>` at `App`; dependency arrows do not make a foundational layer know an upstream one; no cycle was routed around.
+- **Implement** — no `new` on `@IService`-carrying classes; `@IX` on constructor params only (service params after static params); interface + impl carry `_serviceBrand`; decorator names unique; coded errors only; flags for unreleased behavior.
+- **Test** — SUT resolved by interface; stubs under `test/`; scope tests re-register after `_clearScopedRegistryForTests()`; teardown through one `DisposableStore`.
+- **Files** — header comments describe role + scope only; registration runs from the impl file's top level; the new domain is exported from `src/index.ts`.
+
+Then re-read the [global red lines](SKILL.md#global-red-lines) once — they catch most cross-stage mistakes in a single scan.
+
+## Red lines (this stage)
+
+- Do not skip `lint:imports` — it is the only automated check for the v1-import ban and the kosong subtree rules.
+- Do not list internal packages in a changeset when the change enters the CLI bundle — list `@moonshot-ai/kimi-code` and describe the real change.
+- Never write a `major` changeset without explicit user confirmation.

.agents/skills/agent-core-review/SKILL.md

@@ -0,0 +1,21 @@
+---
+name: agent-core-review
+description: Use ONLY for code review and test write/review guidance in `packages/agent-core-v2` (the DI × Scope agent engine). Does NOT apply to the legacy `packages/agent-core` or to any other package — for those, do not load this skill. Groups the review and testing lenses used for agent-core-v2 — `slop` (single-level-of-abstraction / layered error-handling review, invoked only on explicit request) and `test` (contract-driven per-test rules for both authoring and reviewing tests). Apply the sub-skill that matches the task; do not apply `slop` unprompted.
+has-sub-skill: true
+---
+
+# kc-review
+
+> **Scope: `packages/agent-core-v2` only.** These lenses are calibrated for the v2 engine (DI × Scope). Do not apply them to the legacy `packages/agent-core` or to other packages.
+
+A bundle of the lenses used when reviewing or testing `packages/agent-core-v2`. Each sub-skill is self-contained; invoke the one that matches the task.
+
+## Sub-skills
+
+- **`slop/`** — Single Level of Abstraction & layered error handling. A *review dimension*: a function should read as a straight-line description of its own layer, with errors handled above or below. The agent reports detections and measurements, not severity grades. **Invoke only when the user explicitly asks for this lens** — do not apply it unprompted to general reviews or refactors.
+- **`test/`** — Per-test rules behind "test the contract / responsibility, not the implementation," serving two modes. **Write mode:** author a test — one behavior per `it`, drive through the public surface, stub only the true external boundary, control time/config via documented knobs, keep tests clear, isolated, and refactor-resilient (CCCR). **Review mode:** audit existing tests against the same rules and report findings with `file:line`. Use when writing, modifying, or reviewing tests, or when asked how to write a good single test.
+
+## Routing
+
+- Reviewing code structure / abstraction layers / where error handling belongs → `slop` (only on explicit request).
+- Writing or modifying tests, reviewing test quality, or advising on a single test → `test`.

.agents/skills/agent-core-review/slop/SKILL.md

@@ -0,0 +1,133 @@
+---
+name: slop
+description: Invoke only when the user explicitly asks to review code through the "single level of abstraction / layered error handling" lens — a function does only its own layer's business logic while errors are handled above or below. The agent reports detections, raw-count measurements, and move directions. Apply only when the user explicitly requests this lens.
+---
+
+# Single Level of Abstraction & Layered Error Handling
+
+North star: **a function should read as a straight-line description of what its own layer does. Anything that is not that — input validation, error handling, error-to-response translation, logging, retries, low-level mechanics — belongs to a layer above or below, not inline.**
+
+This is a review dimension, not a hard rule. See "Exemption checklist" at the end.
+
+## Scope of this skill — detect and measure
+
+The agent applying this lens is a **sensor**. Its one job is to report *whether* a function mixes levels and *by how much*; deciding *how serious* it is belongs downstream. Severity labels (`Block` / `Request changes` / `Nit`) compress a continuous quantity into an uncalibrated three-point scale and are the main source of review-to-review variance, so they are produced downstream — by a deterministic rubric, anchored examples, or a human — from the facts the agent reports.
+
+The agent's output is exactly these four things:
+
+- **Detection (yes/no):** does this statement / block / function violate a rule of the lens?
+- **Measurement (raw factual counts only):** mechanically countable quantities — body size, control-flow keywords, named syntactic shapes (see "Quantify"). Anything that first requires classifying a line (core/foreign, happy/error, high/low level) is recorded under detection, not here.
+- **Direction (where it moves):** for each foreign concern, the destination layer — push **down** into a value / parser / infra helper, or push **up** into the edge handler.
+- **Exemption flags:** which items, if any, hit the exemption checklist — recorded, not weighed.
+
+Severity grades, merge/block verdicts, and "is splitting worth it" calls live downstream, derived from the four items above.
+
+## When to use
+
+Apply this lens only when the user asks for it explicitly (for example "用单一抽象层次审视一下", "check whether this function does too much", "errors should be handled above/below, right?"). Leave general reviews and refactors to other lenses unless the user names this one.
+
+## The principle
+
+One function, one level of abstraction, one responsibility. Three mutually reinforcing rules:
+
+1. **Single Level of Abstraction (SLAP).** Every statement inside a function sits at the same conceptual level. High-level intent ("reserve inventory, charge payment, create the order") must not be interleaved with low-level mechanics (building headers, escaping strings, opening sockets, parsing bytes). If some lines read as "what" and others as "how", they belong in different functions.
+2. **Error handling is its own concern (Clean Code).** A function either does the work or handles the error — not both. Business logic describes the happy path and *signals* failure (throw or return a result); the catch, mapping, logging, and recovery live in a dedicated handler, usually one layer up. Prefer exceptions / result types over threaded check-and-return ladders that interrupt the main flow.
+3. **Separation of concerns by layer.** Each layer owns exactly one kind of knowledge: low-level code knows formats and protocols; mid-level code knows business rules; edge code knows the outside world (HTTP / CLI / UI). A function that knows two of these at once is leaking a layer.
+
+The combined test: **could you explain this function to someone without using the word "and"?** If the explanation is "it reserves stock AND validates the email format AND maps the error to a status code AND logs to metrics", it is doing more than its layer's job.
+
+Concerns that usually do **not** belong in a business function:
+
+- Format / range / null validation that a lower value or parser could guarantee once.
+- Mapping domain failures to an external protocol (status code, exit code, UI message) — that is the edge layer's job.
+- Catch-and-swallow, retry loops, backoff, timeout, circuit breaking around a single call — infrastructure, push down.
+- Cross-cutting telemetry / log / metric noise woven through every step — extract or push to a wrapper.
+- Check-and-return ladders that occupy more space than the business core — replace with signal + a handler above.
+
+## Methodology — fixing a function that violates it
+
+Work top-down. Never start by shuffling lines.
+
+1. **Name the level.** In one sentence, write what this function is for at its own layer. If you cannot, the function has no clear level — split before polishing.
+2. **Classify every statement.** Tag each line or block as: **core** (this layer's business), **down** (a detail a lower abstraction should own), **up** (a concern an upper / edge layer should own), or **cross-cutting** (log / metric / retry). Unlabeled lines are where the mess hides — do not "just leave them".
+3. **Decide down vs. up for each foreign item.**
+   - Push **down** when it is a guarantee a lower building block can provide: a value that can only be constructed valid, a parser that returns a typed result, an infra helper that already retries. The business function then assumes validity and stays clean.
+   - Push **up** when it is about translating or reacting to failure for the outside world: status codes, messages, exit codes, aggregation of many errors. The edge layer catches once and maps; business code just signals.
+   - Rule of thumb: if removing it would change what the business rule says, it is core and stays; if removing it only changes how a failure is reported or a detail is computed, it moves.
+4. **Extract, do not interleave.** Pull each foreign concern into its own named function or layer. Keep the original function as a readable sequence of same-level calls. For error handling specifically, separate the work body from the recovery body into distinct functions so neither clutters the other.
+5. **Signal, do not handle, in the middle.** Mid-layer business functions throw / return and let the right layer react. Do not catch-and-log-and-continue in business code unless continuing is itself the business rule.
+6. **Re-read for level.** After the moves, every remaining line should be explainable at the same altitude. If not, repeat from step 1.
+
+Keep the change minimal: move the smallest thing that restores the level. Do not invent abstractions, frameworks, or generic "handler" machinery beyond what the function actually needs. Three straight-line, same-level calls beat a premature pipeline.
+
+## Review method — applying the lens to a diff
+
+Read each changed or touched function and, for each check, record only: **the hit (yes/no) plus evidence (`file:line`)**, and — where the check points at a construct — a raw factual count from "Quantify".
+
+1. **Altitude check.** Are all lines at the same level of abstraction? Record each place where a "what" line is immediately followed by a "how" block (or vice versa) inside the same function, with `file:line`.
+2. **Happy-path check.** Can you read the business intent top to bottom without stepping through error branches? Record whether error handling sits inline between business steps (yes/no + `file:line`), supported by raw counts from "Quantify" (e.g. number of `catch` clauses, `continue` statements).
+3. **Ownership check.** For each validation, catch, mapping, log, retry: is this layer the rightful owner, or is it borrowed from above / below? Record each borrowed item with `file:line` and its destination (down / up), using the rules from the methodology.
+4. **Layer-leak check.** Does a business function mention an external protocol (status code, exit code, UI text, wire field)? Does an edge function contain a business rule? Record each leak candidate with `file:line` and whether it names an *external* protocol or an *internal* domain shape.
+5. **Explanation test.** Describe the function in one sentence with no "and". Record whether "and" was needed; if so, list the proposed split as candidate moves (down / up).
+
+### Quantify — report only raw factual counts
+
+Report only quantities that can be counted **mechanically from the text**. Anything that first requires classifying a line (core vs foreign, happy-path vs error-handling, high-level vs low-level) is recorded under detection (the five checks above) as evidence, not as a number here.
+
+Report, per function:
+
+- **Body size** — lines and/or statements of the function body; state the basis (e.g. "statements, excluding lone braces").
+- **Control-flow keywords (raw counts)** — `if`, `continue`, early `return`, `throw`, `try` / `catch` / `finally`, `await`, loops (`for` / `while` / `.forEach`).
+- **Named syntactic shapes a check points at** — when a check cites a construct, count it verbatim and name the exact token: e.g. number of object literals, string literals, `.trim()` calls, `.length` reads, `origin.` property reads, spread `[...x]` operations.
+- **Recovery presence (raw)** — number of `catch` clauses, and number of log / metric calls inside them.
+
+Quantities that embed a prior classification — out-of-level vs core counts, guard-to-core ratios, happy-path vs error-handling volume, "repeated boundary checks a lower layer could guarantee once", "low-level literals in a high-level flow" — are captured as evidence under the relevant check (`file:line` + the verbatim tokens). A downstream rubric derives any ratio from those raw facts.
+
+### Red flags
+
+Record each as evidence (yes/no + `file:line`); these are candidates, not verdicts:
+
+- A body that is mostly check-and-return / check-and-throw ladders around a thin core.
+- A recovery block that logs, maps, and returns inline, sitting next to business steps.
+- A function that both computes a value and decides how that value's failure is shown to the user.
+- Low-level literals (byte offsets, header strings, format codes) inside a high-level workflow.
+- A name that needs "And" / "Or" / "With" to be honest, or a name so vague ("handle", "process", "do") that it hides multiple levels.
+- Catch-and-swallow that hides a failure the caller needed to see.
+- Defensive null / format checks repeated at every call site instead of guaranteed once at the boundary.
+
+### Severity grading belongs downstream
+
+The agent's facts (detections, raw counts, directions, exemptions) feed a downstream grade; the agent reports those facts and stops there. Grades compress a continuous quantity into an uncalibrated three-point scale and are exactly where identical evidence gets labeled differently across runs. Grading happens above the agent:
+
+- A **deterministic rubric** — a versioned threshold table over the raw counts from "Quantify"; or
+- **Anchored examples** — the reviewer judges relative to repo-known reference functions rather than against an absolute adjective like "materially"; or
+- A **human**, for items that land near a threshold boundary.
+
+If a downstream consumer still asks the agent for a grade, the agent returns the underlying facts and the threshold band it would fall under, with `confidence: low` on boundary cases; the grade itself is produced downstream.
+
+### How to report findings
+
+Report **evidence + direction**. Lead with the location and the level, then the proposed move. Prefer "this block is one level lower than the rest of the function (`file:line`) — move it **down** into X" over "this is ugly" or "this is a request-changes". The destination layer (down into a value / parser / infra helper, or up into the edge handler) is the actionable output and the deliverable. Attach the "Quantify" numbers and any exemption flags to each finding.
+
+## Exemption checklist
+
+This is a lens, not a law. For each foreign concern, check whether any exemption below applies and **record the hit (yes/no) plus the reason**. The agent records exemptions as facts; a recorded exemption is then used downstream to cap the grade (e.g. to `Nit`) deterministically.
+
+- **Tiny function:** the function is small enough that splitting would add indirection with no reader benefit.
+- **Foreign concern is the single job:** the "foreign" concern is in fact the function's one purpose — a dedicated error mapper, a validator, an infra wrapper, or an index-bookkeeping helper whose low-level arithmetic *is* its level.
+- **Atomicity / correctness / performance:** the steps genuinely must stay together (e.g. a re-check after an `await` to guard state that may have changed).
+- **Edge-translator role:** an edge / handler function whose job is to translate an external event into internal indices; naming the wire fields is its job.
+
+Keep a split that would make the code harder to read as a recorded candidate for downstream review. When the evidence lands on an exemption boundary, record both sides and set `confidence: low`.
+
+## Output contract
+
+Return, per function, items 1–5 only:
+
+1. **Level statement** — one sentence: what the function is for at its own layer.
+2. **Per-check results** — for each of the five review checks: `hit: yes/no`, evidence `file:line`, and (only where the check points at a construct) a raw factual count.
+3. **Measurements** — the raw factual counts from "Quantify".
+4. **Exemptions** — checklist hits (yes/no + reason).
+5. **Proposed moves** — for each foreign concern: `file:line` → destination (down into X / up into Y). This is the actionable deliverable.
+
+Severity grades, block/merge verdicts, and "worth splitting" calls live downstream, derived from items 1–4. When a consumer asks for a label, hand back items 1–4 and the threshold band, with `confidence: low` on boundary cases.

.agents/skills/agent-core-review/test/SKILL.md

@@ -0,0 +1,115 @@
+---
+name: test
+description: Use when writing or reviewing tests, or when asked how to write a good single test. Encodes the per-test rules behind the "test the contract / responsibility, not the implementation" principle — name and structure one behavior per `it`, drive through the public surface, stub only true external boundaries, control time and config via documented knobs, and keep tests clear, isolated, and refactor-resilient. The same rules drive both authoring (write mode) and auditing existing tests (review mode).
+---
+
+# Tests — write & review
+
+Per-test rules that operationalize one principle: **test the contract / responsibility, not the implementation**. This is the how-to for a single `it`, and the lens for reviewing one.
+
+## Two modes, one rule set
+
+- **Write mode** — authoring a test. Apply the rules below to produce it.
+- **Review mode** — auditing an existing test or test diff. Apply the same rules as a checklist; report each violation with `file:line`, the rule it breaks, and the fix. See "Review mode" near the end.
+
+The rules are identical in both modes — only the posture changes (produce vs. audit).
+
+## Test contract, not implementation
+
+- Drive the system through its **public control plane** and assert on **observable effects** (returned values, persisted state, emitted events, injected messages), never on source details.
+- Resolve collaborators through their contract — the interface plus its identifier — not the module that binds a concrete implementation.
+- Do not reach into private fields or add backdoors "for testing". If you feel the need, the seam is wrong — fix the design, not the test.
+
+## One behavior per `it`
+
+Each `it` covers exactly one responsibility / scenario. If the name needs "and", split it.
+
+```ts
+it('returns 401 when the caller is unauthorized', ...);
+it('does not double-fire when the same tick repeats', ...);
+```
+
+## Name and structure
+
+- `describe('<slice> (<responsibilities>)'` — name the **responsibility**, not the class.
+- An `it(...)` reads as a sentence, but it must still encode three things — the **behavior / method**, the **state or condition**, and the **expected outcome**: `it('<behavior> when <condition>, <outcome>')`. A name like `does X when Y` with no result is too vague to fail usefully.
+  - Use spaces, not the Java-style `method_state_outcome` underscores — that convention exists only because Java test methods cannot contain spaces. A string-named test reads fine as a sentence.
+  - Good: `it('returns 401 when the caller is unauthorized')` · `it('advances the cursor and does not double-fire on a repeat tick')`
+  - Bad: `it('works')` · `it('handles auth correctly')` — no condition, no outcome
+- Arrange / Act / Assert. A short `// Given` `// When` `// Then` is fine when it aids reading; do not paste it mechanically on trivial tests.
+
+## Build a small rig
+
+When several tests share setup, write a factory (`rig()`, `createHost()`, whatever fits the codebase) that returns the **smallest surface the test needs**. Tests reach into the rig; they do not rebuild the world each time. Keep the rig dumb: wiring only, no assertions.
+
+## Stub only the real external boundary
+
+Default to real collaborators wired the way production wires them. Stub the **minimum seam** that is genuinely external:
+
+- A remote / model / service boundary — spy on the contract method (the interface), and capture what the system sends across it. Do not stand up the real external thing.
+- Network / other-process boundaries — stub at the boundary, not the internals.
+- Time, timers, jitter — use the documented control knobs the system exposes (env, an injected clock, a manual tick). Do **not** use fake timers or real `setTimeout` to drive time.
+- Env / config knobs are usually snapshotted at bootstrap — set them **before** building the system under test, and restore them in `afterEach`.
+
+## Keep tests DAMP and keep cause next to effect
+
+- DAMP over DRY: use **literal expected values** in assertions; do not compute the expectation with the same logic as the code under test.
+- Keep the key preconditions inside the `it` (or its rig), where the reader can see cause next to effect. Reserve `beforeEach` for cross-cutting plumbing (env snapshot, cleanup), not for hiding the scenario's setup.
+
+```ts
+// Good — the expected value is a literal the reader can check.
+expect(discount).toBe(15);
+// Bad — re-derives the expectation; mirrors the implementation.
+expect(discount).toBe(price * rate);
+```
+
+## Assert only what is relevant
+
+Assert the effect that proves the contract. Use matchers / partial-object matching to ignore incidental fields. Do not assert internal counters, call orders, or shapes the user cannot rely on.
+
+## Isolate and clean up (no flakes)
+
+Every test must be hermetic and order-independent. In `afterEach`:
+
+- restore every mock / spy
+- restore every env var you touched (snapshot in `beforeEach`)
+- dispose the host / container and reset its reference
+
+No dependence on wall-clock time, run order, or leftover on-disk state — give each scenario its own isolated identity / workspace when state persists.
+
+## Quality bar: CCCR
+
+Before finishing, check each test against:
+
+- **Clarity** — a stranger can tell what broke from the failure message alone.
+- **Completeness** — covers the responsibility's success, error, and boundary paths.
+- **Conciseness** — no duplicate or speculative cases; one scenario per `it`.
+- **Resilience** — survives an internal refactor with no test change (because it asserts contract, not implementation).
+
+## Per-file scenario header
+
+Start each test file with a short header comment: the **scenario**, the **responsibilities** asserted, the **wiring** (which collaborators are real vs. the single stubbed boundary), and how to run it.
+
+## Review mode — auditing existing tests
+
+Apply the rules above as a checklist against each test in scope (a file, a diff, or a named `it`). For every hit, report `file:line` + the rule it breaks + the fix; do not rewrite unless asked. Lead with the contract question: *what observable behavior does this test prove, and would it survive a refactor?*
+
+Check, in order:
+
+1. **Contract, not implementation** — asserts observable effects, not private fields, call order, or internal shapes the user cannot rely on.
+2. **One behavior per `it`** — the name carries behavior + condition + outcome; "and" in the name means a split is owed.
+3. **Boundary discipline** — only the true external seam is stubbed; time is driven by documented knobs, not fake timers / real `setTimeout`.
+4. **DAMP expectations** — expected values are literals, not re-derived by the code under test's logic.
+5. **Isolation** — mocks / spies / env / host restored in `afterEach`; no wall-clock, run-order, or leftover on-disk dependence.
+6. **CCCR read-through** — Clarity, Completeness (success / error / boundary), Conciseness, Resilience.
+
+Report findings as evidence + fix, e.g. "`foo.test.ts:42` asserts on `service.internalMap` (contract) — assert the returned value instead." If a test passes the lens, say so briefly; silence on a rule means it held.
+
+## Quick checklist (write & review)
+
+- Resolved through the contract; no concrete-impl import
+- One behavior per `it`; name carries behavior + condition + outcome; AAA
+- Stubbed only the true external seam; time via knobs, not fake timers
+- Literal expectations; relevant assertions only
+- Mocks / env / host restored in `afterEach`; hermetic, no flakes
+- CCCR read-through done

.agents/skills/gen-changesets/SKILL.md

@@ -11,23 +11,34 @@ description: Use when generating changesets in the kimi-code repository, includi
 
 All other `@moonshot-ai/*` packages are treated as internal packages, including `@moonshot-ai/kimi-code-sdk`, `agent-core`, `kosong`, `kaos`, `kimi-code-oauth`, `kimi-telemetry`, and `migration-legacy`.
 
+`@moonshot-ai/pi-tui` is a special internal package: it is a private fork (`private: true`) that is never published, but it keeps its own changelog through changesets. It is an exception to Core Rule 4 — see the dedicated section below.
+
+Only the CLI changelog gets a curated, user-facing presentation (the docs-site changelog sync). The SDK and other internal package changelogs are raw changesets output kept for version history — nobody curates them, so write those entries honestly and technically; their wording does not need to suit end users.
+
 ## Core Rules
 
 1. **Inspect the actual changes first.** Use `git status` / `git diff --name-only` to identify which packages were actually changed.
 2. **List packages that changesets can release.** If a changed package is ignored in `.changeset/config.json`, do not put that ignored package in frontmatter together with a non-ignored package; changesets rejects mixed ignored/non-ignored frontmatter.
 3. **Map ignored internal changes to the affected released package.** If an ignored internal package changes CLI output or behavior, list `@moonshot-ai/kimi-code` and describe the actual user-visible or release-artifact change in the changelog text.
-4. **Internal package source changes that enter the CLI bundle must manually list the CLI.** `@moonshot-ai/kimi-code` inline-bundles `@moonshot-ai/*` source, but those internal packages are devDependencies from the CLI's perspective, so changesets will not automatically propagate bumps. If a change enters the CLI output, list `@moonshot-ai/kimi-code`.
-   - **Web app (`@moonshot-ai/kimi-web`) changes always enter the CLI bundle.** `@moonshot-ai/kimi-web` is ignored by changesets (see `.changeset/config.json`) and cannot be mixed with `@moonshot-ai/kimi-code` in one changeset frontmatter. Describe the web change in the changelog text, but list `@moonshot-ai/kimi-code` so the CLI release carries the bundled `dist-web` output.
+4. **Internal package source changes that enter the CLI bundle must manually list the CLI — when they get a changeset at all.** `@moonshot-ai/kimi-code` inline-bundles `@moonshot-ai/*` source, but those internal packages are devDependencies from the CLI's perspective, so changesets will not automatically propagate bumps. If a change enters the CLI output and is user-perceivable, list `@moonshot-ai/kimi-code`. See rule 6 for when to skip the changeset entirely.
 5. **Docs-only and tests-only changes usually do not need a changeset.** README, internal docs, and `test/` changes that do not enter package output do not trigger a CLI bump.
-6. `@moonshot-ai/vis` / `vis-server` / `vis-web` are ignored by changesets and should not be handled.
+6. **Skip changes users cannot perceive — write no changeset at all.** The CLI changelog is user-facing; a changeset is a changelog entry, not a shipping gate. Internal changes merged to `main` still ship in the next release triggered by any user-facing changeset, so skipping the changeset loses nothing. Do not write changesets for:
+   - `agent-core-v2` internal architecture: new services, refactors, config-persistence or journal/wire mechanisms.
+   - `kap-server` WebSocket / REST protocol changes consumed only by the bundled web UI, kimi-inspect, or other dev tooling (new endpoints, subscribe protocols, stream baselines).
+   - Behavior that only takes effect on the experimental engine (e.g. experimental `kimi -p`), unless it exposes documented user configuration such as a `config.toml` section or env vars that also work on a shipped surface (TUI or `kimi web`).
+   - When unsure whether users can perceive a change, ask before writing.
+7. `@moonshot-ai/vis` / `vis-server` / `vis-web` are ignored by changesets and should not be handled. `@moonshot-ai/kimi-inspect` (a private dev app that never ships) is likewise ignored and must never appear in a changeset frontmatter.
 
 ## Workflow
 
 1. List the changed packages and check whether each one is ignored by `.changeset/config.json`.
-2. Choose a bump level for each package.
-3. If an ignored internal package change enters the CLI bundle, put `@moonshot-ai/kimi-code` in frontmatter instead of mixing the ignored package into the same changeset.
-4. Create a short kebab-case file under `.changeset/`.
-5. Split unrelated changes into separate changesets; keep one logical change in one file.
+2. Decide whether the change is user-perceivable (Core Rule 6); if not, stop — no changeset.
+3. Choose a bump level for each package.
+4. If an ignored internal package change enters the CLI bundle, put `@moonshot-ai/kimi-code` in frontmatter instead of mixing the ignored package into the same changeset.
+5. Create a short kebab-case file under `.changeset/`.
+6. Split unrelated changes into separate changesets; keep one logical change in one file.
+
+Before a release, review the accumulated `.changeset/` entries against Core Rule 6 and prune non-user-facing ones; the release PR regenerates from `.changeset/` on `main`, so deleting a changeset removes its changelog entry without affecting the shipped code.
 
 Format:
 
@@ -50,6 +61,8 @@ Format:
 
 When in doubt between `patch` and `minor`: if the change improves an existing feature and the user-facing impact is small, choose `patch` even when the change is technically "new". Reserve `minor` for a substantial new capability that introduces something users could not do before.
 
+New configuration surface is not automatically `minor`. Additions to an existing feature's configuration — env var overlays, config-file fallbacks, global defaults under per-item settings — are `patch`. Examples: a global default MCP timeout when per-server timeouts already exist; env-based credentials for a service already configurable in `config.toml`.
+
 ### Major Rule
 
 Never write `major` on your own.
@@ -59,13 +72,26 @@ If you believe a change qualifies as major, stop first, explain why, and ask the
 ## Wording Rules
 
 - Changelog entries **must be written in English**.
-- **Keep it short — ideally a single sentence that states what was done.** Do not write a paragraph, do not pile on technical detail, and do not enumerate every sub-change.
+- **Keep the whole entry concise.** Aim for one short sentence that states what was done; at most a short sentence plus a one-line usage hint. Do not write a paragraph, do not pile on technical detail, and do not enumerate every sub-change.
+- **For new user-facing features, append a brief usage hint** so users know how to try it. Keep it to a single short line — a command name, a subcommand, a flag, or a one-line "how to use". Do not explain design rationale or list edge cases. Skip the hint for bug fixes, internal changes, and refactors.
+  - Slash command: `Add the /foo slash command to list active sessions. Run /foo to see them.`
+  - CLI subcommand: `Add the kimi web subcommand to open the web UI. Run kimi web to launch it.`
+  - Flag: `Add a --bar flag to skip confirmation prompts. Pass --bar to skip.`
+  - Too long: `Add the /foo command to list active sessions. It accepts an optional --all flag to include background sessions, supports filtering by name with /foo <name>, and writes the result to the transcript...`
 - User-facing CLI wording should only be used when CLI users can perceive the change.
 - Internal changes that do not affect CLI users can still share a changeset with the CLI, but the wording must describe the real change honestly and must not present it as a user-facing feature.
 - Do not mention file names, class names, function names, PR numbers, or commit hashes.
 - Do not include real internal endpoints, key names, account names, or service names. If an example is needed, use neutral placeholders such as `example.com`, `example.test`, or `YOUR_API_KEY`.
 - Avoid vague words such as `refactor`, `optimize`, and `improve`. Describe the actual change, or use more specific wording.
 
+## When You Are Unsure About a Change
+
+Generate the changeset from what the diff clearly shows. If part of a change is unclear and you cannot confidently describe what it does for users, do not guess or pad the entry with vague wording.
+
+1. Finish the changeset for the parts that are clear.
+2. Then ask the user once, in a short list: name the specific change(s) you do not understand, and ask whether you may dig into the repository (read related source, tests, or call sites) to describe it more accurately.
+3. Only read more code after the user agrees. If the user says no or does not reply, keep the concise wording you already have and do not invent detail.
+
 ## Common Examples
 
 An internal package fixes a bug visible to CLI users:
@@ -78,6 +104,36 @@ An internal package fixes a bug visible to CLI users:
 Fix occasional loss of tool call results in long conversations.
 ```
 
+A new user-facing slash command (note the short usage hint):
+
+```markdown
+---
+"@moonshot-ai/kimi-code": minor
+---
+
+Add the /foo slash command to list active sessions. Run /foo to see them.
+```
+
+A new CLI subcommand:
+
+```markdown
+---
+"@moonshot-ai/kimi-code": minor
+---
+
+Add the kimi web subcommand to open the web UI. Run kimi web to launch it.
+```
+
+A new flag on an existing command:
+
+```markdown
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Add a --bar flag to skip confirmation prompts. Pass --bar to skip.
+```
+
 An internal package has an internal-only change, but it enters the CLI bundle:
 
 ```markdown
@@ -98,44 +154,48 @@ Only SDK source changed, and the CLI does not use it:
 Clarify session status typing for internal SDK callers.
 ```
 
-## Web app changes
+## `@moonshot-ai/pi-tui` changes
 
-`@moonshot-ai/kimi-web` is ignored by changesets and must **never** appear in a changeset frontmatter. Because the web app is bundled into the CLI release artifact, any web change that ships must list `@moonshot-ai/kimi-code` instead and describe the actual web-facing change in the text.
+`@moonshot-ai/pi-tui` is a vendored fork that lives in `packages/pi-tui`. It is `private: true` and is never published, but it is **not** ignored by changesets: changesets versions it and writes `packages/pi-tui/CHANGELOG.md` so the fork keeps its own history. Because it is bundled into the CLI like other internal packages, it is an exception to Core Rule 4 — do **not** list `@moonshot-ai/kimi-code` for a change that only touches pi-tui.
 
-- If a PR contains both web UI changes and server API changes, split them into separate changesets so each entry has a focused description.
-- Do not enumerate every micro-tweak; keep it to one sentence that captures what the web user gets.
+- Changes that only affect pi-tui (build, package, strict-mode cleanup, renderer fixes): list `@moonshot-ai/pi-tui` only. No CLI changeset.
+- If the same change is also user-visible in the CLI (for example a terminal rendering fix that CLI users can see), add a **separate** changeset that lists `@moonshot-ai/kimi-code` with CLI-focused wording, in addition to the pi-tui changeset. Do not mix both packages in one frontmatter — the two changelogs need different wording.
 
-Web-only fix:
+pi-tui-only change:
+
+```markdown
+---
+"@moonshot-ai/pi-tui": patch
+---
+
+Export the package manifest so the bundled binary can locate its native assets.
+```
+
+pi-tui change that is also visible in the CLI (two separate changesets):
+
+```markdown
+---
+"@moonshot-ai/pi-tui": patch
+---
+
+Clamp the differential render to the visible viewport so scrolling up during streaming no longer jumps to the top.
+```
 
 ```markdown
 ---
 "@moonshot-ai/kimi-code": patch
 ---
 
-Fix the web chat not scrolling to the bottom after sending a message.
-```
-
-Web UI plus server APIs in the same PR (split into two changesets):
-
-```markdown
----
-"@moonshot-ai/kimi-code": minor
----
-
-Add the server-hosted web UI, including chat layout and session list behaviors.
-```
-
-```markdown
----
-"@moonshot-ai/kimi-code": minor
----
-
-Add the server REST and WebSocket APIs that power the web UI.
+Fix the transcript jumping to the top when scrolling up through history during streaming output.
 ```
 
 ## Red Flags
 
 - You are about to write `major` without asking the user.
+- You are writing a changeset for something users cannot perceive — `agent-core-v2` internals, `kap-server` WS/REST protocol plumbing, experimental-engine-only behavior. Skip the changeset instead (Core Rule 6).
+- A new env var overlay or config fallback for an existing feature is bumped `minor` — configuration additions to existing features are `patch`.
+- A new user-facing feature entry has no usage hint, or the hint runs to multiple lines and explains design rationale.
+- You guessed wording for a change you do not understand instead of asking the user whether you may dig into the repo.
 - Internal package source enters the CLI bundle, but `@moonshot-ai/kimi-code` is missing.
 - A changeset frontmatter mixes ignored internal packages with non-ignored packages.
 - `packages/node-sdk` was not changed, but `@moonshot-ai/kimi-code-sdk` was listed for "internal package sync".
@@ -143,3 +203,4 @@ Add the server REST and WebSocket APIs that power the web UI.
 - The wording claims more than the diff actually did.
 - The CLI wording mentions internal package names, class names, or PR numbers.
 - The entry includes real internal identifiers instead of neutral placeholders.
+- A change that only touches `@moonshot-ai/pi-tui` lists `@moonshot-ai/kimi-code` instead of `@moonshot-ai/pi-tui`, or mixes both packages in one frontmatter.

.agents/skills/pre-changelog/SKILL.md

@@ -37,9 +37,11 @@ If the CLI changelog is not in the diff (for example an SDK-only release), stop
 
 Process the version block exactly as `sync-changelog` does for the docs site, but only in memory:
 
-- **Strip** (`sync-changelog` step 3): drop the H1, the `### Patch Changes` / `### Minor Changes` / `### Major Changes` subheadings, PR links, and commit-hash links; keep only each entry's body text.
-- **Classify** (`sync-changelog` step 4): bucket into Features / Bug Fixes / Polish / Refactors / Other; order within each section by reader value.
-- **Translate** (`sync-changelog` step 6): translate entry bodies to Chinese; section headings become 新功能 / 修复 / 优化 / 重构 / 其他.
+- **Strip** (`sync-changelog` step 3): drop the H1, the `### Patch Changes` / `### Minor Changes` / `### Major Changes` subheadings, PR links, and commit-hash links; keep only each entry's body text. The `Thanks [@user](...)!` credit (including the multi-author form) must be removed every time. Within each entry, drop SDK-only and provider-internal sentences (SDK capability mapping / API exposure, provider wire-format mechanics, internal XML markers, hook/event payload mechanics such as what an event reports or carries) and keep only the user-facing effect and required constraints.
+- **Merge and deduplicate** (`sync-changelog` step 4): merge micro-tweaks to the same surface into one higher-level entry; when three or more fixes target the same UI area or the same class of problem, merge them into one higher-level fix entry (do not merge broad or genuinely distinct fixes); and drop a server/API entry that only backs a web feature already listed.
+- **Collapse low-signal entries** (`sync-changelog` step 4): keep standalone only entries that pass both gates — the reader-action test (the reader must do or re-evaluate something) and the channel test (the product cannot push it into the user's path: hidden controls, habit invalidations, capabilities users would not know to seek — a control merely sitting in the UI is not surfacing, users do not explore). Polish keeps only must-react items; experiences the product shows at the moment of need (recovery cards, post-install guidance) fold. Fixes keep only behavior-change entries (readers must update a habit, config, or workaround); loud failures fold (the fix itself notifies the victim), and silent past damage folds too — the changelog does not repair the past, and a notice that names no locatable instance and no realistic action is noise, not diligence. Section sizes follow density defaults (about 2 polish, 3 fixes) that yield to genuinely qualifying entries — flag the overflow for the reviewer instead of folding to hit the number. Fold everything else into one catch-all line placed last under 修复 — `修复了一些已知问题。` (or `修复了一些已知问题，并做了若干细节优化。` when non-fix entries were also collapsed; when nothing folded is a fix, place it under 优化 instead as `做了若干细节优化和内部改进。`), followed by a separate pointer sentence: `更详细的变更记录见 [GitHub](https://github.com/MoonshotAI/kimi-code/blob/main/apps/kimi-code/CHANGELOG.md)。` (file link, no version anchor; before the release PR merges, the target does not yet contain this version's block — expected for a preview).
+- **Classify** (`sync-changelog` step 4): bucket into Features / Bug Fixes / Polish / Refactors / Other; order within each section by reader value (in Polish, user-visible improvements before protocol/internal adjustments).
+- **Translate** (`sync-changelog` step 6): translate entry bodies to Chinese; keep one sentence per entry with a parallel rhythm within a section; section headings become 新功能 / 修复 / 优化 / 重构 / 其他.
 
 If an upstream entry is not in English, flag it and stop (changeset entries must be English).
 
@@ -47,6 +49,10 @@ If an upstream entry is not in English, flag it and stop (changeset entries must
 
 Print the preview directly. Use `<version>（预览）` as the heading because the version is not released yet. Write `无` for empty sections. Do not write any file.
 
+After the preview block, append a reviewer-only section titled `### 审稿参考（不进入文档）`: list every entry folded into the catch-all (short English title, one line each), note any section that exceeds the density defaults, and flag borderline calls for the reviewer to confirm. This breakdown is how reviewers see what was folded — before merge, the catch-all pointer's target does not yet contain the version's block. Never write this section into the docs pages.
+
+The preview is pasted into chat tools (for example Lark), where relative docs links do not resolve. Rewrite every docs link to its absolute published URL: map `../<path>.md[#anchor]` to `https://moonshotai.github.io/kimi-code/zh/<path>.html[#anchor]` — for example `../configuration/config-files.md#loop-control` → `https://moonshotai.github.io/kimi-code/zh/configuration/config-files.html#loop-control`. Never emit raw relative paths, and never wrap a link in backticks; code-style the link text inside the brackets instead ([`loop_control`](...)).
+
 ```
 发版 PR: <url>
 

.agents/skills/sync-changelog/SKILL.md

@@ -93,13 +93,13 @@ Use upstream order: newest version first.
 Upstream entries look like this:
 
 ```markdown
-- [#317](https://github.com/...) [`2f51db4`](https://github.com/...) - Clean up lint warnings ...
+- [#317](https://github.com/...) [`2f51db4`](https://github.com/...) Thanks [@user](https://github.com/...)! - Clean up lint warnings ...
 ```
 
-Keep:
+Changesets may add a `Thanks ...!` credit, but it must be removed every time. Keep:
 
 - Version headings such as `## 0.2.0`.
-- Only the body text of each entry, after the PR/hash decoration.
+- Only the body text of each entry, after the PR/hash decoration and any `Thanks ...!` credit have been removed.
 
 Remove:
 
@@ -107,29 +107,55 @@ Remove:
 - Changesets subheadings such as `### Patch Changes`, `### Minor Changes`, and `### Major Changes`.
 - PR links such as `[#317](...)`.
 - Commit hash links such as ``[`2f51db4`](...)``.
+- The `Thanks [@user](...)!` credit, including the multi-author form `Thanks [@a](...), [@b](...)!`. Drop the whole `Thanks ...!` segment every time, regardless of whether the feature is enabled.
 
-After stripping, each entry should be only:
+After stripping, each entry is `- <body text>`.
 
-```markdown
-- <body text>
-```
+Drop SDK-only and provider-internal detail. This changelog serves `@moonshot-ai/kimi-code` CLI and web users. Within an entry, keep only what CLI/web users can perceive, and remove sentences that document internals instead of user-visible behavior. Apply this on both the English and Chinese pages:
+
+- Drop sentences about how the SDK maps a capability, builds model aliases, or exposes a flag through an API such as `getExperimentalFeatures()` — that belongs in the SDK changelog, not here.
+- Drop provider / wire-format implementation mechanics (XML markers like `<tools_added>`, protocol field explanations, "the wire protocol is unchanged", cache-hit mechanics) unless they are the behavior a user perceives.
+- Drop hook/event payload mechanics — clauses about what extra fields an event payload carries or what an event reports in a specific case (for example "enrich hook payloads with the session title and client type", "`SessionEnd` reports `archive` when a session is archived"). Keep the new events or capability itself and how to configure it.
+- Keep the user-facing effect and any constraints users must follow (for example "question texts must be unique").
+
+Do not change facts or drop a real user-facing behavior — only trim the internal-only scaffolding. For over-long, internal-heavy entries, this trim applies on the English page too, not only in translation.
 
 Upstream language rule: `gen-changesets` requires changelog entries to be English. If the upstream CLI changelog contains a non-English entry, stop and report it to the user. Do not silently rewrite it while syncing docs.
 
 Public-text rule: do not copy real internal endpoints, key names, account names, or service names into docs changelogs. Replace examples with neutral placeholders such as `example.com`, `example.test`, or `YOUR_API_KEY` while preserving the user-visible meaning.
 
-### 4. Classify Entries
+### 4. Merge, Deduplicate, And Classify Entries
+
+Before classifying, merge related entries and drop redundant ones from the user-facing changelog:
+
+- **Curate for end users: collapse low-signal entries into one catch-all line.** The docs changelog is the only curated, user-facing outlet; the full entry list always remains in the upstream package changelog, so hiding detail here loses nothing. Apply two gates to every candidate entry. Gate 1, the reader-action test: **after reading this, is there something the reader must do, or something they must re-evaluate?** Gate 2, the channel test: **is the changelog the only channel that can deliver this?** The changelog is the channel of last resort — when the product itself surfaces the information in context, at the moment of need, to exactly the affected users, the entry is redundant no matter how real the improvement is. "Surfaced" means pushed into the user's path, not merely present on screen: an event-triggered card, prompt, or post-install screen forces the encounter, while a toggle, menu item, command, or settings page only waits to be found. Users do not explore — a capability that lives only in ambient UI is effectively undiscoverable, so the changelog must announce it. What in-product surfacing cannot deliver: hidden controls (env vars, config keys, opt-out flags nobody would find unprompted), invalidations of existing habits or expectations (in-product discovery comes as confusion), and capabilities users would not know to seek. An entry that fails either gate folds. Anchor both gates to the changelog's reader, never to the bug's victim: someone who hit a loud failure does not need the changelog to confirm the fix — the product working again is the notification — and a reader who never hit it gets nothing from the entry.
+  - `Features`: keep when users would try it or must react to it — new capabilities create demand readers did not know to seek. Collapse only behavior that takes effect solely behind an experimental flag.
+  - `Polish`: keep only must-react items — a notification users may want to turn off, a behavior change to a command they already use, a default flip with an opt-out. Fold improved experiences the product surfaces in context (recovery cards, post-install guidance, progress or status displays): they are discovered at the moment of need, and pre-reading about them helps nobody. Also fold subtle or transient tweaks (status wording, spacing, animations) and internal-behavior adjustments — nobody acts on them.
+  - `Bug Fixes`: keep only **behavior-change** fixes — the fix changes how something works going forward, so readers must update a habit, a config, or a widely-adopted workaround. Everything else folds, for one of two opposite reasons. Loud failures (crashes, refusals, interrupted runs): the fix itself notifies whoever was hit — announcement value falls as bug visibility rises. Silent past damage (dropped data, wrong results the user never noticed): the changelog cannot repair the past, and in this product the notice names no locatable instance and no realistic action — users cannot enumerate which old sessions were affected, and they do not audit finished sessions; a "some past outputs may be wrong" line is anxiety without an outlet, not diligence. The rare exception is a retrospective notice with a concrete, locatable action (for example rotating a token after a credential-handling flaw); keep those. Never keep a fix merely because it was severe, and never keep one because the bug class feels important.
+  - Do not grade entries by engineering importance. Severity and effort are already represented upstream; the curated changelog is not a credit ledger — its only job is to change what the reader does or knows.
+  - **Density, not quota.** Standalone sections stay short so the changelog actually gets read — as a default, expect about 2 Polish and 3 Bug Fixes entries per version, while `Features` is gated by the test alone and has no count. The defaults yield whenever more entries genuinely pass the reader-action test: keep them and flag the overflow for the human reviewer; never fold a qualifying entry just to hit the number, and never pad a section to reach it. The reviewer owns the final cutoff — the curator's job is to surface the borderline calls, not to resolve them silently.
+  - Everything else collapses into a single catch-all bullet placed last under `Bug Fixes`: `Fix several known issues.` When entries beyond fixes were also collapsed, use `Fix several known issues and make various refinements.` instead (Chinese: `修复了一些已知问题。` / `修复了一些已知问题，并做了若干细节优化。`). End the catch-all line with a pointer to the upstream file so folded entries stay reachable, phrased as a separate short sentence — `See the [changelog on GitHub](https://github.com/MoonshotAI/kimi-code/blob/main/apps/kimi-code/CHANGELOG.md) for more technical entries.` (Chinese: `更详细的变更记录见 [GitHub](https://github.com/MoonshotAI/kimi-code/blob/main/apps/kimi-code/CHANGELOG.md)。`). Link the file itself, never a per-version anchor — GitHub's generated heading anchors are fragile. Keep the pointer wording restrained ("more technical entries"): upstream only contains changes that received a changeset, so never claim the list is complete.
+  - If no fix survives, the `Bug Fixes` section is the catch-all line alone; if the whole version has no user-facing change, the version block is a single section with that line. Match the catch-all to what was folded — never claim fixes that did not happen: when the folded entries include fixes, use the forms above under `Bug Fixes`; when everything folded is polish or internal work, place the catch-all under `Polish` as `Make several refinements and internal improvements.` (Chinese: `做了若干细节优化和内部改进。`).
+- **Merge micro-tweaks to the same surface.** Collapse several small tweaks to the same UI area or feature into one concise entry at the higher level. For example, "change the composer's default height" and "change the composer's default font" merge into "Polish the composer's default styling." Use the most specific common ancestor (composer, settings page, tool card, and so on). Classify the merged entry by its combined effect
+- **Merge same-surface or same-kind fixes when you have three or more.** The `Bug Fixes` section tends to accumulate many narrow UI/polish fixes that read as noise when listed one by one. When three or more fixes target the same area (for example several tool cards in the TUI, or the web session/conversation surface) or the same class of problem (for example several "jumping/flickering/collapsing during streaming" fixes), merge them into one higher-level entry. Examples:
+  - "Fix the Bash tool card collapsing...", "Fix the Edit tool card jumping in height...", "Fix the Edit tool card flickering while its result streams in" → "Fix several TUI tool cards jumping, flickering, or collapsing in height when results stream in or end with short output."
+  - "Fix the collapsed sidebar not hiding...", "Stop the chat history from replaying its entrance animation...", "Fix tool components jumping the conversation when expanded/collapsed" → "Fix several layout and display glitches when switching sessions, including the collapsed sidebar not hiding, the chat history replaying its entrance animation, and tool components jumping the conversation."
+  - Classify the merged fixes as `Bug Fixes`.
+  - **Do not over-merge.** Leave a fix standalone when it is broad, high-value, or genuinely distinct (for example model/provider tool-calling bugs, session-list corruption, file-completion gaps). Merging is for low-reader-value, similar-shape fixes that read as a wall of similar bullets. A merged fix entry must still pass the standalone test from the catch-all rule above; if the merged group is low-signal too, fold it into the catch-all line instead of listing it.
+- **Drop server/API plumbing covered by a web entry.** If one entry adds a web UI feature (for example, an Archived sessions page) and another entry only adds the server or REST/WebSocket endpoints that exist solely to power that web feature, keep the web UI entry and drop the API entry. CLI and web users perceive the web page; the backing API is implementation detail with no independent user value on this changelog. Keep the API entry only when it has independent user value — a new public endpoint that SDK or server consumers call directly, or a capability usable outside the web feature. When unsure, keep both and let the reviewer decide.
 
 The docs changelog uses five section types:
 
 | English section | Chinese section | Meaning |
 |---|---|---|
 | `### Features` | `### 新功能` | New user-facing functionality, such as a new command, flag, mode, or capability that did not exist before |
-| `### Bug Fixes` | `### 修复` | Fixes for behavior that was broken |
 | `### Polish` | `### 优化` | User-visible improvements to existing functionality, including UX adjustments, behavior tweaks, and performance improvements that are not fixes or new capabilities |
+| `### Bug Fixes` | `### 修复` | Fixes for behavior that was broken |
 | `### Refactors` | `### 重构` | Internal changes with no user-visible behavior change, including build, CI, tests, dependency cleanup, and internal renames |
 | `### Other` | `### 其他` | Anything that does not fit above, such as CDN/endpoint swaps and docs-related artifacts |
 
+With the catch-all rule above, `Refactors` and `Other` rarely appear in newly synced versions: entries with no user-perceivable effect fold into the catch-all, and an entry that does change user-perceivable default behavior (for example an engine default flip with an opt-out flag) is classified by that effect, usually `Polish`. Reserve `Other` for genuinely unclassifiable but user-facing entries. Older versions keep whatever sections they already have — do not rewrite history.
+
 Classification process:
 
 1. Classify from the stripped entry text first.
@@ -140,6 +166,8 @@ Classification process:
 
 Features vs. Polish: ask whether the entry introduces something the user could not do before. If yes (new command, flag, mode, viewer, or capability), use `Features`. If it only improves an existing surface (a UI panel that already existed, an existing prompt, an existing tool card, an existing payload pipeline), use `Polish`. Verbs like `Add` do not automatically mean `Features` — a small visual addition to an existing UI is still polish.
 
+Default-behavior changes: changing the default value of an existing capability (for example flipping a feature on by default) is usually `Polish`, because the capability already existed. Use `Features` only when the new default materially changes the out-of-box experience for most users in a way they could not get before. When genuinely ambiguous, flag it and confirm with the reviewer rather than guessing.
+
 Keyword hints:
 
 - **Features**: `Add ... command/flag/option/mode/viewer`, `Introduce`, `Support`, `Allow`, `Enable`, `Implement`, `New ... command/flag/option`
@@ -151,14 +179,15 @@ Keyword hints:
 Within each version, section order is:
 
 ```text
-Features → Bug Fixes → Polish → Refactors → Other
+Features → Polish → Bug Fixes → Refactors → Other
 ```
 
 Omit empty sections. Within each section, order entries by reader value, not upstream order:
 
 1. Put the most valuable, obvious, and larger changes first.
 2. Prefer broad user-visible features, workflow-changing fixes, high-frequency bugs, and large cross-cutting improvements over small polish, narrow edge cases, and internal cleanup.
-3. If entries have similar value, preserve upstream order.
+3. Within `Polish`, put directly user-visible UX or performance improvements (something users can see or feel) before protocol or internal-behavior adjustments (something that makes the model or pipeline behave more reliably but is invisible to users).
+4. If entries have similar value, preserve upstream order.
 
 Do not reword or exaggerate entries just to make them look more important; only reorder existing entries.
 
@@ -203,6 +232,8 @@ Example:
 - Update the native release workflow to use current GitHub artifact actions.
 ```
 
+Doc links: an entry that changes a documented config surface may end with a pointer to the docs page — `see [X](...) for details` (Chinese: `详见 [X](...)。`). Keep it a real Markdown link into the docs tree with a relative path (for example `../configuration/config-files.md#loop-control`). When the link text is a config key or another identifier, code-style the text inside the brackets: [`loop_control`](../configuration/config-files.md#loop-control). Never wrap the whole link in backticks — `` `[loop_control](...)` `` renders as raw inline code that exposes the relative path instead of a clickable link.
+
 ### 6. Translate The Increment Into Chinese
 
 After updating the English page, translate only the newly added English content into `docs/zh/release-notes/changelog.md`.
@@ -231,6 +262,53 @@ Chinese page requirements:
 - Translate only entry body text. Do not add entries that are not present in English.
 - Follow `docs/AGENTS.md` for Chinese typography: full-width punctuation, spaces between Chinese and English, and the glossary.
 
+#### Chinese wording style
+
+Structural fidelity does not mean literal translation. The Chinese entries should read like a concise, idiomatic Chinese changelog. Keep the same facts as the English entry, but rephrase for natural Chinese prose.
+
+Guidelines:
+
+- **One entry, one sentence.** Avoid chaining multiple effects with commas or semicolons. If the English entry is long, split it into shorter sentences or keep only the most important effect.
+- **Drop SDK-only and provider-internal detail.** Apply the trim from step 3 while translating: keep the user-facing effect and required constraints, drop SDK-mapping sentences, provider / wire-format mechanics, and internal XML markers. A long internal entry should collapse to one short Chinese sentence about what the user gets.
+- **Prefer common changelog verbs**: 新增、支持、修复、优化、改进、调整.
+- **Avoid indirect "through... make..." structures**. Do not write "通过 X，使 Y"; prefer direct cause-effect or just state the result.
+  - Bad: `通过缓存已渲染消息行，使终端在长篇对话中保持响应。`
+  - Better: `缓存已渲染消息行，提升长对话下终端的响应速度。`
+- **Be specific, not vague**. Prefer concrete actions over abstract quality words.
+  - Bad: `加固默认系统提示词和内置工具描述。`
+  - Better: `优化默认系统提示词与内置工具描述，避免 Agent 阻塞后台任务。`
+- **Name concrete files or config keys when it helps clarity**.
+  - Bad: `插件现在可以在其清单中声明 hooks。`
+  - Better: `插件现支持在 kimi.plugin.json 中声明生命周期 hooks。`
+- **Include required argument placeholders in CLI options**.
+  - Bad: `--allowed-host`
+  - Better: `--allowed-host <host>`
+- **Keep usage hints to one short clause**.
+  - Bad: `传入 --allowed-host 以允许额外的 host。例如 ... （多句展开）`
+  - Better: `例如 kimi web --allowed-host example.com。`
+- **Do not translate technical identifiers**: keep command names, flag names, file names, env vars, config keys as-is.
+- **Keep parallel rhythm within a section.** When several entries fix similar web surfaces (layout, animation, sizing), phrase them with a consistent structure (for example 修复 <问题>，现 <行为>) so the section reads as a tidy list rather than a mix of shapes.
+
+Example — translating a feature entry:
+
+English source:
+
+```markdown
+- Add a --allowed-host flag to kimi web that lets extra Host header values pass the DNS-rebinding check, and include allow guidance in the 403 error message. Pass --allowed-host <host> to allow an extra host.
+```
+
+Before (literal, wordy):
+
+```markdown
+- 为 `kimi web` 新增 `--allowed-host` 标志，允许额外的 Host 请求头值通过 DNS 重绑定检查，并在 403 错误消息中包含允许指引。传入 `--allowed-host <host>` 以允许额外的 host。例如 `kimi web --allowed-host example.com`。
+```
+
+After (concise, idiomatic):
+
+```markdown
+- `kimi web` 新增 `--allowed-host <host>` 选项，可将指定 Host 加入 DNS 重绑定白名单；403 错误会提示如何通过 `--allowed-host` 或 `KIMI_CODE_ALLOWED_HOSTS` 放行，例如 `kimi web --allowed-host example.com`。
+```
+
 ### 7. Verify
 
 Review:
@@ -246,8 +324,11 @@ Check:
 - Each version has the same section set and order on both pages.
 - Each section has the same number of entries on both pages.
 - Within each section, the most valuable, obvious, and larger entries appear before smaller or narrower entries.
+- Low-signal entries were collapsed into the single catch-all line, placed last under `Bug Fixes` — or under `Polish` when nothing folded is a fix (both the reader-action test and the channel test applied); the catch-all wording matches what was folded and never claims fixes that did not happen; section sizes stay within the density defaults (about 2 Polish, 3 Bug Fixes) unless extra qualifying entries were deliberately kept and flagged for review. The catch-all line ends with the upstream changelog pointer (file link, no version anchor).
 - PR links and commit hashes were stripped.
+- No `Thanks ...!` credit remains (remove it every time).
 - Real internal identifiers were replaced with neutral placeholders.
+- Doc links are real Markdown links (code-styled text inside the brackets when needed), never wrapped in backticks.
 - There are no empty sections.
 - Markdown indentation and blank lines are intact.
 
@@ -272,7 +353,7 @@ If the user chooses review:
    git diff docs/en/release-notes/changelog.md docs/zh/release-notes/changelog.md
    ```
 
-2. Summarize synced versions, section counts, and anything that needed manual classification.
+2. Summarize synced versions, section counts, and anything that needed manual classification. List every entry folded into a catch-all line (short titles, one line each), any section that exceeds the density defaults, and every borderline call flagged during curation — the reviewer cannot own a cutoff they cannot see.
 3. Tell the user to reply when they are done reviewing, or to ask for edits.
 4. Do **not** commit, push, or open a PR until the user explicitly says review is complete, or asks to proceed.
 
@@ -362,6 +443,18 @@ Return the PR URL to the user when done.
 |---|---|
 | Adding entries directly to the English docs page without reading upstream | Use `apps/kimi-code/CHANGELOG.md` as the source |
 | Copying PR links or commit hashes into docs | Strip them; keep only body text |
+| Leaving the `Thanks ...!` credit in docs | Remove it every time, including the multi-author form |
+| Leaving near-duplicate micro-tweaks as separate bullets | Merge small tweaks to the same surface into one higher-level entry (e.g. composer height + font → composer's default styling) |
+| Listing many narrow fixes to the same surface as separate bullets | When three or more fixes target the same UI area or the same class of problem, merge them into one higher-level fix entry; keep genuinely distinct or high-value fixes standalone |
+| Listing low-signal fixes or internal changes as standalone bullets | Collapse them into the single catch-all line (`Fix several known issues.`) placed last under Bug Fixes; treat the section-size defaults (about 2 Polish, 3 Bug Fixes) as a density guard, not a quota |
+| Folding a qualifying entry just to hit the section-size default | The defaults are density guards; keep entries that genuinely pass the reader-action test and flag the overflow for the human reviewer |
+| Keeping a fix because it was severe or hard-won | Severity makes the announcement redundant — the fix itself notifies whoever was hit; keep only behavior-change fixes and retrospective notices with a concrete, locatable action |
+| Keeping an improvement the product surfaces in context (recovery cards, post-install guidance, progress displays) | The product is the better channel — right users, moment of need; fold it (channel test) |
+| Folding a new capability because its control is visible somewhere in the UI | Visible is not discoverable — users do not explore; a toggle, menu item, or settings page that only waits to be found needs the changelog announcement |
+| Keeping a silent-impact fix out of diligence (dropped data, wrong results the user never noticed) | The changelog does not repair the past; if the notice names no locatable instance and no realistic action, it is anxiety without an outlet — fold it |
+| Overstating the catch-all pointer (for example claiming the upstream changelog is complete) | Keep the pointer restrained — `See the [changelog on GitHub](...) for more technical entries.`; upstream only contains changes that received a changeset |
+| Writing `Fix several known issues.` when nothing folded is a fix | Never claim fixes that did not happen; all-polish/internal folds go under Polish as `Make several refinements and internal improvements.` |
+| Listing a server/API entry that only backs a web feature already listed | Drop the API entry and keep the web UI entry, unless the API has independent user value |
 | Rewording upstream English entries | Upstream is frozen; copy the body text unless the user explicitly asks otherwise |
 | Leaving English text untranslated in the Chinese page | The Chinese page must be fully Chinese except preserved technical terms |
 | Editing upstream changelog text | Do not edit upstream |
@@ -375,6 +468,8 @@ Return the PR URL to the user when done.
 | Leaving empty sections | Delete sections with no entries |
 | Putting everything under Other for convenience | Classify what can be classified first |
 | Translating tool names, command names, or config keys | Keep them as written |
+| Wrapping a whole doc link in backticks | Code-style the link text inside the brackets instead, so the link stays clickable: [`loop_control`](...) |
+| Keeping hook/event payload-mechanics clauses | Drop what an event reports or carries; keep the new capability and how to configure it |
 | Creating a changeset for docs sync | Do not create one |
 | Committing or pushing directly on `main` | Create `docs/changelog-sync-<version>`, commit there, then open a PR |
 | Committing or opening a PR before the user skips review or confirms review is done | Wait at the human review checkpoint |

.changeset/README.md

@@ -20,16 +20,12 @@ All other workspace packages are private internal packages, are not published to
 - `@moonshot-ai/kaos`
 - `@moonshot-ai/kimi-code-oauth`
 - `@moonshot-ai/kimi-telemetry`
-- `@moonshot-ai/kimi-web`
 - `@moonshot-ai/kosong`
 - `@moonshot-ai/migration-legacy`
 - `@moonshot-ai/protocol`
-- `@moonshot-ai/server`
-- `@moonshot-ai/server-e2e`
 - `@moonshot-ai/vis`
 - `@moonshot-ai/vis-server`
 - `@moonshot-ai/vis-web`
-- `kimi-migration-legacy`
 
 Version impact from internal dependencies must be judged manually. The published artifacts for CLI and SDK bundle internal workspace packages into the artifact itself; runtime `dependencies` of published packages must not include any `@moonshot-ai/*` internal workspace packages.
 

.changeset/config.json

@@ -1,5 +1,5 @@
 {
-  "changelog": ["@changesets/changelog-github", { "repo": "MoonshotAI/kimi-code", "disableThanks": true }],
+  "changelog": ["@changesets/changelog-github", { "repo": "MoonshotAI/kimi-code" }],
   "commit": false,
   "fixed": [],
   "linked": [],
@@ -7,11 +7,10 @@
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
   "ignore": [
-    "@moonshot-ai/server-e2e",
     "@moonshot-ai/vis",
     "@moonshot-ai/vis-server",
     "@moonshot-ai/vis-web",
-    "kimi-migration-legacy"
+    "@moonshot-ai/kimi-inspect"
   ],
   "snapshot": {
     "useCalculatedVersion": true,

.changeset/goal-objective-length-warning.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Warn in the footer while a typed `/goal` objective exceeds the 4000-character limit, and restore the input instead of losing it when an over-limit objective is rejected. The error message now suggests putting long content in a file and referencing the file path.

.changeset/goal-objective-too-long-message.md

@@ -0,0 +1,6 @@
+---
+"@moonshot-ai/agent-core": patch
+"@moonshot-ai/agent-core-v2": patch
+---
+
+Include the file-reference workaround in the `GOAL_OBJECTIVE_TOO_LONG` error message so clients surface how to submit long objectives.

.gitattributes

@@ -0,0 +1,10 @@
+# Enforce LF line endings in the working tree on every platform so that
+# raw-imported text (e.g. `*.md?raw` templates) is byte-identical on Windows
+# and POSIX. Without this, Git for Windows' default `core.autocrlf=true`
+# checks text files out as CRLF, which shifts token-count snapshots.
+* text=auto eol=lf
+
+# Binary assets — never normalize line endings.
+*.gif binary
+*.ico binary
+*.png binary

.github/workflows/_native-build.yml

@@ -86,11 +86,9 @@ jobs:
           echo "KIMI_CODE_BUILT_IN_CATALOG_FILE=$CATALOG_FILE" >> "$GITHUB_ENV"
 
       - name: Build Kimi web assets
-        # The SEA blob step embeds apps/kimi-code/dist-web; build the web app
-        # and stage its assets before producing the native executable.
-        run: |
-          pnpm --filter @moonshot-ai/kimi-web run build
-          node apps/kimi-code/scripts/copy-web-assets.mjs
+        # The SEA blob step embeds apps/kimi-code/dist-web. The bundle is
+        # committed (synced from the code-app repo) — just verify it is in place.
+        run: node apps/kimi-code/scripts/check-web-assets.mjs
 
       - name: Build native executable (release profile, macOS signed)
         if: runner.os == 'macOS' && inputs.sign-macos

.github/workflows/ci.yml

@@ -30,6 +30,10 @@ jobs:
 
   test:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        shard: [1, 2, 3, 4, 5]
 
     steps:
       - uses: actions/checkout@v4
@@ -42,7 +46,67 @@ jobs:
           cache: pnpm
 
       - run: pnpm install --frozen-lockfile
-      - run: pnpm run test
+      - run: pnpm run test --shard=${{ matrix.shard }}/5
+
+  # pi-tui's suite runs on node:test (not vitest), so the root `pnpm run test`
+  # does not execute it; it needs its own job.
+  test-pi-tui:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v6
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version-file: .nvmrc
+          cache: pnpm
+
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm --filter @moonshot-ai/pi-tui test
+
+  # The VS Code extension suite runs on the default (v2) engine as part of the
+  # sharded root run above; this job reruns it on the legacy v1 engine, which
+  # the extension selects through the rollback env var.
+  test-vscode-legacy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v6
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version-file: .nvmrc
+          cache: pnpm
+
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm --filter kimi-code test
+        env:
+          KIMI_CODE_LEGACY_FLAG: "1"
+
+  test-windows:
+    runs-on: windows-latest
+    # Temporarily disabled while Windows tests are being stabilized.
+    if: false
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v6
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version-file: .nvmrc
+          cache: pnpm
+
+      - run: pnpm install --frozen-lockfile
+      # Windows runners are slower and run the whole suite (including
+      # in-process e2e tests) under more contention, so the default 5s test
+      # timeout causes flaky failures. Give it more headroom.
+      - run: pnpm run test -- --testTimeout=30000
 
   lint:
     runs-on: ubuntu-latest
@@ -82,8 +146,8 @@ jobs:
             echo "Typechecking ${config}"
             pnpm dlx --package @typescript/native-preview@beta tsgo -p "${config}" --noEmit
           done
-      - name: Typecheck kimi-web (vue-tsc)
-        run: pnpm --filter @moonshot-ai/kimi-web run typecheck
+      - name: Typecheck VS Code extension
+        run: pnpm --filter kimi-code run typecheck
       - name: Typecheck vis-server
         run: pnpm --filter @moonshot-ai/vis-server run typecheck
       - name: Typecheck vis-web

.github/workflows/pkg-pr-new.yml

@@ -36,9 +36,6 @@ jobs:
       - name: Build package dependencies
         run: pnpm run build:packages
 
-      - name: Build Kimi web assets
-        run: pnpm --filter @moonshot-ai/kimi-web run build
-
       - name: Generate Kimi Code built-in catalog
         shell: bash
         run: |

.github/workflows/release.yml

@@ -37,7 +37,7 @@ jobs:
           registry-url: "https://registry.npmjs.org"
 
       - name: Upgrade npm for Trusted Publishing
-        run: npm install -g npm@latest
+        run: npm install -g npm@11
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile

.gitignore

@@ -1,12 +1,14 @@
 node_modules/
 dist/
-dist-web/
 dist-single/
 dist-native/
 .tmp-api-extractor/
+.contract-types-tmp/
+.local/
 coverage/
 *.tsbuildinfo
 .vitest-results/
+.vite/
 .DS_Store
 .playwright-mcp/
 .claude
@@ -15,6 +17,11 @@ coverage/
 plugins/cdn/
 .worktrees/
 .kimi-code/local.toml
+.kimi-sandbox/
+.vscode/
+!apps/vscode/.vscode/
+!apps/vscode/.vscode/*.json
+apps/vscode/artifacts/
 
 Dockerfile
 docker-compose.yml
@@ -23,3 +30,16 @@ docker-compose.yml
 docs/superpowers/
 reports/
 .superpowers/
+/plan/
+
+# Agent scratch / throwaway files - do not commit
+.tmp/
+HANDOVER*.md
+HANDOFF*.md
+handoff.md
+handover.md
+*-designs.html
+*-design.html
+*-mockup.html
+*-demo.html
+*-demos.html

.oxlintrc.json

@@ -90,6 +90,30 @@
         "eslint/no-console": "off"
       }
     },
+    {
+      // The worker closures: these modules (and everything
+      // packages/minidb/src/worker/ and
+      // packages/kap-server/src/search/worker/ pull in) are loaded by a bare
+      // node:worker_threads Worker under Node's native type stripping with
+      // `execArgv: ['--experimental-transform-types']`, which requires
+      // explicit `.ts` import specifiers (the strip loader does not remap
+      // `.js` -> `.ts`). Keep the exception scoped to exactly those closures.
+      "files": [
+        "packages/minidb/src/worker/**/*.ts",
+        "packages/minidb/src/codec.ts",
+        "packages/minidb/src/crc32.ts",
+        "packages/minidb/src/trigram.ts",
+        "packages/minidb/src/text-postings.ts",
+        "packages/minidb/src/text-index/tokenize.ts",
+        "packages/minidb/src/gen-codec.ts",
+        "packages/kap-server/src/search/worker/**/*.ts",
+        "packages/kap-server/src/search/indexCore.ts",
+        "packages/kap-server/src/search/match.ts"
+      ],
+      "rules": {
+        "import/extensions": "off"
+      }
+    },
     {
       "files": ["packages/kosong/src/providers/**/*.ts"],
       "rules": {
@@ -146,10 +170,12 @@
   ],
   "ignorePatterns": [
     "dist/",
+    "dist-web/",
     "coverage/",
     "node_modules/",
     "apps/*/scripts/",
     "docs/smoke-archive/",
+    "packages/pi-tui/",
     "*.generated.ts"
   ]
 }

AGENTS.md

@@ -15,16 +15,21 @@ This is a TypeScript monorepo built for agent-assisted development. Keep the roo
 ## Project Map
 
 - `apps/kimi-code`: the CLI / TUI application. It consumes core capabilities through `@moonshot-ai/kimi-code-sdk` and must not depend directly on `@moonshot-ai/agent-core`. When writing or modifying its terminal UI, use the `write-tui` skill (`.agents/skills/write-tui/SKILL.md`).
-- `apps/kimi-web`: the browser web UI, a peer to the TUI. Vue 3 + Vite + vue-i18n; talks to the server over REST + WebSocket under `/api/v1`. It must not depend on `@moonshot-ai/agent-core` (wire types are re-implemented locally). See `apps/kimi-web/AGENTS.md`.
+- the browser web UI: **its source no longer lives in this repo.** It is developed in the code-app repo (`apps/web`) and shipped as the committed, prebuilt bundle `apps/kimi-code/dist-web` (gitignored, force-added), synced from code-app with `KIMI_CODE_REPO=<this checkout> pnpm run sync:web` — sync and commit the bundle in the same change whenever the web UI should ship differently. `apps/kimi-code/scripts/check-web-assets.mjs` guards packaging against a missing bundle. To hack on the web UI against this repo's server, run `pnpm dev:server` here and point code-app's `pnpm dev:web` at it via `KIMI_SERVER_URL`.
 - `apps/vis`, `apps/vis/server`, `apps/vis/web`: visual debugging tools for sessions and replays.
-- `packages/agent-core`: the unified agent engine, including Agent, Session, profile, skills, tools, plan, permission, background, records, the in-process DI service layer (`src/services/`), and other core capabilities.
+- `apps/kimi-inspect`: web inspector for the kap-server `/api/v1/debug` RPC surface — workspace/session browser, per-session transcript chat, per-scope Service panels, and the DI unit inspection view. See `apps/kimi-inspect/AGENTS.md`.
+- `packages/agent-core`: the unified agent engine, including Agent, Session, profile, skills, tools, plan, permission, background, records, the in-process DI service layer (`src/services/`), and other core capabilities. See `packages/agent-core/AGENTS.md`.
+- `packages/agent-core-v2`: the DI × Scope agent engine (the v2 port behind kap-server). Four `LifecycleScope` tiers — `App` / `Workspace` / `Session` / `Agent` (`app/scopes.ts`) — plus the L3 unit layer (`Service`/`Fiber` units, collection contribution points, the Feature seam in `src/features/`); there is no App-level session lifecycle facade — callers compose `ISessionIndex` → `IWorkspaceLifecycleService.handlerFor` → the handler. See `packages/agent-core-v2/AGENTS.md` and use the `agent-core-dev` skill (`.agents/skills/agent-core-dev/SKILL.md`) when developing here.
 - `packages/node-sdk`: the public TypeScript SDK and harness.
 - `packages/kosong`: the LLM / provider abstraction layer.
 - `packages/kaos`: the execution environment and file/process abstractions.
 - `packages/oauth`: Kimi OAuth and managed auth utilities.
 - `packages/telemetry`: shared client-side telemetry infrastructure.
-- `packages/server`: the Kimi Code server. Hosts `agent-core` sessions and exposes them over REST + WebSocket (`/api/v1`); bootstrapped from `src/start.ts` and consumed by `apps/kimi-code`. See `packages/server/AGENTS.md`.
-- `packages/server-e2e`: live e2e tests and scenarios against a running server (`KIMI_SERVER_URL`, default `http://127.0.0.1:58627`). See `packages/server-e2e/AGENTS.md`.
+- `packages/transcript`: the isomorphic transcript rendering data layer — L1 agent-granular store, L2 idempotent operations, L3 `off/turn/block/delta` subscription granularity, L4 framework-free view registry, plus turn-cursor pagination. Pure TypeScript (browser-safe, no engine imports); the sole owner of the transcript contract types (`src/contract/`) and the op-batch sequencing contract. See `packages/transcript/AGENTS.md`.
+- `packages/kap-server`: the Kimi Code server, backed by `@moonshot-ai/agent-core-v2`; exposes sessions over REST + WebSocket (`/api/v1` + `/api/v1/ws`), plus the `/api/v1/debug/*` reflection RPC surface (`--debug-endpoints`, loopback bind + bearer auth). See `packages/kap-server/AGENTS.md`.
+- `packages/klient`: the client SDK — a contract-driven facade over agent-core-v2 (`global.*` / `session(id).*` / `agent(id).*`, zod-validated); transport via subpath entry (`@moonshot-ai/klient/ipc|memory`, both return the same `Klient`); also hosts the e2e suites. See `packages/klient/AGENTS.md`.
+- `packages/tree-sitter-bash`: a pure-TypeScript bash parser (no runtime deps, no wasm); `parse(source, { timeoutMs, maxNodes })` runs under a deterministic budget and returns a discriminated `ParseResult` — callers must treat aborted/hasError trees as "cannot analyze" and degrade. Parser only, no safety judgments; see the package README's "Known differences" section.
+- `packages/minidb`: the embedded JSON document store (`MiniDb`) behind kap-server's search index — snapshot + WAL persistence with an exclusive write lock, a larger-than-RAM full-text layer, and persistent index generations. See `packages/minidb/AGENTS.md`.
 
 ## Environment Requirements
 
@@ -51,19 +56,21 @@ This is a TypeScript monorepo built for agent-assisted development. Keep the roo
   - NO: `interface Options { user?: User | undefined }`
 - Internal methods with only a single parameter should not be turned into options objects just for stylistic uniformity.
 - Except for a package's `index.ts`, other `index.ts` files should prefer `export * from './module';`.
-- The `Agent` class in `packages/agent-core/src/agent` must be usable on its own. The constructor must not force the caller to create a `Session` instance, nor require an `agentId` or `session`. It may accept an optional `sessionId` as a request-config hint — for example mapped to the provider's `prompt_cache_key` — but the instance must not hold `sessionId`, and must not depend on the Session lifecycle, metadata, or parent/child relationship logic.
 - Do not add too many new test files. Prefer adding tests to the existing test file of the corresponding component or module.
 - When a test fails because of a user modification, default to fixing the test first; do not change the implementation to satisfy an old test unless the implementation truly has a bug.
 - Do not sacrifice code quality for external compatibility unless the user explicitly asks for it. Breaking changes go through changesets and a `major` bump, gated by the rule below.
 
 ## Experimental Features
 
-- Gate a not-yet-public feature behind an experimental flag. Add the flag to the registry at `packages/agent-core/src/flags/registry.ts`, then check it with `flags.enabled('my-feature')`. Flags are env-driven and default off: `KIMI_CODE_EXPERIMENTAL_<NAME>` toggles one, `KIMI_CODE_EXPERIMENTAL_FLAG` enables all. Release by flipping the entry's `default` to `true`.
+- Gate a not-yet-public feature behind an experimental flag. Flags are env-driven and default off: `KIMI_CODE_EXPERIMENTAL_<NAME>` toggles one, `KIMI_CODE_EXPERIMENTAL_FLAG` enables all. Release by flipping the entry's `default` to `true`.
+  - `packages/agent-core` (v1): add the flag to the central registry at `packages/agent-core/src/flags/registry.ts`, then check it with `flags.enabled('my-feature')`.
+  - `packages/agent-core-v2` and kap-server modules: there is no central catalog — declare the flag in the owning domain via `registerFlagDefinition` at import time (see `packages/agent-core-v2/docs/flag.md`), then check it with `IFlagService.enabled(id)`. Current search-index-separation flags: `persistence_minidb_readmodel` (session read model, default on) and `search_worker` (global search worker host, default on).
 
 ## Where to Update Instructions
 
 - Hard rules that affect almost every task: update the root `AGENTS.md`.
 - Rules that only affect a specific directory: update the nearest sub-directory `AGENTS.md`.
+- Project-map entries stay at 1–2 sentences; deep package docs live in the package's own `AGENTS.md`.
 - Keep instruction updates focused and supported by code facts.
 
 ## Workflow Requirements
@@ -75,5 +82,9 @@ This is a TypeScript monorepo built for agent-assisted development. Keep the roo
 - When an AI agent opens or updates a PR, fill in `.github/pull_request_template.md` — link the related issue or explain the problem, then describe what changed. Do not leave placeholder text or submit a generic summary of the diff.
 - Do not submit vague AI-generated PR text. The human author must understand the change well enough to explain the code, edge cases, and why the approach fits this repository.
 - After finishing a task and before submitting a PR, you must run the `gen-changesets` skill (see `.agents/skills/gen-changesets/SKILL.md`) and generate a changeset under `.changeset/` according to its rules.
-- When generating a changeset, **never** decide on a `major` bump on your own. When you judge a change to meet the major criteria (breaking changes, incompatible user configuration, renamed or removed commands/arguments, changed behavior semantics, etc.), you must stop and explain it to the user and ask for confirmation. **Only write `major` after the user has explicitly agreed.** Otherwise default to `minor` (and fall back to `patch` if `minor` is unclear). See the "Hard rule: confirm with the user before writing `major`" section in `.agents/skills/gen-changesets/SKILL.md` for details.
+- When generating a changeset, **never** decide on a `major` bump on your own — stop, explain, and get explicit user confirmation first; default to `minor`, fall back to `patch`. See `.agents/skills/gen-changesets/SKILL.md`.
 - Prefer importing via `import ... from '#/...'`, which serves the same purpose as `import ... from '@/...'`.
+- Do not commit throwaway scratch or exploratory files. Never stage:
+  - Agent working notes or handoff/summary documents (e.g. `HANDOVER-*.md`, `HANDOFF-*.md`, `handoff.md`).
+  - Throwaway UI/UX prototypes or design mockups (e.g. `*-designs.html`, `*-mockup.html`, `*-demo(s).html`) at the repo root or under a `design/` folder. The only tracked `.html` files should be Vite `index.html` entrypoints.
+  Before committing or opening a PR, run `git status` and `git diff --staged --stat` and remove anything matching these patterns. Put scratch work under `.tmp/` (gitignored) instead of the repo root or the source tree.

CLAUDE.md

@@ -0,0 +1 @@
+AGENTS.md

GOAL.md

@@ -0,0 +1,231 @@
+# Goal 功能拆分
+
+本文把 agent-core 中 goal mode 的能力拆成三部分：
+
+1. 核心工作流：没有它就不能运行 goal。
+2. 统计 / token 数限制：让 goal 可度量、可限额、可审计。
+3. 用户交互相关：让用户可以安全启动、理解、控制和恢复 goal。
+
+## 1. 核心工作流
+
+核心工作流是 goal mode 的运行骨架。它负责创建结构化目标、维护状态机、把普通 turn 串成自治多轮执行，并让模型用机器可读状态结束或停放目标。
+
+### 目标状态
+
+同一个 main agent 同时最多只有一个当前 goal。goal 不是普通聊天文本，而是 runtime 持有的结构化状态，至少包含目标、可选完成标准、当前状态、停止原因和运行统计。
+
+状态分为四类：
+
+- `active`：正在被 goal driver 推进。只有这个状态会自动运行下一轮。
+- `paused`：暂停但保留目标。通常来自用户暂停、中断、进程恢复后降级、provider 或 runtime 错误。可以恢复。
+- `blocked`：目标遇到真实阻塞但保留目标。通常来自模型判断需要外部输入、目标无法按当前表述完成、预算达到、prompt hook 阻止。可以恢复。
+- `complete`：瞬时完成状态。runtime 发出完成事件后立即清除 goal，不长期持久化。
+
+没有 `cancelled` 状态。取消就是清除 goal，并提醒模型忽略之前关于该目标的 active reminder。
+
+### 创建和替换
+
+创建 goal 时，runtime 需要校验目标不能为空、不能过长。已有 active、paused 或 blocked goal 时，默认拒绝创建新 goal，防止静默覆盖。只有用户或调用方明确要求替换时，才先清除旧 goal，再创建新 goal。
+
+新 goal 创建后进入 `active`，写入持久记录，并发出 goal 更新事件。
+
+### 多轮驱动
+
+goal driver 的职责是把一个 active goal 推进成连续的普通 turn：
+
+- turn 开始时如果 goal 已经是 `active`，进入 goal driver。
+- 普通 turn 中如果模型创建了 goal，或把 paused/blocked goal 恢复成 active，当前 turn 结束后 goal driver 接管继续执行。
+- driver 每次只运行一个普通 turn。
+- 每个 turn 结束后读取 goal 状态。
+- goal 仍是 `active` 时，runtime 自动追加 continuation prompt 并启动下一轮。
+- goal 变成 `paused`、`blocked` 或被清除时，driver 停止。
+
+模型如果不调用状态更新工具，且 goal 仍是 active，runtime 会继续下一轮。模型不能只靠自然语言说“完成了”来结束 goal，必须给出结构化状态信号。
+
+### Goal 注入
+
+每个 goal turn 的边界，runtime 会把当前 goal 状态注入上下文。注入内容包括：
+
+- 当前正在 goal mode。
+- 目标和完成标准是什么。
+- 目标文本是用户提供的数据，不能覆盖 system/developer 指令、工具 schema、权限规则或 host 控制。
+- 当前状态和进度。
+- 模型应该做简短自审，然后推进一个连贯工作切片。
+- 简单、已完成、不可能、不安全、矛盾的目标，应在同一轮内直接标记 complete 或 blocked。
+- 只有全部要求完成、验证通过、没有下一步有用动作时，才能标记 complete。
+- 外部条件或用户输入阻塞时，应标记 blocked。
+- 不要只做了计划、总结、第一版或部分结果就标记 complete。
+
+goal 注入只在 turn / continuation 边界做，不在每个 model step 都做，避免上下文重复膨胀，也有利于 prompt cache。
+
+paused 和 blocked goal 的注入更轻：
+
+- paused：提醒模型目标存在但当前不应自治推进，除非用户明确要求继续。
+- blocked：提醒模型目标被阻塞且当前不自治推进，除非用户要求处理或恢复。
+
+### Continuation prompt
+
+当 goal 仍是 active，runtime 会追加一个系统触发输入，含义相当于“继续朝当前 active goal 工作”。它不只是简单续跑，还要求模型每轮重新判断：
+
+- 是否已经完成。
+- 是否遇到真实阻塞。
+- 是否应该只推进一个合理切片后继续下一轮。
+- 是否应该避免发散或启动无关工作。
+- 除非真实阻塞，否则不要向用户要输入。
+
+### 完成、阻塞和暂停
+
+模型通过结构化状态更新控制 goal 生命周期：
+
+- `complete`：目标已满足，runtime 发出完成事件并清除 goal。
+- `blocked`：遇到真实阻塞，runtime 保留 goal 并停止自治推进。
+- `paused`：暂时放下 goal，runtime 保留 goal 并停止自治推进。
+- `active`：恢复 paused 或 blocked goal。
+
+状态更新工具的输入应保持窄，只表达机器状态。完成总结或阻塞原因由模型随后给用户说明。
+
+当模型标记 complete 后，runtime 应再给模型一次收尾机会，生成简短最终回复，说明 goal 已完成、主要做了什么、跑了什么验证。
+
+当模型标记 blocked 后，runtime 应再给模型一次收尾机会，说明具体阻塞、需要什么输入或变化才能继续。
+
+如果当前 turn 已经没有 step 预算，不应为了收尾总结强行再跑一步，避免把“没法写总结”变成 turn 失败。
+
+### 错误停车
+
+goal mode 把技术运行失败视为可恢复停车：
+
+- 用户中断当前 turn：goal 变 paused。
+- provider rate limit：goal 变 paused。
+- provider 连接错误、认证错误、API 错误：goal 变 paused。
+- 模型配置错误：goal 变 paused。
+- runtime 异常：goal 变 paused。
+- provider safety filter：goal 变 paused。
+
+业务、规则或外部条件阻塞则变 blocked：
+
+- prompt hook 阻止目标。
+- 模型判断无法继续。
+- 预算达到。
+- 需要用户或外部系统提供新条件。
+
+### 持久化和恢复
+
+goal 的创建、更新、完成、阻塞、清除应写入可恢复记录。session 恢复时，runtime 用记录重建 goal。
+
+恢复时如果发现 goal 原来是 active，不应自动继续跑，而是降级为 paused。因为旧进程中的 active turn 不可能还活着，自动继续会造成重启后偷偷消耗资源。
+
+paused 和 blocked 原样保留。complete 理论上不长期存在，因为完成后会清除。
+
+fork session 时不继承源 session 的 goal，并提醒模型不要继续源 session 的旧目标。
+
+## 2. 统计 / token 数限制
+
+这一部分让 goal 可度量、可限额、可审计。没有它，goal 仍然可以运行，但不可控。
+
+### 运行统计
+
+goal 统计包括：
+
+- continuation turn 数。
+- token 数。
+- active wall-clock 时间。
+
+统计只在 goal 是 `active` 时增长。paused 和 blocked 期间不继续计数。
+
+turn 统计在每个 goal turn 准备运行时增加，因此模型在某一轮里标记 complete 时，这一轮也计入最终统计。
+
+token 统计在 model step 结束后累计。没有 active goal 时，不记入 goal。token 统计应以静默更新为主，不应每一步都刷 UI。
+
+时间统计只计算 active pursuit 时间。进入 active 时开启计时区间，离开 active 时折算进累计时间；pause/resume 会形成新的 active 区间。
+
+### 预算
+
+goal 预算包括：
+
+- turn budget。
+- token budget。
+- wall-clock budget。
+
+默认没有预算。只有用户明确给出硬限制时才设置，例如“最多 20 轮”“不超过 500k token”“30 分钟内”。模糊表达如“尽快”“别花太久”不能设置预算，模型也不能自行发明预算。
+
+时间预算需要合理范围。过短或过长应拒绝。turn 和 token 预算应规范化为正整数。
+
+### 预算硬停
+
+预算检查应发生在 goal turn 开始前和结束后。token budget 还应在 model step 后触发停止，避免超额后继续下一步。
+
+一旦达到预算，runtime 应直接把 goal 标记为 blocked，原因是配置预算已达到。这个 blocked 仍可恢复，但如果预算不变，恢复后可能立刻再次 blocked。
+
+### 预算引导和最终统计
+
+当预算未接近时，模型提示应鼓励稳定推进。当任一预算达到 75% 以上时，提示应转为收敛，避免启动新的可选工作。
+
+complete 和 blocked 的最终回复提示应包含 worked turns、elapsed time、tokens used 等统计信息。UI 事件也应带当前 snapshot 和变化类型。
+
+telemetry 可以记录 goal 创建、预算设置、continuation、状态变化、清除等事件，但不应包含目标文本、停止原因等敏感内容。
+
+## 3. 用户交互相关
+
+这一部分让用户可以安全启动、理解、控制和恢复 goal。没有它，runtime 仍可能运行，但交互体验和安全边界不足。
+
+### 生命周期控制
+
+用户可以直接控制 goal：
+
+- 创建。
+- 查看。
+- 暂停。
+- 恢复。
+- 取消。
+
+这些操作可以不经过模型 turn。pause 把 active goal 变 paused；resume 把 paused 或 blocked goal 变 active；cancel 直接清除当前 goal。
+
+resume 会清除旧停止原因，表示开始新的尝试。paused/blocked goal 不会因为用户发普通消息就自动继续。
+
+### 模型发起 goal 的确认
+
+模型可以代表用户创建 goal，但只有在用户明确要求启动 goal、自治工作，或宿主 goal-intake 提示要求时才应该这样做。普通请求不能被模型擅自升级成 goal。
+
+模型发起 CreateGoal 时，非 auto 权限模式下应触发用户确认。确认菜单允许用户选择本次 goal 的运行权限模式。用户拒绝则 goal 不创建。
+
+`GetGoal`、`SetGoalBudget`、`UpdateGoal` 只改 goal runtime 状态，默认可以更容易批准。真正写文件、跑 shell、访问敏感路径等仍走普通权限系统。
+
+### 暂停、阻塞和取消后的提示
+
+paused goal 的上下文提示应说明目标存在但当前不应继续做，除非用户明确要求继续。
+
+blocked goal 的上下文提示应说明目标被阻塞且当前不自治推进，可以在用户要求时帮助解阻，否则正常处理当前请求。
+
+cancel 后应追加提醒，让模型忽略旧 goal 的 active reminder，避免旧上下文诱导模型继续已经取消的目标。
+
+### 完成和阻塞的用户回复
+
+complete 后，goal 被清除，模型应给用户一条简短完成总结，说明完成了什么、做了什么验证。
+
+blocked 后，goal 保留，模型应给用户一条简短阻塞说明，说明具体阻塞和继续所需输入、权限、外部条件或变更。
+
+### Tool 暴露和隔离
+
+goal 工具只给 main agent。subagent 不应直接创建、恢复、结束主 goal。
+
+没有 goal 时，模型不应看到 `UpdateGoal` 和 `SetGoalBudget`。有 goal 时才暴露这些控制工具。
+
+goal ID 不应暴露给模型，因为它只是 runtime/UI 内部标识，没有用户语义。
+
+### 辅助写 goal
+
+`write-goal` 类能力用于帮助用户把粗糙意图整理成适合 goal mode 的完成契约。好的 goal 应明确：
+
+- end state：什么条件必须变成真。
+- proof：用什么可观察证据证明完成。
+- boundaries：工作范围和禁止触碰的内容。
+- loop：如何迭代推进。
+- stop rule：什么情况下停止并报告，而不是强行继续。
+
+预算是 opt-in，不应默认加入，也不应把 turn cap 写进目标文本。
+
+### UI 和会话语义
+
+goal 创建、暂停、恢复、阻塞、完成、清除都应发出 goal updated 事件。lifecycle 变化和 completion 变化应区分。completion 是一次终局事件，然后 snapshot 变 null。blocked/paused 保留 snapshot，UI 可以继续展示可恢复 goal。
+
+session 恢复时，active goal 会变 paused，避免重启后自动继续。fork session 时不继承 goal，并提醒模型不要继续源 session 的目标。

README.md

@@ -19,12 +19,6 @@ Install with the official script. No Node.js required.
 curl -fsSL https://code.kimi.com/kimi-code/install.sh | bash
 ```
 
-- **Homebrew (macOS/Linux)**:
-
-```sh
-brew install kimi-code
-```
-
 - **Windows (PowerShell)**:
 
 ```powershell

README.zh-CN.md

@@ -22,12 +22,6 @@ Kimi Code CLI 是一个运行在终端里的 AI 编程 agent，可以帮你读
 curl -fsSL https://code.kimi.com/kimi-code/install.sh | bash
 ```
 
-- **Homebrew（macOS / Linux）**：
-
-```sh
-brew install kimi-code
-```
-
 - **Windows（PowerShell）**：
 
 ```powershell

apps/kimi-code/.gitignore

@@ -6,3 +6,6 @@ agents/
 # next to it keeps `#/generated/vis-web-asset` type-resolvable on a fresh
 # clone (before any build has produced the `.ts`).
 src/generated/vis-web-asset.ts
+
+# Copied from packages/pi-tui/native at build time by scripts/copy-native-assets.mjs
+/native/

apps/kimi-code/AGENTS.md

@@ -65,6 +65,7 @@ The theme apply/switch mechanics live in the `write-tui` skill. The following ru
 
 ## General Coding Requirements
 
+- The startup path before the workspace trust gate (`KimiTUI.start()` -> `maybeRunWorkspaceTrustPrompt()`) must not spawn child processes by bare command name — on Windows, cmd.exe / CreateProcess resolve them from the current directory first, so a binary planted in an untrusted workspace would run before the user confirms trust. When an external command is unavoidable, resolve it with `resolveCommandPath` from `src/utils/process/resolve-command.ts`, which returns an absolute PATH hit and refuses matches inside the cwd.
 - For optional object properties, pass `undefined` directly — do not use conditional spread.
 - Optional object properties do not need to additionally allow `undefined` in the type.
 - Internal methods with only a single parameter should not be turned into options objects just for stylistic uniformity.