dsh-deeppilot 0.6.0-alpha.2 → 0.6.0-alpha.3

package/lib/index.d.ts

@@ -1,5 +1,5 @@
-import z from "@deepseek-ai/schemastery";
 import { Context } from "@deepseek-ai/cordis";
+import z from "@deepseek-ai/schemastery";
 //#region src/protocol.d.ts
 type SessionStatus = "running" | "idle" | "error" | "unknown";
 type SessionTodoStatus = "pending" | "in_progress" | "completed";
@@ -40,12 +40,13 @@ interface MessageContextInfo {
 /** One image carried by a user message. `attachmentId` keys the read-back RPC
  * (c2s.session.attachment); width/height let clients reserve layout space. */
 interface MessageAttachment {
-  kind: 'image';
+  kind: 'image' | 'document';
   name?: string;
   mediaType?: string;
   attachmentId?: string;
   width?: number;
   height?: number;
+  truncated?: boolean;
 }
 interface MessageProjection {
   /** Durable row identity; unique within one session/page. */
@@ -402,6 +403,14 @@ interface PushOutlet {
   isAvailable(): boolean;
 }
 //#endregion
+//#region src/document-payload.d.ts
+interface PromptDocument {
+  name: string;
+  mediaType: string;
+  text: string;
+  truncated?: boolean;
+}
+//#endregion
 //#region src/host-bridge.d.ts
 declare class HostBridge {
   private readonly apiProxy;
@@ -537,7 +546,7 @@ declare class HostBridge {
     mediaType: 'image/png' | 'image/jpeg' | 'image/webp' | 'image/gif';
     data: string;
     name?: string;
-  }>): Promise<SessionManagementResult<number>>;
+  }>, documents?: PromptDocument[]): Promise<SessionManagementResult<number>>;
   respondApproval(requestId: string, decision: 'allow' | 'deny', reason?: string): Promise<PendingResponseOutcome>;
   respondQuestion(requestId: string, answers: unknown): Promise<PendingResponseOutcome>;
 }

package/lib/index.js

@@ -5,6 +5,8 @@ import { access, chmod, mkdir, readFile, rename, unlink, writeFile } from "node:
 import { dirname, join, resolve } from "node:path";
 import { WebSocketServer } from "ws";
 import { homedir, networkInterfaces } from "node:os";
+import * as Cordis from "@deepseek-ai/cordis";
+import { Context } from "@deepseek-ai/cordis";
 import { TypertRemoteService } from "@deepseek-ai/dsh-typert-protocol";
 import { connect } from "node:http2";
 import { spawn } from "node:child_process";
@@ -339,6 +341,9 @@ function requiredScope(type) {
 function sanitizeImageName(value) {
 	return value.replace(/[\u0000-\u001F\u007F]/g, "").trim().slice(0, 120);
 }
+function sanitizeDocumentField(value, maxChars) {
+	return value.replace(/[\u0000-\u001F\u007F]/g, " ").trim().slice(0, maxChars);
+}
 /** Error code for a failed approval/question response outcome. */
 function pendingResponseErrorCode(reason) {
 	switch (reason) {
@@ -724,9 +729,11 @@ var BridgeConnection = class {
 				const p = env.payload;
 				const text = typeof p?.text === "string" ? p.text : "";
 				const rawImages = Array.isArray(p?.images) ? p.images : [];
-				if (!p?.sessionId || text.trim().length === 0 && rawImages.length === 0) return this.fail(env.id, "E_PROTOCOL", "sessionId and text or images required");
+				const rawDocuments = Array.isArray(p?.documents) ? p.documents : [];
+				if (!p?.sessionId || text.trim().length === 0 && rawImages.length === 0 && rawDocuments.length === 0) return this.fail(env.id, "E_PROTOCOL", "sessionId and prompt content required");
 				if (text.length > 262144) return this.fail(env.id, "E_PROTOCOL", "prompt text too long");
 				if (rawImages.length > 4) return this.fail(env.id, "E_PROTOCOL", "too many images");
+				if (rawDocuments.length > 4 || rawImages.length + rawDocuments.length > 4) return this.fail(env.id, "E_PROTOCOL", "too many prompt attachments");
 				const images = [];
 				for (const image of rawImages) {
 					if (!IMAGE_MEDIA_TYPES.has(String(image?.mediaType)) || typeof image?.data !== "string" || image.data.length === 0 || image.data.length > 8388608) return this.fail(env.id, "E_PROTOCOL", "invalid image attachment");
@@ -736,7 +743,20 @@ var BridgeConnection = class {
 						...typeof image.name === "string" && sanitizeImageName(image.name).length > 0 ? { name: sanitizeImageName(image.name) } : {}
 					});
 				}
-				const userSeq = await this.deps.bridge.sendPrompt(p.sessionId, text, images);
+				const documents = [];
+				for (const document of rawDocuments) {
+					if (typeof document?.name !== "string" || typeof document?.mediaType !== "string" || typeof document?.text !== "string" || document.text.length === 0 || document.text.length > 262144) return this.fail(env.id, "E_PROTOCOL", "invalid document attachment");
+					const name = sanitizeDocumentField(document.name, 180);
+					const mediaType = sanitizeDocumentField(document.mediaType, 120).toLowerCase();
+					if (!name || !mediaType || mediaType.startsWith("image/")) return this.fail(env.id, "E_PROTOCOL", "invalid document attachment");
+					documents.push({
+						name,
+						mediaType,
+						text: document.text,
+						...document.truncated === true ? { truncated: true } : {}
+					});
+				}
+				const userSeq = await this.deps.bridge.sendPrompt(p.sessionId, text, images, documents);
 				if (!userSeq.ok) return this.fail(env.id, managementErrorCode(userSeq.kind), userSeq.message);
 				this.send("s2c.ack", { userSeq: userSeq.value }, env.id);
 				return;
@@ -855,6 +875,44 @@ function unwrapStreamItem(item) {
 	return item;
 }
 //#endregion
+//#region src/document-payload.ts
+const PREFIX = "[DeepPilot document:";
+const SUFFIX = "]";
+/**
+* DSH 0.1.2 has durable image attachments but no generic file content block.
+* Documents therefore travel as a bounded, explicitly-labelled text block.
+* The marker lets the canonical phone row recover an attachment chip without
+* exposing the complete document body as ordinary user-authored bubble text.
+*/
+function documentPromptBlock(document) {
+	const marker = {
+		v: 1,
+		name: document.name,
+		mediaType: document.mediaType,
+		...document.truncated ? { truncated: true } : {}
+	};
+	const encoded = Buffer.from(JSON.stringify(marker), "utf8").toString("base64url");
+	return `${PREFIX}${encoded}${SUFFIX}\nAttached document: ${document.name}\n\n${document.text}`;
+}
+function projectedDocument(text) {
+	if (!text.startsWith(PREFIX)) return void 0;
+	const end = text.indexOf(SUFFIX, 20);
+	if (end < 0) return void 0;
+	try {
+		const decoded = JSON.parse(Buffer.from(text.slice(20, end), "base64url").toString("utf8"));
+		if (decoded.v !== 1 || typeof decoded.name !== "string" || typeof decoded.mediaType !== "string") return void 0;
+		if (!decoded.name.trim() || !decoded.mediaType.trim()) return void 0;
+		return {
+			name: decoded.name,
+			mediaType: decoded.mediaType,
+			text: text.slice(end + 1).replace(/^\nAttached document:[^\n]*\n\n/, ""),
+			...decoded.truncated === true ? { truncated: true } : {}
+		};
+	} catch {
+		return;
+	}
+}
+//#endregion
 //#region src/host-event-projection.ts
 const MAX_MESSAGE_PROJECTION_BYTES = 262144;
 /** One durable host event sequence becomes exactly one phone message row.
@@ -1049,7 +1107,7 @@ function contentText(content) {
 		if (typeof part === "string") return part;
 		if (part && typeof part === "object") {
 			const piece = part;
-			if (piece.type === "text" && typeof piece.text === "string") return piece.text;
+			if (piece.type === "text" && typeof piece.text === "string") return projectedDocument(piece.text) ? "" : piece.text;
 		}
 		return "";
 	}).join("");
@@ -1060,22 +1118,34 @@ function messageAttachments(data) {
 	const obj = data;
 	if (obj.message && typeof obj.message === "object") return messageAttachments(obj.message);
 	if (!Array.isArray(obj.content)) return [];
-	return obj.content.flatMap((part) => {
-		if (!part || typeof part !== "object") return [];
+	const attachments = [];
+	for (const part of obj.content) {
+		if (!part || typeof part !== "object") continue;
 		const block = part;
-		if (block.type !== "image" || !block.attachment) return [];
+		if (block.type === "text" && typeof block.text === "string") {
+			const document = projectedDocument(block.text);
+			if (document) attachments.push({
+				kind: "document",
+				name: document.name,
+				mediaType: document.mediaType,
+				...document.truncated ? { truncated: true } : {}
+			});
+			continue;
+		}
+		if (block.type !== "image" || !block.attachment) continue;
 		const attachmentId = typeof block.attachment.attachmentId === "string" && block.attachment.attachmentId.length > 0 ? block.attachment.attachmentId : void 0;
 		const width = typeof block.attachment.width === "number" && Number.isFinite(block.attachment.width) ? block.attachment.width : void 0;
 		const height = typeof block.attachment.height === "number" && Number.isFinite(block.attachment.height) ? block.attachment.height : void 0;
-		return [{
+		attachments.push({
 			kind: "image",
 			...typeof block.attachment.name === "string" ? { name: block.attachment.name } : {},
 			...typeof block.attachment.mediaType === "string" ? { mediaType: block.attachment.mediaType } : {},
 			...attachmentId ? { attachmentId } : {},
 			...width !== void 0 ? { width } : {},
 			...height !== void 0 ? { height } : {}
-		}];
-	});
+		});
+	}
+	return attachments;
 }
 function attachmentProjection(data) {
 	const attachments = messageAttachments(data);
@@ -2139,7 +2209,7 @@ var HostBridge = class {
 			return null;
 		}
 	}
-	async sendPrompt(sessionId, text, images = []) {
+	async sendPrompt(sessionId, text, images = [], documents = []) {
 		try {
 			const content = [];
 			if (text.trim().length > 0) content.push({
@@ -2150,6 +2220,10 @@ var HostBridge = class {
 				type: "image",
 				...image
 			});
+			for (const document of documents) content.push({
+				type: "text",
+				text: documentPromptBlock(document)
+			});
 			const response = await this.apiProxy.sessions.prompt({
 				rpcId: randomUUID(),
 				payload: {
@@ -2476,16 +2550,150 @@ function projectSessionModels(value) {
 }
 /** Project a history page (raw events) into MessageProjection rows. */
 //#endregion
+//#region src/dsh012-remote-interactions.ts
+/**
+* Resident DSH 0.1.2-alpha.3 Remote Events client for phone interactions.
+*
+* The Host-side `approval/request` and `user-questions/request` events are
+* owned once by DSH API Remotes. API Gateway then fans each pending waterfall
+* out to every connected Client and settles the first result. DeepPilot joins
+* that official Client plane in-process instead of registering a competing
+* Host waterfall listener or replacing the official Web composer.
+*/
+let clientFaces;
+/**
+* Load DSH's browser-distributed Client faces into a tiny Host-side module
+* table. Published `lib/client.js` files register with `window.__ModuleLoader__`
+* rather than exporting ESM values, so a normal Node import cannot consume
+* them. The shim runs only while the three official bundles register; their
+* apply functions then operate against a non-browser Cordis Context.
+*/
+function pluginModule(value, specifier) {
+	if (typeof value !== "object" || value === null) throw new Error(`${specifier} Client bundle returned no exports`);
+	if (typeof value.apply !== "function") throw new Error(`${specifier} has no Client apply() export`);
+	return value;
+}
+async function loadClientFaces() {
+	clientFaces ??= (async () => {
+		const modules = /* @__PURE__ */ new Map([["@deepseek-ai/cordis", Cordis]]);
+		const loaderGlobal = globalThis;
+		const previousWindow = loaderGlobal.window;
+		loaderGlobal.window = { __ModuleLoader__: { load: (definition) => {
+			const exports = definition.factory((id) => {
+				if (!modules.has(id)) throw new Error(`resident DSH Client cannot resolve ${JSON.stringify(id)}`);
+				return modules.get(id);
+			});
+			modules.set(definition.id, exports);
+		} } };
+		try {
+			for (const specifier of [
+				"@deepseek-ai/dsh-typert-registry/client",
+				"@deepseek-ai/dsh-client-connection/client",
+				"@deepseek-ai/dsh-api-gateway/client"
+			]) await import(specifier);
+		} finally {
+			if (previousWindow === void 0) delete loaderGlobal.window;
+			else loaderGlobal.window = previousWindow;
+		}
+		return {
+			typert: pluginModule(modules.get("@deepseek-ai/dsh-typert-registry"), "@deepseek-ai/dsh-typert-registry/client"),
+			connection: pluginModule(modules.get("@deepseek-ai/dsh-client-connection"), "@deepseek-ai/dsh-client-connection/client"),
+			gateway: pluginModule(modules.get("@deepseek-ai/dsh-api-gateway"), "@deepseek-ai/dsh-api-gateway/client")
+		};
+	})();
+	return clientFaces;
+}
+const agentScopeKey = Symbol("deeppilot.dsh-client.agent-scope");
+function scopeOf(ctx) {
+	return ctx[agentScopeKey];
+}
+function createAgentScope(ctx, identity) {
+	return ctx.plugin(function deeppilotAgentScope() {}).ctx.extend({
+		[agentScopeKey]: identity,
+		[Context.filter](listenerCtx) {
+			const listenerIdentity = scopeOf(listenerCtx);
+			return listenerIdentity === void 0 || listenerIdentity === identity;
+		}
+	});
+}
+function inProcessStream(gateway, endpoint, payload, signal) {
+	return (async function* () {
+		yield* await gateway.wireStream.open(endpoint, payload, signal);
+	})();
+}
+/**
+* Start one headless official DSH Client backed by the Host's in-process
+* Connection and Gateway carriers.
+*
+* The returned disposer tears down the Remote Events generation, all pending
+* listeners, and every lazily minted Agent scope.
+*/
+async function startDsh012RemoteInteractions(hostCtx, handlers) {
+	const connection = hostCtx.get("connection");
+	const gateway = hostCtx.get("typertGateway");
+	if (connection === void 0) throw new Error("dsh 0.1.2-alpha.3 Host connection is unavailable");
+	if (gateway === void 0) throw new Error("dsh 0.1.2-alpha.3 typertGateway is unavailable");
+	const faces = await loadClientFaces();
+	const client = new Context();
+	const fetchHandler = connection.createSharedFetchHandler("/api");
+	const transport = {
+		fetch: (input, init) => fetchHandler.fetch(new Request(input, init)),
+		openStream: (endpoint, payload, signal) => inProcessStream(gateway, endpoint, payload, signal),
+		ownsHost: true
+	};
+	try {
+		faces.typert.apply(client);
+		const transportGlobal = globalThis;
+		const previousTransport = transportGlobal.__DSH_TRANSPORT__;
+		transportGlobal.__DSH_TRANSPORT__ = transport;
+		try {
+			faces.connection.apply(client);
+		} finally {
+			if (previousTransport === void 0) delete transportGlobal.__DSH_TRANSPORT__;
+			else transportGlobal.__DSH_TRANSPORT__ = previousTransport;
+		}
+		const typert = client.get("typert");
+		if (typert === void 0) throw new Error("resident DSH Client typert service was not installed");
+		const scopes = /* @__PURE__ */ new Map();
+		typert.contexts.registerClient("agent", {
+			identity: (candidate) => scopeOf(candidate),
+			resolve: (identity) => {
+				let scope = scopes.get(identity);
+				if (scope === void 0) {
+					scope = createAgentScope(client, identity);
+					scopes.set(identity, scope);
+				}
+				return scope;
+			}
+		});
+		faces.gateway.apply(client);
+		const remote = client.get("remote");
+		if (remote === void 0) throw new Error("resident DSH Client remote service was not installed");
+		remote.$on("approval/request", function(request, next) {
+			return handlers.approval(scopeOf(this) ?? "", request, next);
+		});
+		remote.$on("user-questions/request", function(request, next) {
+			return handlers.question(scopeOf(this) ?? "", request, next);
+		});
+		return async () => {
+			await client.fiber.dispose();
+		};
+	} catch (error) {
+		await client.fiber.dispose();
+		throw error;
+	}
+}
+//#endregion
 //#region src/dsh012-api-proxy.ts
 /**
 * Compatibility façade for the DSH 0.1.2 controller API.
 *
 * DeepPilot's phone protocol deliberately speaks one stable in-process
 * `apiProxy` vocabulary. Harness 0.1.2 removed that service in favor of
-* direct Session/Workspace controllers plus scoped Cordis interaction events.
+* direct Session/Workspace controllers plus Gateway-backed Remote Events.
 * This adapter rebuilds the small subset the bridge needs from those public
-* controllers, keeping the protocol implementation isolated from the Host API
-* migration. It is intentionally Host-only.
+* controllers and joins the official Client interaction plane in-process,
+* keeping the phone protocol isolated from the Host API migration.
 */
 /** Direct-controller facade with the exact legacy shape HostBridge consumes. */
 var Dsh012ApiProxy = class {
@@ -2494,13 +2702,27 @@ var Dsh012ApiProxy = class {
 	workspaceController;
 	directoryPicker;
 	interactions = /* @__PURE__ */ new Map();
-	constructor(ctx) {
+	shouldSurfaceInteraction;
+	constructor(ctx, options = {}) {
 		this.ctx = ctx;
 		const session = ctx.get("sessionController");
 		if (session === void 0) throw new Error("dsh 0.1.2 sessionController is unavailable");
 		this.session = session;
 		this.workspaceController = ctx.get("workspaceController");
 		this.directoryPicker = ctx.get("directoryPickerController");
+		this.shouldSurfaceInteraction = options.shouldSurfaceInteraction ?? (() => true);
+	}
+	/**
+	* Decide whether this Gateway Client can surface a phone card. The decision
+	* fails open to false so a broken device registry delegates this delivery
+	* while the official Web Client remains able to answer.
+	*/
+	canSurfaceInteraction(kind) {
+		try {
+			return this.shouldSurfaceInteraction(kind);
+		} catch {
+			return false;
+		}
 	}
 	sessions = {
 		list: async () => this.call(async () => {
@@ -2613,71 +2835,79 @@ var Dsh012ApiProxy = class {
 				value
 			});
 		});
-		const offApproval = this.ctx.on("approval/request", ((request) => {
-			const rpcId = randomUUID();
-			const sessionId = String(request.agent?.session?.id ?? request.agent?.id ?? "");
-			const response = deferred();
-			const abort = () => response.resolve("cancelled");
-			request.signal?.addEventListener("abort", abort, { once: true });
-			this.interactions.set(rpcId, {
-				resolve: response.resolve,
-				map: (value) => {
-					const outcome = value?.outcome;
-					return outcome === "allowed-once" || outcome === "rejected" ? outcome : "unavailable";
-				}
-			});
-			queue.push({
-				type: "approval/requested",
-				rpcId,
-				sessionId,
-				approvalId: rpcId,
-				toolName: String(request.toolName ?? "tool"),
-				reason: String(request.reason ?? "")
-			});
-			return response.promise.finally(() => {
-				request.signal?.removeEventListener("abort", abort);
-				this.interactions.delete(rpcId);
-				queue.push({
-					type: "approval/resolved",
-					approvalId: rpcId
-				});
-			});
-		}), { global: true });
-		const offQuestion = this.ctx.on("user-questions/request", ((request) => {
-			const rpcId = randomUUID();
-			const sessionId = String(request.agent?.session?.id ?? request.agent?.id ?? "");
-			const response = deferred();
-			const abort = () => response.reject(/* @__PURE__ */ new Error("question cancelled"));
-			request.signal?.addEventListener("abort", abort, { once: true });
-			this.interactions.set(rpcId, {
-				resolve: response.resolve,
-				map: (value) => value?.answer ?? value
-			});
-			queue.push({
-				type: "question/requested",
-				rpcId,
-				sessionId,
-				questions: request.questions ?? []
-			});
-			return response.promise.finally(() => {
-				request.signal?.removeEventListener("abort", abort);
-				this.interactions.delete(rpcId);
-				queue.push({
-					type: "question/resolved",
-					questionRpcId: rpcId
-				});
+		let disposeInteractions;
+		try {
+			disposeInteractions = await startDsh012RemoteInteractions(this.ctx, {
+				approval: (sessionId, request, next) => this.answerApproval(queue, sessionId, request, next),
+				question: (sessionId, request, next) => this.answerQuestion(queue, sessionId, request, next)
 			});
-		}), { global: true });
+		} catch (error) {
+			console.warn(`[deeppilot] DSH Remote interaction client unavailable: ${toError(error).message}`);
+		}
 		try {
 			yield* queue.iterate();
 		} finally {
 			offEvent();
 			offProjection?.();
-			offApproval();
-			offQuestion();
+			await disposeInteractions?.();
 			queue.close();
 		}
 	}
+	answerApproval(queue, sessionId, request, next) {
+		if (!this.canSurfaceInteraction("approval")) return next();
+		const rpcId = randomUUID();
+		const response = deferred();
+		const abort = () => response.resolve("cancelled");
+		request.signal?.addEventListener("abort", abort, { once: true });
+		this.interactions.set(rpcId, {
+			resolve: response.resolve,
+			map: (value) => {
+				const outcome = value?.outcome;
+				return outcome === "allowed-once" || outcome === "rejected" ? outcome : "unavailable";
+			}
+		});
+		queue.push({
+			type: "approval/requested",
+			rpcId,
+			sessionId,
+			approvalId: rpcId,
+			toolName: String(request.toolName ?? "tool"),
+			reason: String(request.reason ?? "")
+		});
+		return response.promise.finally(() => {
+			request.signal?.removeEventListener("abort", abort);
+			this.interactions.delete(rpcId);
+			queue.push({
+				type: "approval/resolved",
+				approvalId: rpcId
+			});
+		});
+	}
+	answerQuestion(queue, sessionId, request, next) {
+		if (!this.canSurfaceInteraction("question")) return next();
+		const rpcId = randomUUID();
+		const response = deferred();
+		const abort = () => response.reject(/* @__PURE__ */ new Error("question cancelled"));
+		request.signal?.addEventListener("abort", abort, { once: true });
+		this.interactions.set(rpcId, {
+			resolve: response.resolve,
+			map: (value) => value?.answer ?? value
+		});
+		queue.push({
+			type: "question/requested",
+			rpcId,
+			sessionId,
+			questions: request.questions ?? []
+		});
+		return response.promise.finally(() => {
+			request.signal?.removeEventListener("abort", abort);
+			this.interactions.delete(rpcId);
+			queue.push({
+				type: "question/resolved",
+				questionRpcId: rpcId
+			});
+		});
+	}
 	async *hostEvents(signal) {
 		const queue = new AsyncFrameQueue(signal);
 		const listen = (event, type, project) => this.ctx.on(event, ((...args) => queue.push({
@@ -5151,7 +5381,21 @@ function apply(ctx, options) {
 			res.end(JSON.stringify({ ok: false }));
 		}
 	};
-	ctx.inject(["sessionController"], (sub) => {
+	/**
+	* Whether the resident Gateway Client represents a real phone surface. A
+	* paired device remains answerable even while offline: HostBridge retains an
+	* authoritative pending snapshot that the app pulls on reconnect, while
+	* APNs is only a best-effort wakeup. With no paired device this Client calls
+	* `next()`; Gateway's independent official Web delivery is unaffected.
+	*/
+	const hasPairedPhoneSurface = (_kind) => {
+		return (auth.devices?.list() ?? []).some((device) => device.revokedAt === void 0);
+	};
+	ctx.inject([
+		"sessionController",
+		"connection",
+		"typertGateway"
+	], (sub) => {
 		if (currentConfig().enabled !== true) {
 			log("bridge disabled; data plane stays inactive");
 			return;
@@ -5159,7 +5403,7 @@ function apply(ctx, options) {
 		const apiCtx = sub;
 		let proxy;
 		try {
-			proxy = new Dsh012ApiProxy(apiCtx);
+			proxy = new Dsh012ApiProxy(apiCtx, { shouldSurfaceInteraction: hasPairedPhoneSurface });
 		} catch (error) {
 			log("dsh 0.1.2 session bridge unavailable: " + String(error));
 			return;