mirror of
https://github.com/yusufipk/dikte.git
synced 2026-09-11 10:56:10 +00:00
The claude and codex CLIs spawn shells to do their work, and killing only the direct child left those shells holding the pipes: the stdout loop never saw EOF, so the run hung forever with the watchdog already fired, and cleanup's subprocess.run could hang inside the stdlib the same way after its own timeout. Both now run the CLI with its output in files rather than pipes and put the whole tree down on a timeout, taskkill /T on Windows and a process group everywhere else. Whether a dead resume means "start a fresh conversation" was decided by English substrings of stderr, which a localized CLI never says; a resumed run that exits nonzero with no answer now retries fresh once, whatever the words were. Recognised API trouble is the exception: a spent quota, a signed-out CLI or a dead network is not the session's fault, and is reported as itself rather than retried into a second copy of the same failure. Co-Authored-By: Claude Fable 5 <[email protected]>
238 lines
8.9 KiB
Python
238 lines
8.9 KiB
Python
"""Who rewrites the transcript once it has been heard.
|
|
|
|
Normally a small model on OpenRouter: one request, a second, a few tenths of a
|
|
cent. A machine with Claude Code or Codex on it is already paying for a model
|
|
though, and the subscription that answers "put that in my calendar on Thursday"
|
|
can just as well take the "eee"s out of a sentence. No second key, no second
|
|
bill. It costs seconds rather than one, because a CLI opens a whole session to
|
|
do it, which is the trade.
|
|
|
|
Whoever does it, the job is the same one: no tools, no files, no memory of the
|
|
last dictation. There is nothing here to look up and nothing to carry over, and
|
|
a transcript is text from a microphone rather than an instruction, so the less
|
|
the agent can reach while it reads one, the better.
|
|
"""
|
|
|
|
import os
|
|
import shutil
|
|
import subprocess
|
|
import tempfile
|
|
|
|
from . import api
|
|
from . import assistant
|
|
from . import ggml
|
|
from . import paths
|
|
from .i18n import t
|
|
|
|
PROVIDERS = ("openrouter", "local", "claude", "codex")
|
|
|
|
|
|
class CleanupError(api.ApiError):
|
|
"""What a CLI could not do.
|
|
|
|
An ApiError because to the chain a cleanup that failed is a cleanup that
|
|
failed, whichever way it was run, and every caller already catches one and
|
|
keeps the raw transcript.
|
|
"""
|
|
|
|
|
|
def provider(conf):
|
|
chosen = conf["cleanup_provider"]
|
|
return chosen if chosen in PROVIDERS else "openrouter"
|
|
|
|
|
|
def executable(name):
|
|
"""The CLI a provider runs, or "" when it needs none."""
|
|
return {"claude": "claude", "codex": "codex"}.get(name, "")
|
|
|
|
|
|
def model(conf):
|
|
"""Which model does the cleaning, for the history and the settings window."""
|
|
name = provider(conf)
|
|
if name == "local":
|
|
return conf["local_llm_model"]
|
|
if name == "claude":
|
|
return conf["cleanup_claude_model"].strip() or "haiku"
|
|
if name == "codex":
|
|
# Codex is left on whatever it is set to unless a model is typed in, so
|
|
# here there is only the name of the thing that did it.
|
|
return conf["cleanup_codex_model"].strip() or "codex"
|
|
return conf["cleanup_model"]
|
|
|
|
|
|
def run(text, conf, system_prompt, timeout=180, aborter=None):
|
|
"""Hand the transcript to whoever is set to clean it up.
|
|
|
|
`aborter` is only of use to the two that answer over HTTP; a CLI is stopped
|
|
between blocks instead, which is close enough when a block is seconds.
|
|
"""
|
|
name = provider(conf)
|
|
if name == "openrouter":
|
|
return api.cleanup(
|
|
text, conf.openrouter_key(), conf["cleanup_model"], system_prompt,
|
|
reasoning=conf["cleanup_reasoning"],
|
|
base_url=conf["openrouter_base_url"], timeout=timeout,
|
|
aborter=aborter,
|
|
)
|
|
if name == "local":
|
|
return _local(text, conf, system_prompt, timeout, aborter)
|
|
runner = _claude if name == "claude" else _codex
|
|
return runner(text, conf, system_prompt, timeout)
|
|
|
|
|
|
def _local(text, conf, system_prompt, timeout, aborter=None):
|
|
"""llama.cpp, on this machine, answering the request OpenRouter answers.
|
|
|
|
No key and no bill, and the address does not exist until the server is up,
|
|
which is what starting it here is for. The timeout is the hosted one raised:
|
|
the only thing being spent is time.
|
|
"""
|
|
service = t("Local model")
|
|
try:
|
|
return api.cleanup(
|
|
text, "", conf["local_llm_model"], system_prompt,
|
|
reasoning=conf["local_llm_reasoning"],
|
|
base_url=api.serving(ggml.llm),
|
|
timeout=max(timeout, api.LOCAL_TIMEOUT),
|
|
provider="local-llm", service=service, aborter=aborter,
|
|
)
|
|
except api.ApiError as exc:
|
|
# A server that died mid-request would otherwise report only that the
|
|
# connection dropped, when the reason is in its own output.
|
|
raise api.local_failure(service, ggml.llm, exc) from None
|
|
|
|
|
|
def _wrap(text):
|
|
"""The same fence the OpenRouter call puts around it: this is the material,
|
|
not the instruction, however much of it reads like one."""
|
|
return f"<transcript>\n{text}\n</transcript>"
|
|
|
|
|
|
# --- Claude Code ----------------------------------------------------------
|
|
|
|
def _claude(text, conf, system_prompt, timeout):
|
|
cmd = [
|
|
"claude", "-p", _wrap(text),
|
|
# --system-prompt rather than --append-system-prompt: the cleanup rules
|
|
# are the whole job, and Claude Code's own instructions are about
|
|
# working on a codebase.
|
|
"--system-prompt", system_prompt,
|
|
"--model", model(conf),
|
|
"--output-format", "text",
|
|
"--tools", "", # nothing to run
|
|
"--strict-mcp-config", "--mcp-config", '{"mcpServers":{}}',
|
|
"--no-session-persistence", # nothing to resume
|
|
]
|
|
effort = assistant.CLAUDE_EFFORT.get(conf["cleanup_reasoning"], "")
|
|
if effort:
|
|
cmd += ["--effort", effort]
|
|
|
|
answer = _output(cmd, timeout, "Claude")
|
|
if not answer:
|
|
raise CleanupError(t("{service} answered with nothing.", service="Claude"))
|
|
return answer
|
|
|
|
|
|
# --- Codex ----------------------------------------------------------------
|
|
|
|
def _codex(text, conf, system_prompt, timeout):
|
|
# Codex takes no system prompt of its own, so the rules ride in front of the
|
|
# transcript, kept apart from it so the two are not read as one.
|
|
body = f"{system_prompt}\n\n---\n\n{_wrap(text)}"
|
|
cmd = [
|
|
"codex", "exec",
|
|
"--sandbox", "read-only", # it has no reason to touch the disk
|
|
"--skip-git-repo-check",
|
|
"--ephemeral", # nothing to resume
|
|
"--color", "never",
|
|
"-c", 'approval_policy="never"', # there is nobody here to approve
|
|
]
|
|
if conf["cleanup_codex_model"].strip():
|
|
cmd += ["-m", conf["cleanup_codex_model"].strip()]
|
|
effort = assistant.CODEX_EFFORT.get(conf["cleanup_reasoning"], "")
|
|
if effort:
|
|
cmd += ["-c", f'model_reasoning_effort="{effort}"']
|
|
|
|
# `codex exec` prints a header, its thinking and a token count around the
|
|
# answer; the file it writes on the way out is the answer on its own.
|
|
handle, last_message = tempfile.mkstemp(prefix="dikte-cleanup-", suffix=".txt")
|
|
os.close(handle)
|
|
cmd += ["-o", last_message, body]
|
|
try:
|
|
_output(cmd, timeout, "Codex")
|
|
answer = _read(last_message)
|
|
finally:
|
|
try:
|
|
os.unlink(last_message)
|
|
except OSError:
|
|
pass
|
|
|
|
if not answer:
|
|
raise CleanupError(t("{service} answered with nothing.", service="Codex"))
|
|
return answer
|
|
|
|
|
|
def _read(path):
|
|
try:
|
|
with open(path, encoding="utf-8", errors="replace") as fh:
|
|
return fh.read().strip()
|
|
except OSError:
|
|
return ""
|
|
|
|
|
|
# --- running a CLI --------------------------------------------------------
|
|
|
|
def _output(cmd, timeout, service):
|
|
"""Run cmd to the end and return what it printed.
|
|
|
|
It runs in the home directory rather than wherever the agent is pointed: a
|
|
project's instructions have opinions about how text should be written, and
|
|
none of them are about this transcript.
|
|
"""
|
|
binary = cmd[0]
|
|
if not shutil.which(binary):
|
|
raise CleanupError(t(
|
|
"{binary} not found. Install it, or have OpenRouter clean up "
|
|
"instead, under Settings → API and models.", binary=binary,
|
|
))
|
|
# Both streams land in files rather than pipes: nobody drains a pipe while
|
|
# the process is being waited out, and a CLI chatty enough would fill the
|
|
# buffer and wedge. And a timeout must end the CLI's tool subprocesses too,
|
|
# not just the CLI, which subprocess.run's timeout does not do; hence the
|
|
# own session on POSIX and assistant.kill_tree on the way out.
|
|
out_file = tempfile.TemporaryFile()
|
|
err_file = tempfile.TemporaryFile()
|
|
grouped = {"start_new_session": True} if os.name == "posix" else {}
|
|
try:
|
|
try:
|
|
proc = subprocess.Popen(
|
|
cmd, cwd=os.path.expanduser("~"), stdin=subprocess.DEVNULL,
|
|
stdout=out_file, stderr=err_file,
|
|
creationflags=paths.NO_WINDOW,
|
|
**grouped,
|
|
)
|
|
except OSError as exc:
|
|
raise CleanupError(t("Could not run {binary}: {error}",
|
|
binary=binary, error=exc)) from exc
|
|
try:
|
|
proc.wait(timeout=timeout)
|
|
except subprocess.TimeoutExpired:
|
|
assistant.kill_tree(proc)
|
|
raise CleanupError(t("{service} did not finish within {seconds} seconds.",
|
|
service=service, seconds=timeout)) from None
|
|
out_file.seek(0)
|
|
stdout = out_file.read().decode("utf-8", "replace")
|
|
err_file.seek(0)
|
|
stderr = err_file.read().decode("utf-8", "replace")
|
|
finally:
|
|
for handle in (out_file, err_file):
|
|
try:
|
|
handle.close()
|
|
except OSError:
|
|
pass
|
|
if proc.returncode != 0:
|
|
raise CleanupError(assistant.last_line(stderr) or t(
|
|
"{service} exited with code {code}.",
|
|
service=service, code=proc.returncode))
|
|
return stdout.strip()
|