@sjhmars/happy-bridge 0.3.0 → 0.3.3

package/README.md

@@ -21,7 +21,7 @@
 - 新建：只能选已经在网页登记过的工作区。不会在磁盘上 mkdir。App 里「new worktree」会失败（故意不暴露 bash）。
 - 发文字：已注册 `/命令` 走命令通道；否则当聊天。`/skill名` 仍当普通消息，由 harness 注入。
 - 发图片：相册/拍照/粘贴后，会随下一条文字（也可以只发图）进同一场电脑对话，模型能看见图。`.java` / `.txt` 等普通文件会先下载到工作区 `happy-inbox/`，再走电脑原来的 `read` 工具读内容（和你在仓库里打开一个文件一样）。PDF、Word 这类不是纯文本的文件，电脑的 `read` 会拒绝，插件也不会自己拆文档。远程档至少「能聊」。输入框左边应有图片按钮；发出后电脑网页会出现图片，手机会转圈等回复。电脑网页贴的图也会按同一套加密上传推到手机。
-- 工具批准、计划审阅、选择题：和网页黄框/提问框赛跑，谁先点谁算。手机点「始终允许」只在这次网页进程里记住。选择题走 Happy 表单通道：选项照列，每题下面还有自由输入框，提交后卡片上会一直显示你选的答案（旧版 App 没有这条通道，见 `questionChannel`）。提问还在等的时候，用输入框打字等于自己填；审阅计划时打字会关掉审阅，这句话当普通聊天发出去。批完/拒完的卡片会停在「已批准/已拒绝」状态，按钮失效。远程档至少「能批」才能从手机点。
+- 工具批准、计划审阅、选择题：和网页黄框/提问框赛跑，谁先点谁算。手机点「始终允许」只在这次网页进程里记住。选择题走 Happy 表单通道，每道题末尾多一个「✏️ 自定义…」选项：点它之后在输入框写出你的想法直接发送，那条文本就是这道题的答案（其他题已选的项保留）；答完后卡片会显示所选内容和自定义文本。旧版 App 没有这条通道，见 `questionChannel`。提问还在等的时候，直接用输入框打字也等于自己填；审阅计划时打字会关掉审阅，这句话当普通聊天发出去。批完/拒完的卡片会停在「已批准/已拒绝」状态，按钮失效。远程档至少「能批」才能从手机点。
 - 电脑正在生成时，手机可以点停止（Happy App 的 Stop）。远程档至少「能聊」。只看档点了不会停。
 - 助手回复按整段推到手机（生成中会转圈）。思考收成一行 **Think · 摘要** 的 Note 卡片，点进去看全文。工具用 Happy 认识的名字（Grep / Read / Bash），描述跟网页那一行摘要一样。Happy 没有网页同款图标。
 
@@ -74,7 +74,7 @@ pnpm dsh web --port 3080
 
 `remoteGrant`：`watch` | `chat` | `approve` | `full`。设置页下拉框会写入这份配置。会话里也可以 `/remote approve`（只改当前进程，不写设置）。档位「完整」时，手机换模型和思考强度走电脑同一条 `session.selectModel`，网页模型栏和推理等级会跟着变。电脑自己换模型和思考强度同样会写回手机。网页加了新模型后，已镜像的手机会话会重新收到完整名单。
 
-`questionChannel`：`communications`（默认）| `permission`。选择题走的 Happy 通道。`communications` 是 App 的表单通道：每道题带自由输入框，提交后卡片常驻显示你选的答案，会话列表也会显示「等回答」；需要较新版 Happy App。旧版 App 没有这条通道时配成 `permission`：题目选项仍可见可答，但没有自由输入框（此时可在输入框打字作答），答完卡片也不回显。
+`questionChannel`：`communications`（默认）| `permission`。选择题走的 Happy 通道。`communications` 是 App 的表单通道：答完卡片常驻显示你选的答案，会话列表也会显示「等回答」；需要较新版 Happy App。`permission` 是旧通道：题目选项仍可见可答，答完卡片不回显。两条通道都没有内联输入框——自由回答都靠每题末尾的「✏️ 自定义…」选项 + 输入框打字（`communications` 下，零选项的题目会弹 App 全屏表单，那里有真正的输入框）。
 
 ## 已知限制
 

package/lib/client.js

@@ -17,21 +17,21 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var HappyBridgeCard_module_css_default = {
-			"body": "l9rBEq_body",
+			"checkbox": "l9rBEq_checkbox",
+			"label": "l9rBEq_label",
+			"status": "l9rBEq_status",
+			"headText": "l9rBEq_headText",
+			"button": "l9rBEq_button",
 			"row": "l9rBEq_row",
-			"description": "l9rBEq_description",
+			"qr": "l9rBEq_qr",
 			"name": "l9rBEq_name",
-			"headText": "l9rBEq_headText",
 			"chevron": "l9rBEq_chevron",
-			"qr": "l9rBEq_qr",
-			"card": "l9rBEq_card",
 			"error": "l9rBEq_error",
-			"button": "l9rBEq_button",
-			"status": "l9rBEq_status",
-			"checkbox": "l9rBEq_checkbox",
-			"label": "l9rBEq_label",
+			"header": "l9rBEq_header",
+			"body": "l9rBEq_body",
 			"select": "l9rBEq_select",
-			"header": "l9rBEq_header"
+			"card": "l9rBEq_card",
+			"description": "l9rBEq_description"
 		};
 		//#endregion
 		//#region src/client/HappyBridgeCard.tsx

package/lib/index.js

@@ -1699,19 +1699,6 @@ function answersFromHappy(answers, questions) {
 	});
 }
 /**
-* Fill every still-open question with the typed chat line as `custom`.
-* @param questions - harness questions in order.
-* @param text - the App composer line.
-* @returns one answer row per question.
-*/
-function customAnswersFromText(questions, text) {
-	return questions.map((question) => ({
-		id: question.id,
-		selected: [],
-		custom: text
-	}));
-}
-/**
 * The option label that declines a plan-review question.
 * @param question - first question of a plan-review `ask`.
 * @returns the non-approve option label, or Keep planning.
@@ -1744,6 +1731,41 @@ function parsePermissionRpc(params) {
 	return result;
 }
 /**
+* Synthetic last option the bridge appends to every question: the App's inline
+* form has no free-text input, so "custom answer" is a two-tap flow — pick
+* this option, then type the real answer in the composer.
+*/
+const CUSTOM_ANSWER_LABEL = "✏️ 自定义…";
+/**
+* Merge composer text with a deferred (marker-picked) submission.
+* - No deferred selections: the text becomes `custom` for every question
+*   (the original "type while waiting" behavior).
+* - With deferred selections: real options are kept per question; questions
+*   that picked the marker — and questions never answered — take the text
+*   as `custom`.
+* @param questions - harness questions in order.
+* @param text - the composer line.
+* @param deferred - per-question submitted options, keyed by question id.
+* @returns one answer row per question.
+*/
+function mergeCustomAnswers(questions, text, deferred) {
+	return questions.map((question) => {
+		const selected = deferred?.[question.id];
+		if (selected === void 0) return {
+			id: question.id,
+			selected: [],
+			custom: text
+		};
+		const real = selected.filter((option) => option !== CUSTOM_ANSWER_LABEL);
+		const marked = real.length !== selected.length;
+		return {
+			id: question.id,
+			selected: real,
+			...!marked && real.length > 0 ? {} : { custom: text }
+		};
+	});
+}
+/**
 * Translate Happy communications answers (`{ [question id]: { options, custom } }`)
 * into harness answer rows. Options become `selected`; free text becomes `custom`.
 * @param answers - communication RPC answers keyed by question id.
@@ -3714,12 +3736,12 @@ var HappyBridge = class {
 		const files = await this.drainPhoneFiles(link);
 		const pending = link.pendingHuman;
 		if (pending?.kind === "ask") {
-			const answers = customAnswersFromText(pending.questions, message.text);
+			const answers = mergeCustomAnswers(pending.questions, message.text, pending.deferred);
 			pending.resolve({ answers });
 			delete link.pendingHuman;
 			if (pending.communication !== void 0) this.completeCommunication(link, pending.id, pending.communication, "answered", Object.fromEntries(answers.map((row) => [row.id, {
-				options: [],
-				custom: row.custom
+				options: row.selected,
+				...row.custom === void 0 ? {} : { custom: row.custom }
 			}])));
 			else this.clearRequest(link, pending.id, "canceled", pending.request);
 			link.socket.sendToolEnd(pending.id);
@@ -3765,7 +3787,10 @@ var HappyBridge = class {
 		const model = messageModelCode(meta);
 		const effort = messageEffort(meta);
 		const permissionMode = meta.permissionMode;
-		if (model !== void 0) {
+		const publishedModel = this.lastPublished.get(agent.id)?.model;
+		const modelIsEcho = model !== void 0 && publishedModel !== void 0 && sameCatalogPick({ model: publishedModel }, { model });
+		if (model !== void 0) this.log(`手机消息 meta.model=${model}${modelIsEcho ? "（自己发布的回声，忽略）" : "（用户选择，准备应用）"}`);
+		if (modelIsEcho) {} else if (model !== void 0) {
 			if (!grantAtLeast(this.config.remoteGrant, "full")) link.socket.sendText("service", "改模型需要远程档「完整」，这条消息仍会发出。");
 			else this.applyModel(agent, model, typeof effort === "string" ? effort : effort === null ? null : void 0);
 		} else if (effort === null || typeof effort === "string") {
@@ -3786,6 +3811,7 @@ var HappyBridge = class {
 		if (pick === void 0) return;
 		const published = this.lastPublished.get(dshId);
 		if (published === void 0 || sameCatalogPick(published, pick)) return;
+		this.log(`手机模型选择 ${pick.model ?? ""}${pick.effort ?? ""}（上次发布 ${published.model ?? "无"}），准备应用`);
 		const link = this.links.get(dshId);
 		const agent = link === void 0 ? void 0 : this.requireAgent(link);
 		if (agent === void 0) return;
@@ -3863,6 +3889,7 @@ var HappyBridge = class {
 	*/
 	onHostModelSelected(sessionId, selection) {
 		if (this.hostSelectFromPhone) return;
+		this.log(`网页选模型 ${selection.provider}/${selection.model}${selection.reasoningEffort ?? ""}，同步到手机`);
 		const next = {
 			provider: selection.provider,
 			model: selection.model,
@@ -4149,10 +4176,13 @@ var HappyBridge = class {
 					id: question.id,
 					header: question.header ?? question.question.slice(0, 24),
 					question: question.question,
-					options: (question.options ?? []).map((option) => ({
+					options: [...(question.options ?? []).map((option) => ({
 						label: option.label,
 						...option.description === void 0 ? {} : { description: option.description }
-					})),
+					})), ...(question.options ?? []).length > 0 ? [{
+						label: CUSTOM_ANSWER_LABEL,
+						description: "选中并提交后，到下方聊天输入框写出你的回答"
+					}] : []],
 					multiSelect: question.multiSelect === true,
 					allowCustom: true,
 					required: true
@@ -4184,10 +4214,13 @@ var HappyBridge = class {
 			const arguments_ = { questions: request.questions.map((question) => ({
 				question: question.question,
 				header: question.header ?? question.question.slice(0, 24),
-				options: (question.options ?? []).map((option) => ({
+				options: [...(question.options ?? []).map((option) => ({
 					label: option.label,
 					description: option.description ?? ""
-				})),
+				})), {
+					label: CUSTOM_ANSWER_LABEL,
+					description: "选中并提交后，到下方聊天输入框写出你的回答"
+				}],
 				multiSelect: question.multiSelect === true
 			})) };
 			link.pendingHuman = {
@@ -4273,6 +4306,17 @@ var HappyBridge = class {
 			return;
 		}
 		const mapped = answersFromHappy(rpc.updatedInput?.answers, pending.questions);
+		const deferred = {};
+		let wantsCustom = false;
+		for (const row of mapped) {
+			deferred[row.id] = row.selected;
+			if (row.selected.includes("✏️ 自定义…")) wantsCustom = true;
+		}
+		if (wantsCustom) {
+			pending.deferred = deferred;
+			link.socket.sendText("service", "已选自定义回答：请在输入框输入你的想法，直接发送即可。");
+			return;
+		}
 		pending.resolve({ answers: mapped.map((row) => ({
 			id: row.id,
 			selected: row.selected
@@ -4291,10 +4335,21 @@ var HappyBridge = class {
 		if (link === void 0 || pending === void 0 || pending.kind !== "ask") return;
 		if (pending.id !== rpc.id || pending.communication === void 0) return;
 		if (rpc.status !== "answered" || rpc.answers === void 0) {
-			pending.reject(new UserQuestionError("the user cancelled ask_user_question", "ASK_CANCELLED"));
-			delete link.pendingHuman;
+			pending.deferred ??= {};
 			this.completeCommunication(link, rpc.id, pending.communication, "cancelled");
-			link.socket.sendToolEnd(rpc.id);
+			return;
+		}
+		const deferred = {};
+		let wantsCustom = false;
+		for (const [questionId, answer] of Object.entries(rpc.answers)) {
+			deferred[questionId] = answer.options;
+			if (answer.options.includes("✏️ 自定义…")) wantsCustom = true;
+		}
+		if (wantsCustom) {
+			pending.deferred = deferred;
+			this.completeCommunication(link, rpc.id, pending.communication, "answered", rpc.answers);
+			link.socket.sendToolStart(rpc.id, "request_user_input", pending.communication.form, "需要你回答", "已选自定义：请在下方输入框输入你的回答后发送");
+			link.socket.sendText("service", "已选自定义回答：请在输入框输入你的想法，直接发送即可。");
 			return;
 		}
 		pending.resolve({ answers: answersFromCommunication(rpc.answers, pending.questions) });
@@ -4359,8 +4414,10 @@ var HappyBridge = class {
 		}, this.credentials.machineId, sessionLabel(events), link.agent === void 0 ? void 0 : this.currentModel(link.agent), this.config.remoteGrant);
 		link.socket.updateMetadata(metadata);
 		const pick = catalogModelPick(metadata);
+		const previousPick = this.lastPublished.get(link.dshId);
 		if (pick === void 0) this.lastPublished.delete(link.dshId);
 		else this.lastPublished.set(link.dshId, pick);
+		if (pick === void 0 || sameCatalogPick(previousPick, pick) === false) this.log(`发布目录：模型 ${pick?.model ?? "（无）"} 思考 ${String(pick?.effort ?? "（无）")}`);
 	}
 	pushAllMetadata() {
 		for (const link of this.links.values()) if (!link.parked) this.pushMetadata(link);

package/lib/types/inbound.d.ts

@@ -85,6 +85,31 @@ export declare function planReviewDeclineLabel(question: {
  * @returns id, approved flag, optional Always-allow decision, and answers.
  */
 export declare function parsePermissionRpc(params: unknown): PermissionRpc;
+/**
+ * Synthetic last option the bridge appends to every question: the App's inline
+ * form has no free-text input, so "custom answer" is a two-tap flow — pick
+ * this option, then type the real answer in the composer.
+ */
+export declare const CUSTOM_ANSWER_LABEL = "\u270F\uFE0F \u81EA\u5B9A\u4E49\u2026";
+/**
+ * Merge composer text with a deferred (marker-picked) submission.
+ * - No deferred selections: the text becomes `custom` for every question
+ *   (the original "type while waiting" behavior).
+ * - With deferred selections: real options are kept per question; questions
+ *   that picked the marker — and questions never answered — take the text
+ *   as `custom`.
+ * @param questions - harness questions in order.
+ * @param text - the composer line.
+ * @param deferred - per-question submitted options, keyed by question id.
+ * @returns one answer row per question.
+ */
+export declare function mergeCustomAnswers(questions: readonly {
+    id: string;
+}[], text: string, deferred?: Record<string, string[]>): {
+    id: string;
+    selected: string[];
+    custom?: string;
+}[];
 /**
  * Translate Happy communications answers (`{ [question id]: { options, custom } }`)
  * into harness answer rows. Options become `selected`; free text becomes `custom`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjhmars/happy-bridge",
-  "version": "0.3.0",
+  "version": "0.3.3",
   "description": "Remote-control bridge: pair a running dsh web/desktop client with the Happy mobile app by QR code, then remote-control the same harness sessions from the phone (send messages, read replies, approve tool calls, switch models)",
   "keywords": [
     "deepseek-harness",