@deepseek-ai/dsh-api-session-controller 0.1.3-alpha.2 → 0.1.5-alpha.2

package/lib/index.js

@@ -1,6 +1,7 @@
+import { hostname } from "node:os";
 import z from "@deepseek-ai/schemastery";
 import { AssistantStreamAccumulator, ReasoningEffortId, assistantStreamChunks, createUserMessage, errorChain, freezeMessage } from "@deepseek-ai/dsh-llm";
-import { canOpenNativePath, openNativePath } from "@deepseek-ai/dsh-native-command";
+import { canOpenNativePath, nativeFileManager, openNativePath, revealNativePath } from "@deepseek-ai/dsh-native-command";
 import { Remote, RemoteError, TypertRemoteService, remoteErrorOf } from "@deepseek-ai/dsh-typert-protocol";
 import { mkdir } from "node:fs/promises";
 import { installModelSelection } from "@deepseek-ai/dsh-agent";
@@ -15,6 +16,9 @@ import { assertNever } from "@deepseek-ai/dsh-util-values";
 import { Deque } from "@deepseek-ai/dsh-deque";
 import { z as z$1 } from "zod";
 import { isUserInvocable } from "@deepseek-ai/dsh-skill";
+import { isAbsolute } from "node:path";
+import { FsError } from "@deepseek-ai/dsh-fs";
+import mime from "mime-types";
 //#region lib/types/agent.js
 /** Agent activation, composition, and model-selection policy owned by API Session. */
 var __addDisposableResource$4 = function(env, value, async) {
@@ -349,14 +353,14 @@ var ApiSessionAgentController = class {
 	*/
 	async composeAgent(presetId) {
 		const presets = this.ctx.get("agentPresets");
-		if (presets === void 0) return { setup: (agentCtx) => {
-			this.installSelection(agentCtx);
+		if (presets === void 0) return { setup: (_agentCtx, agent) => {
+			this.installSelection(agent);
 		} };
 		const resolvedId = (await presets.resolve(presetId)).id;
 		return {
 			agentPreset: resolvedId,
-			setup: async (agentCtx) => {
-				this.installSelection(agentCtx);
+			setup: async (agentCtx, agent) => {
+				this.installSelection(agent);
 				await presets.mount(agentCtx, resolvedId);
 			}
 		};
@@ -456,9 +460,7 @@ var ApiSessionAgentController = class {
 			model
 		};
 	}
-	installSelection(agentCtx) {
-		const agent = agentCtx.agent;
-		if (agent === void 0) throw new Error("api-session: Agent setup has no scoped Agent");
+	installSelection(agent) {
 		this.selectionFor(agent);
 	}
 	/**
@@ -543,6 +545,9 @@ var __disposeResources$3 = (function(SuppressedError) {
 	var e = new Error(message);
 	return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 });
+function hasPromptContent(content) {
+	return content.some((part) => part.type !== "text" || part.text.trim().length > 0);
+}
 /** Implements Session business commands delegated by the Session Controller Remote service. */
 var SessionCommandController = class {
 	ctx;
@@ -724,11 +729,12 @@ var SessionCommandController = class {
 		}
 	}
 	/**
-	* Admit one browser prompt after explicit Agent resume and image validation.
+	* Reject empty content, then admit one prompt after Agent and attachment validation.
 	* @param request - Session identity, prompt content, source metadata, and delivery mode.
 	* @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 });
 		const agent = await this.resolveAgent(request.sessionId);
@@ -814,7 +820,10 @@ var SessionCommandController = class {
 	* @returns acknowledgement that the queue mutation was applied.
 	*/
 	updateQueue(request) {
-		if (request.action.kind === "edit" && request.action.content.some((block) => block.type !== "text")) throw new RemoteError("session/attachment-invalid", "queue edits accept text content only", { reason: "QUEUE_EDIT_NON_TEXT" });
+		if (request.action.kind === "edit") {
+			if (request.action.content.some((block) => block.type !== "text")) throw new RemoteError("session/attachment-invalid", "queue edits accept text content only", { reason: "QUEUE_EDIT_NON_TEXT" });
+			if (!hasPromptContent(request.action.content)) throw new RemoteError("gateway/bad-request", "queue edit content must include non-whitespace text", {});
+		}
 		const agent = this.ctx.agents.get(request.sessionId);
 		if (agent === void 0) throw new RemoteError("session/queue-item-not-found", "queued item is no longer pending", { itemId: request.itemId });
 		if (hasApiSessionSubagentOwner(this.ctx, agent.session, agent)) {
@@ -989,9 +998,6 @@ var SessionControlController = class {
 	/** @param ctx - Host context carrying live Agent, projection, and jobs services. */
 	constructor(ctx) {
 		this.ctx = ctx;
-		ctx.on("session/event", (session, event) => {
-			this.onSessionEvent(session, event);
-		});
 		ctx.sessionProjections.onChanged((session, key, value, seq) => {
 			this.broadcast({
 				type: "projection",
@@ -1000,6 +1006,13 @@ var SessionControlController = class {
 				value,
 				seq
 			});
+			if (key !== "inbox") return;
+			if (this.ctx.agents.get(session.id)?.session !== session) return;
+			this.broadcast({
+				type: "queue",
+				sessionId: session.id,
+				items: queueItemsFromInbox(value)
+			});
 		});
 		ctx.inject(["jobs"], (jobsCtx) => {
 			jobsCtx.jobs.onJobsChanged((owner) => {
@@ -1065,16 +1078,6 @@ var SessionControlController = class {
 		}
 		return blocks;
 	}
-	onSessionEvent(session, event) {
-		if (event.type !== "agent/inbox/spliced") return;
-		const agent = this.ctx.agents.get(session.id);
-		if (agent?.session !== session) return;
-		this.broadcast({
-			type: "queue",
-			sessionId: session.id,
-			items: queueItems(agent, event.data)
-		});
-	}
 	onJobsChanged(owner) {
 		if (owner !== void 0) {
 			this.broadcast({
@@ -1139,12 +1142,14 @@ var ControlQueue = class {
 		}
 	}
 };
-function queueItems(agent, splice) {
-	const project = (target) => {
-		const messages = target === "next-turn" ? agent.inbox.nextTurn : agent.inbox.nextStep;
-		return splice?.target === target ? messages.toSpliced(splice.start, splice.removedCount ?? 0, ...splice.inserted) : messages;
-	};
-	return [...project("next-turn").map((message) => ({
+function queueItems(agent) {
+	return queueItemsFromInbox({
+		"next-turn": agent.inbox.nextTurn,
+		"next-step": agent.inbox.nextStep
+	});
+}
+function queueItemsFromInbox(inbox) {
+	return [...inbox["next-turn"].map((message) => ({
 		id: message.id,
 		placement: "queued",
 		...promptRpcId(message),
@@ -1152,7 +1157,7 @@ function queueItems(agent, splice) {
 			id: message.id,
 			content: message.content
 		}
-	})), ...project("next-step").map((message) => ({
+	})), ...inbox["next-step"].map((message) => ({
 		id: message.id,
 		placement: message.source.kind === "user" ? "steering" : "context",
 		...promptRpcId(message),
@@ -2297,6 +2302,79 @@ let SessionSkillCatalog = (() => {
 	};
 })();
 //#endregion
+//#region lib/types/media-references.js
+/**
+* Authenticated GET/HEAD /api/file reads bounded file responses through
+* the composed filesystem provider. Paths and MIME types do not restrict access;
+* the connection service authenticates requests before this handler.
+* @module @deepseek-ai/dsh-api-session-controller/media-references
+*/
+const BASE_HEADERS = {
+	"Cache-Control": "private, no-store",
+	"X-Content-Type-Options": "nosniff",
+	"Content-Security-Policy": "sandbox; default-src 'none'"
+};
+async function serveFile(request, fs, maxBytes) {
+	const fail = (status, text) => new Response(request.method === "HEAD" ? null : text, {
+		status,
+		headers: BASE_HEADERS
+	});
+	const path = new URL(request.url).searchParams.get("path");
+	if (path === null || path.length === 0) return fail(400, "missing path");
+	if (path.includes("\0") || !isAbsolute(path)) return fail(400, "absolute path required");
+	try {
+		const target = await fs.resolve(path, { signal: request.signal });
+		const mediaType = mime.lookup(target.displayPath) || "application/octet-stream";
+		const headers = {
+			...BASE_HEADERS,
+			"Content-Type": mediaType
+		};
+		if (request.method === "HEAD") {
+			const info = await fs.stat(target, request.signal);
+			if (info === void 0) return fail(404, "not found");
+			if (info.type !== "file") return fail(403, "not a regular file");
+			if (info.size !== void 0) {
+				if (info.size > maxBytes) return fail(413, "file exceeds byte limit");
+				headers["Content-Length"] = String(info.size);
+			}
+			return new Response(null, { headers });
+		}
+		const bytes = await fs.readBytes(target, request.signal, maxBytes);
+		headers["Content-Length"] = String(bytes.byteLength);
+		return new Response(bytes.slice(), { headers });
+	} catch (error) {
+		if (!(error instanceof FsError)) throw error;
+		return fail({
+			FS_NOT_FOUND: 404,
+			FS_NOT_REGULAR_FILE: 403,
+			FS_PERMISSION_DENIED: 403,
+			FS_SANDBOX_DENIED: 403,
+			FS_TOO_LARGE: 413,
+			FS_ABORTED: 499
+		}[error.code] ?? 500, error.code);
+	}
+}
+/**
+* File-display contribution. The connection service supplies authentication;
+* `ctx.fs` supplies the execution world's paths, reads, and access policy.
+*/
+const SessionMediaReferences = {
+	inject: [
+		"connection",
+		"fs",
+		"attachments"
+	],
+	apply(ctx) {
+		const maxBytes = ctx.attachments.imageLimits.maxImageBytes;
+		ctx.effect(() => ctx.connection.fetch.register({
+			path: "/api/file",
+			methods: ["GET", "HEAD"],
+			requestBody: "buffered",
+			fetch: (request) => serveFile(request, ctx.fs, maxBytes)
+		}), "session-controller: /api/file");
+	}
+};
+//#endregion
 //#region lib/types/index.js
 /** Session Remote owner: cold reads, explicit Agent commands, and live control state. */
 var __runInitializers = function(thisArg, initializers, value) {
@@ -2636,6 +2714,7 @@ let SessionController = (() => {
 		history;
 		listState;
 		openPath;
+		revealPath;
 		canOpenPath;
 		promotions = /* @__PURE__ */ new Set();
 		/**
@@ -2662,8 +2741,10 @@ let SessionController = (() => {
 			});
 			this.listState = new ApiSessionList(ctx);
 			this.openPath = internals.openPath ?? openNativePath;
+			this.revealPath = internals.revealPath ?? revealNativePath;
 			this.canOpenPath = internals.canOpenPath ?? (() => config.nativeOpen ?? (internals.openPath !== void 0 || canOpenNativePath()));
 			ctx.plugin(SessionFileReferences);
+			ctx.plugin(SessionMediaReferences);
 			ctx.plugin(SessionSkillCatalog);
 			ctx.on("session/created", (session) => {
 				ctx.emit("api-session/added", this.listState.summaryFor(session));
@@ -2784,6 +2865,18 @@ let SessionController = (() => {
 			return this.canOpenPath();
 		}
 		/**
+		* Describe the serving desktop for authenticated file-action routes.
+		* @returns Host name, configured availability, and platform-specific file-manager behavior.
+		*/
+		workspaceDesktop() {
+			const fileManager = nativeFileManager();
+			return {
+				name: hostname(),
+				available: fileManager !== null && this.canOpenPath(),
+				fileManager
+			};
+		}
+		/**
 		* Open one path prepared by a Session-aware caller on the Host desktop.
 		* @param request - path after best-effort Session workspace resolution.
 		* @param signal - caller lifetime; abort terminates the native command.
@@ -2794,7 +2887,8 @@ let SessionController = (() => {
 			if (request.path.length === 0) throw new RemoteError("gateway/bad-request", "session.openWorkspacePath requires a non-empty path", {});
 			signal.throwIfAborted();
 			try {
-				await this.openPath(request.path, signal);
+				if (request.action === "reveal") await this.revealPath(request.path, signal);
+				else await this.openPath(request.path, signal);
 				return { opened: true };
 			} catch (error) {
 				if (signal.aborted) throw new RemoteError("gateway/cancelled", "path open was aborted", {});