@sjhmars/happy-bridge 0.2.0 → 0.2.2

package/lib/client.js

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

package/lib/index.js

@@ -2847,6 +2847,10 @@ var HappyBridge = class {
 			if (status === "idle") this.drainNewEvents(link, agent);
 		}, { global: true });
 		this.ctx.on("session/event", (session, event) => {
+			if (event.type === "model/selection") {
+				this.onHostModelSelected(String(session.header.id), event.data);
+				return;
+			}
 			const link = this.links.get(session.header.id);
 			if (link !== void 0) {
 				this.onSessionEvent(link, event);
@@ -2857,15 +2861,6 @@ var HappyBridge = class {
 			this.ensureMirror(session.header.id).catch((error) => this.log(`镜像会话失败：${String(error)}`));
 		}, { global: true });
 		this.ctx.on("approval/request", (req, next) => this.onApproval(req, next), { prepend: true });
-		this.ctx.inject(["apiProxy"], (inner) => {
-			const proxy = inner.get("apiProxy");
-			if (proxy === void 0) return;
-			const original = proxy.sessions.selectModel;
-			proxy.sessions.selectModel = (request) => this.afterHostSelect(request, original.call(proxy.sessions, request));
-			inner.effect(() => () => {
-				proxy.sessions.selectModel = original;
-			}, "happy-bridge: restore sessions.selectModel");
-		});
 		this.ctx.inject(["userQuestions"], (inner) => {
 			const questions = inner.userQuestions;
 			const original = questions.ask;
@@ -3719,27 +3714,20 @@ var HappyBridge = class {
 		this.syncHostSelection(agent, next);
 	}
 	/**
-	* Write the web picker's Host selection (`session.selectModel`) so the
-	* composer model seat reloads without a click on the computer.
+	* Write the web picker's Host selection (`sessionController.selectModel`) so
+	* the composer model seat reloads without a click on the computer.
 	*/
 	async syncHostSelection(agent, next) {
-		const proxy = this.ctx.get("apiProxy");
-		if (proxy === void 0) return;
+		const controller = this.ctx.get("sessionController");
+		if (controller === void 0) return;
 		this.hostSelectFromPhone += 1;
 		try {
-			const response = await proxy.sessions.selectModel({
-				rpcId: `happy-model-${String(Date.now())}`,
-				payload: {
-					sessionId: agent.id,
-					provider: next.provider,
-					model: next.model,
-					...next.reasoningEffort === void 0 ? {} : { reasoningEffort: next.reasoningEffort }
-				}
+			await controller.selectModel({
+				sessionId: agent.id,
+				provider: next.provider,
+				model: next.model,
+				...next.reasoningEffort === void 0 ? {} : { reasoningEffort: next.reasoningEffort }
 			});
-			if (!response.result.ok) {
-				this.log(`电脑模型栏未同步：${response.result.error.message}`);
-				return;
-			}
 			const link = this.links.get(agent.id);
 			if (link !== void 0 && !link.parked) this.pushMetadata(link);
 		} catch (error) {
@@ -3752,26 +3740,21 @@ var HappyBridge = class {
 	* After the web picker (or any Host caller) lands a selection, publish it
 	* to Happy. Phone-originated calls set {@link hostSelectFromPhone} and push themselves.
 	*/
-	async afterHostSelect(request, pending) {
-		const response = await pending;
-		if (this.hostSelectFromPhone) return response;
-		if (!response.result.ok) return response;
-		const { sessionId, provider, model, reasoningEffort } = request.payload;
-		const id = String(sessionId);
+	onHostModelSelected(sessionId, selection) {
+		if (this.hostSelectFromPhone) return;
 		const next = {
-			provider,
-			model,
-			...reasoningEffort === void 0 ? {} : { reasoningEffort: ReasoningEffortId(reasoningEffort) }
+			provider: selection.provider,
+			model: selection.model,
+			...selection.reasoningEffort === void 0 ? {} : { reasoningEffort: ReasoningEffortId(selection.reasoningEffort) }
 		};
-		this.models.set(id, next);
-		const link = this.links.get(id);
+		this.models.set(sessionId, next);
+		const link = this.links.get(sessionId);
 		const agent = link?.agent;
 		if (agent !== void 0) {
-			const selection = this.selections.get(agent);
-			if (selection !== void 0) selection.current = next;
+			const current = this.selections.get(agent);
+			if (current !== void 0) current.current = next;
 		}
 		if (link !== void 0 && !link.parked) this.pushMetadata(link);
-		return response;
 	}
 	/**
 	* Put a concrete reasoningEffort on a phone-spawned / phone-woken agent
@@ -3964,6 +3947,8 @@ var HappyBridge = class {
 		if (link.alwaysAllow.has(req.toolName)) return "allowed-once";
 		if (!grantAtLeast(this.config.remoteGrant, "approve")) return next();
 		const id = req.callId;
+		const controller = new AbortController();
+		req.signal = req.signal === void 0 ? controller.signal : AbortSignal.any([req.signal, controller.signal]);
 		this.startTool(link, id, req.toolName, req.reason === void 0 ? {} : { reason: req.reason });
 		const phone = new Promise((resolve) => {
 			link.pendingHuman = {
@@ -3974,13 +3959,18 @@ var HappyBridge = class {
 			};
 		});
 		this.pushRequests(link);
-		const winner = await Promise.race([phone.then((outcome) => ({
-			src: "phone",
+		const web = next().then((outcome) => ({
+			src: "web",
 			outcome
-		})), next().then((outcome) => ({
+		}), () => ({
 			src: "web",
+			outcome: "cancelled"
+		}));
+		const winner = await Promise.race([phone.then((outcome) => ({
+			src: "phone",
 			outcome
-		}))]);
+		})), web]);
+		if (winner.src === "phone") controller.abort();
 		if (winner.src === "web" && link.pendingHuman?.kind === "approval" && link.pendingHuman.id === id) {
 			delete link.pendingHuman;
 			this.clearRequest(link, id, winner.outcome === "allowed-once" ? "approved" : "canceled");

package/lib/types/bridge.d.ts

@@ -169,15 +169,15 @@ export declare class HappyBridge {
     /** Keep the last Host pick so Happy metadata can echo the web composer. */
     private rememberModel;
     /**
-     * Write the web picker's Host selection (`session.selectModel`) so the
-     * composer model seat reloads without a click on the computer.
+     * Write the web picker's Host selection (`sessionController.selectModel`) so
+     * the composer model seat reloads without a click on the computer.
      */
     private syncHostSelection;
     /**
      * After the web picker (or any Host caller) lands a selection, publish it
      * to Happy. Phone-originated calls set {@link hostSelectFromPhone} and push themselves.
      */
-    private afterHostSelect;
+    private onHostModelSelected;
     /**
      * Put a concrete reasoningEffort on a phone-spawned / phone-woken agent
      * before the first LLM request, matching the effort Happy metadata advertises.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjhmars/happy-bridge",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Pair an already-running dsh web/desktop client with Happy App so the phone remote-controls the same harness sessions",
   "type": "module",
   "main": "lib/index.js",