@deepseek-ai/dsh-api-session-controller 0.2.1-alpha.2 → 0.2.1-alpha.3

package/README.i18n.yaml

@@ -15,8 +15,8 @@
   en: 1fdf707322fb6996
   zh: 0204f7e9d4aa3cce
 /session-controller/use-this-package:
-  en: d26a58a8f2406cd5
-  zh: 82135eceb9adb628
+  en: f9e4042fae88f801
+  zh: f379f78966d57c2e
 /session-controller/client-references:
   en: 41bdda1ac32df558
   zh: aa5d0e325924066b

package/README.md

@@ -33,13 +33,15 @@ The Client journal validates current Session event envelopes before publishing f
 
 Each endpoint states its activation policy. List reads only stored headers and projection-cache rows: it never calls per-session stat or opens a cold Session body. A current-format cache identity may supply every list hint; a lifecycle-matching predecessor cache may supply only its version-compatible title as a stale display fact, never as an authoritative fold seed. Search, attachment, history pages, log following, skill discovery, and workspace-path opening can inspect persistence without activating an Agent; `canOpenWorkspacePath()` reports native-opening availability without addressing a Session. Cancellation requires live state; queue mutation, model, rename, prompt, and file-reference operations may resolve or resume an ordinary Session. Prompt rejects content with neither non-whitespace text nor an attachment before resolving the Agent or appending Session events; queue edits accept only non-empty text content. Prompt admission consumes opaque receipts from the injected [`fileUploads`](../../client/file-upload/README.md) Host service and resolves every same-Agent receipt before sending the complete ordered content list through `ctx.attachments`. Prompt retries whose `requestId` is already queued or logged return the original acceptance without inserting another message. Create and fork are the only operations that create a new Agent directly. The service applies one preset-aware resume policy and subagent ownership fence to its own methods and to the Typert Agent and Session lookups used by other Remote namespaces. Queue mutation has one narrow exception: a live child whose current projected identity is continuable and comes from its own non-seed suffix accepts the ordinary Edit, Remove, and QueueDock Steer actions across both inbox destinations. One-shot, missing, unknown, corrupt, seed-only, or cold children remain rejected without resume. The skill catalog uses a live Agent's effective working directory and scoped registry when present. Cold listing uses the projected current directory, falling back to the recorded origin and then the configured directory default. It retains the preset standing scope without activating an Agent. The authenticated delivery routes use `workspaceDesktop()` for the serving Host name and file-manager behavior. `openWorkspacePath({ path, action: "reveal" })` delegates file-manager navigation to the native adapter; omitting `action` opens the file-type association, including HTML and SVG. Both operations require the composed filesystem to map the requested Host path to the same canonical process path; unmapped remote paths are refused before a native command runs. `session.projections` normally reads an exact baseline, including current-format cold logs, and returns `kind: sequenced`. Only a read requiring migration returns `kind: migration-required` hints without `asOfSeq`; missing keys remain absent. It returns null for a missing Session. Fork callers may set `allowMigration: false` to receive `session/migration-required` instead of starting source migration; omission retains automatic migration. The Client exposes shared values and explicit-read state through `projectionsBySession`; domains select their own keys. Session-list summaries carry `agentAvailable`, updated through existing summary and status events independently of durable projections. Sequenced reads and live projection frames use the same sequence ordering; cached reads fill hints without replacing sequenced values.
 
+Every Remote endpoint is access-controlled: a Peer whose principal is not the owner reaches an endpoint only when, on every resource the call touches, a binding of that principal kind's policy in [`dsh-api-remote-access`](../remote-access/README.md) grants a role listing the action ([Peer principals Agent Note](../../../.agents/notes/implemented/architecture/2026-10-12-peer-principal-and-remote-access.md)). The controller injects `remoteAccess` and registers the `session` resource kind with the default field `sessionId` through `typert.resources`. `session/page` and `session/follow` declare a `session` reader in `@Remote({ resources })` that reads `request.address.sessionId` for an ordinary Session address and `request.address.childSessionId` for a subagent address; whether access to the parent Session covers its children is the policy's rule. `session/projections` reads the Session resource from `request.sessionId`, so a reconnecting reader reloads only the projections of Sessions it may read. `session/list`, `session/search`, and `session/control` read no resource, so their calls touch the `global` resource and need a `global` role; for a non-owner caller, `session/list` returns only the rows, `session/search` only the hits, and `session/control` only the baseline projections and projection frames, whose Session `ctx.remoteAccess.allows()` admits for the same action, so that action also belongs to a `session` role; owner results are unfiltered. `session/prompt` builds the durable `user-rpc` message source in its Remote method and records `principal` only for a non-owner caller, read through `principalOf(this.ctx.invocation)`; a source without `principal` belongs to the owner.
+
 List rows carry `formatStatus` when available, so Clients can identify migration-required Sessions without requesting their projections.
 
 Host list generation yields between complete rows only when its configured work slice is exhausted; cheap remaining work returns without a forced yield. Request cancellation is checked per row and after each yield and rejects without partial results. Each row is synchronous; the list does not promise one cross-Session snapshot. A Session already queued as cold remains a cached row if it attaches during a yield: Client in-flight mutation replay corrects its availability, and sequenced projections supersede cached hints.
 
 Client list rows and resident Sessions use the current `sessionListMetadata` projection to reject stale blank-session hints; recency is the later of the summary timestamp and the projected last user prompt. When SessionManager creates an instance before its list row arrives, it reconciles blankness with metadata already retained for that Session. An opened conversation is therefore not reused by New Session even when an older list response still marks it blank.
 
-Explicit-id `session.create` adopts a live Session or resumes a persisted Session while retaining its writer lock. Writer contention returns `session/writer-held`; callers may try another blank without suppressing unrelated failures. `session.list` includes persisted blanks using cached metadata, without opening cold log bodies.
+`session.create` returns a Session for a new conversation, and its response names the Session actually used. A named `sessionId` is reused while it is blank (no turn has started), belongs to the requested directory, is an unarchived member of the requested Workspace, and is not written by another owner; a live Session is reused in place, and a persisted one is resumed while retaining its writer lock. The reused Session runs the requested `agentPreset`, or the configured default when the request names none: its recorded preset is not resolved, and a change is logged as `agent-preset/selected` before the Agent is published. A named Session that has started, fails the Workspace placement, or is written by another owner stays unchanged, and a new Session is created instead. A `sessionId` with no stored Session becomes the new Session's identity. A named Session in another directory fails with `session/conflict`, and one owned by subagent routing with `session/agent-busy`; both checks precede preset resolution. Creations naming one identity run in arrival order, including their preset resolution, and each response reports the preset its own request left the Session running. `session.list` includes persisted blanks using cached metadata, without opening cold log bodies.
 
 Client list refreshes retain unchanged row objects and reuse the items array when order and values match. Each row's `retainedBy` contains positive local reference-source counts; Host metadata refreshes cannot overwrite them. Cache membership checks use a per-refresh ID set, so reconciliation grows linearly with the current list and retained cache sizes. Host summary updates replace running and Agent availability; local create/fork responses only fill missing metadata on existing rows. Removed ordinary Sessions retain projection stores only when their catalogs contain children.
 

package/README.zh.md

@@ -33,13 +33,15 @@ Client journal 在发布 follow 快照、live entry 或历史页之前验证当
 
 每个 endpoint 都声明自己的激活策略。列表只读取持久化 header 与 projection cache row，绝不调用逐 Session stat 或打开冷 Session body。当前格式 cache identity 可以提供全部列表 hint；生命周期匹配的 predecessor cache 只能提供版本兼容的 title，作为可能过时的展示事实，绝不能作为权威 fold seed。搜索、附件、历史页、日志跟随、skill 发现和工作区路径打开可以在不激活 Agent 的情况下检查 persistence；`canOpenWorkspacePath()` 无需指定 Session 即可报告原生打开能力。取消要求 live 状态；queue 变更、模型、重命名、prompt 和文件引用操作可以解析或恢复普通 Session。提示词会在解析 Agent 或追加 Session 事件前，拒绝既没有非空白文本也没有附件的 content；queue edit 只接受非空文本 content。prompt 准入从注入的 [`fileUploads`](../../client/file-upload/README.zh.md) Host 服务取得不透明凭证，在把完整有序内容列表交给 `ctx.attachments` 前解析每个属于同一 Agent 的凭证。`requestId` 已进入 queue 或日志时，prompt 重试直接返回原来的接受结果，不会重复插入消息。只有 create 与 fork 会直接创建新 Agent。该服务把同一套感知 preset 的恢复策略和 subagent ownership fence 同时用于自身方法，以及其他 Remote namespace 使用的 Typert Agent 与 Session lookup。Queue 变更只有一个狭窄例外：当前 projection identity 为 continuable 且来自自身非 seed suffix 的在线 child，可以在两个 inbox 目标上使用普通 Edit、Remove 与 QueueDock Steer action。One-shot、缺失、未知、损坏、仅含 seed identity 或冷 child 继续被拒绝，且不会恢复。skill 目录优先使用已有 live Agent 的有效工作目录与限定范围内的注册表。冷态列表使用投影中的当前目录，依次回退到记录的起始目录与配置的默认目录。它保留 preset 常驻 scope，不会激活 Agent。经过鉴权的文件交付路由通过 `workspaceDesktop()` 获取提供服务的 Host 名称和文件管理器行为。`openWorkspacePath({ path, action: "reveal" })` 将文件管理器导航委托给原生适配器；省略 `action` 时按文件类型关联打开，包括 HTML 和 SVG。两种操作都要求当前文件系统将请求的 Host 路径映射到同一个规范进程路径；无法映射的远端路径会在执行原生命令之前被拒绝。 `session.projections` 正常读取准确基线，包括当前格式的冷日志，返回 `kind: sequenced`。只有需要迁移时才返回不带 `asOfSeq` 的 `kind: migration-required` 提示，缺少的键保持缺席。Session 不存在时返回 null。Fork 调用者可设置 `allowMigration: false`，在源历史需要迁移时收到 `session/migration-required`；省略则保持自动迁移。Client 通过 `projectionsBySession` 暴露共享值和显式读取状态，由领域选择自身的 key。Session 列表摘要携带 `agentAvailable`，通过已有摘要与状态事件更新，与持久化 projection 相互独立。有序读取与实时 projection 帧使用相同的序号排序规则；缓存读取只补充提示，不替换有序值。
 
+每个 Remote 端点都受访问控制：principal 不是 owner 的 Peer 只有在本次调用访问的每个资源上，该 principal kind 在 [`dsh-api-remote-access`](../remote-access/README.zh.md) 中的 policy 都有某个 binding 授予列出该 action 的 role 时，才能调用该端点（[Peer 身份属性 Agent Note](../../../.agents/notes/implemented/architecture/2026-10-12-peer-principal-and-remote-access.zh.md)）。控制器注入 `remoteAccess`，并经 `typert.resources` 以默认字段 `sessionId` 登记 `session` 资源种类。`session/page` 与 `session/follow` 在 `@Remote({ resources })` 中声明 `session` 读取函数：对普通 Session 地址读 `request.address.sessionId`，对 subagent 地址读 `request.address.childSessionId`；父会话的访问权是否覆盖其子会话由 policy 决定。`session/projections` 从 `request.sessionId` 读取会话资源，因此重连的读者只会重新读取它可读的会话的 projections。`session/list`、`session/search` 与 `session/control` 不读取资源，其调用访问 `global` 资源，需要 `global` role；对非 owner 调用方，`session/list` 只返回其 Session 被 `ctx.remoteAccess.allows()` 按同一 action 允许的行，`session/search` 只返回这类 Session 的命中，`session/control` 也只返回这类 Session 的 baseline projection 与 projection 帧，因此该 action 也要列在 `session` role 中；owner 的结果不过滤。`session/prompt` 在其 Remote 方法内构造持久的 `user-rpc` 消息 source，且只为非 owner 调用方记录经 `principalOf(this.ctx.invocation)` 读取的 `principal`；不带 `principal` 的 source 属于 owner。
+
 列表行在状态可用时携带 `formatStatus`，Client 无需请求其投影即可识别需要迁移的 Session。
 
 Host 仅在配置的工作时间片耗尽时，于完整条目之间让出事件循环；剩余工作较少时直接返回，不强制让出。每行及每次让出之后检查请求取消，取消时拒绝返回部分结果。每行同步计算；列表不承诺跨 Session 的统一快照。已经进入冷态队列的 Session 若在让出期间接入，仍返回缓存行：Client 对进行中请求的变更重放会纠正其可用性，带序号的投影会覆盖缓存提示。
 
 Client 列表行和驻留 Session 使用当前 `sessionListMetadata` 投影纠正过期的空白会话提示；最近活动时间取摘要时间戳与投影中最后一次用户提示词时间的较晚值。当 SessionManager 在列表行到达前创建实例时，会使用已保留的该 Session 元数据对账空白状态。因此，即使旧列表响应仍将已有对话标为空白，新会话操作也不会复用已经打开过的对话。
 
-显式 ID 的 `session.create` 会收养活动 Session，或恢复持久化 Session 并持续持有其写锁。写锁争用返回 `session/writer-held`；调用方可以尝试其他空白会话，同时保留其他失败。`session.list` 根据缓存元数据列出持久化空白会话，不打开冷日志正文。
+`session.create` 返回一个用于新对话的 Session，响应指明实际使用的 Session。请求指明的 `sessionId` 在满足以下条件时被复用：仍为空白（尚未开始任何轮次）、属于请求的目录、是请求的工作区中未归档的成员，且未被其他写者占用；活动 Session 原地复用，持久化 Session 被恢复并持续持有其写锁。被复用的 Session 运行请求的 `agentPreset`，请求未指明时运行配置的默认 preset：不解析它记录的 preset，变更在 Agent 发布前记录为 `agent-preset/selected`。指明的 Session 若已开始、不满足工作区归属，或被其他写者占用，则保持不变，改为新建 Session。没有对应已存储 Session 的 `sessionId` 成为新 Session 的标识。指明其他目录中的 Session 返回 `session/conflict`，指明由 subagent 路由拥有的 Session 返回 `session/agent-busy`；这两项检查先于 preset 解析。指明同一标识的创建请求按到达顺序执行，preset 解析也包含在内，每个响应报告其自身请求完成时该 Session 运行的 preset。`session.list` 根据缓存元数据列出持久化空白会话，不打开冷日志正文。
 
 Client 列表刷新保留未变化的行对象，并在顺序和值均相同时复用条目数组。每行的 `retainedBy` 包含正数的本地引用来源计数，Host 元数据刷新不能覆盖它们。缓存成员检查使用每次刷新构建的 ID 集合，因此对账成本随当前列表和保留缓存的规模线性增长。 Host 摘要更新会替换运行状态与 Agent 可用性；本地 create/fork 响应只补充已有行缺失的元数据。普通 Session 被移除后，仅在目录仍有子项时保留其投影 store。
 

package/lib/client.js

@@ -157,6 +157,8 @@ window.__ModuleLoader__.load({
 			"hook/invoked",
 			"hook/result",
 			"image/offload",
+			"job/registered",
+			"job/settled",
 			"llm/retry",
 			"llm/retry-started",
 			"model/selection",
@@ -2359,7 +2361,7 @@ window.__ModuleLoader__.load({
 				else {
 					const routedContent = content;
 					const routed = await this.remote.subagents.prompt({
-						requestId: randomUUID(),
+						requestId: requestId ?? randomUUID(),
 						parentSessionId: this.address.parentSessionId,
 						childSessionId: this.address.childSessionId,
 						mode: "continuable",
@@ -3313,11 +3315,14 @@ window.__ModuleLoader__.load({
 			* Contract session.create; on success merge into summaries immediately (no
 			* wait for the next refresh). A created session is blank by definition
 			* (entity birth precedes the first message).
-			* @param opts - target workspace or working directory, plus an optional caller-owned id.
-			* @returns the create result.
+			* @param opts - target workspace or working directory, an optional blank Session to reuse, and an optional Agent preset.
+			* @returns the create result, naming the Session the Host created or reused.
 			*/
 			async create(opts = {}) {
-				const shared = opts.sessionId === void 0 ? {} : { sessionId: opts.sessionId };
+				const shared = {
+					...opts.sessionId === void 0 ? {} : { sessionId: opts.sessionId },
+					...opts.agentPreset === void 0 ? {} : { agentPreset: opts.agentPreset }
+				};
 				const payload = opts.workspaceId !== void 0 ? {
 					workspaceId: opts.workspaceId,
 					...shared
@@ -3960,8 +3965,8 @@ window.__ModuleLoader__.load({
 			/**
 			* Create a Host Session and publish its catalog row before resolving.
 			* Callers retain the returned identity before borrowing its binding.
-			* @param opts - target workspace or directory and an optional preallocated id.
-			* @returns the new session id.
+			* @param opts - target workspace or directory, an optional blank Session to reuse, and an optional Agent preset.
+			* @returns the created or reused session id.
 			* @throws {SessionCreateError} with the requested id.
 			*/
 			async create(opts = {}) {

package/lib/index.js

@@ -4,18 +4,18 @@ import z from "@deepseek-ai/schemastery";
 import { AssistantStreamAccumulator, ReasoningEffortId, assistantStreamChunks, createUserMessage, errorChain, freezeMessage } from "@deepseek-ai/dsh-llm";
 import { canOpenNativePath, nativeFileApplications, nativeFileManager, openNativeAssociatedPath, openNativeFileApplication, revealNativePath } from "@deepseek-ai/dsh-native-command";
 import { SessionQueryError } from "@deepseek-ai/dsh-session-query";
-import { Remote, RemoteError, TypertRemoteService, remoteErrorOf } from "@deepseek-ai/dsh-typert-protocol";
+import { Remote, RemoteError, TypertRemoteService, principalOf, remoteErrorOf } from "@deepseek-ai/dsh-typert-protocol";
+import { canonicalClientTimeZone } from "@deepseek-ai/dsh-util-time";
+import { assertNever } from "@deepseek-ai/dsh-util-values";
+import { randomUUID } from "node:crypto";
 import { mkdir } from "node:fs/promises";
 import { installModelSelection } from "@deepseek-ai/dsh-agent";
-import { credentialRef } from "@deepseek-ai/dsh-credentials";
-import { randomUUID } from "node:crypto";
 import { brandString } from "@deepseek-ai/dsh-brand";
+import { credentialRef } from "@deepseek-ai/dsh-credentials";
 import { AttachmentError } from "@deepseek-ai/dsh-attachment";
 import { buildForkSeed } from "@deepseek-ai/dsh-session/fork";
 import { SessionLogOffset, SessionSeq, isAppendSurfaceEvent } from "@deepseek-ai/dsh-session";
 import { SessionTitleInvalidError } from "@deepseek-ai/dsh-session-title";
-import { canonicalClientTimeZone } from "@deepseek-ai/dsh-util-time";
-import { assertNever } from "@deepseek-ai/dsh-util-values";
 import { Deque } from "@deepseek-ai/dsh-deque";
 import { performance } from "node:perf_hooks";
 import { scheduler } from "node:timers/promises";
@@ -106,18 +106,18 @@ var ApiSessionCwdConflict = class extends Error {
 		this.existingCwd = existingCwd;
 	}
 };
-/** Explicit-id creation attempted to adopt a Session under another preset. */
+/** Reuse of a Session named an Agent preset while the deployment composes no preset roster. */
 var ApiSessionPresetConflict = class extends Error {
 	sessionId;
 	requestedPreset;
-	existingPreset;
-	constructor(sessionId, requestedPreset, existingPreset) {
-		super(existingPreset === void 0 ? `session "${sessionId}" records no agent preset and cannot be adopted under "${requestedPreset}"` : `session "${sessionId}" runs agent preset "${existingPreset}", not "${requestedPreset}"`);
+	constructor(sessionId, requestedPreset) {
+		super(`the deployment composes no agent preset roster, so session "${sessionId}" cannot run preset "${requestedPreset}"`);
 		this.sessionId = sessionId;
 		this.requestedPreset = requestedPreset;
-		this.existingPreset = existingPreset;
 	}
 };
+/** A blank Session chosen for reuse started a turn before this Host acquired its writer. */
+var ApiSessionStartedSinceObserved = class extends Error {};
 /**
 * Test whether generic Session routing must leave an identity to subagent routing.
 * @param ctx - Host context carrying the Agent ownership registry.
@@ -180,7 +180,7 @@ async function inspectApiSession(ctx, sessionId, signal) {
 var ApiSessionAgentController = class {
 	ctx;
 	resumes = /* @__PURE__ */ new Map();
-	creations = /* @__PURE__ */ new Map();
+	claims = /* @__PURE__ */ new Map();
 	selections = /* @__PURE__ */ new WeakMap();
 	imageAdmissionChains = /* @__PURE__ */ new WeakMap();
 	/** @param ctx - Host context carrying Agent, model, persistence, and Typert services. */
@@ -245,35 +245,26 @@ var ApiSessionAgentController = class {
 		}
 	}
 	/**
-	* Resolve one requested identity, creating or resuming it once.
-	* @param sessionId - requested Session identity.
-	* @param cwd - directory the Session must own.
-	* @param checkPersistedIdentity - whether to inspect a cold identity before creation.
-	* @param presetId - optional Agent preset the Session must own.
-	* @returns the matching live ordinary Agent.
+	* Create a Session for a new conversation, reusing the named blank Session
+	* while it is still reusable. A reused Session runs the requested preset, or
+	* the configured default when the request names none; the preset it recorded
+	* is not resolved, and a change is logged as `agent-preset/selected` before
+	* the Agent is published. A named Session that has started a turn, fails the
+	* caller's placement rule, or is written by another owner stays unchanged,
+	* and a new Session is created instead. Requests naming one identity run in
+	* arrival order, including their preset resolution, and check the named
+	* Session's directory and ownership before resolving the preset.
+	* @param request - optional Session to reuse, directory, preset, and placement rule.
+	* @returns the reused or created Session and the preset it ran when this request finished.
+	* @throws ApiSessionCwdConflict when the named Session belongs to another directory.
+	* @throws ApiSessionSubagentOwnership when subagent routing owns the named Session.
+	* @throws RemoteError `agent-preset/not-found` or `agent-preset/invalid` for the requested or default preset.
+	* @throws ApiSessionPresetConflict when no roster is composed and the request names a preset for a reused Session.
 	*/
-	async ensureSession(sessionId, cwd, checkPersistedIdentity, presetId) {
-		let creation = this.creations.get(sessionId);
-		if (creation === void 0) {
-			creation = this.createOrAdopt(sessionId, cwd, checkPersistedIdentity, presetId).catch((error) => {
-				const live = this.ctx.agents.get(sessionId);
-				if (live !== void 0) {
-					if (hasApiSessionSubagentOwner(this.ctx, live.session, live)) throw new ApiSessionSubagentOwnership(sessionId);
-					return live;
-				}
-				const attached = this.ctx.sessions.get(sessionId);
-				if (attached !== void 0 && hasApiSessionSubagentOwner(this.ctx, attached, void 0)) throw new ApiSessionSubagentOwnership(sessionId);
-				throw error;
-			}).finally(() => {
-				this.creations.delete(sessionId);
-			});
-			this.creations.set(sessionId, creation);
-		}
-		const agent = await creation;
-		if (hasApiSessionSubagentOwner(this.ctx, agent.session, agent)) throw new ApiSessionSubagentOwnership(sessionId);
-		if (presetId !== void 0) this.assertPresetUnchanged(sessionId, presetId, this.presetForSession(agent.session));
-		if (agent.session.header.cwd !== cwd) throw new ApiSessionCwdConflict(sessionId, cwd, agent.session.header.cwd);
-		return agent;
+	async createSession(request) {
+		const named = request.sessionId;
+		if (named === void 0) return this.created(await this.createMinted(request.cwd, await this.composeAgent(request.agentPreset)));
+		return this.inOrder(named, async () => this.created(await this.claim(named, request)));
 	}
 	/**
 	* Install or return the Session-local model selection used by prompt assembly.
@@ -411,44 +402,118 @@ var ApiSessionAgentController = class {
 			setup: composition.setup
 		})).agent;
 	}
-	async createOrAdopt(sessionId, cwd, checkPersistedIdentity, presetId) {
+	async inOrder(sessionId, operation) {
+		const result = (this.claims.get(sessionId) ?? Promise.resolve()).then(operation);
+		const settled = result.then(() => void 0, () => void 0);
+		this.claims.set(sessionId, settled);
+		try {
+			return await result;
+		} finally {
+			if (this.claims.get(sessionId) === settled) this.claims.delete(sessionId);
+		}
+	}
+	/** @returns the reused Session, a new Session under `sessionId` when none is stored, or a new Session under a minted identity. */
+	async claim(sessionId, request) {
 		const attached = this.ctx.sessions.get(sessionId);
 		const live = this.ctx.agents.get(sessionId);
 		if (attached !== void 0 && hasApiSessionSubagentOwner(this.ctx, attached, live)) throw new ApiSessionSubagentOwnership(sessionId);
-		if (live !== void 0) return live;
-		if (checkPersistedIdentity) try {
+		if (live !== void 0) {
+			if (live.session.header.cwd !== request.cwd) throw new ApiSessionCwdConflict(live.id, request.cwd, live.session.header.cwd);
+			const composition = await this.composeAgent(request.agentPreset);
+			return await this.reuseLive(live, request, composition) ?? this.createMinted(request.cwd, composition);
+		}
+		let observation;
+		try {
+			observation = await this.ctx.sessionQuery.observeSession(sessionId);
+		} catch (error) {
+			if (!(error instanceof SessionQueryError) || error.code !== "SESSION_QUERY_SESSION_NOT_FOUND") throw error;
+			return this.createAgent(sessionId, request.cwd, await this.composeAgent(request.agentPreset));
+		}
+		let reusable;
+		{
 			const env_3 = {
 				stack: [],
 				error: void 0,
 				hasError: false
 			};
 			try {
-				const observation = __addDisposableResource$4(env_3, await this.ctx.sessionQuery.observeSession(sessionId), false);
-				if (hasApiSessionSubagentOwner(this.ctx, { header: observation.header }, void 0)) throw new ApiSessionSubagentOwnership(sessionId);
-				if (observation.header.cwd !== cwd) throw new ApiSessionCwdConflict(sessionId, cwd, observation.header.cwd);
-				const storedPreset = this.presetForObservation(observation);
-				this.assertPresetUnchanged(sessionId, presetId, storedPreset);
-				const composition = await this.composeAgent(storedPreset);
-				return (await this.ctx.agents.resume({
-					resumeSessionId: sessionId,
-					agentOptions: this.agentOptions(),
-					setup: composition.setup
-				})).agent;
+				const observed = __addDisposableResource$4(env_3, observation, false);
+				if (hasApiSessionSubagentOwner(this.ctx, { header: observed.header }, void 0)) throw new ApiSessionSubagentOwnership(sessionId);
+				if (observed.header.cwd !== request.cwd) throw new ApiSessionCwdConflict(sessionId, request.cwd, observed.header.cwd);
+				reusable = request.reusable(sessionId) && !observed.events.some((event) => event.type === "turn/start");
 			} catch (e_3) {
 				env_3.error = e_3;
 				env_3.hasError = true;
 			} finally {
 				__disposeResources$4(env_3);
 			}
+		}
+		const composition = await this.composeAgent(request.agentPreset);
+		if (!reusable) return this.createMinted(request.cwd, composition);
+		this.assertPresetApplicable(sessionId, request.agentPreset);
+		try {
+			return (await this.ctx.agents.resume({
+				resumeSessionId: sessionId,
+				agentOptions: this.agentOptions(),
+				setup: this.reuseSetup(composition)
+			})).agent;
 		} catch (error) {
-			if (!(error instanceof SessionQueryError) || error.code !== "SESSION_QUERY_SESSION_NOT_FOUND") throw error;
+			if (error instanceof ApiSessionStartedSinceObserved) return this.createMinted(request.cwd, composition);
+			if (!(error instanceof Error) || error.name !== "SessionAlreadyOwnedError") throw error;
+			return this.ctx.agents.get(sessionId) === void 0 ? this.createMinted(request.cwd, composition) : this.claim(sessionId, request);
+		}
+	}
+	/** @returns the live blank Session under the requested preset, or undefined when it cannot be reused. */
+	async reuseLive(live, request, composition) {
+		if (!request.reusable(live.id) || !this.isBlank(live.session)) return void 0;
+		this.assertPresetApplicable(live.id, request.agentPreset);
+		const current = this.presetForSession(live.session);
+		const presets = this.ctx.get("agentPresets");
+		const target = composition.agentPreset;
+		if (presets === void 0 || target === void 0 || target === current) return live;
+		try {
+			await presets.select(live, target);
+		} catch (error) {
+			if (remoteErrorOf(error)?.code !== "agent-preset/locked") throw error;
+			return;
 		}
+		return live;
+	}
+	/** Setup that re-checks blankness under the acquired writer, then records a preset change before publication. */
+	reuseSetup(composition) {
+		return async (agentCtx, agent) => {
+			if (!this.isBlank(agent.session)) throw new ApiSessionStartedSinceObserved();
+			const commit = await composition.setup(agentCtx, agent);
+			const target = composition.agentPreset;
+			if (target !== void 0 && this.presetForSession(agent.session) !== target) agent.session.append("agent-preset/selected", { agentPreset: target });
+			return commit;
+		};
+	}
+	/** Whether no turn has started, by the predicate the preset registry's `select` enforces. */
+	isBlank(session) {
+		const boundary = this.ctx.sessionProjections.stateOf(session, "turnBoundary");
+		return boundary === void 0 || boundary.openTurnStartSeq === null && boundary.lastTurn === 0;
+	}
+	/** Without a roster, reuse cannot apply a named preset. */
+	assertPresetApplicable(sessionId, requested) {
+		if (requested === void 0 || this.ctx.get("agentPresets") !== void 0) return;
+		throw new ApiSessionPresetConflict(sessionId, requested);
+	}
+	created(agent) {
+		return {
+			agent,
+			agentPreset: this.presetForSession(agent.session)
+		};
+	}
+	createMinted(cwd, composition) {
+		return this.createAgent(brandString(`session-${randomUUID()}`), cwd, composition);
+	}
+	async createAgent(sessionId, cwd, composition) {
 		try {
 			await mkdir(cwd, { recursive: true });
 		} catch (error) {
 			throw new Error(`failed to ensure project directory "${cwd}": ${String(error)}`, { cause: error });
 		}
-		const composition = await this.composeAgent(presetId);
 		return (await this.ctx.agents.create({
 			sessionId,
 			agentOptions: this.agentOptions(),
@@ -478,10 +543,6 @@ var ApiSessionAgentController = class {
 		if (observation.projections === void 0) throw new Error("api-session: Agent activation requires a projected Session observation");
 		return observation.projections.values.agentPreset ?? void 0;
 	}
-	assertPresetUnchanged(sessionId, requested, existing) {
-		if (requested === void 0 || requested === existing) return;
-		throw new ApiSessionPresetConflict(sessionId, requested, existing);
-	}
 };
 function agentModelSelection(selection) {
 	return {
@@ -648,6 +709,11 @@ var __disposeResources$3 = (function(SuppressedError) {
 	var e = new Error(message);
 	return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 });
+/**
+* Whether prompt content carries non-whitespace text or an attachment.
+* @param content - submitted or edited prompt parts.
+* @returns false for content the Agent must not receive.
+*/
 function hasPromptContent(content) {
 	return content.some((part) => part.type !== "text" || part.text.trim().length > 0);
 }
@@ -681,25 +747,31 @@ var SessionCommandController = class {
 		this.defaultCwd = defaultCwd;
 	}
 	/**
-	* Create or idempotently adopt one ordinary Session.
-	* @param request - requested identity, location, and Agent preset.
-	* @returns the Session identity and resolved preset when configured.
+	* Create one ordinary Session for a new conversation, reusing the named
+	* blank Session while it is an unarchived member of the requested Workspace.
+	* @param request - optional blank Session to reuse, location, and Agent preset.
+	* @returns the created or reused Session identity and its preset when configured.
 	*/
 	async create(request) {
 		if (request.workspaceId !== void 0 && request.cwd !== void 0) throw new RemoteError("gateway/bad-request", "session.create accepts workspaceId or cwd, not both", {});
-		const sessionId = request.sessionId ?? brandString(`session-${randomUUID()}`);
 		let workspace;
 		if (request.workspaceId !== void 0) {
 			workspace = this.ctx.workspaceRegistry.get(request.workspaceId);
 			if (workspace === void 0) throw new RemoteError("workspace/not-found", `workspace "${request.workspaceId}" not found`, { workspaceId: request.workspaceId });
 		}
 		const cwd = workspace?.path ?? request.cwd ?? this.defaultCwd;
-		let adopted;
+		let created;
 		try {
-			adopted = await this.agents.ensureSession(sessionId, cwd, request.sessionId !== void 0, request.agentPreset);
+			created = await this.agents.createSession({
+				...request.sessionId === void 0 ? {} : { sessionId: request.sessionId },
+				cwd,
+				...request.agentPreset === void 0 ? {} : { agentPreset: request.agentPreset },
+				reusable: (sessionId) => !this.ctx.workspaceRegistry.archivedSessionIds.includes(sessionId) && (workspace === void 0 || workspace.sessionIds.includes(sessionId))
+			});
 		} catch (error) {
-			this.rejectCreation(sessionId, error);
+			this.rejectCreation(error);
 		}
+		const sessionId = created.agent.id;
 		if (workspace !== void 0) try {
 			await workspace.attachSession(sessionId);
 		} catch (error) {
@@ -708,10 +780,9 @@ var SessionCommandController = class {
 				workspaceId: workspace.id
 			});
 		}
-		const agentPreset = this.agents.presetForSession(adopted.session);
 		return {
 			sessionId,
-			...agentPreset === void 0 ? {} : { agentPreset }
+			...created.agentPreset === void 0 ? {} : { agentPreset: created.agentPreset }
 		};
 	}
 	/**
@@ -845,21 +916,15 @@ var SessionCommandController = class {
 		}
 	}
 	/**
-	* Reject empty content, then admit one prompt after Agent and attachment validation.
-	* @param request - Session identity, prompt content, source metadata, and delivery mode.
+	* Admit one prompt after Agent and attachment validation; the Remote method
+	* has already validated the content and built the durable message source.
+	* @param request - Session identity, prompt content, and delivery mode.
+	* @param source - the `user-rpc` source recorded on the accepted message.
 	* @returns acknowledgement that the Agent accepted the prompt.
 	*/
-	async prompt(request) {
-		if (!hasPromptContent(request.content)) throw new RemoteError("gateway/bad-request", "prompt content must include non-whitespace text or an attachment", {});
-		const clientTimeZone = request.clientTimeZone === void 0 ? void 0 : canonicalClientTimeZone(request.clientTimeZone);
-		if (request.clientTimeZone !== void 0 && clientTimeZone === void 0) throw new RemoteError("session/invalid-time-zone", "clientTimeZone must be UTC or a valid IANA Area/Location name", { value: request.clientTimeZone });
+	async prompt(request, source) {
 		const agent = await this.resolveAgent(request.sessionId);
 		if (hasPromptRequest(agent, request.requestId)) return { accepted: true };
-		const source = {
-			kind: "user",
-			rpcId: request.requestId,
-			...clientTimeZone === void 0 ? {} : { clientTimeZone }
-		};
 		const hasImage = request.content.some((part) => part.type === "image");
 		const admit = async () => {
 			try {
@@ -1005,13 +1070,11 @@ var SessionCommandController = class {
 		if ("error" in found) throw found.error;
 		return found.agent;
 	}
-	rejectCreation(sessionId, error) {
+	rejectCreation(error) {
 		if (remoteErrorOf(error) !== void 0) throw error;
-		if (error instanceof Error && error.name === "SessionAlreadyOwnedError") throw new RemoteError("session/writer-held", error.message, { sessionId });
 		if (error instanceof ApiSessionPresetConflict) throw new RemoteError("agent-preset/conflict", error.message, {
 			sessionId: error.sessionId,
-			requestedPreset: error.requestedPreset,
-			...error.existingPreset === void 0 ? {} : { existingPreset: error.existingPreset }
+			requestedPreset: error.requestedPreset
 		});
 		if (error instanceof ApiSessionCwdConflict) throw new RemoteError("session/conflict", error.message, {
 			sessionId: error.sessionId,
@@ -1019,7 +1082,7 @@ var SessionCommandController = class {
 			...error.existingCwd === void 0 ? {} : { existingCwd: error.existingCwd }
 		});
 		if (error instanceof ApiSessionSubagentOwnership) throw apiSessionSubagentOwnershipError(error.sessionId);
-		throw new RemoteError("gateway/internal", `failed to create session "${sessionId}": ${String(error)}`, {});
+		throw new RemoteError("gateway/internal", `failed to create session: ${String(error)}`, {});
 	}
 	async readSessionState(sessionId) {
 		const attached = this.ctx.sessions.get(sessionId);
@@ -2575,6 +2638,15 @@ var __disposeResources = (function(SuppressedError) {
 	var e = new Error(message);
 	return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 });
+/**
+* Read the Session resource a history address names: the Session itself, or
+* the child Session whose transcript a subagent address reads.
+* @param request - history request carrying the durable address.
+* @returns the Session whose access the read requires.
+*/
+function addressedSession(request) {
+	return request.address.kind === "session" ? request.address.sessionId : request.address.childSessionId;
+}
 /** Host service backing the generated `ctx.remote.session` namespace. */
 let SessionController = (() => {
 	let _classSuper = TypertRemoteService;
@@ -2616,8 +2688,14 @@ let SessionController = (() => {
 			_attachment_decorators = [Remote("attachment")];
 			_updateQueue_decorators = [Remote("updateQueue")];
 			_cancel_decorators = [Remote("cancel")];
-			_page_decorators = [Remote("page")];
-			_follow_decorators = [Remote({ mode: "stream" })];
+			_page_decorators = [Remote({
+				name: "page",
+				resources: { session: addressedSession }
+			})];
+			_follow_decorators = [Remote({
+				mode: "stream",
+				resources: { session: addressedSession }
+			})];
 			_projections_decorators = [Remote("projections")];
 			_control_decorators = [Remote({ mode: "stream" })];
 			__esDecorate(this, null, _list_decorators, {
@@ -2843,6 +2921,7 @@ let SessionController = (() => {
 			"fileUploads",
 			"fs",
 			"llm",
+			"remoteAccess",
 			"sessions",
 			"sessionProjections",
 			"sessionQuery",
@@ -2871,6 +2950,7 @@ let SessionController = (() => {
 		*/
 		constructor(ctx, config, internals = {}) {
 			super(ctx, "sessionController", { namespace: "session" });
+			ctx.typert.resources.register("session", { field: "sessionId" });
 			const resolved = SessionController.Config(config);
 			installModelSelectionProjection(ctx);
 			this.agents = new ApiSessionAgentController(ctx);
@@ -2979,21 +3059,33 @@ let SessionController = (() => {
 		* @returns visible Session summaries ordered by activity.
 		*/
 		async list(_request, signal) {
-			return { items: await this.listState.list(signal) };
+			return { items: (await this.listState.list(signal)).filter((item) => this.ctx.remoteAccess.allows({
+				kind: "session",
+				id: item.sessionId
+			})) };
 		}
 		/**
-		* Search visible Session content without resuming an Agent.
+		* Search visible Session content without resuming an Agent. A non-owner
+		* receives only the hits whose Session `allows()` admits; `hasMore`
+		* describes the bounded result before that filtering.
 		* @param request - literal message-content query.
 		* @param signal - cancellation for list and search reads.
 		* @returns authorized bounded Session search results.
 		*/
-		search(request, signal) {
-			return this.listState.search(request.query, signal);
+		async search(request, signal) {
+			const result = await this.listState.search(request.query, signal);
+			return {
+				...result,
+				items: result.items.filter((item) => this.ctx.remoteAccess.allows({
+					kind: "session",
+					id: item.sessionId
+				}))
+			};
 		}
 		/**
-		* Create or idempotently adopt one ordinary Session.
-		* @param request - requested identity, location, and Agent preset.
-		* @returns the Session identity and resolved preset when configured.
+		* Create one ordinary Session for a new conversation, reusing the named blank Session while it is reusable.
+		* @param request - optional blank Session to reuse, location, and Agent preset.
+		* @returns the created or reused Session identity and its preset when configured.
 		*/
 		create(request) {
 			return this.commands.create(request);
@@ -3123,9 +3215,19 @@ let SessionController = (() => {
 		* @param signal - caller cancellation before prompt admission begins.
 		* @returns acknowledgement that the Agent accepted the prompt.
 		*/
-		prompt(request, signal) {
+		async prompt(request, signal) {
 			signal.throwIfAborted();
-			return this.commands.prompt(request);
+			if (!hasPromptContent(request.content)) throw new RemoteError("gateway/bad-request", "prompt content must include non-whitespace text or an attachment", {});
+			const clientTimeZone = request.clientTimeZone === void 0 ? void 0 : canonicalClientTimeZone(request.clientTimeZone);
+			if (request.clientTimeZone !== void 0 && clientTimeZone === void 0) throw new RemoteError("session/invalid-time-zone", "clientTimeZone must be UTC or a valid IANA Area/Location name", { value: request.clientTimeZone });
+			const principal = principalOf(this.ctx.invocation);
+			const source = {
+				kind: "user",
+				rpcId: request.requestId,
+				...clientTimeZone === void 0 ? {} : { clientTimeZone },
+				...principal === void 0 ? {} : { principal }
+			};
+			return this.commands.prompt(request, source);
 		}
 		/**
 		* Read one image proven reachable from the addressed Session log.
@@ -3233,8 +3335,31 @@ let SessionController = (() => {
 		* @param signal - cancellation owned by the Remote stream carrier.
 		* @returns one complete baseline followed by live replacement frames.
 		*/
-		control(signal) {
-			return this.controlState.control(signal);
+		async *control(signal) {
+			for await (const frame of this.controlState.control(signal)) switch (frame.type) {
+				case "baseline": {
+					const projections = Object.fromEntries(Object.entries(frame.value.projections).filter(([sessionId]) => this.ctx.remoteAccess.allows({
+						kind: "session",
+						id: sessionId
+					})));
+					yield {
+						type: "baseline",
+						value: {
+							...frame.value,
+							projections
+						}
+					};
+					break;
+				}
+				case "projection":
+					if (this.ctx.remoteAccess.allows({
+						kind: "session",
+						id: frame.sessionId
+					})) yield frame;
+					break;
+				/* v8 ignore next -- closed control-frame union. */
+				default: assertNever(frame);
+			}
 		}
 	};
 })();