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
2 changes: 1 addition & 1 deletion Agent.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1008) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (1011) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败,v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)
Expand Down
30 changes: 27 additions & 3 deletions emrg/server/daemon.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2539,18 +2539,24 @@ async def _run_tool_loop(
reasoning=full_reasoning,
)

# Persist assistant message
# Persist assistant message (reasoning kept for DeepSeek
# thinking-mode pass-back, rant 2026-08-22T17:25:02)
session.append_message({
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
})

# Append the assistant reply to the local messages so the
# LLM context stays coherent when queued messages are
# injected after this round (mirrors Case 2's assistant
# tool_calls message).
messages.append({"role": "assistant", "content": full_content})
messages.append({
"role": "assistant",
"content": full_content,
**({"reasoning_content": full_reasoning} if full_reasoning else {}),
})

# P1 (rant 21:55:37): messages queued mid-round (after the
# round-top drain) must not end the turn — inject and continue.
Expand DownExpand Up@@ -2605,13 +2611,18 @@ async def _run_tool_loop(
},
})
assistant_msg["tool_calls"] = openai_tool_calls
if full_reasoning:
# DeepSeek thinking mode: reasoning must be passed back
# verbatim on the next round (rant 2026-08-22T17:25:02).
assistant_msg["reasoning_content"] = full_reasoning
messages.append(assistant_msg)

# Persist assistant message WITH embedded tool_calls
session.append_message({
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
"tool_calls": [
{
"id": tc.get("id", ""),
Expand DownExpand Up@@ -2734,12 +2745,17 @@ async def _run_tool_loop(
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
})

# Append the assistant reply to the local messages so the LLM
# context stays coherent when queued messages are injected
# after this round.
messages.append({"role": "assistant", "content": full_content})
messages.append({
"role": "assistant",
"content": full_content,
**({"reasoning_content": full_reasoning} if full_reasoning else {}),
})

# P1 (rant 21:55:37): messages queued mid-round must not end the
# turn — inject and continue (injection round does not consume
Expand DownExpand Up@@ -3736,6 +3752,10 @@ async def _reflect():
# IMPORTANT: assistant message with tool_calls must come BEFORE
# tool result messages (OpenAI/DeepSeek API requirement).
assistant_msg["tool_calls"] = openai_tool_calls
if msg.get("reasoning_content") or msg.get("reasoning"):
assistant_msg["reasoning_content"] = (
msg.get("reasoning_content") or msg.get("reasoning")
)
messages.append(assistant_msg)

for tc in tool_calls:
Expand DownExpand Up@@ -3848,6 +3868,10 @@ async def _consolidate_session_memories(
"function": {"name": fn.get("name", ""), "arguments": fn.get("arguments", "")},
})
assistant_msg["tool_calls"] = openai_tool_calls
if msg.get("reasoning_content") or msg.get("reasoning"):
assistant_msg["reasoning_content"] = (
msg.get("reasoning_content") or msg.get("reasoning")
)
messages.append(assistant_msg)

for tc in tool_calls:
Expand Down
6 changes: 6 additions & 0 deletions emrg/session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,6 +323,12 @@ def get_messages_for_llm(self) -> list[dict]:
if r.get("type") == "message":
msg: dict = {"role": r["role"], "content": r.get("content")}

# DeepSeek thinking mode: assistant reasoning must be passed
# back verbatim to the API (rant 2026-08-22T17:25:02). Old
# records without the field are skipped naturally.
if r.get("role") == "assistant" and r.get("reasoning"):
msg["reasoning_content"] = r["reasoning"]

# Check for embedded tool_calls (current format)
embedded_tc = r.get("tool_calls")
if embedded_tc and r["role"] == "assistant":
Expand Down
49 changes: 49 additions & 0 deletions tests/test_session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -641,6 +641,55 @@ def test_messages_with_embedded_tool_calls(self, tmp_path):
assert result[2]["role"] == "tool"
assert result[2]["tool_call_id"] == "call_1"

def test_assistant_reasoning_passed_back(self, tmp_path):
"""get_messages_for_llm() maps persisted reasoning to reasoning_content
(DeepSeek thinking-mode pass-back, rant 2026-08-22T17:25:02)."""
session = Session.create(tmp_path)
session.append_message({
"type": "message",
"role": "assistant",
"content": "answer",
"reasoning": "think step by step",
})

result = session.get_messages_for_llm()
assert len(result) == 1
assert result[0]["reasoning_content"] == "think step by step"

def test_assistant_reasoning_with_tool_calls_passed_back(self, tmp_path):
"""get_messages_for_llm() keeps reasoning_content on tool-call rounds."""
session = Session.create(tmp_path)
session.append_message({
"type": "message",
"role": "assistant",
"content": None,
"reasoning": "need to read the file",
"tool_calls": [
{"id": "call_1", "type": "function", "function": {"name": "read", "arguments": "{}"}},
],
})
session.append_message({
"type": "tool_result",
"role": "tool",
"tool_call_id": "call_1",
"content": "file content",
})

result = session.get_messages_for_llm()
assert len(result) == 2
assert result[0]["reasoning_content"] == "need to read the file"
assert "tool_calls" in result[0]

def test_old_records_without_reasoning_untouched(self, tmp_path):
"""get_messages_for_llm() skips reasoning for old records without the field."""
session = Session.create(tmp_path)
session.append_message({"type": "message", "role": "assistant", "content": "old answer"})

result = session.get_messages_for_llm()
assert len(result) == 1
assert "reasoning_content" not in result[0]
assert result[0] == {"role": "assistant", "content": "old answer"}


class TestSessionListSessions:
"""Tests for Session.list_sessions()."""
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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
2 changes: 1 addition & 1 deletion Agent.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1008) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (1011) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败,v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)
Expand Down
30 changes: 27 additions & 3 deletions emrg/server/daemon.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2539,18 +2539,24 @@ async def _run_tool_loop(
reasoning=full_reasoning,
)

# Persist assistant message
# Persist assistant message (reasoning kept for DeepSeek
# thinking-mode pass-back, rant 2026-08-22T17:25:02)
session.append_message({
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
})

# Append the assistant reply to the local messages so the
# LLM context stays coherent when queued messages are
# injected after this round (mirrors Case 2's assistant
# tool_calls message).
messages.append({"role": "assistant", "content": full_content})
messages.append({
"role": "assistant",
"content": full_content,
**({"reasoning_content": full_reasoning} if full_reasoning else {}),
})

# P1 (rant 21:55:37): messages queued mid-round (after the
# round-top drain) must not end the turn — inject and continue.
Expand DownExpand Up@@ -2605,13 +2611,18 @@ async def _run_tool_loop(
},
})
assistant_msg["tool_calls"] = openai_tool_calls
if full_reasoning:
# DeepSeek thinking mode: reasoning must be passed back
# verbatim on the next round (rant 2026-08-22T17:25:02).
assistant_msg["reasoning_content"] = full_reasoning
messages.append(assistant_msg)

# Persist assistant message WITH embedded tool_calls
session.append_message({
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
"tool_calls": [
{
"id": tc.get("id", ""),
Expand DownExpand Up@@ -2734,12 +2745,17 @@ async def _run_tool_loop(
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
})

# Append the assistant reply to the local messages so the LLM
# context stays coherent when queued messages are injected
# after this round.
messages.append({"role": "assistant", "content": full_content})
messages.append({
"role": "assistant",
"content": full_content,
**({"reasoning_content": full_reasoning} if full_reasoning else {}),
})

# P1 (rant 21:55:37): messages queued mid-round must not end the
# turn — inject and continue (injection round does not consume
Expand DownExpand Up@@ -3736,6 +3752,10 @@ async def _reflect():
# IMPORTANT: assistant message with tool_calls must come BEFORE
# tool result messages (OpenAI/DeepSeek API requirement).
assistant_msg["tool_calls"] = openai_tool_calls
if msg.get("reasoning_content") or msg.get("reasoning"):
assistant_msg["reasoning_content"] = (
msg.get("reasoning_content") or msg.get("reasoning")
)
messages.append(assistant_msg)

for tc in tool_calls:
Expand DownExpand Up@@ -3848,6 +3868,10 @@ async def _consolidate_session_memories(
"function": {"name": fn.get("name", ""), "arguments": fn.get("arguments", "")},
})
assistant_msg["tool_calls"] = openai_tool_calls
if msg.get("reasoning_content") or msg.get("reasoning"):
assistant_msg["reasoning_content"] = (
msg.get("reasoning_content") or msg.get("reasoning")
)
messages.append(assistant_msg)

for tc in tool_calls:
Expand Down
6 changes: 6 additions & 0 deletions emrg/session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,6 +323,12 @@ def get_messages_for_llm(self) -> list[dict]:
if r.get("type") == "message":
msg: dict = {"role": r["role"], "content": r.get("content")}

# DeepSeek thinking mode: assistant reasoning must be passed
# back verbatim to the API (rant 2026-08-22T17:25:02). Old
# records without the field are skipped naturally.
if r.get("role") == "assistant" and r.get("reasoning"):
msg["reasoning_content"] = r["reasoning"]

# Check for embedded tool_calls (current format)
embedded_tc = r.get("tool_calls")
if embedded_tc and r["role"] == "assistant":
Expand Down
49 changes: 49 additions & 0 deletions tests/test_session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -641,6 +641,55 @@ def test_messages_with_embedded_tool_calls(self, tmp_path):
assert result[2]["role"] == "tool"
assert result[2]["tool_call_id"] == "call_1"

def test_assistant_reasoning_passed_back(self, tmp_path):
"""get_messages_for_llm() maps persisted reasoning to reasoning_content
(DeepSeek thinking-mode pass-back, rant 2026-08-22T17:25:02)."""
session = Session.create(tmp_path)
session.append_message({
"type": "message",
"role": "assistant",
"content": "answer",
"reasoning": "think step by step",
})

result = session.get_messages_for_llm()
assert len(result) == 1
assert result[0]["reasoning_content"] == "think step by step"

def test_assistant_reasoning_with_tool_calls_passed_back(self, tmp_path):
"""get_messages_for_llm() keeps reasoning_content on tool-call rounds."""
session = Session.create(tmp_path)
session.append_message({
"type": "message",
"role": "assistant",
"content": None,
"reasoning": "need to read the file",
"tool_calls": [
{"id": "call_1", "type": "function", "function": {"name": "read", "arguments": "{}"}},
],
})
session.append_message({
"type": "tool_result",
"role": "tool",
"tool_call_id": "call_1",
"content": "file content",
})

result = session.get_messages_for_llm()
assert len(result) == 2
assert result[0]["reasoning_content"] == "need to read the file"
assert "tool_calls" in result[0]

def test_old_records_without_reasoning_untouched(self, tmp_path):
"""get_messages_for_llm() skips reasoning for old records without the field."""
session = Session.create(tmp_path)
session.append_message({"type": "message", "role": "assistant", "content": "old answer"})

result = session.get_messages_for_llm()
assert len(result) == 1
assert "reasoning_content" not in result[0]
assert result[0] == {"role": "assistant", "content": "old answer"}


class TestSessionListSessions:
"""Tests for Session.list_sessions()."""
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
2 changes: 1 addition & 1 deletion Agent.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1008) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (1011) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败,v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)
Expand Down
30 changes: 27 additions & 3 deletions emrg/server/daemon.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2539,18 +2539,24 @@ async def _run_tool_loop(
reasoning=full_reasoning,
)

# Persist assistant message
# Persist assistant message (reasoning kept for DeepSeek
# thinking-mode pass-back, rant 2026-08-22T17:25:02)
session.append_message({
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
})

# Append the assistant reply to the local messages so the
# LLM context stays coherent when queued messages are
# injected after this round (mirrors Case 2's assistant
# tool_calls message).
messages.append({"role": "assistant", "content": full_content})
messages.append({
"role": "assistant",
"content": full_content,
**({"reasoning_content": full_reasoning} if full_reasoning else {}),
})

# P1 (rant 21:55:37): messages queued mid-round (after the
# round-top drain) must not end the turn — inject and continue.
Expand DownExpand Up@@ -2605,13 +2611,18 @@ async def _run_tool_loop(
},
})
assistant_msg["tool_calls"] = openai_tool_calls
if full_reasoning:
# DeepSeek thinking mode: reasoning must be passed back
# verbatim on the next round (rant 2026-08-22T17:25:02).
assistant_msg["reasoning_content"] = full_reasoning
messages.append(assistant_msg)

# Persist assistant message WITH embedded tool_calls
session.append_message({
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
"tool_calls": [
{
"id": tc.get("id", ""),
Expand DownExpand Up@@ -2734,12 +2745,17 @@ async def _run_tool_loop(
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
})

# Append the assistant reply to the local messages so the LLM
# context stays coherent when queued messages are injected
# after this round.
messages.append({"role": "assistant", "content": full_content})
messages.append({
"role": "assistant",
"content": full_content,
**({"reasoning_content": full_reasoning} if full_reasoning else {}),
})

# P1 (rant 21:55:37): messages queued mid-round must not end the
# turn — inject and continue (injection round does not consume
Expand DownExpand Up@@ -3736,6 +3752,10 @@ async def _reflect():
# IMPORTANT: assistant message with tool_calls must come BEFORE
# tool result messages (OpenAI/DeepSeek API requirement).
assistant_msg["tool_calls"] = openai_tool_calls
if msg.get("reasoning_content") or msg.get("reasoning"):
assistant_msg["reasoning_content"] = (
msg.get("reasoning_content") or msg.get("reasoning")
)
messages.append(assistant_msg)

for tc in tool_calls:
Expand DownExpand Up@@ -3848,6 +3868,10 @@ async def _consolidate_session_memories(
"function": {"name": fn.get("name", ""), "arguments": fn.get("arguments", "")},
})
assistant_msg["tool_calls"] = openai_tool_calls
if msg.get("reasoning_content") or msg.get("reasoning"):
assistant_msg["reasoning_content"] = (
msg.get("reasoning_content") or msg.get("reasoning")
)
messages.append(assistant_msg)

for tc in tool_calls:
Expand Down
6 changes: 6 additions & 0 deletions emrg/session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,6 +323,12 @@ def get_messages_for_llm(self) -> list[dict]:
if r.get("type") == "message":
msg: dict = {"role": r["role"], "content": r.get("content")}

# DeepSeek thinking mode: assistant reasoning must be passed
# back verbatim to the API (rant 2026-08-22T17:25:02). Old
# records without the field are skipped naturally.
if r.get("role") == "assistant" and r.get("reasoning"):
msg["reasoning_content"] = r["reasoning"]

# Check for embedded tool_calls (current format)
embedded_tc = r.get("tool_calls")
if embedded_tc and r["role"] == "assistant":
Expand Down
49 changes: 49 additions & 0 deletions tests/test_session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -641,6 +641,55 @@ def test_messages_with_embedded_tool_calls(self, tmp_path):
assert result[2]["role"] == "tool"
assert result[2]["tool_call_id"] == "call_1"

def test_assistant_reasoning_passed_back(self, tmp_path):
"""get_messages_for_llm() maps persisted reasoning to reasoning_content
(DeepSeek thinking-mode pass-back, rant 2026-08-22T17:25:02)."""
session = Session.create(tmp_path)
session.append_message({
"type": "message",
"role": "assistant",
"content": "answer",
"reasoning": "think step by step",
})

result = session.get_messages_for_llm()
assert len(result) == 1
assert result[0]["reasoning_content"] == "think step by step"

def test_assistant_reasoning_with_tool_calls_passed_back(self, tmp_path):
"""get_messages_for_llm() keeps reasoning_content on tool-call rounds."""
session = Session.create(tmp_path)
session.append_message({
"type": "message",
"role": "assistant",
"content": None,
"reasoning": "need to read the file",
"tool_calls": [
{"id": "call_1", "type": "function", "function": {"name": "read", "arguments": "{}"}},
],
})
session.append_message({
"type": "tool_result",
"role": "tool",
"tool_call_id": "call_1",
"content": "file content",
})

result = session.get_messages_for_llm()
assert len(result) == 2
assert result[0]["reasoning_content"] == "need to read the file"
assert "tool_calls" in result[0]

def test_old_records_without_reasoning_untouched(self, tmp_path):
"""get_messages_for_llm() skips reasoning for old records without the field."""
session = Session.create(tmp_path)
session.append_message({"type": "message", "role": "assistant", "content": "old answer"})

result = session.get_messages_for_llm()
assert len(result) == 1
assert "reasoning_content" not in result[0]
assert result[0] == {"role": "assistant", "content": "old answer"}


class TestSessionListSessions:
"""Tests for Session.list_sessions()."""
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
2 changes: 1 addition & 1 deletion Agent.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1008) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (1011) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败,v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)
Expand Down
30 changes: 27 additions & 3 deletions emrg/server/daemon.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2539,18 +2539,24 @@ async def _run_tool_loop(
reasoning=full_reasoning,
)

# Persist assistant message
# Persist assistant message (reasoning kept for DeepSeek
# thinking-mode pass-back, rant 2026-08-22T17:25:02)
session.append_message({
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
})

# Append the assistant reply to the local messages so the
# LLM context stays coherent when queued messages are
# injected after this round (mirrors Case 2's assistant
# tool_calls message).
messages.append({"role": "assistant", "content": full_content})
messages.append({
"role": "assistant",
"content": full_content,
**({"reasoning_content": full_reasoning} if full_reasoning else {}),
})

# P1 (rant 21:55:37): messages queued mid-round (after the
# round-top drain) must not end the turn — inject and continue.
Expand DownExpand Up@@ -2605,13 +2611,18 @@ async def _run_tool_loop(
},
})
assistant_msg["tool_calls"] = openai_tool_calls
if full_reasoning:
# DeepSeek thinking mode: reasoning must be passed back
# verbatim on the next round (rant 2026-08-22T17:25:02).
assistant_msg["reasoning_content"] = full_reasoning
messages.append(assistant_msg)

# Persist assistant message WITH embedded tool_calls
session.append_message({
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
"tool_calls": [
{
"id": tc.get("id", ""),
Expand DownExpand Up@@ -2734,12 +2745,17 @@ async def _run_tool_loop(
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
})

# Append the assistant reply to the local messages so the LLM
# context stays coherent when queued messages are injected
# after this round.
messages.append({"role": "assistant", "content": full_content})
messages.append({
"role": "assistant",
"content": full_content,
**({"reasoning_content": full_reasoning} if full_reasoning else {}),
})

# P1 (rant 21:55:37): messages queued mid-round must not end the
# turn — inject and continue (injection round does not consume
Expand DownExpand Up@@ -3736,6 +3752,10 @@ async def _reflect():
# IMPORTANT: assistant message with tool_calls must come BEFORE
# tool result messages (OpenAI/DeepSeek API requirement).
assistant_msg["tool_calls"] = openai_tool_calls
if msg.get("reasoning_content") or msg.get("reasoning"):
assistant_msg["reasoning_content"] = (
msg.get("reasoning_content") or msg.get("reasoning")
)
messages.append(assistant_msg)

for tc in tool_calls:
Expand DownExpand Up@@ -3848,6 +3868,10 @@ async def _consolidate_session_memories(
"function": {"name": fn.get("name", ""), "arguments": fn.get("arguments", "")},
})
assistant_msg["tool_calls"] = openai_tool_calls
if msg.get("reasoning_content") or msg.get("reasoning"):
assistant_msg["reasoning_content"] = (
msg.get("reasoning_content") or msg.get("reasoning")
)
messages.append(assistant_msg)

for tc in tool_calls:
Expand Down
6 changes: 6 additions & 0 deletions emrg/session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,6 +323,12 @@ def get_messages_for_llm(self) -> list[dict]:
if r.get("type") == "message":
msg: dict = {"role": r["role"], "content": r.get("content")}

# DeepSeek thinking mode: assistant reasoning must be passed
# back verbatim to the API (rant 2026-08-22T17:25:02). Old
# records without the field are skipped naturally.
if r.get("role") == "assistant" and r.get("reasoning"):
msg["reasoning_content"] = r["reasoning"]

# Check for embedded tool_calls (current format)
embedded_tc = r.get("tool_calls")
if embedded_tc and r["role"] == "assistant":
Expand Down
49 changes: 49 additions & 0 deletions tests/test_session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -641,6 +641,55 @@ def test_messages_with_embedded_tool_calls(self, tmp_path):
assert result[2]["role"] == "tool"
assert result[2]["tool_call_id"] == "call_1"

def test_assistant_reasoning_passed_back(self, tmp_path):
"""get_messages_for_llm() maps persisted reasoning to reasoning_content
(DeepSeek thinking-mode pass-back, rant 2026-08-22T17:25:02)."""
session = Session.create(tmp_path)
session.append_message({
"type": "message",
"role": "assistant",
"content": "answer",
"reasoning": "think step by step",
})

result = session.get_messages_for_llm()
assert len(result) == 1
assert result[0]["reasoning_content"] == "think step by step"

def test_assistant_reasoning_with_tool_calls_passed_back(self, tmp_path):
"""get_messages_for_llm() keeps reasoning_content on tool-call rounds."""
session = Session.create(tmp_path)
session.append_message({
"type": "message",
"role": "assistant",
"content": None,
"reasoning": "need to read the file",
"tool_calls": [
{"id": "call_1", "type": "function", "function": {"name": "read", "arguments": "{}"}},
],
})
session.append_message({
"type": "tool_result",
"role": "tool",
"tool_call_id": "call_1",
"content": "file content",
})

result = session.get_messages_for_llm()
assert len(result) == 2
assert result[0]["reasoning_content"] == "need to read the file"
assert "tool_calls" in result[0]

def test_old_records_without_reasoning_untouched(self, tmp_path):
"""get_messages_for_llm() skips reasoning for old records without the field."""
session = Session.create(tmp_path)
session.append_message({"type": "message", "role": "assistant", "content": "old answer"})

result = session.get_messages_for_llm()
assert len(result) == 1
assert "reasoning_content" not in result[0]
assert result[0] == {"role": "assistant", "content": "old answer"}


class TestSessionListSessions:
"""Tests for Session.list_sessions()."""
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
2 changes: 1 addition & 1 deletion Agent.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1008) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (1011) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败,v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)
Expand Down
30 changes: 27 additions & 3 deletions emrg/server/daemon.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2539,18 +2539,24 @@ async def _run_tool_loop(
reasoning=full_reasoning,
)

# Persist assistant message
# Persist assistant message (reasoning kept for DeepSeek
# thinking-mode pass-back, rant 2026-08-22T17:25:02)
session.append_message({
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
})

# Append the assistant reply to the local messages so the
# LLM context stays coherent when queued messages are
# injected after this round (mirrors Case 2's assistant
# tool_calls message).
messages.append({"role": "assistant", "content": full_content})
messages.append({
"role": "assistant",
"content": full_content,
**({"reasoning_content": full_reasoning} if full_reasoning else {}),
})

# P1 (rant 21:55:37): messages queued mid-round (after the
# round-top drain) must not end the turn — inject and continue.
Expand DownExpand Up@@ -2605,13 +2611,18 @@ async def _run_tool_loop(
},
})
assistant_msg["tool_calls"] = openai_tool_calls
if full_reasoning:
# DeepSeek thinking mode: reasoning must be passed back
# verbatim on the next round (rant 2026-08-22T17:25:02).
assistant_msg["reasoning_content"] = full_reasoning
messages.append(assistant_msg)

# Persist assistant message WITH embedded tool_calls
session.append_message({
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
"tool_calls": [
{
"id": tc.get("id", ""),
Expand DownExpand Up@@ -2734,12 +2745,17 @@ async def _run_tool_loop(
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
})

# Append the assistant reply to the local messages so the LLM
# context stays coherent when queued messages are injected
# after this round.
messages.append({"role": "assistant", "content": full_content})
messages.append({
"role": "assistant",
"content": full_content,
**({"reasoning_content": full_reasoning} if full_reasoning else {}),
})

# P1 (rant 21:55:37): messages queued mid-round must not end the
# turn — inject and continue (injection round does not consume
Expand DownExpand Up@@ -3736,6 +3752,10 @@ async def _reflect():
# IMPORTANT: assistant message with tool_calls must come BEFORE
# tool result messages (OpenAI/DeepSeek API requirement).
assistant_msg["tool_calls"] = openai_tool_calls
if msg.get("reasoning_content") or msg.get("reasoning"):
assistant_msg["reasoning_content"] = (
msg.get("reasoning_content") or msg.get("reasoning")
)
messages.append(assistant_msg)

for tc in tool_calls:
Expand DownExpand Up@@ -3848,6 +3868,10 @@ async def _consolidate_session_memories(
"function": {"name": fn.get("name", ""), "arguments": fn.get("arguments", "")},
})
assistant_msg["tool_calls"] = openai_tool_calls
if msg.get("reasoning_content") or msg.get("reasoning"):
assistant_msg["reasoning_content"] = (
msg.get("reasoning_content") or msg.get("reasoning")
)
messages.append(assistant_msg)

for tc in tool_calls:
Expand Down
6 changes: 6 additions & 0 deletions emrg/session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,6 +323,12 @@ def get_messages_for_llm(self) -> list[dict]:
if r.get("type") == "message":
msg: dict = {"role": r["role"], "content": r.get("content")}

# DeepSeek thinking mode: assistant reasoning must be passed
# back verbatim to the API (rant 2026-08-22T17:25:02). Old
# records without the field are skipped naturally.
if r.get("role") == "assistant" and r.get("reasoning"):
msg["reasoning_content"] = r["reasoning"]

# Check for embedded tool_calls (current format)
embedded_tc = r.get("tool_calls")
if embedded_tc and r["role"] == "assistant":
Expand Down
49 changes: 49 additions & 0 deletions tests/test_session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -641,6 +641,55 @@ def test_messages_with_embedded_tool_calls(self, tmp_path):
assert result[2]["role"] == "tool"
assert result[2]["tool_call_id"] == "call_1"

def test_assistant_reasoning_passed_back(self, tmp_path):
"""get_messages_for_llm() maps persisted reasoning to reasoning_content
(DeepSeek thinking-mode pass-back, rant 2026-08-22T17:25:02)."""
session = Session.create(tmp_path)
session.append_message({
"type": "message",
"role": "assistant",
"content": "answer",
"reasoning": "think step by step",
})

result = session.get_messages_for_llm()
assert len(result) == 1
assert result[0]["reasoning_content"] == "think step by step"

def test_assistant_reasoning_with_tool_calls_passed_back(self, tmp_path):
"""get_messages_for_llm() keeps reasoning_content on tool-call rounds."""
session = Session.create(tmp_path)
session.append_message({
"type": "message",
"role": "assistant",
"content": None,
"reasoning": "need to read the file",
"tool_calls": [
{"id": "call_1", "type": "function", "function": {"name": "read", "arguments": "{}"}},
],
})
session.append_message({
"type": "tool_result",
"role": "tool",
"tool_call_id": "call_1",
"content": "file content",
})

result = session.get_messages_for_llm()
assert len(result) == 2
assert result[0]["reasoning_content"] == "need to read the file"
assert "tool_calls" in result[0]

def test_old_records_without_reasoning_untouched(self, tmp_path):
"""get_messages_for_llm() skips reasoning for old records without the field."""
session = Session.create(tmp_path)
session.append_message({"type": "message", "role": "assistant", "content": "old answer"})

result = session.get_messages_for_llm()
assert len(result) == 1
assert "reasoning_content" not in result[0]
assert result[0] == {"role": "assistant", "content": "old answer"}


class TestSessionListSessions:
"""Tests for Session.list_sessions()."""
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
2 changes: 1 addition & 1 deletion Agent.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1008) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (1011) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败,v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)
Expand Down
30 changes: 27 additions & 3 deletions emrg/server/daemon.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2539,18 +2539,24 @@ async def _run_tool_loop(
reasoning=full_reasoning,
)

# Persist assistant message
# Persist assistant message (reasoning kept for DeepSeek
# thinking-mode pass-back, rant 2026-08-22T17:25:02)
session.append_message({
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
})

# Append the assistant reply to the local messages so the
# LLM context stays coherent when queued messages are
# injected after this round (mirrors Case 2's assistant
# tool_calls message).
messages.append({"role": "assistant", "content": full_content})
messages.append({
"role": "assistant",
"content": full_content,
**({"reasoning_content": full_reasoning} if full_reasoning else {}),
})

# P1 (rant 21:55:37): messages queued mid-round (after the
# round-top drain) must not end the turn — inject and continue.
Expand DownExpand Up@@ -2605,13 +2611,18 @@ async def _run_tool_loop(
},
})
assistant_msg["tool_calls"] = openai_tool_calls
if full_reasoning:
# DeepSeek thinking mode: reasoning must be passed back
# verbatim on the next round (rant 2026-08-22T17:25:02).
assistant_msg["reasoning_content"] = full_reasoning
messages.append(assistant_msg)

# Persist assistant message WITH embedded tool_calls
session.append_message({
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
"tool_calls": [
{
"id": tc.get("id", ""),
Expand DownExpand Up@@ -2734,12 +2745,17 @@ async def _run_tool_loop(
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
})

# Append the assistant reply to the local messages so the LLM
# context stays coherent when queued messages are injected
# after this round.
messages.append({"role": "assistant", "content": full_content})
messages.append({
"role": "assistant",
"content": full_content,
**({"reasoning_content": full_reasoning} if full_reasoning else {}),
})

# P1 (rant 21:55:37): messages queued mid-round must not end the
# turn — inject and continue (injection round does not consume
Expand DownExpand Up@@ -3736,6 +3752,10 @@ async def _reflect():
# IMPORTANT: assistant message with tool_calls must come BEFORE
# tool result messages (OpenAI/DeepSeek API requirement).
assistant_msg["tool_calls"] = openai_tool_calls
if msg.get("reasoning_content") or msg.get("reasoning"):
assistant_msg["reasoning_content"] = (
msg.get("reasoning_content") or msg.get("reasoning")
)
messages.append(assistant_msg)

for tc in tool_calls:
Expand DownExpand Up@@ -3848,6 +3868,10 @@ async def _consolidate_session_memories(
"function": {"name": fn.get("name", ""), "arguments": fn.get("arguments", "")},
})
assistant_msg["tool_calls"] = openai_tool_calls
if msg.get("reasoning_content") or msg.get("reasoning"):
assistant_msg["reasoning_content"] = (
msg.get("reasoning_content") or msg.get("reasoning")
)
messages.append(assistant_msg)

for tc in tool_calls:
Expand Down
6 changes: 6 additions & 0 deletions emrg/session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,6 +323,12 @@ def get_messages_for_llm(self) -> list[dict]:
if r.get("type") == "message":
msg: dict = {"role": r["role"], "content": r.get("content")}

# DeepSeek thinking mode: assistant reasoning must be passed
# back verbatim to the API (rant 2026-08-22T17:25:02). Old
# records without the field are skipped naturally.
if r.get("role") == "assistant" and r.get("reasoning"):
msg["reasoning_content"] = r["reasoning"]

# Check for embedded tool_calls (current format)
embedded_tc = r.get("tool_calls")
if embedded_tc and r["role"] == "assistant":
Expand Down
49 changes: 49 additions & 0 deletions tests/test_session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -641,6 +641,55 @@ def test_messages_with_embedded_tool_calls(self, tmp_path):
assert result[2]["role"] == "tool"
assert result[2]["tool_call_id"] == "call_1"

def test_assistant_reasoning_passed_back(self, tmp_path):
"""get_messages_for_llm() maps persisted reasoning to reasoning_content
(DeepSeek thinking-mode pass-back, rant 2026-08-22T17:25:02)."""
session = Session.create(tmp_path)
session.append_message({
"type": "message",
"role": "assistant",
"content": "answer",
"reasoning": "think step by step",
})

result = session.get_messages_for_llm()
assert len(result) == 1
assert result[0]["reasoning_content"] == "think step by step"

def test_assistant_reasoning_with_tool_calls_passed_back(self, tmp_path):
"""get_messages_for_llm() keeps reasoning_content on tool-call rounds."""
session = Session.create(tmp_path)
session.append_message({
"type": "message",
"role": "assistant",
"content": None,
"reasoning": "need to read the file",
"tool_calls": [
{"id": "call_1", "type": "function", "function": {"name": "read", "arguments": "{}"}},
],
})
session.append_message({
"type": "tool_result",
"role": "tool",
"tool_call_id": "call_1",
"content": "file content",
})

result = session.get_messages_for_llm()
assert len(result) == 2
assert result[0]["reasoning_content"] == "need to read the file"
assert "tool_calls" in result[0]

def test_old_records_without_reasoning_untouched(self, tmp_path):
"""get_messages_for_llm() skips reasoning for old records without the field."""
session = Session.create(tmp_path)
session.append_message({"type": "message", "role": "assistant", "content": "old answer"})

result = session.get_messages_for_llm()
assert len(result) == 1
assert "reasoning_content" not in result[0]
assert result[0] == {"role": "assistant", "content": "old answer"}


class TestSessionListSessions:
"""Tests for Session.list_sessions()."""
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
2 changes: 1 addition & 1 deletion Agent.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1008) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (1011) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败,v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)
Expand Down
30 changes: 27 additions & 3 deletions emrg/server/daemon.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2539,18 +2539,24 @@ async def _run_tool_loop(
reasoning=full_reasoning,
)

# Persist assistant message
# Persist assistant message (reasoning kept for DeepSeek
# thinking-mode pass-back, rant 2026-08-22T17:25:02)
session.append_message({
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
})

# Append the assistant reply to the local messages so the
# LLM context stays coherent when queued messages are
# injected after this round (mirrors Case 2's assistant
# tool_calls message).
messages.append({"role": "assistant", "content": full_content})
messages.append({
"role": "assistant",
"content": full_content,
**({"reasoning_content": full_reasoning} if full_reasoning else {}),
})

# P1 (rant 21:55:37): messages queued mid-round (after the
# round-top drain) must not end the turn — inject and continue.
Expand DownExpand Up@@ -2605,13 +2611,18 @@ async def _run_tool_loop(
},
})
assistant_msg["tool_calls"] = openai_tool_calls
if full_reasoning:
# DeepSeek thinking mode: reasoning must be passed back
# verbatim on the next round (rant 2026-08-22T17:25:02).
assistant_msg["reasoning_content"] = full_reasoning
messages.append(assistant_msg)

# Persist assistant message WITH embedded tool_calls
session.append_message({
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
"tool_calls": [
{
"id": tc.get("id", ""),
Expand DownExpand Up@@ -2734,12 +2745,17 @@ async def _run_tool_loop(
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
})

# Append the assistant reply to the local messages so the LLM
# context stays coherent when queued messages are injected
# after this round.
messages.append({"role": "assistant", "content": full_content})
messages.append({
"role": "assistant",
"content": full_content,
**({"reasoning_content": full_reasoning} if full_reasoning else {}),
})

# P1 (rant 21:55:37): messages queued mid-round must not end the
# turn — inject and continue (injection round does not consume
Expand DownExpand Up@@ -3736,6 +3752,10 @@ async def _reflect():
# IMPORTANT: assistant message with tool_calls must come BEFORE
# tool result messages (OpenAI/DeepSeek API requirement).
assistant_msg["tool_calls"] = openai_tool_calls
if msg.get("reasoning_content") or msg.get("reasoning"):
assistant_msg["reasoning_content"] = (
msg.get("reasoning_content") or msg.get("reasoning")
)
messages.append(assistant_msg)

for tc in tool_calls:
Expand DownExpand Up@@ -3848,6 +3868,10 @@ async def _consolidate_session_memories(
"function": {"name": fn.get("name", ""), "arguments": fn.get("arguments", "")},
})
assistant_msg["tool_calls"] = openai_tool_calls
if msg.get("reasoning_content") or msg.get("reasoning"):
assistant_msg["reasoning_content"] = (
msg.get("reasoning_content") or msg.get("reasoning")
)
messages.append(assistant_msg)

for tc in tool_calls:
Expand Down
6 changes: 6 additions & 0 deletions emrg/session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,6 +323,12 @@ def get_messages_for_llm(self) -> list[dict]:
if r.get("type") == "message":
msg: dict = {"role": r["role"], "content": r.get("content")}

# DeepSeek thinking mode: assistant reasoning must be passed
# back verbatim to the API (rant 2026-08-22T17:25:02). Old
# records without the field are skipped naturally.
if r.get("role") == "assistant" and r.get("reasoning"):
msg["reasoning_content"] = r["reasoning"]

# Check for embedded tool_calls (current format)
embedded_tc = r.get("tool_calls")
if embedded_tc and r["role"] == "assistant":
Expand Down
49 changes: 49 additions & 0 deletions tests/test_session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -641,6 +641,55 @@ def test_messages_with_embedded_tool_calls(self, tmp_path):
assert result[2]["role"] == "tool"
assert result[2]["tool_call_id"] == "call_1"

def test_assistant_reasoning_passed_back(self, tmp_path):
"""get_messages_for_llm() maps persisted reasoning to reasoning_content
(DeepSeek thinking-mode pass-back, rant 2026-08-22T17:25:02)."""
session = Session.create(tmp_path)
session.append_message({
"type": "message",
"role": "assistant",
"content": "answer",
"reasoning": "think step by step",
})

result = session.get_messages_for_llm()
assert len(result) == 1
assert result[0]["reasoning_content"] == "think step by step"

def test_assistant_reasoning_with_tool_calls_passed_back(self, tmp_path):
"""get_messages_for_llm() keeps reasoning_content on tool-call rounds."""
session = Session.create(tmp_path)
session.append_message({
"type": "message",
"role": "assistant",
"content": None,
"reasoning": "need to read the file",
"tool_calls": [
{"id": "call_1", "type": "function", "function": {"name": "read", "arguments": "{}"}},
],
})
session.append_message({
"type": "tool_result",
"role": "tool",
"tool_call_id": "call_1",
"content": "file content",
})

result = session.get_messages_for_llm()
assert len(result) == 2
assert result[0]["reasoning_content"] == "need to read the file"
assert "tool_calls" in result[0]

def test_old_records_without_reasoning_untouched(self, tmp_path):
"""get_messages_for_llm() skips reasoning for old records without the field."""
session = Session.create(tmp_path)
session.append_message({"type": "message", "role": "assistant", "content": "old answer"})

result = session.get_messages_for_llm()
assert len(result) == 1
assert "reasoning_content" not in result[0]
assert result[0] == {"role": "assistant", "content": "old answer"}


class TestSessionListSessions:
"""Tests for Session.list_sessions()."""
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
2 changes: 1 addition & 1 deletion Agent.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1008) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (1011) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败,v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)
Expand Down
30 changes: 27 additions & 3 deletions emrg/server/daemon.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2539,18 +2539,24 @@ async def _run_tool_loop(
reasoning=full_reasoning,
)

# Persist assistant message
# Persist assistant message (reasoning kept for DeepSeek
# thinking-mode pass-back, rant 2026-08-22T17:25:02)
session.append_message({
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
})

# Append the assistant reply to the local messages so the
# LLM context stays coherent when queued messages are
# injected after this round (mirrors Case 2's assistant
# tool_calls message).
messages.append({"role": "assistant", "content": full_content})
messages.append({
"role": "assistant",
"content": full_content,
**({"reasoning_content": full_reasoning} if full_reasoning else {}),
})

# P1 (rant 21:55:37): messages queued mid-round (after the
# round-top drain) must not end the turn — inject and continue.
Expand DownExpand Up@@ -2605,13 +2611,18 @@ async def _run_tool_loop(
},
})
assistant_msg["tool_calls"] = openai_tool_calls
if full_reasoning:
# DeepSeek thinking mode: reasoning must be passed back
# verbatim on the next round (rant 2026-08-22T17:25:02).
assistant_msg["reasoning_content"] = full_reasoning
messages.append(assistant_msg)

# Persist assistant message WITH embedded tool_calls
session.append_message({
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
"tool_calls": [
{
"id": tc.get("id", ""),
Expand DownExpand Up@@ -2734,12 +2745,17 @@ async def _run_tool_loop(
"type": "message",
"role": "assistant",
"content": full_content,
**({"reasoning": full_reasoning} if full_reasoning else {}),
})

# Append the assistant reply to the local messages so the LLM
# context stays coherent when queued messages are injected
# after this round.
messages.append({"role": "assistant", "content": full_content})
messages.append({
"role": "assistant",
"content": full_content,
**({"reasoning_content": full_reasoning} if full_reasoning else {}),
})

# P1 (rant 21:55:37): messages queued mid-round must not end the
# turn — inject and continue (injection round does not consume
Expand DownExpand Up@@ -3736,6 +3752,10 @@ async def _reflect():
# IMPORTANT: assistant message with tool_calls must come BEFORE
# tool result messages (OpenAI/DeepSeek API requirement).
assistant_msg["tool_calls"] = openai_tool_calls
if msg.get("reasoning_content") or msg.get("reasoning"):
assistant_msg["reasoning_content"] = (
msg.get("reasoning_content") or msg.get("reasoning")
)
messages.append(assistant_msg)

for tc in tool_calls:
Expand DownExpand Up@@ -3848,6 +3868,10 @@ async def _consolidate_session_memories(
"function": {"name": fn.get("name", ""), "arguments": fn.get("arguments", "")},
})
assistant_msg["tool_calls"] = openai_tool_calls
if msg.get("reasoning_content") or msg.get("reasoning"):
assistant_msg["reasoning_content"] = (
msg.get("reasoning_content") or msg.get("reasoning")
)
messages.append(assistant_msg)

for tc in tool_calls:
Expand Down
6 changes: 6 additions & 0 deletions emrg/session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,6 +323,12 @@ def get_messages_for_llm(self) -> list[dict]:
if r.get("type") == "message":
msg: dict = {"role": r["role"], "content": r.get("content")}

# DeepSeek thinking mode: assistant reasoning must be passed
# back verbatim to the API (rant 2026-08-22T17:25:02). Old
# records without the field are skipped naturally.
if r.get("role") == "assistant" and r.get("reasoning"):
msg["reasoning_content"] = r["reasoning"]

# Check for embedded tool_calls (current format)
embedded_tc = r.get("tool_calls")
if embedded_tc and r["role"] == "assistant":
Expand Down
49 changes: 49 additions & 0 deletions tests/test_session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -641,6 +641,55 @@ def test_messages_with_embedded_tool_calls(self, tmp_path):
assert result[2]["role"] == "tool"
assert result[2]["tool_call_id"] == "call_1"

def test_assistant_reasoning_passed_back(self, tmp_path):
"""get_messages_for_llm() maps persisted reasoning to reasoning_content
(DeepSeek thinking-mode pass-back, rant 2026-08-22T17:25:02)."""
session = Session.create(tmp_path)
session.append_message({
"type": "message",
"role": "assistant",
"content": "answer",
"reasoning": "think step by step",
})

result = session.get_messages_for_llm()
assert len(result) == 1
assert result[0]["reasoning_content"] == "think step by step"

def test_assistant_reasoning_with_tool_calls_passed_back(self, tmp_path):
"""get_messages_for_llm() keeps reasoning_content on tool-call rounds."""
session = Session.create(tmp_path)
session.append_message({
"type": "message",
"role": "assistant",
"content": None,
"reasoning": "need to read the file",
"tool_calls": [
{"id": "call_1", "type": "function", "function": {"name": "read", "arguments": "{}"}},
],
})
session.append_message({
"type": "tool_result",
"role": "tool",
"tool_call_id": "call_1",
"content": "file content",
})

result = session.get_messages_for_llm()
assert len(result) == 2
assert result[0]["reasoning_content"] == "need to read the file"
assert "tool_calls" in result[0]

def test_old_records_without_reasoning_untouched(self, tmp_path):
"""get_messages_for_llm() skips reasoning for old records without the field."""
session = Session.create(tmp_path)
session.append_message({"type": "message", "role": "assistant", "content": "old answer"})

result = session.get_messages_for_llm()
assert len(result) == 1
assert "reasoning_content" not in result[0]
assert result[0] == {"role": "assistant", "content": "old answer"}


class TestSessionListSessions:
"""Tests for Session.list_sessions()."""
Expand Down
Loading