@sjhmars/happy-bridge 0.3.1 → 0.3.3

package/lib/client.js

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

package/lib/index.js

@@ -3787,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") {
@@ -3808,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;
@@ -3885,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,
@@ -4174,7 +4179,10 @@ var HappyBridge = class {
 					options: [...(question.options ?? []).map((option) => ({
 						label: option.label,
 						...option.description === void 0 ? {} : { description: option.description }
-					})), ...(question.options ?? []).length > 0 ? [{ label: CUSTOM_ANSWER_LABEL }] : []],
+					})), ...(question.options ?? []).length > 0 ? [{
+						label: CUSTOM_ANSWER_LABEL,
+						description: "选中并提交后，到下方聊天输入框写出你的回答"
+					}] : []],
 					multiSelect: question.multiSelect === true,
 					allowCustom: true,
 					required: true
@@ -4209,7 +4217,10 @@ var HappyBridge = class {
 				options: [...(question.options ?? []).map((option) => ({
 					label: option.label,
 					description: option.description ?? ""
-				})), { label: CUSTOM_ANSWER_LABEL }],
+				})), {
+					label: CUSTOM_ANSWER_LABEL,
+					description: "选中并提交后，到下方聊天输入框写出你的回答"
+				}],
 				multiSelect: question.multiSelect === true
 			})) };
 			link.pendingHuman = {
@@ -4324,10 +4335,8 @@ 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 = {};
@@ -4339,6 +4348,7 @@ var HappyBridge = class {
 		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;
 		}
@@ -4404,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjhmars/happy-bridge",
-  "version": "0.3.1",
+  "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",