@sjhmars/happy-bridge 0.3.6 → 0.3.8

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 走进输入框自定义流程，把网页模型栏锁回目录第一项 DeepSeek V4）。旧版 App 没有这条通道，见 `questionChannel`。提问还在等的时候，直接用输入框打字也等于自己填；审阅计划时打字会关掉审阅，这句话当普通聊天发出去。批完/拒完的卡片会停在「已批准/已拒绝」状态，按钮失效。远程档至少「能批」才能从手机点。
 - 电脑正在生成时，手机可以点停止（Happy App 的 Stop）。远程档至少「能聊」。只看档点了不会停。
 - 助手回复按整段推到手机（生成中会转圈）。思考收成一行 **Think · 摘要** 的 Note 卡片，点进去看全文。工具用 Happy 认识的名字（Grep / Read / Bash），描述跟网页那一行摘要一样。Happy 没有网页同款图标。
 

package/lib/client.js

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

package/lib/index.js

@@ -247,7 +247,8 @@ async function buildSessionMetadata(ctx, source, machineId, title, selection, _g
 		value: name,
 		description: name === "danger-full-access" ? "不限制文件，且不再询问批准" : "只能改当前工作区，危险工具要批准"
 	}));
-	const selected = resolveSelection(models, selection);
+	const selected = resolvePublishedSelection(models, selection);
+	const publishedModels = selected === void 0 || models.some((model) => model.providerId === selected.row.providerId && model.id === selected.row.id) ? models : [selected.row, ...models];
 	const thoughtLevels = selected?.row.effortOptions;
 	const thought = selected === void 0 ? void 0 : selected.effort ?? selected.row.defaultThinkingLevel;
 	return {
@@ -271,7 +272,7 @@ async function buildSessionMetadata(ctx, source, machineId, title, selection, _g
 		happyToolsDir: VIRTUAL_HOME,
 		slashCommands,
 		skills,
-		models,
+		models: publishedModels,
 		operatingModes,
 		client: {
 			id: "rig",
@@ -329,17 +330,47 @@ async function buildSessionMetadata(ctx, source, machineId, title, selection, _g
 		}
 	};
 }
-function resolveSelection(models, selection) {
+/**
+* Pick the Happy catalog row that matches Host selection.
+* A known Host pick that is missing from the listed rows stays that pick
+* (synthetic row) instead of falling back to `models[0]` (usually DeepSeek V4).
+* @param models - rows advertised to the App.
+* @param selection - current Host provider/model/effort, when known.
+* @returns the row to publish, plus effort when the Host named one.
+*/
+function resolvePublishedSelection(models, selection) {
 	if (selection !== void 0) {
 		const row = models.find((model) => model.providerId === selection.provider && model.id === selection.model) ?? models.find((model) => model.code === `${selection.provider}/${selection.model}`);
 		if (row !== void 0) return {
 			row,
 			...selection.reasoningEffort === void 0 ? {} : { effort: selection.reasoningEffort }
 		};
+		return {
+			row: syntheticHappyRow(selection),
+			...selection.reasoningEffort === void 0 ? {} : { effort: selection.reasoningEffort }
+		};
 	}
 	const first = models[0];
 	return first === void 0 ? void 0 : { row: first };
 }
+function syntheticHappyRow(selection) {
+	const effort = selection.reasoningEffort;
+	return {
+		code: `${selection.provider}/${selection.model}`,
+		value: selection.model,
+		id: selection.model,
+		name: selection.model,
+		providerId: selection.provider,
+		providerKind: "custom",
+		providerName: selection.provider,
+		thinkingLevels: effort === void 0 ? [] : [effort],
+		effortOptions: effort === void 0 ? [] : [{
+			code: effort,
+			value: effort
+		}],
+		...effort === void 0 ? {} : { defaultThinkingLevel: effort }
+	};
+}
 function listCommands(ctx, agent) {
 	const commands = ctx.get("commands");
 	if (commands === void 0) return [];
@@ -1105,6 +1136,22 @@ function sameCatalogPick(previous, next) {
 	if (previous === void 0) return false;
 	return catalogPickKey(previous) === catalogPickKey(next);
 }
+/**
+* Whether inbound `meta.model` is the pick we last published.
+* The App often echoes only `currentModelCode` (bare id) on a chat line,
+* while we publish `provider:id`; treating that as a user switch would
+* lock the web composer onto the catalog default (DeepSeek V4).
+* @param published - last pick we wrote, if any.
+* @param inbound - model code from the inbound message.
+* @returns true when the inbound model is our own echo.
+*/
+function isPublishedModelEcho(published, inbound) {
+	if (published?.model === void 0) return false;
+	if (sameCatalogPick({ model: published.model }, { model: inbound })) return true;
+	const publishedSplit = splitModelCode(published.model);
+	const inboundSplit = splitModelCode(inbound);
+	return inboundSplit.provider === "" && inboundSplit.model === publishedSplit.model;
+}
 function catalogPickKey(pick) {
 	const split = pick.model === void 0 ? void 0 : splitModelCode(pick.model);
 	return `${split === void 0 ? "" : split.provider === "" ? split.model : `${split.provider}/${split.model}`}\0${pick.effort === void 0 ? "" : pick.effort === null ? "null" : pick.effort}`;
@@ -1767,6 +1814,18 @@ function mergeCustomAnswers(questions, text, deferred) {
 	});
 }
 /**
+* Translate a web-side harness answer batch into Happy communications answers
+* so the phone card shows the same choice instead of a cancelled form.
+* @param answers - harness answer rows from the web composer.
+* @returns answers keyed by question id.
+*/
+function communicationAnswersFromWeb(answers) {
+	return Object.fromEntries(answers.map((row) => [row.id, {
+		options: row.selected,
+		...row.custom === void 0 || row.custom === "" ? {} : { custom: row.custom }
+	}]));
+}
+/**
 * 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.
@@ -3788,12 +3847,13 @@ var HappyBridge = class {
 		const model = messageModelCode(meta);
 		const effort = messageEffort(meta);
 		const permissionMode = meta.permissionMode;
-		const publishedModel = this.lastPublished.get(agent.id)?.model;
-		const modelIsEcho = model !== void 0 && publishedModel !== void 0 && sameCatalogPick({ model: publishedModel }, { model });
+		const published = this.lastPublished.get(agent.id);
+		const modelIsEcho = model !== void 0 && isPublishedModelEcho(published, model);
+		const effortIsEcho = effort !== void 0 && published?.effort != null && effort === published.effort;
 		if (model !== void 0 && !modelIsEcho) {
 			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") {
+		} else if ((effort === null || typeof effort === "string") && !effortIsEcho) {
 			if (!grantAtLeast(this.config.remoteGrant, "full")) link.socket.sendText("service", "改思考强度需要远程档「完整」，这条消息仍会发出。");
 			else if (effort === null) {
 				const current = this.currentModel(agent);
@@ -4252,8 +4312,8 @@ var HappyBridge = class {
 			const pending = link.pendingHuman;
 			if (pending !== void 0) {
 				delete link.pendingHuman;
-				if (pending.kind === "ask" && pending.communication !== void 0) this.completeCommunication(link, pending.id, pending.communication, "cancelled");
-				else this.clearRequest(link, pending.id, "canceled", pending.request);
+				if (pending.kind === "ask" && pending.communication !== void 0) this.completeCommunication(link, pending.id, pending.communication, "answered", communicationAnswersFromWeb(answer.answers));
+				else this.clearRequest(link, pending.id, "approved", pending.request);
 				link.socket.sendToolEnd(pending.id);
 			}
 			return answer;

package/lib/types/catalogs.d.ts

@@ -117,4 +117,16 @@ export declare function buildSessionMetadata(ctx: Context, source: {
     }[];
     agent?: Agent;
 }, machineId: string, title: string, selection: HappySelection | undefined, _grant: RemoteGrant): Promise<SessionMetadata>;
+/**
+ * Pick the Happy catalog row that matches Host selection.
+ * A known Host pick that is missing from the listed rows stays that pick
+ * (synthetic row) instead of falling back to `models[0]` (usually DeepSeek V4).
+ * @param models - rows advertised to the App.
+ * @param selection - current Host provider/model/effort, when known.
+ * @returns the row to publish, plus effort when the Host named one.
+ */
+export declare function resolvePublishedSelection(models: HappyModelRow[], selection: HappySelection | undefined): {
+    row: HappyModelRow;
+    effort?: string;
+} | undefined;
 //# sourceMappingURL=catalogs.d.ts.map

package/lib/types/grant.d.ts

@@ -84,4 +84,14 @@ export interface CatalogModelPick {
  * @returns true when the inbound pick is our own echo.
  */
 export declare function sameCatalogPick(previous: CatalogModelPick | undefined, next: CatalogModelPick): boolean;
+/**
+ * Whether inbound `meta.model` is the pick we last published.
+ * The App often echoes only `currentModelCode` (bare id) on a chat line,
+ * while we publish `provider:id`; treating that as a user switch would
+ * lock the web composer onto the catalog default (DeepSeek V4).
+ * @param published - last pick we wrote, if any.
+ * @param inbound - model code from the inbound message.
+ * @returns true when the inbound model is our own echo.
+ */
+export declare function isPublishedModelEcho(published: CatalogModelPick | undefined, inbound: string): boolean;
 //# sourceMappingURL=grant.d.ts.map

package/lib/types/inbound.d.ts

@@ -110,6 +110,20 @@ export declare function mergeCustomAnswers(questions: readonly {
     selected: string[];
     custom?: string;
 }[];
+/**
+ * Translate a web-side harness answer batch into Happy communications answers
+ * so the phone card shows the same choice instead of a cancelled form.
+ * @param answers - harness answer rows from the web composer.
+ * @returns answers keyed by question id.
+ */
+export declare function communicationAnswersFromWeb(answers: readonly {
+    id: string;
+    selected: string[];
+    custom?: string;
+}[]): Record<string, {
+    options: 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.6",
+  "version": "0.3.8",
   "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",