flawed-avatar 0.2.1 → 0.2.2

package/src/main/gateway-client.ts

@@ -1,7 +1,23 @@
 import WebSocket from "ws";
 import { randomUUID } from "node:crypto";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { fileURLToPath } from "node:url";
 import { GATEWAY_RECONNECT_BASE_MS, GATEWAY_RECONNECT_MAX_MS } from "../shared/config.js";
 import type { AgentState } from "../shared/types.js";
+import type { DeviceIdentity } from "./device-identity.js";
+import { loadStoredAuthToken, buildAuthPayload, signPayload, publicKeyToBase64Url } from "./device-identity.js";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const PKG_VERSION: string = (() => {
+	try {
+		const raw = fs.readFileSync(path.resolve(__dirname, "..", "..", "..", "package.json"), "utf-8");
+		return (JSON.parse(raw) as { version: string }).version;
+	} catch {
+		return "0.0.0";
+	}
+})();
 
 const PROTOCOL_VERSION = 3;
 
@@ -40,6 +56,7 @@ export function createGatewayClient(
 	onModelSwitch: (vrmPath: string) => void,
 	agentConfigs?: Record<string, { vrmPath?: string }>,
 	authToken?: string,
+	deviceIdentity?: DeviceIdentity | null,
 ): { destroy: () => void; sendChat: (text: string, sessionKey: string | null) => void; getCurrentAgentId: () => string | null } {
 	let ws: WebSocket | null = null;
 	let destroyed = false;
@@ -60,7 +77,6 @@ export function createGatewayClient(
 
 		// Track session changes - agent events contain the actual sessionKey
 		if (sessionKey && sessionKey !== currentSessionKey) {
-			console.log("flawed-avatar: setting currentSessionKey from agent event:", sessionKey);
 			currentSessionKey = sessionKey;
 			if (agentConfigs?.[sessionKey]?.vrmPath) {
 				onModelSwitch(agentConfigs[sessionKey].vrmPath!);
@@ -124,7 +140,6 @@ export function createGatewayClient(
 							const firstSession = sessions[0];
 							if (firstSession.key) {
 								currentSessionKey = firstSession.key;
-								console.log("flawed-avatar: auto-detected session from sessions.list:", currentSessionKey, "displayName:", firstSession.displayName);
 							}
 						}
 					}
@@ -139,14 +154,12 @@ export function createGatewayClient(
 							const agentId = firstAgent.id ?? "main";
 							const sessionKey = `agent:${agentId}:main`;
 							currentSessionKey = sessionKey;
-							console.log("flawed-avatar: fallback to agent main session:", currentSessionKey);
 						}
 					}
 
 					// Connect success - request active sessions once
 					if (connectSent && !connectionSetupDone && !sessionsListRequestId && !agentsListRequestId) {
 						connectionSetupDone = true;
-						console.log("flawed-avatar: gateway connected successfully");
 						backoffMs = GATEWAY_RECONNECT_BASE_MS;
 						// Request recently active sessions
 						requestSessionsList();
@@ -176,6 +189,36 @@ export function createGatewayClient(
 			connectTimer = null;
 		}
 
+		const role = "operator";
+		const scopes = ["operator.admin"];
+		const storedToken = deviceIdentity ? loadStoredAuthToken(deviceIdentity.deviceId, role) : null;
+		const effectiveToken = storedToken ?? authToken ?? undefined;
+		const auth = effectiveToken ? { token: effectiveToken } : undefined;
+
+		const nonce = connectNonce ?? undefined;
+		const signedAtMs = Date.now();
+		const device = (() => {
+			if (!deviceIdentity) return undefined;
+			const payload = buildAuthPayload({
+				deviceId: deviceIdentity.deviceId,
+				clientId: "gateway-client",
+				clientMode: "backend",
+				role,
+				scopes,
+				signedAtMs,
+				token: effectiveToken ?? null,
+				nonce,
+			});
+			const signature = signPayload(deviceIdentity.privateKeyPem, payload);
+			return {
+				id: deviceIdentity.deviceId,
+				publicKey: publicKeyToBase64Url(deviceIdentity.publicKeyPem),
+				signature,
+				signedAt: signedAtMs,
+				nonce,
+			};
+		})();
+
 		const frame = {
 			type: "req",
 			id: randomUUID(),
@@ -186,14 +229,15 @@ export function createGatewayClient(
 				client: {
 					id: "gateway-client",
 					displayName: "Flawed Avatar",
-					version: "0.1.0",
+					version: PKG_VERSION,
 					platform: process.platform,
 					mode: "backend",
 				},
 				caps: [],
-				role: "operator",
-				scopes: ["operator.admin"],
-				auth: authToken ? { token: authToken } : {},
+				role,
+				scopes,
+				auth,
+				device,
 			},
 		};
 
@@ -223,7 +267,6 @@ export function createGatewayClient(
 				limit: 10,
 			},
 		};
-		console.log("flawed-avatar: requesting sessions list");
 		ws.send(JSON.stringify(frame));
 	}
 
@@ -236,7 +279,6 @@ export function createGatewayClient(
 			method: "agents.list",
 			params: {},
 		};
-		console.log("flawed-avatar: requesting agents list (fallback)");
 		ws.send(JSON.stringify(frame));
 	}
 
@@ -246,7 +288,6 @@ export function createGatewayClient(
 		ws = new WebSocket(gatewayUrl, { maxPayload: 25 * 1024 * 1024 });
 
 		ws.on("open", () => {
-			console.log("flawed-avatar: ws open, sending connect frame");
 			queueConnect();
 		});
 

package/src/main/main.ts

@@ -7,6 +7,7 @@ import { createWindowManager } from "./window-manager.js";
 import { createTray } from "./tray.js";
 import { createStdinListener, type StdinCommand } from "./stdin-listener.js";
 import { createGatewayClient } from "./gateway-client.js";
+import { loadDeviceIdentity } from "./device-identity.js";
 import { IPC } from "../shared/ipc-channels.js";
 import { GATEWAY_URL_DEFAULT, CHAT_INPUT_MAX_LENGTH } from "../shared/config.js";
 import { getVrmModelPath, saveVrmModelPath } from "./persistence/index.js";
@@ -77,7 +78,7 @@ app.whenReady().then(() => {
 	createTray(wm);
 
 	// Return VRM model path (CLI override > persisted > default)
-	const defaultVrmPath = path.join(__dirname, "..", "..", "..", "assets", "models", "default-avatar.vrm");
+	const defaultVrmPath = path.join(__dirname, "..", "..", "..", "assets", "models", "CaptainLobster.vrm");
 	ipcMain.handle(IPC.GET_VRM_PATH, () => {
 		if (cliVrmPath) return cliVrmPath;
 		const persisted = getVrmModelPath();
@@ -133,25 +134,23 @@ app.whenReady().then(() => {
 	// Connect to gateway WebSocket for agent event streaming
 	const gatewayUrl = cliGatewayUrl ?? GATEWAY_URL_DEFAULT;
 	const authToken = resolveAuthToken();
-	console.log(`flawed-avatar: connecting to ${gatewayUrl} (auth=${authToken ? "token" : "none"})`);
+	const deviceIdentity = loadDeviceIdentity();
+	console.log(`flawed-avatar: connecting to ${gatewayUrl} (auth=${authToken ? "token" : "none"}, device=${deviceIdentity ? deviceIdentity.deviceId.slice(0, 8) + "…" : "none"})`);
 	const gw = createGatewayClient(
 		gatewayUrl,
 		(state) => wm.sendAgentState(state),
 		(vrmPath) => wm.sendToAvatar(IPC.VRM_MODEL_CHANGED, vrmPath),
 		agentConfigs,
 		authToken,
+		deviceIdentity,
 	);
 
 	// IPC: send chat message to active agent
 	ipcMain.on(IPC.SEND_CHAT, (_event, text: unknown) => {
-		console.log("flawed-avatar: SEND_CHAT received:", text);
 		if (typeof text !== "string" || text.trim().length === 0 || text.length > CHAT_INPUT_MAX_LENGTH) {
-			console.log("flawed-avatar: SEND_CHAT rejected (validation failed)");
 			return;
 		}
 		const agentId = gw.getCurrentAgentId();
-		console.log("flawed-avatar: current agentId:", agentId);
-		console.log("flawed-avatar: sending chat to gateway");
 		gw.sendChat(text.trim(), agentId);
 	});
 

package/src/renderer/audio/index.ts

@@ -26,9 +26,6 @@ export {
 export { createWebSpeechTTSService } from "./web-speech-tts.js";
 export { createKokoroTTSService, disposeKokoroLoader } from "./kokoro-tts-service.js";
 
-// Backwards compatibility alias
-export { createWebSpeechTTSService as createTTSService } from "./web-speech-tts.js";
-
 // Factory
 export { createTTSServiceFactory, createTTSServiceWithFallback, type TTSServiceFactory } from "./tts-service-factory.js";
 

package/src/renderer/audio/kokoro-model-loader.ts

@@ -44,7 +44,6 @@ function createModelLoader(): KokoroModelLoader {
 			throw new Error("Model loader has been disposed");
 		}
 
-		console.log("[Kokoro] Loading model...");
 		loading = true;
 
 		try {
@@ -57,7 +56,6 @@ function createModelLoader(): KokoroModelLoader {
 				{ dtype: "q8" }
 			);
 
-			console.log("[Kokoro] Model loaded successfully");
 			model = tts as unknown as KokoroTTS;
 			loading = false;
 			return model;

package/src/renderer/audio/kokoro-tts-service.ts

@@ -166,8 +166,6 @@ export function createKokoroTTSService(events: TTSEvents): TTSService {
 				return;
 			}
 
-			console.log(`[Kokoro] Generating: "${segment.text.slice(0, 40)}..." (ready=${readyAudio.length}, pending=${pendingSegments.length})`);
-
 			const result = await model.generate(segment.text, { voice: currentVoice });
 
 			if (disposed || segment.cancelled) {

package/src/renderer/audio/tts-controller.ts

@@ -132,7 +132,6 @@ export function createTTSController(
 			}
 			wlipSync = analyzer;
 			player.setAnalysisNode(analyzer.node);
-			console.log("[TTS] wLipSync analyzer initialized");
 		}).catch((err) => {
 			console.warn("[TTS] Failed to initialize wLipSync:", err);
 		}).finally(() => {
@@ -271,8 +270,6 @@ export function createTTSController(
 		setEngine(engine: TTSEngineType): void {
 			if (disposed || engine === currentEngine) return;
 
-			console.log(`[TTS] Switching engine from ${currentEngine} to ${engine}`);
-
 			// Cancel and dispose current service
 			if (ttsService) {
 				ttsService.cancel();

package/src/renderer/avatar/ibl-enhancer.ts

@@ -68,7 +68,7 @@ export function createIBLEnhancer(): IBLEnhancer {
 		if (!(mat as any).isShaderMaterial && !(mat as any).isMeshStandardMaterial) return;
 		if ((mat as any).__iblEnhanced) return; // Guard: already enhanced
 
-		// Chain onBeforeCompile (RISK 3 fix: preserve MToon's original)
+		// Chain onBeforeCompile — preserve MToon's existing hook
 		const prev = mat.onBeforeCompile;
 		mat.onBeforeCompile = (shader, renderer) => {
 			prev?.call(mat, shader, renderer);

package/src/renderer/chat-window/chat-index.html

@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8" />
   <meta http-equiv="Content-Security-Policy" content="default-src 'self' file: data: blob:; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' file: data: blob:; connect-src 'self' file: data: blob:" />
-  <title>OpenClaw Chat</title>
+  <title>Flawed Avatar Chat</title>
   <link rel="stylesheet" href="./styles/chat.css" />
 </head>
 <body>

package/src/renderer/renderer.ts

@@ -122,7 +122,6 @@ async function boot(): Promise<void> {
 	const ttsEnabled = await bridge.getTtsEnabled();
 	const ttsEngine = await bridge.getTtsEngine();
 	const ttsVoice = await bridge.getTtsVoice();
-	console.log("[TTS] Initializing with:", { ttsEnabled, ttsEngine, ttsVoice });
 	ttsController = createTTSController(animator.getLipSync(), {
 		enabled: ttsEnabled,
 		engine: ttsEngine || "web-speech",

package/src/renderer/settings-window/settings-index.html

@@ -6,7 +6,7 @@
         content="default-src 'self' file: data: blob:; script-src 'self';
                  style-src 'self' 'unsafe-inline'; img-src 'self' file: data: blob:;
                  connect-src 'self' file: data: blob:" />
-  <title>OpenClaw Settings</title>
+  <title>Flawed Avatar Settings</title>
   <link rel="stylesheet" href="./styles/settings.css" />
 </head>
 <body>

package/src/renderer/ui/chat-bubble.ts

@@ -182,45 +182,6 @@ export function createChatBubble(
 		pruneHistory();
 	}
 
-	// --- Render empty state ---
-	function renderEmptyState(): HTMLElement {
-		const el = document.createElement("div");
-		el.className = "chat-empty";
-		el.innerHTML = `
-			<div class="chat-empty__icon" aria-hidden="true">💬</div>
-			<div class="chat-empty__title">No messages yet</div>
-			<div class="chat-empty__message">Start a conversation</div>
-		`;
-		return el;
-	}
-
-	// --- Render error state ---
-	function renderError(message: string): HTMLElement {
-		const el = document.createElement("div");
-		el.className = "chat-error";
-		el.setAttribute("role", "alert");
-		el.innerHTML = `
-			<svg class="chat-error__icon" viewBox="0 0 16 16" fill="currentColor" aria-hidden="true">
-				<circle cx="8" cy="8" r="7" fill="none" stroke="currentColor" stroke-width="1.5"/>
-				<path d="M8 4v5M8 11v1"/>
-			</svg>
-			<span class="chat-error__message">${message}</span>
-		`;
-		return el;
-	}
-
-	// --- Render loading skeleton ---
-	function renderLoadingSkeleton(): HTMLElement {
-		const el = document.createElement("div");
-		el.className = "chat-loading";
-		for (let i = 0; i < 3; i++) {
-			const skeleton = document.createElement("div");
-			skeleton.className = "skeleton message-skeleton";
-			el.appendChild(skeleton);
-		}
-		return el;
-	}
-
 	// --- Send message ---
 	function sendMessage(text: string): void {
 		bridge.sendChat(text);

package/src/service.ts

@@ -13,7 +13,7 @@ const RESTART_BASE_MS = 5_000;
 const RESTART_MAX_MS = 30_000;
 const RESTART_RESET_MS = 60_000;
 
-export function createAvatarOverlayService(api: OpenClawPluginApi) {
+export function createFlawedAvatarService(api: OpenClawPluginApi) {
 	let child: ChildProcess | null = null;
 	let stopped = false;
 	let restartBackoffMs = RESTART_BASE_MS;

package/src/renderer/audio/tts-service.ts

@@ -1,16 +0,0 @@
-/**
- * TTS Service - Re-exports for backwards compatibility.
- *
- * The implementation has been split into:
- * - types.ts: Interface definitions
- * - web-speech-tts.ts: Web Speech API implementation
- * - kokoro-tts-service.ts: Kokoro.js implementation
- * - tts-service-factory.ts: Factory for creating services
- */
-
-// Re-export types for backwards compatibility
-export type { TTSEvents, TTSService, TTSVoice, TTSEngineType, TTSControllerConfig } from "./types.js";
-export { TTS_ENGINES, KOKORO_VOICES, KOKORO_DEFAULT_VOICE } from "./types.js";
-
-// Re-export Web Speech implementation as default factory for backwards compatibility
-export { createWebSpeechTTSService as createTTSService } from "./web-speech-tts.js";