mirror of
https://github.com/agentscope-ai/ReMe.git
synced 2026-09-07 08:26:06 +00:00
### 1. Agent Wrapper(统一 Agent 后端抽象) - **`base_agent_wrapper.py`**:`reply()` 返回值从 `tuple[str, Any]` 改为 `dict`(含 `session_id` / `last_message` / `result` / 可选 `structured_output`);`reply_stream()` 改为产出统一的 `StreamChunk`。废弃 `add_tools()`,改为 `add_job_tools(names: list[str])`(按名解析 BaseJob)与 `add_skills()`;新增 `_resolve_job_tools()`、`_merged_kwargs()`、`_chunk()` 辅助方法及 `project_path` / `project_skills_root` 属性。 - **`as_agent_wrapper.py`(AgentScope 后端)**: - 会话持久化重写:`session_path` 落地到 `<vault>/<session_dir>/agentscope/`,`_load_state` 支持 `resume` / `session_id` / `fork_session`,并做 UUID 校验(`_validate_session_id`);`_cleanup_expired_sessions` 按天数清理过期会话。 - 新增内置工具集(`BypassAnalysisBash` + Edit/Glob/Grep/Read/Write),`BypassAnalysisBash` 绕过 AgentScope 自带 Bash 静态分析以让 permission_mode 生效;`_resolve_skills()` 把配置的 skill 暴露给后端,`_load_tool_env()` 注入项目 `.env`。 - `_event_to_chunk()` 把 20+ 种 AgentScope 事件(Reply/Text/Thinking/Data/ToolCall/ToolResult/ModelCall/ExceedMaxIters)归一化为 `StreamChunk`。 - **`cc_agent_wrapper.py`(Claude Code SDK 后端,+551 行)**: - 新增 `_CcFileSessionStore`:基于 vault 的文件型会话存储,实现 append(按 uuid 去重)/ load / list / delete / list_subkeys,并对路径做 `_safe_parts` + `resolve()` 防越界校验。 - `_build_options()`:统一构建 `ClaudeAgentOptions`,处理 skills、disallowed_tools(默认禁 `WebSearch`)、`.env` 注入、Claude Code 的 API 凭据解析(`_claude_code_api_env`,多级 base_url/api_key 回退)、`CLAUDE_CONFIG_DIR` 设置、skill 目录软链接(`_ensure_claude_skill_dir`)。 - `_raw_event_to_chunk()` / `_message_content_to_chunks()`:把 Anthropic 流式事件(message_start/delta/stop、content_block_*)与 SDK 消息块(AssistantMessage/UserMessage/ResultMessage/RateLimitEvent)转换为统一 `StreamChunk`;跟踪 block_id/block_type/tool_call_name 做关联;处理尾部 `"success"` 误报异常的吞掉逻辑。 ### 2. 统一流式协议(StreamChunk / ChunkEnum) - **`stream_chunk.py`**:`StreamChunk` 扩展为承载 AS + CC 双后端完整信息的统一结构,新增 `session_id` / `block_id` / `tool_call_id` / `tool_call_name` / `media_type` / `input_tokens` / `output_tokens` 等字段,纯文本流仍保持轻量。 - **`chunk_enum.py`**:补全生命周期标记 `REPLY_START` / `REPLY_END`,并文档化两套后端事件 → ChunkEnum 的映射。 ### 3. Index 模块重构(变化批次化 + dispatch) - 新增 `_change_batch.py`:`coalesce_changes()` 把同路径多次事件折叠为最终状态(结合 path 存在性判定),`bucket_changes()` 按 watchfiles.Change 分桶。 - 新增 `init_changes.py`(`InitChangesStep`):一次性扫描,对比 file_store / file_catalog 已索引节点计算 added/modified/deleted,写入 `context["changes"]` 后 dispatch。 - 新增 `update_changes.py`:抽象基类 `ChangeApplyStep` 统一 added/modified/deleted 处理与错误收集;`UpdateCatalogStep`(写 file_catalog)、`UpdateIndexStep`(写 file_store,含按后缀解析 chunker)。 - **`watch_changes.py`**:改用 `dispatch_step_specs`(基类提供的 `dispatch_steps()`),每批先 `coalesce_changes` 再 dispatch;默认参数调整(debounce 5000ms / step 1000ms / poll 5000ms)并暴露常量。 - 删除旧步骤:`clear_and_scan` / `foreach_dispatch` / `scan_changes` / `update_catalog`(旧) / `update_index`(旧);`clear_store.py` 取代 clear_and_scan。 ### 4. Evolve / Dream 模块(拆分为多步 pipeline) - 删除旧的单体 `auto_dream.py` / `dream.py` / `dream.yaml`,新增 `dream/` 子包,按 5 个步骤组织: - **`extract.py`**:扫描当日 day-index + daily 笔记,对比 file_catalog 找出 changed/deleted,调用 LLM 全局抽取 `units`(procedure/personal/wiki 三桶)与 `topics`,路径与桶做清洗/路由。 - **`integrate.py`**:逐个 unit 调用 LLM 写入 digest,结构化输出 `IntegrateOutcome`(CREATE/CORROBORATE/REFINE/CORRECT),失败 unit/路径收集回写。 - **`topics.py`**:写 `daily/<date>/interests.yaml`,结合当天已有 + 近 N 天做去重(`normalize_topic`),可走 LLM 或纯规则去重两条路径。 - **`proactive.py`**:读取当日 `interests.yaml`,作为主动推荐话题的入口。 - **`finish.py`**:把变更路径落盘到 dream file_catalog(checkpoint),渲染最终汇总摘要。 - 新增 `schema.py`(`DreamState` 等跨步骤共享状态与结构化输出模型)与 `utils.py`(状态存取、扫描打包、YAML 读写、结构化回复解析等公共函数)。 - `evolve/__init__.py` 导出全部新 step。 ### 5. auto_memory / auto_resource(适配新 Agent API) - **`auto_memory.py`**:会话路径迁移到 `<session_dir>/dialog/<session_id>.jsonl`;改用 `job_tools`;新增 `source_conversation` frontmatter 反向链接(`_session_link`);执行后刷新 day 索引(`refresh_day_index`),并对 session_id 做合法性校验。 - **`auto_resource.py`**:资源改用「同名 daily note」方案(`_compute_note_stem` 取文件 stem);批量处理 `changes: list[dict]`(`_handle_change` 逐项处理,返回逐项结果摘要);agent 会话 id 用稳定的 `uuid5`;同样刷新 day 索引。 ### 6. BaseStep 基类增强 - 新增 `dispatch_steps` / `dispatch_step_specs` 机制:`_resolve_dispatch_step()` 支持字符串或 dict 形式的 step spec,`dispatch_steps()` 复用当前 context 调用下游 step。 - 新增 `config_value()`:按 key 取 app config,缺失时回退 `ApplicationConfig` 默认值。 - 小幅清理:`language` 初始化、`copy()`、`Ref.__init__` 签名精简。 ### 7. Components 改动 - **`file_store/local_file_store.py`**:持久化改用 zstd 压缩(`.jsonl.zst`,通过新 `utils/jsonl_zst.py`);upsert 时先删除旧 chunk 的 keyword 文档;embedding 复用改为 `(text, embedding)` 键控,要求文本一致才复用;新增 `_matches_search_filter()` 对 vector/keyword 搜索做 path/path_prefix/metadata 的统一后过滤。 - **`keyword_index/bm25_index.py`**:索引文件名加入组件名 + tokenizer 指纹(sha256 前 12 位),快照/恢复时校验指纹防配置漂移;空索引 dump 时删除文件,加载失败抛错而非静默。 - **`file_chunker/markdown_file_chunker.py`**:弃用 `python-frontmatter`,改用内置 YAML 解析(非法 YAML 不阻断正文索引),并修正因 frontmatter 占用行号导致的 AST 行号偏移(`line_offset`)。 - **`cron_job.py`**:大幅简化(-187 行),由原来「dispatch 外部 job/step + 多种调度模式」改为「在自身 steps 上跑 cron 表达式」;`Application` 启动顺序随之调整为 base > stream > background > cron。 - 其余小调整:service(base/http/mcp)、file_graph、file_catalog、as_llm、as_embedding、tokenizer、prompt_handler、base_component 的签名/接口微调。 ### 8. Application 生命周期 - `_start()` 启动顺序明确为 components → base → stream → background → cron,启动失败会触发 `_close()` 回滚并 re-raise(不再吞异常)。 - 启动时创建 `session_dir` 目录;新增 `update_component()`(按类型/名就地更新已存在组件,不存在则报错)。 ### 9. File IO / 路径安全 - **`_path.py`**:`resolve_path` 增加 vault 越界防护(`is_relative_to` 校验),禁止 `.` / `..` 路径分量,支持 `allow_empty`。 - **`read.py`**:大文件(超过 `MAX_FILE_READ_BYTES`)走按行读取 `read_file_lines_safe`,避免一次性载入内存。 - **`_file_io.py` / `_daily_index.py` / `_path.py`** 等支持函数补齐(如 `refresh_day_index`、`read_file_lines_safe`)。 - **`env_utils.py`**:新增 `parse_env_file()`,`load_env()` 返回加载到的键值、支持 `override`、对无路径调用做幂等缓存。 ### 10. Config - `ApplicationConfig` 新增 `session_dir`(默认 `reme_session`)。 - `config_parser.py`:环境变量展开后做类型转换(`_convert_value`)、dot-notation 与 key=value 参数校验更严格、配置文件路径支持相对 `_CONFIG_DIR` 查找、根非 dict 报错。 - `default.yaml`:作业编排改用 `init_changes_step` + `dispatch_steps`(index/resource/digest 三个 watch loop 与 reindex);新增 `auto_dream`(4 步)、`proactive` 作业,移除旧 `dream`;file_catalog 增配 `resource` / `digest` / `dream` 实例;LLM 默认值与 Claude Code 凭据配置调整(tool_result_limit 50000、thinking_enable=false 等)。 ### 11. 其它 - 新增 `steps/common/add.py`(`AddStep` 算术 demo)、`channel/__init__.py` 与 common `__init__` 导出整理。 - 新增 4 篇文档:`docs4/auto_dream_logic_and_step_refactor.md`、`docs4/watch_loop_step_refactor_plan.md`、`docs4/todo.md`,以及 `reme_design.md` 更新。 **
660 lines
24 KiB
Python
660 lines
24 KiB
Python
"""Shared integration-test fixture: build a vault test environment.
|
|
|
|
Every integration test in this directory used to repeat the same
|
|
boilerplate — temp dir, ``chdir``, ``load_env()``, ``_make_app()``,
|
|
``_today()``, ``_AgentMemoryRecorder``, ``_wait_for_glob`` /
|
|
``_wait_for_populated`` / ``_wait_for_server``, ad-hoc seed helpers
|
|
(daily notes, resource files, the dreamer's pre-existing digest nodes).
|
|
|
|
This module unifies all of that behind one entry point:
|
|
|
|
from _vault_fixture import vault_env
|
|
|
|
async def run():
|
|
with vault_env() as env:
|
|
app = await env.make_app()
|
|
try:
|
|
# env.vault_dir, env.today, env.place_resource(...),
|
|
# env.seed_daily_note(...), env.seed_dream_vault(),
|
|
# env.wait_for_populated(...), env.record_agents(...) ...
|
|
...
|
|
finally:
|
|
await env.close_all()
|
|
|
|
``env.make_app()`` defaults to the standard config; pass
|
|
``config="cc"`` for the CC SDK wiring, or arbitrary kwargs to deep-merge
|
|
into ``resolve_app_config``. The vault path is fixed to
|
|
``<tmp_workspace>/.reme`` so seed helpers can write files before the
|
|
app is started.
|
|
|
|
The dreamer-specific seed (4 pre-existing digest nodes spread across
|
|
the three buckets + 4 daily provenance stubs + a new daily note that
|
|
exercises CREATE and UPDATE in each bucket) is preserved as
|
|
``env.seed_dream_vault()`` / ``DREAM_INPUT_PATH``.
|
|
|
|
Usage as a script (for the dreamer manual run):
|
|
|
|
python tests4/integration/_vault_fixture.py /tmp/my-vault
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import contextlib
|
|
import json
|
|
import os
|
|
import shutil
|
|
import socket
|
|
import sys
|
|
import tempfile
|
|
import time
|
|
from datetime import date as _date
|
|
from pathlib import Path
|
|
from typing import Any, Iterator
|
|
|
|
REPO_ROOT = Path(__file__).resolve().parents[2]
|
|
INTEGRATION_DIR = Path(__file__).resolve().parent
|
|
|
|
|
|
# ─────────────────────────────────────────────────────────────────────────────
|
|
# Dream preset — pre-existing digest nodes + a new daily note that exercises
|
|
# CREATE and UPDATE across the three buckets (procedure / personal / wiki).
|
|
# ─────────────────────────────────────────────────────────────────────────────
|
|
|
|
DREAM_INPUT_PATH = "daily/2026-05-28/auth-refactor/notes.md"
|
|
|
|
_DREAM_FILES: dict[str, str] = {
|
|
# ----- pre-existing digest nodes (recall targets) -----
|
|
"digest/wiki/jwt.md": """\
|
|
---
|
|
name: jwt
|
|
description: JSON Web Token — signed authentication token format
|
|
---
|
|
|
|
# JWT
|
|
|
|
JSON Web Token (RFC 7519). A compact, signed (JWS) or encrypted (JWE)
|
|
token used to assert identity and claims between parties.
|
|
|
|
## Structure
|
|
- Header — `alg`, `typ`, `kid`
|
|
- Payload — claims: `iss`, `sub`, `aud`, `exp`, `iat`
|
|
- Signature
|
|
|
|
## Related
|
|
Often issued by [[digest/wiki/oauth2.md]] flows.
|
|
|
|
derived_from:: [[daily/2026-05-15/auth-design/notes.md]]
|
|
""",
|
|
"digest/wiki/oauth2.md": """\
|
|
---
|
|
name: oauth2
|
|
description: OAuth 2.0 — delegated authorization framework
|
|
---
|
|
|
|
# OAuth 2.0
|
|
|
|
RFC 6749. A delegated authorization framework: a resource owner grants
|
|
a client limited access to a protected resource via an access token
|
|
issued by an authorization server.
|
|
|
|
## Grant types
|
|
- Authorization code (with PKCE for public clients)
|
|
- Client credentials
|
|
- Refresh token
|
|
|
|
derived_from:: [[daily/2026-05-10/oauth-intro/notes.md]]
|
|
""",
|
|
"digest/procedure/key-rotation.md": """\
|
|
---
|
|
name: key-rotation
|
|
description: Rotating signing keys for JWT issuance
|
|
---
|
|
|
|
# Key rotation (current — pre 2026-05-28 refactor)
|
|
|
|
Procedure for rotating the signing key used by [[digest/wiki/jwt.md]]
|
|
issuance.
|
|
|
|
## Steps
|
|
1. Generate new keypair offline.
|
|
2. Publish the public key to the JWKS endpoint with a fresh `kid`.
|
|
3. Wait 24h for clients to refresh their JWKS cache.
|
|
4. Cut over the signer to the new private key.
|
|
5. Mark the old `kid` as deprecated; remove after 30 days.
|
|
|
|
## Cadence
|
|
Default rotation cadence is **30 days**. Driven by historical practice;
|
|
no formal compliance requirement has tightened this so far.
|
|
|
|
derived_from:: [[daily/2026-05-20/rotation-plan/notes.md]]
|
|
""",
|
|
"digest/personal/no-trailing-summary.md": """\
|
|
---
|
|
name: no-trailing-summary
|
|
description: 不要在回复末尾加总结段落
|
|
---
|
|
|
|
# 不要在回复末尾加总结段落
|
|
|
|
用户能看 diff,不需要在回复末尾重述刚做的事。
|
|
|
|
**Why**: diff 已经把"改了什么"摆在用户面前;再口述一遍是噪音。
|
|
|
|
**How to apply**: 任意编码 / 编辑任务回复结束时,直接停在最后一条
|
|
有信息量的话上,不要再补一段"以上就是本次的修改..."。
|
|
|
|
derived_from:: [[daily/2026-05-01/style-feedback/notes.md]]
|
|
""",
|
|
# ----- daily provenance stubs (so the digest links don't dangle) -----
|
|
"daily/2026-05-01/style-feedback/notes.md": """\
|
|
---
|
|
name: notes
|
|
description: style feedback to Claude on 2026-05-01
|
|
---
|
|
|
|
# Style feedback (2026-05-01)
|
|
|
|
每次任务结束都重述了一遍刚做的事——不需要,我能看 diff。以后直接停。
|
|
""",
|
|
"daily/2026-05-10/oauth-intro/notes.md": """\
|
|
---
|
|
name: notes
|
|
description: OAuth 2.0 intro session
|
|
---
|
|
|
|
# OAuth 2.0 intro
|
|
|
|
简介 grant types: authorization code (with PKCE), client credentials,
|
|
refresh token。重点放在 PKCE 是给 public clients 用的。
|
|
""",
|
|
"daily/2026-05-15/auth-design/notes.md": """\
|
|
---
|
|
name: notes
|
|
description: initial auth design discussion
|
|
---
|
|
|
|
# Auth design
|
|
|
|
讨论 JWT 的结构 (header / payload / signature) 和我们项目里的 claim
|
|
约定 (iss, sub, aud, exp, iat)。
|
|
""",
|
|
"daily/2026-05-20/rotation-plan/notes.md": """\
|
|
---
|
|
name: notes
|
|
description: key rotation plan v1
|
|
---
|
|
|
|
# Key rotation plan v1
|
|
|
|
定下当前的 5 步轮换流程:offline 生成 keypair → 发布到 JWKS (新 kid)
|
|
→ 等 24h cache → 切签发 → 30 天后清旧 kid。周期定 30 天。
|
|
""",
|
|
# ----- the NEW daily note dreamer will be invoked on -----
|
|
DREAM_INPUT_PATH: """\
|
|
---
|
|
name: notes
|
|
description: auth refactor working notes — 2026-05-28
|
|
---
|
|
|
|
# Auth refactor — 2026-05-28
|
|
|
|
## 决定:JWT 轮换周期改为 24 小时
|
|
|
|
今天确定把 JWT 签名密钥的轮换周期从 30 天压到 **24 小时**。原因是
|
|
SOC2 合规审计批评:30 天的会话 token 太长,不满足"短期凭证"原则。
|
|
|
|
新流程不再依赖 JWKS cache 的 24h 等待,改成走 Redis 里的 `kid`
|
|
版本号实时下发。客户端在 token 验证失败时主动拉新 JWKS,而不是定
|
|
时轮询。
|
|
|
|
(这条同时更新 JWT 概念笔记和 key-rotation 流程笔记。)
|
|
|
|
## 新概念:kid 版本号机制
|
|
|
|
`kid` (key ID) 是 JWT header 里的字段。我们把它当成版本号来用:
|
|
Redis key `auth:jwks:current_kid` 保存当前活跃 kid;Auth Service
|
|
在签发 token 时读这个 key,客户端验证失败时也读这个 key 再拉对应
|
|
的 public key。这样无须等 cache TTL。
|
|
|
|
## 顺带复习:OAuth 2.0 是什么
|
|
|
|
(为了帮新同学接住上下文,这里把 OAuth 2.0 简单重述一下,不引入
|
|
新事实。)OAuth 2.0 (RFC 6749) 是一个委托授权框架:资源所有者
|
|
允许 client 通过 authorization server 颁发的 access token 来有
|
|
限度地访问受保护资源。常见 grant types: authorization code
|
|
(public client 用 PKCE)、client credentials、refresh token。
|
|
——这一段没有任何新内容,纯粹是给后面 JWT 24h 轮换决定铺垫读者
|
|
的背景知识。
|
|
|
|
## 观察:SOC2 审计在 30 天周期上的具体批评
|
|
|
|
审计员引用 SOC2 CC6.1 控制点:"会话凭证应有合理的短期有效期"。
|
|
30 天对应于人类工作周期,但对自动化客户端 token 来说过长。审计
|
|
要求 24h 或更短,且必须能在事件响应时立即吊销 (kid 切换可满足)。
|
|
|
|
## 偏好:小 PR 优先
|
|
|
|
后续这个 refactor 拆 PR 时,每个 PR 控制在 < 300 行。原因是 review
|
|
负担太大时容易被拍脑袋通过,这违背了 SOC2 审计中变更管理的精神。
|
|
|
|
## 偏好:回复结尾再补充
|
|
|
|
之前说过不要总结段落 (我能看 diff),今天再补充一点:也不要"接下来
|
|
的步骤"列表,除非我明确问 next steps。直接回答问题然后停。
|
|
|
|
## 关联:已有 digest
|
|
|
|
这次 refactor 直接更新这几篇已有 digest 笔记(这里用 wikilink
|
|
引用,方便检索关联):
|
|
|
|
- JWT 概念:[[digest/wiki/jwt.md]]
|
|
- 签名密钥轮换流程:[[digest/procedure/key-rotation.md]]
|
|
""",
|
|
}
|
|
|
|
_CLEAN_DIRS = ("daily", "digest", "resource", "reme_metadata")
|
|
|
|
|
|
# ─────────────────────────────────────────────────────────────────────────────
|
|
# Small primitives
|
|
# ─────────────────────────────────────────────────────────────────────────────
|
|
|
|
|
|
def today() -> str:
|
|
"""ISO date today, e.g. ``2026-06-08`` — same shape every test expected."""
|
|
return _date.today().isoformat()
|
|
|
|
|
|
@contextlib.contextmanager
|
|
def temp_chdir(path) -> Iterator[Path]:
|
|
"""``chdir`` to ``path`` for the block; restore the original cwd on exit."""
|
|
old = os.getcwd()
|
|
os.chdir(path)
|
|
try:
|
|
yield Path(path)
|
|
finally:
|
|
os.chdir(old)
|
|
|
|
|
|
def port_free(host: str, port: int) -> bool:
|
|
"""True iff (host, port) is currently bindable. Used by webhook tests
|
|
to fail fast instead of racing the connector start-up against a
|
|
listener that's already squatting the port."""
|
|
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
|
|
try:
|
|
sock.bind((host, port))
|
|
except OSError:
|
|
return False
|
|
return True
|
|
|
|
|
|
# ─────────────────────────────────────────────────────────────────────────────
|
|
# Agent transcript capture — monkey-patches ``Agent.__init__`` to grab every
|
|
# agent created within its ``with`` block, then dumps each agent's context
|
|
# to ``<dump_dir>/<prefix>_<idx>_<name>.jsonl`` on ``dump()``.
|
|
# ─────────────────────────────────────────────────────────────────────────────
|
|
|
|
|
|
class AgentMemoryRecorder:
|
|
"""Record every ``agentscope.agent.Agent`` instance created within the block.
|
|
|
|
Used to surface the ReAct trace of Phase 1 / Phase 2 dreams, the
|
|
daily-write fork, the resource-interpret agent, etc. — what tools
|
|
were called in what order, what candidates were recalled, what the
|
|
LLM decided. Dumps land under ``<vault>/agent_logs/`` by default
|
|
(created by :meth:`VaultEnv.record_agents`) so they're auto-cleaned
|
|
with the throwaway vault. Pass an explicit ``dump_dir`` to persist
|
|
them somewhere else for post-mortem inspection.
|
|
"""
|
|
|
|
def __init__(self, dump_dir: Path, prefix: str = "agent"):
|
|
self.dump_dir = dump_dir
|
|
self.prefix = prefix
|
|
self.agents: list[Any] = []
|
|
self._orig_init = None
|
|
self.dumped_paths: list[Path] = []
|
|
|
|
def __enter__(self):
|
|
from agentscope.agent import Agent # local import — heavy module
|
|
|
|
self._orig_init = Agent.__init__
|
|
agents = self.agents
|
|
orig = self._orig_init
|
|
|
|
def _capturing_init(agent_self, *args, **kwargs):
|
|
orig(agent_self, *args, **kwargs)
|
|
agents.append(agent_self)
|
|
|
|
Agent.__init__ = _capturing_init
|
|
return self
|
|
|
|
def __exit__(self, *exc):
|
|
from agentscope.agent import Agent
|
|
|
|
if self._orig_init is not None:
|
|
Agent.__init__ = self._orig_init
|
|
|
|
async def dump(self) -> list[Path]:
|
|
"""Serialize captured agent transcripts to ``<dump_dir>/`` and return paths."""
|
|
self.dump_dir.mkdir(parents=True, exist_ok=True)
|
|
for stale in self.dump_dir.glob(f"{self.prefix}_*.jsonl"):
|
|
stale.unlink()
|
|
|
|
for idx, agent in enumerate(self.agents, 1):
|
|
messages = agent.state.context
|
|
name = getattr(agent, "name", "agent") or "agent"
|
|
out_path = self.dump_dir / f"{self.prefix}_{idx:02d}_{name}.jsonl"
|
|
with out_path.open("w", encoding="utf-8") as f:
|
|
for msg in messages:
|
|
f.write(json.dumps(msg.model_dump(), ensure_ascii=False, default=str) + "\n")
|
|
self.dumped_paths.append(out_path)
|
|
return self.dumped_paths
|
|
|
|
|
|
# ─────────────────────────────────────────────────────────────────────────────
|
|
# VaultEnv — the value the ``vault_env()`` context manager yields. Holds the
|
|
# resolved vault path, app construction, seeding, wait helpers, recorder
|
|
# factory, and tracks any apps the test started so they get closed.
|
|
# ─────────────────────────────────────────────────────────────────────────────
|
|
|
|
|
|
class VaultEnv:
|
|
"""A vault test environment — temp workspace + helpers."""
|
|
|
|
def __init__(self, workspace: Path, vault_dir: Path):
|
|
self.workspace = workspace
|
|
self.vault_dir = vault_dir
|
|
self.today = today()
|
|
self._apps: list[Any] = []
|
|
|
|
# ----- app construction -----------------------------------------------
|
|
|
|
async def make_app(self, *, config: str | None = None, **overrides) -> Any:
|
|
"""Build and start an ``Application`` (default config) and track it for cleanup.
|
|
|
|
Pass ``config="cc"`` for the CC SDK wiring; arbitrary kwargs are
|
|
deep-merged into ``resolve_app_config`` (e.g. ``jobs={...}`` to
|
|
inject a background connector).
|
|
"""
|
|
from reme4 import Application
|
|
from reme4.config import resolve_app_config
|
|
|
|
kwargs: dict[str, Any] = {
|
|
"log_to_console": False,
|
|
"log_to_file": False,
|
|
"enable_logo": False,
|
|
"vault_dir": str(self.vault_dir),
|
|
}
|
|
if config:
|
|
kwargs["config"] = config
|
|
kwargs.update(overrides)
|
|
cfg = resolve_app_config(**kwargs)
|
|
app = Application(**cfg)
|
|
await app.start()
|
|
self._apps.append(app)
|
|
return app
|
|
|
|
async def make_reme(self, **overrides) -> Any:
|
|
"""Same as ``make_app`` but returns a ``ReMe`` instance (alias of ``Application``)."""
|
|
from reme4 import ReMe
|
|
from reme4.config import resolve_app_config
|
|
|
|
kwargs: dict[str, Any] = {"vault_dir": str(self.vault_dir)}
|
|
kwargs.update(overrides)
|
|
cfg = resolve_app_config(**kwargs)
|
|
app = ReMe(**cfg)
|
|
await app.start()
|
|
self._apps.append(app)
|
|
return app
|
|
|
|
async def close_all(self) -> None:
|
|
"""Close every app started via this env. Idempotent."""
|
|
for app in self._apps:
|
|
await app.close()
|
|
self._apps.clear()
|
|
|
|
# ----- seeding --------------------------------------------------------
|
|
|
|
def clean(self) -> list[str]:
|
|
"""Remove fixture-managed subdirs (``daily/``, ``digest/``, ``resource/``,
|
|
``reme_metadata/``) under the vault so the next seed starts clean.
|
|
Returns relative paths that were actually removed."""
|
|
removed: list[str] = []
|
|
for rel in _CLEAN_DIRS:
|
|
target = self.vault_dir / rel
|
|
if target.exists():
|
|
shutil.rmtree(target)
|
|
removed.append(rel)
|
|
return removed
|
|
|
|
def seed_dream_vault(self) -> list[str]:
|
|
"""Write the dreamer preset: pre-existing digest nodes + provenance
|
|
stubs + the new daily note dreamer will be invoked on
|
|
(``DREAM_INPUT_PATH``). Idempotent — skips files that already exist.
|
|
Returns relative paths that were actually written."""
|
|
seeded: list[str] = []
|
|
for rel, body in _DREAM_FILES.items():
|
|
target = self.vault_dir / rel
|
|
if target.exists():
|
|
continue
|
|
target.parent.mkdir(parents=True, exist_ok=True)
|
|
target.write_text(body, encoding="utf-8")
|
|
seeded.append(rel)
|
|
return seeded
|
|
|
|
def place_resource(
|
|
self,
|
|
filename: str,
|
|
content: str,
|
|
*,
|
|
date: str | None = None,
|
|
) -> str:
|
|
"""Drop a file under ``resource/<date>/<filename>``. Returns the
|
|
vault-relative path so the caller can pass it straight to
|
|
``auto_resource``."""
|
|
d = date or self.today
|
|
resource_dir = self.vault_dir / "resource" / d
|
|
resource_dir.mkdir(parents=True, exist_ok=True)
|
|
path = resource_dir / filename
|
|
path.write_text(content, encoding="utf-8")
|
|
return f"resource/{d}/{filename}"
|
|
|
|
def seed_daily_note(
|
|
self,
|
|
stem: str,
|
|
body: str,
|
|
*,
|
|
date: str | None = None,
|
|
) -> Path:
|
|
"""Write a note at ``daily/<date>/<stem>.md`` and return the absolute path."""
|
|
d = date or self.today
|
|
day_dir = self.vault_dir / "daily" / d
|
|
day_dir.mkdir(parents=True, exist_ok=True)
|
|
path = day_dir / f"{stem}.md"
|
|
path.write_text(body, encoding="utf-8")
|
|
return path
|
|
|
|
# ----- introspection --------------------------------------------------
|
|
|
|
def daily_notes(self, *, date: str | None = None) -> list[Path]:
|
|
"""All ``.md`` files under ``daily/<date>/`` (sorted)."""
|
|
d = date or self.today
|
|
day_dir = self.vault_dir / "daily" / d
|
|
if not day_dir.is_dir():
|
|
return []
|
|
return sorted(day_dir.glob("*.md"))
|
|
|
|
def digest_files(self) -> list[Path]:
|
|
"""All ``.md`` files anywhere under ``digest/`` (sorted)."""
|
|
digest_root = self.vault_dir / "digest"
|
|
if not digest_root.is_dir():
|
|
return []
|
|
return sorted(digest_root.rglob("*.md"))
|
|
|
|
def session_state_files(self, prefix: str = "session_state_") -> list[Path]:
|
|
"""All session-state jsonl files (the agent wrapper writes these under
|
|
``resource/`` whenever a ``session_id`` is provided)."""
|
|
resource_dir = self.vault_dir / "resource"
|
|
if not resource_dir.exists():
|
|
return []
|
|
return sorted(resource_dir.rglob(f"{prefix}*.jsonl"))
|
|
|
|
# ----- async wait helpers --------------------------------------------
|
|
|
|
async def wait_for_glob(
|
|
self,
|
|
parent: Path,
|
|
pattern: str,
|
|
timeout: float,
|
|
poll: float = 0.5,
|
|
) -> Path:
|
|
"""Poll ``parent.glob(pattern)`` until the first match appears or timeout."""
|
|
deadline = time.monotonic() + timeout
|
|
while time.monotonic() < deadline:
|
|
if parent.is_dir():
|
|
matches = sorted(parent.glob(pattern))
|
|
if matches:
|
|
return matches[0]
|
|
await asyncio.sleep(poll)
|
|
listing = [p.name for p in parent.iterdir()] if parent.is_dir() else []
|
|
raise TimeoutError(
|
|
f"timeout after {timeout}s waiting for {parent}/{pattern}; dir listing: {listing}",
|
|
)
|
|
|
|
async def wait_for_populated(
|
|
self,
|
|
parent: Path,
|
|
pattern: str,
|
|
min_bytes: int,
|
|
timeout: float,
|
|
poll: float = 1.0,
|
|
) -> Path:
|
|
"""Like ``wait_for_glob`` but only returns once the file exceeds ``min_bytes``.
|
|
|
|
``daily_create`` writes a ~50-byte frontmatter-only stub before the
|
|
agent fills in the body, so a simple ``glob`` check returns too early.
|
|
"""
|
|
deadline = time.monotonic() + timeout
|
|
while time.monotonic() < deadline:
|
|
if parent.is_dir():
|
|
for p in sorted(parent.glob(pattern)):
|
|
try:
|
|
if p.stat().st_size >= min_bytes:
|
|
return p
|
|
except OSError:
|
|
pass
|
|
await asyncio.sleep(poll)
|
|
listing = [(p.name, p.stat().st_size) for p in parent.iterdir()] if parent.is_dir() else []
|
|
raise TimeoutError(
|
|
f"timeout after {timeout}s waiting for {parent}/{pattern} with size>={min_bytes}; " f"current: {listing}",
|
|
)
|
|
|
|
async def wait_for_server(self, url: str, timeout: float = 10.0) -> None:
|
|
"""Poll ``url`` until the server answers (any 2xx/4xx counts). Used by
|
|
the webhook test so the POST isn't racing uvicorn's bind."""
|
|
import httpx # local — keep optional
|
|
|
|
deadline = time.monotonic() + timeout
|
|
async with httpx.AsyncClient(timeout=1.0) as client:
|
|
while time.monotonic() < deadline:
|
|
try:
|
|
resp = await client.request("HEAD", url)
|
|
if resp.status_code in (200, 202, 404, 405):
|
|
return
|
|
except (httpx.ConnectError, httpx.ReadError):
|
|
pass
|
|
await asyncio.sleep(0.2)
|
|
raise TimeoutError(f"server didn't come up at {url} within {timeout}s")
|
|
|
|
# ----- agent recorder factory ----------------------------------------
|
|
|
|
def record_agents(
|
|
self,
|
|
prefix: str = "agent",
|
|
dump_dir: Path | None = None,
|
|
) -> AgentMemoryRecorder:
|
|
"""Context manager that captures every Agent created in its block.
|
|
|
|
Dumps default to ``<vault>/agent_logs/`` so they're cleaned up with
|
|
the throwaway vault. Pass ``dump_dir`` to persist them elsewhere
|
|
(e.g. for post-mortem inspection of a failing run).
|
|
"""
|
|
return AgentMemoryRecorder(
|
|
dump_dir=dump_dir or self.vault_dir / "agent_logs",
|
|
prefix=prefix,
|
|
)
|
|
|
|
|
|
# ─────────────────────────────────────────────────────────────────────────────
|
|
# Public entry point
|
|
# ─────────────────────────────────────────────────────────────────────────────
|
|
|
|
|
|
@contextlib.contextmanager
|
|
def vault_env(
|
|
*,
|
|
chdir: bool = True,
|
|
vault_name: str = ".reme",
|
|
load_env_file: bool = True,
|
|
) -> Iterator[VaultEnv]:
|
|
"""Yield a fresh ``VaultEnv`` rooted at a temp workspace.
|
|
|
|
- Creates ``<tmp>/<vault_name>`` eagerly so seed helpers work before
|
|
``make_app()``.
|
|
- chdirs into the temp workspace (so relative vault_dir resolves
|
|
correctly and any helper that writes under cwd lands inside the
|
|
throwaway tree).
|
|
- Loads ``.env`` once (idempotent — safe to call repeatedly).
|
|
|
|
The workspace is cleaned up automatically when the block exits. The
|
|
caller is still responsible for ``await env.close_all()`` to release
|
|
any apps it started.
|
|
"""
|
|
if load_env_file:
|
|
from reme4.utils import load_env
|
|
|
|
load_env()
|
|
|
|
with tempfile.TemporaryDirectory() as tmp_dir:
|
|
workspace = Path(tmp_dir).resolve()
|
|
vault = workspace / vault_name
|
|
vault.mkdir(parents=True, exist_ok=True)
|
|
env = VaultEnv(workspace=workspace, vault_dir=vault)
|
|
|
|
if chdir:
|
|
with temp_chdir(workspace):
|
|
yield env
|
|
else:
|
|
yield env
|
|
|
|
|
|
# ─────────────────────────────────────────────────────────────────────────────
|
|
# Script entry — replicate the original dreamer manual-seed CLI.
|
|
# ─────────────────────────────────────────────────────────────────────────────
|
|
|
|
|
|
# pylint: disable=missing-function-docstring
|
|
def main() -> None:
|
|
if len(sys.argv) < 2:
|
|
print(f"usage: {sys.argv[0]} <vault_dir>", file=sys.stderr)
|
|
sys.exit(2)
|
|
vault = Path(sys.argv[1]).resolve()
|
|
vault.mkdir(parents=True, exist_ok=True)
|
|
|
|
env = VaultEnv(workspace=vault.parent, vault_dir=vault)
|
|
removed = env.clean()
|
|
if removed:
|
|
print(f"cleaned {len(removed)} dir(s) under {vault}: {', '.join(removed)}")
|
|
seeded = env.seed_dream_vault()
|
|
if seeded:
|
|
print(f"seeded {len(seeded)} file(s) under {vault}:")
|
|
for f in seeded:
|
|
print(f" + {f}")
|
|
else:
|
|
print(f"vault {vault} already seeded — no changes")
|
|
print(f"\nDream this file:\n {vault}/{DREAM_INPUT_PATH}")
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|