opencharm 0.4.0 → 0.6.0

package/README.md

@@ -20,6 +20,7 @@ npx opencharm
 | `opencharm pair <code>`                                                                               | Pair the charm showing that code; you choose its PIN (`--name <name>`)                                                                                                                                                                                                                                                                 |
 | `opencharm status`                                                                                    | What's running (charmd, each connected charm's build, the starter commit of the workspace; spec 015), then the paired charms and whether they are connected, locked or blocked                                                                                                                                                         |
 | `opencharm lock` / `unlock` / `revoke <charm>`                                                        | Lock it now; clear a block and unlock; forget it                                                                                                                                                                                                                                                                                       |
+| `opencharm replies on\|off`                                                                           | The desktop charm speaks its replies, or shows them as text, from the next one; a charm on a board always speaks. To keep it, set `"speakReplies": false` in `opencharm.json`                                                                                                                                                          |
 | `opencharm look`                                                                                      | Show the charm's look, or change it on every unlocked charm until charmd restarts (`--colour <colour>`, `--greeting <text>`, `--motion full\|calm`); to keep it, set `charm` in `opencharm.json`                                                                                                                                       |
 | `opencharm dev face <charm> <state> [text]` / `dev say <charm> <text>` / `dev ask <charm> <question>` | Show a face, speak, or ask a question (hold = yes, press = no) on a connected charm (testing)                                                                                                                                                                                                                                          |
 | `opencharm voice` / `voice install`                                                                   | The local voice's models (Parakeet listening, Supertonic speaking): whether they're here, and download them now (charmd does it on its first start otherwise)                                                                                                                                                                          |

package/dist/main.mjs

@@ -497,6 +497,11 @@ const unlock = z.object({
 	op: z.literal("unlock"),
 	pin: z.string().regex(/^\d{4,12}$/)
 });
+const typed = z.object({
+	type: z.literal("charm"),
+	op: z.literal("text"),
+	text: z.string().max(2e3).refine((text) => text.trim().length > 0, { message: "empty" })
+});
 const answer = z.object({
 	type: z.literal("charm"),
 	op: z.literal("answer"),
@@ -507,7 +512,8 @@ const serverHello = z.object({
 	type: z.literal("hello"),
 	transport: z.literal("websocket"),
 	session_id: z.string().min(1).max(128),
-	audio_params: audioParams
+	audio_params: audioParams,
+	features: z.object({ text: z.boolean().optional() }).optional()
 });
 const stt = z.object({
 	session_id: sessionId,
@@ -593,7 +599,8 @@ const CLIENT_SCHEMAS = {
 	listen,
 	abort,
 	"charm:unlock": unlock,
-	"charm:answer": answer
+	"charm:answer": answer,
+	"charm:text": typed
 };
 const SERVER_SCHEMAS = {
 	hello: serverHello,
@@ -828,6 +835,7 @@ const schema = z.object({
 	agent: agentSchema.default({ adapter: "fake" }),
 	turnTimeoutSeconds: z.number().int().min(5).max(600).default(60),
 	logTranscripts: z.boolean().default(false),
+	speakReplies: z.boolean().default(true),
 	charm: charmSchema.prefault({})
 }).strict();
 function defaultAdminSocket(statePath) {
@@ -961,7 +969,7 @@ function sendAdmin(socketPath, request) {
 }
 //#endregion
 //#region package.json
-var version = "0.4.0";
+var version = "0.6.0";
 function channelToCube(value) {
 	if (value < 48) return 0;
 	if (value < 115) return 1;
@@ -1225,6 +1233,19 @@ async function runAdminCommand(ctx, command, args, deps) {
 			await look(ctx, args, deps);
 			return;
 		}
+		if (command === "replies") {
+			const choice = firstPositional(args);
+			if (choice !== "on" && choice !== "off") {
+				fail$2(ctx, "Usage: opencharm replies on|off   (spoken, or text on the desktop charm)");
+				return;
+			}
+			await deps.send(deps.socket, {
+				cmd: "replies",
+				speak: choice === "on"
+			});
+			ctx.out.write(choice === "on" ? "Replies are spoken, from the next one.\n" : "Replies show as text on the desktop charm, from the next one (a charm on a board still speaks).\n");
+			return;
+		}
 		if (command === "status") {
 			const answer = statusSchema.safeParse(await deps.send(deps.socket, { cmd: "status" }));
 			if (!answer.success) {
@@ -1452,6 +1473,7 @@ function runHelp(ctx) {
     opencharm lock <charm>          lock a charm now
     opencharm unlock <charm>        clear a block and unlock
     opencharm revoke <charm>        forget a charm (it must pair again)
+    opencharm replies on|off        the desktop charm speaks its replies, or shows them as text
     opencharm look                  show or change the charm's look until charmd restarts   [--colour <c>] [--greeting <text>] [--motion full|calm]
     opencharm dev face <charm> <state> [text]   show a face (testing)
     opencharm dev say <charm> <text>            speak through it (testing)
@@ -1796,6 +1818,7 @@ async function serveMcp(input, output, deps) {
 }
 //#endregion
 //#region ../charmd/src/admin/admin-actions.ts
+const repliesInput = z.object({ speak: z.boolean() }).strict();
 const pairInput = z.object({
 	code: z.string().regex(/^\d{6}$/, "the code has 6 digits"),
 	pin: z.string().regex(/^\d{4,12}$/, "the PIN is 4 to 12 digits"),
@@ -1829,7 +1852,7 @@ function parseInput(schema, input) {
 	if (!result.success) throw new Error(result.error.issues.map((i) => i.message).join("; "));
 	return result.data;
 }
-function createAdminActions({ store, pairing, sessions, look, agentCanChangeLook, identity, starter, voice }) {
+function createAdminActions({ store, pairing, sessions, look, agentCanChangeLook, identity, starter, voice, replies }) {
 	function sessionsOf(charmId) {
 		return [...sessions()].filter((s) => s.charmId === charmId && s.state !== "closed");
 	}
@@ -1934,6 +1957,14 @@ function createAdminActions({ store, pairing, sessions, look, agentCanChangeLook
 				};
 			});
 		},
+		replies(input) {
+			return settled(() => {
+				const { speak } = parseInput(repliesInput, input);
+				if (!replies) throw new Error("This charmd can't change how replies are given.");
+				replies.speak = speak;
+				return { speak };
+			});
+		},
 		status() {
 			return {
 				charmd: identity ?? "unknown",
@@ -1967,7 +1998,8 @@ const COMMANDS = [
 	"devFace",
 	"devSay",
 	"devAsk",
-	"look"
+	"look",
+	"replies"
 ];
 function isCommand(value) {
 	return typeof value === "string" && COMMANDS.includes(value);
@@ -2248,7 +2280,8 @@ var Session = class {
 			sendAudio: (packet) => {
 				if (this.#state === "unlocked") this.#deps.outbound.sendAudio?.(packet);
 			},
-			ask: (text, options) => this.ask(text, options)
+			ask: (text, options) => this.ask(text, options),
+			kind: () => this.#build?.kind
 		});
 		return this.#turn;
 	}
@@ -2327,7 +2360,8 @@ var Session = class {
 			type: "hello",
 			transport: "websocket",
 			session_id: this.sessionId,
-			audio_params: AUDIO_DOWN
+			audio_params: AUDIO_DOWN,
+			...this.#build?.kind === "desktop" ? { features: { text: true } } : {}
 		});
 		const { token } = this.#deps;
 		if (token === void 0) {
@@ -2372,6 +2406,9 @@ var Session = class {
 			if (message.state === "start") turn.listenStart();
 			else if (message.state === "stop") turn.listenStop();
 		} else if (message.type === "abort") turn.abort();
+		else if (message.type === "charm" && message.op === "text") {
+			if (this.#build?.kind === "desktop") turn.typed(message.text);
+		}
 	}
 	async #onUnlock(pin) {
 		if (this.#state === "unlocked") {
@@ -3220,6 +3257,10 @@ var SentenceSplitter = class {
 	#buffer = "";
 	#pending = "";
 	#started = false;
+	#firstClause;
+	constructor(options = {}) {
+		this.#firstClause = options.firstClause ?? true;
+	}
 	#take(piece) {
 		const text = piece.replace(/\s+/g, " ").trim();
 		if (!text) return [];
@@ -3234,7 +3275,7 @@ var SentenceSplitter = class {
 		this.#buffer += chunk;
 		const out = [];
 		let start = 0;
-		for (const match of this.#buffer.matchAll(this.#started ? BOUNDARY : FIRST_BOUNDARY)) {
+		for (const match of this.#buffer.matchAll(this.#started || !this.#firstClause ? BOUNDARY : FIRST_BOUNDARY)) {
 			const end = match.index + match[0].length;
 			if (/^[,;:]/.test(match[0]) && (this.#started || this.#pending.length + end - start < FIRST_CLAUSE_CHARS)) continue;
 			const lastWord = this.#buffer.slice(start, end).trim().split(/\s+/).at(-1)?.toLowerCase() ?? "";
@@ -3259,6 +3300,8 @@ function cleanForSpeech(text) {
 //#endregion
 //#region ../charmd/src/turn/turn.ts
 const MAX_FRAMES = 1e3;
+const READING_WORDS_PER_SECOND = 3;
+const MIN_READING_MS = 2e3;
 const LOOKAHEAD = 2;
 const AGENT_LABELS = { ...Object.fromEntries(Object.entries(ACP_AGENTS).map(([name, agent]) => [name, agent.label])) };
 var TurnTimeout = class extends Error {};
@@ -3269,6 +3312,10 @@ var StageError = class extends Error {
 		this.stage = stage;
 	}
 };
+function readingMs(text) {
+	const words = text.split(/\s+/).filter(Boolean).length;
+	return Math.max(MIN_READING_MS, words / READING_WORDS_PER_SECOND * 1e3);
+}
 function sleepMs(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -3356,9 +3403,13 @@ var TurnController = class {
 			this.#face("idle");
 			return Promise.resolve();
 		}
-		return this.#run(frames);
+		return this.#run({ frames });
 	}
-	async #run(frames) {
+	typed(text) {
+		if (this.busy) this.#cancel();
+		return this.#run({ text: text.trim() });
+	}
+	async #run(input) {
 		const generation = ++this.#generation;
 		const live = () => this.#generation === generation;
 		const controller = new AbortController();
@@ -3374,6 +3425,7 @@ var TurnController = class {
 		let timer = startClock();
 		let speakingStarted = false;
 		let asking = false;
+		let reading = false;
 		const restartClock = () => {
 			clearTimeout(timer);
 			timer = startClock();
@@ -3384,7 +3436,15 @@ var TurnController = class {
 				restartClock();
 			},
 			touch: () => {
-				if (speakingStarted && !asking) restartClock();
+				if (speakingStarted && !asking && !reading) restartClock();
+			},
+			pause: () => {
+				reading = true;
+				clearTimeout(timer);
+			},
+			resume: () => {
+				reading = false;
+				restartClock();
 			}
 		};
 		const timeoutGuard = new Promise((_, reject) => signal.addEventListener("abort", () => {
@@ -3394,14 +3454,17 @@ var TurnController = class {
 		this.#state = "thinking";
 		this.#face("thinking");
 		try {
-			const ogg = writeOggOpus(frames, { inputSampleRate: 16e3 });
-			heard = await Promise.race([inStage("stt", () => this.#deps.voice.transcribe(ogg, signal)), timeoutGuard]);
-			timings.sttMs = now() - started;
-			if (!live()) return;
-			this.#deps.send({
-				type: "stt",
-				text: heard
-			});
+			if ("text" in input) heard = input.text;
+			else {
+				const ogg = writeOggOpus(input.frames, { inputSampleRate: 16e3 });
+				heard = await Promise.race([inStage("stt", () => this.#deps.voice.transcribe(ogg, signal)), timeoutGuard]);
+				timings.sttMs = now() - started;
+				if (!live()) return;
+				this.#deps.send({
+					type: "stt",
+					text: heard
+				});
+			}
 			if (!heard) {
 				outcome = "nothing-heard";
 				this.#state = "idle";
@@ -3429,7 +3492,7 @@ var TurnController = class {
 				signal,
 				...ask ? { ask: (action) => this.ask(`${label} wants to ${action}.`) } : {}
 			});
-			said = await this.#speak(reply, signal, live, timings, started, timeoutGuard, guessLanguage(heard) ?? this.#deps.voice.language ?? "en", clock);
+			said = await this.#speak(reply, signal, live, timings, started, timeoutGuard, guessLanguage(heard) ?? this.#deps.voice.language ?? "en", clock, !("text" in input) && (this.#deps.speakAloud?.() ?? true));
 			if (!live()) return;
 			if (this.#speaking) this.#deps.send({
 				type: "tts",
@@ -3464,6 +3527,7 @@ var TurnController = class {
 				outcome: live() ? outcome : "cancelled",
 				...timings,
 				totalMs: now() - started,
+				..."text" in input ? { typed: true } : {},
 				...this.#deps.logTranscripts ? {
 					heard,
 					said: said.trim()
@@ -3471,7 +3535,7 @@ var TurnController = class {
 			});
 		}
 	}
-	async #speak(source, signal, live, timings, started, timeoutGuard, language, clock) {
+	async #speak(source, signal, live, timings, started, timeoutGuard, language, clock, aloud) {
 		const now = this.#deps.now ?? Date.now;
 		const going = () => live() && !signal.aborted;
 		let speaking = language;
@@ -3497,11 +3561,11 @@ var TurnController = class {
 				text,
 				language: sentenceLanguage
 			});
-			startUpTo(playing + LOOKAHEAD);
+			if (aloud) startUpTo(playing + LOOKAHEAD);
 			wake();
 		};
 		const produce = (async () => {
-			const splitter = new SentenceSplitter();
+			const splitter = new SentenceSplitter({ firstClause: aloud });
 			await inStage("agent", async () => {
 				for await (const chunk of source) {
 					if (!going()) return;
@@ -3524,6 +3588,11 @@ var TurnController = class {
 					await new Promise((resolve) => wake = resolve);
 					continue;
 				}
+				if (!aloud) {
+					await this.#showForReading(queue[playing].text, signal, going, clock, timings, started);
+					playing += 1;
+					continue;
+				}
 				startUpTo(playing + LOOKAHEAD);
 				const { text, packets } = queue[playing];
 				if (!packets) throw new Error("A sentence wasn't started");
@@ -3563,9 +3632,20 @@ var TurnController = class {
 			clearTimeout(timer);
 			timer = startClock();
 		};
+		let reading = false;
 		const clock = {
 			started: restartClock,
-			touch: restartClock
+			touch: () => {
+				if (!reading) restartClock();
+			},
+			pause: () => {
+				reading = true;
+				clearTimeout(timer);
+			},
+			resume: () => {
+				reading = false;
+				restartClock();
+			}
 		};
 		const timeoutGuard = new Promise((_, reject) => controller.signal.addEventListener("abort", () => {
 			if (controller.signal.reason instanceof TurnTimeout) reject(controller.signal.reason);
@@ -3575,7 +3655,7 @@ var TurnController = class {
 			yield await Promise.resolve(text);
 		}
 		try {
-			await this.#speak(once(), controller.signal, live, {}, Date.now(), timeoutGuard, guessLanguage(text) ?? this.#deps.voice.language ?? "en", clock);
+			await this.#speak(once(), controller.signal, live, {}, Date.now(), timeoutGuard, guessLanguage(text) ?? this.#deps.voice.language ?? "en", clock, this.#deps.speakAloud?.() ?? true);
 			if (!live()) return;
 			if (this.#speaking) this.#deps.send({
 				type: "tts",
@@ -3598,6 +3678,28 @@ var TurnController = class {
 			clearTimeout(timer);
 		}
 	}
+	async #showForReading(text, signal, going, clock, timings, started) {
+		if (!going()) return;
+		if (!this.#speaking) {
+			this.#speaking = true;
+			this.#state = "speaking";
+			timings.firstTextMs = (this.#deps.now ?? Date.now)() - started;
+			clock.started();
+			this.#deps.send({
+				type: "tts",
+				state: "start"
+			});
+		}
+		this.#deps.send({
+			type: "tts",
+			state: "sentence_start",
+			text
+		});
+		const sleep = this.#deps.sleep ?? sleepMs;
+		clock.pause();
+		await Promise.race([sleep(readingMs(text)), new Promise((resolve) => signal.addEventListener("abort", () => resolve(), { once: true }))]);
+		clock.resume();
+	}
 	#failureLine(error) {
 		if (error instanceof TurnTimeout) return "That took too long.";
 		if (error instanceof StageError && error.cause instanceof VoiceNotReady) return error.cause.message;
@@ -4670,6 +4772,7 @@ async function startDaemon(config, options = {}) {
 	});
 	const sessions = /* @__PURE__ */ new Map();
 	const voice = createVoiceFromConfig(config);
+	const replies = { speak: config.speakReplies };
 	voice.warm?.().catch(() => void 0);
 	const log = options.log ?? ((entry) => {
 		if (!options.quiet) console.log(JSON.stringify({
@@ -4691,6 +4794,7 @@ async function startDaemon(config, options = {}) {
 		agentCanChangeLook,
 		identity: options.identity,
 		starter: options.starter,
+		replies,
 		voice: () => {
 			const downloading = ["parakeet", "supertonic"].flatMap((id) => {
 				const state = modelState(id);
@@ -4749,7 +4853,8 @@ async function startDaemon(config, options = {}) {
 				agent,
 				timeoutMs: config.turnTimeoutSeconds * 1e3,
 				logTranscripts: config.logTranscripts,
-				log
+				log,
+				speakAloud: () => io.kind() !== "desktop" || replies.speak
 			})
 		});
 		sessions.set(session.connectionId, session);
@@ -4831,7 +4936,7 @@ function formatIdentity(unit, version, commit) {
 let cached;
 function identity() {
 	if (cached) return cached;
-	const commit = "42da0c7";
+	const commit = "cb4cbce";
 	cached = {
 		version: `cli@${version}`,
 		commit,
@@ -5311,6 +5416,7 @@ async function main(argv) {
 		case "status":
 		case "dev":
 		case "look":
+		case "replies":
 			await runAdminCommand(ctx, command, rest, {
 				socket: loadConfig(flagValue(rest, "--config")).adminSocket,
 				send: sendAdmin,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencharm",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "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": {

package/sim/charm_sim.js

@@ -1,2 +1,2 @@
-async function createCharm(moduleArg={}){var Module=moduleArg;var ENVIRONMENT_IS_WEB=true;var ENVIRONMENT_IS_WORKER=false;var programArgs=[];var thisProgram="./this.program";var _scriptName=import.meta.url;var scriptDirectory="";function locateFile(path){if(Module["locateFile"]){return Module["locateFile"](path,scriptDirectory)}return scriptDirectory+path}var readAsync,readBinary;if(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER){try{scriptDirectory=new URL(".",_scriptName).href}catch{}{readAsync=async url=>{var response=await fetch(url,{credentials:"same-origin"});if(response.ok){return response.arrayBuffer()}throw new Error(response.status+" : "+response.url)}}}else{}var out=console.log.bind(console);var err=console.error.bind(console);var wasmBinary;var ABORT=false;class EmscriptenEH{}class EmscriptenSjLj extends EmscriptenEH{}var runtimeInitialized=false;function getMemoryBuffer(){return wasmMemory.buffer}function updateMemoryViews(){if(HEAP8?.buffer?.resizable)return;var b=getMemoryBuffer();HEAP8=new Int8Array(b);Module["HEAP16"]=HEAP16=new Int16Array(b);Module["HEAPU8"]=HEAPU8=new Uint8Array(b);Module["HEAP32"]=HEAP32=new Int32Array(b);HEAPU32=new Uint32Array(b);Module["HEAPF32"]=HEAPF32=new Float32Array(b)}function preRun(){var preRun=Module["preRun"];if(preRun){if(typeof preRun=="function")preRun=[preRun];onPreRuns.push(...preRun)}callRuntimeCallbacks(onPreRuns)}function initRuntime(){runtimeInitialized=true;wasmExports["r"]()}function postRun(){var postRun=Module["postRun"];if(postRun){if(typeof postRun=="function")postRun=[postRun];onPostRuns.push(...postRun)}callRuntimeCallbacks(onPostRuns)}function abort(what){Module["onAbort"]?.(what);what=`Aborted(${what})`;err(what);ABORT=true;what+=". Build with -sASSERTIONS for more info.";var e=new WebAssembly.RuntimeError(what);throw e}var wasmBinaryFile;function findWasmBinary(){if(Module["locateFile"]){return locateFile("charm_sim.wasm")}return new URL("charm_sim.wasm",import.meta.url).href}function getBinarySync(file){if(readBinary){return readBinary(file)}throw"both async and sync fetching of the wasm failed"}async function getWasmBinary(binaryFile){if(!wasmBinary){try{var response=await readAsync(binaryFile);return new Uint8Array(response)}catch{}}return getBinarySync(binaryFile)}async function instantiateArrayBuffer(binaryFile,imports){try{var binary=await getWasmBinary(binaryFile);var instance=await WebAssembly.instantiate(binary,imports);return instance}catch(reason){err(`failed to asynchronously prepare wasm: ${reason}`);abort(reason)}}async function instantiateAsync(binary,binaryFile,imports){if(!binary){try{var response=fetch(binaryFile,{credentials:"same-origin"});var instantiationResult=await WebAssembly.instantiateStreaming(response,imports);return instantiationResult}catch(reason){err(`wasm streaming compile failed: ${reason}`);err("falling back to ArrayBuffer instantiation")}}return instantiateArrayBuffer(binaryFile,imports)}function getWasmImports(){var imports={a:wasmImports};return imports}async function createWasm(){function receiveInstance(instance){wasmExports=instance.exports;assignWasmExports(wasmExports);updateMemoryViews();return wasmExports}function receiveInstantiationResult(result){return receiveInstance(result["instance"])}var info=getWasmImports();var instantiateWasm=Module["instantiateWasm"];if(instantiateWasm){return new Promise(resolve=>{instantiateWasm(info,inst=>resolve(receiveInstance(inst)))})}wasmBinaryFile??=findWasmBinary();var result=await instantiateAsync(wasmBinary,wasmBinaryFile,info);var exports=receiveInstantiationResult(result);return exports}class ExitStatus{name="ExitStatus";constructor(status){this.message=`Program terminated with exit(${status})`;this.status=status}}var HEAP8;var callRuntimeCallbacks=callbacks=>{while(callbacks.length>0){callbacks.shift()(Module)}};var onPostRuns=[];var onPreRuns=[];var noExitRuntime=true;var HEAPU32;class ExceptionInfo{constructor(excPtr){this.excPtr=excPtr;this.ptr=excPtr-24}set_type(type){HEAPU32[this.ptr+4>>2]=type}get_type(){return HEAPU32[this.ptr+4>>2]}set_destructor(destructor){HEAPU32[this.ptr+8>>2]=destructor}get_destructor(){return HEAPU32[this.ptr+8>>2]}set_caught(caught){caught=caught?1:0;HEAP8[this.ptr+12]=caught}get_caught(){return HEAP8[this.ptr+12]!=0}set_rethrown(rethrown){rethrown=rethrown?1:0;HEAP8[this.ptr+13]=rethrown}get_rethrown(){return HEAP8[this.ptr+13]!=0}init(type,destructor){this.set_adjusted_ptr(0);this.set_type(type);this.set_destructor(destructor)}set_adjusted_ptr(adjustedPtr){HEAPU32[this.ptr+16>>2]=adjustedPtr}get_adjusted_ptr(){return HEAPU32[this.ptr+16>>2]}}var uncaughtExceptionCount=0;var __Unwind_RaiseException=ex=>{abort()};var ___cxa_throw=(ptr,type,destructor)=>{var info=new ExceptionInfo(ptr);info.init(type,destructor);uncaughtExceptionCount++;__Unwind_RaiseException(ptr)};var __abort_js=()=>abort("");var getHeapMax=()=>2147483648;var alignMemory=(size,alignment)=>Math.ceil(size/alignment)*alignment;var growMemory=size=>{var oldHeapSize=wasmMemory.buffer.byteLength;var pages=(size-oldHeapSize+65535)/65536|0;try{wasmMemory.grow(pages);updateMemoryViews();return 1}catch(e){}};var HEAPU8;var _emscripten_resize_heap=requestedSize=>{var oldSize=HEAPU8.length;requestedSize>>>=0;var maxHeapSize=getHeapMax();if(requestedSize>maxHeapSize){return false}for(var cutDown=1;cutDown<=4;cutDown*=2){var overGrownHeapSize=oldSize*(1+.2/cutDown);overGrownHeapSize=Math.min(overGrownHeapSize,requestedSize+100663296);var newSize=Math.min(maxHeapSize,alignMemory(Math.max(requestedSize,overGrownHeapSize),65536));var replacement=growMemory(newSize);if(replacement){return true}}return false};var _fd_close=fd=>52;var printCharBuffers=[null,[],[]];var UTF8Decoder=globalThis.TextDecoder&&new TextDecoder;var findStringEnd=(heapOrArray,idx,maxBytesToRead,ignoreNul)=>{var maxIdx=idx+maxBytesToRead;if(ignoreNul)return maxIdx;while(heapOrArray[idx]&&!(idx>=maxIdx))++idx;return idx};var UTF8ArrayToString=(heapOrArray,idx=0,maxBytesToRead,ignoreNul)=>{var endPtr=findStringEnd(heapOrArray,idx,maxBytesToRead,ignoreNul);if(endPtr-idx>16&&heapOrArray.buffer&&UTF8Decoder){return UTF8Decoder.decode(heapOrArray.subarray(idx,endPtr))}var str="";while(idx<endPtr){var u0=heapOrArray[idx++];if(!(u0&128)){str+=String.fromCharCode(u0);continue}var u1=heapOrArray[idx++]&63;if((u0&224)==192){str+=String.fromCharCode((u0&31)<<6|u1);continue}var u2=heapOrArray[idx++]&63;if((u0&240)==224){u0=(u0&15)<<12|u1<<6|u2}else{u0=(u0&7)<<18|u1<<12|u2<<6|heapOrArray[idx++]&63}if(u0<65536){str+=String.fromCharCode(u0)}else{var ch=u0-65536;str+=String.fromCharCode(55296|ch>>10,56320|ch&1023)}}return str};var printChar=(stream,curr)=>{var buffer=printCharBuffers[stream];if(!curr||curr===10){(stream===1?out:err)(UTF8ArrayToString(buffer));buffer.length=0}else{buffer.push(curr)}};var UTF8ToString=(ptr,maxBytesToRead,ignoreNul)=>ptr?UTF8ArrayToString(HEAPU8,ptr,maxBytesToRead,ignoreNul):"";var _fd_write=(fd,iov,iovcnt,pnum)=>{var num=0;for(var i=0;i<iovcnt;i++){var ptr=HEAPU32[iov>>2];var len=HEAPU32[iov+4>>2];iov+=8;for(var j=0;j<len;j++){printChar(fd,HEAPU8[ptr+j])}num+=len}HEAPU32[pnum>>2]=num;return 0};var HEAPF32;var HEAP16;var HEAP32;var stringToUTF8Array=(str,heap,outIdx,maxBytesToWrite)=>{if(!(maxBytesToWrite>0))return 0;var startIdx=outIdx;var endIdx=outIdx+maxBytesToWrite-1;for(var i=0;i<str.length;++i){var u=str.codePointAt(i);if(u<=127){if(outIdx>=endIdx)break;heap[outIdx++]=u}else if(u<=2047){if(outIdx+1>=endIdx)break;heap[outIdx++]=192|u>>6;heap[outIdx++]=128|u&63}else if(u<=65535){if(outIdx+2>=endIdx)break;heap[outIdx++]=224|u>>12;heap[outIdx++]=128|u>>6&63;heap[outIdx++]=128|u&63}else{if(outIdx+3>=endIdx)break;heap[outIdx++]=240|u>>18;heap[outIdx++]=128|u>>12&63;heap[outIdx++]=128|u>>6&63;heap[outIdx++]=128|u&63;i++}}heap[outIdx]=0;return outIdx-startIdx};var stringToUTF8=(str,outPtr,maxBytesToWrite)=>stringToUTF8Array(str,HEAPU8,outPtr,maxBytesToWrite);var lengthBytesUTF8=str=>{var len=0;for(var i=0;i<str.length;++i){var c=str.charCodeAt(i);if(c<=127){len++}else if(c<=2047){len+=2}else if(c>=55296&&c<=57343){len+=4;++i}else{len+=3}}return len};{if(Module["noExitRuntime"])noExitRuntime=Module["noExitRuntime"];if(Module["print"])out=Module["print"];if(Module["printErr"])err=Module["printErr"];if(Module["arguments"])programArgs=Module["arguments"];if(Module["thisProgram"])thisProgram=Module["thisProgram"];var preInit=Module["preInit"];if(preInit){if(typeof preInit=="function")Module["preInit"]=preInit=[preInit];while(preInit.length>0){preInit.shift()()}}}Module["UTF8ToString"]=UTF8ToString;Module["stringToUTF8"]=stringToUTF8;Module["lengthBytesUTF8"]=lengthBytesUTF8;function js_panel(open){charmSim.panel(!!open)}function js_send_text(json){charmSim.sendText(UTF8ToString(json))}function js_send_binary(data,size){charmSim.sendBinary(HEAPU8.slice(data,data+size))}function js_mic(on){charmSim.mic(!!on)}function js_play_pcm(pcm,samples){charmSim.playPcm(HEAPF32.slice(pcm>>2,(pcm>>2)+samples))}function js_stop_audio(){charmSim.stopAudio()}function js_brightness(percent){charmSim.brightness(percent)}function js_store_get(key){var value=localStorage.getItem("opencharm."+UTF8ToString(key));if(value===null)return 0;var size=lengthBytesUTF8(value)+1;var ptr=_malloc(size);stringToUTF8(value,ptr,size);return ptr}function js_store_set(key,value){localStorage.setItem("opencharm."+UTF8ToString(key),UTF8ToString(value))}function js_store_erase(key){localStorage.removeItem("opencharm."+UTF8ToString(key))}function js_reconnect(){charmSim.reconnect()}var _sim_set_build,_sim_commit,_sim_init,_sim_frame,_sim_pin_key,_sim_frame_box,_sim_frame_dirty,_sim_tick,_sim_pointer,_sim_key,_sim_connected,_sim_disconnected,_sim_text,_sim_audio,_sim_mic_pcm,_sim_token,_sim_forget,_free,_malloc,memory,__indirect_function_table,wasmMemory;function assignWasmExports(wasmExports){_sim_set_build=Module["_sim_set_build"]=wasmExports["s"];_sim_commit=Module["_sim_commit"]=wasmExports["t"];_sim_init=Module["_sim_init"]=wasmExports["u"];_sim_frame=Module["_sim_frame"]=wasmExports["v"];_sim_pin_key=Module["_sim_pin_key"]=wasmExports["w"];_sim_frame_box=Module["_sim_frame_box"]=wasmExports["x"];_sim_frame_dirty=Module["_sim_frame_dirty"]=wasmExports["y"];_sim_tick=Module["_sim_tick"]=wasmExports["z"];_sim_pointer=Module["_sim_pointer"]=wasmExports["A"];_sim_key=Module["_sim_key"]=wasmExports["B"];_sim_connected=Module["_sim_connected"]=wasmExports["C"];_sim_disconnected=Module["_sim_disconnected"]=wasmExports["D"];_sim_text=Module["_sim_text"]=wasmExports["E"];_sim_audio=Module["_sim_audio"]=wasmExports["F"];_sim_mic_pcm=Module["_sim_mic_pcm"]=wasmExports["G"];_sim_token=Module["_sim_token"]=wasmExports["H"];_sim_forget=Module["_sim_forget"]=wasmExports["I"];_free=Module["_free"]=wasmExports["J"];_malloc=Module["_malloc"]=wasmExports["K"];memory=wasmMemory=wasmExports["q"];__indirect_function_table=wasmExports["__indirect_function_table"]}var wasmImports={o:___cxa_throw,l:__abort_js,j:_emscripten_resize_heap,k:_fd_close,b:_fd_write,e:js_brightness,a:js_mic,p:js_panel,g:js_play_pcm,m:js_reconnect,h:js_send_binary,i:js_send_text,f:js_stop_audio,n:js_store_erase,d:js_store_get,c:js_store_set};async function run(){preRun();var setStatus=Module["setStatus"];if(setStatus){setStatus("Running...");await new Promise(resolve=>setTimeout(resolve,1));setTimeout(setStatus,1,"")}if(ABORT)return;initRuntime();Module["onRuntimeInitialized"]?.();postRun()}var wasmExports;wasmExports=await createWasm();await run();
+async function createCharm(moduleArg={}){var Module=moduleArg;var ENVIRONMENT_IS_WEB=true;var ENVIRONMENT_IS_WORKER=false;var programArgs=[];var thisProgram="./this.program";var _scriptName=import.meta.url;var scriptDirectory="";function locateFile(path){if(Module["locateFile"]){return Module["locateFile"](path,scriptDirectory)}return scriptDirectory+path}var readAsync,readBinary;if(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER){try{scriptDirectory=new URL(".",_scriptName).href}catch{}{readAsync=async url=>{var response=await fetch(url,{credentials:"same-origin"});if(response.ok){return response.arrayBuffer()}throw new Error(response.status+" : "+response.url)}}}else{}var out=console.log.bind(console);var err=console.error.bind(console);var wasmBinary;var ABORT=false;class EmscriptenEH{}class EmscriptenSjLj extends EmscriptenEH{}var runtimeInitialized=false;function getMemoryBuffer(){return wasmMemory.buffer}function updateMemoryViews(){if(HEAP8?.buffer?.resizable)return;var b=getMemoryBuffer();HEAP8=new Int8Array(b);Module["HEAP16"]=HEAP16=new Int16Array(b);Module["HEAPU8"]=HEAPU8=new Uint8Array(b);Module["HEAP32"]=HEAP32=new Int32Array(b);HEAPU32=new Uint32Array(b);Module["HEAPF32"]=HEAPF32=new Float32Array(b)}function preRun(){var preRun=Module["preRun"];if(preRun){if(typeof preRun=="function")preRun=[preRun];onPreRuns.push(...preRun)}callRuntimeCallbacks(onPreRuns)}function initRuntime(){runtimeInitialized=true;wasmExports["r"]()}function postRun(){var postRun=Module["postRun"];if(postRun){if(typeof postRun=="function")postRun=[postRun];onPostRuns.push(...postRun)}callRuntimeCallbacks(onPostRuns)}function abort(what){Module["onAbort"]?.(what);what=`Aborted(${what})`;err(what);ABORT=true;what+=". Build with -sASSERTIONS for more info.";var e=new WebAssembly.RuntimeError(what);throw e}var wasmBinaryFile;function findWasmBinary(){if(Module["locateFile"]){return locateFile("charm_sim.wasm")}return new URL("charm_sim.wasm",import.meta.url).href}function getBinarySync(file){if(readBinary){return readBinary(file)}throw"both async and sync fetching of the wasm failed"}async function getWasmBinary(binaryFile){if(!wasmBinary){try{var response=await readAsync(binaryFile);return new Uint8Array(response)}catch{}}return getBinarySync(binaryFile)}async function instantiateArrayBuffer(binaryFile,imports){try{var binary=await getWasmBinary(binaryFile);var instance=await WebAssembly.instantiate(binary,imports);return instance}catch(reason){err(`failed to asynchronously prepare wasm: ${reason}`);abort(reason)}}async function instantiateAsync(binary,binaryFile,imports){if(!binary){try{var response=fetch(binaryFile,{credentials:"same-origin"});var instantiationResult=await WebAssembly.instantiateStreaming(response,imports);return instantiationResult}catch(reason){err(`wasm streaming compile failed: ${reason}`);err("falling back to ArrayBuffer instantiation")}}return instantiateArrayBuffer(binaryFile,imports)}function getWasmImports(){var imports={a:wasmImports};return imports}async function createWasm(){function receiveInstance(instance){wasmExports=instance.exports;assignWasmExports(wasmExports);updateMemoryViews();return wasmExports}function receiveInstantiationResult(result){return receiveInstance(result["instance"])}var info=getWasmImports();var instantiateWasm=Module["instantiateWasm"];if(instantiateWasm){return new Promise(resolve=>{instantiateWasm(info,inst=>resolve(receiveInstance(inst)))})}wasmBinaryFile??=findWasmBinary();var result=await instantiateAsync(wasmBinary,wasmBinaryFile,info);var exports=receiveInstantiationResult(result);return exports}class ExitStatus{name="ExitStatus";constructor(status){this.message=`Program terminated with exit(${status})`;this.status=status}}var HEAP8;var callRuntimeCallbacks=callbacks=>{while(callbacks.length>0){callbacks.shift()(Module)}};var onPostRuns=[];var onPreRuns=[];var noExitRuntime=true;var HEAPU32;class ExceptionInfo{constructor(excPtr){this.excPtr=excPtr;this.ptr=excPtr-24}set_type(type){HEAPU32[this.ptr+4>>2]=type}get_type(){return HEAPU32[this.ptr+4>>2]}set_destructor(destructor){HEAPU32[this.ptr+8>>2]=destructor}get_destructor(){return HEAPU32[this.ptr+8>>2]}set_caught(caught){caught=caught?1:0;HEAP8[this.ptr+12]=caught}get_caught(){return HEAP8[this.ptr+12]!=0}set_rethrown(rethrown){rethrown=rethrown?1:0;HEAP8[this.ptr+13]=rethrown}get_rethrown(){return HEAP8[this.ptr+13]!=0}init(type,destructor){this.set_adjusted_ptr(0);this.set_type(type);this.set_destructor(destructor)}set_adjusted_ptr(adjustedPtr){HEAPU32[this.ptr+16>>2]=adjustedPtr}get_adjusted_ptr(){return HEAPU32[this.ptr+16>>2]}}var uncaughtExceptionCount=0;var __Unwind_RaiseException=ex=>{abort()};var ___cxa_throw=(ptr,type,destructor)=>{var info=new ExceptionInfo(ptr);info.init(type,destructor);uncaughtExceptionCount++;__Unwind_RaiseException(ptr)};var __abort_js=()=>abort("");var getHeapMax=()=>2147483648;var alignMemory=(size,alignment)=>Math.ceil(size/alignment)*alignment;var growMemory=size=>{var oldHeapSize=wasmMemory.buffer.byteLength;var pages=(size-oldHeapSize+65535)/65536|0;try{wasmMemory.grow(pages);updateMemoryViews();return 1}catch(e){}};var HEAPU8;var _emscripten_resize_heap=requestedSize=>{var oldSize=HEAPU8.length;requestedSize>>>=0;var maxHeapSize=getHeapMax();if(requestedSize>maxHeapSize){return false}for(var cutDown=1;cutDown<=4;cutDown*=2){var overGrownHeapSize=oldSize*(1+.2/cutDown);overGrownHeapSize=Math.min(overGrownHeapSize,requestedSize+100663296);var newSize=Math.min(maxHeapSize,alignMemory(Math.max(requestedSize,overGrownHeapSize),65536));var replacement=growMemory(newSize);if(replacement){return true}}return false};var _fd_close=fd=>52;var printCharBuffers=[null,[],[]];var UTF8Decoder=globalThis.TextDecoder&&new TextDecoder;var findStringEnd=(heapOrArray,idx,maxBytesToRead,ignoreNul)=>{var maxIdx=idx+maxBytesToRead;if(ignoreNul)return maxIdx;while(heapOrArray[idx]&&!(idx>=maxIdx))++idx;return idx};var UTF8ArrayToString=(heapOrArray,idx=0,maxBytesToRead,ignoreNul)=>{var endPtr=findStringEnd(heapOrArray,idx,maxBytesToRead,ignoreNul);if(endPtr-idx>16&&heapOrArray.buffer&&UTF8Decoder){return UTF8Decoder.decode(heapOrArray.subarray(idx,endPtr))}var str="";while(idx<endPtr){var u0=heapOrArray[idx++];if(!(u0&128)){str+=String.fromCharCode(u0);continue}var u1=heapOrArray[idx++]&63;if((u0&224)==192){str+=String.fromCharCode((u0&31)<<6|u1);continue}var u2=heapOrArray[idx++]&63;if((u0&240)==224){u0=(u0&15)<<12|u1<<6|u2}else{u0=(u0&7)<<18|u1<<12|u2<<6|heapOrArray[idx++]&63}if(u0<65536){str+=String.fromCharCode(u0)}else{var ch=u0-65536;str+=String.fromCharCode(55296|ch>>10,56320|ch&1023)}}return str};var printChar=(stream,curr)=>{var buffer=printCharBuffers[stream];if(!curr||curr===10){(stream===1?out:err)(UTF8ArrayToString(buffer));buffer.length=0}else{buffer.push(curr)}};var UTF8ToString=(ptr,maxBytesToRead,ignoreNul)=>ptr?UTF8ArrayToString(HEAPU8,ptr,maxBytesToRead,ignoreNul):"";var _fd_write=(fd,iov,iovcnt,pnum)=>{var num=0;for(var i=0;i<iovcnt;i++){var ptr=HEAPU32[iov>>2];var len=HEAPU32[iov+4>>2];iov+=8;for(var j=0;j<len;j++){printChar(fd,HEAPU8[ptr+j])}num+=len}HEAPU32[pnum>>2]=num;return 0};var HEAPF32;var HEAP16;var HEAP32;var stringToUTF8Array=(str,heap,outIdx,maxBytesToWrite)=>{if(!(maxBytesToWrite>0))return 0;var startIdx=outIdx;var endIdx=outIdx+maxBytesToWrite-1;for(var i=0;i<str.length;++i){var u=str.codePointAt(i);if(u<=127){if(outIdx>=endIdx)break;heap[outIdx++]=u}else if(u<=2047){if(outIdx+1>=endIdx)break;heap[outIdx++]=192|u>>6;heap[outIdx++]=128|u&63}else if(u<=65535){if(outIdx+2>=endIdx)break;heap[outIdx++]=224|u>>12;heap[outIdx++]=128|u>>6&63;heap[outIdx++]=128|u&63}else{if(outIdx+3>=endIdx)break;heap[outIdx++]=240|u>>18;heap[outIdx++]=128|u>>12&63;heap[outIdx++]=128|u>>6&63;heap[outIdx++]=128|u&63;i++}}heap[outIdx]=0;return outIdx-startIdx};var stringToUTF8=(str,outPtr,maxBytesToWrite)=>stringToUTF8Array(str,HEAPU8,outPtr,maxBytesToWrite);var lengthBytesUTF8=str=>{var len=0;for(var i=0;i<str.length;++i){var c=str.charCodeAt(i);if(c<=127){len++}else if(c<=2047){len+=2}else if(c>=55296&&c<=57343){len+=4;++i}else{len+=3}}return len};{if(Module["noExitRuntime"])noExitRuntime=Module["noExitRuntime"];if(Module["print"])out=Module["print"];if(Module["printErr"])err=Module["printErr"];if(Module["arguments"])programArgs=Module["arguments"];if(Module["thisProgram"])thisProgram=Module["thisProgram"];var preInit=Module["preInit"];if(preInit){if(typeof preInit=="function")Module["preInit"]=preInit=[preInit];while(preInit.length>0){preInit.shift()()}}}Module["UTF8ToString"]=UTF8ToString;Module["stringToUTF8"]=stringToUTF8;Module["lengthBytesUTF8"]=lengthBytesUTF8;function js_panel(open){charmSim.panel(!!open)}function js_send_text(json){charmSim.sendText(UTF8ToString(json))}function js_send_binary(data,size){charmSim.sendBinary(HEAPU8.slice(data,data+size))}function js_mic(on){charmSim.mic(!!on)}function js_play_pcm(pcm,samples){charmSim.playPcm(HEAPF32.slice(pcm>>2,(pcm>>2)+samples))}function js_stop_audio(){charmSim.stopAudio()}function js_brightness(percent){charmSim.brightness(percent)}function js_store_get(key){var value=localStorage.getItem("opencharm."+UTF8ToString(key));if(value===null)return 0;var size=lengthBytesUTF8(value)+1;var ptr=_malloc(size);stringToUTF8(value,ptr,size);return ptr}function js_store_set(key,value){localStorage.setItem("opencharm."+UTF8ToString(key),UTF8ToString(value))}function js_store_erase(key){localStorage.removeItem("opencharm."+UTF8ToString(key))}function js_reconnect(){charmSim.reconnect()}var _sim_set_build,_sim_commit,_sim_init,_sim_frame,_sim_pin_key,_sim_frame_box,_sim_frame_dirty,_sim_tick,_sim_pointer,_sim_key,_sim_connected,_sim_disconnected,_sim_text,_sim_type,_sim_audio,_sim_mic_pcm,_sim_token,_sim_forget,_free,_malloc,memory,__indirect_function_table,wasmMemory;function assignWasmExports(wasmExports){_sim_set_build=Module["_sim_set_build"]=wasmExports["s"];_sim_commit=Module["_sim_commit"]=wasmExports["t"];_sim_init=Module["_sim_init"]=wasmExports["u"];_sim_frame=Module["_sim_frame"]=wasmExports["v"];_sim_pin_key=Module["_sim_pin_key"]=wasmExports["w"];_sim_frame_box=Module["_sim_frame_box"]=wasmExports["x"];_sim_frame_dirty=Module["_sim_frame_dirty"]=wasmExports["y"];_sim_tick=Module["_sim_tick"]=wasmExports["z"];_sim_pointer=Module["_sim_pointer"]=wasmExports["A"];_sim_key=Module["_sim_key"]=wasmExports["B"];_sim_connected=Module["_sim_connected"]=wasmExports["C"];_sim_disconnected=Module["_sim_disconnected"]=wasmExports["D"];_sim_text=Module["_sim_text"]=wasmExports["E"];_sim_type=Module["_sim_type"]=wasmExports["F"];_sim_audio=Module["_sim_audio"]=wasmExports["G"];_sim_mic_pcm=Module["_sim_mic_pcm"]=wasmExports["H"];_sim_token=Module["_sim_token"]=wasmExports["I"];_sim_forget=Module["_sim_forget"]=wasmExports["J"];_free=Module["_free"]=wasmExports["K"];_malloc=Module["_malloc"]=wasmExports["L"];memory=wasmMemory=wasmExports["q"];__indirect_function_table=wasmExports["__indirect_function_table"]}var wasmImports={o:___cxa_throw,l:__abort_js,j:_emscripten_resize_heap,k:_fd_close,b:_fd_write,e:js_brightness,a:js_mic,p:js_panel,g:js_play_pcm,m:js_reconnect,h:js_send_binary,i:js_send_text,f:js_stop_audio,n:js_store_erase,d:js_store_get,c:js_store_set};async function run(){preRun();var setStatus=Module["setStatus"];if(setStatus){setStatus("Running...");await new Promise(resolve=>setTimeout(resolve,1));setTimeout(setStatus,1,"")}if(ABORT)return;initRuntime();Module["onRuntimeInitialized"]?.();postRun()}var wasmExports;wasmExports=await createWasm();await run();
 ;return Module}export default createCharm;

package/sim/sim.js

@@ -109,6 +109,14 @@ window.charmSim = {
     M._sim_forget();
     ws?.close();
   },
+  // Typed text from the desktop charm's field (spec 013): "sent", "busy" (a question or a talk), or
+  // "unsupported" (an older charmd).
+  type: (text) => {
+    let result = 0;
+    withString(text, (ptr) => (result = M._sim_type(ptr)));
+    wake();
+    return ["busy", "sent", "unsupported"][result] ?? "busy";
+  },
   // A PIN key from a keyboard or the desktop app ("0"…"9", "<", "OK").
   pinKey: (key) => {
     withString(key, (ptr) => M._sim_pin_key(ptr));
@@ -291,15 +299,22 @@ function key(down) {
   wake();
 }
 
+// Keys typed into a text field (the desktop charm's typing field) are text, not the charm's key or PIN.
+const typingInto = (e) =>
+  e.target instanceof HTMLElement &&
+  (e.target.isContentEditable ||
+    e.target.tagName === "INPUT" ||
+    e.target.tagName === "TEXTAREA");
+
 let spaceDown = false;
 addEventListener("keydown", (e) => {
-  if (e.code !== "Space" || e.repeat || spaceDown) return;
+  if (e.code !== "Space" || e.repeat || spaceDown || typingInto(e)) return;
   e.preventDefault();
   spaceDown = true;
   key(true);
 });
 addEventListener("keyup", (e) => {
-  if (e.code !== "Space") return;
+  if (e.code !== "Space" || !spaceDown) return;
   e.preventDefault();
   spaceDown = false;
   key(false);
@@ -349,6 +364,7 @@ document.getElementById("shape").addEventListener("click", () => {
 
 // The PIN can be typed on the keyboard too (the notch has no room for a pad).
 addEventListener("keydown", (e) => {
+  if (typingInto(e)) return;
   const key = /^[0-9]$/.test(e.key)
     ? e.key
     : e.key === "Backspace"