4 Commits

Author SHA1 Message Date
javis-bot
b9f637faa4 fix: stop hardcoding MELO_SPEED so the .env override reaches the worker
Some checks failed
Release / semantic-release (push) Successful in 26s
tests / Unit tests (Linux, Python 3.11) (push) Failing after 5m13s
Release / build-linux (push) Failing after 7m8s
Release / build-windows (push) Has been cancelled
Release / build-macos (arm64, macos-latest) (push) Has been cancelled
Release / build-macos (x64, macos-15-intel) (push) Has been cancelled
Release / release-main (push) Has been cancelled
Release / release-develop (push) Has been cancelled
supervisord.conf passed MELO_DEVICE through as %(ENV_MELO_DEVICE)s but pinned
MELO_SPEED="1.5", so lowering MELO_SPEED in .env had no effect — the worker
always got 1.5. Pass MELO_SPEED through with %(ENV_MELO_SPEED)s and set a
compose default (MELO_SPEED=${MELO_SPEED:-1.5}, same pattern as MELO_DEVICE) so
the supervisord expansion always resolves and an .env value actually changes
the speaking rate. Default rate is unchanged (1.5). melo_worker logs the
resolved speed at startup, so the env->worker path is verifiable.

Verified: _resolve_speed() returns 1.1 for MELO_SPEED=1.1 (1.5 otherwise), and
`MELO_SPEED=1.1 docker compose config` renders MELO_SPEED: "1.1" into the env.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-06-23 01:02:43 +09:00
javis-bot
2f000ac6c8 feat: load operator instructions from agents/*.md into the reply prompt
Some checks failed
Release / semantic-release (push) Successful in 30s
Release / build-windows (push) Has been cancelled
Release / build-macos (arm64, macos-latest) (push) Has been cancelled
Release / build-macos (x64, macos-15-intel) (push) Has been cancelled
Release / build-linux (push) Has been cancelled
Release / release-main (push) Has been cancelled
Release / release-develop (push) Has been cancelled
tests / Unit tests (Linux, Python 3.11) (push) Has been cancelled
Drop Markdown files into an agents/ folder and their contents are appended to
the main reply LLM's system prompt, so an operator can extend the assistant's
rules/tone without code changes. Files are concatenated in filename order
(use 00-, 10- prefixes to control ordering) and re-read once per turn, so edits
apply on the next reply with no rebuild/restart. Fail-open: a missing, empty,
or unreadable folder yields no instructions and never breaks a reply.

- load_agent_instructions() in system_prompt.py (AGENTS_DIR env, default
  /app/agents); reads *.md only, skips blanks, ignores non-dir paths
- engine.py appends it alongside the existing settings-UI llm_instructions,
  under the same "Additional instructions from the operator:" framing
- docker-compose.yml bind-mounts ./agents:/app/agents:ro and sets AGENTS_DIR
- agents/example.md.sample starter template (.sample is not loaded)
- tests cover ordering, md-only filtering, blank-skip, env/arg resolution,
  and fail-open paths
- README, .env.example, docs/llm_contexts.md updated

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-06-23 00:57:54 +09:00
javis-bot
677bfcd2a9 feat: log the resolved whisper device on bridge load
Some checks failed
Release / semantic-release (push) Successful in 24s
tests / Unit tests (Linux, Python 3.11) (push) Failing after 5m19s
Release / build-linux (push) Failing after 7m10s
Release / build-windows (push) Has been cancelled
Release / build-macos (arm64, macos-latest) (push) Has been cancelled
Release / build-macos (x64, macos-15-intel) (push) Has been cancelled
Release / release-main (push) Has been cancelled
Release / release-develop (push) Has been cancelled
The bridge only logged Whisper's device on the CPU-fallback path, so a
successful GPU (or silent CPU) load was invisible. Print the CTranslate2-
resolved device on success and on the fallback load, so it is verifiable that
STT is actually running on cuda alongside ollama (GPU) and MeloTTS (cuda).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-06-23 00:19:20 +09:00
javis-bot
e49be6d04e fix: add video driver capability so NVENC works in the container
Some checks failed
Release / semantic-release (push) Successful in 31s
Release / build-windows (push) Has been cancelled
Release / build-macos (arm64, macos-latest) (push) Has been cancelled
Release / build-macos (x64, macos-15-intel) (push) Has been cancelled
Release / build-linux (push) Has been cancelled
Release / release-main (push) Has been cancelled
Release / release-develop (push) Has been cancelled
tests / Unit tests (Linux, Python 3.11) (push) Has been cancelled
The Go-Live broadcast encodes with h264_nvenc, but the image only requested
NVIDIA_DRIVER_CAPABILITIES=compute,utility. The NVIDIA Container Toolkit gates
which driver libraries it injects by capability, and the NVENC/NVDEC libs
(libnvidia-encode.so.1 / libnvidia-decode.so.1) come with the `video`
capability. Without it the broadcast ffmpeg dies with
"Cannot load libnvidia-encode.so.1", the capture produces no packets, and
Go-Live never connects, while CUDA workloads (ollama/whisper/melo) and
nvidia-smi keep working because compute+utility are present.

Add `video` so hardware encode is available. Applies to both Linux (CDI) and
Windows Docker Desktop (WSL2).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-06-23 00:16:12 +09:00
11 changed files with 180 additions and 7 deletions

View File

@@ -74,6 +74,12 @@ WHISPER_MODEL=small
# occasional trailing CJK fragment small models leak on free-form chat).
OUTPUT_LANGUAGE=
# Operator instruction folder: every *.md in this dir is appended to the main
# reply LLM's system prompt (filename order), re-read each turn so edits apply
# without a rebuild/restart. ./agents is bind-mounted here read-only; only
# change this to relocate the folder inside the container. See README "운영자 지시문".
AGENTS_DIR=/app/agents
# ---------------------------------------------------------------------------
# Docker desktop (VNC) — used only by the container image
# ---------------------------------------------------------------------------

View File

@@ -10,8 +10,14 @@ ENV DEBIAN_FRONTEND=noninteractive \
DISPLAY=:1 \
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 \
PATH=/opt/venv/bin:/root/.bun/bin:/usr/local/bin:/usr/bin:/bin \
NVIDIA_VISIBLE_DEVICES=all \
NVIDIA_DRIVER_CAPABILITIES=compute,utility
NVIDIA_VISIBLE_DEVICES=all
# `video` is REQUIRED for NVENC/NVDEC: it tells the NVIDIA Container Toolkit to
# inject libnvidia-encode.so.1 / libnvidia-decode.so.1 into the container. With
# only `compute,utility` you get CUDA (ollama/whisper/melo) + nvidia-smi, but the
# Go-Live broadcast's h264_nvenc fails with "Cannot load libnvidia-encode.so.1".
# Applies on both Linux (CDI) and Windows Docker Desktop (WSL2).
ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
# --- System packages: desktop, VNC, Chrome deps, ffmpeg, python, ocr ---
RUN apt-get update && apt-get install -y --no-install-recommends \

View File

@@ -247,6 +247,18 @@ cd bot; bun run register; bun run start # 창 2: (일반 봇이면) 슬래시
- `OLLAMA_CHAT_MODEL` — 두뇌 LLM (기본 `qwen2.5:3b`)
- `COMPOSE_FILE` — OS별 GPU override를 매번 `-f`로 안 치고 자동 적용 (위 "실행 — Docker" 참고)
- `output_language` — 출력 언어 고정(비우면 사용자 언어). 설정 웹 UI(`/settings`)에서 바꾸면 env 기본값보다 우선하며 컨테이너 재생성 후에도 유지됩니다.
- `AGENTS_DIR` — 운영자 지시문 폴더(기본 `/app/agents`, `./agents`가 read-only로 마운트됨). 아래 "운영자 지시문" 참고.
---
## 운영자 지시문 (`agents/*.md`)
`agents/` 폴더에 마크다운 파일을 넣으면 그 내용이 어시스턴트의 메인 답변 시스템 프롬프트 뒤에 그대로 추가됩니다. 페르소나(집사 성격)는 그대로 두고 규칙·말투·금칙어 등을 덧붙일 때 쓰세요.
- `agents/` 안의 모든 `*.md`를 **파일명 순서**로 이어 붙입니다. 순서를 정하려면 `00-tone.md`, `10-rules.md`처럼 숫자 접두사를 쓰세요.
- **매 답변마다 다시 읽습니다.** 파일을 저장하면 다음 발화부터 바로 반영되며, 재빌드/재시작이 필요 없습니다(폴더가 read-only로 마운트됨).
- 폴더가 없거나 비어 있으면 아무 일도 일어나지 않습니다(fail-open).
- `agents/example.md.sample`을 `rules.md` 등 `*.md`로 복사해서 시작하세요. `.sample` 파일은 로드되지 않습니다.
---

15
agents/example.md.sample Normal file
View File

@@ -0,0 +1,15 @@
# Operator instruction file (example)
#
# HOW TO USE: copy or rename this file to anything ending in `.md`
# (e.g. `rules.md`). Every `*.md` in this folder is appended to the assistant's
# main reply system prompt, in filename order — use number prefixes like
# `00-tone.md`, `10-rules.md` to control ordering. Edits take effect on the
# NEXT reply; no rebuild or restart is needed (the folder is read per turn).
#
# Files ending in `.sample` (like this one) are ignored, so this template never
# affects replies until you rename it to `*.md`.
#
# Everything below a heading is treated as plain instruction text for the LLM.
Always keep replies under two sentences.
When the user asks about deployment, mention the relevant docker compose command.

View File

@@ -150,12 +150,17 @@ def _ensure_brain():
compute = os.environ.get("WHISPER_COMPUTE_TYPE", "auto")
try:
whisper = WhisperModel(cfg.whisper_model, device=device, compute_type=compute)
# Log the device actually resolved by CTranslate2 (device="auto"
# picks cuda when available) so a silent CPU load is visible.
resolved = str(getattr(getattr(whisper, "model", None), "device", device)).lower()
print(f"[bridge] whisper loaded on {resolved} (compute={compute})", flush=True)
except Exception as ge:
# GPU not available / unsupported -> fall back to CPU so the
# bridge still works without a GPU passed to the container.
if device != "cpu":
print(f"[bridge] whisper device='{device}' failed ({ge}); falling back to CPU", flush=True)
whisper = WhisperModel(cfg.whisper_model, device="cpu", compute_type="int8")
print("[bridge] whisper loaded on cpu (compute=int8)", flush=True)
else:
raise

View File

@@ -69,6 +69,10 @@ services:
# MeloTTS on the GPU (cu128 torch baked by docker/setup-melo.sh). CPU synth
# serialised under load and pushed TTS to 7-8s; GPU does ~0.3s/sentence.
MELO_DEVICE: ${MELO_DEVICE:-cuda}
# Speaking rate for MeloTTS. Set here (with a default) so supervisord's
# %(ENV_MELO_SPEED)s passthrough always resolves and an .env override
# actually reaches the melo-worker. Lower it (e.g. 1.1) for a calmer pace.
MELO_SPEED: ${MELO_SPEED:-1.5}
# Optional single-language lock for replies (empty = user's own language).
OUTPUT_LANGUAGE: ${OUTPUT_LANGUAGE:-ko}
# Drop the pre-loop planner LLM call to cut voice-reply latency on small
@@ -97,6 +101,10 @@ services:
BROWSER_CONTROL_BIND: ${BROWSER_CONTROL_BIND:-0.0.0.0}
BROWSER_CONTROL_PORT: ${BROWSER_CONTROL_PORT:-8777}
BROWSER_CONTROL_URL: ${BROWSER_CONTROL_URL:-}
# Folder of operator *.md instruction files appended to the main reply
# LLM's system prompt. Bind-mounted from ./agents below; override only to
# relocate it inside the container.
AGENTS_DIR: ${AGENTS_DIR:-/app/agents}
# No hard depends_on ollama: a browser-host (`docker compose up -d javis`)
# must NOT pull in Ollama. Full/bot layouts start it with a plain
# `docker compose up -d` (all services); the bridge tolerates Ollama warming
@@ -149,6 +157,11 @@ services:
# If unseeded, the path fail-opens to the DDG/Brave cascade and the
# entrypoint logs a warning. Only consumed when GEMINI_AUTH=oauth.
- ${GEMINI_OAUTH_DIR:-./docker/gemini-oauth}:/root/.gemini
# Operator instruction files. Every *.md here is appended to the main
# reply LLM's system prompt (filename order), read per turn so edits apply
# on the next reply without a rebuild/restart. Read-only; a project-
# relative path resolves identically on Linux and Windows Docker Desktop.
- ./agents:/app/agents:ro
volumes:
ollama_models:

View File

@@ -61,10 +61,13 @@ directory=/app
; HF_HUB_OFFLINE/TRANSFORMERS_OFFLINE force pure-cache reads: the pinned old
; transformers/huggingface_hub otherwise retry the network on every load and
; error out instead of falling back to the (complete) baked cache.
; MELO_DEVICE inherits from the container env (compose sets it; default cuda)
; so the worker runs MeloTTS on the GPU. supervisord interpolates %(ENV_x)s
; from its own environment, which is the container's.
environment=MELO_LANGUAGE="KR",MELO_SPEED="1.5",MELO_DEVICE="%(ENV_MELO_DEVICE)s",MELO_WORKER_HOST="127.0.0.1",MELO_WORKER_PORT="8770",HF_HOME="/opt/melo-cache",HF_HUB_OFFLINE="1",TRANSFORMERS_OFFLINE="1"
; MELO_DEVICE and MELO_SPEED inherit from the container env (compose sets both
; with defaults: cuda / 1.5) so the worker runs MeloTTS on the GPU at the
; configured rate. supervisord interpolates %(ENV_x)s from its own environment,
; which is the container's — so MELO_SPEED must always be set in the env
; (compose guarantees it) or this expansion fails at startup. Hardcoding 1.5
; here previously shadowed the .env value, so lowering MELO_SPEED had no effect.
environment=MELO_LANGUAGE="KR",MELO_SPEED="%(ENV_MELO_SPEED)s",MELO_DEVICE="%(ENV_MELO_DEVICE)s",MELO_WORKER_HOST="127.0.0.1",MELO_WORKER_PORT="8770",HF_HOME="/opt/melo-cache",HF_HUB_OFFLINE="1",TRANSFORMERS_OFFLINE="1"
priority=280
autorestart=true
stdout_logfile=/dev/stdout

View File

@@ -13,6 +13,7 @@ Every distinct LLM call in Jarvis, what feeds it, what consumes it, and how it i
- Redacted user query
- Recent dialogue (last 5 minutes), including in-loop tool-call + tool-role messages from prior replies within the active conversation (tool carryover, `DialogueMemory.record_tool_turn` / `get_recent_turns_with_tools` in [src/jarvis/memory/conversation.py](src/jarvis/memory/conversation.py); per-prompt cap via `cfg.tool_carryover_max_turns` / `tool_carryover_per_entry_chars`; storage cap `_tool_turns_max_storage = 16`; cleared on `stop` signal AND on new-conversation entry; UNTRUSTED WEB EXTRACT fence markers preserved on truncation; both `content` and `tool_calls[*].function.arguments` scrubbed on write)
- Unified system prompt from [src/jarvis/system_prompt.py](src/jarvis/system_prompt.py) + ASR note + tool-protocol guidance. Reply language is resolved by `reply_language_directive(lang, cfg.tts_engine)` where `lang = _resolve_output_language()` — the single source of truth that prefers the settings-web UI value (config JSON `output_language`) over the compose `OUTPUT_LANGUAGE` env, so changing the language in the settings page takes effect. An explicit lock wins (forces "reply only in `<language>`", also forbidding other scripts so small models stop leaking trailing CJK/Hanja); else a Piper/Chatterbox TTS forces English (English-only voices); else (multilingual TTS, no lock) the assistant replies in the user's own language. The directive is inserted near the FRONT of the guidance list so a small model gives it primacy, and the SAME resolved `lang` feeds `build_system_prompt()`, which rewrites the persona's "in the user's language" clause to the locked language so the persona cannot contradict the directive (previously the persona read the raw env while the directive read the config value, so a settings-UI change was honoured by one and ignored by the other). Gated in `_build_initial_system_message()` at [engine.py](src/jarvis/reply/engine.py).
- **Operator instructions** (two sources, both framed "Additional instructions from the operator:" and appended near the end of the guidance list): the settings-UI `llm_instructions` config field, and every `*.md` file in `AGENTS_DIR` (default `/app/agents`, bind-mounted from `./agents`). The file-based set is read once per turn by `load_agent_instructions()` in [src/jarvis/system_prompt.py](src/jarvis/system_prompt.py) and concatenated in filename order, so dropping/editing a `.md` applies on the next reply with no rebuild/restart; fail-open to `""` when the folder is absent/empty/unreadable.
- **Warm profile block** (query-agnostic User + Directives excerpt from the knowledge graph, composed by `build_warm_profile()` / `format_warm_profile_block()` in [src/jarvis/memory/graph_ops.py](src/jarvis/memory/graph_ops.py) at Step 3.5 of `reply()`; no LLM call, pure SQLite read; injected unconditionally so personalisation is the default; result cached in `DialogueMemory._hot_cache` under `DialogueMemory.WARM_PROFILE_CACHE_KEY` for the lifetime of the active conversation. Invalidated on `stop`, on new-conversation entry, AND on User/Directives graph mutations via the listener registered in [src/jarvis/daemon.py](src/jarvis/daemon.py) against `register_graph_mutation_listener` in [src/jarvis/memory/graph.py](src/jarvis/memory/graph.py); World-branch writes are ignored)
- Digested memory enrichment (optional, see #4)
- Time + location context (re-injected each turn)

View File

@@ -9,7 +9,11 @@ import os
from typing import Optional, TYPE_CHECKING
from ..utils.redact import redact
from ..system_prompt import build_system_prompt, reply_language_directive
from ..system_prompt import (
build_system_prompt,
load_agent_instructions,
reply_language_directive,
)
from ..tools.registry import run_tool_with_retries, generate_tools_description, generate_tools_json_schema, BUILTIN_TOOLS
from ..tools.builtin.stop import STOP_SIGNAL
from ..debug import debug_log
@@ -1702,6 +1706,10 @@ def run_reply_engine(db: "Database", cfg, tts: Optional[Any],
# the directive used the config value made the two contradict each other.
_output_language = _resolve_output_language()
_persona_prompt = build_system_prompt(_assistant_name, _output_language)
# File-based operator instructions: every *.md in AGENTS_DIR (default
# /app/agents, bind-mounted from ./agents). Read once per turn so edits in
# the folder apply on the next reply without a restart; fail-open to "".
_agent_instructions = load_agent_instructions()
def _build_initial_system_message() -> str:
guidance = [_persona_prompt.strip()]
@@ -1810,6 +1818,12 @@ def run_reply_engine(db: "Database", cfg, tts: Optional[Any],
if _user_instructions:
guidance.append("Additional instructions from the operator:\n" + _user_instructions)
# File-based operator instructions: the concatenated agents/*.md content
# resolved once above. Same framing/placement as the settings-UI field
# so both are treated as authoritative operator guidance.
if _agent_instructions:
guidance.append("Additional instructions from the operator:\n" + _agent_instructions)
# Recency reinforcement: repeat the language lock at the very END too.
# In a ~5k-token prompt the front-placed rule gets "lost in the middle";
# bigger models (qwen2.5:7b) otherwise leak Chinese/Cyrillic mid-reply.

View File

@@ -6,8 +6,51 @@ who renames the wake word (e.g. "Friday") gets a butler with the matching
name rather than a persona hardcoded to "Jarvis".
"""
import os
from pathlib import Path
from typing import Optional
# Default location of the operator's file-based instruction folder. In the
# Docker deployment ./agents is bind-mounted here (see docker-compose.yml), so a
# user can drop *.md files in without rebuilding. Overridable via AGENTS_DIR.
_DEFAULT_AGENTS_DIR = "/app/agents"
def load_agent_instructions(agents_dir: Optional[str] = None) -> str:
"""Concatenate every ``*.md`` in the agents dir into one instruction block.
Files are read in filename order (so ``00-tone.md`` precedes ``10-rules.md``)
and joined with blank lines. This lets the operator extend the main reply
LLM's system prompt by dropping Markdown files into a folder, no code change
or restart required — the caller reads this once per turn.
Resolution order for the directory: explicit ``agents_dir`` arg, then the
``AGENTS_DIR`` env var, then ``/app/agents``.
Fail-open by design: a missing or empty directory, an unreadable file, or
any unexpected error yields ``""`` so a misconfigured folder can never break
a reply. Only regular ``*.md`` files are read; other files are ignored.
"""
directory = agents_dir or os.environ.get("AGENTS_DIR") or _DEFAULT_AGENTS_DIR
try:
base = Path(directory)
if not base.is_dir():
return ""
parts: list[str] = []
for path in sorted(base.glob("*.md"), key=lambda p: p.name):
if not path.is_file():
continue
try:
text = path.read_text(encoding="utf-8").strip()
except Exception:
continue
if text:
parts.append(text)
return "\n\n".join(parts).strip()
except Exception:
return ""
_SYSTEM_PROMPT_TEMPLATE: str = (
"Persona: you are a British butler named {name} — polite, composed, quietly amused, and "
"quietly enjoying yourself. Default voice is dry, witty, and lightly sarcastic: you notice "

View File

@@ -7,6 +7,7 @@ hardcoded to Jarvis.
from jarvis.system_prompt import (
build_system_prompt,
load_agent_instructions,
output_language_directive,
reply_language_directive,
ENGLISH_ONLY_DIRECTIVE,
@@ -108,3 +109,57 @@ class TestReplyLanguageDirective:
def test_lock_wins_even_with_multilingual_tts(self):
directive = reply_language_directive("Korean", "melo")
assert directive is not None and "Korean" in directive
class TestLoadAgentInstructions:
"""Operator can extend the reply LLM's system prompt by dropping *.md files
into an agents/ folder. The loader concatenates them in filename order and
fails open so a missing/empty/broken folder never breaks a reply."""
def test_missing_dir_returns_empty(self, tmp_path):
assert load_agent_instructions(str(tmp_path / "does-not-exist")) == ""
def test_empty_dir_returns_empty(self, tmp_path):
assert load_agent_instructions(str(tmp_path)) == ""
def test_reads_and_concatenates_single_file(self, tmp_path):
(tmp_path / "rules.md").write_text("Always be brief.", encoding="utf-8")
assert load_agent_instructions(str(tmp_path)) == "Always be brief."
def test_files_are_ordered_by_filename(self, tmp_path):
# Filename prefixes let the operator control ordering.
(tmp_path / "10-second.md").write_text("SECOND", encoding="utf-8")
(tmp_path / "00-first.md").write_text("FIRST", encoding="utf-8")
result = load_agent_instructions(str(tmp_path))
assert result.index("FIRST") < result.index("SECOND")
def test_only_md_files_are_read(self, tmp_path):
(tmp_path / "note.txt").write_text("IGNORE ME", encoding="utf-8")
(tmp_path / "use.md").write_text("USE ME", encoding="utf-8")
result = load_agent_instructions(str(tmp_path))
assert "USE ME" in result
assert "IGNORE ME" not in result
def test_blank_files_are_skipped(self, tmp_path):
(tmp_path / "blank.md").write_text(" \n ", encoding="utf-8")
(tmp_path / "real.md").write_text("Real instruction.", encoding="utf-8")
assert load_agent_instructions(str(tmp_path)) == "Real instruction."
def test_env_var_is_used_when_no_arg(self, tmp_path, monkeypatch):
(tmp_path / "a.md").write_text("FROM ENV", encoding="utf-8")
monkeypatch.setenv("AGENTS_DIR", str(tmp_path))
assert load_agent_instructions() == "FROM ENV"
def test_explicit_arg_overrides_env(self, tmp_path, monkeypatch):
(tmp_path / "env.md").write_text("ENV", encoding="utf-8")
other = tmp_path / "other"
other.mkdir()
(other / "arg.md").write_text("ARG", encoding="utf-8")
monkeypatch.setenv("AGENTS_DIR", str(tmp_path))
assert load_agent_instructions(str(other)) == "ARG"
def test_a_file_path_instead_of_dir_returns_empty(self, tmp_path):
f = tmp_path / "file.md"
f.write_text("x", encoding="utf-8")
# Pointed at a file, not a directory → fail-open.
assert load_agent_instructions(str(f)) == ""