@sjhmars/happy-bridge 0.3.4 → 0.3.6

package/lib/client.js

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

package/lib/index.js

@@ -303,11 +303,12 @@ async function buildSessionMetadata(ctx, source, machineId, title, selection, _g
 			resume: false,
 			rpcMethods: [
 				"permission",
+				"communication",
 				"killSession",
 				"abort"
 			],
 			shell: false,
-			steering: false
+			steering: true
 		},
 		currentOperatingModeCode: currentPreset === "custom" ? operatingModes[0]?.code ?? "workspace-write" : currentPreset,
 		...selected === void 0 ? {} : {
@@ -3788,7 +3789,8 @@ var HappyBridge = class {
 		const effort = messageEffort(meta);
 		const permissionMode = meta.permissionMode;
 		const publishedModel = this.lastPublished.get(agent.id)?.model;
-		if (model !== void 0 && publishedModel !== void 0 && sameCatalogPick({ model: publishedModel }, { model })) {} else if (model !== void 0) {
+		const modelIsEcho = model !== void 0 && publishedModel !== void 0 && sameCatalogPick({ model: publishedModel }, { model });
+		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") {
@@ -3953,6 +3955,9 @@ var HappyBridge = class {
 	* Queue the phone text as a user followup. The App already shows the typed
 	* bubble; do not send a second user envelope. Images ride as DSH
 	* attachments; other files land under `happy-inbox` for Harness `read`.
+	* A turn that is still running gets the text as steering (`agent.steer`),
+	* matching the `steering: true` capability we advertise — otherwise the
+	* App unlocks the composer only to have the message wait a whole turn.
 	*/
 	async followup(link, agent, text, files) {
 		const blocks = [];
@@ -3977,10 +3982,12 @@ var HappyBridge = class {
 		if (blocks.length === 0) return;
 		link.skipNextUser += 1;
 		link.agent = agent;
-		agent.followup(createUserMessage({
+		const message = createUserMessage({
 			content: blocks,
 			source: { kind: "user" }
-		}));
+		});
+		if (agent.status === "running" && link.pendingHuman === void 0) agent.steer(message);
+		else agent.followup(message);
 	}
 	/**
 	* Claim every download started before this text, wait, keep the successes.
@@ -4266,7 +4273,10 @@ var HappyBridge = class {
 	onPermission(dshId, rpc) {
 		const link = this.links.get(dshId);
 		const pending = link?.pendingHuman;
-		if (link === void 0 || pending === void 0 || pending.id !== rpc.id) return;
+		if (link === void 0 || pending === void 0 || pending.id !== rpc.id) {
+			this.log(`收到无法匹配的审批答复 id=${rpc.id}（旧卡片，或另一个实例抢走了本会话的 RPC）`);
+			return;
+		}
 		if (pending.kind === "approval") {
 			if (rpc.approved) {
 				if (rpc.decision === "approved_for_session") link.alwaysAllow.add(pending.toolName);
@@ -4314,8 +4324,10 @@ var HappyBridge = class {
 	onCommunication(dshId, rpc) {
 		const link = this.links.get(dshId);
 		const pending = link?.pendingHuman;
-		if (link === void 0 || pending === void 0 || pending.kind !== "ask") return;
-		if (pending.id !== rpc.id || pending.communication === void 0) return;
+		if (link === void 0 || pending === void 0 || pending.kind !== "ask" || pending.id !== rpc.id || pending.communication === void 0) {
+			this.log(`收到无法匹配的表单答复 id=${rpc.id}（旧卡片，或另一个实例抢走了本会话的 RPC）`);
+			return;
+		}
 		if (rpc.status !== "answered" || rpc.answers === void 0) {
 			pending.deferred ??= {};
 			this.completeCommunication(link, rpc.id, pending.communication, "cancelled");

package/lib/types/bridge.d.ts

@@ -188,6 +188,9 @@ export declare class HappyBridge {
      * Queue the phone text as a user followup. The App already shows the typed
      * bubble; do not send a second user envelope. Images ride as DSH
      * attachments; other files land under `happy-inbox` for Harness `read`.
+     * A turn that is still running gets the text as steering (`agent.steer`),
+     * matching the `steering: true` capability we advertise — otherwise the
+     * App unlocks the composer only to have the message wait a whole turn.
      */
     private followup;
     /**

package/lib/types/catalogs.d.ts

@@ -92,7 +92,8 @@ export interface SessionMetadata {
         resume: false;
         rpcMethods: string[];
         shell: false;
-        steering: false;
+        /** True: mid-turn phone text steers the running turn (`agent.steer`). */
+        steering: boolean;
     };
     tools?: string[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjhmars/happy-bridge",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "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",
@@ -121,6 +121,6 @@
   "scripts": {
     "build": "tsc -p tsconfig.json && tsdown -c tsdown.config.ts",
     "typecheck": "tsc -p tsconfig.json --noEmit",
-    "test": "node --experimental-strip-types --test tests/*.test.ts"
+    "test": "node --experimental-strip-types --experimental-test-isolation=none --import ./tests/peer-stubs/register.mjs --test tests/*.test.ts"
   }
 }