Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import TasksMenu from "./components/TasksMenu.vue";
import SettingsPanel from "./components/SettingsPanel.vue";
import { loadSettings, pickFiles, shellQuote, speakClaudeReply, speakStop, voiceCancel, voiceStart, voiceStop } from "./lib/settings";
import { voiceCommand } from "./lib/voice";
import { serialQueue } from "./lib/queue";
import { listen } from "@tauri-apps/api/event";
import { getCurrentWebview } from "@tauri-apps/api/webview";
import { anon } from "./state/anon";
Expand Down Expand Up @@ -499,13 +500,17 @@ let speakSeq = 0;
/** Aba sendo lida: sair dela cancela a leitura. */
let speakingTab: number | undefined;

/** Leituras automáticas, uma de cada vez. */
const speechQueue = serialQueue();

/** Claude da aba terminou: lê sozinho, conforme "Ler a resposta" nas configurações. */
async function speakReply(tab: Tab) {
const dictated = dictatedTabs.delete(tab.id);
const speech = (await loadSettings().catch(() => null))?.speech;
if (!speech || speech.mode === "off") return;
if (speech.mode === "dictated" ? !dictated : !isActive(tab)) return;
await speakTab(tab, false);
// Na fila: a resposta de outra aba espera a que está sendo lida acabar, em vez de cortá-la.
await speechQueue.add(() => speakTab(tab, false));
}

/** Lê a última resposta do Claude da aba. `manual`: pedido pelo ▶, avisa se não tem o que ler. */
Expand Down Expand Up @@ -534,7 +539,9 @@ function listenReply() {
else if (tab) flash("Voz: não tem Claude rodando nesta aba.");
}

function stopSpeaking() {
/** `keepQueue`: só corta a leitura atual (saiu da aba); as outras respostas na fila continuam. */
function stopSpeaking(keepQueue = false) {
if (!keepQueue) speechQueue.clear();
speakSeq++;
speakingTab = undefined;
voice.value = "idle";
Expand All @@ -545,7 +552,7 @@ function stopSpeaking() {
watch(
() => activeTab.value?.id,
(id) => {
if (voice.value === "speaking" && speakingTab !== undefined && speakingTab !== id) stopSpeaking();
if (voice.value === "speaking" && speakingTab !== undefined && speakingTab !== id) stopSpeaking(true);
},
);

Expand Down
40 changes: 40 additions & 0 deletions src/lib/queue.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import { describe, expect, it } from "vitest";
import { serialQueue } from "./queue";

const tick = () => new Promise((r) => setTimeout(r, 0));

describe("serialQueue", () => {
it("a segunda só começa quando a primeira termina", async () => {
const q = serialQueue();
const log: string[] = [];
let finishFirst!: () => void;
q.add(() => (log.push("a começa"), new Promise<void>((r) => (finishFirst = () => (log.push("a termina"), r())))));
const done = q.add(async () => void log.push("b começa"));
await tick();
expect(log).toEqual(["a começa"]);
finishFirst();
await done;
expect(log).toEqual(["a começa", "a termina", "b começa"]);
});

it("clear descarta as que esperavam, mas aceita as novas", async () => {
const q = serialQueue();
const log: string[] = [];
let finish!: () => void;
q.add(() => new Promise<void>((r) => (finish = r)));
q.add(async () => void log.push("descartada"));
await tick();
q.clear();
finish();
await q.add(async () => void log.push("nova"));
expect(log).toEqual(["nova"]);
});

it("uma tarefa que falha não trava a fila", async () => {
const q = serialQueue();
const log: string[] = [];
q.add(() => Promise.reject(new Error("x")));
await q.add(async () => void log.push("seguiu"));
expect(log).toEqual(["seguiu"]);
});
});
15 changes: 15 additions & 0 deletions src/lib/queue.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/** Fila de tarefas uma depois da outra; `clear` descarta as que ainda não começaram. */
export function serialQueue() {
let tail: Promise<void> = Promise.resolve();
let generation = 0;
return {
add(task: () => Promise<unknown>): Promise<void> {
const gen = generation;
tail = tail.then(() => (gen === generation ? task().then(() => {}, () => {}) : undefined));
return tail;
},
clear() {
generation++;
},
};
}