dsh-cursor-subscription 0.5.3 → 0.5.4

package/README.md

@@ -11,7 +11,7 @@ Sign in to your Cursor account and use your Cursor subscription directly from De
 - Use a Cursor subscription directly in DSH through browser-based PKCE sign-in—no API key required.
 - Store credentials in DSH's local credential store and refresh access tokens automatically.
 - Discover models available to the current account dynamically through Cursor's `GetUsableModels`, with a built-in fallback list if discovery fails.
-- Stream conversations with reasoning output and DSH tool calls.
+- Stream conversations with reasoning output, image attachments, and DSH tool calls.
 - View sign-in status and token expiration in the settings page.
 - View and manually refresh subscription usage, including requests, Auto + Composer usage, other-model (API) usage, per-model spend, on-demand spend, and billing cycle.
 - View and manually refresh the models available to the current account.
@@ -72,7 +72,7 @@ If DSH is running, restart it manually after installation or an update.
 
 ## Scope and Support
 
-- Cursor-native features such as image generation and web search are outside this plugin's scope.
+- Image *input* (user-uploaded attachments) is supported. Cursor-native features such as image generation and web search remain outside this plugin's scope.
 - Report problems through the repository's Issues page.
 
 [MIT](LICENSE)

package/README_zh.md

@@ -16,7 +16,7 @@
 - 在 DSH 中直接使用 Cursor 订阅（浏览器 PKCE 登录，无 API Key）；
 - 登录凭据保存在本机 DSH credential 存储中，自动刷新访问令牌；
 - 通过 Cursor 的 `GetUsableModels` 动态发现当前账户可用的模型（失败时回退到内置列表）；
-- 流式对话，支持思考过程（reasoning）与 DSH 工具调用；
+- 流式对话，支持思考过程（reasoning）、用户图片附件与 DSH 工具调用；
 - 设置页可查看登录状态与令牌有效期；
 - 设置页可查询订阅用量（包含请求、Auto + Composer、其他模型占比、各模型消费、按需消费、账单周期）并手动刷新；
 - 设置页可查看当前账户可用的模型列表并手动刷新；
@@ -85,7 +85,7 @@ dsh plugin --profile web remove dsh-cursor-subscription   # 卸载
 
 ## 边界与支持
 
-- 图片生成、联网搜索等 Cursor 内置能力不在本插件范围内；
+- 支持用户上传图片作为输入。图片生成、联网搜索等 Cursor 内置能力仍不在本插件范围内；
 - 问题反馈请在仓库 Issues 中提交。
 
 [MIT](LICENSE)

package/lib/index.js

@@ -102,7 +102,7 @@ function sanitizeHeaders(headers) {
 }
 
 function makeResponse(status, res, data) {
-	const text = () => data.toString("utf8");
+	const text = async () => data.toString("utf8");
 	return {
 		ok: status >= 200 && status < 300,
 		status,
@@ -111,7 +111,7 @@ function makeResponse(status, res, data) {
 			get: (name) => res.headers[String(name).toLowerCase()] ?? null,
 		},
 		text: async () => text(),
-		json: async () => JSON.parse(text()),
+		json: async () => JSON.parse(await text()),
 		arrayBuffer: async () => data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength),
 	};
 }
@@ -890,10 +890,30 @@ function encodeModelDetails(modelId) {
 	return writer.finish();
 }
 
-/** ConversationAction { user_message_action = 1 } → UserMessageAction { user_message = 1 } */
-function encodeUserMessageAction(userBytes) {
-	const inner = new Writer().message(1, userBytes).finish(); // UserMessageAction
-	return new Writer().message(1, inner).finish(); // ConversationAction
+/**
+ * ConversationHistoryImageContent { data = 1, mime_type = 2 }
+ * wrapped as ConversationHistoryMessage.user.content[].image
+ */
+function encodeConversationHistoryImage({ data, mimeType }) {
+	const image = new Writer().string(1, data);
+	if (mimeType) image.string(2, mimeType);
+	const content = new Writer().message(2, image.finish()).finish(); // UserContent.image
+	const user = new Writer().message(1, content).finish(); // UserMessage.content
+	return new Writer().message(1, user).finish(); // HistoryMessage.user
+}
+
+/** ConversationHistory { messages = 1 } with one history message per image. */
+function encodeConversationHistory(images) {
+	const writer = new Writer();
+	for (const image of images) writer.message(1, encodeConversationHistoryImage(image));
+	return writer.finish();
+}
+
+/** ConversationAction { user_message_action = 1 } → UserMessageAction { user_message = 1, conversation_history = 7 } */
+function encodeUserMessageAction(userBytes, images = []) {
+	const inner = new Writer().message(1, userBytes); // UserMessageAction.user_message
+	if (images.length > 0) inner.message(7, encodeConversationHistory(images));
+	return new Writer().message(1, inner.finish()).finish(); // ConversationAction
 }
 
 /** ConversationStateStructure — the durable conversation payload. */
@@ -1573,6 +1593,26 @@ function sha256(bytes) {
 	return createHash("sha256").update(bytes).digest();
 }
 
+function collectImageAttachments(options) {
+	const refs = new Map();
+	const visit = (blocks) => {
+		for (const block of blocks ?? []) {
+			if (block.type === "image") refs.set(block.attachment.attachmentId, block.attachment);
+			else if (block.type === "tool-result") visit(block.content);
+		}
+	};
+	for (const message of options.messages ?? []) if (message.role === "user") visit(message.content);
+	return [...refs.values()];
+}
+
+export async function prepareCursorImages(options, attachments) {
+	const refs = collectImageAttachments(options);
+	if (refs.length === 0) return [];
+	if (attachments === undefined) throw new LlmError("Cursor image input requires the durable attachment service", "UNSUPPORTED_CONTENT");
+	const stored = await Promise.all(refs.map((ref) => attachments.readImage(ref, options.signal)));
+	return stored.map(({ ref, data }) => ({ data: Buffer.from(data).toString("base64"), mimeType: ref.mediaType }));
+}
+
 function flattenBlocks(content) {
 	let text = "";
 	for (const block of content ?? []) {
@@ -1892,7 +1932,7 @@ export function buildConversationState(options) {
  * conversation state and its referenced blobs are served from the persisted
  * blob store. Otherwise the state is built from the DSH message history.
  */
-export function buildRunPayload(options, modelId, persisted) {
+export function buildRunPayload(options, modelId, persisted, images = []) {
 	let conversationState;
 	let blobStore;
 	let actionText;
@@ -1912,7 +1952,7 @@ export function buildRunPayload(options, modelId, persisted) {
 		actionText = coldStartActionText(options);
 	}
 	const userBytes = encodeUserMessage({ text: actionText, messageId: randomUUID() });
-	const action = encodeUserMessageAction(userBytes);
+	const action = encodeUserMessageAction(userBytes, images);
 	const modelDetails = encodeModelDetails(modelId);
 	const runRequest = encodeRunRequest({
 		conversationState,
@@ -2333,6 +2373,7 @@ export class CursorAdapter extends LlmAdapter {
 		});
 		this.settings = options.settings ?? (() => fallbackSettings);
 		this.createAgentRun = options.createAgentRun ?? ((access) => new AgentRun(access));
+		this.resolveAttachments = options.resolveAttachments;
 		this.sleep = options.sleep ?? abortableDelay;
 		this.now = options.now ?? Date.now;
 		this.#modelsCache = { at: 0, models: undefined };
@@ -2367,7 +2408,7 @@ export class CursorAdapter extends LlmAdapter {
 		const result = source.map((model) => ({
 			id: model.id,
 			name: model.name || model.id,
-			inputModalities: ["text"],
+			inputModalities: ["text", "image"],
 		}));
 		this.#modelsCache = { at: now, models: result };
 		return result;
@@ -2400,7 +2441,7 @@ export class CursorAdapter extends LlmAdapter {
 			provider,
 			id: model,
 			name,
-			inputModalities: ["text"],
+			inputModalities: ["text", "image"],
 			context: { contextWindow: DEFAULT_CONTEXT_WINDOW },
 			defaultMaxTokens: DEFAULT_MAX_TOKENS,
 		};
@@ -2460,7 +2501,8 @@ export class CursorAdapter extends LlmAdapter {
 					persisted.blobs.clear();
 				}
 				const access = await this.auth.accessToken({ signal: upstream });
-				const built = buildRunPayload(options, options.model, persisted);
+				const images = await prepareCursorImages(options, this.resolveAttachments?.());
+				const built = buildRunPayload(options, options.model, persisted, images);
 				blobStore = built.blobStore;
 				let retriesUsed = 0;
 				for (;;) {
@@ -2864,7 +2906,7 @@ export function apply(ctx, config = {}) {
 	};
 	const store = new CursorCredentialStore(ctx.credentials, CREDENTIAL_REF);
 	const auth = new CursorAuthService(store, { logger: ctx.logger });
-	const adapter = new CursorAdapter({ auth, settings: readSettings });
+	const adapter = new CursorAdapter({ auth, settings: readSettings, resolveAttachments: () => ctx.get("attachments") });
 	ctx.llm.registerAdapter([PROVIDER], adapter);
 	const usageReader = new CursorUsageReader(auth, { logger: ctx.logger });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cursor-subscription",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "packageManager": "pnpm@11.19.0",
   "description": "Cursor subscription for DeepSeek Harness with browser login, token refresh, model discovery, and the Cursor Agent chat protocol",
   "type": "module",