loadn 0.7.76__tar.gz → 0.7.78__tar.gz

{loadn-0.7.76 → loadn-0.7.78}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: loadn
-Version: 0.7.76
+Version: 0.7.78
 Summary: loadn (load-n) agent engine: Claude Code-compatible stream-json CLI, pluggable providers, tools, MCP, subagents, and context compaction. Monorepo also hosts loadn webui.
 Author: loadn-ai contributors
 License: 

{loadn-0.7.76 → loadn-0.7.78}/loadn/__init__.py

@@ -12,7 +12,7 @@ import os
 import shutil
 from pathlib import Path
 
-__version__ = "0.7.76"
+__version__ = "0.7.78"
 
 
 def loadn_home() -> Path:

{loadn-0.7.76 → loadn-0.7.78}/loadn/core/subagent.py

@@ -80,16 +80,24 @@ class SubagentManager:
         self.session_id = session_id
         self.home = home
         self.types = {**SUBAGENT_TYPES, **(extra_types or {})}
+        # 自定义类型键集（org 数字员工 def 等）：点名派发时人卡合一的判据
+        self.custom_types = set(extra_types or {})
         self.model_provider_factory = model_provider_factory
         self._sem = asyncio.Semaphore(SUBAGENT_CONCURRENCY)
         self._n = 0
         self._used_names: set[str] = set()
 
-    def _pick_name(self) -> str:
-        """子代理取名：临时工池优先（temp_pool.json 随机取），池空回落
-        AGENT_NAME_POOL 确定性轮转；同回合撞名追加「·N」。
+    def _pick_name(self, forced: str | None = None) -> str:
+        """子代理取名：forced（点名员工名）优先直用；否则临时工池优先
+        （temp_pool.json 随机取），池空回落 AGENT_NAME_POOL 确定性轮转；
+        同回合撞名追加「·N」。
 
         池文件由 webui recruit/retire 全量重写（单写者），引擎侧只读零竞态。"""
+        if forced:
+            name = forced if forced not in self._used_names \
+                else f"{forced}·{self._n}"
+            self._used_names.add(name)
+            return name
         base = None
         pool = self._temp_pool_names()
         if pool:
@@ -175,7 +183,14 @@ class SubagentManager:
             self._n += 1
             sub_sid = f"{self.session_id}-sub{self._n}"
             card_id = f"sub_{self._n}"
-            agent_name = self._pick_name()
+            # 人卡合一（DW 点名派发修复）：subagent_type 命中自定义类型
+            # （org 数字员工 def）时 agent_name 用员工名——此前恒池取临时工
+            # 名（生产实证 9b71：点名郑明衡/林知夏，卡片显示陈沐阳——员工
+            # persona/system_add 已生效但名字是临时工的，人格分裂）；池取名
+            # 只服务内建类型/未点名 general 派发。
+            agent_name = self._pick_name(
+                forced=subagent_type if subagent_type in self.custom_types
+                else None)
             if emit is not None:
                 # 形状纪律：主 emit 是 StreamJsonEmitter——message 必须是
                 # Message 对象、块必须带 to_dict()（裸 dict 会 AttributeError

{loadn-0.7.76 → loadn-0.7.78}/loadn.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: loadn
-Version: 0.7.76
+Version: 0.7.78
 Summary: loadn (load-n) agent engine: Claude Code-compatible stream-json CLI, pluggable providers, tools, MCP, subagents, and context compaction. Monorepo also hosts loadn webui.
 Author: loadn-ai contributors
 License: 

{loadn-0.7.76 → loadn-0.7.78}/loadn_webui/api/routes/consolidate.py

@@ -83,14 +83,25 @@ async def get_suggest(sid: str):
 
 
 _ADJUDICATE_SYSTEM = (
-    "你判断「用户发给 AI 助手的一条消息」是否是对助手行为的纠正、或希望助手"
-    "今后持续遵循的规则教导。只输出 JSON（不要解释）："
-    '{"verdict":"teach|correct|reject","rule":"提炼成一句 ≤40 字的规则，reject 时为空"}\n'
-    "- teach=明确教导持续规则（以后都/记住/今后一律…）\n"
-    "- correct=对助手上一轮行为的明确否定并要求改正（不对/错了/重做…）\n"
+    "你判断「用户发给 AI 助手的一条消息」是否是对助手行为的纠正/规则教导，"
+    "并评估可复用价值。只输出一行 JSON（不要解释），必须含全部三键：\\n"
+    '{"verdict":"teach|correct|reject","rule":"≤40字规则，reject为空","reusable":true|false}\\n'
+    "判定规则：\\n"
+    "- teach=明确教导持续规则（以后都/记住/今后一律…）\\n"
+    "- correct=对助手上一轮行为的明确否定并要求改正（不对/错了/重做…）\\n"
     "- reject=以下任一：转贴的日志/代码/报错文本、巡检或定时任务等系统注入、"
     "对外部事物的问题描述（错的是别的东西不是助手）、与助手行为无关的闲聊、"
-    "含纠正字样但无纠正意图的叙述。拿不准判 reject。"
+    "含纠正字样但无纠正意图的叙述。拿不准判 reject。\\n"
+    "- reusable（判 teach/correct 时必须给 false 或 true，不可省略）：该经验"
+    "能否泛化到未来其他任务。例：\\n"
+    '  用户说「不对，应该先建 venv 再装依赖」→ {"verdict":"correct",'
+    '"rule":"先建venv再pip","reusable":true}（通用纪律）\\n'
+    '  用户说「我是想让你排查X，不是让你去做Y」→ {"verdict":"correct",'
+    '"rule":"","reusable":false}（会话内意图澄清，歧义一次性，新会话'
+    "不会再遇同样场景）\\n"
+    "  以下均 reusable=false：①意图澄清（「我想让你做 X 不是 Y」）；"
+    "②仅本任务专属细节（「这个任务里不要动某文件」）；③未来遇不到的"
+    "一次性场景。reusable=false 与 reject 等效（不值得存为技能）。"
 )
 
 
@@ -129,6 +140,14 @@ async def _llm_adjudicate(card: dict) -> dict | None:
             return {"verdict": "reject"}
         d = json.loads(m.group(0))
         if d.get("verdict") in ("teach", "correct"):
+            # 价值门（VA）：判真还须可复用——意图澄清/一次性任务细节
+            # （reusable=false）视同 reject（生产实证：用户纠正「我是想让你
+            # 排查名字问题不是召唤子代理」被提炼成 avoid-lesson 存技能——
+            # 会话内歧义零跨会话价值，用户「教导完全没有价值」的直接来源）。
+            # 缺 reusable 字段亦 fail-closed（真机实测 doubao-mini 会漏键，
+            # 默认放行=价值门失效；误杀真教导的代价=少一张卡，可接受）。
+            if str(d.get("reusable", "")).lower() not in ("true", "1", "yes"):
+                return {"verdict": "reject"}
             return {"verdict": d["verdict"], "rule": str(d.get("rule") or "")}
         return {"verdict": "reject"}
     except Exception:                            # 判定失败 fail-closed（不出卡）

{loadn-0.7.76 → loadn-0.7.78}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "loadn"
-version = "0.7.76"
+version = "0.7.78"
 description = "loadn (load-n) agent engine: Claude Code-compatible stream-json CLI, pluggable providers, tools, MCP, subagents, and context compaction. Monorepo also hosts loadn webui."
 readme = "README.md"
 license = { file = "LICENSE" }

{loadn-0.7.76 → loadn-0.7.78}/tests/test_consolidate.py

@@ -509,3 +509,56 @@ async def test_llm_adjudicate_unconfigured_falls_back(client, monkeypatch):
     p = r.json()["pending"]
     assert calls["n"] == 1                              # 被调且内部短路
     assert p is not None and p["kind"] == "teach"      # 原样返回未删
+
+
+async def test_llm_adjudicate_value_gate_oneoff_clarification(client, monkeypatch):
+    """>>> VA 价值门：判真（correct）但 reusable=false 的会话内意图澄清
+    → 视同 reject 不出卡（生产实证：用户纠正「我是想让你排查名字问题，
+    不是让你召唤子代理」被提炼成 avoid-lesson——歧义一次性零跨会话价值，
+    用户「教导完全没有价值」反馈的直接来源）。"""
+    from loadn_webui.api.routes import consolidate as croute
+    from loadn_webui.config import PATHS
+    r = await client.post("/api/sessions", json={"title": "价值门"})
+    sid = r.json()["session"]["id"]
+    ws = PATHS["workspace"] / sid
+    card = {"kind": "correct", "fingerprint": "fpvg1", "name": "avoid-lesson",
+            "description": "x",
+            "trigger": "上个任务处理的不对，我是想让你排查召唤子代理时候产生的"
+                       "名字问题，而不是让你召唤子代理去处理事件",
+            "body": "# 用户教导（correct）\n\n> 上个任务处理的不对…\n\n"
+                    "## 上一轮行为（被纠正的上下文）\n\n派发了三个子代理\n\n"
+                    "## 应遵循的规则\n\n排查意图要先确认",
+            "origin_session": sid, "created_at": "now"}
+    (ws / ".loadn").mkdir(parents=True, exist_ok=True)
+    (ws / ".loadn" / "skill-suggest.json").write_text(json.dumps(card, ensure_ascii=False))
+    # 真实判定链：不 mock _llm_adjudicate，mock 其内部 HTTP 层成本高——
+    # 直接验证消费端语义：reusable=false 的真判定 → 卡被清。
+    async def fake_adj(c):
+        return {"verdict": "reject"}   # _llm_adjudicate 内部已把 reusable=false 折叠为 reject
+    monkeypatch.setattr(croute, "_llm_adjudicate", fake_adj)
+    r = await client.get(f"/api/sessions/{sid}/skill-suggest")
+    assert r.json()["pending"] is None
+    assert not (ws / ".loadn" / "skill-suggest.json").exists(), "一次性澄清不该存活"
+
+
+async def test_llm_adjudicate_reusable_true_general_discipline(client, monkeypatch):
+    """>>> VA 对照：通用纪律（先建 venv 再装依赖）reusable=true → 正常出卡。"""
+    from loadn_webui.api.routes import consolidate as croute
+    from loadn_webui.config import PATHS
+    r = await client.post("/api/sessions", json={"title": "价值门通"})
+    sid = r.json()["session"]["id"]
+    ws = PATHS["workspace"] / sid
+    card = {"kind": "correct", "fingerprint": "fpvg2", "name": "venv-first",
+            "description": "x", "trigger": "不对，应该先建 venv 再装依赖",
+            "body": "# 用户教导（correct）\n\n> 不对，应该先建 venv\n\n"
+                    "## 应遵循的规则\n\n先建 venv",
+            "origin_session": sid, "created_at": "now"}
+    (ws / ".loadn").mkdir(parents=True, exist_ok=True)
+    (ws / ".loadn" / "skill-suggest.json").write_text(json.dumps(card, ensure_ascii=False))
+    async def fake_adj(c):
+        return {"verdict": "correct", "rule": "Python 安装先建 venv 再 pip",
+                "reusable": True}     # 真判定带 reusable=true 原样传递
+    monkeypatch.setattr(croute, "_llm_adjudicate", fake_adj)
+    r = await client.get(f"/api/sessions/{sid}/skill-suggest")
+    p = r.json()["pending"]
+    assert p and p["adjudicated"] is True, "通用纪律应正常出卡"

{loadn-0.7.76 → loadn-0.7.78}/tests/test_dw_engine.py

@@ -90,3 +90,33 @@ def test_pick_name_pool_first(tmp_path):
                            cwd=tmp_path, session_id="s", home=home)
     mgr3._n = 1
     assert mgr3._pick_name() == AGENT_NAME_POOL[0], "坏池文件=空池回落"
+
+
+def test_pick_name_forced_employee_identity(tmp_path):
+    """>>> 人卡合一（DW 点名派发修复）：subagent_type 命中自定义员工类型时
+    agent_name 用员工名（生产实证 9b71：点名郑明衡，卡片显示池工陈沐阳
+    ——persona 生效但名字人格分裂）；内建类型不 forced 仍走池；同名
+    防撞追加 ·N。"""
+    import json as _json
+    home = tmp_path / "h"
+    home.mkdir()
+    (home / "temp_pool.json").write_text(
+        _json.dumps({"names": ["陈沐阳", "林晓悦"]}, ensure_ascii=False),
+        encoding="utf-8")
+    mgr = SubagentManager(
+        registry=None, provider_factory=None, cwd=tmp_path, session_id="s",
+        home=home,
+        extra_types={"郑明衡": {"tools": None, "system_add": "产品分析师"},
+                     "林知夏": {"tools": None, "system_add": "产品经理"}})
+    mgr._n = 1
+    # 点名员工：名字=员工名（不吃池）
+    assert mgr._pick_name(forced="郑明衡") == "郑明衡"
+    assert mgr._pick_name(forced="林知夏") == "林知夏"
+    # 同名并发：防撞 ·N
+    mgr._n = 3
+    assert mgr._pick_name(forced="郑明衡") == "郑明衡·3"
+    # 未 forced：池取名不变（回归）
+    assert mgr._pick_name() in {"陈沐阳", "林晓悦"}
+    # task() 派发链：custom_types 判据——点名员工的 Task 卡 agent_name=员工名
+    assert mgr.custom_types == {"郑明衡", "林知夏"}
+    assert "郑明衡" in mgr.types and "general" in mgr.types