codebee 0.1.99 → 0.1.100

package/app/core/project_memory.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import hashlib
 import json
 import os
+import re
 import stat
 import time
 from pathlib import Path
@@ -95,6 +96,8 @@ def list_entries(workdir, *, now=None):
         raw = row.get("content") or ""
         row["verified"] = hashlib.sha256(raw.encode("utf-8")).hexdigest() == row.get("content_sha256")
         row["expired"] = float(row.get("expires_at") or 0) <= stamp
+        row["feedback_score"] = int(row.get("feedback_score") or 0)
+        row["feedback_count"] = int(row.get("feedback_count") or 0)
     return sorted(rows, key=lambda x: (x.get("created_at", 0), x.get("id", "")), reverse=True)
 
 
@@ -126,14 +129,78 @@ def decide(workdir, entry_id, action, *, expected_version=None, now=None):
     return row
 
 
-def active_text(workdir, *, cap=4000, now=None):
+def feedback(workdir, entry_id, *, useful, expected_version=None, now=None):
+    """Record explicit retrieval feedback as a versioned append-only update."""
+    if not isinstance(useful, bool):
+        raise ValueError("useful 必须是布尔值")
+    path = _file(workdir)
+    row = _read(path).get(str(entry_id or ""))
+    if not row:
+        raise KeyError("记忆条目不存在")
+    if expected_version is not None and int(expected_version) != int(row.get("version") or 1):
+        raise ValueError("记忆条目版本已变化，请刷新后重试")
+    raw = row.get("content") or ""
+    if hashlib.sha256(raw.encode("utf-8")).hexdigest() != row.get("content_sha256"):
+        raise ValueError("记忆内容指纹校验失败")
+    if row.get("status") != "approved":
+        raise ValueError("只有已批准的记忆条目可以反馈")
     stamp = float(now if now is not None else time.time())
+    row = dict(row, feedback_score=int(row.get("feedback_score") or 0) +
+               (1 if useful else -1),
+               feedback_count=int(row.get("feedback_count") or 0) + 1,
+               feedback_at=stamp, version=int(row.get("version") or 1) + 1,
+               updated_at=stamp)
+    _append(path, row)
+    return row
+
+
+def _query_terms(query):
+    query = str(query or "").strip().lower()
+    words = re.findall(r"[a-z0-9_]+|[\u3400-\u9fff]+", query)
+    terms = set()
+    for word in words:
+        if len(word) > 2 and re.fullmatch(r"[\u3400-\u9fff]+", word):
+            terms.update(word[i:i + 2] for i in range(len(word) - 1))
+        else:
+            terms.add(word)
+    return terms
+
+
+def _relevance(row, terms):
+    if not terms:
+        return 0
+    title = str(row.get("title") or "").lower()
+    content = str(row.get("content") or "").lower()
+    title_terms = _query_terms(title)
+    content_terms = _query_terms(content)
+    return 4 * len(terms & title_terms) + len(terms & content_terms)
+
+
+def active_text(workdir, *, cap=4000, query="", now=None):
+    stamp = float(now if now is not None else time.time())
+    try:
+        cap = max(0, int(cap))
+    except (TypeError, ValueError):
+        cap = 4000
+    heading = "## 已批准项目记忆（内容已校验，过期条目不注入）\n\n"
+    cap = max(0, cap - len(heading) - 2)
+    terms = _query_terms(query)
     items = []
     for row in list_entries(workdir, now=stamp):
         if row.get("status") != "approved" or row.get("expired") or not row.get("verified"):
             continue
-        items.append("### %s\n%s" % (row.get("title") or "项目记忆", row.get("content") or ""))
-    text = "\n\n".join(items)
-    if len(text) > cap:
-        text = text[-cap:]
-    return ("## 已批准项目记忆（内容已校验，过期条目不注入）\n\n" + text + "\n\n") if text else ""
+        block = "### %s\n%s" % (row.get("title") or "项目记忆", row.get("content") or "")
+        items.append((row, block))
+    items.sort(key=lambda item: (_relevance(item[0], terms),
+                                 item[0].get("feedback_score", 0),
+                                 item[0].get("created_at", 0)), reverse=True)
+    selected = []
+    used = 0
+    for _row, block in items:
+        cost = len(block) + (2 if selected else 0)
+        if used + cost > cap:
+            continue
+        selected.append(block)
+        used += cost
+    text = "\n\n".join(selected)
+    return (heading + text + "\n\n") if text else ""

package/app/core/registry.py

@@ -88,6 +88,12 @@ def effective_agents(catalog_entries, detected):
         if not pref.get("enabled", entry.get("default_enabled", False)):
             continue
         out.append(_build_agent(entry))
+    try:
+        from . import backend_profiles
+        out.extend(backend_profiles.runtime_agents())
+    except Exception:
+        # Broken local profile storage must not disable unrelated installed agents.
+        pass
     out.extend([dict(m) for m in MOCK_AGENTS])
     return out
 
@@ -98,6 +104,13 @@ def installed_agent(entry_id, catalog_entries, detected):
     续会话是用户对该 CLI 的显式指定，不依赖其是否参与自动路由；
     未安装 / 无编排配置 / id 不存在时返回 None。
     """
+    if str(entry_id or "").startswith("acp-"):
+        try:
+            from . import backend_profiles
+            return next((agent for agent in backend_profiles.runtime_agents()
+                         if agent.get("id") == entry_id), None)
+        except Exception:
+            return None
     for entry in catalog_entries:
         if entry.get("id") != entry_id:
             continue

package/app/core/runner.py

@@ -1678,7 +1678,8 @@ def _opencode_fast_banner_death(res):
 
 def run_agent(agent, prompt, workdir=None, readonly=True,
               timeout=DEFAULT_TIMEOUT, cancel_event=None, log_path=None, resume=None,
-              images=None, require_tools=False, deadline=None):
+              images=None, require_tools=False, deadline=None, command_context=None,
+              checkpoint_run_id=""):
     """执行一次智能体调用，返回统一结构
     {ok, text, json, cost_usd, tokens, error, error_code, raw}。
     agent 来自 registry.effective_agents()；resume 为已有会话 id，仅真实智能体生效
@@ -1722,6 +1723,17 @@ def run_agent(agent, prompt, workdir=None, readonly=True,
                 "kind": agent.get("kind", "generic"), "model": None,
                 "attempts": []}
     kind = agent.get("kind", "generic")
+    if kind == "acp":
+        from . import acp_client
+        context = dict(command_context or {})
+        context.setdefault("run_id", checkpoint_run_id)
+        context.setdefault("sandbox", {})
+        context.setdefault("allow_terminal", not readonly)
+        return acp_client.run_agent(
+            agent, prompt, workdir=workdir, readonly=readonly, timeout=timeout,
+            cancel_event=cancel_event, deadline=deadline,
+            command_context=context, checkpoint_run_id=checkpoint_run_id,
+            resume=resume)
     if agent.get("runtime_config_sync_failed"):
         return {"ok": False, "text": "", "json": None, "cost_usd": 0.0,
                 "tokens": 0, "usage": None,

package/app/main.py

@@ -358,6 +358,15 @@ class Handler(BaseHTTPRequestHandler):
                     return self._json(200, {"entries": project_memory.list_entries(task.get("workdir"))})
                 except (OSError, ValueError) as exc:
                     return self._json(409, {"error": str(exc)})
+            if path == "/api/backend-profiles":
+                from core import backend_profiles
+                try:
+                    return self._json(200, {"profiles": backend_profiles.list_profiles()})
+                except (OSError, ValueError) as exc:
+                    return self._json(409, {"error": str(exc)})
+            if path == "/api/command-auth":
+                from core import command_auth
+                return self._json(200, command_auth.view())
             if path == "/api/agents/presence":
                 from core import presence
                 return self._json(200, {"agents": presence.list_agents()})
@@ -887,6 +896,58 @@ class Handler(BaseHTTPRequestHandler):
                 return deny
         if path == "/api/tasks":
             return self._api_create_task()
+        if path == "/api/backend-profiles":
+            from core import backend_profiles
+            try:
+                return self._json(200, {"profile": backend_profiles.save(self._body() or {})})
+            except KeyError as exc:
+                return self._json(404, {"error": str(exc)})
+            except (OSError, TypeError, ValueError) as exc:
+                return self._json(400, {"error": str(exc)})
+        m = re.match(r"^/api/backend-profiles/([^/]+)/delete$", path)
+        if m:
+            from core import backend_profiles
+            try:
+                backend_profiles.remove(unquote(m.group(1)))
+                store.bump_state()
+                return self._json(200, {"ok": True})
+            except KeyError as exc:
+                return self._json(404, {"error": str(exc)})
+            except (OSError, TypeError, ValueError) as exc:
+                return self._json(400, {"error": str(exc)})
+        if path == "/api/command-auth":
+            from core import command_auth
+            body = self._body() or {}
+            try:
+                if "mode" in body:
+                    command_auth.set_mode(body.get("mode"))
+                return self._json(200, command_auth.view())
+            except (TypeError, ValueError) as exc:
+                return self._json(400, {"error": str(exc)})
+        m = re.match(r"^/api/command-auth/requests/([^/]+)$", path)
+        if m:
+            from core import command_auth
+            body = self._body() or {}
+            try:
+                result = command_auth.decide(
+                    unquote(m.group(1)), approve=body.get("approve"),
+                    scope=body.get("scope", "once"), match=body.get("match", "exact"),
+                    prefix=body.get("prefix"))
+                return self._json(200, result)
+            except KeyError as exc:
+                return self._json(404, {"error": str(exc)})
+            except (TypeError, ValueError) as exc:
+                return self._json(400, {"error": str(exc)})
+        m = re.match(r"^/api/command-auth/rules/([^/]+)/revoke$", path)
+        if m:
+            from core import command_auth
+            try:
+                command_auth.revoke(unquote(m.group(1)))
+                return self._json(200, {"ok": True})
+            except KeyError as exc:
+                return self._json(404, {"error": str(exc)})
+            except (TypeError, ValueError) as exc:
+                return self._json(400, {"error": str(exc)})
         if path == "/api/a2a/tasks":
             status, resp = self._create_and_start(self._body() or {})
             return self._json(status, {"protocol": "a2a-lite", **resp})
@@ -915,6 +976,11 @@ class Handler(BaseHTTPRequestHandler):
             body = self._body() or {}
             from core import project_memory
             try:
+                if str(body.get("action") or "").lower() == "feedback":
+                    row = project_memory.feedback(
+                        task.get("workdir"), body.get("id"), useful=body.get("useful"),
+                        expected_version=body.get("expected_version"))
+                    return self._json(200, {"entry": row})
                 row = project_memory.decide(task.get("workdir"), body.get("id"),
                                             body.get("action"),
                                             expected_version=body.get("expected_version"))
@@ -3480,6 +3546,10 @@ def main():
     print("[CodeBee] v%s" % (_ver or "?"), flush=True)
     _step("正在准备数据目录…")
     paths.ensure_dirs()
+    from core import backend_profiles as _backend_profiles
+    from core import command_auth as _command_auth
+    _backend_profiles.init()
+    _command_auth.init()
     from core import attachments
     n_pc = attachments.cleanup_stale()  # 待提交附件残留清理（崩溃/弃单不堆积）
     if n_pc:

package/app/ui/app.js

@@ -4764,7 +4764,8 @@ window.loadProjectMemory = async function (taskId) {
     box.innerHTML = entries.map((entry) => {
       const canApprove = entry.status === "pending" && !entry.expired && entry.verified;
       const canRestore = entry.status === "archived" && !entry.expired && entry.verified;
-      const actions = (canApprove ? '<button type="button" class="ghost small" onclick="decideProjectMemory(\'' + jsq(taskId) + '\',\'' + jsq(entry.id) + '\',\'approve\',' + Number(entry.version) + ')">' + esc(t("批准")) + "</button><button type=\"button\" class=\"ghost small\" onclick=\"decideProjectMemory('" + jsq(taskId) + "','" + jsq(entry.id) + "','reject'," + Number(entry.version) + ')\">' + esc(t("拒绝")) + "</button>" : "") +
+      const feedback = entry.status === "approved" ? '<button type="button" class="ghost small" onclick="feedbackProjectMemory(\'' + jsq(taskId) + '\',\'' + jsq(entry.id) + '\',true,' + Number(entry.version) + ')">' + esc(t("有用")) + '</button><button type="button" class="ghost small" onclick="feedbackProjectMemory(\'' + jsq(taskId) + '\',\'' + jsq(entry.id) + '\',false,' + Number(entry.version) + ')">' + esc(t("无用")) + '</button>' : "";
+      const actions = feedback + (canApprove ? '<button type="button" class="ghost small" onclick="decideProjectMemory(\'' + jsq(taskId) + '\',\'' + jsq(entry.id) + '\',\'approve\',' + Number(entry.version) + ')">' + esc(t("批准")) + "</button><button type=\"button\" class=\"ghost small\" onclick=\"decideProjectMemory('" + jsq(taskId) + "','" + jsq(entry.id) + "','reject'," + Number(entry.version) + ')">' + esc(t("拒绝")) + "</button>" : "") +
         (entry.status === "approved" ? '<button type="button" class="ghost small" onclick="decideProjectMemory(\'' + jsq(taskId) + '\',\'' + jsq(entry.id) + '\',\'archive\',' + Number(entry.version) + ')">' + esc(t("归档")) + "</button>" : "") +
         (canRestore ? '<button type="button" class="ghost small" onclick="decideProjectMemory(\'' + jsq(taskId) + '\',\'' + jsq(entry.id) + '\',\'restore\',' + Number(entry.version) + ')">' + esc(t("恢复")) + "</button>" : "");
       return '<article class="rd-memory-row"><div><strong>' + esc(entry.title || t("项目记忆")) + '</strong><span class="chip">' + esc(entry.status || "") + (entry.expired ? " · " + esc(t("已过期")) : "") + '</span></div><pre>' + esc(entry.content || "") + '</pre><div class="rd-memory-actions">' + actions + "</div></article>";
@@ -4782,6 +4783,16 @@ window.decideProjectMemory = async function (taskId, id, action, version) {
   } catch (error) { toast(t("项目记忆操作失败：") + error.message, true); }
 };
 
+window.feedbackProjectMemory = async function (taskId, id, useful, version) {
+  try {
+    await api("/api/tasks/" + encodeURIComponent(taskId) + "/memory", {
+      method: "POST", headers: Object.assign({ "Content-Type": "application/json" }, authHeaders()),
+      body: JSON.stringify({ id, action: "feedback", useful, expected_version: version }),
+    });
+    await loadProjectMemory(taskId);
+  } catch (error) { toast(t("项目记忆反馈失败：") + error.message, true); }
+};
+
 window.loadRunCheckpoints = async function (requestedRunId) {
   const runId = requestedRunId || S.detailRunId || ((S.state || {}).task_latest || {})[S.detailTaskKey]?.id;
   if (!runId) return;
@@ -13362,8 +13373,77 @@ async function loadSettings() {
     }
   } catch (e) { /* 忽略 */ }
   loadSettingsV2();   // 引擎调参卡独立拉取（挂了不影响基础设置）
+  loadBackendProfiles();
+  loadCommandAuth();
 }
 
+async function loadBackendProfiles() {
+  const box = $("acp-profiles");
+  if (!box) return;
+  try {
+    const data = await api("/api/backend-profiles");
+    const rows = data.profiles || [];
+    box.innerHTML = rows.length ? rows.map((row) =>
+      '<div class="list-row"><span><b>' + esc(row.label || row.id) + '</b> · ' + esc(row.command || "") +
+      (row.enabled === false ? ' · ' + esc(t("已停用")) : '') + '</span><button class="ghost small" type="button" onclick="deleteAcpProfile(\'' + jsq(row.id) + '\')">' + esc(t("删除")) + '</button></div>'
+    ).join("") : '<span class="hint">' + esc(t("暂无 ACP 后端")) + '</span>';
+  } catch (error) {
+    box.innerHTML = '<span class="hint">' + esc(t("ACP 配置加载失败：")) + esc(error.message) + '</span>';
+  }
+}
+
+window.saveAcpProfile = async function () {
+  const msg = $("acp-msg");
+  try {
+    const argsText = ($("acp-args") || {}).value || "[]";
+    const args = JSON.parse(argsText);
+    if (!Array.isArray(args)) throw new Error(t("参数必须是 JSON 数组"));
+    await api("/api/backend-profiles", { method: "POST", headers: Object.assign({ "Content-Type": "application/json" }, authHeaders()),
+      body: JSON.stringify({ label: $("acp-label").value, command: $("acp-command").value,
+        args, workspace_path: $("acp-workspace").value }) });
+    if (msg) msg.textContent = t("ACP 后端已保存");
+    ["acp-label", "acp-command", "acp-args", "acp-workspace"].forEach((id) => { const el = $(id); if (el) el.value = id === "acp-args" ? "[]" : ""; });
+    await loadBackendProfiles();
+    await refreshState();
+  } catch (error) { if (msg) msg.textContent = t("ACP 保存失败：") + error.message; }
+};
+
+window.deleteAcpProfile = async function (id) {
+  try {
+    await api("/api/backend-profiles/" + encodeURIComponent(id) + "/delete", { method: "POST", headers: authHeaders(), body: "{}" });
+    await loadBackendProfiles();
+    await refreshState();
+  } catch (error) { toast(t("删除 ACP 失败：") + error.message, true); }
+};
+
+async function loadCommandAuth() {
+  const pendingBox = $("command-auth-pending");
+  const mode = $("command-auth-mode");
+  if (!pendingBox || !mode) return;
+  try {
+    const data = await api("/api/command-auth");
+    mode.value = data.mode || "legacy";
+    const rows = data.pending || [];
+    pendingBox.innerHTML = rows.length ? rows.map((row) =>
+      '<div class="list-row"><span><code>' + esc(row.command || "") + '</code> · ' + esc(row.source || "") + '</span><button class="ghost small" type="button" onclick="decideCommandAuth(\'' + jsq(row.id) + '\',true)">' + esc(t("批准一次")) + '</button><button class="ghost small" type="button" onclick="decideCommandAuth(\'' + jsq(row.id) + '\',false)">' + esc(t("拒绝")) + '</button></div>'
+    ).join("") : '<span class="hint">' + esc(t("暂无待批准命令")) + '</span>';
+  } catch (error) { pendingBox.innerHTML = '<span class="hint">' + esc(t("授权状态加载失败：")) + esc(error.message) + '</span>'; }
+}
+
+window.saveCommandAuthMode = async function () {
+  try {
+    await api("/api/command-auth", { method: "POST", headers: Object.assign({ "Content-Type": "application/json" }, authHeaders()), body: JSON.stringify({ mode: $("command-auth-mode").value }) });
+    await loadCommandAuth();
+  } catch (error) { const msg = $("command-auth-msg"); if (msg) msg.textContent = t("授权策略保存失败：") + error.message; }
+};
+
+window.decideCommandAuth = async function (id, approve) {
+  try {
+    await api("/api/command-auth/requests/" + encodeURIComponent(id), { method: "POST", headers: Object.assign({ "Content-Type": "application/json" }, authHeaders()), body: JSON.stringify({ approve, scope: "once" }) });
+    await loadCommandAuth();
+  } catch (error) { const msg = $("command-auth-msg"); if (msg) msg.textContent = t("命令授权操作失败：") + error.message; }
+};
+
 /* ---------------- settings_v2 引擎调参卡（schema 驱动） ----------------
  * /api/settings-v2 拉 describe（含字段元数据），按 namespace 渲染控件；
  * 保存走 /api/settings-v2/<ns> mutate（expected_revision CAS，409=别处已改，

package/app/ui/index.html

@@ -1076,6 +1076,25 @@
             </div>
             <p data-i18n="内置智能体（直连对话/直接执行）会把服务器的工具并入工具循环（mcp__服务器__工具 名）。命令在你本机执行，与「执行命令」工具同一自主权级别；工具清单缓存 5 分钟。留空 = 不启用。" class="hint">内置智能体（直连对话/直接执行）会把服务器的工具并入工具循环（mcp__服务器__工具 名）。命令在你本机执行，与「执行命令」工具同一自主权级别；工具清单缓存 5 分钟。留空 = 不启用。</p>
           </div>
+          <h3 class="sec-title">ACP Backend Profiles</h3>
+          <p class="hint">接入遵循 Agent Client Protocol v1 的本地或 SSH stdio Agent。密钥只保存在本机，读取时始终脱敏。</p>
+          <div class="field">
+            <div id="acp-profiles" class="list"></div>
+            <div class="input-row" style="margin-top:6px">
+              <input id="acp-label" type="text" placeholder="名称">
+              <input id="acp-command" type="text" placeholder="启动命令，例如 acp-agent">
+              <input id="acp-args" type="text" placeholder="参数 JSON 数组，例如 [\"--stdio\"]">
+              <input id="acp-workspace" type="text" placeholder="Agent 工作区（可空）">
+              <button class="ghost small" type="button" onclick="saveAcpProfile()">保存 ACP</button>
+            </div>
+            <p id="acp-msg" class="hint"></p>
+          </div>
+          <h3 class="sec-title">命令授权</h3>
+          <div class="field">
+            <div class="input-row"><select id="command-auth-mode"><option value="legacy">legacy：自动执行</option><option value="restricted">restricted：逐条等待批准</option></select><button class="ghost small" type="button" onclick="saveCommandAuthMode()">保存策略</button></div>
+            <div id="command-auth-pending" class="list"></div>
+            <p id="command-auth-msg" class="hint"></p>
+          </div>
           <h3 data-i18n="推送通知" class="sec-title">推送通知</h3>
           <div class="field"><label data-i18n="群机器人 Webhook（钉钉 / 飞书 / 企业微信，按域名自动适配）">群机器人 Webhook（钉钉 / 飞书 / 企业微信，按域名自动适配）</label>
             <div class="input-row">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codebee",
-  "version": "0.1.99",
+  "version": "0.1.100",
   "description": "CodeBee · 多智能体编排台 — 统一编排本机 AI 编码 CLI（Codex / Claude Code / QwenCode / OpenCode / Aider…）：目标→拆解→路由→执行→验证→跨厂商评审→修复→报告。纯 Python 标准库实现，本地 Web UI。",
   "license": "MIT",
   "bin": {