opencharm 0.7.1 → 0.8.1

package/dist/main.mjs

@@ -406,6 +406,25 @@ const ACP_AGENTS = {
 };
 const ACP_AGENT_NAMES = Object.keys(ACP_AGENTS);
 //#endregion
+//#region ../design/src/own-colour.ts
+const OWN_COLOUR = /^#[0-9A-Fa-f]{6}$/;
+function linear(v) {
+	return v <= .04045 ? v / 12.92 : ((v + .055) / 1.055) ** 2.4;
+}
+function ownColourProblem(hex) {
+	const [r, g, b] = [
+		1,
+		3,
+		5
+	].map((at) => Number.parseInt(hex.slice(at, at + 2), 16) / 255);
+	if (.2126 * linear(r) + .7152 * linear(g) + .0722 * linear(b) < .05) return "too dark to see on black";
+	const max = Math.max(r, g, b);
+	const spread = max - Math.min(r, g, b);
+	if (max !== r || max < .5 || spread / max < .5) return void 0;
+	const hue = 60 * (g - b) / spread;
+	return hue >= 6 && hue <= 40 ? "too close to the orange that means 'it needs you'" : void 0;
+}
+//#endregion
 //#region ../protocol/src/constants.ts
 const AUDIO_DOWN = {
 	format: "opus",
@@ -629,22 +648,7 @@ const MAX_NAME_CHARS = 12;
 const MAX_NAME_BYTES = 24;
 const MAX_GREETING_BYTES = 40;
 const COLOUR_IDS = facesData.colours.map((colour) => colour.id);
-const OWN_COLOUR = /^#[0-9A-Fa-f]{6}$/;
 const lookName = z.string().min(1, "the name can't be empty").refine((name) => [...name].length <= MAX_NAME_CHARS && utf8Length(name) <= MAX_NAME_BYTES, { message: `at most ${MAX_NAME_CHARS} characters` });
-function ownColourProblem(hex) {
-	const [r, g, b] = [
-		1,
-		3,
-		5
-	].map((at) => Number.parseInt(hex.slice(at, at + 2), 16) / 255);
-	const linear = (v) => v <= .04045 ? v / 12.92 : ((v + .055) / 1.055) ** 2.4;
-	if (.2126 * linear(r) + .7152 * linear(g) + .0722 * linear(b) < .05) return "too dark to see on black";
-	const max = Math.max(r, g, b);
-	const spread = max - Math.min(r, g, b);
-	if (max !== r || max < .5 || spread / max < .5) return void 0;
-	const hue = 60 * (g - b) / spread;
-	return hue >= 6 && hue <= 40 ? "too close to the orange that means 'it needs you'" : void 0;
-}
 const colour = z.string().superRefine((value, context) => {
 	if (COLOUR_IDS.includes(value)) return;
 	const problem = OWN_COLOUR.test(value) ? ownColourProblem(value) : `the colour is one of ${COLOUR_IDS.join(", ")}, or your own as #RRGGBB`;
@@ -993,7 +997,7 @@ function sendAdmin(socketPath, request) {
 }
 //#endregion
 //#region package.json
-var version = "0.7.1";
+var version = "0.8.1";
 function channelToCube(value) {
 	if (value < 48) return 0;
 	if (value < 115) return 1;
@@ -3410,6 +3414,7 @@ var TurnController = class {
 		this.#frames = [];
 		this.#face("listening");
 		this.#deps.agent.warm?.(this.#deps.sessionKey);
+		if (this.#deps.speakAloud?.() ?? true) this.#deps.voice.prime?.();
 	}
 	audio(frame) {
 		if (this.#state === "listening" && this.#frames.length < MAX_FRAMES) this.#frames.push(frame);
@@ -4374,21 +4379,25 @@ function audioOf(frame) {
 function voiceFor(language, voices) {
 	return voices[language] ?? voices.en ?? DEFAULT_VOICES.en;
 }
-function connect(text, language, voices, signal, options) {
-	const timeoutMs = options.timeoutMs ?? 15e3;
+function openSocket(options) {
 	const connection = randomUUID().replace(/-/g, "");
 	const url = `${options.url ?? SERVICE_URL}?TrustedClientToken=${TRUSTED_CLIENT_TOKEN}&Sec-MS-GEC=${secMsGec()}&Sec-MS-GEC-Version=${GEC_VERSION}&ConnectionId=${connection}`;
-	const packets = createChannel();
-	const reader = new WebmOpusReader();
-	let sent = 0;
-	let settled = false;
-	const socket = new WebSocket(url, {
+	return new WebSocket(url, {
 		headers: {
 			"User-Agent": USER_AGENT,
 			Origin: ORIGIN
 		},
-		handshakeTimeout: timeoutMs
+		handshakeTimeout: options.timeoutMs ?? 15e3
 	});
+}
+function connect(text, language, voices, signal, options, ready) {
+	const timeoutMs = options.timeoutMs ?? 15e3;
+	const connection = randomUUID().replace(/-/g, "");
+	const packets = createChannel();
+	const reader = new WebmOpusReader();
+	let sent = 0;
+	let settled = false;
+	const socket = ready ?? openSocket(options);
 	const finish = (error) => {
 		if (settled) return;
 		settled = true;
@@ -4403,7 +4412,7 @@ function connect(text, language, voices, signal, options) {
 	const timer = setTimeout(() => finish(/* @__PURE__ */ new Error("Microsoft's voice took too long")), timeoutMs);
 	if (signal.aborted) onAbort();
 	else signal.addEventListener("abort", onAbort, { once: true });
-	socket.on("open", () => {
+	const request = () => {
 		socket.send(message("speech.config", "application/json; charset=utf-8", JSON.stringify({ context: { synthesis: { audio: {
 			metadataoptions: {
 				sentenceBoundaryEnabled: "false",
@@ -4412,7 +4421,9 @@ function connect(text, language, voices, signal, options) {
 			outputFormat: OUTPUT_FORMAT
 		} } } })));
 		socket.send(message("ssml", "application/ssml+xml", ssml(text, voiceFor(language, voices)), connection));
-	});
+	};
+	if (socket.readyState === WebSocket.OPEN) request();
+	else socket.once("open", request);
 	socket.on("message", (data, isBinary) => {
 		const frame = Buffer.isBuffer(data) ? data : Buffer.concat(data);
 		if (!isBinary) {
@@ -4440,9 +4451,48 @@ function createMicrosoftSpeaker(options = {}) {
 		...DEFAULT_VOICES,
 		...options.voices
 	};
-	const stream = (text, signal, language = "en") => connect(text, language, voices, signal, options);
+	const spareMs = options.spareMs ?? 2e4;
+	let spare;
+	const takeSpare = () => {
+		const taken = spare;
+		spare = void 0;
+		if (!taken) return void 0;
+		if ((taken.socket.readyState === WebSocket.OPEN || taken.socket.readyState === WebSocket.CONNECTING) && Date.now() < taken.until) return taken.socket;
+		taken.socket.terminate();
+	};
+	const prime = () => {
+		if (spare) return;
+		const socket = openSocket(options);
+		socket.on("error", () => void 0);
+		spare = {
+			socket,
+			until: Date.now() + spareMs
+		};
+		setTimeout(() => {
+			if (spare?.socket !== socket) return;
+			spare = void 0;
+			socket.terminate();
+		}, spareMs).unref();
+	};
+	async function* stream(text, signal, language = "en") {
+		const ready = takeSpare();
+		if (ready) {
+			let spoke = false;
+			try {
+				for await (const packet of connect(text, language, voices, signal, options, ready)) {
+					spoke = true;
+					yield packet;
+				}
+				return;
+			} catch (error) {
+				if (spoke || signal.aborted) throw error;
+			}
+		}
+		yield* connect(text, language, voices, signal, options);
+	}
 	return {
 		name: "microsoft",
+		prime,
 		stream,
 		async synthesize(text, signal, language = "en") {
 			const packets = [];
@@ -4687,6 +4737,9 @@ function speakWithFallback(chain, options = {}) {
 		},
 		warm: async () => {
 			await Promise.allSettled(chain.map((speaker) => speaker.warm?.() ?? Promise.resolve()));
+		},
+		prime: () => {
+			if ((resting.get(first) ?? 0) <= now()) first.prime?.();
 		}
 	};
 }
@@ -4746,7 +4799,8 @@ function createVoiceFromConfig(config) {
 		language: config.voice.language,
 		warm: async () => {
 			await Promise.allSettled([listener.warm?.(), speaker.warm?.()]);
-		}
+		},
+		...speaker.prime ? { prime: speaker.prime } : {}
 	};
 }
 function charmToolsServers(config, tools) {
@@ -4965,7 +5019,7 @@ function formatIdentity(unit, version, commit) {
 let cached;
 function identity() {
 	if (cached) return cached;
-	const commit = "de16e27";
+	const commit = "e06b6db";
 	cached = {
 		version: `cli@${version}`,
 		commit,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencharm",
-  "version": "0.7.1",
+  "version": "0.8.1",
   "description": "An open-source body for the AI agent you already run: a face, a voice, one key. Claude Code, Codex, Gemini CLI, Hermes, OpenClaw or any ACP or OpenAI-compatible agent; on a small board, your Mac's notch or the browser.",
   "type": "module",
   "bin": {