@markusylisiurunen/tau 0.3.72 → 0.3.74

package/dist/core/tool/speech_generate.js

@@ -0,0 +1,269 @@
+import { createReadStream } from "node:fs";
+import { link, open, readFile, rename, stat, writeFile } from "node:fs/promises";
+import { extname, join, resolve } from "node:path";
+import { z } from "zod";
+import { getElevenLabsApiKey } from "../config/schema.js";
+import { ToolCliError } from "./errors.js";
+import { mediaRequest, parseMediaArgs, prepareMediaOutput, readMediaResponse, requiredArg, } from "./media.js";
+const SAMPLE_RATE = 24000;
+const CHUNK_CHARACTERS = 2000;
+const MAX_WAV_BYTES = 0xffffffff - 36;
+const speechDocument = z.strictObject({
+    voices: z.record(z.string().min(1), z.string().trim().min(1)),
+    chunks: z
+        .array(z
+        .array(z.strictObject({
+        speaker: z.string().min(1),
+        text: z.string().refine((text) => text.trim().length > 0, "text must not be blank"),
+    }))
+        .min(1))
+        .min(1),
+});
+function parseSpeechBatches(value) {
+    const document = speechDocument.parse(value);
+    const batches = [];
+    const voices = new Set();
+    for (const [index, chunk] of document.chunks.entries()) {
+        const characters = chunk.reduce((sum, turn) => sum + Array.from(turn.text).length, 0);
+        if (characters > CHUNK_CHARACTERS) {
+            throw new ToolCliError(`chunk ${index + 1} has ${characters} characters; maximum ${CHUNK_CHARACTERS}`);
+        }
+        const inputs = chunk.map((turn) => {
+            const voice = Object.hasOwn(document.voices, turn.speaker)
+                ? document.voices[turn.speaker]
+                : undefined;
+            if (!voice) {
+                throw new ToolCliError(`chunk ${index + 1}: unknown speaker ${turn.speaker}`);
+            }
+            voices.add(voice);
+            return { voice_id: voice, text: turn.text };
+        });
+        const previous = batches.at(-1);
+        if (previous && previous.characters + characters <= CHUNK_CHARACTERS) {
+            previous.chunks.push(index + 1);
+            previous.inputs.push(...inputs);
+            previous.characters += characters;
+        }
+        else {
+            batches.push({ chunks: [index + 1], inputs, characters });
+        }
+    }
+    if (voices.size > 10) {
+        throw new ToolCliError("speech supports at most 10 distinct voices");
+    }
+    return batches;
+}
+export function printSpeechGenerateHelp(log = console.log) {
+    log([
+        "usage: tau tool speech-generate --model <eleven_v4_turbo|eleven_v4> --input <script.json> --output <audio.wav>",
+        "       tau tool speech-generate --list-voices",
+        "",
+        'input: {"voices":{"narrator":"VOICE_ID"},"chunks":[[{"speaker":"narrator","text":"Hello."}]]}',
+        "each chunk allows 2000 Unicode characters across its turns, including delivery tags.",
+        "whole chunks may share a request; no automatic text splitting or rewriting.",
+        "writes mono 24 kHz 16-bit PCM WAV and retains request batches in <output>.parts.",
+        "requires ELEVENLABS_API_KEY or apiKeys.elevenlabs; never overwrites or retries.",
+        "",
+        "documentation: https://github.com/markusylisiurunen/tau/blob/main/docs/speech-generation.md",
+    ].join("\n"));
+}
+async function listVoices(fetchImpl, apiKey, log) {
+    const seenTokens = new Set();
+    let token;
+    do {
+        const url = new URL("https://api.elevenlabs.io/v2/voices");
+        url.searchParams.set("page_size", "100");
+        if (token) {
+            url.searchParams.set("next_page_token", token);
+        }
+        const response = await mediaRequest(fetchImpl, url.href, { headers: { "xi-api-key": apiKey } });
+        const page = z
+            .object({
+            voices: z.array(z.object({ voice_id: z.string(), name: z.string() })),
+            has_more: z.boolean(),
+            next_page_token: z.string().nullable().optional(),
+        })
+            .parse(JSON.parse((await readMediaResponse(response, 8 * 1024 * 1024)).toString("utf8")));
+        for (const voice of page.voices) {
+            log(JSON.stringify(voice));
+        }
+        if (!page.has_more) {
+            return;
+        }
+        token = page.next_page_token ?? undefined;
+        if (!token || seenTokens.has(token)) {
+            throw new ToolCliError("provider returned invalid voice pagination");
+        }
+        seenTokens.add(token);
+    } while (token);
+}
+async function savePcm(response, path) {
+    const reader = response.body?.getReader();
+    if (!reader) {
+        throw new ToolCliError("provider returned no audio");
+    }
+    const file = await open(path, "wx", 0o600);
+    let bytes = 0;
+    try {
+        while (true) {
+            const { done, value } = await reader.read();
+            if (done) {
+                break;
+            }
+            bytes += value.length;
+            if (bytes > 128 * 1024 * 1024) {
+                throw new ToolCliError("speech batch exceeds 128 MiB");
+            }
+            await file.writeFile(value);
+        }
+        if (!bytes || bytes % 2) {
+            throw new ToolCliError("provider returned empty or unaligned PCM audio");
+        }
+    }
+    finally {
+        await file.close();
+        await reader.cancel();
+    }
+    return bytes;
+}
+export async function assembleSpeechWav(paths, output) {
+    const sizes = await Promise.all(paths.map(async (path) => (await stat(path)).size));
+    const bytes = sizes.reduce((sum, size) => sum + size, 0);
+    if (!paths.length || sizes.some((size) => !size || size % 2) || bytes > MAX_WAV_BYTES) {
+        throw new ToolCliError("PCM audio is empty, unaligned, or exceeds the WAV size limit");
+    }
+    const header = Buffer.alloc(44);
+    header.write("RIFF", 0);
+    header.writeUInt32LE(bytes + 36, 4);
+    header.write("WAVEfmt ", 8);
+    header.writeUInt32LE(16, 16);
+    header.writeUInt16LE(1, 20);
+    header.writeUInt16LE(1, 22);
+    header.writeUInt32LE(SAMPLE_RATE, 24);
+    header.writeUInt32LE(SAMPLE_RATE * 2, 28);
+    header.writeUInt16LE(2, 32);
+    header.writeUInt16LE(16, 34);
+    header.write("data", 36);
+    header.writeUInt32LE(bytes, 40);
+    const file = await open(output, "wx", 0o600);
+    try {
+        await file.writeFile(header);
+        for (const [index, path] of paths.entries()) {
+            let copied = 0;
+            for await (const chunk of createReadStream(path)) {
+                copied += chunk.length;
+                if (copied > sizes[index]) {
+                    throw new ToolCliError(`PCM file changed during assembly: ${path}`);
+                }
+                await file.writeFile(chunk);
+            }
+            if (copied !== sizes[index]) {
+                throw new ToolCliError(`PCM file changed during assembly: ${path}`);
+            }
+        }
+    }
+    finally {
+        await file.close();
+    }
+}
+export async function runSpeechGenerateCommand(argv, options) {
+    const args = parseMediaArgs(argv, {
+        help: { type: "boolean", short: "h" },
+        "list-voices": { type: "boolean" },
+        model: { type: "string" },
+        input: { type: "string" },
+        output: { type: "string" },
+    });
+    const log = options.stdout ?? console.log;
+    if (args.help) {
+        return printSpeechGenerateHelp(log);
+    }
+    if (args["list-voices"] && (args.model || args.input || args.output)) {
+        throw new ToolCliError("--list-voices cannot be combined with generation options");
+    }
+    const apiKey = getElevenLabsApiKey(options.config, options.env);
+    const fetchImpl = options.fetchImpl ?? fetch;
+    if (args["list-voices"]) {
+        if (!apiKey) {
+            throw new ToolCliError("missing ELEVENLABS_API_KEY or apiKeys.elevenlabs");
+        }
+        return listVoices(fetchImpl, apiKey, log);
+    }
+    const model = requiredArg(args.model, "model");
+    if (model !== "eleven_v4_turbo" && model !== "eleven_v4") {
+        throw new ToolCliError(`unsupported speech model: ${model}`);
+    }
+    const cwd = options.cwd ?? process.cwd();
+    const input = requiredArg(args.input, "input");
+    const output = requiredArg(args.output, "output");
+    if (extname(output).toLowerCase() !== ".wav") {
+        throw new ToolCliError("--output must have a .wav extension");
+    }
+    const batches = parseSpeechBatches(JSON.parse(await readFile(resolve(cwd, input), "utf8")));
+    if (!apiKey) {
+        throw new ToolCliError("missing ELEVENLABS_API_KEY or apiKeys.elevenlabs");
+    }
+    const destination = await prepareMediaOutput(output, cwd);
+    const manifest = {
+        model,
+        sampleRate: SAMPLE_RATE,
+        channels: 1,
+        bitsPerSample: 16,
+        output: destination.path,
+        batches: batches.map((batch, index) => ({
+            ...batch,
+            file: `batch-${String(index + 1).padStart(4, "0")}.pcm`,
+            completed: false,
+            bytes: 0,
+            requestId: null,
+            characterCost: null,
+        })),
+    };
+    const saveManifest = async () => {
+        const temporary = join(destination.parts, "manifest.json.tmp");
+        await writeFile(temporary, JSON.stringify(manifest, null, 2), { mode: 0o600 });
+        await rename(temporary, join(destination.parts, "manifest.json"));
+    };
+    try {
+        await saveManifest();
+        for (const [index, batch] of manifest.batches.entries()) {
+            const previousRequestIds = manifest.batches
+                .slice(Math.max(0, index - 3), index)
+                .map((previous) => {
+                if (!previous.requestId) {
+                    throw new ToolCliError("provider omitted request-id; cannot stitch the next speech batch");
+                }
+                return previous.requestId;
+            });
+            const response = await mediaRequest(fetchImpl, "https://api.elevenlabs.io/v1/text-to-dialogue?output_format=pcm_24000", {
+                method: "POST",
+                headers: { "xi-api-key": apiKey, "Content-Type": "application/json" },
+                body: JSON.stringify({
+                    model_id: model,
+                    inputs: batch.inputs,
+                    ...(previousRequestIds.length ? { previous_request_ids: previousRequestIds } : {}),
+                }),
+            });
+            batch.requestId = response.headers.get("request-id");
+            batch.characterCost = response.headers.get("character-cost");
+            await saveManifest();
+            const path = join(destination.parts, batch.file);
+            batch.bytes = await savePcm(response, `${path}.partial`);
+            await rename(`${path}.partial`, path);
+            batch.completed = true;
+            await saveManifest();
+        }
+        const artifact = join(destination.parts, "assembled.wav");
+        await assembleSpeechWav(manifest.batches.map((batch) => join(destination.parts, batch.file)), artifact);
+        await link(artifact, destination.path);
+        log(JSON.stringify({
+            output: destination.path,
+            artifacts: destination.parts,
+            batches: batches.length,
+        }));
+    }
+    catch (error) {
+        throw new ToolCliError(`speech generation failed; completed batches and manifest retained at ${destination.parts}; ${error instanceof Error ? error.message : String(error)}`);
+    }
+}
+//# sourceMappingURL=speech_generate.js.map

package/dist/core/tool/speech_generate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"speech_generate.js","sourceRoot":"","sources":["../../../src/core/tool/speech_generate.ts"],"names":[],"mappings":"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"}

package/dist/core/tools/bash_jobs.js

@@ -179,11 +179,12 @@ export class BashJobRegistry {
     }
 }
 function buildBashJobPresentation(toolName, args, text) {
+    const detailText = text?.replace(/\r\n?/g, "\n").trimEnd();
     return buildToolRunPresentation({
         toolName,
         operation: "bash",
         subject: args ? (args.ids?.join(", ") ?? args.id ?? "jobs") : "(invalid arguments)",
-        details: text?.split("\n").map((text) => ({ text })),
+        details: detailText ? detailText.split("\n").map((text) => ({ text })) : [],
     });
 }
 export function createBashJobToolDefinitions(jobs) {

package/dist/core/tools/bash_jobs.js.map

@@ -1 +1 @@
-{"version":3,"file":"bash_jobs.js","sourceRoot":"","sources":["../../../src/core/tools/bash_jobs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bash_jobs.js","sourceRoot":"","sources":["../../../src/core/tools/bash_jobs.ts"],"names":[],"mappings":"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"}

package/dist/core/tools/tau_docs.js

@@ -7,13 +7,30 @@ import { buildToolRunPresentation } from "./presentation.js";
 import { createTextToolOutcome, executeTool, } from "./registry.js";
 import { TOOL_NAME_TAU_DOCS } from "./tool_names.js";
 const TAU_DOCS_DESCRIPTION = [
-    "Read the user-facing documentation shipped with the running Tau version (the Tau host providing this tool, not Tau source code in the agent's workspace).",
-    "Use only when needed to operate or configure Tau, or when the user explicitly asks to consult Tau's documentation.",
-    "Do not call it merely because Tau is mentioned.",
-    "In a Tau source checkout, inspect source and tests instead for questions about implementation, built-in content, defaults, or current branch behavior.",
-    "The documentation does not report effective local configuration.",
-    "Begin with index.md, then follow its exact flat paths.",
-].join(" ");
+    [
+        "Read the user-facing documentation shipped with the running Tau version (not necessarily the version of Tau source code in your working directory).",
+        "Use when needed to operate or configure Tau, to use the command-line tools described below, or when the user explicitly asks to consult Tau's documentation.",
+        "Do not call it merely because Tau is mentioned.",
+        "In a Tau source checkout, inspect source and tests instead for questions about implementation, built-in content, defaults, or current branch behavior.",
+        "The documentation does not report effective local configuration.",
+        "Begin with index.md for general documentation, or read a command-line tool's listed page directly.",
+    ].join(" "),
+    "",
+    "### Built-in command-line tools",
+    "",
+    "Tau includes command-line tools that agents can invoke through Bash. Each tool has a dedicated documentation page describing its requirements, supported operations, and usage. The summaries below provide discovery without loading the full instructions.",
+    "",
+    "Available tools:",
+    "- PDF unpacking: extract OCR text, tables, and page-image patches from a PDF. Documentation: pdf-unpacking.md.",
+    "- Image generation: generate images from prompts or edit images using local references. Documentation: image-generation.md.",
+    "- Speech generation: turn narration or multi-speaker dialogue scripts into an audio file. Documentation: speech-generation.md.",
+    "",
+    "Guidelines:",
+    "- Selection: Consider these tools when their capabilities match the task, even if the user has not explicitly named them. Their use is optional; choose the approach that best fits the request.",
+    "- Documentation: Before using a tool, read its listed page directly through tau_docs. Load only the relevant guides, and reuse instructions already visible in context.",
+    "- Execution: Follow the guide's prerequisites and usage instructions. Listing a tool here does not guarantee its executable, dependencies, or credentials are available where you run commands.",
+    "- Scope: Tool availability does not expand the user's request or authorize unrelated actions. If a tool is unavailable or unsuitable, use another appropriate approach or explain the blocker.",
+].join("\n");
 const documentationRoot = new URL("../static/tau_docs/", import.meta.url);
 const manifest = JSON.parse(readFileSync(new URL("manifest.json", documentationRoot), "utf8"));
 const manifestSchema = z.object({ files: z.array(z.string()).min(1) }).strict();
@@ -24,7 +41,7 @@ export const TAU_DOCS_TOOL = {
     description: TAU_DOCS_DESCRIPTION,
     parameters: Type.Object({
         path: Type.String({
-            description: "Exact flat .md path from the Tau documentation index.",
+            description: "Exact flat .md path from the Tau documentation index or this tool description.",
             pattern: "^[a-z0-9]+(?:-[a-z0-9]+)*\\.md$",
         }),
     }, { additionalProperties: false }),

package/dist/core/tools/tau_docs.js.map

@@ -1 +1 @@
-{"version":3,"file":"tau_docs.js","sourceRoot":"","sources":["../../../src/core/tools/tau_docs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tau_docs.js","sourceRoot":"","sources":["../../../src/core/tools/tau_docs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAEL,qBAAqB,EACrB,WAAW,GAIZ,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,oBAAoB,GAAG;IAC3B;QACE,qJAAqJ;QACrJ,8JAA8J;QAC9J,iDAAiD;QACjD,wJAAwJ;QACxJ,kEAAkE;QAClE,oGAAoG;KACrG,CAAC,IAAI,CAAC,GAAG,CAAC;IACX,EAAE;IACF,iCAAiC;IACjC,EAAE;IACF,8PAA8P;IAC9P,EAAE;IACF,kBAAkB;IAClB,gHAAgH;IAChH,6HAA6H;IAC7H,gIAAgI;IAChI,EAAE;IACF,aAAa;IACb,kMAAkM;IAClM,yKAAyK;IACzK,iMAAiM;IACjM,gMAAgM;CACjM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,qBAAqB,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;AAC1E,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CACzB,YAAY,CAAC,IAAI,GAAG,CAAC,eAAe,EAAE,iBAAiB,CAAC,EAAE,MAAM,CAAC,CACvD,CAAC;AACb,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;AAChF,MAAM,kBAAkB,GAAG,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC;AAChE,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAEzD,MAAM,CAAC,MAAM,aAAa,GAAS;IACjC,IAAI,EAAE,kBAAkB;IACxB,WAAW,EAAE,oBAAoB;IACjC,UAAU,EAAE,IAAI,CAAC,MAAM,CACrB;QACE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC;YAChB,WAAW,EACT,gFAAgF;YAClF,OAAO,EAAE,iCAAiC;SAC3C,CAAC;KACH,EACD,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAChC;CACF,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC;KACxB,MAAM,CAAC;IACN,IAAI,EAAE,CAAC;SACJ,MAAM,EAAE;SACR,KAAK,CAAC,gCAAgC,EAAE,wCAAwC,CAAC;CACrF,CAAC;KACD,MAAM,EAAE,CAAC;AAEZ,SAAS,gBAAgB,CACvB,GAAY;IAEZ,MAAM,MAAM,GAAG,iBAAiB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAChD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;IAC5D,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;AACzC,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAY;IACrC,MAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACrC,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,2BAA2B;IACzC,OAAO;QACL,MAAM,EAAE,aAAa;QACrB,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACvB,YAAY,EAAE,wBAAwB,CAAC;gBACrC,QAAQ,EAAE,kBAAkB;gBAC5B,OAAO,EAAE,iBAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC;aAC/C,CAAC;SACH,CAAC;QACF,KAAK,CAAC,OAAO,CACX,QAAkB,EAClB,OAA6B;YAE7B,OAAO,WAAW,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;gBACrC,MAAM,UAAU,GAAG,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBACxD,MAAM,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBAEtD,MAAM,OAAO,GAAG,CACd,MAAc,EACd,eAAe,GAAoC,SAAS,EACjC,EAAE;oBAC7B,MAAM,OAAO,GAAG,qBAAqB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;oBAC/D,MAAM,OAAO,GAAiB;wBAC5B,IAAI,EAAE,mBAAmB;wBACzB,UAAU,EAAE,QAAQ,CAAC,EAAE;wBACvB,QAAQ,EAAE,kBAAkB;wBAC5B,YAAY,EAAE,wBAAwB,CAAC;4BACrC,QAAQ,EAAE,kBAAkB;4BAC5B,OAAO;4BACP,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;yBAC5B,CAAC;wBACF,MAAM;qBACP,CAAC;oBACF,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;gBACzE,CAAC,CAAC;gBAEF,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;oBACnB,OAAO,OAAO,CAAC,sBAAsB,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC3D,CAAC;gBAED,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC;gBACjC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;oBACpC,OAAO,OAAO,CACZ,mCAAmC,IAAI,mCAAmC,CAC3E,CAAC;gBACJ,CAAC;gBAED,IAAI,CAAC;oBACH,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,GAAG,CAAC,IAAI,EAAE,iBAAiB,CAAC,EAAE,MAAM,CAAC,CAAC;oBACvE,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;oBAC7D,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACnF,MAAM,OAAO,GAAG,qBAAqB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;oBAC5D,MAAM,OAAO,GAAiB;wBAC5B,IAAI,EAAE,oBAAoB;wBAC1B,UAAU,EAAE,QAAQ,CAAC,EAAE;wBACvB,QAAQ,EAAE,kBAAkB;wBAC5B,YAAY,EAAE,wBAAwB,CAAC;4BACrC,QAAQ,EAAE,kBAAkB;4BAC5B,OAAO,EAAE,IAAI;4BACb,OAAO;4BACP,QAAQ,EAAE;gCACR,mBAAmB,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gCAC/C,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE;6BAC/D;yBACF,CAAC;wBACF,MAAM,EAAE,SAAS;qBAClB,CAAC;oBACF,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;gBACzE,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBACvE,OAAO,OAAO,CAAC,qCAAqC,OAAO,EAAE,EAAE,QAAQ,CAAC,CAAC;gBAC3E,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/core/utils/compact.js

@@ -151,6 +151,14 @@ export function formatHistoryForCompaction(history, options) {
         lines.push(formatCompactionBlock("[System prompt]:", systemPrompt));
     }
     for (const message of history) {
+        if (message.role === "system") {
+            const id = options?.historyEntryIds?.get(message);
+            const marker = id
+                ? `[System instruction id=${JSON.stringify(id)}]:`
+                : "[System instruction]:";
+            lines.push(formatCompactionBlock(marker, extractTextFromContent(message.content)));
+            continue;
+        }
         if (message.role === "user") {
             const userText = stripTauUserMetadata(extractTextFromContent(message.content));
             const text = hasToolRecoveryMetadata(message)

package/dist/core/utils/compact.js.map

@@ -1 +1 @@
-{"version":3,"file":"compact.js","sourceRoot":"","sources":["../../../src/core/utils/compact.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compact.js","sourceRoot":"","sources":["../../../src/core/utils/compact.ts"],"names":[],"mappings":"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"}

package/dist/core/utils/gemini_transcription.js

@@ -60,11 +60,9 @@ const liveMessageSchema = z
     setupComplete: z.object({}).optional(),
     serverContent: z
         .object({
-        inputTranscription: z
-            .object({
-            text: z.string().trim().min(1),
-        })
-            .optional(),
+        generationComplete: z.boolean().optional(),
+        interimInputTranscription: z.object({ text: z.string() }).optional(),
+        inputTranscription: z.object({ text: z.string() }).optional(),
     })
         .passthrough()
         .optional(),
@@ -79,6 +77,9 @@ class GeminiStreamingTranscriptionImpl {
     socket;
     keywordAbortController = new AbortController();
     keywordsPromise;
+    onProgress;
+    finalizedText = "";
+    finishing = false;
     ready = false;
     aborted = false;
     failure;
@@ -97,6 +98,7 @@ class GeminiStreamingTranscriptionImpl {
         if (!apiKey) {
             throw new Error("missing Gemini API key");
         }
+        this.onProgress = options.onProgress;
         this.keywordsPromise = prepareGeminiTranscriptionKeywords({
             apiKey,
             context: options.context,
@@ -171,6 +173,7 @@ class GeminiStreamingTranscriptionImpl {
                 this.socket.terminate();
             }, GEMINI_TRANSCRIPTION_COMPLETION_TIMEOUT_MS);
             this.completionTimeout.unref?.();
+            this.finishing = true;
             this.send({ realtimeInput: { activityEnd: {} } });
             return await completion;
         }
@@ -207,9 +210,9 @@ class GeminiStreamingTranscriptionImpl {
                     responseModalities: ["TEXT"],
                 },
                 inputAudioTranscription: {
-                    languageCodes: [],
+                    languageCodes: ["en-US", "fi-FI"],
                     ...(keywords.length > 0 ? { customVocabulary: keywords } : {}),
-                    mode: "SMART",
+                    mode: "VERBATIM",
                 },
                 realtimeInputConfig: {
                     automaticActivityDetection: {
@@ -220,6 +223,8 @@ class GeminiStreamingTranscriptionImpl {
         });
     }
     handleMessage(data) {
+        if (this.aborted || this.failure || this.completedTranscript)
+            return;
         let payload;
         try {
             payload = JSON.parse(formatWebSocketMessage(data));
@@ -255,11 +260,24 @@ class GeminiStreamingTranscriptionImpl {
             this.rejectReady = undefined;
             return;
         }
-        const transcript = event.data.serverContent?.inputTranscription?.text;
+        const content = event.data.serverContent;
+        const transcript = content?.inputTranscription?.text;
         if (transcript) {
-            this.completedTranscript = transcript;
+            this.finalizedText += transcript;
+            this.onProgress?.(this.finalizedText);
+        }
+        else if (content?.interimInputTranscription) {
+            this.onProgress?.(this.finalizedText + content.interimInputTranscription.text);
+        }
+        if (content?.generationComplete && this.finishing) {
+            const text = this.finalizedText.trim();
+            if (!text) {
+                this.fail(new Error("transcription result was empty"));
+                return;
+            }
+            this.completedTranscript = text;
             this.clearTimers();
-            this.resolveCompletion?.(transcript);
+            this.resolveCompletion?.(text);
             this.clearWaiters();
             this.socket.close();
         }
@@ -358,9 +376,9 @@ export async function transcribeGeminiAudio(options) {
                 ],
                 generation_config: {
                     transcription_config: {
-                        language_codes: [],
+                        language_codes: ["en-US", "fi-FI"],
                         ...(keywords.length > 0 ? { custom_vocabulary: keywords } : {}),
-                        mode: "smart",
+                        mode: { type: "verbatim" },
                     },
                 },
                 store: false,