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

package/lib/index.js

@@ -227,7 +227,8 @@ var ApiSessionAgentController = class {
 			this.resumes.set(sessionId, resume);
 		}
 		try {
-			return { agent: await resume };
+			const agent = await resume;
+			return this.liveAgent(sessionId) ?? { agent };
 		} catch (error) {
 			if (error instanceof ApiSessionNotFound) return { error: new RemoteError("session/not-found", error.message, { sessionId }) };
 			if (error instanceof ApiSessionSubagentOwnership) return { error: apiSessionSubagentOwnershipError(error.sessionId) };
@@ -235,6 +236,7 @@ var ApiSessionAgentController = class {
 			if (raced !== void 0) return raced;
 			const racedSession = this.ctx.sessions.get(sessionId);
 			if (racedSession !== void 0 && hasApiSessionSubagentOwner(this.ctx, racedSession, void 0)) return { error: apiSessionSubagentOwnershipError(sessionId) };
+			if (error instanceof Error && error.name === "SessionAlreadyOwnedError") return { error: new RemoteError("session/writer-held", error.message, { sessionId }) };
 			return { error: new RemoteError("gateway/internal", `resume failed for session "${sessionId}": ${String(error)}`, {}) };
 		}
 	}
@@ -681,8 +683,7 @@ var SessionCommandController = class {
 			const lastSeq = source.events.at(-1)?.seq ?? -1;
 			const boundary = (atSeq === void 0 ? void 0 : source.events.find((event) => event.type === "turn/end" && event.seq >= atSeq)) ?? (atSeq === void 0 || atSeq > lastSeq ? source.events.findLast((event) => event.type === "turn/end") : void 0);
 			if (boundary === void 0) throw new RemoteError("session/fork-unavailable", atSeq !== void 0 && atSeq <= lastSeq ? `session "${request.sessionId}" has not completed the turn containing event ${String(atSeq)}` : `session "${request.sessionId}" has no completed turn to fork from`, { sessionId: request.sessionId });
-			let cut = SessionLogOffset(boundary.seq + 1);
-			while (cut < source.events.length && source.events[cut]?.type !== "turn/start") cut = SessionLogOffset(cut + 1);
+			const cut = SessionLogOffset(boundary.seq + 1);
 			let workspace;
 			try {
 				workspace = await this.forkWorkspace(source.header);
@@ -815,17 +816,24 @@ var SessionCommandController = class {
 		}
 	}
 	/**
-	* Mutate one still-pending queue occurrence without resuming a cold Agent.
+	* Mutate one pending Inbox occurrence, restoring an ordinary cold Agent when needed.
 	* @param request - Session, queue item, and requested mutation.
 	* @returns acknowledgement that the queue mutation was applied.
 	*/
-	updateQueue(request) {
+	async updateQueue(request) {
 		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 });
+		let agent = this.ctx.agents.get(request.sessionId);
+		if (agent === void 0) {
+			const found = await this.agents.resolveAgent(request.sessionId);
+			if ("error" in found) {
+				if (found.error.code !== "session/not-found") throw found.error;
+				throw new RemoteError("session/queue-item-not-found", "queued item is no longer pending", { itemId: request.itemId });
+			}
+			agent = found.agent;
+		}
 		if (hasApiSessionSubagentOwner(this.ctx, agent.session, agent)) {
 			const identity = this.ctx.sessionProjections.snapshot(agent.session, ["subagent"]).values.subagent;
 			if (identity?.mode !== "continuable" || !agent.session.isOwnSeq(identity.seq)) throw apiSessionSubagentOwnershipError(request.sessionId);
@@ -990,7 +998,7 @@ function routeServed(ctx, provider) {
 }
 //#endregion
 //#region lib/types/control.js
-/** Live Session queue, jobs, and projection state with reconnect baselines. */
+/** Live Session jobs and projection state with reconnect baselines. */
 /** Owns the Host-wide Session control stream. */
 var SessionControlController = class {
 	ctx;
@@ -1006,13 +1014,6 @@ 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) => {
@@ -1054,15 +1055,12 @@ var SessionControlController = class {
 	}
 	baseline() {
 		const sessions = this.ctx.sessions.list();
-		const queues = Object.create(null);
 		const jobs = Object.create(null);
 		for (const session of sessions) {
 			const agent = this.ctx.agents.get(session.id);
-			queues[session.id] = agent?.session === session ? queueItems(agent) : [];
 			jobs[session.id] = this.jobsFor(agent);
 		}
 		return {
-			queues,
 			jobs,
 			projections: this.projectionBaseline(sessions)
 		};
@@ -1142,36 +1140,6 @@ var ControlQueue = class {
 		}
 	}
 };
-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),
-		message: {
-			id: message.id,
-			content: message.content
-		}
-	})), ...inbox["next-step"].map((message) => ({
-		id: message.id,
-		placement: message.source.kind === "user" ? "steering" : "context",
-		...promptRpcId(message),
-		message: {
-			id: message.id,
-			content: message.content
-		}
-	}))];
-}
-/** Prompt-RPC identity carried by a browser-submitted message's user source. */
-function promptRpcId(message) {
-	const source = message.source;
-	return source.kind === "user" && "rpcId" in source ? { rpcId: source.rpcId } : {};
-}
 function jobView(job) {
 	return {
 		id: job.id,
@@ -2279,6 +2247,7 @@ let SessionSkillCatalog = (() => {
 					scope
 				})).filter(isUserInvocable).map((skill) => ({
 					name: skill.name,
+					...skill.path === void 0 ? {} : { path: skill.path },
 					description: skill.description,
 					...skill.whenToUse === void 0 ? {} : { whenToUse: skill.whenToUse },
 					modelInvocable: skill.invocation.modelInvocable
@@ -2930,7 +2899,7 @@ let SessionController = (() => {
 			return this.commands.attachment(request);
 		}
 		/**
-		* Mutate one still-pending queue occurrence on a live Agent.
+		* Mutate one still-pending queue occurrence, resuming a cold Agent first.
 		* @param request - Session, queue item, and requested mutation.
 		* @returns acknowledgement that the queue mutation was applied.
 		*/