@sjhmars/happy-bridge 0.2.4 → 0.2.5

package/lib/client.js

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

package/lib/index.js

@@ -2548,17 +2548,23 @@ var HappySessionSocket = class {
 	}
 	/**
 	* Encrypt and push agentState (permission requests).
+	* Retries on version-mismatch the same way metadata does; a dropped bump
+	* leaves the App with empty `requests` and no Yes/No card.
 	* @param agentState - plaintext agentState.
 	*/
 	updateState(agentState) {
 		const socket = this.socket;
 		if (socket === void 0) return;
+		this.emitState(socket, agentState, this.agentStateVersion, 0);
+	}
+	emitState(socket, agentState, expected, attempt) {
 		socket.emit("update-state", {
 			sid: this.happySessionId,
 			agentState: encryptB64(this.crypto, agentState),
-			expectedVersion: this.agentStateVersion
+			expectedVersion: expected
 		}, (answer) => {
 			if (typeof answer?.version === "number") this.agentStateVersion = answer.version;
+			if (answer?.result === "version-mismatch" && attempt < 3 && typeof answer.version === "number") this.emitState(socket, agentState, answer.version, attempt + 1);
 		});
 	}
 	sendAgent(ev, time) {
@@ -3965,16 +3971,22 @@ var HappyBridge = class {
 		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 });
-		this.pushRequests(link);
+		const args = req.reason === void 0 ? {} : { reason: req.reason };
+		const card = happyTool(req.toolName, args);
+		let resolvePhone = () => {};
 		const phone = new Promise((resolve) => {
-			link.pendingHuman = {
-				kind: "approval",
-				id,
-				toolName: req.toolName,
-				resolve
-			};
+			resolvePhone = resolve;
 		});
+		link.pendingHuman = {
+			kind: "approval",
+			id,
+			toolName: req.toolName,
+			happyName: card.name,
+			arguments: card.args,
+			resolve: resolvePhone
+		};
+		this.pushRequests(link);
+		link.socket.keepAliveNow(true);
 		const web = next().then((outcome) => ({
 			src: "web",
 			outcome
@@ -3991,7 +4003,7 @@ var HappyBridge = class {
 			delete link.pendingHuman;
 			this.clearRequest(link, id, winner.outcome === "allowed-once" ? "approved" : "canceled");
 		}
-		if (this.running) link.socket.keepAliveNow(true);
+		if (link.agent?.status === "running") link.socket.keepAliveNow(true);
 		return winner.outcome;
 	}
 	onAsk(questions, original, request) {
@@ -4119,8 +4131,8 @@ var HappyBridge = class {
 		const requests = {};
 		if (pending !== void 0) {
 			if (pending.kind === "approval") requests[pending.id] = {
-				tool: pending.toolName,
-				arguments: {},
+				tool: pending.happyName,
+				arguments: pending.arguments,
 				createdAt: Date.now()
 			};
 			else if (pending.kind === "plan-review") requests[pending.id] = {

package/lib/types/session-socket.d.ts

@@ -141,9 +141,12 @@ export declare class HappySessionSocket {
     private emitMetadata;
     /**
      * Encrypt and push agentState (permission requests).
+     * Retries on version-mismatch the same way metadata does; a dropped bump
+     * leaves the App with empty `requests` and no Yes/No card.
      * @param agentState - plaintext agentState.
      */
     updateState(agentState: unknown): void;
+    private emitState;
     private sendAgent;
     private emitEnvelope;
     private onMetadataUpdate;

package/package.json

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