forked from EduCraft/curriculum-project-hub
Compare commits
24 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d16bd4899d | |||
| 4021e58d5d | |||
| 5df1900ca8 | |||
| df66691d24 | |||
| 73cb0e5b47 | |||
| e21096c642 | |||
| dc2d1c2f9e | |||
| 3f9b60f692 | |||
| 4234ba4c96 | |||
| 15f9443d3d | |||
| 7f09fb1f13 | |||
| eb0be43eac | |||
| ce18740870 | |||
| ef96f8d33d | |||
| 5e10419fc8 | |||
| 64b3d1fc64 | |||
| b673dd1fe9 | |||
| aaa098bb8b | |||
| 97f7972cc5 | |||
| cc42e6a7c6 | |||
| 4e01c18cac | |||
|
a12984d174
|
|||
| b93acd8e8c | |||
| 35251986af |
@@ -1,12 +1,12 @@
|
|||||||
name: checker check
|
name: checker check
|
||||||
|
|
||||||
# Builds and lints the Rust implementation crates under crates/ (the rule-based
|
# Builds and lints the Rust implementation crates under crates/ (the rule-based
|
||||||
# checker that "stands in Lean's position" at product runtime).
|
# lesson checker).
|
||||||
#
|
#
|
||||||
# Like spec-check, this is an INTERNAL gate on the implementation's own health
|
# This is an INTERNAL gate on the implementation's own health
|
||||||
# (does it build, pass its tests, satisfy clippy + rustfmt?). It is NOT a
|
# (does it build, pass its tests, satisfy clippy + rustfmt?). There is no
|
||||||
# spec-to-implementation conformance gate — implementations align to the Lean
|
# decision-to-implementation conformance gate — implementations align to the
|
||||||
# contract by human review, not by CI. See the repo README.
|
# ADRs by human review, not by CI. See the repo README.
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
name: hub check
|
name: hub check
|
||||||
|
|
||||||
# Builds, type-checks, and tests the Hub TS package under hub/.
|
# Builds, type-checks, and tests the Hub TS package under hub/.
|
||||||
# The Hub is the Feishu-group collaboration + agent runtime half
|
# The Hub is the Feishu-group collaboration + agent runtime half.
|
||||||
# (spec/System implementation). This is an INTERNAL gate on the Hub's own
|
# This is an INTERNAL gate on the Hub's own
|
||||||
# health, like checker-check is for the Rust half.
|
# health, like checker-check is for the Rust half.
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
name: spec check
|
|
||||||
|
|
||||||
# Builds the Lean semantic master spec under spec/.
|
|
||||||
# This is an INTERNAL well-formedness gate (does the contract type-check?),
|
|
||||||
# NOT a spec-to-implementation conformance gate — implementations align to the
|
|
||||||
# contract by human review, not by CI. See repo README.
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
pull_request:
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
spec-check:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v5
|
|
||||||
- uses: leanprover/lean-action@v1
|
|
||||||
with:
|
|
||||||
lake-package-directory: spec
|
|
||||||
@@ -1,7 +1,3 @@
|
|||||||
# Lean / Lake build artifacts (spec/ has its own .gitignore too)
|
|
||||||
.lake/
|
|
||||||
**/.lake/
|
|
||||||
|
|
||||||
# Rust / Cargo build artifacts (repo-wide cargo workspace at root)
|
# Rust / Cargo build artifacts (repo-wide cargo workspace at root)
|
||||||
/target
|
/target
|
||||||
**/*.pdf
|
**/*.pdf
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"sessionID": "ses_0705f8afbffePWIq7GrFfwfFwV",
|
||||||
|
"updatedAt": "2026-07-23T15:40:15.630Z",
|
||||||
|
"sources": {
|
||||||
|
"background-task": {
|
||||||
|
"state": "idle",
|
||||||
|
"updatedAt": "2026-07-23T15:40:15.630Z"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"sessionID": "ses_07252990dffeRFmXnvdyynty2z",
|
||||||
|
"updatedAt": "2026-07-23T06:33:33.086Z",
|
||||||
|
"sources": {
|
||||||
|
"background-task": {
|
||||||
|
"state": "idle",
|
||||||
|
"updatedAt": "2026-07-23T06:33:33.086Z"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"sessionID": "ses_075d214a0ffe6mU8VNgukUfH5L",
|
||||||
|
"updatedAt": "2026-07-22T14:15:01.741Z",
|
||||||
|
"sources": {
|
||||||
|
"background-task": {
|
||||||
|
"state": "idle",
|
||||||
|
"updatedAt": "2026-07-22T14:15:01.741Z"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"sessionID": "ses_075d3282bffejz0HFE00taOaGM",
|
||||||
|
"updatedAt": "2026-07-22T14:13:54.785Z",
|
||||||
|
"sources": {
|
||||||
|
"background-task": {
|
||||||
|
"state": "idle",
|
||||||
|
"updatedAt": "2026-07-22T14:13:54.785Z"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"sessionID": "ses_0781484caffeKJHXVKiD4BqEJw",
|
||||||
|
"updatedAt": "2026-07-22T06:17:18.238Z",
|
||||||
|
"sources": {
|
||||||
|
"background-task": {
|
||||||
|
"state": "idle",
|
||||||
|
"updatedAt": "2026-07-22T06:17:18.238Z"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"sessionID": "ses_07b163c13ffeudULxSfIfK986T",
|
||||||
|
"updatedAt": "2026-07-21T13:55:58.878Z",
|
||||||
|
"sources": {
|
||||||
|
"background-task": {
|
||||||
|
"state": "idle",
|
||||||
|
"updatedAt": "2026-07-21T13:55:58.878Z"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"sessionID": "ses_07b1e6c8effeq7bdmj6NgO0LqC",
|
||||||
|
"updatedAt": "2026-07-21T13:38:01.132Z",
|
||||||
|
"sources": {
|
||||||
|
"background-task": {
|
||||||
|
"state": "idle",
|
||||||
|
"updatedAt": "2026-07-21T13:38:01.132Z"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"sessionID": "ses_07b932dddffecSipFLwlJOvoJ9",
|
||||||
|
"updatedAt": "2026-07-21T11:27:10.420Z",
|
||||||
|
"sources": {
|
||||||
|
"background-task": {
|
||||||
|
"state": "idle",
|
||||||
|
"updatedAt": "2026-07-21T11:27:10.420Z"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"sessionID": "ses_07b9c4268ffeic4mMXCPUt225j",
|
||||||
|
"updatedAt": "2026-07-21T11:18:53.449Z",
|
||||||
|
"sources": {
|
||||||
|
"background-task": {
|
||||||
|
"state": "idle",
|
||||||
|
"updatedAt": "2026-07-21T11:18:53.449Z"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"sessionID": "ses_07b9c4346ffeVBdV5pf4h6s9PW",
|
||||||
|
"updatedAt": "2026-07-21T11:18:29.979Z",
|
||||||
|
"sources": {
|
||||||
|
"background-task": {
|
||||||
|
"state": "idle",
|
||||||
|
"updatedAt": "2026-07-21T11:18:29.979Z"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"sessionID": "ses_07b9c9a75ffeOyJ4ewp3DBvXhz",
|
||||||
|
"updatedAt": "2026-07-21T11:21:09.776Z",
|
||||||
|
"sources": {
|
||||||
|
"background-task": {
|
||||||
|
"state": "idle",
|
||||||
|
"updatedAt": "2026-07-21T11:21:09.776Z"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"sessionID": "ses_07cdbac0effeiBrdcHLUUUfwuF",
|
||||||
|
"updatedAt": "2026-07-23T15:37:59.918Z",
|
||||||
|
"sources": {
|
||||||
|
"background-task": {
|
||||||
|
"state": "idle",
|
||||||
|
"updatedAt": "2026-07-23T15:37:59.918Z"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,114 @@
|
|||||||
|
# 文件库 · 开工计划(v1.0)
|
||||||
|
|
||||||
|
> 配套文档:《文件库-接口契约.md》(v0.1,仓库根目录)。本计划已吸收规划顾问评审意见,包含开工前必须先冻结的**架构收口决策 D11–D19**(回写契约 v0.2 时并入)。
|
||||||
|
> 工期按 1 人全栈估算;前端从 Phase 2 后可并行。
|
||||||
|
|
||||||
|
## 开工判定
|
||||||
|
|
||||||
|
**可以开工。** 四个外部依赖(版本包 / Group / 审计 / 平台身份)全部有契约可依、可 mock 并行开发;无阻塞项。唯一前置:本文件的 D11–D19 决策在写第一行 schema 前过一遍(半天,自查即可,有异议再升级)。
|
||||||
|
|
||||||
|
## 架构收口决策(新增,先冻结再动工)
|
||||||
|
|
||||||
|
| 编号 | 决策 | 理由 |
|
||||||
|
|---|---|---|
|
||||||
|
| D11 | `creator` 是 Node 的**不可变列**,创建时同时落一条 Manage grant;独立权限开关关闭时,**creator 的 Manage 仍生效**,其余项目级 grant 冻结不参与计算 | 否则 creator 可能被自己关掉的开关锁死 |
|
||||||
|
| D12 | 移动节点授权 = **本节点 Manage + 目标父 Edit+**;移动在事务 + Postgres 咨询锁内完成,防并发成环 | 预检环检测在并发下不安全 |
|
||||||
|
| D13 | Group resolve 失败返回 **503**(不伪装 404/403);每次 HTTP 请求 fresh resolve,不跨请求缓存;单请求内多次校验合并为一次调用(此点与 Group 团队确认,OPEN-9) | 依赖故障 ≠ 无权限;契约 G4 要求实时 |
|
||||||
|
| D14 | 命名规则:NFC 归一化、trim、≤128 字符、禁 `/` 与控制字符;**活跃兄弟节点大小写不敏感唯一**;根节点全局唯一 | 缺命名规则必有脏数据 |
|
||||||
|
| D15 | 删除 = 只给被删节点打标,后代**不递归打标**,靠"任一祖先已删"过滤;所有查询链路强制此过滤(含递归 SQL,不只靠 Prisma middleware) | 递归打标的写放大与恢复复杂度不可控 |
|
||||||
|
| D16 | `baseVersion` 为**文件级版本**(GET file 返回的 version);无关文件的提交不产生冲突 | 与 C1 `head(dir, filePath)` 语义一致 |
|
||||||
|
| D17 | breadcrumb 只暴露用户有 View 的祖先名称;无权限祖先显示占位符 `…`,不暴露名字 | 404 不泄露语义(D8)延伸到面包屑 |
|
||||||
|
| D18 | v1 **单副本部署**(git 仓库在本地磁盘);多副本需共享存储或分片,后置 | 不解决不存在的扩展问题 |
|
||||||
|
| D19 | 网站管理员**不隐式读内容**;force_adjust 凭 node id 操作(id 从审计或用户上报获得) | C4 已定的最小权限原则 |
|
||||||
|
|
||||||
|
## 阶段计划
|
||||||
|
|
||||||
|
### Phase 0 · 骨架与身份先行(1–2 天)
|
||||||
|
|
||||||
|
- [ ] 过 D11–D19,回写契约 v0.2
|
||||||
|
- [ ] repo 骨架 `server/` + `web/`,Postgres docker-compose,CI(lint / typecheck / vitest / 集成测试用真实 Postgres service container)
|
||||||
|
- [ ] **JWT 中间件 + 本地 JWKS 测试服务 + 签名 token fixtures**(有效/过期/错 issuer/错 audience/错算法/未知 kid/轮换)——身份先行,不做"宽松 mock 身份"
|
||||||
|
- [ ] 4 个 port 接口定义 + mock:`VersionStore`、`GroupResolver`、`AuditSink`(直写 outbox 表的实现就是真的,mock 的是对端服务)、`ExportAdapter`
|
||||||
|
- [ ] fastify-swagger 接入,OpenAPI 骨架——**OpenAPI 随每个端点同步产出,不留到最后**
|
||||||
|
- **验收**:骨架可 `pnpm dev` 起服务;本地 JWKS 六类 token fixture(有效/过期/错 issuer/错 audience/错算法/未知 kid)中间件行为全对;CI 流水线绿
|
||||||
|
|
||||||
|
### Phase 1 · 数据模型与权限引擎(2–3 天)⚑ 心脏
|
||||||
|
|
||||||
|
- [ ] Prisma schema:`Node`(parentId **权威** + id 编码的 materialized path 派生列,name 不入 path)、`Grant`、`ProjectIndependentSettings`、`OutboxEvent`(含 attempts/nextAttemptAt/lease/lastError,relay 字段一次到位)、`ExportJob`
|
||||||
|
- [ ] 数据库约束:kind 枚举、项目无子节点、活跃兄弟名唯一(部分唯一索引,root 的 NULL parent 特殊处理)、活跃 grant 按 (nodeId, principalType, principalId) 唯一、独立设置仅项目
|
||||||
|
- [ ] **纯权限 reducer**:输入已解析的 grants + 祖先链 + 用户组集合,输出 role|null;不碰 DB/网络。fast-check 属性测试:max 单调、加 grant 只升不降、祖先继承、toggle 行为、顺序无关、软删过滤
|
||||||
|
- [ ] 数据获取层 + `effective(user, node)` 组装
|
||||||
|
- [ ] 树操作服务:create(creator 自动 Manage、root 仅管理员且必带 ≥1 Manage)、rename、move(D12 事务+咨询锁)、soft delete(D15)、breadcrumb(D17)
|
||||||
|
- **验收**:并发对移(A→B 与 B→A)、移动+并发建子、property tests、删除祖先过滤,真实 Postgres 全绿
|
||||||
|
|
||||||
|
### Phase 2 · 树与授权 API(1–2 天)
|
||||||
|
|
||||||
|
- [ ] nodes 端点组 + grants 端点组 + independent-permission 开关 + effective-permission 自查
|
||||||
|
- [ ] 授权矩阵校验(契约 8.1:creator-only 授 Manage、Manage 不可动 creator、force_adjust 独立通道)
|
||||||
|
- [ ] 全部写操作落 outbox 事件(C3 词汇表)
|
||||||
|
- **验收**:契约 8.1 矩阵逐格 API 测试;D8 的 404/403/503 三分语义测试
|
||||||
|
|
||||||
|
### Phase 3 · 仓库生命周期与文件 API(2 天)
|
||||||
|
|
||||||
|
- [ ] 项目 provisioning 状态机 `PROVISIONING → READY | FAILED`:先建 DB 行(PROVISIONING)→ 调 `VersionStore.init`(幂等)→ 置 READY;失败可重试;孤儿仓库对账 job
|
||||||
|
- [ ] 每项目写锁(Postgres 咨询锁,跨进程安全)——不假设版本包能跨进程串行
|
||||||
|
- [ ] 路径安全:canonical 后必须落在项目根内、拒绝 `.git`、禁 symlink 逃逸、路径长度上限
|
||||||
|
- [ ] 上传限额(单文件 10MB / 单项目配额,数值 OPEN-5)+ 流式接收
|
||||||
|
- [ ] files 端点组全量(list/read/upload/commits→409/diff/history/delete)+ 双客户端冲突 e2e
|
||||||
|
- **验收**:DB/git 故障注入(init 失败、提交后崩溃)→ 对账能收敛;路径穿越语料库测试全拒
|
||||||
|
|
||||||
|
### Phase 4 · 外部集成(1–2 天)
|
||||||
|
|
||||||
|
- [ ] `GroupResolver` HTTP client:超时/5xx/429/畸形 JSON/万级 group 的故障注入测试;失败 → 503(D13)
|
||||||
|
- [ ] Audit relay worker:租约领取、指数退避、eventId 幂等、重启恢复、积压告警
|
||||||
|
- [ ] 导出 job:状态机 + 轮询 + 下载权限校验;`ExportAdapter` 桩(参数 OPEN-6 未定前**不计入完成标准**)
|
||||||
|
- **验收**:relay 重启不丢不重(对端幂等);group 故障时写操作 503、读操作按 D13
|
||||||
|
|
||||||
|
### Phase 5 · 前端(3–5 天,Phase 2 后并行启动)
|
||||||
|
|
||||||
|
- [ ] 登录(平台 SSO 占位 + 本地 JWKS 直通开关)
|
||||||
|
- [ ] 树浏览(懒加载 + 分页)、breadcrumb(D17 占位符)、创建对话框(类型 + 批量授权选择器,Group search 接 C2)
|
||||||
|
- [ ] 权限管理面板(按 8.1 矩阵控制可选项,creator 标识)
|
||||||
|
- [ ] 文件页:查看/上传/下载/历史列表(编辑 UI 不归我方,留对接位)
|
||||||
|
- [ ] 导出按钮 + job 轮询
|
||||||
|
- **验收**:无权限节点全链路不可见;授权面板不会送出矩阵禁止的组合
|
||||||
|
|
||||||
|
### Phase 6 · 硬化与交付(1–2 天)
|
||||||
|
|
||||||
|
- [ ] 404/403/503 全端点核对;并发与重试幂等抽查
|
||||||
|
- [ ] 备份脚本(DB + git 仓库一致性快照)、健康检查(DB/JWKS/磁盘/Group)、磁盘水位告警
|
||||||
|
- [ ] OpenAPI 终稿 + 部署脚本 + 一页运维手册
|
||||||
|
|
||||||
|
## 里程碑
|
||||||
|
|
||||||
|
| 里程碑 | 内容 | 累计工期 |
|
||||||
|
|---|---|---|
|
||||||
|
| M1 | Phase 0–1:骨架 + 权限引擎 + 树操作可跑 | ~4 天 |
|
||||||
|
| M2 | Phase 2–3:后端 API 全量(含文件冲突流) | ~7 天 |
|
||||||
|
| M3 | Phase 4:外部集成(导出不计) | ~9 天 |
|
||||||
|
| M4 | Phase 5–6:前端 + 硬化,可交付 | ~14–18 天 |
|
||||||
|
|
||||||
|
## Mock 保真红线(mock 可以顶,但不许骗)
|
||||||
|
|
||||||
|
| Mock | 不许掩盖的事 | 真身到位后的契约测试 |
|
||||||
|
|---|---|---|
|
||||||
|
| VersionStore | 磁盘延迟、半初始化、锁残留、跨进程并发 | 真包跑临时仓库:并发 commit/init 重试/遍历与 symlink 语料 |
|
||||||
|
| GroupResolver | 超时、5xx、畸形响应、大规模组集 | 故障注入 HTTP 桩全过;我方绝不自己推祖先 |
|
||||||
|
| GroupSearch(前端选择器) | 与 resolve 是**两个独立端点**,不可用 resolve mock 顶替 | C2 `/groups/search` 真身到位后跑分页/空结果/超时 |
|
||||||
|
| Audit 对端 | 重复投递、乱序、长时间不可用 | relay 重启恢复 + 对端幂等 |
|
||||||
|
| JWT | issuer/audience/算法/轮换 | 本地 JWKS 全用例 |
|
||||||
|
| ExportAdapter | 参数、幂等、耗时 | 参数定了再写,之前不算完成 |
|
||||||
|
|
||||||
|
## Top 5 风险
|
||||||
|
|
||||||
|
1. **DB/git 分裂**(崩溃导致元数据、仓库、审计三边不一致)→ provisioning 状态机 + 对账 job,Phase 3 前置
|
||||||
|
2. **移动子树改变整树权限** → D12 事务+锁+源目标双授权,并发测试
|
||||||
|
3. **creator/独立权限开关交互** → D11 先冻结
|
||||||
|
4. **外部契约缺口**(导出参数、请求内 resolve 合并)→ OPEN 清单跟踪,mock 保真红线不许掩盖
|
||||||
|
5. **存储滥用/路径逃逸** → 路径安全 + 配额进 Phase 3 验收,不拖到硬化
|
||||||
|
|
||||||
|
## OPEN 清单(在契约文档基础上增补)
|
||||||
|
|
||||||
|
- OPEN-9:单请求内合并多次 resolve 是否符合 G4"实时"语义(找 Group 团队确认)
|
||||||
|
- OPEN-10:恶意软件扫描归属(我方/平台/不做)
|
||||||
|
- 其余 OPEN-1~8 见《文件库-接口契约.md》第 10 节
|
||||||
@@ -29,7 +29,7 @@ workload brakes.
|
|||||||
|
|
||||||
The full current-state inventory, accepted behavior, and release evidence are
|
The full current-state inventory, accepted behavior, and release evidence are
|
||||||
recorded in [Initial abuse and capacity controls](../assets/initial-abuse-capacity-controls.md),
|
recorded in [Initial abuse and capacity controls](../assets/initial-abuse-capacity-controls.md),
|
||||||
with the durable decision in ADR-0022 and `Spec.System.Capacity`. Numerical
|
with the durable decision in ADR-0022. Numerical
|
||||||
ceilings remain open until production-like calibration.
|
ceilings remain open until production-like calibration.
|
||||||
|
|
||||||
The implementation frontier is:
|
The implementation frontier is:
|
||||||
|
|||||||
@@ -7,6 +7,6 @@ Blocked by: 01, 02, 03, 04, 05, 06, 07, 09, 10, 11, 12, 13, 14, 15, 16, 17, 18,
|
|||||||
## Question
|
## Question
|
||||||
|
|
||||||
After the readiness investigations and resulting fixes are resolved, can one
|
After the readiness investigations and resulting fixes are resolved, can one
|
||||||
repeatable release procedure prove build/test/spec health, deploy a clean
|
repeatable release procedure prove build/test health, deploy a clean
|
||||||
production-like environment, exercise critical tenant and agent journeys,
|
production-like environment, exercise critical tenant and agent journeys,
|
||||||
verify observability and recovery, and either roll forward or roll back safely?
|
verify observability and recovery, and either roll forward or roll back safely?
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ Blocked by: 04
|
|||||||
|
|
||||||
Separate or unify run-bound audit entries, pre-run security/permission events,
|
Separate or unify run-bound audit entries, pre-run security/permission events,
|
||||||
structured messages, and operational recovery events without weakening
|
structured messages, and operational recovery events without weakening
|
||||||
`Spec.System.Audit`'s pinned AuditEntry-to-run relation. Decide durability,
|
the pinned AuditEntry-to-run relation. Decide durability,
|
||||||
failure, retention, and query semantics; then enforce referential integrity and
|
failure, retention, and query semantics; then enforce referential integrity and
|
||||||
observable/recoverable writes instead of silently swallowing lost evidence.
|
observable/recoverable writes instead of silently swallowing lost evidence.
|
||||||
Do not merge these customer Project/Run records with ADR-0023's already-decided
|
Do not merge these customer Project/Run records with ADR-0023's already-decided
|
||||||
|
|||||||
+1
-3
@@ -40,9 +40,7 @@ an off-host recovery key, an incident and reason, and issues only an expiring
|
|||||||
Emergency Platform Grant.
|
Emergency Platform Grant.
|
||||||
|
|
||||||
The complete accepted decision and implementation divergences are in
|
The complete accepted decision and implementation divergences are in
|
||||||
[ADR-0023](../../../docs/adr/0023-platform-administrator-identity-and-audit.md).
|
[ADR-0023](../../../docs/adr/0023-platform-administrator-identity-and-audit.md),
|
||||||
The pinned semantic invariants are in
|
|
||||||
[`Spec.System.PlatformAdministration`](../../../spec/Spec/System/PlatformAdministration.lean),
|
|
||||||
and the canonical terms are in [`CONTEXT.md`](../../../CONTEXT.md).
|
and the canonical terms are in [`CONTEXT.md`](../../../CONTEXT.md).
|
||||||
|
|
||||||
Exact numeric session/invitation/step-up limits and browser mechanics remain
|
Exact numeric session/invitation/step-up limits and browser mechanics remain
|
||||||
|
|||||||
@@ -1,29 +1,25 @@
|
|||||||
# AGENTS.md —— agent 操作手册(全 repo)
|
# AGENTS.md —— agent 操作手册(全 repo)
|
||||||
|
|
||||||
本 repo 是 monorepo。先读根 `README.md` 的"宪法"5 条,那是一切工作的前提。本文件是给在这里干活的 coding agent 的纪律。
|
本 repo 是 monorepo。先读根 `README.md` 的"宪法"4 条,那是一切工作的前提。本文件是给在这里干活的 coding agent 的纪律。
|
||||||
|
|
||||||
## 这个 repo 是什么
|
## 这个 repo 是什么
|
||||||
|
|
||||||
- `spec/` 是一份**人机共识的契约**(Lean 语义母本),是产品语义的上游参照。
|
- `docs/adr/` 是系统级决策的唯一权威来源;`CONTEXT.md` 是平台语言词汇表;代码注释把关键不变量锚到 ADR 编号,可 grep。
|
||||||
- 其余部件(将来的 `spec/` 外文件夹)是**向 `spec/` 对齐的实现**。
|
|
||||||
- `hub/` 的平台层按 SaaS 形态演进:`Organization` 是 tenant root;`Project`/`Team`
|
- `hub/` 的平台层按 SaaS 形态演进:`Organization` 是 tenant root;`Project`/`Team`
|
||||||
必须归属 org,TEAM→PROJECT 授权不得跨 org(见 ADR-0020 / `Spec.System.Organization`)。
|
必须归属 org,TEAM→PROJECT 授权不得跨 org(见 ADR-0020)。
|
||||||
- org 后台 project explorer 里 `Folder` 是透明组织节点,不是权限资源;project 仍是权限边界。
|
- org 后台 project explorer 里 `Folder` 是透明组织节点,不是权限资源;project 仍是权限边界。
|
||||||
普通老师可在飞书群自助建 project 但受 org policy 控制(见 ADR-0021 /
|
普通老师可在飞书群自助建 project 但受 org policy 控制(见 ADR-0021)。
|
||||||
`Spec.System.ProjectWorkspace`)。
|
|
||||||
- 每个 org 自选 BYOK 或平台托管 model provider connection;平台托管也必须是该 org
|
- 每个 org 自选 BYOK 或平台托管 model provider connection;平台托管也必须是该 org
|
||||||
独享的 key/base URL,不得让无关 org 共用 process-global provider key(见 ADR-0021 /
|
独享的 key/base URL,不得让无关 org 共用 process-global provider key(见 ADR-0021)。
|
||||||
`Spec.System.Organization`)。
|
|
||||||
- Feishu/provider secret 使用本地版本化 master-key keyring 的信封加密;生产由 systemd
|
- Feishu/provider secret 使用本地版本化 master-key keyring 的信封加密;生产由 systemd
|
||||||
credential 注入,运行时只允许显式 org/project scope 的 fail-closed resolver,不得回退
|
credential 注入,运行时只允许显式 org/project scope 的 fail-closed resolver,不得回退
|
||||||
process-global credential;Agent child 只接收 run-scoped loopback proxy capability,
|
process-global credential;Agent child 只接收 run-scoped loopback proxy capability,
|
||||||
不接收 org provider credential(见 ADR-0024 / `Spec.System.Organization`)。
|
不接收 org provider credential(见 ADR-0024)。
|
||||||
- 生产容量按不可突破的 platform ceiling 与 org 可下调 policy 分层;有效限制取两者较低值。
|
- 生产容量按不可突破的 platform ceiling 与 org 可下调 policy 分层;有效限制取两者较低值。
|
||||||
Agent admission 必须持久、有界、跨 org 公平且显式背压(见 ADR-0022 /
|
Agent admission 必须持久、有界、跨 org 公平且显式背压(见 ADR-0022)。
|
||||||
`Spec.System.Capacity`)。
|
|
||||||
- 平台管理员只通过独立的 platform-owned 飞书应用与可撤销 Platform Session 认证,不复用
|
- 平台管理员只通过独立的 platform-owned 飞书应用与可撤销 Platform Session 认证,不复用
|
||||||
客户 `User`/org membership;平台写操作与 append-only audit 同事务,break-glass 只走
|
客户 `User`/org membership;平台写操作与 append-only audit 同事务,break-glass 只走
|
||||||
双因子的离线恢复流程(见 ADR-0023 / `Spec.System.PlatformAdministration`)。
|
双因子的离线恢复流程(见 ADR-0023)。
|
||||||
- 受控 alpha 暂采用一 Organization 一具名 systemd Silo:独立 database role/database、
|
- 受控 alpha 暂采用一 Organization 一具名 systemd Silo:独立 database role/database、
|
||||||
service identity、workspace、keyring 与 Feishu/provider connection;进程必须由
|
service identity、workspace、keyring 与 Feishu/provider connection;进程必须由
|
||||||
`HUB_SILO_ORGANIZATION_ID` fail-closed 绑定唯一 org,平台后台不开放。共享 SaaS
|
`HUB_SILO_ORGANIZATION_ID` fail-closed 绑定唯一 org,平台后台不开放。共享 SaaS
|
||||||
@@ -44,12 +40,12 @@
|
|||||||
|
|
||||||
## 纪律
|
## 纪律
|
||||||
|
|
||||||
1. **不得用预训练先验脑补本领域。** 这个领域很新,你没有相关先验。契约里 prose doc 注释是语义的唯一权威来源;契约没写的,就是没定的。
|
1. **不得用预训练先验脑补本领域。** 这个领域很新,你没有相关先验。ADR 与 `CONTEXT.md` 是语义的唯一权威来源;没写的,就是没定的。
|
||||||
|
|
||||||
2. **凡契约未写明者,不得假设。** 遇到标了 `OPEN` 的地方,或契约根本没覆盖的地方,**显式 surface 出来**让开发者决定,绝不擅自替它选一个解。
|
2. **凡 ADR 未写明者,不得假设。** 遇到没覆盖的地方,**显式 surface 出来**让开发者决定,绝不擅自替它选一个解。
|
||||||
|
|
||||||
3. **改 `spec/` 必须保持其 `lake build` 通过。** 在 `spec/` 目录下跑 `lake build`。新增声明必须带 `/-- … -/` doc 注释和恰当标签(`PINNED` / `OPEN` / `ADR-NNNN`)。规范见 `spec/README.md`。不准用 `sorry` 把 build 糊绿。
|
3. **新语义决策进 ADR。** 跨部件的语义分歧点按编号顺延新增 `docs/adr/NNNN-*.md`;代码里的关键不变量用注释锚到 ADR 编号,保持可 grep。已有 ADR 正文不改写历史——推翻旧决策就写新 ADR 标记 supersede。
|
||||||
|
|
||||||
4. **实现向契约对齐;偏离必须 surface。** 没有 CI gate 替你把关 spec↔实现的一致性(见宪法第 2 条)——这道对齐靠 review 和你巡逻 diff。发现实现与契约不一致时,报告它,不要默默让其中一边将就另一边。
|
4. **实现向 ADR 对齐;偏离必须 surface。** 没有 CI gate 替你把关 ADR↔实现的一致性(见宪法第 2 条)——这道对齐靠 review 和你巡逻 diff。发现实现与决策不一致时,报告它,不要默默让其中一边将就另一边。
|
||||||
|
|
||||||
5. **写操作谨慎。** 线上操作、git 写操作前与开发者确认(这是开发者的全局偏好)。
|
5. **写操作谨慎。** 线上操作、git 写操作前与开发者确认(这是开发者的全局偏好)。
|
||||||
|
|||||||
@@ -1,25 +1,23 @@
|
|||||||
# CLAUDE.md —— agent 操作手册(全 repo)
|
# CLAUDE.md —— agent 操作手册(全 repo)
|
||||||
|
|
||||||
本 repo 是 monorepo。先读根 `README.md` 的"宪法"5 条,那是一切工作的前提。本文件是给在这里干活的 coding agent 的纪律。
|
本 repo 是 monorepo。先读根 `README.md` 的"宪法"4 条,那是一切工作的前提。本文件是给在这里干活的 coding agent 的纪律。
|
||||||
|
|
||||||
## 这个 repo 是什么
|
## 这个 repo 是什么
|
||||||
|
|
||||||
- `spec/` 是一份**人机共识的契约**(Lean 语义母本),是产品语义的上游参照。
|
- `docs/adr/` 是系统级决策的唯一权威来源;`CONTEXT.md` 是平台语言词汇表;代码注释把关键不变量锚到 ADR 编号,可 grep。
|
||||||
- 其余部件(将来的 `spec/` 外文件夹)是**向 `spec/` 对齐的实现**。
|
|
||||||
- `hub/` 的平台层按 SaaS 形态演进:`Organization` 是 tenant root;`Project`/`Team`
|
- `hub/` 的平台层按 SaaS 形态演进:`Organization` 是 tenant root;`Project`/`Team`
|
||||||
必须归属 org,TEAM→PROJECT 授权不得跨 org(见 ADR-0020 / `Spec.System.Organization`)。
|
必须归属 org,TEAM→PROJECT 授权不得跨 org(见 ADR-0020)。
|
||||||
- org 后台 project explorer 里 `Folder` 是透明组织节点,不是权限资源;project 仍是权限边界。
|
- org 后台 project explorer 里 `Folder` 是透明组织节点,不是权限资源;project 仍是权限边界。
|
||||||
普通老师可在飞书群自助建 project 但受 org policy 控制(见 ADR-0021 /
|
普通老师可在飞书群自助建 project 但受 org policy 控制(见 ADR-0021)。
|
||||||
`Spec.System.ProjectWorkspace`)。
|
|
||||||
|
|
||||||
## 纪律
|
## 纪律
|
||||||
|
|
||||||
1. **不得用预训练先验脑补本领域。** 这个领域很新,你没有相关先验。契约里 prose doc 注释是语义的唯一权威来源;契约没写的,就是没定的。
|
1. **不得用预训练先验脑补本领域。** 这个领域很新,你没有相关先验。ADR 与 `CONTEXT.md` 是语义的唯一权威来源;没写的,就是没定的。
|
||||||
|
|
||||||
2. **凡契约未写明者,不得假设。** 遇到标了 `OPEN` 的地方,或契约根本没覆盖的地方,**显式 surface 出来**让开发者决定,绝不擅自替它选一个解。
|
2. **凡 ADR 未写明者,不得假设。** 遇到没覆盖的地方,**显式 surface 出来**让开发者决定,绝不擅自替它选一个解。
|
||||||
|
|
||||||
3. **改 `spec/` 必须保持其 `lake build` 通过。** 在 `spec/` 目录下跑 `lake build`。新增声明必须带 `/-- … -/` doc 注释和恰当标签(`PINNED` / `OPEN` / `ADR-NNNN`)。规范见 `spec/README.md`。不准用 `sorry` 把 build 糊绿。
|
3. **新语义决策进 ADR。** 跨部件的语义分歧点按编号顺延新增 `docs/adr/NNNN-*.md`;代码里的关键不变量用注释锚到 ADR 编号,保持可 grep。已有 ADR 正文不改写历史——推翻旧决策就写新 ADR 标记 supersede。
|
||||||
|
|
||||||
4. **实现向契约对齐;偏离必须 surface。** 没有 CI gate 替你把关 spec↔实现的一致性(见宪法第 2 条)——这道对齐靠 review 和你巡逻 diff。发现实现与契约不一致时,报告它,不要默默让其中一边将就另一边。
|
4. **实现向 ADR 对齐;偏离必须 surface。** 没有 CI gate 替你把关 ADR↔实现的一致性(见宪法第 2 条)——这道对齐靠 review 和你巡逻 diff。发现实现与决策不一致时,报告它,不要默默让其中一边将就另一边。
|
||||||
|
|
||||||
5. **写操作谨慎。** 线上操作、git 写操作前与开发者确认(这是开发者的全局偏好)。
|
5. **写操作谨慎。** 线上操作、git 写操作前与开发者确认(这是开发者的全局偏好)。
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
教研生产的数字化解决方案。核心思路:课程像 DAW / 剪辑软件那样有一个**结构化的工程文件**;coding agent 协助编辑它;一个 rule-based checker(类编译器)校验其合法性并给出 helpful fix hint。目标是把教研从一次性的文档,沉淀成**可累积、可校验、可复用的资产**。
|
教研生产的数字化解决方案。核心思路:课程像 DAW / 剪辑软件那样有一个**结构化的工程文件**;coding agent 协助编辑它;一个 rule-based checker(类编译器)校验其合法性并给出 helpful fix hint。目标是把教研从一次性的文档,沉淀成**可累积、可校验、可复用的资产**。
|
||||||
|
|
||||||
这是一个 **monorepo**。它的组织方式本身就表达了一条原则:**`spec/` 是上游的语义母本,其余部件是向它对齐的实现。**
|
这是一个 **monorepo**。它的组织方式本身就表达了一条原则:**`docs/adr/` 是系统级决策的唯一权威来源,代码注释把关键不变量锚到 ADR 编号,可 grep。**
|
||||||
|
|
||||||
## 安装 `cph` 命令行
|
## 安装 `cph` 命令行
|
||||||
|
|
||||||
@@ -33,47 +33,40 @@ cph completions zsh > ~/.zfunc/_cph # 或 bash/fish/powershell/elvish
|
|||||||
```
|
```
|
||||||
README.md ← 本文件:总览 + 宪法(下面 5 条)
|
README.md ← 本文件:总览 + 宪法(下面 5 条)
|
||||||
CLAUDE.md ← 全局 agent 操作手册(管整个 repo)
|
CLAUDE.md ← 全局 agent 操作手册(管整个 repo)
|
||||||
docs/adr/ ← 系统级架构决策记录(跨部件,被 spec 契约引用)
|
docs/adr/ ← 系统级架构决策记录(跨部件,决策的唯一权威来源)
|
||||||
spec/ ← Lean 语义母本(自包含的 Lean 工程)。见 spec/README.md
|
CONTEXT.md ← 平台语言词汇表(术语与禁用说法)
|
||||||
Cargo.toml ← 仓库级 cargo workspace(实现部件共用,便于跨部件复用 crate)
|
Cargo.toml ← 仓库级 cargo workspace(实现部件共用,便于跨部件复用 crate)
|
||||||
crates/ ← 实现:rule-based checker(向 spec 对齐)。见 crates/README.md
|
crates/ ← 实现:rule-based checker(语义由 ADR 锚定)。见 crates/README.md
|
||||||
cph-diag / cph-model / cph-schema / cph-typst ← 可复用基础(模型/校验/typst 引擎)
|
cph-diag / cph-model / cph-schema / cph-typst ← 可复用基础(模型/校验/typst 引擎)
|
||||||
cph-check / cph-cli ← checker 本体 + `cph` 命令行
|
cph-check / cph-cli ← checker 本体 + `cph` 命令行
|
||||||
render/ ← typst 渲染包 cph-render(母本的渲染后端之一,ADR-0005)
|
render/ ← typst 渲染包 cph-render(checker 的渲染后端,ADR-0005)
|
||||||
examples/ ← 样例工程文件(如 TH-141),流水线的真实输入
|
examples/ ← 样例工程文件(如 TH-141),流水线的真实输入
|
||||||
hub/ ← SaaS Hub:飞书协作、org 管理、agent runtime 与生产部署
|
hub/ ← SaaS Hub:飞书协作、org 管理、agent runtime 与生产部署
|
||||||
(exporter/ …) ← 将来的其他部件,平级于 spec/
|
(exporter/ …) ← 将来的其他部件,平级于 crates/
|
||||||
```
|
```
|
||||||
|
|
||||||
`spec/` 与实现部件**物理分离、平级共存**:谁是上游、谁向谁对齐,一眼可见。
|
|
||||||
实现部件共用一个仓库根的 cargo workspace,使基础 crate(模型、typst 引擎)能被
|
实现部件共用一个仓库根的 cargo workspace,使基础 crate(模型、typst 引擎)能被
|
||||||
未来部件(如 exporter)复用,而非各自重造。
|
未来部件(如 exporter)复用,而非各自重造。
|
||||||
|
|
||||||
## 宪法
|
## 宪法
|
||||||
|
|
||||||
这 5 条是 `spec/` 这份语义母本的定位与约束,是本仓库一切工作的前提。
|
这 4 条是本仓库的协作约定,是一切工作的前提。
|
||||||
|
|
||||||
1. **角色 —— Lean 是研发侧的上游参照。**
|
1. **角色 —— ADR 是决策真相。**
|
||||||
`spec/` 用 Lean 编写,是开发者(领域专家)与 coding agent **共用**的 spec 工具,用来沉淀产品各部件的**语义**。它**不进入产品运行时**——产品里"站在 Lean 这个位置"的那个 checker 用什么技术实现,尚未决定;但那个东西的语义,先在 `spec/` 里固定下来。
|
跨部件的语义决策只记录在 `docs/adr/`,一份决策一份 ADR,编号顺延、正文不改写历史。代码里的关键不变量用注释锚到 ADR 编号,保持可 grep。没有第二份权威文档。
|
||||||
|
|
||||||
2. **对齐机制 —— Lean 只做上游参照。**
|
2. **对齐机制 —— 人肉承载,无机器兜底。**
|
||||||
不做 extract / codegen,不派生 conformance test,CI 里**没有** spec→实现的 gate。实现对齐 spec,由"开发者 review + agent 巡逻 diff"这个人肉环节承载。
|
CI 只验各部件自身良构(build / test / clippy),**没有**决策↔实现的一致性 gate。实现对齐 ADR,由"开发者 review + agent 巡逻 diff"这个人肉环节承载。发现漂移,报告它,不要默默让其中一边将就另一边。
|
||||||
(CI 里的 `spec check` 只验 spec **自身**能否 type-check,即契约内部良构,不是 spec↔实现的对齐检查。)
|
|
||||||
|
|
||||||
3. **资产性 —— 由 review 纪律承载,无机器兜底。**
|
3. **形态 —— 自包含。**
|
||||||
这份仓库给你的是"精确、自洽、机器验内部良构的语义共识",**不是**"实现正确性保证"。spec 与实现之间那道缝,是我们自愿用人来守的——清醒地守,它就是资产;放任实现漂移而不回头同步,它就退化成最贵的过期文档。
|
凡 ADR 未明文规定的,开发者与 agent 双方都不该假设;遇到没覆盖的地方,**显式 surface** 出来让开发者决定。
|
||||||
|
|
||||||
4. **形态 —— 它是人机共识的契约。**
|
4. **深度判据 —— 只收录分歧点。**
|
||||||
契约必须**自包含**:凡契约未明文规定的,开发者与 agent 双方都不该假设。这比"文档"严格——type checker 会逼这份契约在结构上无洞。
|
一条语义该不该写进 ADR,取决于一句话:**"不写明,开发者与 agent 会不会各自做出不同假设?"** 会 → 进 ADR;显然的东西 / 纯 plumbing / 普通 CRUD 字段 → 不进(写进去只稀释信噪比、增加维护面)。
|
||||||
|
深度上限是**你愿意在每次实现变更时手动回头同步的量**——写得比你能维护的更深,多出来的部分会率先过期、反过来误导实现。
|
||||||
5. **深度判据 —— 只收录分歧点。**
|
|
||||||
一条语义该不该写进 Lean,取决于一句话:**"不写明,开发者与 agent 会不会各自做出不同假设?"** 会 → 进契约;显然的东西 / 纯 plumbing / 普通 CRUD 字段 → 不进(写进去只稀释信噪比、增加维护面)。
|
|
||||||
深度上限不是 Lean 的表达力,而是**你愿意在每次实现变更时手动回头同步的量**——写得比你能维护的更深,多出来的部分会率先过期、反过来误导实现。
|
|
||||||
|
|
||||||
## CI
|
## CI
|
||||||
|
|
||||||
`.gitea/workflows/spec-check.yml` 在每次 push / PR 时于 `spec/` 下跑 `lake build`,确保契约始终 type-check 通过(从第一天起就是"绿"的)。这是良构 gate,见宪法第 2 条。
|
|
||||||
|
|
||||||
Rust checker 的本地与 CI 工具链由根 `rust-toolchain.toml` 固定;`.gitea/workflows/checker-check.yml`
|
Rust checker 的本地与 CI 工具链由根 `rust-toolchain.toml` 固定;`.gitea/workflows/checker-check.yml`
|
||||||
必须安装同一精确版本并执行 `cargo fmt --all --check`、Clippy `-D warnings` 与 workspace
|
必须安装同一精确版本并执行 `cargo fmt --all --check`、Clippy `-D warnings` 与 workspace
|
||||||
全测试。升级 Rust 时这两处必须在同一提交更新并通过完整 checker gate。
|
全测试。升级 Rust 时这两处必须在同一提交更新并通过完整 checker gate。
|
||||||
|
|||||||
+3
-2
@@ -1,7 +1,8 @@
|
|||||||
# crates/
|
# crates/
|
||||||
|
|
||||||
These crates implement the rule-based lesson checker that aligns to the
|
These crates implement the rule-based lesson checker whose semantics are
|
||||||
semantic master in `spec/`: it reads an engineering-file (one lesson, ADR-0005)
|
pinned by the ADRs in `docs/adr/`: it reads an engineering-file (one lesson,
|
||||||
|
ADR-0005)
|
||||||
laid out per ADR-0008 (declarative `manifest.toml` + per-element
|
laid out per ADR-0008 (declarative `manifest.toml` + per-element
|
||||||
`element.toml`), validates structure and content, and emits diagnostics.
|
`element.toml`), validates structure and content, and emits diagnostics.
|
||||||
`cph-diag` (the shared diagnostic vocabulary), `cph-model` (the ADR-0008 loader),
|
`cph-diag` (the shared diagnostic vocabulary), `cph-model` (the ADR-0008 loader),
|
||||||
|
|||||||
@@ -19,13 +19,11 @@ const DEFAULT_TARGET: &str = "student";
|
|||||||
|
|
||||||
/// Severity of the render-coverage ("element ignored under a target") diagnostic.
|
/// Severity of the render-coverage ("element ignored under a target") diagnostic.
|
||||||
///
|
///
|
||||||
/// **PINNED to `warning` by the contract.** Mirrors the Lean master's
|
/// **PINNED to `warning` by ADR-0005:** when a
|
||||||
/// `Spec.Courseware.renderIgnoredSeverity : Severity := .warning`
|
|
||||||
/// (`spec/Spec/Courseware/Check/Diagnostic.lean`), itself citing ADR-0005: when a
|
|
||||||
/// `(kind, target)` pair has no render rule the checker reports that the element
|
/// `(kind, target)` pair has no render rule the checker reports that the element
|
||||||
/// is ignored under that target and **does not block the export**. Naming the
|
/// is ignored under that target and **does not block the export**. Naming the
|
||||||
/// severity as a const makes "it is a warning, not an error" a greppable,
|
/// severity as a const makes "it is a warning, not an error" a greppable
|
||||||
/// alignable fact rather than an inline literal.
|
/// fact rather than an inline literal.
|
||||||
const RENDER_IGNORED_SEVERITY: Severity = Severity::Warning;
|
const RENDER_IGNORED_SEVERITY: Severity = Severity::Warning;
|
||||||
|
|
||||||
/// The result of running [`check`] (or the check phases of [`build`]).
|
/// The result of running [`check`] (or the check phases of [`build`]).
|
||||||
@@ -57,12 +55,12 @@ impl CheckReport {
|
|||||||
|
|
||||||
/// Whether any collected diagnostic is `Error`-severity.
|
/// Whether any collected diagnostic is `Error`-severity.
|
||||||
///
|
///
|
||||||
/// **Legality decision (spec alignment).** `!has_errors()` is the
|
/// **Legality decision (ADR-0010).** `!has_errors()` decides lesson
|
||||||
/// implementation of `Spec.Courseware.Legal` (`spec/Spec/Courseware/Check/Diagnostic.lean`):
|
/// legality: a lesson is *legal* iff its diagnostics contain no error-level
|
||||||
/// a lesson is *legal* iff its diagnostics contain no error-level diagnostic
|
/// diagnostic (warnings are non-blocking — see `Severity`). There is no CI
|
||||||
/// (warnings are non-blocking — see `Severity` / ADR-0010). There is no CI
|
/// gate enforcing ADR↔implementation alignment (repo constitution); it is
|
||||||
/// gate enforcing this alignment (repo constitution); it is kept greppable
|
/// kept greppable here so a reviewer can tie the orchestrator's gate to
|
||||||
/// here so a reviewer can tie the orchestrator's gate to the Lean master.
|
/// the ADR.
|
||||||
pub fn has_errors(&self) -> bool {
|
pub fn has_errors(&self) -> bool {
|
||||||
self.diagnostics
|
self.diagnostics
|
||||||
.iter()
|
.iter()
|
||||||
|
|||||||
+10
-15
@@ -2,7 +2,7 @@
|
|||||||
//!
|
//!
|
||||||
//! Every other crate in the workspace depends on these types to report
|
//! Every other crate in the workspace depends on these types to report
|
||||||
//! problems. The vocabulary is intentionally small and stable: a [`Severity`]
|
//! problems. The vocabulary is intentionally small and stable: a [`Severity`]
|
||||||
//! (mirroring the Lean master), a closed set of machine-stable [`DiagCode`]s, an
|
//! (two-valued, ADR-0010), a closed set of machine-stable [`DiagCode`]s, an
|
||||||
//! optional [`SourceSpan`] pointing back at the offending source, and a
|
//! optional [`SourceSpan`] pointing back at the offending source, and a
|
||||||
//! [`Diagnostic`] tying them together with a human message and a fix hint.
|
//! [`Diagnostic`] tying them together with a human message and a fix hint.
|
||||||
//!
|
//!
|
||||||
@@ -17,32 +17,27 @@ use serde::Serialize;
|
|||||||
|
|
||||||
/// Severity of a diagnostic.
|
/// Severity of a diagnostic.
|
||||||
///
|
///
|
||||||
/// **Mirrors `Spec.Courseware.Diagnostic.Severity`** in the Lean semantic
|
/// **Pinned by ADR-0005 / ADR-0010: exactly two values.**
|
||||||
/// master (`spec/Spec/Courseware/Check/Diagnostic.lean`), whose definition is
|
|
||||||
/// exactly:
|
|
||||||
///
|
///
|
||||||
/// ```text
|
/// ```text
|
||||||
/// inductive Severity where
|
/// warning | error
|
||||||
/// | warning
|
|
||||||
/// | error
|
|
||||||
/// ```
|
/// ```
|
||||||
///
|
///
|
||||||
/// This two-valued shape is a **contract decision**, not an accident: the Lean
|
/// This two-valued shape is a **contract decision**, not an accident: the
|
||||||
/// module pins `Severity` to exactly `warning | error` and states the finer
|
/// finer levels (`info` / `hint` / `note`) are deliberately undecided, so we
|
||||||
/// levels (`info` / `hint` / `note`) are deliberately undecided. We therefore
|
|
||||||
/// do **not** add an info/note level here. `error` blocks (the artifact is
|
/// do **not** add an info/note level here. `error` blocks (the artifact is
|
||||||
/// invalid); `warning` does not block (the artifact still exports, but with
|
/// invalid); `warning` does not block (the artifact still exports, but with
|
||||||
/// loss / an ignored element — e.g. ADR-0005's "missing render ⇒ warning").
|
/// loss / an ignored element — e.g. ADR-0005's "missing render ⇒ warning").
|
||||||
///
|
///
|
||||||
/// There is no CI gate enforcing this alignment (see the repo constitution);
|
/// There is no CI gate enforcing ADR↔implementation alignment (see the repo
|
||||||
/// it is maintained by review, which is why this correspondence is documented
|
/// constitution); it is maintained by review, which is why the decision is
|
||||||
/// here rather than only in the spec.
|
/// documented here rather than only in the ADR.
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
|
||||||
pub enum Severity {
|
pub enum Severity {
|
||||||
/// Non-blocking: the artifact still exports, but is lossy / has an ignored
|
/// Non-blocking: the artifact still exports, but is lossy / has an ignored
|
||||||
/// element. Mirrors Lean `Severity.warning`.
|
/// element. ADR-0010 `warning`.
|
||||||
Warning,
|
Warning,
|
||||||
/// Blocking: the artifact is invalid. Mirrors Lean `Severity.error`.
|
/// Blocking: the artifact is invalid. ADR-0010 `error`.
|
||||||
Error,
|
Error,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+25
-38
@@ -3,9 +3,7 @@
|
|||||||
//! This crate is the **loader**, not the full checker. It reads
|
//! This crate is the **loader**, not the full checker. It reads
|
||||||
//! `<root>/manifest.toml` (project / info / ordered `[[parts]]` / declared
|
//! `<root>/manifest.toml` (project / info / ordered `[[parts]]` / declared
|
||||||
//! `[targets.*]`) and each part's `<root>/<path>/element.toml`, and produces an
|
//! `[targets.*]`) and each part's `<root>/<path>/element.toml`, and produces an
|
||||||
//! ordered [`Lesson`] — mirroring the Lean master's `Lesson = List (Element P)`
|
//! ordered [`Lesson`], where the order of `parts` carries teaching semantics.
|
||||||
//! (`spec/Spec/Courseware/Model/Lesson.lean`), where the order of `parts` carries
|
|
||||||
//! teaching semantics.
|
|
||||||
//!
|
//!
|
||||||
//! Scope boundaries (deliberately staying in lane):
|
//! Scope boundaries (deliberately staying in lane):
|
||||||
//! - It validates **structure** only: manifest shape, element.toml shape, and
|
//! - It validates **structure** only: manifest shape, element.toml shape, and
|
||||||
@@ -23,7 +21,7 @@ use serde::{Deserialize, Serialize};
|
|||||||
|
|
||||||
/// An ordered, in-memory lesson loaded from an engineering file.
|
/// An ordered, in-memory lesson loaded from an engineering file.
|
||||||
///
|
///
|
||||||
/// Mirrors the Lean master's `Lesson = List (Element P)`: `parts` is an ordered
|
/// `parts` is an ordered
|
||||||
/// `Vec`, and that order is the lesson's order (ADR-0008 §"the lesson manifest
|
/// `Vec`, and that order is the lesson's order (ADR-0008 §"the lesson manifest
|
||||||
/// is declarative" — the `[[parts]]` array order is the single source of truth).
|
/// is declarative" — the `[[parts]]` array order is the single source of truth).
|
||||||
#[derive(Debug, Clone, PartialEq, Serialize)]
|
#[derive(Debug, Clone, PartialEq, Serialize)]
|
||||||
@@ -86,9 +84,8 @@ pub struct TargetConfig {
|
|||||||
/// with template `exports/<name>.typ` when no `[[steps]]` are given.
|
/// with template `exports/<name>.typ` when no `[[steps]]` are given.
|
||||||
pub steps: Vec<Step>,
|
pub steps: Vec<Step>,
|
||||||
/// The **render-coverage declaration**: which element kinds this target
|
/// The **render-coverage declaration**: which element kinds this target
|
||||||
/// renders. Realizes `Spec.Courseware.TargetSpec.covers : KindId → Prop`
|
/// renders. Realizes ADR-0011's "render
|
||||||
/// (`spec/Spec/Courseware/Export/Render.lean`) and ADR-0011's "render
|
/// coverage is a declaration, not a payload": the declaration keeps *which
|
||||||
/// coverage is a declaration, not a payload": the contract keeps *which
|
|
||||||
/// kinds a target renders* (used by the `renderIgnored` seed diagnostic),
|
/// kinds a target renders* (used by the `renderIgnored` seed diagnostic),
|
||||||
/// while the rendering "how" lives in the template/steps.
|
/// while the rendering "how" lives in the template/steps.
|
||||||
///
|
///
|
||||||
@@ -102,13 +99,10 @@ pub struct TargetConfig {
|
|||||||
|
|
||||||
/// The artifact an export target produces (ADR-0009/0011).
|
/// The artifact an export target produces (ADR-0009/0011).
|
||||||
///
|
///
|
||||||
/// **Mirrors `Spec.Courseware.Artifact`** in the Lean semantic master
|
/// **Pinned by ADR-0011** as an ADT with fields:
|
||||||
/// (`spec/Spec/Courseware/Export/Artifact.lean`), whose definition is exactly:
|
|
||||||
///
|
///
|
||||||
/// ```text
|
/// ```text
|
||||||
/// inductive Artifact where
|
/// Artifact = singleFile (filepath) | fileTree (root, outputs)
|
||||||
/// | singleFile (filepath : String)
|
|
||||||
/// | fileTree (root : String) (outputs : String)
|
|
||||||
/// ```
|
/// ```
|
||||||
///
|
///
|
||||||
/// ADR-0011 pinned the artifact as an ADT **with fields**: "what the product
|
/// ADR-0011 pinned the artifact as an ADT **with fields**: "what the product
|
||||||
@@ -120,20 +114,20 @@ pub struct TargetConfig {
|
|||||||
/// `"single-file"` → [`Artifact::SingleFile`], `"file-tree"` →
|
/// `"single-file"` → [`Artifact::SingleFile`], `"file-tree"` →
|
||||||
/// [`Artifact::FileTree`].
|
/// [`Artifact::FileTree`].
|
||||||
///
|
///
|
||||||
/// As with `cph-diag`'s `Severity`, there is no CI gate enforcing this
|
/// As with `cph-diag`'s `Severity`, there is no CI gate enforcing ADR↔
|
||||||
/// alignment (see the repo constitution) — it is maintained by review, which is
|
/// implementation alignment (see the repo constitution) — it is maintained by
|
||||||
/// why the correspondence is documented here.
|
/// review, which is why the decision is documented here.
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
|
||||||
pub enum Artifact {
|
pub enum Artifact {
|
||||||
/// One bundled document landing at `filepath` (relative to the engineering
|
/// One bundled document landing at `filepath` (relative to the engineering
|
||||||
/// root). Mirrors Lean `Artifact.singleFile`. The default artifact shape.
|
/// root). ADR-0011 `singleFile`. The default artifact shape.
|
||||||
SingleFile {
|
SingleFile {
|
||||||
/// Where the single product is written (relative to the engineering
|
/// Where the single product is written (relative to the engineering
|
||||||
/// root), e.g. `build/student.pdf`.
|
/// root), e.g. `build/student.pdf`.
|
||||||
filepath: PathBuf,
|
filepath: PathBuf,
|
||||||
},
|
},
|
||||||
/// A set of files under `root` matching the `outputs` glob. Mirrors Lean
|
/// A set of files under `root` matching the `outputs` glob. ADR-0011
|
||||||
/// `Artifact.fileTree`.
|
/// `fileTree`.
|
||||||
FileTree {
|
FileTree {
|
||||||
/// The output directory (relative to the engineering root).
|
/// The output directory (relative to the engineering root).
|
||||||
root: PathBuf,
|
root: PathBuf,
|
||||||
@@ -156,14 +150,10 @@ impl Artifact {
|
|||||||
|
|
||||||
/// One typed build step (ADR-0011).
|
/// One typed build step (ADR-0011).
|
||||||
///
|
///
|
||||||
/// **Mirrors `Spec.Courseware.Step`** in the Lean semantic master
|
/// **Pinned by ADR-0011** as an ADT:
|
||||||
/// (`spec/Spec/Courseware/Export/Render.lean`), whose definition is exactly:
|
|
||||||
///
|
///
|
||||||
/// ```text
|
/// ```text
|
||||||
/// inductive Step where
|
/// Step = typstCompile (template) | shell (run) | assembleMarkdown (field)
|
||||||
/// | typstCompile (template : String)
|
|
||||||
/// | shell (run : String)
|
|
||||||
/// | assembleMarkdown (field : String)
|
|
||||||
/// ```
|
/// ```
|
||||||
///
|
///
|
||||||
/// A step is a *typed* operation (extensible): `TypstCompile` compiles a
|
/// A step is a *typed* operation (extensible): `TypstCompile` compiles a
|
||||||
@@ -183,20 +173,20 @@ impl Artifact {
|
|||||||
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
|
||||||
pub enum Step {
|
pub enum Step {
|
||||||
/// Compile a template file (relative to the engineering root) into the
|
/// Compile a template file (relative to the engineering root) into the
|
||||||
/// artifact; the framework injects the manifest. Mirrors Lean
|
/// artifact; the framework injects the manifest. ADR-0011
|
||||||
/// `Step.typstCompile`.
|
/// `typstCompile`.
|
||||||
TypstCompile {
|
TypstCompile {
|
||||||
/// The template file to compile as main, e.g. `exports/student.typ`.
|
/// The template file to compile as main, e.g. `exports/student.typ`.
|
||||||
template: PathBuf,
|
template: PathBuf,
|
||||||
},
|
},
|
||||||
/// Run a shell command — the escape hatch. Mirrors Lean `Step.shell`.
|
/// Run a shell command — the escape hatch. ADR-0011 `shell`.
|
||||||
Shell {
|
Shell {
|
||||||
/// The command line to run.
|
/// The command line to run.
|
||||||
run: String,
|
run: String,
|
||||||
},
|
},
|
||||||
/// Assemble a single-file markdown deliverable by concatenating each
|
/// Assemble a single-file markdown deliverable by concatenating each
|
||||||
/// element's `field` markdown content file in `[[parts]]` order. Mirrors
|
/// element's `field` markdown content file in `[[parts]]` order. ADR-0011
|
||||||
/// Lean `Step.assembleMarkdown` (ADR-0015). Not a typst build — the
|
/// `assembleMarkdown` (ADR-0015). Not a typst build — the
|
||||||
/// framework owns the read/concatenate/write itself.
|
/// framework owns the read/concatenate/write itself.
|
||||||
AssembleMarkdown {
|
AssembleMarkdown {
|
||||||
/// The per-element markdown content field to assemble (e.g. `slides`,
|
/// The per-element markdown content field to assemble (e.g. `slides`,
|
||||||
@@ -226,12 +216,11 @@ pub struct Project {
|
|||||||
|
|
||||||
/// `[info]` table (passed through to render targets verbatim).
|
/// `[info]` table (passed through to render targets verbatim).
|
||||||
///
|
///
|
||||||
/// **Mirrors `Spec.Courseware.Info`** in the Lean semantic master
|
/// The *canonical* model whose
|
||||||
/// (`spec/Spec/Courseware/Model/Info.lean`): the *canonical* model whose
|
|
||||||
/// `authors` is always a list. The authoring-surface form (string-or-array
|
/// `authors` is always a list. The authoring-surface form (string-or-array
|
||||||
/// `author`) is the separate [`RawInfo`] / [`RawAuthor`], normalized into this
|
/// `author`) is the separate [`RawInfo`] / [`RawAuthor`], normalized into this
|
||||||
/// at the load boundary — mirroring the Lean `RawInfo` / `RawAuthor` split. No
|
/// at the load boundary. No
|
||||||
/// CI gate enforces this alignment (repo constitution); it is kept greppable.
|
/// CI gate enforces ADR↔implementation alignment (repo constitution); it is kept greppable.
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
|
||||||
pub struct Info {
|
pub struct Info {
|
||||||
/// Lesson title.
|
/// Lesson title.
|
||||||
@@ -240,7 +229,6 @@ pub struct Info {
|
|||||||
/// so this is a list, not a single name. Empty when `[info]` declares no
|
/// so this is a list, not a single name. Empty when `[info]` declares no
|
||||||
/// `author`. The on-disk `author` accepts either a bare string (one author)
|
/// `author`. The on-disk `author` accepts either a bare string (one author)
|
||||||
/// or an array of strings (see [`RawAuthor`]); both load into this `Vec`.
|
/// or an array of strings (see [`RawAuthor`]); both load into this `Vec`.
|
||||||
/// Mirrors Lean `Info.authors : List String`.
|
|
||||||
pub authors: Vec<String>,
|
pub authors: Vec<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -290,8 +278,7 @@ struct RawProject {
|
|||||||
name: String,
|
name: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The authoring-surface `[info]` (mirrors Lean `RawInfo` in
|
/// The authoring-surface `[info]`: the raw form that exists for
|
||||||
/// `spec/Spec/Courseware/Model/Info.lean`): the raw form that exists for
|
|
||||||
/// fill-in convenience, normalized into the canonical [`Info`] at the load
|
/// fill-in convenience, normalized into the canonical [`Info`] at the load
|
||||||
/// boundary. Not the form the rest of the model traffics in.
|
/// boundary. Not the form the rest of the model traffics in.
|
||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
@@ -301,7 +288,7 @@ struct RawInfo {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// On-disk `author`: either a single name (`author = "…"`) or a list
|
/// On-disk `author`: either a single name (`author = "…"`) or a list
|
||||||
/// (`author = ["…", "…"]`). Mirrors Lean `RawAuthor`: a fill-in convenience whose
|
/// (`author = ["…", "…"]`). A fill-in convenience whose
|
||||||
/// string-or-array union lives **only** at the load boundary — [`RawAuthor::into_vec`]
|
/// string-or-array union lives **only** at the load boundary — [`RawAuthor::into_vec`]
|
||||||
/// folds it into the canonical [`Info::authors`] `Vec`, after which it never appears.
|
/// folds it into the canonical [`Info::authors`] `Vec`, after which it never appears.
|
||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
@@ -312,7 +299,7 @@ enum RawAuthor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl RawAuthor {
|
impl RawAuthor {
|
||||||
/// Flatten to the ordered author list (Lean `RawAuthor.normalize`): a single
|
/// Flatten to the ordered author list: a single
|
||||||
/// name becomes a one-element list; a list passes through verbatim.
|
/// name becomes a one-element list; a list passes through verbatim.
|
||||||
fn into_vec(self) -> Vec<String> {
|
fn into_vec(self) -> Vec<String> {
|
||||||
match self {
|
match self {
|
||||||
|
|||||||
@@ -0,0 +1,146 @@
|
|||||||
|
# ADR 0026: Usage Fact Ledger
|
||||||
|
|
||||||
|
## Status
|
||||||
|
|
||||||
|
Accepted.
|
||||||
|
|
||||||
|
## Context
|
||||||
|
|
||||||
|
ADR-0022 pins the cost-attribution contract for the platform: token,
|
||||||
|
provider-reported cost, run count, and duration are attributed by Organization,
|
||||||
|
Project, Run, model, and Provider Connection; "missing provider cost remains
|
||||||
|
unknown rather than zero." ADR-0021 scopes usage accounting as operational
|
||||||
|
reporting, not payment collection (commercial billing stays deferred).
|
||||||
|
|
||||||
|
The implementation today stores this as **one scalar per `AgentRun`**:
|
||||||
|
`inputTokens`, `outputTokens`, `costUsd?`, `costSource?`, written once from the
|
||||||
|
Claude Agent SDK's `result.total_cost_usd` when the run finishes. This is
|
||||||
|
adequate for a single provider-reported model loop, but it cannot represent:
|
||||||
|
|
||||||
|
- **External capability consumption** inside a run. PDF→Markdown bundle
|
||||||
|
conversion, audio/video transcription, OCR and similar media transforms are
|
||||||
|
not the main agent loop. They run as side effects of a run, may use a
|
||||||
|
different provider/model, may bill in non-token units (pages, seconds,
|
||||||
|
invocations), and may report cost through a different channel than the
|
||||||
|
OpenRouter gateway. Today there is no row to write that cost to — it would
|
||||||
|
either disappear or silently corrupt the run's single scalar.
|
||||||
|
- **Multiple model calls within one run** (e.g. a sub-model invoked by a
|
||||||
|
tool, a gateway-side reroute). The scalar collapses them into one number.
|
||||||
|
- **Pricebook derivation** after the fact. With only a final USD figure and no
|
||||||
|
`(provider, model, occurredAt, tokens)` fact, an operator cannot re-derive
|
||||||
|
cost from a price table when the provider did not report it.
|
||||||
|
|
||||||
|
Treating each external call as a nested `AgentRun` was considered and
|
||||||
|
rejected: `AgentRun` carries lock ownership (ADR-0002), session/provider/role
|
||||||
|
binding (ADR-0017), admission/capacity semantics (ADR-0022), and the
|
||||||
|
user-visible task boundary. External calls hold none of those. Making them
|
||||||
|
`AgentRun`s would pollute run counts, admission, lock semantics, and session
|
||||||
|
continuity, and would still not solve non-token metering.
|
||||||
|
|
||||||
|
## Decision
|
||||||
|
|
||||||
|
Introduce **`UsageFact`** as the single source of truth for billable
|
||||||
|
consumption inside an `AgentRun`. An `AgentRun` owns zero or more
|
||||||
|
append-only `UsageFact` rows; each row records one billable consumption event:
|
||||||
|
|
||||||
|
- `kind` — `model_completion` (the main agent loop) | `external_capability`
|
||||||
|
| `tool_proxy`. The kind set is `OPEN`; new kinds must be surfaced, not
|
||||||
|
silently folded into an existing one.
|
||||||
|
- `provider` — e.g. `openrouter`, `mineru`, `openai_whisper`.
|
||||||
|
- `model?`, `inputTokens?`, `outputTokens?` — token metering, optional
|
||||||
|
because non-token capabilities have none.
|
||||||
|
- `quantity?` + `unit?` — non-token metering (pages, audio_seconds,
|
||||||
|
invocations), coexisting with tokens rather than replacing them.
|
||||||
|
- `costUsd?` + `costSource` — `provider_reported` | `pricebook_derived` |
|
||||||
|
`unknown`. `costUsd = null` means **unknown, not zero** (ADR-0022). When the
|
||||||
|
provider reported a cost, `costSource = provider_reported` and that value
|
||||||
|
wins. When only tokens are known, a later pricebook pass may derive
|
||||||
|
`costUsd` with `costSource = pricebook_derived`. When neither is possible,
|
||||||
|
`costSource = unknown` and `costUsd` stays null.
|
||||||
|
- `occurredAt` — when the consumption happened; the pricebook derivation
|
||||||
|
depends on this, not on `AgentRun.finishedAt`, because an external
|
||||||
|
capability may complete before the run finishes.
|
||||||
|
- `capabilityId?` — for `external_capability` facts, the registered capability
|
||||||
|
id (e.g. `pdf_to_md_bundle`, `audio_video_to_text`).
|
||||||
|
- `correlationId?` — external request id for reconciliation / idempotency;
|
||||||
|
not part of the aggregation key.
|
||||||
|
|
||||||
|
### Invariants
|
||||||
|
|
||||||
|
1. **Append-only.** A `UsageFact` row is never updated or deleted. A cost
|
||||||
|
correction is a new row; the old row stays. `onDelete: Cascade` exists only
|
||||||
|
so a hard run delete (itself not a normal path) cleans up its facts.
|
||||||
|
2. **Belongs to exactly one Run; never holds a lock.** A fact is a side-effect
|
||||||
|
ledger of one run, not a sub-run. External capability calls obey the same
|
||||||
|
boundary: their identity is `capabilityId + correlationId`, not `RunId`.
|
||||||
|
3. **Missing cost ≠ zero.** Aggregation MUST NOT sum `null` `costUsd` as 0.
|
||||||
|
A run whose facts all have `costUsd = null` is "cost unknown" — reported as
|
||||||
|
`runsWithoutCost`, exactly as the pre-migration `costUsd = null` runs are
|
||||||
|
today. A run with at least one `costUsd`-bearing fact contributes its sum.
|
||||||
|
|
||||||
|
### Rollup cache
|
||||||
|
|
||||||
|
`AgentRun.costUsd / inputTokens / outputTokens / costSource` columns are kept
|
||||||
|
as a **derived rollup cache**, not dropped:
|
||||||
|
|
||||||
|
- Existing non-`/usage` readers (slash `/usage`, session detail, integration
|
||||||
|
tests asserting `run.costUsd`) continue to work without code changes for
|
||||||
|
historical runs.
|
||||||
|
- On run finish, the writer writes the `UsageFact` row first and then mirrors
|
||||||
|
it onto `AgentRun` as two separate statements, not one transaction. The
|
||||||
|
fact is the truth, so it is written first; the cache is derived, so it is
|
||||||
|
written second. A crash between the two leaves the cache stale, but the
|
||||||
|
usage service re-reads `UsageFact` directly, so staleness is recoverable
|
||||||
|
(and the reverse order would lose the truth, which is not). Keeping the
|
||||||
|
fact insert and the run update in separate statements also avoids holding
|
||||||
|
the `AgentRun` row lock across the FK ShareLock taken by the insert, which
|
||||||
|
deadlocks against concurrent workspace teardown under the cascade path
|
||||||
|
`Organization → Project → AgentRun → UsageFact`.
|
||||||
|
- The org/project usage service and the slash `/usage` command read from
|
||||||
|
`UsageFact` directly — they are the canonical aggregation path.
|
||||||
|
|
||||||
|
### Migration
|
||||||
|
|
||||||
|
A new `UsageFact` table is added. For every existing `AgentRun` with a
|
||||||
|
non-null `costUsd` or non-null `inputTokens`/`outputTokens`, the migration
|
||||||
|
inserts **one synthetic `model_completion` fact** carrying the run's
|
||||||
|
provider, model, tokens, cost, and `costSource`. Its `correlationId` is the
|
||||||
|
run id, so the row is identifiable as a backfill artefact. This keeps
|
||||||
|
historical reporting correct under the new aggregation path. Pre-migration
|
||||||
|
runs with no recorded cost remain `runsWithoutCost` by design, matching
|
||||||
|
ADR-0022's "missing cost ≠ zero" rule and the existing migration
|
||||||
|
`20260709143000_agent_run_cost_tracking`'s "no backfill" stance for the
|
||||||
|
truly unrecorded.
|
||||||
|
|
||||||
|
## Consequences
|
||||||
|
|
||||||
|
- The billing model now supports external capabilities (PDF→MD, ASR, OCR, …)
|
||||||
|
without per-capability schema changes: a new capability is one new
|
||||||
|
`capabilityId` value and one or more `external_capability` facts.
|
||||||
|
- `AgentRun.costUsd` is no longer the truth; it is a convenience cache.
|
||||||
|
Readers that need the truth (cost breakdown, per-capability attribution)
|
||||||
|
must read `UsageFact`. The cache MUST be kept consistent on the write path.
|
||||||
|
- The capability registry, pricebook, and any commercial settlement remain
|
||||||
|
`OPEN` and out of pilot scope (ADR-0021). This ADR only pins the ledger
|
||||||
|
shape and invariants.
|
||||||
|
- `usage.ts` and `/usage` now perform a join against `UsageFact` rather than a
|
||||||
|
single-table scan of `AgentRun`; the index on `(runId, occurredAt)` and
|
||||||
|
`(provider, model, occurredAt)` keeps the existing org/project/report
|
||||||
|
queries bounded.
|
||||||
|
- Cost corrections (e.g. a provider rebills a run) produce a new fact row; the
|
||||||
|
rollup cache must be recomputed. The initial release writes facts once at
|
||||||
|
run finish and does not support post-hoc correction flows — that remains
|
||||||
|
`OPEN`.
|
||||||
|
|
||||||
|
## Deferred
|
||||||
|
|
||||||
|
- **Capability registry** as a first-class spec entity (`Spec.System.Capability`)
|
||||||
|
with org-scoped enable/disable, input/output contracts, metering schemas,
|
||||||
|
and org-exclusive credentials (ADR-0024 alignment). This ADR only reserves
|
||||||
|
the `capabilityId` field and the `external_capability` fact kind.
|
||||||
|
- **Pricebook** — a versioned price table keyed by `(provider, model, unit)`
|
||||||
|
with time validity. Required to actually produce `pricebook_derived` costs;
|
||||||
|
until then, facts without provider-reported cost stay `unknown`.
|
||||||
|
- **Post-hoc cost correction flow** — append-only today; correction UI and
|
||||||
|
rollup recompute are `OPEN`.
|
||||||
|
- **Commercial billing, invoicing, settlement** — still deferred per ADR-0021.
|
||||||
@@ -0,0 +1,152 @@
|
|||||||
|
# ADR 0027: External Capability Registry
|
||||||
|
|
||||||
|
## Status
|
||||||
|
|
||||||
|
Accepted.
|
||||||
|
|
||||||
|
## Context
|
||||||
|
|
||||||
|
ADR-0026 introduced the `UsageFact` ledger with a `kind = external_capability`
|
||||||
|
fact and a `capabilityId` field, but deferred the capability registry itself.
|
||||||
|
Two concrete needs now force the issue:
|
||||||
|
|
||||||
|
- **PDF→Markdown bundle** conversion (and, imminently, audio/video→text)
|
||||||
|
must run as a side effect of an `AgentRun`, bill in non-token units
|
||||||
|
(pages, seconds), use a different provider than the model loop, and report
|
||||||
|
cost through a different channel. It is not a sub-run (ADR-0026 rejected
|
||||||
|
that) and not a model-provider call (it does not speak the Anthropic/
|
||||||
|
OpenRouter protocol).
|
||||||
|
- The Agent already has a Bash tool. Without a first-class capability seam,
|
||||||
|
the path of least resistance is for the agent to shell out to ad-hoc
|
||||||
|
scripts that embed API keys, write to arbitrary paths, and report nothing
|
||||||
|
to the ledger. That is exactly the unattributed, uncontained external
|
||||||
|
consumption ADR-0022/0026 exist to prevent.
|
||||||
|
|
||||||
|
The model-provider connection (`OrganizationProviderConnection`, ADR-0024)
|
||||||
|
is the wrong seam for these services:
|
||||||
|
|
||||||
|
- Its payload schema (`baseUrl` + `authToken` + `anthropicApiKey`) and
|
||||||
|
readiness probe (`/v1/models?supported_parameters=tools`) are specific to
|
||||||
|
OpenRouter/Anthropic. MinerU, Whisper, and future OCR/ASR services have
|
||||||
|
different auth shapes (an API token, optionally a project id) and no
|
||||||
|
`/v1/models` endpoint.
|
||||||
|
- Its uniqueness key is `(organizationId, providerId)` where `providerId`
|
||||||
|
is an OpenRouter-style model-routing id. A capability provider id
|
||||||
|
(`mineru`) names a *service*, not a model.
|
||||||
|
- Coupling capability credentials into the model-provider table would force
|
||||||
|
every capability's auth shape through `ProviderSecretPayloadV1` and every
|
||||||
|
readiness probe through `probeOpenRouterCredential`.
|
||||||
|
|
||||||
|
The Feishu Application Connection (`OrganizationFeishuApplicationConnection`)
|
||||||
|
is the right structural precedent: it reuses the ADR-0024 envelope (KEK →
|
||||||
|
DEK → AES-256-GCM, AAD-bound to purpose/org/connection/version) but has its
|
||||||
|
own connection table, its own payload schema, its own readiness probe, and
|
||||||
|
its own per-org uniqueness. Capability connections follow the same pattern.
|
||||||
|
|
||||||
|
## Decision
|
||||||
|
|
||||||
|
### External Capability
|
||||||
|
|
||||||
|
An **External Capability** is a platform-registered, org-enabled document or
|
||||||
|
media transform service invoked as a side effect of an `AgentRun`. It is
|
||||||
|
identified by a stable `capabilityId` (e.g. `pdf_to_md_bundle`,
|
||||||
|
`audio_video_to_text`). A capability:
|
||||||
|
|
||||||
|
- Has an **input kind** (PDF, image, audio, video, …) and an **output
|
||||||
|
contract** (markdown bundle with extracted images, transcript text, …).
|
||||||
|
- Bills in **non-token units** (pages, audio-seconds) recorded on a
|
||||||
|
`UsageFact` with `kind = external_capability`, or in tokens when the
|
||||||
|
backing service reports them.
|
||||||
|
- Writes its output **into the invoking run's workspace** (ADR-0018
|
||||||
|
`AgentSurface` — no escapes).
|
||||||
|
- Is invoked through a **capability adapter** in Hub, never by the Agent
|
||||||
|
shelling out with embedded credentials.
|
||||||
|
|
||||||
|
### Capability Connection
|
||||||
|
|
||||||
|
Credentials for a capability live in an **`OrganizationCapabilityConnection`**,
|
||||||
|
structurally identical to the Feishu Application Connection:
|
||||||
|
|
||||||
|
- Belongs to exactly one Organization.
|
||||||
|
- Unique by `(organizationId, capabilityId)`.
|
||||||
|
- `DRAFT` / `ACTIVE` / `DISABLED`; resolution accepts only `ACTIVE` with a
|
||||||
|
valid active secret version.
|
||||||
|
- Secret material is an immutable, AAD-bound, KEK-wrapped envelope version
|
||||||
|
(`CapabilityCredentialVersion`), reusing the ADR-0024 encryption
|
||||||
|
machinery with `purpose = "capability"`.
|
||||||
|
- Its payload schema is capability-specific (`CapabilitySecretPayloadV1`:
|
||||||
|
`baseUrl`, `apiToken`, optional `projectId`). New capability types extend
|
||||||
|
the payload, not the connection table.
|
||||||
|
- A capability-specific **readiness probe** validates the credential before
|
||||||
|
activation (e.g. MinerU: a trivial authenticated GET). The probe is
|
||||||
|
injectable, matching the Feishu/provider pattern, so tests never hit the
|
||||||
|
network.
|
||||||
|
|
||||||
|
### Capability Adapter
|
||||||
|
|
||||||
|
The adapter is the seam between the Agent and the external service. It:
|
||||||
|
|
||||||
|
- Resolves the org's active capability connection (fail-closed, no
|
||||||
|
process-global fallback — ADR-0024).
|
||||||
|
- Accepts a workspace-relative input path and an output directory.
|
||||||
|
- Calls the backing service (MinerU, Whisper, …) via an injectable
|
||||||
|
`Client` interface so the real HTTP client is swappable and mockable.
|
||||||
|
- Writes the produced markdown + image assets into the run's workspace.
|
||||||
|
- Writes one `UsageFact` (or more, if the service reports per-stage
|
||||||
|
consumption) with `kind = external_capability`, `capabilityId`,
|
||||||
|
`provider` (the service id), `quantity + unit` (pages / seconds), and
|
||||||
|
`costUsd + costSource = provider_reported` when the service reports cost.
|
||||||
|
|
||||||
|
### Registry
|
||||||
|
|
||||||
|
The platform maintains a **registry** of known capabilities: their id,
|
||||||
|
input kind, output contract, metering unit, and adapter. This is
|
||||||
|
code-level registration (like `ToolRegistry`), not a database table — a
|
||||||
|
capability is available to an Organization only when (a) the platform
|
||||||
|
knows the adapter and (b) the Organization has an `ACTIVE` connection for
|
||||||
|
it. Both gates are required.
|
||||||
|
|
||||||
|
### What is NOT in this ADR
|
||||||
|
|
||||||
|
- The capability invocation is **not** a first-class persisted record
|
||||||
|
(`CapabilityInvocation` table) in this ADR. The `UsageFact` row with
|
||||||
|
`capabilityId` + `correlationId` is the durable trace. If we later need
|
||||||
|
a richer invocation log (retries, partial output, multi-stage status),
|
||||||
|
that is a follow-up; for now the fact is enough.
|
||||||
|
- **Pricebook** remains deferred (ADR-0026). Capability facts use
|
||||||
|
`provider_reported` when the service returns cost; otherwise `unknown`.
|
||||||
|
- **Org-scoped enable/disable policy** beyond connection status is
|
||||||
|
deferred. An org with an `ACTIVE` connection has the capability; one
|
||||||
|
without does not. A finer "enabled but no credential" toggle is not
|
||||||
|
needed yet.
|
||||||
|
- **Agent-facing tool exposure** (how the Agent discovers and calls the
|
||||||
|
capability — MCP tool, Bash wrapper, or built-in) is an implementation
|
||||||
|
detail of the adapter wiring, not a contract concern. The contract pins
|
||||||
|
that the Agent never receives the capability credential.
|
||||||
|
|
||||||
|
## Consequences
|
||||||
|
|
||||||
|
- Adding a new external capability (e.g. `image_ocr`) is: register an
|
||||||
|
adapter, add a `capabilityId` constant, optionally extend the secret
|
||||||
|
payload — no schema change to `UsageFact` or `AgentRun`.
|
||||||
|
- The model-provider connection table stays focused on model routing;
|
||||||
|
capability credentials do not pollute its payload or readiness probe.
|
||||||
|
- Three connection types now share the ADR-0024 envelope: model-provider,
|
||||||
|
Feishu application, and capability. Each has its own table, payload
|
||||||
|
schema, and probe, but the same encryption, rotation, and resolver
|
||||||
|
boundary.
|
||||||
|
- The Agent's Bash tool remains available, but the intended path for
|
||||||
|
document/media transforms is the capability adapter. Whether to narrow
|
||||||
|
Bash for capability-shaped tasks is an operational policy decision,
|
||||||
|
not a contract one.
|
||||||
|
- Tests prove: workspace containment of capability output, fail-closed
|
||||||
|
credential resolution, `UsageFact` attribution with non-token metering,
|
||||||
|
and that the Agent process never receives the capability credential.
|
||||||
|
|
||||||
|
## Deferred
|
||||||
|
|
||||||
|
- `CapabilityInvocation` as a first-class durable record (status, retries,
|
||||||
|
partial output) — currently the `UsageFact` row is the only trace.
|
||||||
|
- Pricebook derivation for capability costs (ADR-0026 deferred).
|
||||||
|
- Org-scoped capability enable/disable policy finer than connection status.
|
||||||
|
- Agent-facing tool discovery (MCP vs built-in) for capabilities.
|
||||||
@@ -32,7 +32,7 @@ App ID 通常以 `cli_` 开头,可以写入交付单。App Secret 必须通过
|
|||||||
| 接收群聊中 @ 机器人的消息 | `im:message.group_at_msg:readonly` |
|
| 接收群聊中 @ 机器人的消息 | `im:message.group_at_msg:readonly` |
|
||||||
| 以应用身份发送消息 | `im:message:send_as_bot` |
|
| 以应用身份发送消息 | `im:message:send_as_bot` |
|
||||||
| 读取触发消息和线程上下文 | `im:message:readonly` |
|
| 读取触发消息和线程上下文 | `im:message:readonly` |
|
||||||
| 获取与上传图片或文件 | `im:resource` |
|
| 获取消息中的图片/文件,并向飞书上传图片或文件(含 Agent 回答中的图片发送) | `im:resource` |
|
||||||
| 添加、删除消息表情回复 | `im:message.reactions:write_only` |
|
| 添加、删除消息表情回复 | `im:message.reactions:write_only` |
|
||||||
| 获取用户基本信息 | `contact:user.base:readonly` |
|
| 获取用户基本信息 | `contact:user.base:readonly` |
|
||||||
| 获取用户基本资料 | `contact:user.basic_profile:readonly` |
|
| 获取用户基本资料 | `contact:user.basic_profile:readonly` |
|
||||||
@@ -66,6 +66,9 @@ Educraft 机器人以应用身份调用上述 API,因此这些 scope 全部放
|
|||||||
|
|
||||||
如果 API 调试台提示缺少更细粒度权限,请把错误提示和发生时间截图给部署人员。不要自行开通通讯录全量读取等超出本表的权限。
|
如果 API 调试台提示缺少更细粒度权限,请把错误提示和发生时间截图给部署人员。不要自行开通通讯录全量读取等超出本表的权限。
|
||||||
|
|
||||||
|
说明:`im:resource` 既用于下载用户发来的图片/文件,也用于 Agent 回复时把本地或远程图片上传为飞书 `image_key` 后嵌入消息卡片。缺少该权限时,带图回答会发送失败或降级为无图文本。已开通该 scope 的存量应用一般无需新增权限,但若权限尚未随最新版本发布,请创建新版本并审核发布。
|
||||||
|
|
||||||
|
|
||||||
## 4. 配置事件与卡片回调
|
## 4. 配置事件与卡片回调
|
||||||
|
|
||||||
进入“事件与回调”。
|
进入“事件与回调”。
|
||||||
|
|||||||
@@ -34,6 +34,10 @@ HUB_FEISHU_EVENTS_PER_MINUTE="120"
|
|||||||
# to this path and rejects any overlap before installing the unit.
|
# to this path and rejects any overlap before installing the unit.
|
||||||
HUB_PROJECT_WORKSPACE_ROOT="/var/lib/cph-hub/workspaces"
|
HUB_PROJECT_WORKSPACE_ROOT="/var/lib/cph-hub/workspaces"
|
||||||
|
|
||||||
|
# Persistent root for the content-addressed agent skill store. Required at hub
|
||||||
|
# startup unless XDG_STATE_HOME is set (then defaults to $XDG_STATE_HOME/skills).
|
||||||
|
HUB_SKILL_STORE_ROOT="/var/lib/cph-hub/state/skills"
|
||||||
|
|
||||||
# This process is pinned to exactly one Organization. Feishu credentials are
|
# This process is pinned to exactly one Organization. Feishu credentials are
|
||||||
# resolved from that Organization's encrypted ACTIVE connection.
|
# resolved from that Organization's encrypted ACTIVE connection.
|
||||||
HUB_SILO_ORGANIZATION_ID=""
|
HUB_SILO_ORGANIZATION_ID=""
|
||||||
|
|||||||
@@ -5,6 +5,9 @@ dist/
|
|||||||
.env.*
|
.env.*
|
||||||
!.env.example
|
!.env.example
|
||||||
.secrets/
|
.secrets/
|
||||||
|
.dev-keyring.json
|
||||||
|
.dev-workspaces/
|
||||||
|
.dev-skills/
|
||||||
admin-web/node_modules/
|
admin-web/node_modules/
|
||||||
admin-web/build/
|
admin-web/build/
|
||||||
admin-web/.svelte-kit/
|
admin-web/.svelte-kit/
|
||||||
|
|||||||
@@ -168,6 +168,16 @@ export interface FeishuApplicationConnection {
|
|||||||
updatedAt: string;
|
updatedAt: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface CapabilityConnection {
|
||||||
|
id: string;
|
||||||
|
capabilityId: string;
|
||||||
|
status: 'DRAFT' | 'ACTIVE' | 'DISABLED';
|
||||||
|
activeVersion: number | null;
|
||||||
|
keyId: string | null;
|
||||||
|
createdAt: string;
|
||||||
|
updatedAt: string;
|
||||||
|
}
|
||||||
|
|
||||||
export interface UsageTotals {
|
export interface UsageTotals {
|
||||||
runCount: number;
|
runCount: number;
|
||||||
runsWithCost: number;
|
runsWithCost: number;
|
||||||
@@ -183,13 +193,81 @@ export interface ProjectUsageRow extends UsageTotals {
|
|||||||
folderId: string | null;
|
folderId: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Ledger slice from UsageFact (ADR-0026): separates model tokens vs external meters. */
|
||||||
|
export interface UsageBreakdownRow {
|
||||||
|
kind: string;
|
||||||
|
provider: string;
|
||||||
|
model: string | null;
|
||||||
|
capabilityId: string | null;
|
||||||
|
unit: string | null;
|
||||||
|
factCount: number;
|
||||||
|
factsWithCost: number;
|
||||||
|
factsWithoutCost: number;
|
||||||
|
inputTokens: number;
|
||||||
|
outputTokens: number;
|
||||||
|
quantity: number | null;
|
||||||
|
costUsd: number | null;
|
||||||
|
}
|
||||||
|
|
||||||
export interface UsageReport {
|
export interface UsageReport {
|
||||||
from: string | null;
|
from: string | null;
|
||||||
to: string | null;
|
to: string | null;
|
||||||
projects: ProjectUsageRow[];
|
projects: ProjectUsageRow[];
|
||||||
totals: UsageTotals;
|
totals: UsageTotals;
|
||||||
|
breakdown: UsageBreakdownRow[];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ProjectUsageReport extends ProjectUsageRow {
|
||||||
|
from: string | null;
|
||||||
|
to: string | null;
|
||||||
|
breakdown: UsageBreakdownRow[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface UsageFactRow {
|
||||||
|
id: string;
|
||||||
|
occurredAt: string;
|
||||||
|
kind: string;
|
||||||
|
provider: string;
|
||||||
|
model: string | null;
|
||||||
|
inputTokens: number | null;
|
||||||
|
outputTokens: number | null;
|
||||||
|
quantity: number | null;
|
||||||
|
unit: string | null;
|
||||||
|
costUsd: number | null;
|
||||||
|
costSource: string;
|
||||||
|
capabilityId: string | null;
|
||||||
|
correlationId: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SessionRunRow {
|
||||||
|
id: string;
|
||||||
|
status: string;
|
||||||
|
model: string;
|
||||||
|
provider: string;
|
||||||
|
inputTokens: number | null;
|
||||||
|
outputTokens: number | null;
|
||||||
|
costUsd: number | null;
|
||||||
|
costSource: string | null;
|
||||||
|
startedAt: string;
|
||||||
|
finishedAt: string | null;
|
||||||
|
error: string | null;
|
||||||
|
usageFacts: UsageFactRow[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SessionDetail {
|
||||||
|
id: string;
|
||||||
|
provider: string;
|
||||||
|
roleId: string;
|
||||||
|
model: string;
|
||||||
|
title: string | null;
|
||||||
|
createdAt: string;
|
||||||
|
updatedAt: string;
|
||||||
|
archivedAt: string | null;
|
||||||
|
project: { id: string; name: string };
|
||||||
|
runs: SessionRunRow[];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
export type CapacityDimension =
|
export type CapacityDimension =
|
||||||
| 'requestRate'
|
| 'requestRate'
|
||||||
| 'requestBodySize'
|
| 'requestBodySize'
|
||||||
@@ -343,6 +421,8 @@ export const api = {
|
|||||||
get(`${orgBase(slug)}/projects/${projectId}/sessions${limit !== undefined ? `?limit=${limit}` : ''}`) as Promise<{
|
get(`${orgBase(slug)}/projects/${projectId}/sessions${limit !== undefined ? `?limit=${limit}` : ''}`) as Promise<{
|
||||||
sessions: SessionSummary[];
|
sessions: SessionSummary[];
|
||||||
}>,
|
}>,
|
||||||
|
session: (slug: string, sessionId: string) =>
|
||||||
|
get(`${orgBase(slug)}/sessions/${encodeURIComponent(sessionId)}`) as Promise<SessionDetail>,
|
||||||
usage: (slug: string, params?: { from?: string; to?: string; folderId?: string }) => {
|
usage: (slug: string, params?: { from?: string; to?: string; folderId?: string }) => {
|
||||||
const q = new URLSearchParams();
|
const q = new URLSearchParams();
|
||||||
if (params?.from) q.set('from', params.from);
|
if (params?.from) q.set('from', params.from);
|
||||||
@@ -351,6 +431,16 @@ export const api = {
|
|||||||
const qs = q.toString();
|
const qs = q.toString();
|
||||||
return get(`${orgBase(slug)}/usage${qs ? `?${qs}` : ''}`) as Promise<UsageReport>;
|
return get(`${orgBase(slug)}/usage${qs ? `?${qs}` : ''}`) as Promise<UsageReport>;
|
||||||
},
|
},
|
||||||
|
projectUsage: (slug: string, projectId: string, params?: { from?: string; to?: string }) => {
|
||||||
|
const q = new URLSearchParams();
|
||||||
|
if (params?.from) q.set('from', params.from);
|
||||||
|
if (params?.to) q.set('to', params.to);
|
||||||
|
const qs = q.toString();
|
||||||
|
return get(
|
||||||
|
`${orgBase(slug)}/projects/${encodeURIComponent(projectId)}/usage${qs ? `?${qs}` : ''}`,
|
||||||
|
) as Promise<ProjectUsageReport>;
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
providerConnections: (slug: string) =>
|
providerConnections: (slug: string) =>
|
||||||
get(`${orgBase(slug)}/provider-connections`) as Promise<{ connections: ProviderConnectionRow[] }>,
|
get(`${orgBase(slug)}/provider-connections`) as Promise<{ connections: ProviderConnectionRow[] }>,
|
||||||
@@ -381,6 +471,21 @@ export const api = {
|
|||||||
disableFeishuApplication: (slug: string) =>
|
disableFeishuApplication: (slug: string) =>
|
||||||
del(`${orgBase(slug)}/feishu-application-connection`) as Promise<FeishuApplicationConnection>,
|
del(`${orgBase(slug)}/feishu-application-connection`) as Promise<FeishuApplicationConnection>,
|
||||||
|
|
||||||
|
capabilityConnections: (slug: string) =>
|
||||||
|
get(`${orgBase(slug)}/capability-connections`) as Promise<{ connections: CapabilityConnection[] }>,
|
||||||
|
capabilityConnection: (slug: string, capabilityId: string) =>
|
||||||
|
get(`${orgBase(slug)}/capability-connections/${encodeURIComponent(capabilityId)}`) as Promise<{
|
||||||
|
connection: CapabilityConnection | null;
|
||||||
|
}>,
|
||||||
|
rotateCapabilityConnection: (
|
||||||
|
slug: string,
|
||||||
|
capabilityId: string,
|
||||||
|
body: { accessKeyId: string; accessKeySecret: string; endpoint: string },
|
||||||
|
) =>
|
||||||
|
put(`${orgBase(slug)}/capability-connections/${encodeURIComponent(capabilityId)}`, body) as Promise<CapabilityConnection>,
|
||||||
|
disableCapabilityConnection: (slug: string, capabilityId: string) =>
|
||||||
|
del(`${orgBase(slug)}/capability-connections/${encodeURIComponent(capabilityId)}`) as Promise<CapabilityConnection>,
|
||||||
|
|
||||||
capacityPolicy: (slug: string) => get(`${orgBase(slug)}/capacity-policy`) as Promise<CapacityPolicyView>,
|
capacityPolicy: (slug: string) => get(`${orgBase(slug)}/capacity-policy`) as Promise<CapacityPolicyView>,
|
||||||
setCapacityPolicy: (slug: string, body: { limits: Partial<Record<CapacityDimension, number | null>> }) =>
|
setCapacityPolicy: (slug: string, body: { limits: Partial<Record<CapacityDimension, number | null>> }) =>
|
||||||
put(`${orgBase(slug)}/capacity-policy`, body) as Promise<CapacityPolicyView>,
|
put(`${orgBase(slug)}/capacity-policy`, body) as Promise<CapacityPolicyView>,
|
||||||
|
|||||||
@@ -8,6 +8,8 @@
|
|||||||
folders,
|
folders,
|
||||||
projects,
|
projects,
|
||||||
slug,
|
slug,
|
||||||
|
onCreateFolder,
|
||||||
|
onCreateProject,
|
||||||
}: {
|
}: {
|
||||||
folder: ExplorerFolder;
|
folder: ExplorerFolder;
|
||||||
folders: ExplorerFolder[];
|
folders: ExplorerFolder[];
|
||||||
@@ -19,17 +21,16 @@
|
|||||||
binding: { chatId: string } | null;
|
binding: { chatId: string } | null;
|
||||||
}[];
|
}[];
|
||||||
slug: string;
|
slug: string;
|
||||||
|
onCreateFolder?: (parentId: string) => void;
|
||||||
|
onCreateProject?: (folderId: string) => void;
|
||||||
} = $props();
|
} = $props();
|
||||||
|
|
||||||
let open = $state(true);
|
let open = $state(true);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<button
|
<div class="group flex w-full items-center gap-2.5 px-3 py-2.5 text-sm transition hover:bg-surface-100">
|
||||||
type="button"
|
<button type="button" class="flex min-w-0 flex-1 items-center gap-2.5 text-left" onclick={() => (open = !open)}>
|
||||||
class="flex w-full items-center gap-2.5 px-3 py-2.5 text-left text-sm transition hover:bg-surface-100"
|
|
||||||
onclick={() => (open = !open)}
|
|
||||||
>
|
|
||||||
<span class="w-3.5 text-center text-xs text-surface-600">{open ? '▾' : '▸'}</span>
|
<span class="w-3.5 text-center text-xs text-surface-600">{open ? '▾' : '▸'}</span>
|
||||||
<span class="flex h-7 w-7 items-center justify-center border border-warning-300 bg-warning-50 text-warning-800">
|
<span class="flex h-7 w-7 items-center justify-center border border-warning-300 bg-warning-50 text-warning-800">
|
||||||
<Icon name="folder" class="h-4 w-4" />
|
<Icon name="folder" class="h-4 w-4" />
|
||||||
@@ -40,9 +41,38 @@
|
|||||||
<span class="saas-badge-neutral">{folder.childFolderCount} 子夹</span>
|
<span class="saas-badge-neutral">{folder.childFolderCount} 子夹</span>
|
||||||
{/if}
|
{/if}
|
||||||
</button>
|
</button>
|
||||||
|
{#if onCreateFolder || onCreateProject}
|
||||||
|
<span
|
||||||
|
class="flex shrink-0 items-center gap-1 opacity-0 transition group-hover:opacity-100 focus-within:opacity-100"
|
||||||
|
>
|
||||||
|
{#if onCreateFolder}
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="flex h-6 w-6 items-center justify-center border border-surface-300 bg-surface-50 text-surface-600 transition hover:border-primary-400 hover:text-primary-700"
|
||||||
|
title="在此新建子文件夹"
|
||||||
|
aria-label="在 {folder.name} 内新建子文件夹"
|
||||||
|
onclick={() => onCreateFolder(folder.id)}
|
||||||
|
>
|
||||||
|
<Icon name="folder-plus" class="h-4 w-4" />
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
|
{#if onCreateProject}
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="flex h-6 w-6 items-center justify-center border border-surface-300 bg-surface-50 text-surface-600 transition hover:border-primary-400 hover:text-primary-700"
|
||||||
|
title="在此新建项目"
|
||||||
|
aria-label="在 {folder.name} 内新建项目"
|
||||||
|
onclick={() => onCreateProject(folder.id)}
|
||||||
|
>
|
||||||
|
<Icon name="file-plus" class="h-4 w-4" />
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
|
</span>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
{#if open}
|
{#if open}
|
||||||
<div class="ml-4 border-l border-surface-300 pl-2">
|
<div class="ml-4 border-l border-surface-300 pl-2">
|
||||||
<FolderTree {folders} {projects} parentId={folder.id} {slug} />
|
<FolderTree {folders} {projects} parentId={folder.id} {slug} {onCreateFolder} {onCreateProject} />
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -9,6 +9,8 @@
|
|||||||
projects,
|
projects,
|
||||||
parentId,
|
parentId,
|
||||||
slug,
|
slug,
|
||||||
|
onCreateFolder,
|
||||||
|
onCreateProject,
|
||||||
}: {
|
}: {
|
||||||
folders: ExplorerFolder[];
|
folders: ExplorerFolder[];
|
||||||
projects: {
|
projects: {
|
||||||
@@ -20,6 +22,8 @@
|
|||||||
}[];
|
}[];
|
||||||
parentId: string | null;
|
parentId: string | null;
|
||||||
slug: string;
|
slug: string;
|
||||||
|
onCreateFolder?: (parentId: string) => void;
|
||||||
|
onCreateProject?: (folderId: string) => void;
|
||||||
} = $props();
|
} = $props();
|
||||||
|
|
||||||
let childFolders = $derived(folders.filter((f) => f.parentId === parentId));
|
let childFolders = $derived(folders.filter((f) => f.parentId === parentId));
|
||||||
@@ -29,7 +33,7 @@
|
|||||||
<div class="space-y-0.5">
|
<div class="space-y-0.5">
|
||||||
{#each childProjects as p (p.id)}
|
{#each childProjects as p (p.id)}
|
||||||
<a
|
<a
|
||||||
href={`/admin/org/${slug}/projects/${p.id}`}
|
href={`/admin/projects/${p.id}`}
|
||||||
class="flex items-center gap-2.5 px-3 py-2.5 text-sm transition hover:bg-surface-100"
|
class="flex items-center gap-2.5 px-3 py-2.5 text-sm transition hover:bg-surface-100"
|
||||||
>
|
>
|
||||||
<span class="flex h-7 w-7 items-center justify-center border border-primary-200 bg-primary-50 text-primary-700">
|
<span class="flex h-7 w-7 items-center justify-center border border-primary-200 bg-primary-50 text-primary-700">
|
||||||
@@ -44,6 +48,6 @@
|
|||||||
{/each}
|
{/each}
|
||||||
|
|
||||||
{#each childFolders as f (f.id)}
|
{#each childFolders as f (f.id)}
|
||||||
<FolderNode folder={f} {folders} {projects} {slug} />
|
<FolderNode folder={f} {folders} {projects} {slug} {onCreateFolder} {onCreateProject} />
|
||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -18,6 +18,8 @@
|
|||||||
| 'arrow-left'
|
| 'arrow-left'
|
||||||
| 'folder'
|
| 'folder'
|
||||||
| 'file'
|
| 'file'
|
||||||
|
| 'folder-plus'
|
||||||
|
| 'file-plus'
|
||||||
| 'check'
|
| 'check'
|
||||||
| 'roles';
|
| 'roles';
|
||||||
class?: string;
|
class?: string;
|
||||||
@@ -122,6 +124,22 @@
|
|||||||
d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z"
|
d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z"
|
||||||
/>
|
/>
|
||||||
</svg>
|
</svg>
|
||||||
|
{:else if name === 'folder-plus'}
|
||||||
|
<svg class={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75">
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="M12 10.5v6m3-3H9m4.06-7.19l-2.12-2.12a1.5 1.5 0 00-1.061-.44H4.5A2.25 2.25 0 002.25 6v12a2.25 2.25 0 002.25 2.25h15A2.25 2.25 0 0021.75 18V9a2.25 2.25 0 00-2.25-2.25h-5.379a1.5 1.5 0 01-1.06-.44z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{:else if name === 'file-plus'}
|
||||||
|
<svg class={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75">
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m3.75 9v6m3-3H9m1.5-12H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
{:else if name === 'check'}
|
{:else if name === 'check'}
|
||||||
<svg class={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75">
|
<svg class={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75">
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12.75l6 6 9-13.5" />
|
<path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12.75l6 6 9-13.5" />
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ export const TOOL_OPTIONS: ToolOption[] = [
|
|||||||
{ id: 'list_files', label: '列目录', group: '文件' },
|
{ id: 'list_files', label: '列目录', group: '文件' },
|
||||||
{ id: 'search_files', label: '搜索', group: '文件' },
|
{ id: 'search_files', label: '搜索', group: '文件' },
|
||||||
{ id: 'bash', label: 'Bash 命令', group: 'Shell' },
|
{ id: 'bash', label: 'Bash 命令', group: 'Shell' },
|
||||||
|
{ id: 'web_fetch', label: 'WebFetch', group: '网络' },
|
||||||
|
{ id: 'web_search', label: 'WebSearch', group: '网络' },
|
||||||
{ id: 'cph_check', label: 'cph check', group: 'CPH' },
|
{ id: 'cph_check', label: 'cph check', group: 'CPH' },
|
||||||
{ id: 'cph_build', label: 'cph build', group: 'CPH' },
|
{ id: 'cph_build', label: 'cph build', group: 'CPH' },
|
||||||
{ id: 'send_file', label: '发送文件(飞书)', group: '飞书' },
|
{ id: 'send_file', label: '发送文件(飞书)', group: '飞书' },
|
||||||
|
|||||||
@@ -29,6 +29,52 @@ export function fmtNum(n: number): string {
|
|||||||
return n.toLocaleString();
|
return n.toLocaleString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const USAGE_KIND_LABELS: Record<string, string> = {
|
||||||
|
model_completion: '模型完成',
|
||||||
|
external_capability: '外部能力',
|
||||||
|
tool_proxy: '工具代理',
|
||||||
|
};
|
||||||
|
|
||||||
|
const METER_UNIT_LABELS: Record<string, string> = {
|
||||||
|
pages: '页',
|
||||||
|
audio_seconds: '音频秒',
|
||||||
|
invocations: '次调用',
|
||||||
|
};
|
||||||
|
|
||||||
|
export function usageKindLabel(kind: string): string {
|
||||||
|
return USAGE_KIND_LABELS[kind] ?? kind;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function meterUnitLabel(unit: string | null | undefined): string {
|
||||||
|
if (!unit) return '—';
|
||||||
|
return METER_UNIT_LABELS[unit] ?? unit;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function fmtQuantity(quantity: number | null | undefined, unit: string | null | undefined): string {
|
||||||
|
if (quantity === null || quantity === undefined) return '—';
|
||||||
|
const u = meterUnitLabel(unit);
|
||||||
|
return u === '—' ? fmtNum(quantity) : `${fmtNum(quantity)} ${u}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function fmtTokens(input: number | null | undefined, output: number | null | undefined): string {
|
||||||
|
const hasIn = input !== null && input !== undefined;
|
||||||
|
const hasOut = output !== null && output !== undefined;
|
||||||
|
if (!hasIn && !hasOut) return '—';
|
||||||
|
return `${fmtNum(input ?? 0)} / ${fmtNum(output ?? 0)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function runStatusLabel(status: string): string {
|
||||||
|
const key = status.toUpperCase();
|
||||||
|
if (key === 'COMPLETED') return '完成';
|
||||||
|
if (key === 'FAILED') return '失败';
|
||||||
|
if (key === 'CANCELED') return '取消';
|
||||||
|
if (key === 'TIMED_OUT') return '超时';
|
||||||
|
if (key === 'RUNNING') return '运行中';
|
||||||
|
if (key === 'QUEUED') return '排队';
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
export function orgRoleLabel(role: string): string {
|
export function orgRoleLabel(role: string): string {
|
||||||
const key = role.toUpperCase() as OrgRole;
|
const key = role.toUpperCase() as OrgRole;
|
||||||
return ORG_ROLE_LABELS[key] ?? role;
|
return ORG_ROLE_LABELS[key] ?? role;
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
import type { MeResponse, OrgMembership } from './api';
|
||||||
|
|
||||||
|
/** Alpha Silo host prefix: <slug>.educraft[.dev].… */
|
||||||
|
export function hostOrgSlug(hostname: string = typeof window !== 'undefined' ? window.location.hostname : ''): string | null {
|
||||||
|
const host = hostname.toLowerCase();
|
||||||
|
const m = host.match(/^([a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)\.educraft(?:-dev)?\./);
|
||||||
|
return m?.[1] ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isOrgAdmin(org: OrgMembership | null | undefined): boolean {
|
||||||
|
if (!org) return false;
|
||||||
|
const role = String(org.role ?? '').toUpperCase();
|
||||||
|
return role === 'OWNER' || role === 'ADMIN';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resolve the tenancy for this browser session.
|
||||||
|
* Prefers hostname slug (silo), then ?org=, then first admin membership, then first membership.
|
||||||
|
*/
|
||||||
|
export function resolveOrg(me: MeResponse | null | undefined, search: string = ''): OrgMembership | null {
|
||||||
|
if (!me || me.organizations.length === 0) return null;
|
||||||
|
const host = hostOrgSlug();
|
||||||
|
if (host) {
|
||||||
|
const byHost = me.organizations.find((o) => o.slug === host);
|
||||||
|
if (byHost) return byHost;
|
||||||
|
}
|
||||||
|
const q = new URLSearchParams(search).get('org')?.trim();
|
||||||
|
if (q) {
|
||||||
|
const byQuery = me.organizations.find((o) => o.slug === q);
|
||||||
|
if (byQuery) return byQuery;
|
||||||
|
}
|
||||||
|
const admin = me.organizations.find((o) => isOrgAdmin(o));
|
||||||
|
return admin ?? me.organizations[0] ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** SPA paths no longer embed org slug (subdomain carries tenancy). */
|
||||||
|
export function adminPath(rest: string = ''): string {
|
||||||
|
const cleaned = rest.replace(/^\/+/, '');
|
||||||
|
return cleaned === '' ? '/admin' : `/admin/${cleaned}`;
|
||||||
|
}
|
||||||
@@ -35,12 +35,9 @@ export async function loadSession(): Promise<void> {
|
|||||||
/**
|
/**
|
||||||
* Resolve org slug for org-scoped Feishu OAuth (`GET /auth/feishu/:orgSlug`).
|
* Resolve org slug for org-scoped Feishu OAuth (`GET /auth/feishu/:orgSlug`).
|
||||||
* Unscoped `/auth/feishu` is disabled unless allowLegacyFeishuOAuth is on.
|
* Unscoped `/auth/feishu` is disabled unless allowLegacyFeishuOAuth is on.
|
||||||
|
* Path no longer carries tenancy: prefer hostname silo slug, then ?org=.
|
||||||
*/
|
*/
|
||||||
export function resolveLoginOrgSlug(): string | null {
|
export function resolveLoginOrgSlug(): string | null {
|
||||||
const path = window.location.pathname.split('/').filter(Boolean);
|
|
||||||
if (path[0] === 'admin' && path[1] === 'org' && path[2]) {
|
|
||||||
return decodeURIComponent(path[2]);
|
|
||||||
}
|
|
||||||
const q = new URLSearchParams(window.location.search).get('org');
|
const q = new URLSearchParams(window.location.search).get('org');
|
||||||
if (q && q.trim() !== '') return q.trim();
|
if (q && q.trim() !== '') return q.trim();
|
||||||
|
|
||||||
@@ -48,6 +45,12 @@ export function resolveLoginOrgSlug(): string | null {
|
|||||||
const host = window.location.hostname.toLowerCase();
|
const host = window.location.hostname.toLowerCase();
|
||||||
const m = host.match(/^([a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)\.educraft(?:-dev)?\./);
|
const m = host.match(/^([a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)\.educraft(?:-dev)?\./);
|
||||||
if (m?.[1]) return m[1];
|
if (m?.[1]) return m[1];
|
||||||
|
|
||||||
|
// Legacy path while old bookmarks still land briefly before redirect.
|
||||||
|
const path = window.location.pathname.split('/').filter(Boolean);
|
||||||
|
if (path[0] === 'admin' && path[1] === 'org' && path[2]) {
|
||||||
|
return decodeURIComponent(path[2]);
|
||||||
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { session, loadSession, logout, redirectToLogin } from '$lib/session';
|
import { session, loadSession, logout, redirectToLogin } from '$lib/session';
|
||||||
import type { OrgMembership } from '$lib/api';
|
import type { OrgMembership } from '$lib/api';
|
||||||
|
import { adminPath, isOrgAdmin, resolveOrg } from '$lib/org';
|
||||||
import { orgRoleLabel } from '$lib/format';
|
import { orgRoleLabel } from '$lib/format';
|
||||||
import Icon from '$lib/components/Icon.svelte';
|
import Icon from '$lib/components/Icon.svelte';
|
||||||
import ToastHost from '$lib/components/ToastHost.svelte';
|
import ToastHost from '$lib/components/ToastHost.svelte';
|
||||||
@@ -20,6 +21,7 @@
|
|||||||
|
|
||||||
const navItems = [
|
const navItems = [
|
||||||
{ key: 'overview', label: '概览', icon: 'overview' as const },
|
{ key: 'overview', label: '概览', icon: 'overview' as const },
|
||||||
|
{ key: 'usage', label: '用量', icon: 'overview' as const },
|
||||||
{ key: 'members', label: '成员', icon: 'members' as const },
|
{ key: 'members', label: '成员', icon: 'members' as const },
|
||||||
{ key: 'teams', label: '团队', icon: 'teams' as const },
|
{ key: 'teams', label: '团队', icon: 'teams' as const },
|
||||||
{ key: 'projects', label: '项目', icon: 'projects' as const },
|
{ key: 'projects', label: '项目', icon: 'projects' as const },
|
||||||
@@ -28,68 +30,52 @@
|
|||||||
{ key: 'skills', label: '技能', icon: 'roles' as const },
|
{ key: 'skills', label: '技能', icon: 'roles' as const },
|
||||||
{ key: 'roles', label: '角色', icon: 'roles' as const },
|
{ key: 'roles', label: '角色', icon: 'roles' as const },
|
||||||
{ key: 'feishu', label: '飞书', icon: 'feishu' as const },
|
{ key: 'feishu', label: '飞书', icon: 'feishu' as const },
|
||||||
|
{ key: 'capabilities', label: '能力', icon: 'provider' as const },
|
||||||
];
|
];
|
||||||
|
|
||||||
function isAdmin(org: OrgMembership): boolean {
|
|
||||||
const role = String(org.role ?? '').toUpperCase();
|
|
||||||
return role === 'OWNER' || role === 'ADMIN';
|
|
||||||
}
|
|
||||||
|
|
||||||
function orgSlugFromPath(): string | null {
|
|
||||||
const parts = page.url.pathname.split('/').filter(Boolean);
|
|
||||||
if (parts[0] === 'admin' && parts[1] === 'org' && parts[2]) {
|
|
||||||
return decodeURIComponent(parts[2]);
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
function isOnProjectRoute(): boolean {
|
|
||||||
const parts = page.url.pathname.split('/').filter(Boolean);
|
|
||||||
return parts[0] === 'admin' && parts[1] === 'org' && parts[3] === 'projects';
|
|
||||||
}
|
|
||||||
|
|
||||||
function memberships(): OrgMembership[] {
|
function memberships(): OrgMembership[] {
|
||||||
return $session.me?.organizations ?? [];
|
return $session.me?.organizations ?? [];
|
||||||
}
|
}
|
||||||
|
|
||||||
function adminOrgs(): OrgMembership[] {
|
function adminOrgs(): OrgMembership[] {
|
||||||
return memberships().filter(isAdmin);
|
return memberships().filter((o) => isOrgAdmin(o));
|
||||||
}
|
}
|
||||||
|
|
||||||
function currentOrg(): OrgMembership | null {
|
function currentOrg(): OrgMembership | null {
|
||||||
const slug = orgSlugFromPath();
|
return resolveOrg($session.me, page.url.search);
|
||||||
if (!slug) return null;
|
|
||||||
return memberships().find((o) => o.slug === slug) ?? null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function pickHomeOrg(): OrgMembership | null {
|
function isOnProjectRoute(): boolean {
|
||||||
const admin = adminOrgs()[0];
|
const parts = page.url.pathname.split('/').filter(Boolean);
|
||||||
if (admin) return admin;
|
// /admin/projects or /admin/projects/:id
|
||||||
return memberships()[0] ?? null;
|
return parts[0] === 'admin' && parts[1] === 'projects';
|
||||||
}
|
}
|
||||||
|
|
||||||
function activeKey(): string {
|
function activeKey(): string {
|
||||||
const parts = page.url.pathname.split('/').filter(Boolean);
|
const parts = page.url.pathname.split('/').filter(Boolean);
|
||||||
if (parts[0] !== 'admin' || parts[1] !== 'org' || !parts[2]) return '';
|
if (parts[0] !== 'admin') return '';
|
||||||
return parts[3] ?? 'overview';
|
// /admin → overview; /admin/usage → usage; /admin/projects/x → projects
|
||||||
|
return parts[1] ?? 'overview';
|
||||||
}
|
}
|
||||||
|
|
||||||
function navHref(key: string): string {
|
function navHref(key: string): string {
|
||||||
const slug = currentOrg()?.slug ?? pickHomeOrg()?.slug;
|
if (key === 'overview') return adminPath();
|
||||||
if (!slug) return '/';
|
return adminPath(key);
|
||||||
if (key === 'overview') return `/admin/org/${slug}`;
|
|
||||||
return `/admin/org/${slug}/${key}`;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function pageTitle(): string {
|
function pageTitle(): string {
|
||||||
const key = activeKey();
|
const key = activeKey();
|
||||||
if (key === 'overview' || key === '') return '概览';
|
if (key === 'overview' || key === '') return '概览';
|
||||||
|
if (key === 'sessions') return '会话详情';
|
||||||
return navItems.find((i) => i.key === key)?.label ?? '管理后台';
|
return navItems.find((i) => i.key === key)?.label ?? '管理后台';
|
||||||
}
|
}
|
||||||
|
|
||||||
function switchOrg(nextSlug: string) {
|
function switchOrg(nextSlug: string) {
|
||||||
if (!nextSlug || nextSlug === currentOrg()?.slug) return;
|
if (!nextSlug || nextSlug === currentOrg()?.slug) return;
|
||||||
void goto(`/admin/org/${nextSlug}`);
|
// Path is tenancy-free; keep optional ?org= for local multi-membership debugging.
|
||||||
|
const url = new URL(page.url.href);
|
||||||
|
url.searchParams.set('org', nextSlug);
|
||||||
|
void goto(`${url.pathname}${url.search}`, { replaceState: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleLogout(e: Event) {
|
function handleLogout(e: Event) {
|
||||||
@@ -112,33 +98,23 @@
|
|||||||
$effect(() => {
|
$effect(() => {
|
||||||
if ($session.loading || !$session.me) return;
|
if ($session.loading || !$session.me) return;
|
||||||
|
|
||||||
const slug = orgSlugFromPath();
|
const path = page.url.pathname;
|
||||||
const matched = slug ? memberships().find((o) => o.slug === slug) : null;
|
// Legacy /admin/org/:slug… is handled by admin/org/[...path] page.
|
||||||
|
|
||||||
// Org admins: route to their first admin org if none matched as admin.
|
const org = currentOrg();
|
||||||
const admins = adminOrgs();
|
const admins = adminOrgs();
|
||||||
if (matched && isAdmin(matched)) {
|
|
||||||
|
if (org && isOrgAdmin(org)) {
|
||||||
redirecting = false;
|
redirecting = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!matched && admins.length > 0) {
|
|
||||||
const target = `/admin/org/${admins[0].slug}`;
|
|
||||||
if (page.url.pathname !== target && !page.url.pathname.startsWith(`${target}/`)) {
|
|
||||||
redirecting = true;
|
|
||||||
void goto(target, { replaceState: true });
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Members (non-admin): project pages are open to project MANAGE holders;
|
// Member only: allow project routes; bounce admin-only surfaces to projects.
|
||||||
// the org overview and other admin-only surfaces are not for them.
|
if (org && !isOrgAdmin(org)) {
|
||||||
if (matched && !isAdmin(matched)) {
|
|
||||||
redirecting = false;
|
redirecting = false;
|
||||||
const parts = page.url.pathname.split('/').filter(Boolean);
|
if (!isOnProjectRoute()) {
|
||||||
const onOverview = parts.length === 3; // /admin/org/:slug
|
const target = adminPath('projects');
|
||||||
if (onOverview) {
|
if (path !== target) {
|
||||||
const target = `/admin/org/${matched.slug}/projects`;
|
|
||||||
if (page.url.pathname !== target) {
|
|
||||||
redirecting = true;
|
redirecting = true;
|
||||||
void goto(target, { replaceState: true });
|
void goto(target, { replaceState: true });
|
||||||
}
|
}
|
||||||
@@ -146,12 +122,11 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// No matched org and no admin orgs: route a member to their first org's
|
// No org resolved but user has memberships → land on first org's projects/overview via resolveOrg next tick
|
||||||
// projects page so they can reach project MANAGE surfaces.
|
if (!org && memberships().length > 0) {
|
||||||
if (!matched && memberships().length > 0) {
|
const home = admins[0] ?? memberships()[0]!;
|
||||||
const home = memberships()[0];
|
const target = isOrgAdmin(home) ? adminPath() : adminPath('projects');
|
||||||
const target = `/admin/org/${home.slug}/projects`;
|
if (path !== target && !path.startsWith(`${target}/`)) {
|
||||||
if (page.url.pathname !== target && !page.url.pathname.startsWith(`${target}/`)) {
|
|
||||||
redirecting = true;
|
redirecting = true;
|
||||||
void goto(target, { replaceState: true });
|
void goto(target, { replaceState: true });
|
||||||
}
|
}
|
||||||
@@ -172,14 +147,14 @@
|
|||||||
d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
|
d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
|
||||||
></path>
|
></path>
|
||||||
</svg>
|
</svg>
|
||||||
<p class="text-sm">{redirecting ? '正在进入组织…' : '正在加载会话…'}</p>
|
<p class="text-sm">加载中…</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{:else if $session.error}
|
{:else if $session.error}
|
||||||
<div class="saas-status-panel">
|
<div class="saas-status-panel">
|
||||||
<div class="saas-status-card">
|
<div class="saas-status-card">
|
||||||
<div
|
<div
|
||||||
class="mx-auto mb-4 flex h-12 w-12 items-center justify-center border border-error-300 bg-error-100 text-error-700 font-bold"
|
class="mx-auto mb-3 flex h-12 w-12 items-center justify-center border border-error-200 bg-error-50 text-error-700"
|
||||||
>
|
>
|
||||||
!
|
!
|
||||||
</div>
|
</div>
|
||||||
@@ -192,7 +167,7 @@
|
|||||||
<div class="saas-status-panel">
|
<div class="saas-status-panel">
|
||||||
<div class="saas-status-card">
|
<div class="saas-status-card">
|
||||||
<div
|
<div
|
||||||
class="mx-auto mb-5 flex h-12 w-12 items-center justify-center border border-primary-700 bg-primary-600 text-white font-bold"
|
class="mx-auto mb-4 flex h-12 w-12 items-center justify-center border border-primary-700 bg-primary-600 text-sm font-bold text-white"
|
||||||
>
|
>
|
||||||
CPH
|
CPH
|
||||||
</div>
|
</div>
|
||||||
@@ -201,7 +176,7 @@
|
|||||||
<button class="saas-btn-primary w-full" onclick={() => redirectToLogin()}>使用飞书登录</button>
|
<button class="saas-btn-primary w-full" onclick={() => redirectToLogin()}>使用飞书登录</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{:else if currentOrg() && isAdmin(currentOrg()!)}
|
{:else if currentOrg() && isOrgAdmin(currentOrg()!)}
|
||||||
{@const org = currentOrg()!}
|
{@const org = currentOrg()!}
|
||||||
{@const me = $session.me!}
|
{@const me = $session.me!}
|
||||||
<div class="saas-shell">
|
<div class="saas-shell">
|
||||||
@@ -226,10 +201,11 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="min-w-0">
|
<div class="min-w-0">
|
||||||
<div class="truncate text-sm font-semibold text-surface-900">组织后台</div>
|
<div class="truncate text-sm font-semibold text-surface-900">组织后台</div>
|
||||||
<div class="truncate text-xs text-surface-600">Curriculum Hub</div>
|
<div class="truncate text-xs text-surface-600">{org.name}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{#if me.organizations.length > 1}
|
||||||
<div class="px-3 pb-3">
|
<div class="px-3 pb-3">
|
||||||
<div class="mb-1.5 flex items-center gap-1.5 text-xs font-medium text-surface-700">
|
<div class="mb-1.5 flex items-center gap-1.5 text-xs font-medium text-surface-700">
|
||||||
<Icon name="org" class="h-3.5 w-3.5" />
|
<Icon name="org" class="h-3.5 w-3.5" />
|
||||||
@@ -237,6 +213,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<SelectField items={orgSelectItems(me.organizations)} value={org.slug} onchange={switchOrg} />
|
<SelectField items={orgSelectItems(me.organizations)} value={org.slug} onchange={switchOrg} />
|
||||||
</div>
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<nav class="flex-1 space-y-0.5 overflow-y-auto px-2 pb-3">
|
<nav class="flex-1 space-y-0.5 overflow-y-auto px-2 pb-3">
|
||||||
<p class="px-3 pb-1 pt-2 text-[11px] font-semibold uppercase tracking-wider text-surface-600">工作台</p>
|
<p class="px-3 pb-1 pt-2 text-[11px] font-semibold uppercase tracking-wider text-surface-600">工作台</p>
|
||||||
@@ -306,13 +283,13 @@
|
|||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{:else if currentOrg() && !isAdmin(currentOrg()!) && isOnProjectRoute()}
|
{:else if currentOrg() && !isOrgAdmin(currentOrg()!) && isOnProjectRoute()}
|
||||||
{@const org = currentOrg()!}
|
{@const org = currentOrg()!}
|
||||||
{@const me = $session.me!}
|
{@const me = $session.me!}
|
||||||
<div class="saas-shell">
|
<div class="saas-shell">
|
||||||
<div class="saas-main">
|
<div class="saas-main">
|
||||||
<header class="saas-topbar">
|
<header class="saas-topbar">
|
||||||
<a href={`/admin/org/${org.slug}/projects`} class="saas-btn-ghost px-2!" aria-label="返回项目列表">
|
<a href={adminPath('projects')} class="saas-btn-ghost px-2!" aria-label="返回项目列表">
|
||||||
<Icon name="menu" class="h-5 w-5" />
|
<Icon name="menu" class="h-5 w-5" />
|
||||||
</a>
|
</a>
|
||||||
<div class="min-w-0">
|
<div class="min-w-0">
|
||||||
@@ -341,7 +318,7 @@
|
|||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{:else if currentOrg() && !isAdmin(currentOrg()!)}
|
{:else if currentOrg() && !isOrgAdmin(currentOrg()!)}
|
||||||
{@const denied = currentOrg()!}
|
{@const denied = currentOrg()!}
|
||||||
<div class="saas-status-panel">
|
<div class="saas-status-panel">
|
||||||
<div class="saas-status-card">
|
<div class="saas-status-card">
|
||||||
@@ -350,7 +327,7 @@
|
|||||||
组织 <strong>{denied.name}</strong>(/{denied.slug})中你的角色是
|
组织 <strong>{denied.name}</strong>(/{denied.slug})中你的角色是
|
||||||
<span class="saas-badge-neutral mx-1">{orgRoleLabel(denied.role)}</span>。普通成员仅可访问自己有授权的项目。
|
<span class="saas-badge-neutral mx-1">{orgRoleLabel(denied.role)}</span>。普通成员仅可访问自己有授权的项目。
|
||||||
</p>
|
</p>
|
||||||
<a class="saas-btn-primary" href={`/admin/org/${denied.slug}/projects`}>查看我的项目</a>
|
<a class="saas-btn-primary" href={adminPath('projects')}>查看我的项目</a>
|
||||||
{#if memberships().length > 1}
|
{#if memberships().length > 1}
|
||||||
<p class="saas-label text-left mb-1.5 mt-3">切换到其他组织</p>
|
<p class="saas-label text-left mb-1.5 mt-3">切换到其他组织</p>
|
||||||
<div class="mb-4">
|
<div class="mb-4">
|
||||||
@@ -361,14 +338,14 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{:else if memberships().length > 0}
|
{:else if memberships().length > 0}
|
||||||
{@const denied = pickHomeOrg()!}
|
{@const denied = resolveOrg($session.me) ?? memberships()[0]!}
|
||||||
<div class="saas-status-panel">
|
<div class="saas-status-panel">
|
||||||
<div class="saas-status-card">
|
<div class="saas-status-card">
|
||||||
<h2 class="mb-2 text-lg font-semibold">正在跳转…</h2>
|
<h2 class="mb-2 text-lg font-semibold">正在跳转…</h2>
|
||||||
<p class="mb-5 text-sm text-surface-700">
|
<p class="mb-5 text-sm text-surface-700">
|
||||||
即将进入 <strong>{denied.name}</strong>(/{denied.slug})的项目。
|
即将进入 <strong>{denied.name}</strong>(/{denied.slug})的项目。
|
||||||
</p>
|
</p>
|
||||||
<a class="saas-btn-primary" href={`/admin/org/${denied.slug}/projects`}>立即进入</a>
|
<a class="saas-btn-primary" href={adminPath('projects')}>立即进入</a>
|
||||||
<button class="saas-btn-ghost mt-3" onclick={handleLogout}>退出登录</button>
|
<button class="saas-btn-ghost mt-3" onclick={handleLogout}>退出登录</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
return r === 'OWNER' || r === 'ADMIN';
|
return r === 'OWNER' || r === 'ADMIN';
|
||||||
});
|
});
|
||||||
const target = admin ?? me.organizations[0];
|
const target = admin ?? me.organizations[0];
|
||||||
return target ? `/admin/org/${target.slug}` : null;
|
return target ? `/admin` : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
|
|||||||
+47
-4
@@ -2,6 +2,7 @@
|
|||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { api, type OrgMembership } from '$lib/api';
|
import { api, type OrgMembership } from '$lib/api';
|
||||||
import { session } from '$lib/session';
|
import { session } from '$lib/session';
|
||||||
|
import { resolveOrg } from '$lib/org';
|
||||||
import { fmtCost, fmtNum, orgRoleLabel } from '$lib/format';
|
import { fmtCost, fmtNum, orgRoleLabel } from '$lib/format';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
import StatCard from '$lib/components/StatCard.svelte';
|
import StatCard from '$lib/components/StatCard.svelte';
|
||||||
@@ -10,7 +11,8 @@
|
|||||||
import SwitchControl from '$lib/components/SwitchControl.svelte';
|
import SwitchControl from '$lib/components/SwitchControl.svelte';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
let orgSlug = $derived(page.params.slug ?? '');
|
const orgFromSession = $derived(resolveOrg($session.me, page.url.search));
|
||||||
|
let orgSlug = $derived(orgFromSession?.slug ?? '');
|
||||||
let org = $derived($session.me?.organizations.find((o) => o.slug === orgSlug) as OrgMembership | undefined);
|
let org = $derived($session.me?.organizations.find((o) => o.slug === orgSlug) as OrgMembership | undefined);
|
||||||
|
|
||||||
let settings = $state<{ membersCanCreateProjects: boolean } | null>(null);
|
let settings = $state<{ membersCanCreateProjects: boolean } | null>(null);
|
||||||
@@ -94,19 +96,56 @@
|
|||||||
<div class="mb-4 flex items-end justify-between gap-3">
|
<div class="mb-4 flex items-end justify-between gap-3">
|
||||||
<div>
|
<div>
|
||||||
<h2 class="saas-section-title">用量概览</h2>
|
<h2 class="saas-section-title">用量概览</h2>
|
||||||
<p class="saas-muted">全组织智能体运行汇总</p>
|
<p class="saas-muted">totals 含全部 UsageFact;分账明细见用量页。</p>
|
||||||
</div>
|
</div>
|
||||||
|
<a class="saas-btn-secondary py-1.5! text-sm" href={`/admin/usage`}>完整用量报告</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mb-6 grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
|
<div class="mb-6 grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
|
||||||
<StatCard label="运行总数" value={fmtNum(usage.totals.runCount)} />
|
<StatCard label="运行总数" value={fmtNum(usage.totals.runCount)} />
|
||||||
<StatCard label="有成本运行" value={fmtNum(usage.totals.runsWithCost)} />
|
<StatCard label="有成本运行" value={fmtNum(usage.totals.runsWithCost)} />
|
||||||
<StatCard label="无成本运行" value={fmtNum(usage.totals.runsWithoutCost)} />
|
<StatCard label="无成本运行" value={fmtNum(usage.totals.runsWithoutCost)} hint="未知 ≠ $0" />
|
||||||
<StatCard label="输入 tokens" value={fmtNum(usage.totals.inputTokens)} />
|
<StatCard label="输入 tokens" value={fmtNum(usage.totals.inputTokens)} />
|
||||||
<StatCard label="输出 tokens" value={fmtNum(usage.totals.outputTokens)} />
|
<StatCard label="输出 tokens" value={fmtNum(usage.totals.outputTokens)} />
|
||||||
<StatCard label="成本 (USD)" value={fmtCost(usage.totals.costUsd)} />
|
<StatCard label="成本 (USD)" value={fmtCost(usage.totals.costUsd)} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{#if usage.breakdown.length > 0}
|
||||||
|
<div class="saas-card overflow-hidden mb-6">
|
||||||
|
<div class="border-b border-surface-200 px-5 py-3 flex items-center justify-between gap-3">
|
||||||
|
<div>
|
||||||
|
<h3 class="text-sm font-semibold text-surface-800">消费来源(Top)</h3>
|
||||||
|
<p class="saas-muted text-xs">模型完成 vs 外部能力,按成本降序前 5</p>
|
||||||
|
</div>
|
||||||
|
<a class="text-sm text-primary-700 hover:underline" href={`/admin/usage`}>查看全部分账</a>
|
||||||
|
</div>
|
||||||
|
<div class="overflow-x-auto">
|
||||||
|
<table class="data-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>类型</th>
|
||||||
|
<th>供应方</th>
|
||||||
|
<th>模型 / 能力</th>
|
||||||
|
<th>次数</th>
|
||||||
|
<th>成本</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{#each [...usage.breakdown].sort((a, b) => (b.costUsd ?? -1) - (a.costUsd ?? -1)).slice(0, 5) as row}
|
||||||
|
<tr>
|
||||||
|
<td class="text-sm">{row.kind === 'external_capability' ? '外部能力' : row.kind === 'model_completion' ? '模型完成' : row.kind}</td>
|
||||||
|
<td class="font-mono text-xs">{row.provider}</td>
|
||||||
|
<td class="font-mono text-xs">{row.capabilityId ?? row.model ?? '—'}</td>
|
||||||
|
<td class="tabular-nums">{fmtNum(row.factCount)}</td>
|
||||||
|
<td class="tabular-nums">{fmtCost(row.costUsd)}</td>
|
||||||
|
</tr>
|
||||||
|
{/each}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<div class="saas-card overflow-hidden">
|
<div class="saas-card overflow-hidden">
|
||||||
<div class="border-b border-surface-200 px-5 py-3">
|
<div class="border-b border-surface-200 px-5 py-3">
|
||||||
<h3 class="text-sm font-semibold text-surface-800">按项目用量</h3>
|
<h3 class="text-sm font-semibold text-surface-800">按项目用量</h3>
|
||||||
@@ -129,7 +168,11 @@
|
|||||||
<tbody>
|
<tbody>
|
||||||
{#each usage.projects as p}
|
{#each usage.projects as p}
|
||||||
<tr>
|
<tr>
|
||||||
<td class="font-medium">{p.projectName}</td>
|
<td class="font-medium">
|
||||||
|
<a class="hover:text-primary-700 hover:underline" href={`/admin/projects/${p.projectId}`}>
|
||||||
|
{p.projectName}
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
<td class="tabular-nums">{fmtNum(p.runCount)}</td>
|
<td class="tabular-nums">{fmtNum(p.runCount)}</td>
|
||||||
<td class="tabular-nums text-surface-600">{fmtNum(p.inputTokens)} / {fmtNum(p.outputTokens)}</td>
|
<td class="tabular-nums text-surface-600">{fmtNum(p.inputTokens)} / {fmtNum(p.outputTokens)}</td>
|
||||||
<td class="tabular-nums">{fmtCost(p.costUsd)}</td>
|
<td class="tabular-nums">{fmtCost(p.costUsd)}</td>
|
||||||
@@ -0,0 +1,205 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { page } from '$app/state';
|
||||||
|
import { api, type CapabilityConnection } from '$lib/api';
|
||||||
|
import { session } from '$lib/session';
|
||||||
|
import { resolveOrg } from '$lib/org';
|
||||||
|
import { fmtDate } from '$lib/format';
|
||||||
|
import { Label } from 'bits-ui';
|
||||||
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
|
import LoadingState from '$lib/components/LoadingState.svelte';
|
||||||
|
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
||||||
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
|
const org = $derived(resolveOrg($session.me, page.url.search));
|
||||||
|
const slug = $derived(org?.slug ?? '');
|
||||||
|
|
||||||
|
const KNOWN_CAPABILITIES = [
|
||||||
|
{ id: 'pdf_to_md_bundle', label: 'PDF → Markdown', description: '将 PDF 转换为带图片的 Markdown bundle(阿里云文档智能,含公式 LaTeX 识别)' },
|
||||||
|
{ id: 'audio_video_to_text', label: '音视频 → 文本', description: '将音频/视频转写为文本(阿里云文档智能,按秒计费)' },
|
||||||
|
] as const;
|
||||||
|
|
||||||
|
let connections = $state<Map<string, CapabilityConnection>>(new Map());
|
||||||
|
let loading = $state(true);
|
||||||
|
let error = $state<string | null>(null);
|
||||||
|
|
||||||
|
let editingCap = $state<string | null>(null);
|
||||||
|
let accessKeyId = $state('');
|
||||||
|
let accessKeySecret = $state('');
|
||||||
|
let endpoint = $state('docmind-api.cn-hangzhou.aliyuncs.com');
|
||||||
|
let saving = $state(false);
|
||||||
|
let disabling = $state<string | null>(null);
|
||||||
|
|
||||||
|
async function load() {
|
||||||
|
loading = true;
|
||||||
|
error = null;
|
||||||
|
try {
|
||||||
|
const res = await api.capabilityConnections(slug);
|
||||||
|
connections = new Map(res.connections.map((c) => [c.capabilityId, c]));
|
||||||
|
} catch (err) {
|
||||||
|
error = err instanceof Error ? err.message : String(err);
|
||||||
|
} finally {
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function startEdit(capId: string) {
|
||||||
|
editingCap = capId;
|
||||||
|
accessKeyId = '';
|
||||||
|
accessKeySecret = '';
|
||||||
|
endpoint = 'docmind-api.cn-hangzhou.aliyuncs.com';
|
||||||
|
}
|
||||||
|
|
||||||
|
function cancelEdit() {
|
||||||
|
editingCap = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function save(capId: string) {
|
||||||
|
if (accessKeyId.trim() === '' || accessKeySecret.trim() === '' || endpoint.trim() === '') {
|
||||||
|
toastError('AccessKey ID、AccessKey Secret、Endpoint 均为必填');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
saving = true;
|
||||||
|
try {
|
||||||
|
const result = await api.rotateCapabilityConnection(slug, capId, {
|
||||||
|
accessKeyId: accessKeyId.trim(),
|
||||||
|
accessKeySecret: accessKeySecret.trim(),
|
||||||
|
endpoint: endpoint.trim(),
|
||||||
|
});
|
||||||
|
connections.set(capId, result);
|
||||||
|
connections = new Map(connections);
|
||||||
|
editingCap = null;
|
||||||
|
toastSuccess('能力凭据已保存');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
} finally {
|
||||||
|
saving = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function disable(capId: string) {
|
||||||
|
if (!confirm('停用后该能力将不可用,确定停用?')) return;
|
||||||
|
disabling = capId;
|
||||||
|
try {
|
||||||
|
const result = await api.disableCapabilityConnection(slug, capId);
|
||||||
|
connections.set(capId, result);
|
||||||
|
connections = new Map(connections);
|
||||||
|
toastSuccess('已停用能力连接');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
} finally {
|
||||||
|
disabling = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function statusBadge(status: string): string {
|
||||||
|
if (status === 'ACTIVE') return 'saas-badge-primary';
|
||||||
|
if (status === 'DISABLED') return 'saas-badge-error';
|
||||||
|
return 'saas-badge-muted';
|
||||||
|
}
|
||||||
|
|
||||||
|
function statusLabel(status: string): string {
|
||||||
|
if (status === 'ACTIVE') return '已启用';
|
||||||
|
if (status === 'DISABLED') return '已停用';
|
||||||
|
return '草稿';
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
if (slug) load();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<PageHeader
|
||||||
|
title="外部能力"
|
||||||
|
description="管理文档/媒体转换服务的组织级凭据(ADR-0027)。凭据按组织隔离、版本化信封存储,缺失或校验失败即 fail-closed。"
|
||||||
|
/>
|
||||||
|
|
||||||
|
{#if loading}
|
||||||
|
<LoadingState />
|
||||||
|
{:else if error}
|
||||||
|
<ErrorBanner message={error} onretry={load} />
|
||||||
|
{:else}
|
||||||
|
<div class="space-y-6">
|
||||||
|
{#each KNOWN_CAPABILITIES as cap}
|
||||||
|
{@const conn = connections.get(cap.id)}
|
||||||
|
<div class="saas-card-pad">
|
||||||
|
<div class="mb-3 flex items-start justify-between gap-3">
|
||||||
|
<div>
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<h3 class="saas-section-title">{cap.label}</h3>
|
||||||
|
{#if conn}
|
||||||
|
<span class={statusBadge(conn.status)}>{statusLabel(conn.status)}</span>
|
||||||
|
{:else}
|
||||||
|
<span class="saas-badge-muted">未配置</span>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
<p class="saas-muted mt-1 text-sm">{cap.description}</p>
|
||||||
|
<p class="mt-0.5 font-mono text-xs text-surface-500">{cap.id}</p>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
{#if conn?.status === 'ACTIVE'}
|
||||||
|
<button
|
||||||
|
class="saas-btn-ghost text-sm"
|
||||||
|
onclick={() => disable(cap.id)}
|
||||||
|
disabled={disabling === cap.id}
|
||||||
|
>
|
||||||
|
{disabling === cap.id ? '停用中…' : '停用'}
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
|
<button
|
||||||
|
class="saas-btn-primary text-sm"
|
||||||
|
onclick={() => startEdit(cap.id)}
|
||||||
|
disabled={editingCap === cap.id}
|
||||||
|
>
|
||||||
|
{conn ? '轮换凭据' : '配置凭据'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if conn}
|
||||||
|
<dl class="space-y-1.5 text-sm text-surface-700">
|
||||||
|
<div class="flex justify-between">
|
||||||
|
<dt class="text-surface-500">版本</dt>
|
||||||
|
<dd class="font-mono">{conn.activeVersion ?? '—'}</dd>
|
||||||
|
</div>
|
||||||
|
<div class="flex justify-between">
|
||||||
|
<dt class="text-surface-500">密钥 ID</dt>
|
||||||
|
<dd class="font-mono text-xs">{conn.keyId ?? '—'}</dd>
|
||||||
|
</div>
|
||||||
|
<div class="flex justify-between">
|
||||||
|
<dt class="text-surface-500">更新时间</dt>
|
||||||
|
<dd>{fmtDate(conn.updatedAt)}</dd>
|
||||||
|
</div>
|
||||||
|
</dl>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
{#if editingCap === cap.id}
|
||||||
|
<div class="mt-4 border-t border-surface-100 pt-4">
|
||||||
|
<p class="saas-muted mb-3 text-sm">
|
||||||
|
阿里云 RAM 用户的 AccessKey。密钥仅写入新版本,旧版本归档。
|
||||||
|
</p>
|
||||||
|
<div class="grid gap-4">
|
||||||
|
<div>
|
||||||
|
<Label.Root class="saas-label" for="ak-id-{cap.id}">AccessKey ID</Label.Root>
|
||||||
|
<input id="ak-id-{cap.id}" class="saas-input font-mono text-sm" bind:value={accessKeyId} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<Label.Root class="saas-label" for="ak-secret-{cap.id}">AccessKey Secret</Label.Root>
|
||||||
|
<input id="ak-secret-{cap.id}" class="saas-input" type="password" bind:value={accessKeySecret} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<Label.Root class="saas-label" for="endpoint-{cap.id}">Endpoint</Label.Root>
|
||||||
|
<input id="endpoint-{cap.id}" class="saas-input font-mono text-sm" bind:value={endpoint} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="mt-4 flex items-center justify-end gap-3">
|
||||||
|
<button class="saas-btn-ghost" onclick={cancelEdit} disabled={saving}>取消</button>
|
||||||
|
<button class="saas-btn-primary" onclick={() => save(cap.id)} disabled={saving}>
|
||||||
|
{saving ? '保存中…' : '保存'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
+4
-1
@@ -1,13 +1,16 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { api, type CapacityDimension, type CapacityDimensionRow, type CapacityPolicyView } from '$lib/api';
|
import { api, type CapacityDimension, type CapacityDimensionRow, type CapacityPolicyView } from '$lib/api';
|
||||||
|
import { session } from '$lib/session';
|
||||||
|
import { resolveOrg } from '$lib/org';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
import LoadingState from '$lib/components/LoadingState.svelte';
|
import LoadingState from '$lib/components/LoadingState.svelte';
|
||||||
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
||||||
import EmptyState from '$lib/components/EmptyState.svelte';
|
import EmptyState from '$lib/components/EmptyState.svelte';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
const slug = $derived(page.params.slug ?? '');
|
const org = $derived(resolveOrg($session.me, page.url.search));
|
||||||
|
const slug = $derived(org?.slug ?? '');
|
||||||
|
|
||||||
// Friendlier, user-facing labels. No spec jargon (墙钟 → 运行时长, etc.).
|
// Friendlier, user-facing labels. No spec jargon (墙钟 → 运行时长, etc.).
|
||||||
const DIMENSION_LABELS: Record<CapacityDimension, string> = {
|
const DIMENSION_LABELS: Record<CapacityDimension, string> = {
|
||||||
+4
-1
@@ -1,6 +1,8 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { api, type FeishuApplicationConnection } from '$lib/api';
|
import { api, type FeishuApplicationConnection } from '$lib/api';
|
||||||
|
import { session } from '$lib/session';
|
||||||
|
import { resolveOrg } from '$lib/org';
|
||||||
import { fmtDate } from '$lib/format';
|
import { fmtDate } from '$lib/format';
|
||||||
import { Label } from 'bits-ui';
|
import { Label } from 'bits-ui';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
@@ -8,7 +10,8 @@
|
|||||||
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
const slug = $derived(page.params.slug ?? '');
|
const org = $derived(resolveOrg($session.me, page.url.search));
|
||||||
|
const slug = $derived(org?.slug ?? '');
|
||||||
|
|
||||||
let connection = $state<FeishuApplicationConnection | null>(null);
|
let connection = $state<FeishuApplicationConnection | null>(null);
|
||||||
let loading = $state(true);
|
let loading = $state(true);
|
||||||
+4
-1
@@ -1,6 +1,8 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { api, type OrgMember } from '$lib/api';
|
import { api, type OrgMember } from '$lib/api';
|
||||||
|
import { session } from '$lib/session';
|
||||||
|
import { resolveOrg } from '$lib/org';
|
||||||
import { fmtDate } from '$lib/format';
|
import { fmtDate } from '$lib/format';
|
||||||
import { ORG_ROLES, ORG_ROLE_LABELS, PERMISSION_ROLE_LABELS } from '$lib/constants';
|
import { ORG_ROLES, ORG_ROLE_LABELS, PERMISSION_ROLE_LABELS } from '$lib/constants';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
@@ -10,7 +12,8 @@
|
|||||||
import SelectField from '$lib/components/SelectField.svelte';
|
import SelectField from '$lib/components/SelectField.svelte';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
const slug = $derived(page.params.slug ?? '');
|
const org = $derived(resolveOrg($session.me, page.url.search));
|
||||||
|
const slug = $derived(org?.slug ?? '');
|
||||||
const roleItems = ORG_ROLES.map((r) => ({ value: r, label: ORG_ROLE_LABELS[r] }));
|
const roleItems = ORG_ROLES.map((r) => ({ value: r, label: ORG_ROLE_LABELS[r] }));
|
||||||
const permHint = Object.values(PERMISSION_ROLE_LABELS).join(' / ');
|
const permHint = Object.values(PERMISSION_ROLE_LABELS).join(' / ');
|
||||||
|
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
/**
|
||||||
|
* Legacy bookmarks: /admin/org/:slug[/...] → /admin[/...]
|
||||||
|
* Tenancy lives on the silo host, not the path.
|
||||||
|
*/
|
||||||
|
import { onMount } from 'svelte';
|
||||||
|
import { goto } from '$app/navigation';
|
||||||
|
import { page } from '$app/state';
|
||||||
|
|
||||||
|
onMount(() => {
|
||||||
|
const raw = page.params.path ?? '';
|
||||||
|
const segments = raw.split('/').filter(Boolean);
|
||||||
|
// Drop the old org slug (first segment) when present.
|
||||||
|
const rest = segments.length > 0 ? segments.slice(1).join('/') : '';
|
||||||
|
const target = rest === '' ? '/admin' : `/admin/${rest}`;
|
||||||
|
const q = page.url.search;
|
||||||
|
void goto(`${target}${q}`, { replaceState: true });
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="saas-status-panel">
|
||||||
|
<p class="text-sm text-surface-600">正在重定向到新地址…</p>
|
||||||
|
</div>
|
||||||
+27
-9
@@ -2,6 +2,7 @@
|
|||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { api, type ExplorerData, type ExplorerFolder, type ExplorerProject, type OrgMembership } from '$lib/api';
|
import { api, type ExplorerData, type ExplorerFolder, type ExplorerProject, type OrgMembership } from '$lib/api';
|
||||||
import { session } from '$lib/session';
|
import { session } from '$lib/session';
|
||||||
|
import { resolveOrg } from '$lib/org';
|
||||||
import FolderTree from '$lib/components/FolderTree.svelte';
|
import FolderTree from '$lib/components/FolderTree.svelte';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
import LoadingState from '$lib/components/LoadingState.svelte';
|
import LoadingState from '$lib/components/LoadingState.svelte';
|
||||||
@@ -13,10 +14,8 @@
|
|||||||
import { fmtDate } from '$lib/format';
|
import { fmtDate } from '$lib/format';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
const slug = $derived(page.params.slug ?? '');
|
const org = $derived(resolveOrg($session.me, page.url.search));
|
||||||
const org = $derived(
|
const slug = $derived(org?.slug ?? '');
|
||||||
($session.me?.organizations.find((o) => o.slug === slug) as OrgMembership | undefined) ?? null,
|
|
||||||
);
|
|
||||||
const isAdmin = $derived(!!org && (org.role === 'OWNER' || org.role === 'ADMIN'));
|
const isAdmin = $derived(!!org && (org.role === 'OWNER' || org.role === 'ADMIN'));
|
||||||
|
|
||||||
let data = $state<ExplorerData | null>(null);
|
let data = $state<ExplorerData | null>(null);
|
||||||
@@ -32,6 +31,18 @@
|
|||||||
let projectName = $state('');
|
let projectName = $state('');
|
||||||
let projectFolder = $state('');
|
let projectFolder = $state('');
|
||||||
|
|
||||||
|
function openFolderModal(parentId: string) {
|
||||||
|
folderName = '';
|
||||||
|
folderParent = parentId;
|
||||||
|
showFolderModal = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function openProjectModal(folderId: string) {
|
||||||
|
projectName = '';
|
||||||
|
projectFolder = folderId;
|
||||||
|
showProjectModal = true;
|
||||||
|
}
|
||||||
|
|
||||||
async function load() {
|
async function load() {
|
||||||
loading = true;
|
loading = true;
|
||||||
error = null;
|
error = null;
|
||||||
@@ -77,7 +88,7 @@
|
|||||||
projectName = '';
|
projectName = '';
|
||||||
projectFolder = '';
|
projectFolder = '';
|
||||||
showProjectModal = false;
|
showProjectModal = false;
|
||||||
window.location.href = `/admin/org/${slug}/projects/${res.id}`;
|
window.location.href = `/admin/projects/${res.id}`;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
toastError(err instanceof Error ? err.message : String(err));
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
}
|
}
|
||||||
@@ -113,8 +124,8 @@
|
|||||||
{:else if isAdmin && data}
|
{:else if isAdmin && data}
|
||||||
<PageHeader title="项目" description="文件夹是透明组织节点;项目是权限边界。">
|
<PageHeader title="项目" description="文件夹是透明组织节点;项目是权限边界。">
|
||||||
{#snippet actions()}
|
{#snippet actions()}
|
||||||
<button class="saas-btn-secondary" onclick={() => (showFolderModal = true)}>新建文件夹</button>
|
<button class="saas-btn-secondary" onclick={() => openFolderModal('')}>新建文件夹</button>
|
||||||
<button class="saas-btn-primary" onclick={() => (showProjectModal = true)}>新建项目</button>
|
<button class="saas-btn-primary" onclick={() => openProjectModal('')}>新建项目</button>
|
||||||
{/snippet}
|
{/snippet}
|
||||||
</PageHeader>
|
</PageHeader>
|
||||||
|
|
||||||
@@ -122,7 +133,14 @@
|
|||||||
{#if data.projects.filter((p) => !p.folderId).length === 0 && data.folders.filter((f) => !f.parentId).length === 0}
|
{#if data.projects.filter((p) => !p.folderId).length === 0 && data.folders.filter((f) => !f.parentId).length === 0}
|
||||||
<EmptyState title="暂无项目" description="新建文件夹或项目,开始组织你的教研资产。" />
|
<EmptyState title="暂无项目" description="新建文件夹或项目,开始组织你的教研资产。" />
|
||||||
{:else}
|
{:else}
|
||||||
<FolderTree folders={data.folders} projects={data.projects} parentId={null} {slug} />
|
<FolderTree
|
||||||
|
folders={data.folders}
|
||||||
|
projects={data.projects}
|
||||||
|
parentId={null}
|
||||||
|
{slug}
|
||||||
|
onCreateFolder={openFolderModal}
|
||||||
|
onCreateProject={openProjectModal}
|
||||||
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -190,7 +208,7 @@
|
|||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{#each myProjects as p}
|
{#each myProjects as p}
|
||||||
<tr class="cursor-pointer" onclick={() => (window.location.href = `/admin/org/${slug}/projects/${p.id}`)}>
|
<tr class="cursor-pointer" onclick={() => (window.location.href = `/admin/projects/${p.id}`)}>
|
||||||
<td class="font-medium">{p.name}</td>
|
<td class="font-medium">{p.name}</td>
|
||||||
<td class="font-mono text-xs">{p.binding ? `群 ${p.binding.chatId}` : '—'}</td>
|
<td class="font-mono text-xs">{p.binding ? `群 ${p.binding.chatId}` : '—'}</td>
|
||||||
<td class="text-surface-700">{fmtDate(p.createdAt)}</td>
|
<td class="text-surface-700">{fmtDate(p.createdAt)}</td>
|
||||||
+89
-5
@@ -7,8 +7,19 @@
|
|||||||
type TeamRow,
|
type TeamRow,
|
||||||
type SessionSummary,
|
type SessionSummary,
|
||||||
type ExplorerData,
|
type ExplorerData,
|
||||||
|
type ProjectUsageReport,
|
||||||
} from '$lib/api';
|
} from '$lib/api';
|
||||||
import { fmtDate, permissionRoleLabel } from '$lib/format';
|
import { session } from '$lib/session';
|
||||||
|
import { resolveOrg } from '$lib/org';
|
||||||
|
import {
|
||||||
|
fmtCost,
|
||||||
|
fmtDate,
|
||||||
|
fmtNum,
|
||||||
|
fmtQuantity,
|
||||||
|
fmtTokens,
|
||||||
|
permissionRoleLabel,
|
||||||
|
usageKindLabel,
|
||||||
|
} from '$lib/format';
|
||||||
import { PERMISSION_ROLES, PERMISSION_ROLE_LABELS } from '$lib/constants';
|
import { PERMISSION_ROLES, PERMISSION_ROLE_LABELS } from '$lib/constants';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
import LoadingState from '$lib/components/LoadingState.svelte';
|
import LoadingState from '$lib/components/LoadingState.svelte';
|
||||||
@@ -18,7 +29,8 @@
|
|||||||
import Icon from '$lib/components/Icon.svelte';
|
import Icon from '$lib/components/Icon.svelte';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
const slug = $derived(page.params.slug ?? '');
|
const org = $derived(resolveOrg($session.me, page.url.search));
|
||||||
|
const slug = $derived(org?.slug ?? '');
|
||||||
const projectId = $derived(page.params.projectId ?? '');
|
const projectId = $derived(page.params.projectId ?? '');
|
||||||
const roleItems = PERMISSION_ROLES.map((r) => ({ value: r, label: PERMISSION_ROLE_LABELS[r] }));
|
const roleItems = PERMISSION_ROLES.map((r) => ({ value: r, label: PERMISSION_ROLE_LABELS[r] }));
|
||||||
const roleChain = `${PERMISSION_ROLE_LABELS.READ} ⊂ ${PERMISSION_ROLE_LABELS.EDIT} ⊂ ${PERMISSION_ROLE_LABELS.MANAGE}`;
|
const roleChain = `${PERMISSION_ROLE_LABELS.READ} ⊂ ${PERMISSION_ROLE_LABELS.EDIT} ⊂ ${PERMISSION_ROLE_LABELS.MANAGE}`;
|
||||||
@@ -26,6 +38,7 @@
|
|||||||
let proj = $state<ProjectDetail | null>(null);
|
let proj = $state<ProjectDetail | null>(null);
|
||||||
let access = $state<TeamAccessEntry[]>([]);
|
let access = $state<TeamAccessEntry[]>([]);
|
||||||
let sessions = $state<SessionSummary[]>([]);
|
let sessions = $state<SessionSummary[]>([]);
|
||||||
|
let projectUsage = $state<ProjectUsageReport | null>(null);
|
||||||
let teams = $state<TeamRow[]>([]);
|
let teams = $state<TeamRow[]>([]);
|
||||||
let explorer = $state<ExplorerData | null>(null);
|
let explorer = $state<ExplorerData | null>(null);
|
||||||
let loading = $state(true);
|
let loading = $state(true);
|
||||||
@@ -49,14 +62,18 @@
|
|||||||
// Team list is needed for grant UI whenever the actor has project MANAGE
|
// Team list is needed for grant UI whenever the actor has project MANAGE
|
||||||
// (org admin or member). Sessions/explorer stay org-admin oversight only.
|
// (org admin or member). Sessions/explorer stay org-admin oversight only.
|
||||||
const needTeams = p.actorIsOrgAdmin === true || p.actorCanManageProject === true;
|
const needTeams = p.actorIsOrgAdmin === true || p.actorCanManageProject === true;
|
||||||
const [s, t, e] = await Promise.all([
|
const [s, t, e, u] = await Promise.all([
|
||||||
p.actorIsOrgAdmin ? api.sessions(slug, projectId) : Promise.resolve({ sessions: [] as SessionSummary[] }),
|
p.actorIsOrgAdmin ? api.sessions(slug, projectId) : Promise.resolve({ sessions: [] as SessionSummary[] }),
|
||||||
needTeams ? api.teams(slug) : Promise.resolve({ teams: [] as TeamRow[] }),
|
needTeams ? api.teams(slug) : Promise.resolve({ teams: [] as TeamRow[] }),
|
||||||
p.actorIsOrgAdmin ? api.explorer(slug) : Promise.resolve(null as ExplorerData | null),
|
p.actorIsOrgAdmin ? api.explorer(slug) : Promise.resolve(null as ExplorerData | null),
|
||||||
|
p.actorIsOrgAdmin
|
||||||
|
? api.projectUsage(slug, projectId)
|
||||||
|
: Promise.resolve(null as ProjectUsageReport | null),
|
||||||
]);
|
]);
|
||||||
sessions = s.sessions;
|
sessions = s.sessions;
|
||||||
teams = t.teams;
|
teams = t.teams;
|
||||||
explorer = e;
|
explorer = e;
|
||||||
|
projectUsage = u;
|
||||||
if (p.actorIsOrgAdmin) {
|
if (p.actorIsOrgAdmin) {
|
||||||
moveFolder = p.folderId ?? '';
|
moveFolder = p.folderId ?? '';
|
||||||
}
|
}
|
||||||
@@ -95,7 +112,7 @@
|
|||||||
if (!confirm(`归档项目 ${proj?.name}?`)) return;
|
if (!confirm(`归档项目 ${proj?.name}?`)) return;
|
||||||
try {
|
try {
|
||||||
await api.archiveProject(slug, projectId);
|
await api.archiveProject(slug, projectId);
|
||||||
window.location.href = `/admin/org/${slug}/projects`;
|
window.location.href = `/admin/projects`;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
toastError(err instanceof Error ? err.message : String(err));
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
}
|
}
|
||||||
@@ -156,7 +173,7 @@
|
|||||||
{:else if proj}
|
{:else if proj}
|
||||||
<div class="mb-2">
|
<div class="mb-2">
|
||||||
<a
|
<a
|
||||||
href={`/admin/org/${slug}/projects`}
|
href={`/admin/projects`}
|
||||||
class="inline-flex items-center gap-1 text-sm text-surface-700 hover:text-primary-600"
|
class="inline-flex items-center gap-1 text-sm text-surface-700 hover:text-primary-600"
|
||||||
>
|
>
|
||||||
<Icon name="arrow-left" class="h-4 w-4" />
|
<Icon name="arrow-left" class="h-4 w-4" />
|
||||||
@@ -269,9 +286,67 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{#if actorIsOrgAdmin}
|
{#if actorIsOrgAdmin}
|
||||||
|
{#if projectUsage}
|
||||||
|
<div class="saas-card overflow-hidden mb-6">
|
||||||
|
<div class="border-b border-surface-200 px-5 py-3 flex items-center justify-between gap-3">
|
||||||
|
<div>
|
||||||
|
<h3 class="text-sm font-semibold">项目用量分账</h3>
|
||||||
|
<p class="saas-muted mt-0.5 text-xs">
|
||||||
|
{fmtNum(projectUsage.runCount)} 次运行 · 成本 {fmtCost(projectUsage.costUsd)} · tokens
|
||||||
|
{fmtTokens(projectUsage.inputTokens, projectUsage.outputTokens)}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<a class="text-sm text-primary-700 hover:underline" href={`/admin/usage`}>组织报告</a>
|
||||||
|
</div>
|
||||||
|
{#if projectUsage.breakdown.length === 0}
|
||||||
|
<div class="px-5 py-4 text-sm text-surface-600">尚无 UsageFact。</div>
|
||||||
|
{:else}
|
||||||
|
<div class="overflow-x-auto">
|
||||||
|
<table class="data-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>类型</th>
|
||||||
|
<th>供应方</th>
|
||||||
|
<th>模型 / 能力</th>
|
||||||
|
<th>次数</th>
|
||||||
|
<th>计量</th>
|
||||||
|
<th>成本</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{#each projectUsage.breakdown as row}
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<span
|
||||||
|
class={row.kind === 'external_capability' ? 'saas-badge-primary' : 'saas-badge-success'}
|
||||||
|
>
|
||||||
|
{usageKindLabel(row.kind)}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
<td class="font-mono text-xs">{row.provider}</td>
|
||||||
|
<td class="font-mono text-xs">{row.capabilityId ?? row.model ?? '—'}</td>
|
||||||
|
<td class="tabular-nums">{fmtNum(row.factCount)}</td>
|
||||||
|
<td class="tabular-nums text-xs">
|
||||||
|
{#if row.unit}
|
||||||
|
{fmtQuantity(row.quantity, row.unit)}
|
||||||
|
{:else}
|
||||||
|
{fmtTokens(row.inputTokens, row.outputTokens)}
|
||||||
|
{/if}
|
||||||
|
</td>
|
||||||
|
<td class="tabular-nums">{fmtCost(row.costUsd)}</td>
|
||||||
|
</tr>
|
||||||
|
{/each}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<div class="saas-card overflow-hidden">
|
<div class="saas-card overflow-hidden">
|
||||||
<div class="border-b border-surface-200 px-5 py-3">
|
<div class="border-b border-surface-200 px-5 py-3">
|
||||||
<h3 class="text-sm font-semibold">智能体会话</h3>
|
<h3 class="text-sm font-semibold">智能体会话</h3>
|
||||||
|
<p class="saas-muted mt-0.5 text-xs">点进会话可查看每次 run 的 UsageFact 分账(模型 / 外部能力)。</p>
|
||||||
</div>
|
</div>
|
||||||
{#if sessions.length === 0}
|
{#if sessions.length === 0}
|
||||||
<EmptyState title="暂无会话" description="飞书侧触发智能体后会显示在此。" />
|
<EmptyState title="暂无会话" description="飞书侧触发智能体后会显示在此。" />
|
||||||
@@ -283,6 +358,7 @@
|
|||||||
<th>模型</th>
|
<th>模型</th>
|
||||||
<th>运行次数</th>
|
<th>运行次数</th>
|
||||||
<th>更新</th>
|
<th>更新</th>
|
||||||
|
<th></th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -292,6 +368,14 @@
|
|||||||
<td class="font-mono text-xs">{s.model}</td>
|
<td class="font-mono text-xs">{s.model}</td>
|
||||||
<td class="tabular-nums">{s.runCount}</td>
|
<td class="tabular-nums">{s.runCount}</td>
|
||||||
<td class="text-surface-700">{fmtDate(s.updatedAt)}</td>
|
<td class="text-surface-700">{fmtDate(s.updatedAt)}</td>
|
||||||
|
<td class="text-right">
|
||||||
|
<a
|
||||||
|
class="text-sm text-primary-700 hover:underline"
|
||||||
|
href={`/admin/sessions/${s.id}`}
|
||||||
|
>
|
||||||
|
详情
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{/each}
|
{/each}
|
||||||
</tbody>
|
</tbody>
|
||||||
+4
-1
@@ -1,6 +1,8 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { api, type ProviderConnectionRow } from '$lib/api';
|
import { api, type ProviderConnectionRow } from '$lib/api';
|
||||||
|
import { session } from '$lib/session';
|
||||||
|
import { resolveOrg } from '$lib/org';
|
||||||
import { fmtDate, providerModeLabel } from '$lib/format';
|
import { fmtDate, providerModeLabel } from '$lib/format';
|
||||||
import { Label } from 'bits-ui';
|
import { Label } from 'bits-ui';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
@@ -8,7 +10,8 @@
|
|||||||
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
const slug = $derived(page.params.slug ?? '');
|
const org = $derived(resolveOrg($session.me, page.url.search));
|
||||||
|
const slug = $derived(org?.slug ?? '');
|
||||||
|
|
||||||
let connections = $state<ProviderConnectionRow[]>([]);
|
let connections = $state<ProviderConnectionRow[]>([]);
|
||||||
let loading = $state(true);
|
let loading = $state(true);
|
||||||
+11
-3
@@ -1,6 +1,8 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { api, type AgentRoleRow, type AgentModelRow, type AgentSkillRow } from '$lib/api';
|
import { api, type AgentRoleRow, type AgentModelRow, type AgentSkillRow } from '$lib/api';
|
||||||
|
import { session } from '$lib/session';
|
||||||
|
import { resolveOrg } from '$lib/org';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
import LoadingState from '$lib/components/LoadingState.svelte';
|
import LoadingState from '$lib/components/LoadingState.svelte';
|
||||||
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
||||||
@@ -8,7 +10,8 @@
|
|||||||
import RoleCard from '$lib/components/RoleCard.svelte';
|
import RoleCard from '$lib/components/RoleCard.svelte';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
const slug = $derived(page.params.slug ?? '');
|
const org = $derived(resolveOrg($session.me, page.url.search));
|
||||||
|
const slug = $derived(org?.slug ?? '');
|
||||||
|
|
||||||
let roles = $state<AgentRoleRow[]>([]);
|
let roles = $state<AgentRoleRow[]>([]);
|
||||||
let models = $state<AgentModelRow[]>([]);
|
let models = $state<AgentModelRow[]>([]);
|
||||||
@@ -24,10 +27,15 @@
|
|||||||
loading = true;
|
loading = true;
|
||||||
error = null;
|
error = null;
|
||||||
try {
|
try {
|
||||||
const [r, m, s] = await Promise.all([api.agentRoles(slug), api.agentModels(slug), api.agentSkills(slug)]);
|
const [r, s] = await Promise.all([api.agentRoles(slug), api.agentSkills(slug)]);
|
||||||
roles = r.roles;
|
roles = r.roles;
|
||||||
models = m.models;
|
|
||||||
skills = s.skills;
|
skills = s.skills;
|
||||||
|
// Model fetch hits the provider API and may fail or be slow; load it
|
||||||
|
// independently so roles remain editable even without a model list.
|
||||||
|
models = [];
|
||||||
|
api.agentModels(slug)
|
||||||
|
.then((m) => { models = m.models; })
|
||||||
|
.catch((err) => { toastError(`模型列表加载失败:${err instanceof Error ? err.message : String(err)}`); });
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
error = err instanceof Error ? err.message : String(err);
|
error = err instanceof Error ? err.message : String(err);
|
||||||
} finally {
|
} finally {
|
||||||
@@ -0,0 +1,238 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { page } from '$app/state';
|
||||||
|
import { api, type SessionDetail, type SessionRunRow, type UsageFactRow } from '$lib/api';
|
||||||
|
import { session } from '$lib/session';
|
||||||
|
import { resolveOrg } from '$lib/org';
|
||||||
|
import {
|
||||||
|
fmtCost,
|
||||||
|
fmtDate,
|
||||||
|
fmtNum,
|
||||||
|
fmtQuantity,
|
||||||
|
fmtTokens,
|
||||||
|
runStatusLabel,
|
||||||
|
usageKindLabel,
|
||||||
|
} from '$lib/format';
|
||||||
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
|
import LoadingState from '$lib/components/LoadingState.svelte';
|
||||||
|
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
||||||
|
import EmptyState from '$lib/components/EmptyState.svelte';
|
||||||
|
import Icon from '$lib/components/Icon.svelte';
|
||||||
|
|
||||||
|
const org = $derived(resolveOrg($session.me, page.url.search));
|
||||||
|
const slug = $derived(org?.slug ?? '');
|
||||||
|
const sessionId = $derived(page.params.sessionId ?? '');
|
||||||
|
|
||||||
|
let detail = $state<SessionDetail | null>(null);
|
||||||
|
let loading = $state(true);
|
||||||
|
let error = $state<string | null>(null);
|
||||||
|
let expandedRunId = $state<string | null>(null);
|
||||||
|
|
||||||
|
async function load() {
|
||||||
|
if (!slug || !sessionId) return;
|
||||||
|
loading = true;
|
||||||
|
error = null;
|
||||||
|
try {
|
||||||
|
detail = await api.session(slug, sessionId);
|
||||||
|
if (detail.runs.length > 0) {
|
||||||
|
expandedRunId = detail.runs[0]!.id;
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
error = err instanceof Error ? err.message : String(err);
|
||||||
|
} finally {
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function statusClass(status: string): string {
|
||||||
|
const key = status.toUpperCase();
|
||||||
|
if (key === 'COMPLETED') return 'saas-badge-success';
|
||||||
|
if (key === 'FAILED' || key === 'TIMED_OUT' || key === 'CANCELED') return 'saas-badge-error';
|
||||||
|
return 'saas-badge-primary';
|
||||||
|
}
|
||||||
|
|
||||||
|
function factMeter(f: UsageFactRow): string {
|
||||||
|
if (f.unit) return fmtQuantity(f.quantity, f.unit);
|
||||||
|
if (f.inputTokens !== null || f.outputTokens !== null) {
|
||||||
|
return fmtTokens(f.inputTokens, f.outputTokens);
|
||||||
|
}
|
||||||
|
return '—';
|
||||||
|
}
|
||||||
|
|
||||||
|
function factSource(f: UsageFactRow): string {
|
||||||
|
if (f.capabilityId) return f.capabilityId;
|
||||||
|
if (f.model) return f.model;
|
||||||
|
return '—';
|
||||||
|
}
|
||||||
|
|
||||||
|
function runCostHint(run: SessionRunRow): string {
|
||||||
|
const factCost = run.usageFacts.reduce<number | null>((acc, f) => {
|
||||||
|
if (f.costUsd === null) return acc;
|
||||||
|
return (acc ?? 0) + f.costUsd;
|
||||||
|
}, null);
|
||||||
|
const cache = run.costUsd;
|
||||||
|
if (factCost !== null && cache !== null && Math.abs(factCost - cache) > 1e-9) {
|
||||||
|
return `运行缓存 ${fmtCost(cache)};事实合计 ${fmtCost(factCost)}(缓存可能未含外部能力)`;
|
||||||
|
}
|
||||||
|
if (factCost !== null) return `事实合计 ${fmtCost(factCost)}`;
|
||||||
|
if (cache !== null) return `运行缓存 ${fmtCost(cache)}`;
|
||||||
|
return '成本未知';
|
||||||
|
}
|
||||||
|
|
||||||
|
function toggleRun(id: string) {
|
||||||
|
expandedRunId = expandedRunId === id ? null : id;
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
if (slug && sessionId) void load();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{#if loading}
|
||||||
|
<LoadingState />
|
||||||
|
{:else if error}
|
||||||
|
<ErrorBanner message={error} onretry={load} />
|
||||||
|
{:else if detail}
|
||||||
|
<div class="mb-2">
|
||||||
|
<a
|
||||||
|
class="inline-flex items-center gap-1 text-sm text-surface-700 hover:text-primary-700"
|
||||||
|
href={`/admin/projects/${detail.project.id}`}
|
||||||
|
>
|
||||||
|
<Icon name="arrow-left" class="h-4 w-4" />
|
||||||
|
返回项目 {detail.project.name}
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<PageHeader
|
||||||
|
title={detail.title?.trim() || '未命名会话'}
|
||||||
|
description={`${detail.provider} · ${detail.roleId} · ${detail.model}`}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<div class="saas-card-pad mb-6">
|
||||||
|
<dl class="grid gap-x-8 gap-y-3 text-sm sm:grid-cols-2 lg:grid-cols-3">
|
||||||
|
<div>
|
||||||
|
<dt class="text-surface-600">会话 ID</dt>
|
||||||
|
<dd class="mt-0.5 break-all font-mono text-xs">{detail.id}</dd>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<dt class="text-surface-600">项目</dt>
|
||||||
|
<dd class="mt-0.5">
|
||||||
|
<a class="text-primary-700 hover:underline" href={`/admin/projects/${detail.project.id}`}>
|
||||||
|
{detail.project.name}
|
||||||
|
</a>
|
||||||
|
</dd>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<dt class="text-surface-600">创建 / 更新</dt>
|
||||||
|
<dd class="mt-0.5 text-surface-800">{fmtDate(detail.createdAt)} · {fmtDate(detail.updatedAt)}</dd>
|
||||||
|
</div>
|
||||||
|
{#if detail.archivedAt}
|
||||||
|
<div>
|
||||||
|
<dt class="text-surface-600">已归档</dt>
|
||||||
|
<dd class="mt-0.5">{fmtDate(detail.archivedAt)}</dd>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
<div>
|
||||||
|
<dt class="text-surface-600">运行数</dt>
|
||||||
|
<dd class="mt-0.5 tabular-nums">{fmtNum(detail.runs.length)}</dd>
|
||||||
|
</div>
|
||||||
|
</dl>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-3">
|
||||||
|
<h2 class="saas-section-title">运行与计费事实</h2>
|
||||||
|
<p class="saas-muted">每条 UsageFact 是一次可计费消费;外部能力与模型完成分开列出。</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if detail.runs.length === 0}
|
||||||
|
<div class="saas-card">
|
||||||
|
<EmptyState title="尚无运行" description="此会话还没有 Agent run。" />
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<div class="space-y-3">
|
||||||
|
{#each detail.runs as run (run.id)}
|
||||||
|
{@const open = expandedRunId === run.id}
|
||||||
|
<div class="saas-card overflow-hidden">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="flex w-full items-start justify-between gap-3 px-5 py-4 text-left hover:bg-surface-50"
|
||||||
|
onclick={() => toggleRun(run.id)}
|
||||||
|
>
|
||||||
|
<div class="min-w-0 space-y-1">
|
||||||
|
<div class="flex flex-wrap items-center gap-2">
|
||||||
|
<span class={statusClass(run.status)}>{runStatusLabel(run.status)}</span>
|
||||||
|
<span class="font-mono text-xs text-surface-700">{run.provider} / {run.model}</span>
|
||||||
|
<span class="font-mono text-[11px] text-surface-500">{run.id}</span>
|
||||||
|
</div>
|
||||||
|
<div class="text-xs text-surface-700">
|
||||||
|
{fmtDate(run.startedAt)}
|
||||||
|
{#if run.finishedAt}
|
||||||
|
→ {fmtDate(run.finishedAt)}
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
<div class="text-xs text-surface-600">{runCostHint(run)}</div>
|
||||||
|
{#if run.error}
|
||||||
|
<div class="text-xs text-error-700">{run.error}</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
<div class="shrink-0 text-right text-sm">
|
||||||
|
<div class="tabular-nums text-surface-800">{fmtTokens(run.inputTokens, run.outputTokens)}</div>
|
||||||
|
<div class="tabular-nums font-medium">{fmtCost(run.costUsd)}</div>
|
||||||
|
<div class="mt-1 text-[11px] text-surface-600">{open ? '收起事实' : `${run.usageFacts.length} 条事实`}</div>
|
||||||
|
</div>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
{#if open}
|
||||||
|
<div class="border-t border-surface-200">
|
||||||
|
{#if run.usageFacts.length === 0}
|
||||||
|
<div class="px-5 py-4">
|
||||||
|
<p class="text-sm text-surface-600">此 run 没有 UsageFact(可能尚未结束或未记费)。</p>
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<div class="overflow-x-auto">
|
||||||
|
<table class="data-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>时间</th>
|
||||||
|
<th>类型</th>
|
||||||
|
<th>供应方</th>
|
||||||
|
<th>模型 / 能力</th>
|
||||||
|
<th>计量</th>
|
||||||
|
<th>成本</th>
|
||||||
|
<th>来源</th>
|
||||||
|
<th>关联 ID</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{#each run.usageFacts as fact}
|
||||||
|
<tr>
|
||||||
|
<td class="whitespace-nowrap text-xs text-surface-700">{fmtDate(fact.occurredAt)}</td>
|
||||||
|
<td>
|
||||||
|
<span
|
||||||
|
class={fact.kind === 'external_capability'
|
||||||
|
? 'saas-badge-primary'
|
||||||
|
: 'saas-badge-success'}
|
||||||
|
>
|
||||||
|
{usageKindLabel(fact.kind)}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
<td class="font-mono text-xs">{fact.provider}</td>
|
||||||
|
<td class="font-mono text-xs">{factSource(fact)}</td>
|
||||||
|
<td class="tabular-nums text-xs">{factMeter(fact)}</td>
|
||||||
|
<td class="tabular-nums">{fmtCost(fact.costUsd)}</td>
|
||||||
|
<td class="font-mono text-[11px] text-surface-600">{fact.costSource}</td>
|
||||||
|
<td class="max-w-[10rem] truncate font-mono text-[11px] text-surface-500" title={fact.correlationId ?? ''}>
|
||||||
|
{fact.correlationId ?? '—'}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{/each}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
{/if}
|
||||||
+4
-1
@@ -1,6 +1,8 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { api, type AgentSkillRow, type SkillFileEntry } from '$lib/api';
|
import { api, type AgentSkillRow, type SkillFileEntry } from '$lib/api';
|
||||||
|
import { session } from '$lib/session';
|
||||||
|
import { resolveOrg } from '$lib/org';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
import LoadingState from '$lib/components/LoadingState.svelte';
|
import LoadingState from '$lib/components/LoadingState.svelte';
|
||||||
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
||||||
@@ -8,7 +10,8 @@
|
|||||||
import SkillEditor from '$lib/components/SkillEditor.svelte';
|
import SkillEditor from '$lib/components/SkillEditor.svelte';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
const slug = $derived(page.params.slug ?? '');
|
const org = $derived(resolveOrg($session.me, page.url.search));
|
||||||
|
const slug = $derived(org?.slug ?? '');
|
||||||
|
|
||||||
let skills = $state<AgentSkillRow[]>([]);
|
let skills = $state<AgentSkillRow[]>([]);
|
||||||
let loading = $state(true);
|
let loading = $state(true);
|
||||||
+4
-1
@@ -2,6 +2,8 @@
|
|||||||
import { Collapsible } from 'bits-ui';
|
import { Collapsible } from 'bits-ui';
|
||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { api, type TeamRow, type TeamMemberRow } from '$lib/api';
|
import { api, type TeamRow, type TeamMemberRow } from '$lib/api';
|
||||||
|
import { session } from '$lib/session';
|
||||||
|
import { resolveOrg } from '$lib/org';
|
||||||
import { fmtDate } from '$lib/format';
|
import { fmtDate } from '$lib/format';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
import LoadingState from '$lib/components/LoadingState.svelte';
|
import LoadingState from '$lib/components/LoadingState.svelte';
|
||||||
@@ -9,7 +11,8 @@
|
|||||||
import EmptyState from '$lib/components/EmptyState.svelte';
|
import EmptyState from '$lib/components/EmptyState.svelte';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
const slug = $derived(page.params.slug ?? '');
|
const org = $derived(resolveOrg($session.me, page.url.search));
|
||||||
|
const slug = $derived(org?.slug ?? '');
|
||||||
|
|
||||||
let teams = $state<TeamRow[]>([]);
|
let teams = $state<TeamRow[]>([]);
|
||||||
let loading = $state(true);
|
let loading = $state(true);
|
||||||
@@ -0,0 +1,241 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { page } from '$app/state';
|
||||||
|
import { api, type UsageReport, type UsageBreakdownRow } from '$lib/api';
|
||||||
|
import { session } from '$lib/session';
|
||||||
|
import { resolveOrg } from '$lib/org';
|
||||||
|
import {
|
||||||
|
fmtCost,
|
||||||
|
fmtDateOnly,
|
||||||
|
fmtNum,
|
||||||
|
fmtQuantity,
|
||||||
|
fmtTokens,
|
||||||
|
usageKindLabel,
|
||||||
|
} from '$lib/format';
|
||||||
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
|
import StatCard from '$lib/components/StatCard.svelte';
|
||||||
|
import LoadingState from '$lib/components/LoadingState.svelte';
|
||||||
|
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
||||||
|
import EmptyState from '$lib/components/EmptyState.svelte';
|
||||||
|
|
||||||
|
const org = $derived(resolveOrg($session.me, page.url.search));
|
||||||
|
const slug = $derived(org?.slug ?? '');
|
||||||
|
|
||||||
|
let usage = $state<UsageReport | null>(null);
|
||||||
|
let loading = $state(true);
|
||||||
|
let error = $state<string | null>(null);
|
||||||
|
let from = $state('');
|
||||||
|
let to = $state('');
|
||||||
|
|
||||||
|
function toIsoStart(dateLocal: string): string | undefined {
|
||||||
|
if (!dateLocal) return undefined;
|
||||||
|
const d = new Date(`${dateLocal}T00:00:00`);
|
||||||
|
return Number.isNaN(d.getTime()) ? undefined : d.toISOString();
|
||||||
|
}
|
||||||
|
|
||||||
|
function toIsoEnd(dateLocal: string): string | undefined {
|
||||||
|
if (!dateLocal) return undefined;
|
||||||
|
const d = new Date(`${dateLocal}T23:59:59.999`);
|
||||||
|
return Number.isNaN(d.getTime()) ? undefined : d.toISOString();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function load() {
|
||||||
|
if (!slug) return;
|
||||||
|
loading = true;
|
||||||
|
error = null;
|
||||||
|
try {
|
||||||
|
usage = await api.usage(slug, {
|
||||||
|
...(toIsoStart(from) !== undefined ? { from: toIsoStart(from) } : {}),
|
||||||
|
...(toIsoEnd(to) !== undefined ? { to: toIsoEnd(to) } : {}),
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
error = err instanceof Error ? err.message : String(err);
|
||||||
|
} finally {
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearRange() {
|
||||||
|
from = '';
|
||||||
|
to = '';
|
||||||
|
void load();
|
||||||
|
}
|
||||||
|
|
||||||
|
function sourceLabel(row: UsageBreakdownRow): string {
|
||||||
|
if (row.capabilityId) return row.capabilityId;
|
||||||
|
if (row.model) return row.model;
|
||||||
|
return '—';
|
||||||
|
}
|
||||||
|
|
||||||
|
function meterCell(row: UsageBreakdownRow): string {
|
||||||
|
if (row.unit) return fmtQuantity(row.quantity, row.unit);
|
||||||
|
if (row.inputTokens > 0 || row.outputTokens > 0) return fmtTokens(row.inputTokens, row.outputTokens);
|
||||||
|
return '—';
|
||||||
|
}
|
||||||
|
|
||||||
|
function meterHint(row: UsageBreakdownRow): string {
|
||||||
|
if (row.unit) return '非 token 计量';
|
||||||
|
if (row.inputTokens > 0 || row.outputTokens > 0) return 'in / out tokens';
|
||||||
|
return '无计量';
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
if (slug) void load();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{#if loading && !usage}
|
||||||
|
<LoadingState />
|
||||||
|
{:else if error && !usage}
|
||||||
|
<ErrorBanner message={error} onretry={load} />
|
||||||
|
{:else if usage}
|
||||||
|
<PageHeader
|
||||||
|
title="用量报告"
|
||||||
|
description="按 UsageFact 分账:模型完成与外部能力(PDF→MD、ASR 等)分开汇总。缺失成本计为未知,不为 0。"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<div class="saas-card-pad mb-6">
|
||||||
|
<div class="flex flex-wrap items-end gap-3">
|
||||||
|
<div>
|
||||||
|
<label class="saas-label" for="usage-from">从</label>
|
||||||
|
<input id="usage-from" class="saas-input" type="date" bind:value={from} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label class="saas-label" for="usage-to">到</label>
|
||||||
|
<input id="usage-to" class="saas-input" type="date" bind:value={to} />
|
||||||
|
</div>
|
||||||
|
<button class="saas-btn-primary py-1.5! text-sm" type="button" onclick={load} disabled={loading}>
|
||||||
|
{loading ? '加载中…' : '应用筛选'}
|
||||||
|
</button>
|
||||||
|
<button class="saas-btn-secondary py-1.5! text-sm" type="button" onclick={clearRange} disabled={loading}>
|
||||||
|
清除
|
||||||
|
</button>
|
||||||
|
{#if usage.from || usage.to}
|
||||||
|
<p class="saas-muted grow text-right text-xs">
|
||||||
|
窗口:
|
||||||
|
{usage.from ? fmtDateOnly(usage.from) : '—'}
|
||||||
|
→
|
||||||
|
{usage.to ? fmtDateOnly(usage.to) : '—'}
|
||||||
|
</p>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{#if error}
|
||||||
|
<p class="mt-3 text-sm text-error-700">{error}</p>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-6 grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
|
||||||
|
<StatCard label="运行总数" value={fmtNum(usage.totals.runCount)} />
|
||||||
|
<StatCard
|
||||||
|
label="有成本 / 无成本"
|
||||||
|
value={`${fmtNum(usage.totals.runsWithCost)} / ${fmtNum(usage.totals.runsWithoutCost)}`}
|
||||||
|
hint="无成本 = 成本未知,不是 $0"
|
||||||
|
/>
|
||||||
|
<StatCard label="成本 (USD)" value={fmtCost(usage.totals.costUsd)} hint="仅汇总已知 costUsd" />
|
||||||
|
<StatCard label="输入 tokens" value={fmtNum(usage.totals.inputTokens)} hint="主要来自模型完成" />
|
||||||
|
<StatCard label="输出 tokens" value={fmtNum(usage.totals.outputTokens)} hint="主要来自模型完成" />
|
||||||
|
<StatCard
|
||||||
|
label="分账条目"
|
||||||
|
value={fmtNum(usage.breakdown.reduce((n, b) => n + b.factCount, 0))}
|
||||||
|
hint={`${fmtNum(usage.breakdown.length)} 个分项`}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="saas-card overflow-hidden mb-6">
|
||||||
|
<div class="border-b border-surface-200 px-5 py-3">
|
||||||
|
<h3 class="text-sm font-semibold text-surface-800">按来源分账</h3>
|
||||||
|
<p class="saas-muted mt-0.5 text-xs">
|
||||||
|
kind × provider × model/capability。外部能力显示页数/秒等计量,不与 tokens 混排。
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{#if usage.breakdown.length === 0}
|
||||||
|
<EmptyState title="暂无用量事实" description="跑过智能体后,模型与外部能力消费会出现在此。" />
|
||||||
|
{:else}
|
||||||
|
<div class="overflow-x-auto">
|
||||||
|
<table class="data-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>类型</th>
|
||||||
|
<th>供应方</th>
|
||||||
|
<th>模型 / 能力</th>
|
||||||
|
<th>次数</th>
|
||||||
|
<th>计量</th>
|
||||||
|
<th>有成本 / 未知</th>
|
||||||
|
<th>成本</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{#each usage.breakdown as row}
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<span
|
||||||
|
class={row.kind === 'external_capability'
|
||||||
|
? 'saas-badge-primary'
|
||||||
|
: row.kind === 'model_completion'
|
||||||
|
? 'saas-badge-success'
|
||||||
|
: 'saas-badge-primary'}
|
||||||
|
>
|
||||||
|
{usageKindLabel(row.kind)}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
<td class="font-mono text-xs">{row.provider}</td>
|
||||||
|
<td class="font-mono text-xs">{sourceLabel(row)}</td>
|
||||||
|
<td class="tabular-nums">{fmtNum(row.factCount)}</td>
|
||||||
|
<td class="tabular-nums">
|
||||||
|
<div>{meterCell(row)}</div>
|
||||||
|
<div class="text-[11px] text-surface-600">{meterHint(row)}</div>
|
||||||
|
</td>
|
||||||
|
<td class="tabular-nums text-surface-700">
|
||||||
|
{fmtNum(row.factsWithCost)} / {fmtNum(row.factsWithoutCost)}
|
||||||
|
</td>
|
||||||
|
<td class="tabular-nums font-medium">{fmtCost(row.costUsd)}</td>
|
||||||
|
</tr>
|
||||||
|
{/each}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="saas-card overflow-hidden">
|
||||||
|
<div class="border-b border-surface-200 px-5 py-3">
|
||||||
|
<h3 class="text-sm font-semibold text-surface-800">按项目</h3>
|
||||||
|
<p class="saas-muted mt-0.5 text-xs">项目仍是权限边界;行内成本已含该项目全部 fact 类型。</p>
|
||||||
|
</div>
|
||||||
|
{#if usage.projects.length === 0}
|
||||||
|
<EmptyState title="暂无项目" description="创建项目并触发智能体后会出现用量。" />
|
||||||
|
{:else}
|
||||||
|
<div class="overflow-x-auto">
|
||||||
|
<table class="data-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>项目</th>
|
||||||
|
<th>运行</th>
|
||||||
|
<th>有成本 / 未知</th>
|
||||||
|
<th>in / out tokens</th>
|
||||||
|
<th>成本</th>
|
||||||
|
<th></th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{#each usage.projects as p}
|
||||||
|
<tr>
|
||||||
|
<td class="font-medium">{p.projectName}</td>
|
||||||
|
<td class="tabular-nums">{fmtNum(p.runCount)}</td>
|
||||||
|
<td class="tabular-nums text-surface-700">
|
||||||
|
{fmtNum(p.runsWithCost)} / {fmtNum(p.runsWithoutCost)}
|
||||||
|
</td>
|
||||||
|
<td class="tabular-nums text-surface-600">{fmtTokens(p.inputTokens, p.outputTokens)}</td>
|
||||||
|
<td class="tabular-nums">{fmtCost(p.costUsd)}</td>
|
||||||
|
<td class="text-right">
|
||||||
|
<a class="text-sm text-primary-700 hover:underline" href={`/admin/projects/${p.projectId}`}>
|
||||||
|
查看项目
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{/each}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
@@ -95,7 +95,7 @@ flock /var/lock/cph-hub-release-publish bash -c '
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
cd "$HUB_DIR"
|
cd "$HUB_DIR"
|
||||||
npm ci
|
PUPPETEER_SKIP_DOWNLOAD=1 npm ci
|
||||||
npm ci --prefix admin-web
|
npm ci --prefix admin-web
|
||||||
npm run audit:production
|
npm run audit:production
|
||||||
npm run build
|
npm run build
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ if [ "$release_ready" = false ]; then
|
|||||||
# 2. Install deps (hub + admin-web), audit hub prod, build tsc + SPA, mark complete.
|
# 2. Install deps (hub + admin-web), audit hub prod, build tsc + SPA, mark complete.
|
||||||
# `npm run build` → tsc then admin:build → admin-web/build for registerStaticSpa.
|
# `npm run build` → tsc then admin:build → admin-web/build for registerStaticSpa.
|
||||||
ssh "${SSH_OPTS[@]}" "$DEPLOY_USER@$HOST" \
|
ssh "${SSH_OPTS[@]}" "$DEPLOY_USER@$HOST" \
|
||||||
"cd '$HUB_DIR' && npm ci && npm ci --prefix admin-web && npm run audit:production && npm run build && touch '$RELEASE_DIR/.complete'"
|
"cd '$HUB_DIR' && PUPPETEER_SKIP_DOWNLOAD=1 npm ci && npm ci --prefix admin-web && npm run audit:production && npm run build && touch '$RELEASE_DIR/.complete'"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 3. Ensure the service is installed (idempotent), then restart.
|
# 3. Ensure the service is installed (idempotent), then restart.
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="zh-CN">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
|
<title>文件库</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div id="app"></div>
|
||||||
|
<script type="module" src="/src/main.ts"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
Generated
+1621
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
"name": "filelib-web",
|
||||||
|
"private": true,
|
||||||
|
"version": "0.1.0",
|
||||||
|
"type": "module",
|
||||||
|
"scripts": {
|
||||||
|
"dev": "vite",
|
||||||
|
"build": "vite build",
|
||||||
|
"preview": "vite preview",
|
||||||
|
"check": "svelte-check --tsconfig ./tsconfig.json"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@sveltejs/vite-plugin-svelte": "^7.1.2",
|
||||||
|
"@tailwindcss/vite": "^4.3.2",
|
||||||
|
"svelte": "^5.56.1",
|
||||||
|
"svelte-check": "^4.6.0",
|
||||||
|
"tailwindcss": "^4.3.2",
|
||||||
|
"typescript": "^5.7.0",
|
||||||
|
"vite": "^8.0.16"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { onMount } from "svelte";
|
||||||
|
import { api, UnauthenticatedError } from "./lib/api.js";
|
||||||
|
import { me, authChecked } from "./lib/stores.js";
|
||||||
|
import type { MeResponse } from "./lib/types.js";
|
||||||
|
import LoginView from "./lib/LoginView.svelte";
|
||||||
|
import BrowserShell from "./lib/BrowserShell.svelte";
|
||||||
|
import Toasts from "./lib/Toasts.svelte";
|
||||||
|
|
||||||
|
onMount(async () => {
|
||||||
|
try {
|
||||||
|
me.set(await api<MeResponse>("/database/api/me"));
|
||||||
|
} catch (e) {
|
||||||
|
if (!(e instanceof UnauthenticatedError)) console.error(e);
|
||||||
|
me.set(null);
|
||||||
|
} finally {
|
||||||
|
authChecked.set(true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{#if !$authChecked}
|
||||||
|
<div class="flex h-full items-center justify-center text-ink-3">加载中…</div>
|
||||||
|
{:else if $me}
|
||||||
|
<BrowserShell />
|
||||||
|
{:else}
|
||||||
|
<LoginView />
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<Toasts />
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
@import "tailwindcss";
|
||||||
|
|
||||||
|
/* 全局 UI 主题令牌(与 hub 端 uiTheme.ts 同源) */
|
||||||
|
@theme {
|
||||||
|
--color-bg: #fcfcfb;
|
||||||
|
--color-panel: #ffffff;
|
||||||
|
--color-sidebar: #f7f7f5;
|
||||||
|
--color-ink: #1a1a18;
|
||||||
|
--color-ink-2: #6b6a66;
|
||||||
|
--color-ink-3: #9c9b96;
|
||||||
|
--color-line: #ecece8;
|
||||||
|
--color-line-soft: #f1f1ee;
|
||||||
|
--color-hover: #f4f4f1;
|
||||||
|
--color-selected: #ebebe7;
|
||||||
|
--color-accent: #1a1a18;
|
||||||
|
--color-accent-hover: #333330;
|
||||||
|
--color-danger: #a13a33;
|
||||||
|
--color-guide: #e9e9e5;
|
||||||
|
--color-diff-add-bg: #f3f6f2;
|
||||||
|
--color-diff-add-text: #4a6741;
|
||||||
|
--color-diff-del-bg: #f8f2f1;
|
||||||
|
--color-diff-del-text: #a13a33;
|
||||||
|
}
|
||||||
|
|
||||||
|
html,
|
||||||
|
body,
|
||||||
|
#app {
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
background: var(--color-bg);
|
||||||
|
color: var(--color-ink);
|
||||||
|
font-family:
|
||||||
|
"Inter",
|
||||||
|
-apple-system,
|
||||||
|
"Segoe UI",
|
||||||
|
"PingFang SC",
|
||||||
|
"Microsoft YaHei",
|
||||||
|
sans-serif;
|
||||||
|
font-size: 14px;
|
||||||
|
line-height: 1.65;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
}
|
||||||
|
|
||||||
|
.font-mono {
|
||||||
|
font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* diff 渲染 */
|
||||||
|
pre.diff {
|
||||||
|
white-space: pre-wrap;
|
||||||
|
font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
|
||||||
|
font-size: 12.5px;
|
||||||
|
line-height: 1.75;
|
||||||
|
}
|
||||||
|
pre.diff .add {
|
||||||
|
display: block;
|
||||||
|
color: var(--color-diff-add-text);
|
||||||
|
background: var(--color-diff-add-bg);
|
||||||
|
}
|
||||||
|
pre.diff .del {
|
||||||
|
display: block;
|
||||||
|
color: var(--color-diff-del-text);
|
||||||
|
background: var(--color-diff-del-bg);
|
||||||
|
}
|
||||||
@@ -0,0 +1,141 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { onMount } from "svelte";
|
||||||
|
import { api } from "./api.js";
|
||||||
|
import { me, toastErr, toastOk } from "./stores.js";
|
||||||
|
import { treeVersion, bumpTree, currentNode, selectedFilePath, clearSelectedFile, bumpFiles } from "./browser.js";
|
||||||
|
import type { NodeChild } from "./types.js";
|
||||||
|
import TreeNode from "./TreeNode.svelte";
|
||||||
|
import NodeDetailPanel from "./NodeDetailPanel.svelte";
|
||||||
|
import FileEditor from "./FileEditor.svelte";
|
||||||
|
import Modal from "./Modal.svelte";
|
||||||
|
|
||||||
|
let roots = $state<NodeChild[] | null>(null);
|
||||||
|
let treeError = $state<string | null>(null);
|
||||||
|
let showCreateRoot = $state(false);
|
||||||
|
let newName = $state("");
|
||||||
|
let newKind = $state<"FOLDER" | "PROJECT">("FOLDER");
|
||||||
|
let newDesc = $state("");
|
||||||
|
|
||||||
|
async function loadRoots(): Promise<void> {
|
||||||
|
try {
|
||||||
|
const r = await api<{ nodes: NodeChild[] }>("/database/api/nodes");
|
||||||
|
roots = r.nodes;
|
||||||
|
treeError = null;
|
||||||
|
} catch (e) {
|
||||||
|
treeError = e instanceof Error ? e.message : String(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onMount(loadRoots);
|
||||||
|
$effect(() => {
|
||||||
|
void $treeVersion;
|
||||||
|
void loadRoots();
|
||||||
|
});
|
||||||
|
|
||||||
|
async function createRoot(): Promise<void> {
|
||||||
|
const name = newName.trim();
|
||||||
|
if (name === "") return;
|
||||||
|
try {
|
||||||
|
await api("/database/api/nodes", {
|
||||||
|
method: "POST",
|
||||||
|
body: {
|
||||||
|
parentId: null,
|
||||||
|
kind: newKind,
|
||||||
|
name,
|
||||||
|
...(newDesc.trim() !== "" ? { description: newDesc.trim() } : {}),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
toastOk("已创建");
|
||||||
|
showCreateRoot = false;
|
||||||
|
newName = ""; newKind = "FOLDER"; newDesc = "";
|
||||||
|
bumpTree();
|
||||||
|
} catch (e) {
|
||||||
|
toastErr(e instanceof Error ? e.message : String(e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function logout(): Promise<void> {
|
||||||
|
try { await fetch("/auth/logout", { method: "POST", credentials: "same-origin" }); } catch { /* ignore */ }
|
||||||
|
me.set(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
const initial = $derived(($me?.userId ?? "U").slice(0, 1).toUpperCase());
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="flex h-full">
|
||||||
|
<!-- 侧栏 -->
|
||||||
|
<aside class="flex w-[300px] shrink-0 flex-col border-r border-line-soft bg-sidebar">
|
||||||
|
<div class="flex items-center justify-between border-b border-line-soft px-4 py-3.5">
|
||||||
|
<span class="text-[15px] font-semibold text-ink">文件库</span>
|
||||||
|
{#if $me?.isWebsiteAdmin}
|
||||||
|
<button class="rounded-lg border border-line bg-panel px-2.5 py-1 text-[11.5px] font-medium text-ink transition hover:bg-hover" onclick={() => (showCreateRoot = true)}>
|
||||||
|
+ 根目录
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex-1 overflow-y-auto px-2 py-2 text-[13px]">
|
||||||
|
{#if roots === null}
|
||||||
|
<div class="px-3 py-6 text-center text-xs text-ink-3">加载中…</div>
|
||||||
|
{:else if treeError}
|
||||||
|
<div class="px-3 py-6 text-center text-xs text-danger">{treeError}</div>
|
||||||
|
{:else if roots.length === 0}
|
||||||
|
<div class="px-3 py-6 text-center text-xs text-ink-3">
|
||||||
|
{$me?.isWebsiteAdmin ? "空文件库 · 点上方「+ 根目录」开始" : "文件库为空,请联系管理员创建根目录"}
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
{#each roots as node (node.id)}
|
||||||
|
<TreeNode {node} depth={0} />
|
||||||
|
{/each}
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex items-center gap-2 border-t border-line-soft px-4 py-3 text-[12.5px]">
|
||||||
|
<div class="flex h-6 w-6 shrink-0 items-center justify-center rounded-full bg-accent text-[11px] font-semibold text-white">{initial}</div>
|
||||||
|
<span class="flex-1 truncate text-ink">{$me?.userId ?? ""}</span>
|
||||||
|
<button class="rounded-lg border border-line-soft px-2.5 py-1 text-[11.5px] text-ink-3 transition hover:bg-hover hover:text-ink" onclick={logout} title="退出登录">退出</button>
|
||||||
|
</div>
|
||||||
|
</aside>
|
||||||
|
|
||||||
|
<!-- 主区 -->
|
||||||
|
<main class="flex-1 overflow-y-auto">
|
||||||
|
<NodeDetailPanel />
|
||||||
|
</main>
|
||||||
|
|
||||||
|
<!-- 右侧:文件预览/编辑栏(选中文件时出现) -->
|
||||||
|
{#if $selectedFilePath && $currentNode?.kind === "PROJECT"}
|
||||||
|
<section class="flex w-[46%] min-w-[420px] shrink-0 flex-col overflow-y-auto border-l border-line-soft bg-bg p-4">
|
||||||
|
<FileEditor
|
||||||
|
projectId={$currentNode.id}
|
||||||
|
path={$selectedFilePath}
|
||||||
|
role={$currentNode.role}
|
||||||
|
onchanged={bumpFiles}
|
||||||
|
onclose={clearSelectedFile}
|
||||||
|
/>
|
||||||
|
</section>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if showCreateRoot}
|
||||||
|
<Modal title="新建根目录" onclose={() => (showCreateRoot = false)}>
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="mb-1 block text-[11.5px] text-ink-3" for="root-name">名称</label>
|
||||||
|
<input id="root-name" class="w-full rounded-lg border border-line bg-panel px-3 py-2 text-[13px] outline-none focus:border-accent" bind:value={newName} placeholder="例如:物理教研" />
|
||||||
|
</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="mb-1 block text-[11.5px] text-ink-3" for="root-kind">类型</label>
|
||||||
|
<select id="root-kind" class="w-full rounded-lg border border-line bg-panel px-3 py-2 text-[13px] outline-none focus:border-accent" bind:value={newKind}>
|
||||||
|
<option value="FOLDER">文件夹</option>
|
||||||
|
<option value="PROJECT">项目(课程资源库)</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="mb-1 block text-[11.5px] text-ink-3" for="root-desc">简介(可选)</label>
|
||||||
|
<textarea id="root-desc" rows="3" class="w-full rounded-lg border border-line bg-panel px-3 py-2 font-mono text-xs outline-none focus:border-accent" bind:value={newDesc} placeholder="简要说明用途…"></textarea>
|
||||||
|
</div>
|
||||||
|
<div class="mt-4 flex justify-end gap-2">
|
||||||
|
<button class="rounded-lg border border-line bg-panel px-3.5 py-1.5 text-[12.5px] font-medium text-ink transition hover:bg-hover" onclick={() => (showCreateRoot = false)}>取消</button>
|
||||||
|
<button class="rounded-lg bg-accent px-3.5 py-1.5 text-[12.5px] font-medium text-white transition hover:bg-accent-hover" onclick={createRoot}>创建</button>
|
||||||
|
</div>
|
||||||
|
</Modal>
|
||||||
|
{/if}
|
||||||
@@ -0,0 +1,165 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { api, ApiError } from "./api.js";
|
||||||
|
import { toastOk, toastErr, toast } from "./stores.js";
|
||||||
|
import type { FileContent, VersionInfo, Role } from "./types.js";
|
||||||
|
import Modal from "./Modal.svelte";
|
||||||
|
|
||||||
|
let { projectId, path, role, onchanged, onclose }: { projectId: string; path: string; role: Role; onchanged: () => void; onclose?: () => void } = $props();
|
||||||
|
|
||||||
|
let file = $state<FileContent | null>(null);
|
||||||
|
let draft = $state("");
|
||||||
|
let loadError = $state<string | null>(null);
|
||||||
|
let conflict = $state<{ currentVersion: string; diff: string } | null>(null);
|
||||||
|
let showHistory = $state(false);
|
||||||
|
let history = $state<VersionInfo[]>([]);
|
||||||
|
|
||||||
|
const canEdit = $derived(role !== "VIEW");
|
||||||
|
|
||||||
|
async function load(): Promise<void> {
|
||||||
|
try {
|
||||||
|
file = await api<FileContent>(`/database/api/projects/${projectId}/file?path=${encodeURIComponent(path)}`);
|
||||||
|
draft = file.encoding === "utf8" ? file.content : "";
|
||||||
|
loadError = null;
|
||||||
|
conflict = null;
|
||||||
|
} catch (e) {
|
||||||
|
loadError = e instanceof Error ? e.message : String(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
void projectId;
|
||||||
|
void path;
|
||||||
|
void load();
|
||||||
|
});
|
||||||
|
|
||||||
|
async function save(): Promise<void> {
|
||||||
|
if (file === null) return;
|
||||||
|
try {
|
||||||
|
const r = await api<{ version: string }>(`/database/api/projects/${projectId}/file/commits`, {
|
||||||
|
method: "POST",
|
||||||
|
body: { path: file.path, baseVersion: file.version, content: draft },
|
||||||
|
});
|
||||||
|
toastOk("已提交 " + r.version);
|
||||||
|
await load();
|
||||||
|
onchanged();
|
||||||
|
} catch (e) {
|
||||||
|
if (e instanceof ApiError && e.status === 409 && typeof e.details?.["currentVersion"] === "string") {
|
||||||
|
await showConflict(e.details["currentVersion"]);
|
||||||
|
} else {
|
||||||
|
toastErr(e instanceof Error ? e.message : String(e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function showConflict(currentVersion: string): Promise<void> {
|
||||||
|
if (file === null) return;
|
||||||
|
try {
|
||||||
|
const r = await api<{ diff: string }>(
|
||||||
|
`/database/api/projects/${projectId}/file/diff?path=${encodeURIComponent(file.path)}&from=${encodeURIComponent(file.version)}&to=${encodeURIComponent(currentVersion)}`,
|
||||||
|
);
|
||||||
|
conflict = { currentVersion, diff: r.diff };
|
||||||
|
file = { ...file, version: currentVersion };
|
||||||
|
} catch (e) {
|
||||||
|
toastErr(e instanceof Error ? e.message : String(e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function acceptLatest(): Promise<void> {
|
||||||
|
conflict = null;
|
||||||
|
await load();
|
||||||
|
toast("已载入最新内容,请在此基础上合并", "info");
|
||||||
|
}
|
||||||
|
|
||||||
|
async function remove(): Promise<void> {
|
||||||
|
if (file === null || !confirm("删除文件 " + file.path + "?")) return;
|
||||||
|
try {
|
||||||
|
await api(`/database/api/projects/${projectId}/file?path=${encodeURIComponent(file.path)}`, {
|
||||||
|
method: "DELETE",
|
||||||
|
body: { baseVersion: file.version },
|
||||||
|
});
|
||||||
|
toastOk("已删除");
|
||||||
|
file = null;
|
||||||
|
onchanged();
|
||||||
|
} catch (e) {
|
||||||
|
toastErr(e instanceof Error ? e.message : String(e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function openHistory(): Promise<void> {
|
||||||
|
try {
|
||||||
|
const r = await api<{ history: VersionInfo[] }>(`/database/api/projects/${projectId}/file/history?path=${encodeURIComponent(path)}`);
|
||||||
|
history = r.history;
|
||||||
|
showHistory = true;
|
||||||
|
} catch (e) {
|
||||||
|
toastErr(e instanceof Error ? e.message : String(e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderDiff(diff: string): string {
|
||||||
|
return diff
|
||||||
|
.replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">")
|
||||||
|
.replace(/^\+(.*)$/gm, '<span class="add">+$1</span>')
|
||||||
|
.replace(/^-(.*)$/gm, '<span class="del">-$1</span>');
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{#if loadError}
|
||||||
|
<div class="rounded-xl border border-line-soft bg-panel p-5 text-xs text-danger">{loadError}</div>
|
||||||
|
{:else if file}
|
||||||
|
<div class="rounded-xl border border-line-soft bg-panel p-5">
|
||||||
|
<div class="mb-2.5 flex items-center justify-between">
|
||||||
|
<span class="font-mono text-[11px] text-ink-3">{file.path} @ {file.version}</span>
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<a class="rounded-lg border border-line bg-panel px-3 py-1 text-[12px] font-medium text-ink transition hover:bg-hover" href="/database/api/projects/{projectId}/file/raw?path={encodeURIComponent(file.path)}" download>下载</a>
|
||||||
|
<button class="rounded-lg border border-line bg-panel px-3 py-1 text-[12px] font-medium text-ink transition hover:bg-hover" onclick={openHistory}>历史</button>
|
||||||
|
{#if canEdit}
|
||||||
|
<button class="rounded-lg border border-transparent px-3 py-1 text-[12px] font-medium text-danger transition hover:bg-[#A13A3312]" onclick={remove}>删除文件</button>
|
||||||
|
{/if}
|
||||||
|
{#if onclose}
|
||||||
|
<button class="rounded-lg border border-line bg-panel px-2.5 py-1 text-[12px] font-medium text-ink-3 transition hover:bg-hover hover:text-ink" onclick={onclose} title="关闭预览">✕</button>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if file.encoding === "base64"}
|
||||||
|
<div class="text-xs text-ink-3">二进制文件({file.size} B),不支持在线编辑</div>
|
||||||
|
{:else}
|
||||||
|
<textarea rows="14" class="w-full rounded-lg border border-line bg-panel px-3 py-2 font-mono text-xs leading-7 outline-none focus:border-accent" bind:value={draft} readonly={!canEdit}></textarea>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
{#if canEdit && file.encoding !== "base64"}
|
||||||
|
<div class="mt-3 flex justify-end">
|
||||||
|
<button class="rounded-lg bg-accent px-3.5 py-1.5 text-[12.5px] font-medium text-white transition hover:bg-accent-hover" onclick={save}>提交修改</button>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
{#if conflict}
|
||||||
|
<div class="mt-3.5 rounded-xl border border-[#E8E2C8] bg-[#FCFBF4] p-4">
|
||||||
|
<div class="mb-2 text-[13px] font-semibold text-[#6E6329]">冲突:他人已提交 {conflict.currentVersion},差异如下(你的基版 → 最新版)</div>
|
||||||
|
<pre class="diff rounded-lg border border-line-soft bg-panel p-3">{@html renderDiff(conflict.diff)}</pre>
|
||||||
|
<div class="mt-2 text-[11.5px] text-[#8A8059]">请人工合并后,以最新内容为全文重新提交(基版将更新为 {conflict.currentVersion})</div>
|
||||||
|
<div class="mt-2 flex justify-end">
|
||||||
|
<button class="rounded-lg border border-line bg-panel px-3 py-1 text-[12px] font-medium text-ink transition hover:bg-hover" onclick={acceptLatest}>载入最新内容</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<div class="rounded-xl border border-line-soft bg-panel p-5 text-xs text-ink-3">加载中…</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
{#if showHistory}
|
||||||
|
<Modal title="版本历史" onclose={() => (showHistory = false)}>
|
||||||
|
<div class="max-h-80 overflow-y-auto">
|
||||||
|
{#each history as v (v.version)}
|
||||||
|
<div class="border-t border-line-soft py-2 text-xs first:border-t-0">
|
||||||
|
<span class="font-mono text-accent">{v.version}</span> {v.message}
|
||||||
|
<div class="text-ink-3">{new Date(v.committedAt).toLocaleString("zh-CN")}{v.author ? " · " + v.author : ""}</div>
|
||||||
|
</div>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
<div class="mt-3 flex justify-end">
|
||||||
|
<button class="rounded-lg border border-line bg-panel px-3 py-1 text-[12px] font-medium text-ink transition hover:bg-hover" onclick={() => (showHistory = false)}>关闭</button>
|
||||||
|
</div>
|
||||||
|
</Modal>
|
||||||
|
{/if}
|
||||||
@@ -0,0 +1,137 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { api } from "./api.js";
|
||||||
|
import { toastOk, toastErr } from "./stores.js";
|
||||||
|
import { selectedFilePath, filesVersion } from "./browser.js";
|
||||||
|
import type { FileEntry, NodeDetail } from "./types.js";
|
||||||
|
import Modal from "./Modal.svelte";
|
||||||
|
|
||||||
|
let { node }: { node: NodeDetail } = $props();
|
||||||
|
|
||||||
|
let files = $state<FileEntry[] | null>(null);
|
||||||
|
let loadError = $state<string | null>(null);
|
||||||
|
let showNewFile = $state(false);
|
||||||
|
let newPath = $state("");
|
||||||
|
let newContent = $state("");
|
||||||
|
let uploadInput: HTMLInputElement;
|
||||||
|
|
||||||
|
const canEdit = $derived(node.role !== "VIEW");
|
||||||
|
|
||||||
|
async function loadFiles(): Promise<void> {
|
||||||
|
try {
|
||||||
|
const r = await api<{ files: FileEntry[] }>(`/database/api/projects/${node.id}/files`);
|
||||||
|
files = r.files;
|
||||||
|
loadError = null;
|
||||||
|
} catch (e) {
|
||||||
|
loadError = e instanceof Error ? e.message : String(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
void node.id;
|
||||||
|
void $filesVersion;
|
||||||
|
void loadFiles();
|
||||||
|
});
|
||||||
|
|
||||||
|
async function submitNewFile(): Promise<void> {
|
||||||
|
const path = newPath.trim();
|
||||||
|
if (path === "") return;
|
||||||
|
try {
|
||||||
|
await api(`/database/api/projects/${node.id}/file`, {
|
||||||
|
method: "PUT",
|
||||||
|
body: { path, content: newContent },
|
||||||
|
});
|
||||||
|
toastOk("已创建");
|
||||||
|
showNewFile = false;
|
||||||
|
newPath = ""; newContent = "";
|
||||||
|
await loadFiles();
|
||||||
|
} catch (e) {
|
||||||
|
toastErr(e instanceof Error ? e.message : String(e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function u8ToBase64(bytes: Uint8Array): string {
|
||||||
|
let bin = "";
|
||||||
|
const CHUNK = 0x8000;
|
||||||
|
for (let i = 0; i < bytes.length; i += CHUNK) {
|
||||||
|
bin += String.fromCharCode.apply(null, Array.from(bytes.subarray(i, i + CHUNK)) as unknown as number[]);
|
||||||
|
}
|
||||||
|
return btoa(bin);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function doUpload(e: Event): Promise<void> {
|
||||||
|
const input = e.target as HTMLInputElement;
|
||||||
|
const file = input.files?.[0];
|
||||||
|
input.value = "";
|
||||||
|
if (!file) return;
|
||||||
|
if (file.size > 10 * 1024 * 1024) {
|
||||||
|
toastErr("文件超过 10MB 上限");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const targetPath = prompt("保存到路径(可含目录):", "材料/" + file.name);
|
||||||
|
if (!targetPath) return;
|
||||||
|
const bytes = new Uint8Array(await file.arrayBuffer());
|
||||||
|
const isBinary = bytes.includes(0);
|
||||||
|
const body = isBinary
|
||||||
|
? { path: targetPath, content: u8ToBase64(bytes), encoding: "base64" }
|
||||||
|
: { path: targetPath, content: new TextDecoder("utf-8").decode(bytes), encoding: "utf8" };
|
||||||
|
try {
|
||||||
|
await api(`/database/api/projects/${node.id}/file`, { method: "PUT", body });
|
||||||
|
toastOk("已上传 " + file.name);
|
||||||
|
await loadFiles();
|
||||||
|
} catch (err) {
|
||||||
|
toastErr(err instanceof Error ? err.message : String(err));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="rounded-xl border border-line-soft bg-panel p-5">
|
||||||
|
<div class="mb-2 flex items-center justify-between">
|
||||||
|
<div class="text-[13px] font-semibold">项目文件({files?.length ?? 0})</div>
|
||||||
|
{#if canEdit}
|
||||||
|
<div class="flex gap-2">
|
||||||
|
<button class="rounded-lg border border-line bg-panel px-3 py-1.5 text-[12.5px] font-medium text-ink transition hover:bg-hover" onclick={() => (showNewFile = true)}>+ 新建文件</button>
|
||||||
|
<button class="rounded-lg bg-accent px-3 py-1.5 text-[12.5px] font-medium text-white transition hover:bg-accent-hover" onclick={() => uploadInput.click()}>上传文件</button>
|
||||||
|
<input bind:this={uploadInput} type="file" class="hidden" onchange={doUpload} />
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if files === null && loadError === null}
|
||||||
|
<div class="py-5 text-center text-xs text-ink-3">加载中…</div>
|
||||||
|
{:else if loadError}
|
||||||
|
<div class="py-5 text-center text-xs text-danger">{loadError}</div>
|
||||||
|
{:else if files && files.length === 0}
|
||||||
|
<div class="py-5 text-center text-xs text-ink-3">空仓库 · 可新建或上传文件</div>
|
||||||
|
{:else if files}
|
||||||
|
<table class="w-full border-collapse text-[13px]">
|
||||||
|
<tbody>
|
||||||
|
{#each files as f (f.path)}
|
||||||
|
<tr
|
||||||
|
class="cursor-pointer border-t border-line-soft first:border-t-0 {$selectedFilePath === f.path ? 'bg-selected' : 'hover:bg-hover'}"
|
||||||
|
onclick={() => selectedFilePath.set(f.path)}
|
||||||
|
>
|
||||||
|
<td class="py-2 font-mono text-[12.5px] text-ink">{f.path}</td>
|
||||||
|
<td class="py-2 text-right font-mono text-[11px] text-ink-3">{f.size} B</td>
|
||||||
|
</tr>
|
||||||
|
{/each}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if showNewFile}
|
||||||
|
<Modal title="新建文件" onclose={() => (showNewFile = false)}>
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="mb-1 block text-[11.5px] text-ink-3" for="nf-path">路径</label>
|
||||||
|
<input id="nf-path" class="w-full rounded-lg border border-line bg-panel px-3 py-2 font-mono text-[13px] outline-none focus:border-accent" bind:value={newPath} placeholder="docs/intro.md" />
|
||||||
|
</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="mb-1 block text-[11.5px] text-ink-3" for="nf-content">内容</label>
|
||||||
|
<textarea id="nf-content" rows="8" class="w-full rounded-lg border border-line bg-panel px-3 py-2 font-mono text-xs outline-none focus:border-accent" bind:value={newContent} placeholder="内容…"></textarea>
|
||||||
|
</div>
|
||||||
|
<div class="mt-4 flex justify-end gap-2">
|
||||||
|
<button class="rounded-lg border border-line bg-panel px-3.5 py-1.5 text-[12.5px] font-medium text-ink transition hover:bg-hover" onclick={() => (showNewFile = false)}>取消</button>
|
||||||
|
<button class="rounded-lg bg-accent px-3.5 py-1.5 text-[12.5px] font-medium text-white transition hover:bg-accent-hover" onclick={submitNewFile}>创建</button>
|
||||||
|
</div>
|
||||||
|
</Modal>
|
||||||
|
{/if}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { onMount } from "svelte";
|
||||||
|
import { api } from "./api.js";
|
||||||
|
|
||||||
|
interface LoginInfo {
|
||||||
|
orgSlug: string;
|
||||||
|
devLoginEnabled: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
let info = $state<LoginInfo | null>(null);
|
||||||
|
let loadFailed = $state(false);
|
||||||
|
|
||||||
|
onMount(async () => {
|
||||||
|
try {
|
||||||
|
info = await api<LoginInfo>("/database/api/login-info");
|
||||||
|
} catch {
|
||||||
|
loadFailed = true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="flex min-h-full items-center justify-center p-6">
|
||||||
|
<div class="w-full max-w-[380px] rounded-2xl border border-line-soft bg-panel p-9 shadow-[0_4px_20px_rgba(26,26,24,.07)]">
|
||||||
|
<div class="text-center text-[26px] font-semibold tracking-wide text-ink">文件库</div>
|
||||||
|
<p class="mt-2.5 mb-8 text-center text-[13px] text-ink-3">课程资源与教研文件,一处安放,随处可查</p>
|
||||||
|
|
||||||
|
{#if info}
|
||||||
|
<a
|
||||||
|
href="/auth/feishu/{encodeURIComponent(info.orgSlug)}"
|
||||||
|
class="flex w-full items-center justify-center rounded-lg bg-accent px-4 py-3 text-sm font-medium text-white transition hover:bg-accent-hover"
|
||||||
|
>使用飞书登录</a>
|
||||||
|
|
||||||
|
{#if info.devLoginEnabled}
|
||||||
|
<div class="my-5 flex items-center gap-2.5 text-[11px] text-ink-3">
|
||||||
|
<span class="flex-1 border-t border-line-soft"></span>开发模式
|
||||||
|
<span class="flex-1 border-t border-line-soft"></span>
|
||||||
|
</div>
|
||||||
|
<a href="/app/dev-login-teacher" class="flex w-full items-center justify-center rounded-lg border border-line bg-panel px-4 py-2 text-[12.5px] font-medium text-ink transition hover:bg-hover">⚡ 一键登录(老师)</a>
|
||||||
|
<p class="mt-2.5 text-center text-[11px] text-ink-3">仅开发环境可见 · 跳过飞书 OAuth</p>
|
||||||
|
{/if}
|
||||||
|
{:else if loadFailed}
|
||||||
|
<p class="text-center text-[12.5px] text-danger">无法加载登录配置,请稍后重试</p>
|
||||||
|
{:else}
|
||||||
|
<p class="text-center text-[12.5px] text-ink-3">加载中…</p>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import type { Snippet } from "svelte";
|
||||||
|
|
||||||
|
let { title, onclose, children }: { title: string; onclose: () => void; children: Snippet } = $props();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div
|
||||||
|
class="fixed inset-0 z-40 flex items-center justify-center bg-black/30 p-4"
|
||||||
|
role="presentation"
|
||||||
|
onclick={(e) => { if (e.target === e.currentTarget) onclose(); }}
|
||||||
|
>
|
||||||
|
<div class="w-full max-w-[440px] rounded-2xl border border-line-soft bg-panel p-6 shadow-[0_4px_20px_rgba(26,26,24,.07)]">
|
||||||
|
<div class="mb-4 text-[15px] font-semibold">{title}</div>
|
||||||
|
{@render children()}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,144 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { api } from "./api.js";
|
||||||
|
import { currentNode, breadcrumb, bumpTree, clearSelectedFile } from "./browser.js";
|
||||||
|
import { toastOk, toastErr } from "./stores.js";
|
||||||
|
import OverviewPanel from "./OverviewPanel.svelte";
|
||||||
|
import FilesPanel from "./FilesPanel.svelte";
|
||||||
|
import Modal from "./Modal.svelte";
|
||||||
|
|
||||||
|
let tab = $state<"detail" | "files">("detail");
|
||||||
|
let showCreateChild = $state(false);
|
||||||
|
let newName = $state("");
|
||||||
|
let newKind = $state<"FOLDER" | "PROJECT">("FOLDER");
|
||||||
|
let newDesc = $state("");
|
||||||
|
|
||||||
|
const node = $derived($currentNode);
|
||||||
|
const crumbs = $derived($breadcrumb);
|
||||||
|
const canManage = $derived(node?.role === "MANAGE");
|
||||||
|
const canEdit = $derived(canManage || node?.role === "EDIT");
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
void node?.id;
|
||||||
|
tab = "detail";
|
||||||
|
clearSelectedFile();
|
||||||
|
});
|
||||||
|
|
||||||
|
async function createChild(): Promise<void> {
|
||||||
|
const name = newName.trim();
|
||||||
|
if (name === "" || node === null) return;
|
||||||
|
try {
|
||||||
|
await api("/database/api/nodes", {
|
||||||
|
method: "POST",
|
||||||
|
body: {
|
||||||
|
parentId: node.id,
|
||||||
|
kind: newKind,
|
||||||
|
name,
|
||||||
|
...(newDesc.trim() !== "" ? { description: newDesc.trim() } : {}),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
toastOk("已创建");
|
||||||
|
showCreateChild = false;
|
||||||
|
newName = ""; newKind = "FOLDER"; newDesc = "";
|
||||||
|
bumpTree();
|
||||||
|
} catch (e) {
|
||||||
|
toastErr(e instanceof Error ? e.message : String(e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function renameNode(): Promise<void> {
|
||||||
|
if (node === null) return;
|
||||||
|
const name = prompt("新名称", node.name);
|
||||||
|
if (name === null) return;
|
||||||
|
try {
|
||||||
|
await api(`/database/api/nodes/${node.id}`, { method: "PATCH", body: { name } });
|
||||||
|
toastOk("已重命名");
|
||||||
|
bumpTree();
|
||||||
|
currentNode.update((n) => (n ? { ...n, name } : n));
|
||||||
|
} catch (e) {
|
||||||
|
toastErr(e instanceof Error ? e.message : String(e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function deleteNode(): Promise<void> {
|
||||||
|
if (node === null || !confirm(`确认删除「${node.name}」?软删除后不可见。`)) return;
|
||||||
|
try {
|
||||||
|
await api(`/database/api/nodes/${node.id}`, { method: "DELETE" });
|
||||||
|
toastOk("已删除");
|
||||||
|
currentNode.set(null);
|
||||||
|
bumpTree();
|
||||||
|
} catch (e) {
|
||||||
|
toastErr(e instanceof Error ? e.message : String(e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{#if node === null}
|
||||||
|
<div class="flex h-full items-center justify-center text-[13px] text-ink-3">从左侧选择一个文件夹或项目</div>
|
||||||
|
{:else}
|
||||||
|
<div class="mx-auto max-w-[880px] px-9 py-9">
|
||||||
|
<div class="mb-2 text-[12.5px] text-ink-3">
|
||||||
|
{#each crumbs as c, i (i)}
|
||||||
|
{#if i > 0}<span class="mx-1 text-line">/</span>{/if}
|
||||||
|
<span>{c.name ?? "…"}</span>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-5 flex items-center justify-between">
|
||||||
|
<div class="flex items-center gap-2.5 text-[19px] font-semibold text-ink">
|
||||||
|
{node.name}
|
||||||
|
<span class="rounded-full border border-line-soft bg-panel px-2 py-0.5 font-mono text-[10.5px] text-ink-3">{node.kind === "PROJECT" ? "项目" : "文件夹"}</span>
|
||||||
|
</div>
|
||||||
|
<div class="flex gap-2">
|
||||||
|
{#if canEdit && node.kind === "FOLDER"}
|
||||||
|
<button class="rounded-lg border border-line bg-panel px-3 py-1.5 text-[12.5px] font-medium text-ink transition hover:bg-hover" onclick={() => (showCreateChild = true)}>+ 新建</button>
|
||||||
|
{/if}
|
||||||
|
{#if canManage}
|
||||||
|
<button class="rounded-lg border border-line bg-panel px-3 py-1.5 text-[12.5px] font-medium text-ink transition hover:bg-hover" onclick={renameNode}>重命名</button>
|
||||||
|
<button class="rounded-lg border border-transparent px-3 py-1.5 text-[12.5px] font-medium text-danger transition hover:bg-[#A13A3312]" onclick={deleteNode}>删除</button>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if node.kind === "FOLDER"}
|
||||||
|
<div class="py-7 text-[13px] text-ink-3">点击左侧树展开以浏览子内容</div>
|
||||||
|
{:else}
|
||||||
|
<div class="mb-5 flex gap-1 border-b border-line-soft">
|
||||||
|
{#each [["detail", "概览"], ["files", "文件"]] as [id, label] (id)}
|
||||||
|
<button
|
||||||
|
class="border-b-2 px-3.5 py-2 text-[13px] transition {tab === id ? 'border-accent font-semibold text-ink' : 'border-transparent text-ink-3 hover:text-ink'}"
|
||||||
|
onclick={() => (tab = id as "detail" | "files")}
|
||||||
|
>{label}</button>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
{#if tab === "detail"}
|
||||||
|
<OverviewPanel {node} />
|
||||||
|
{:else}
|
||||||
|
<FilesPanel {node} />
|
||||||
|
{/if}
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
{#if showCreateChild && node}
|
||||||
|
<Modal title="新建子节点" onclose={() => (showCreateChild = false)}>
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="mb-1 block text-[11.5px] text-ink-3" for="child-name">名称</label>
|
||||||
|
<input id="child-name" class="w-full rounded-lg border border-line bg-panel px-3 py-2 text-[13px] outline-none focus:border-accent" bind:value={newName} placeholder="例如:物理必修一" />
|
||||||
|
</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="mb-1 block text-[11.5px] text-ink-3" for="child-kind">类型</label>
|
||||||
|
<select id="child-kind" class="w-full rounded-lg border border-line bg-panel px-3 py-2 text-[13px] outline-none focus:border-accent" bind:value={newKind}>
|
||||||
|
<option value="FOLDER">文件夹</option>
|
||||||
|
<option value="PROJECT">项目(课程资源库)</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="mb-1 block text-[11.5px] text-ink-3" for="child-desc">简介(可选)</label>
|
||||||
|
<textarea id="child-desc" rows="3" class="w-full rounded-lg border border-line bg-panel px-3 py-2 font-mono text-xs outline-none focus:border-accent" bind:value={newDesc} placeholder="简要说明用途…"></textarea>
|
||||||
|
</div>
|
||||||
|
<div class="mt-4 flex justify-end gap-2">
|
||||||
|
<button class="rounded-lg border border-line bg-panel px-3.5 py-1.5 text-[12.5px] font-medium text-ink transition hover:bg-hover" onclick={() => (showCreateChild = false)}>取消</button>
|
||||||
|
<button class="rounded-lg bg-accent px-3.5 py-1.5 text-[12.5px] font-medium text-white transition hover:bg-accent-hover" onclick={createChild}>创建</button>
|
||||||
|
</div>
|
||||||
|
</Modal>
|
||||||
|
{/if}
|
||||||
@@ -0,0 +1,123 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { api } from "./api.js";
|
||||||
|
import { toastOk, toastErr } from "./stores.js";
|
||||||
|
import { currentNode } from "./browser.js";
|
||||||
|
import type { ExportJob, NodeDetail } from "./types.js";
|
||||||
|
import Modal from "./Modal.svelte";
|
||||||
|
|
||||||
|
let { node }: { node: NodeDetail } = $props();
|
||||||
|
|
||||||
|
let showEditDesc = $state(false);
|
||||||
|
let descDraft = $state("");
|
||||||
|
let exportJob = $state<ExportJob | null>(null);
|
||||||
|
|
||||||
|
const canEdit = $derived(node.role === "MANAGE" || node.role === "EDIT");
|
||||||
|
const roleLabel = $derived(node.role === "MANAGE" ? "可管理" : node.role === "EDIT" ? "可编辑" : "只读");
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
void node.id;
|
||||||
|
exportJob = null;
|
||||||
|
});
|
||||||
|
|
||||||
|
function openEditDesc(): void {
|
||||||
|
descDraft = node.description ?? "";
|
||||||
|
showEditDesc = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function saveDesc(): Promise<void> {
|
||||||
|
const description = descDraft.trim();
|
||||||
|
try {
|
||||||
|
await api(`/database/api/nodes/${node.id}`, {
|
||||||
|
method: "PATCH",
|
||||||
|
body: { description: description === "" ? null : description },
|
||||||
|
});
|
||||||
|
toastOk("简介已保存");
|
||||||
|
showEditDesc = false;
|
||||||
|
const next = description === "" ? null : description;
|
||||||
|
currentNode.update((n) => (n && n.id === node.id ? { ...n, description: next } : n));
|
||||||
|
} catch (e) {
|
||||||
|
toastErr(e instanceof Error ? e.message : String(e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function submitExport(): Promise<void> {
|
||||||
|
try {
|
||||||
|
const r = await api<{ jobId: string; status: string }>(`/database/api/projects/${node.id}/exports`, {
|
||||||
|
method: "POST",
|
||||||
|
body: { target: "manifest" },
|
||||||
|
});
|
||||||
|
toastOk("导出已提交");
|
||||||
|
void pollExport(r.jobId);
|
||||||
|
} catch (e) {
|
||||||
|
toastErr(e instanceof Error ? e.message : String(e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function pollExport(jobId: string): Promise<void> {
|
||||||
|
for (;;) {
|
||||||
|
await new Promise((r) => setTimeout(r, 800));
|
||||||
|
try {
|
||||||
|
const job = await api<ExportJob>(`/database/api/exports/${jobId}`);
|
||||||
|
exportJob = job;
|
||||||
|
if (job.status === "DONE" || job.status === "FAILED") break;
|
||||||
|
} catch {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="rounded-xl border border-line-soft bg-panel p-5">
|
||||||
|
<div class="mb-4">
|
||||||
|
<div class="mb-1.5 text-[11.5px] text-ink-3">简介</div>
|
||||||
|
<div class="text-[13.5px] leading-7 text-ink">
|
||||||
|
{#if node.description}
|
||||||
|
{node.description}
|
||||||
|
{:else}
|
||||||
|
<span class="italic text-ink-3">暂无简介</span>
|
||||||
|
{/if}
|
||||||
|
{#if canEdit}
|
||||||
|
<button class="ml-2.5 rounded-lg border border-line bg-panel px-2.5 py-0.5 align-middle text-[11.5px] text-ink transition hover:bg-hover" onclick={openEditDesc}>编辑</button>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="my-4 border-t border-line-soft"></div>
|
||||||
|
|
||||||
|
<div class="flex flex-col gap-1.5 text-[13px] text-ink-2">
|
||||||
|
<div>我的角色 <b class="font-semibold text-ink">{roleLabel}</b></div>
|
||||||
|
<div>创建时间 <b class="font-semibold text-ink">{new Date(node.createdAt).toLocaleDateString("zh-CN", { year: "numeric", month: "long", day: "numeric" })}</b></div>
|
||||||
|
<div>最近修改 <b class="font-semibold text-ink">{new Date(node.updatedAt).toLocaleDateString("zh-CN", { year: "numeric", month: "long", day: "numeric" })}</b></div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="my-4 border-t border-line-soft"></div>
|
||||||
|
|
||||||
|
<div class="mb-2 text-[12.5px] font-semibold">导出</div>
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<button class="rounded-lg border border-line bg-panel px-3 py-1.5 text-[12.5px] font-medium text-ink transition hover:bg-hover" onclick={submitExport}>开始导出</button>
|
||||||
|
{#if exportJob}
|
||||||
|
<span class="font-mono text-[11px] text-ink-3">
|
||||||
|
{#if exportJob.status === "DONE"}
|
||||||
|
完成 · <a class="text-accent underline" href="/database/api/exports/{exportJob.id}/download">下载</a>
|
||||||
|
{:else if exportJob.status === "FAILED"}
|
||||||
|
失败:{exportJob.error ?? ""}
|
||||||
|
{:else}
|
||||||
|
{exportJob.status}…
|
||||||
|
{/if}
|
||||||
|
</span>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if showEditDesc}
|
||||||
|
<Modal title="编辑简介" onclose={() => (showEditDesc = false)}>
|
||||||
|
<div class="mb-3">
|
||||||
|
<label class="mb-1 block text-[11.5px] text-ink-3" for="desc-draft">简要说明这个项目的内容</label>
|
||||||
|
<textarea id="desc-draft" rows="5" class="w-full rounded-lg border border-line bg-panel px-3 py-2 text-[13px] leading-7 outline-none focus:border-accent" bind:value={descDraft} placeholder="例如:高中物理必修一第三章,表面张力相关内容……"></textarea>
|
||||||
|
</div>
|
||||||
|
<div class="mt-4 flex justify-end gap-2">
|
||||||
|
<button class="rounded-lg border border-line bg-panel px-3.5 py-1.5 text-[12.5px] font-medium text-ink transition hover:bg-hover" onclick={() => (showEditDesc = false)}>取消</button>
|
||||||
|
<button class="rounded-lg bg-accent px-3.5 py-1.5 text-[12.5px] font-medium text-white transition hover:bg-accent-hover" onclick={saveDesc}>保存</button>
|
||||||
|
</div>
|
||||||
|
</Modal>
|
||||||
|
{/if}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { toasts } from "./stores.js";
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="fixed bottom-4 right-4 z-50 flex flex-col gap-2">
|
||||||
|
{#each $toasts as t (t.id)}
|
||||||
|
<div class="max-w-[340px] rounded-lg px-4 py-2 text-sm text-white {t.kind === 'err' ? 'bg-[#7E2C26]' : 'bg-[#333230]'}">
|
||||||
|
{t.message}
|
||||||
|
</div>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,82 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import TreeNode from "./TreeNode.svelte";
|
||||||
|
import { api } from "./api.js";
|
||||||
|
import { expanded, currentNode, breadcrumb, toggleExpanded, treeVersion } from "./browser.js";
|
||||||
|
import { toastErr } from "./stores.js";
|
||||||
|
import type { BreadcrumbEntry, NodeChild, NodeDetail } from "./types.js";
|
||||||
|
|
||||||
|
let { node, depth }: { node: NodeChild; depth: number } = $props();
|
||||||
|
|
||||||
|
let children = $state<NodeChild[] | null>(null);
|
||||||
|
const isOpen = $derived($expanded.has(node.id));
|
||||||
|
const isSelected = $derived($currentNode?.id === node.id);
|
||||||
|
|
||||||
|
// 树刷新信号(增/删/移/重命名)→ 失效子节点缓存,展开状态下随之重载
|
||||||
|
$effect(() => {
|
||||||
|
void $treeVersion;
|
||||||
|
children = null;
|
||||||
|
});
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
if (isOpen && node.kind === "FOLDER" && children === null) {
|
||||||
|
api<{ nodes: NodeChild[] }>(`/database/api/nodes?parentId=${encodeURIComponent(node.id)}`)
|
||||||
|
.then((r) => (children = r.nodes))
|
||||||
|
.catch((e) => toastErr(e instanceof Error ? e.message : String(e)));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
async function select(): Promise<void> {
|
||||||
|
if (node.kind === "FOLDER") toggleExpanded(node.id);
|
||||||
|
try {
|
||||||
|
const [detail, crumb] = await Promise.all([
|
||||||
|
api<{ node: NodeDetail }>(`/database/api/nodes/${node.id}`),
|
||||||
|
api<{ breadcrumb: BreadcrumbEntry[] }>(`/database/api/nodes/${node.id}/breadcrumb`),
|
||||||
|
]);
|
||||||
|
currentNode.set(detail.node);
|
||||||
|
breadcrumb.set(crumb.breadcrumb);
|
||||||
|
} catch (e) {
|
||||||
|
toastErr(e instanceof Error ? e.message : String(e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<div
|
||||||
|
class="tree-item flex cursor-pointer items-center gap-1 rounded-lg px-1.5 py-1.5 select-none {isSelected ? 'bg-selected' : 'hover:bg-hover'}"
|
||||||
|
role="button"
|
||||||
|
tabindex="0"
|
||||||
|
onclick={select}
|
||||||
|
onkeydown={(e) => e.key === "Enter" && select()}
|
||||||
|
>
|
||||||
|
<span class="flex h-4 w-4 shrink-0 items-center justify-center text-ink-3">
|
||||||
|
{#if node.kind === "FOLDER"}
|
||||||
|
<svg width="9" height="9" viewBox="0 0 24 24" fill="currentColor">
|
||||||
|
{#if isOpen}<path d="M6 9l6 6 6-6z" />{:else}<path d="M9 6l6 6-6 6z" />{/if}
|
||||||
|
</svg>
|
||||||
|
{/if}
|
||||||
|
</span>
|
||||||
|
<span class="flex h-4 w-4 shrink-0 items-center justify-center {node.kind === 'PROJECT' ? 'text-ink' : 'text-ink-3'}">
|
||||||
|
{#if node.kind === "PROJECT"}
|
||||||
|
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4" /></svg>
|
||||||
|
{:else}
|
||||||
|
<svg width="16" height="16" viewBox="0 0 24 24" fill="currentColor"><path d="M3 7a2 2 0 0 1 2-2h4l2 2h8a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V7Z" /></svg>
|
||||||
|
{/if}
|
||||||
|
</span>
|
||||||
|
<span class="truncate">{node.name}</span>
|
||||||
|
{#if node.role !== "MANAGE"}
|
||||||
|
<span class="ml-auto pr-1 font-mono text-[10px] text-ink-3">{node.role}</span>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if node.kind === "FOLDER" && isOpen}
|
||||||
|
<div class="ml-[15px] border-l border-guide pl-1">
|
||||||
|
{#if children === null}
|
||||||
|
<div class="px-3 py-1.5 text-xs text-ink-3">…</div>
|
||||||
|
{:else}
|
||||||
|
{#each children as child (child.id)}
|
||||||
|
<TreeNode node={child} depth={depth + 1} />
|
||||||
|
{/each}
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
/** 与 /database/api/* 的约定一致;401 时清空会话(回到登录视图)。 */
|
||||||
|
|
||||||
|
import { me } from "./stores.js";
|
||||||
|
|
||||||
|
export class ApiError extends Error {
|
||||||
|
constructor(
|
||||||
|
readonly status: number,
|
||||||
|
readonly code: string,
|
||||||
|
message: string,
|
||||||
|
readonly details?: Record<string, unknown>,
|
||||||
|
) {
|
||||||
|
super(message);
|
||||||
|
this.name = "ApiError";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export class UnauthenticatedError extends Error {
|
||||||
|
constructor() {
|
||||||
|
super("unauthenticated");
|
||||||
|
this.name = "UnauthenticatedError";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
interface RequestOpts {
|
||||||
|
readonly method?: string;
|
||||||
|
readonly body?: unknown;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function api<T = unknown>(path: string, opts: RequestOpts = {}): Promise<T> {
|
||||||
|
const res = await fetch(path, {
|
||||||
|
credentials: "same-origin",
|
||||||
|
method: opts.method ?? "GET",
|
||||||
|
...(opts.body !== undefined
|
||||||
|
? { headers: { "Content-Type": "application/json" }, body: JSON.stringify(opts.body) }
|
||||||
|
: {}),
|
||||||
|
});
|
||||||
|
if (res.status === 401) {
|
||||||
|
me.set(null);
|
||||||
|
throw new UnauthenticatedError();
|
||||||
|
}
|
||||||
|
if (res.status === 204) return null as T;
|
||||||
|
const text = await res.text();
|
||||||
|
const data = text === "" ? null : (JSON.parse(text) as unknown);
|
||||||
|
if (!res.ok) {
|
||||||
|
const err = (data as { error?: { code?: string; message?: string } } | null)?.error ?? {};
|
||||||
|
throw new ApiError(res.status, err.code ?? "unknown", err.message ?? res.statusText, err as Record<string, unknown>);
|
||||||
|
}
|
||||||
|
return data as T;
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
import { writable } from "svelte/store";
|
||||||
|
import type { BreadcrumbEntry, NodeDetail } from "./types.js";
|
||||||
|
|
||||||
|
/** 树展开集合 / 当前选中节点 / 面包屑 / 树刷新计数。 */
|
||||||
|
export const expanded = writable<Set<string>>(new Set());
|
||||||
|
export const currentNode = writable<NodeDetail | null>(null);
|
||||||
|
export const breadcrumb = writable<BreadcrumbEntry[]>([]);
|
||||||
|
export const treeVersion = writable(0);
|
||||||
|
|
||||||
|
/** 右侧预览栏:当前选中文件路径(项目内);切换节点时清空。 */
|
||||||
|
export const selectedFilePath = writable<string | null>(null);
|
||||||
|
/** 文件列表刷新计数(编辑器保存/删除后 bump,列表随之重载)。 */
|
||||||
|
export const filesVersion = writable(0);
|
||||||
|
|
||||||
|
export function bumpTree(): void {
|
||||||
|
treeVersion.update((v) => v + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function bumpFiles(): void {
|
||||||
|
filesVersion.update((v) => v + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function clearSelectedFile(): void {
|
||||||
|
selectedFilePath.set(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function toggleExpanded(id: string): void {
|
||||||
|
expanded.update((set) => {
|
||||||
|
const next = new Set(set);
|
||||||
|
if (next.has(id)) next.delete(id);
|
||||||
|
else next.add(id);
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import { writable } from "svelte/store";
|
||||||
|
import type { MeResponse } from "./types.js";
|
||||||
|
|
||||||
|
/** 当前登录身份;null = 未登录(显示登录视图)。 */
|
||||||
|
export const me = writable<MeResponse | null>(null);
|
||||||
|
export const authChecked = writable(false);
|
||||||
|
|
||||||
|
export interface ToastItem {
|
||||||
|
readonly id: number;
|
||||||
|
readonly message: string;
|
||||||
|
readonly kind: "info" | "err";
|
||||||
|
}
|
||||||
|
|
||||||
|
let nextToastId = 1;
|
||||||
|
export const toasts = writable<ToastItem[]>([]);
|
||||||
|
|
||||||
|
export function toast(message: string, kind: ToastItem["kind"] = "info"): void {
|
||||||
|
const id = nextToastId++;
|
||||||
|
toasts.update((list) => [...list, { id, message, kind }]);
|
||||||
|
setTimeout(() => {
|
||||||
|
toasts.update((list) => list.filter((t) => t.id !== id));
|
||||||
|
}, 3600);
|
||||||
|
}
|
||||||
|
|
||||||
|
export const toastOk = (m: string): void => toast(m, "info");
|
||||||
|
export const toastErr = (m: string): void => toast(m, "err");
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
/** 与后端 /database/api/* 响应形状对齐。 */
|
||||||
|
|
||||||
|
export type NodeKind = "FOLDER" | "PROJECT";
|
||||||
|
export type Role = "VIEW" | "EDIT" | "MANAGE";
|
||||||
|
|
||||||
|
export interface NodeChild {
|
||||||
|
readonly id: string;
|
||||||
|
readonly parentId: string | null;
|
||||||
|
readonly kind: NodeKind;
|
||||||
|
readonly name: string;
|
||||||
|
readonly role: Role;
|
||||||
|
readonly createdAt: string;
|
||||||
|
readonly updatedAt: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface BreadcrumbEntry {
|
||||||
|
readonly depth: number;
|
||||||
|
readonly id: string | null;
|
||||||
|
readonly name: string | null;
|
||||||
|
readonly kind: NodeKind;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface NodeDetail {
|
||||||
|
readonly id: string;
|
||||||
|
readonly parentId: string | null;
|
||||||
|
readonly kind: NodeKind;
|
||||||
|
readonly name: string;
|
||||||
|
readonly description: string | null;
|
||||||
|
readonly role: Role;
|
||||||
|
readonly provisionStatus: "PROVISIONING" | "READY" | "FAILED";
|
||||||
|
readonly independentPermission: boolean;
|
||||||
|
readonly createdAt: string;
|
||||||
|
readonly updatedAt: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface MeResponse {
|
||||||
|
readonly userId: string;
|
||||||
|
readonly isWebsiteAdmin: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface FileEntry {
|
||||||
|
readonly path: string;
|
||||||
|
readonly size: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type FileContentEncoding = "utf8" | "base64";
|
||||||
|
|
||||||
|
export interface FileContent {
|
||||||
|
readonly path: string;
|
||||||
|
readonly version: string;
|
||||||
|
readonly encoding: FileContentEncoding;
|
||||||
|
readonly content: string;
|
||||||
|
readonly size: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface VersionInfo {
|
||||||
|
readonly version: string;
|
||||||
|
readonly message: string;
|
||||||
|
readonly author?: string;
|
||||||
|
readonly committedAt: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ExportJob {
|
||||||
|
readonly id: string;
|
||||||
|
readonly nodeId: string;
|
||||||
|
readonly target: string;
|
||||||
|
readonly status: "QUEUED" | "RUNNING" | "DONE" | "FAILED";
|
||||||
|
readonly error: string | null;
|
||||||
|
readonly createdAt: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Grant {
|
||||||
|
readonly id: string;
|
||||||
|
readonly principalType: "USER" | "GROUP";
|
||||||
|
readonly principalId: string;
|
||||||
|
readonly role: Role;
|
||||||
|
readonly isCreatorGrant: boolean;
|
||||||
|
readonly createdAt: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface GroupSearchResult {
|
||||||
|
readonly id: string;
|
||||||
|
readonly name: string;
|
||||||
|
readonly breadcrumb: string;
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
import { mount } from "svelte";
|
||||||
|
import App from "./App.svelte";
|
||||||
|
import "./app.css";
|
||||||
|
|
||||||
|
export default mount(App, { target: document.getElementById("app")! });
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"target": "ES2022",
|
||||||
|
"module": "ESNext",
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"strict": true,
|
||||||
|
"noUncheckedIndexedAccess": true,
|
||||||
|
"exactOptionalPropertyTypes": true,
|
||||||
|
"verbatimModuleSyntax": true,
|
||||||
|
"skipLibCheck": true,
|
||||||
|
"isolatedModules": true,
|
||||||
|
"resolveJsonModule": true,
|
||||||
|
"useDefineForClassFields": true,
|
||||||
|
"lib": ["ES2022", "DOM", "DOM.Iterable"]
|
||||||
|
},
|
||||||
|
"include": ["src/**/*.ts", "src/**/*.svelte"]
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
import { defineConfig } from "vite";
|
||||||
|
import { svelte } from "@sveltejs/vite-plugin-svelte";
|
||||||
|
import tailwindcss from "@tailwindcss/vite";
|
||||||
|
|
||||||
|
// 老师端独立 SPA:构建产物由 hub 后端静态托管于 /app;
|
||||||
|
// 开发时 vite dev(:5173)把 API/认证请求代理到后端(:8788)。
|
||||||
|
const backend = "http://127.0.0.1:8788";
|
||||||
|
|
||||||
|
export default defineConfig({
|
||||||
|
plugins: [svelte(), tailwindcss()],
|
||||||
|
base: "/app/",
|
||||||
|
build: {
|
||||||
|
outDir: "dist",
|
||||||
|
emptyOutDir: true,
|
||||||
|
},
|
||||||
|
server: {
|
||||||
|
port: 5173,
|
||||||
|
proxy: {
|
||||||
|
"/database/api": backend,
|
||||||
|
"/auth": backend,
|
||||||
|
"/app/dev-login": backend,
|
||||||
|
"/app/dev-login-teacher": backend,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
Generated
+556
-13
@@ -1,15 +1,19 @@
|
|||||||
{
|
{
|
||||||
"name": "@paradigm/hub",
|
"name": "@paradigm/hub",
|
||||||
"version": "0.0.29",
|
"version": "0.0.36",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "@paradigm/hub",
|
"name": "@paradigm/hub",
|
||||||
"version": "0.0.29",
|
"version": "0.0.36",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@alicloud/credentials": "^2.4.5",
|
||||||
|
"@alicloud/docmind-api20220711": "^1.4.15",
|
||||||
|
"@alicloud/tea-util": "^1.4.11",
|
||||||
"@anthropic-ai/claude-agent-sdk": "^0.3.202",
|
"@anthropic-ai/claude-agent-sdk": "^0.3.202",
|
||||||
"@fastify/cookie": "^11.0.2",
|
"@fastify/cookie": "^11.0.2",
|
||||||
|
"@fastify/static": "^10.1.2",
|
||||||
"@larksuiteoapi/node-sdk": "^1.70.0",
|
"@larksuiteoapi/node-sdk": "^1.70.0",
|
||||||
"@prisma/client": "^6.19.3",
|
"@prisma/client": "^6.19.3",
|
||||||
"ai": "^7.0.16",
|
"ai": "^7.0.16",
|
||||||
@@ -74,6 +78,175 @@
|
|||||||
"zod": "^3.25.76 || ^4.1.8"
|
"zod": "^3.25.76 || ^4.1.8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@alicloud/credentials": {
|
||||||
|
"version": "2.4.5",
|
||||||
|
"resolved": "https://registry.npmjs.org/@alicloud/credentials/-/credentials-2.4.5.tgz",
|
||||||
|
"integrity": "sha512-od1ufCxOO7cP2R4EVFliOB0kGo9lUXCibyj/mzmI6yLhxeqhqsegTzVsx5p2NJJsceKJnYcmye7FWKyLJAFBkw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@alicloud/tea-typescript": "^1.8.0",
|
||||||
|
"httpx": "^2.3.3",
|
||||||
|
"ini": "^1.3.5",
|
||||||
|
"kitx": "^2.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@alicloud/darabonba-array": {
|
||||||
|
"version": "0.1.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@alicloud/darabonba-array/-/darabonba-array-0.1.2.tgz",
|
||||||
|
"integrity": "sha512-ZPuQ+bJyjrd8XVVm55kl+ypk7OQoi1ZH/DiToaAEQaGvgEjrTcvQkg71//vUX/6cvbLIF5piQDvhrLb+lUEIPQ==",
|
||||||
|
"license": "ISC",
|
||||||
|
"dependencies": {
|
||||||
|
"@alicloud/tea-typescript": "^1.7.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@alicloud/darabonba-encode-util": {
|
||||||
|
"version": "0.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@alicloud/darabonba-encode-util/-/darabonba-encode-util-0.0.2.tgz",
|
||||||
|
"integrity": "sha512-mlsNctkeqmR0RtgE1Rngyeadi5snLOAHBCWEtYf68d7tyKskosXDTNeZ6VCD/UfrUu4N51ItO8zlpfXiOgeg3A==",
|
||||||
|
"license": "ISC",
|
||||||
|
"dependencies": {
|
||||||
|
"moment": "^2.29.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@alicloud/darabonba-map": {
|
||||||
|
"version": "0.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@alicloud/darabonba-map/-/darabonba-map-0.0.1.tgz",
|
||||||
|
"integrity": "sha512-2ep+G3YDvuI+dRYVlmER1LVUQDhf9kEItmVB/bbEu1pgKzelcocCwAc79XZQjTcQGFgjDycf3vH87WLDGLFMlw==",
|
||||||
|
"license": "ISC",
|
||||||
|
"dependencies": {
|
||||||
|
"@alicloud/tea-typescript": "^1.7.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@alicloud/darabonba-signature-util": {
|
||||||
|
"version": "0.0.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/@alicloud/darabonba-signature-util/-/darabonba-signature-util-0.0.4.tgz",
|
||||||
|
"integrity": "sha512-I1TtwtAnzLamgqnAaOkN0IGjwkiti//0a7/auyVThdqiC/3kyafSAn6znysWOmzub4mrzac2WiqblZKFcN5NWg==",
|
||||||
|
"license": "ISC",
|
||||||
|
"dependencies": {
|
||||||
|
"@alicloud/darabonba-encode-util": "^0.0.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@alicloud/darabonba-signature-util/node_modules/@alicloud/darabonba-encode-util": {
|
||||||
|
"version": "0.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@alicloud/darabonba-encode-util/-/darabonba-encode-util-0.0.1.tgz",
|
||||||
|
"integrity": "sha512-Sl5vCRVAYMqwmvXpJLM9hYoCHOMsQlGxaWSGhGWulpKk/NaUBArtoO1B0yHruJf1C5uHhEJIaylYcM48icFHgw==",
|
||||||
|
"license": "ISC",
|
||||||
|
"dependencies": {
|
||||||
|
"@alicloud/tea-typescript": "^1.7.1",
|
||||||
|
"moment": "^2.29.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@alicloud/darabonba-string": {
|
||||||
|
"version": "1.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@alicloud/darabonba-string/-/darabonba-string-1.0.3.tgz",
|
||||||
|
"integrity": "sha512-NyWwrU8cAIesWk3uHL1Q7pTDTqLkCI/0PmJXC4/4A0MFNAZ9Ouq0iFBsRqvfyUujSSM+WhYLuTfakQXiVLkTMA==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@alicloud/tea-typescript": "^1.5.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@alicloud/docmind-api20220711": {
|
||||||
|
"version": "1.4.15",
|
||||||
|
"resolved": "https://registry.npmjs.org/@alicloud/docmind-api20220711/-/docmind-api20220711-1.4.15.tgz",
|
||||||
|
"integrity": "sha512-QmjSDPV52d2B5bd/Dk3Zeofu+cJFPKYS+MphIHqlulfYsOynLgOaDqTRMGTK/RhcmVCwG14CyZ/15GBF00GRFw==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@alicloud/credentials": "^2.4.2",
|
||||||
|
"@alicloud/openapi-core": "^1.0.0",
|
||||||
|
"@darabonba/typescript": "^1.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@alicloud/endpoint-util": {
|
||||||
|
"version": "0.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@alicloud/endpoint-util/-/endpoint-util-0.0.1.tgz",
|
||||||
|
"integrity": "sha512-+pH7/KEXup84cHzIL6UJAaPqETvln4yXlD9JzlrqioyCSaWxbug5FUobsiI6fuUOpw5WwoB3fWAtGbFnJ1K3Yg==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@alicloud/tea-typescript": "^1.5.1",
|
||||||
|
"kitx": "^2.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@alicloud/gateway-pop": {
|
||||||
|
"version": "0.0.6",
|
||||||
|
"resolved": "https://registry.npmjs.org/@alicloud/gateway-pop/-/gateway-pop-0.0.6.tgz",
|
||||||
|
"integrity": "sha512-KF4I+JvfYuLKc3fWeWYIZ7lOVJ9jRW0sQXdXidZn1DKZ978ncfGf7i0LBfONGk4OxvNb/HD3/0yYhkgZgPbKtA==",
|
||||||
|
"license": "ISC",
|
||||||
|
"dependencies": {
|
||||||
|
"@alicloud/credentials": "^2",
|
||||||
|
"@alicloud/darabonba-array": "^0.1.0",
|
||||||
|
"@alicloud/darabonba-encode-util": "^0.0.2",
|
||||||
|
"@alicloud/darabonba-map": "^0.0.1",
|
||||||
|
"@alicloud/darabonba-signature-util": "^0.0.4",
|
||||||
|
"@alicloud/darabonba-string": "^1.0.2",
|
||||||
|
"@alicloud/endpoint-util": "^0.0.1",
|
||||||
|
"@alicloud/gateway-spi": "^0.0.8",
|
||||||
|
"@alicloud/openapi-util": "^0.3.2",
|
||||||
|
"@alicloud/tea-typescript": "^1.7.1",
|
||||||
|
"@alicloud/tea-util": "^1.4.8"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@alicloud/gateway-spi": {
|
||||||
|
"version": "0.0.8",
|
||||||
|
"resolved": "https://registry.npmjs.org/@alicloud/gateway-spi/-/gateway-spi-0.0.8.tgz",
|
||||||
|
"integrity": "sha512-KM7fu5asjxZPmrz9sJGHJeSU+cNQNOxW+SFmgmAIrITui5hXL2LB+KNRuzWmlwPjnuA2X3/keq9h6++S9jcV5g==",
|
||||||
|
"license": "ISC",
|
||||||
|
"dependencies": {
|
||||||
|
"@alicloud/credentials": "^2",
|
||||||
|
"@alicloud/tea-typescript": "^1.7.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@alicloud/openapi-core": {
|
||||||
|
"version": "1.0.8",
|
||||||
|
"resolved": "https://registry.npmjs.org/@alicloud/openapi-core/-/openapi-core-1.0.8.tgz",
|
||||||
|
"integrity": "sha512-xs8LdgMDcEUqv13kZ4nl+Vd+Fc1mixTF0g1lm5QSrNWDaLUUD5vqpuMtvUZnKNnq9PITfUQ+8KunAvNQJpFo8g==",
|
||||||
|
"hasInstallScript": true,
|
||||||
|
"license": "ISC",
|
||||||
|
"dependencies": {
|
||||||
|
"@alicloud/credentials": "^2.4.2",
|
||||||
|
"@alicloud/gateway-pop": "0.0.6",
|
||||||
|
"@alicloud/gateway-spi": "^0.0.8",
|
||||||
|
"@darabonba/typescript": "^1.0.5"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@alicloud/openapi-util": {
|
||||||
|
"version": "0.3.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@alicloud/openapi-util/-/openapi-util-0.3.3.tgz",
|
||||||
|
"integrity": "sha512-vf0cQ/q8R2U7ZO88X5hDiu1yV3t/WexRj+YycWxRutkH/xVXfkmpRgps8lmNEk7Ar+0xnY8+daN2T+2OyB9F4A==",
|
||||||
|
"license": "ISC",
|
||||||
|
"dependencies": {
|
||||||
|
"@alicloud/tea-typescript": "^1.7.1",
|
||||||
|
"@alicloud/tea-util": "^1.3.0",
|
||||||
|
"kitx": "^2.1.0",
|
||||||
|
"sm3": "^1.0.3"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@alicloud/tea-typescript": {
|
||||||
|
"version": "1.8.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@alicloud/tea-typescript/-/tea-typescript-1.8.0.tgz",
|
||||||
|
"integrity": "sha512-CWXWaquauJf0sW30mgJRVu9aaXyBth5uMBCUc+5vKTK1zlgf3hIqRUjJZbjlwHwQ5y9anwcu18r48nOZb7l2QQ==",
|
||||||
|
"license": "ISC",
|
||||||
|
"dependencies": {
|
||||||
|
"@types/node": "^12.0.2",
|
||||||
|
"httpx": "^2.2.6"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@alicloud/tea-typescript/node_modules/@types/node": {
|
||||||
|
"version": "12.20.55",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz",
|
||||||
|
"integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/@alicloud/tea-util": {
|
||||||
|
"version": "1.4.11",
|
||||||
|
"resolved": "https://registry.npmjs.org/@alicloud/tea-util/-/tea-util-1.4.11.tgz",
|
||||||
|
"integrity": "sha512-HyPEEQ8F0WoZegiCp7sVdrdm6eBOB+GCvGl4182u69LDFktxfirGLcAx3WExUr1zFWkq2OSmBroTwKQ4w/+Yww==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@alicloud/tea-typescript": "^1.5.1",
|
||||||
|
"@darabonba/typescript": "^1.0.0",
|
||||||
|
"kitx": "^2.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@anthropic-ai/claude-agent-sdk": {
|
"node_modules/@anthropic-ai/claude-agent-sdk": {
|
||||||
"version": "0.3.202",
|
"version": "0.3.202",
|
||||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk/-/claude-agent-sdk-0.3.202.tgz",
|
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk/-/claude-agent-sdk-0.3.202.tgz",
|
||||||
@@ -234,6 +407,24 @@
|
|||||||
"node": ">=6.9.0"
|
"node": ">=6.9.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@darabonba/typescript": {
|
||||||
|
"version": "1.0.5",
|
||||||
|
"resolved": "https://registry.npmjs.org/@darabonba/typescript/-/typescript-1.0.5.tgz",
|
||||||
|
"integrity": "sha512-pfxHFVM8I3h8K2o8skpDQLMmR5iAeQ2eNpP1HrKDEm/9ZPF8aKwDKPwwEszT1NnIo0Y3++E7x1YsVkVpGjA/xw==",
|
||||||
|
"license": "Apache License 2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@alicloud/tea-typescript": "^1.5.1",
|
||||||
|
"http-proxy-agent": "^5.0.0",
|
||||||
|
"https-proxy-agent": "^5.0.1",
|
||||||
|
"httpx": "^2.3.2",
|
||||||
|
"lodash": "^4.17.21",
|
||||||
|
"moment": "^2.30.1",
|
||||||
|
"moment-timezone": "^0.5.45",
|
||||||
|
"socks-proxy-agent": "^6.2.1",
|
||||||
|
"ws": "^8.18.0",
|
||||||
|
"xml2js": "^0.6.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@emnapi/core": {
|
"node_modules/@emnapi/core": {
|
||||||
"version": "1.11.2",
|
"version": "1.11.2",
|
||||||
"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.2.tgz",
|
"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.2.tgz",
|
||||||
@@ -712,6 +903,22 @@
|
|||||||
"node": ">=18"
|
"node": ">=18"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@fastify/accept-negotiator": {
|
||||||
|
"version": "2.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@fastify/accept-negotiator/-/accept-negotiator-2.0.1.tgz",
|
||||||
|
"integrity": "sha512-/c/TW2bO/v9JeEgoD/g1G5GxGeCF1Hafdf79WPmUlgYiBXummY0oX3VVq4yFkKKVBKDNlaDUYoab7g38RpPqCQ==",
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/fastify"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "opencollective",
|
||||||
|
"url": "https://opencollective.com/fastify"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/@fastify/ajv-compiler": {
|
"node_modules/@fastify/ajv-compiler": {
|
||||||
"version": "4.0.5",
|
"version": "4.0.5",
|
||||||
"resolved": "https://registry.npmjs.org/@fastify/ajv-compiler/-/ajv-compiler-4.0.5.tgz",
|
"resolved": "https://registry.npmjs.org/@fastify/ajv-compiler/-/ajv-compiler-4.0.5.tgz",
|
||||||
@@ -843,6 +1050,83 @@
|
|||||||
"ipaddr.js": "^2.1.0"
|
"ipaddr.js": "^2.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@fastify/send": {
|
||||||
|
"version": "4.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@fastify/send/-/send-4.1.0.tgz",
|
||||||
|
"integrity": "sha512-TMYeQLCBSy2TOFmV95hQWkiTYgC/SEx7vMdV+wnZVX4tt8VBLKzmH8vV9OzJehV0+XBfg+WxPMt5wp+JBUKsVw==",
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/fastify"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "opencollective",
|
||||||
|
"url": "https://opencollective.com/fastify"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@lukeed/ms": "^2.0.2",
|
||||||
|
"escape-html": "~1.0.3",
|
||||||
|
"fast-decode-uri-component": "^1.0.1",
|
||||||
|
"http-errors": "^2.0.0",
|
||||||
|
"mime": "^3"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@fastify/static": {
|
||||||
|
"version": "10.1.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@fastify/static/-/static-10.1.2.tgz",
|
||||||
|
"integrity": "sha512-G/g18cG9tLutT/OVyN1AIsHIl9L1UwmJ+S3dkyhVpplIx0nEMicd7RGQ+uJLyhKKF4a3tTcQydccn3Mop1fX+Q==",
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/fastify"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "opencollective",
|
||||||
|
"url": "https://opencollective.com/fastify"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@fastify/accept-negotiator": "^2.0.0",
|
||||||
|
"@fastify/error": "^4.0.0",
|
||||||
|
"@fastify/send": "^4.0.0",
|
||||||
|
"content-disposition": "^2.0.1",
|
||||||
|
"fastify-plugin": "^6.0.0",
|
||||||
|
"fastq": "^1.17.1",
|
||||||
|
"glob": "^13.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@fastify/static/node_modules/content-disposition": {
|
||||||
|
"version": "2.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-2.0.1.tgz",
|
||||||
|
"integrity": "sha512-e+H0ZXHSWYrENhQzw1LPuP4oF5MzVKmDU6d3hxlvaPEYLLg62MxtQNPRx4SYSuYJSBUgnQIG4HIN2tEtNv7Dog==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=18"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"type": "opencollective",
|
||||||
|
"url": "https://opencollective.com/express"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@fastify/static/node_modules/fastify-plugin": {
|
||||||
|
"version": "6.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/fastify-plugin/-/fastify-plugin-6.0.0.tgz",
|
||||||
|
"integrity": "sha512-fZOty7z3O7vOliF6d8bHE3wiEh1KcNnKEQensSgTk9C1DvN6nRLS++XVd86v33Hw/8u9Un8A1zDrQ8ujcQDHEg==",
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/fastify"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "opencollective",
|
||||||
|
"url": "https://opencollective.com/fastify"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/@hono/node-server": {
|
"node_modules/@hono/node-server": {
|
||||||
"version": "1.19.14",
|
"version": "1.19.14",
|
||||||
"resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.14.tgz",
|
"resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.14.tgz",
|
||||||
@@ -878,6 +1162,15 @@
|
|||||||
"ws": "^8.19.0"
|
"ws": "^8.19.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@lukeed/ms": {
|
||||||
|
"version": "2.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@lukeed/ms/-/ms-2.0.2.tgz",
|
||||||
|
"integrity": "sha512-9I2Zn6+NJLfaGoz9jN3lpwDgAYvfGeNYdbAIjJOqzs4Tpc+VU3Jqq4IofSUBKajiDS8k9fZIg18/z13mpk1bsA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=8"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@modelcontextprotocol/sdk": {
|
"node_modules/@modelcontextprotocol/sdk": {
|
||||||
"version": "1.29.0",
|
"version": "1.29.0",
|
||||||
"resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.29.0.tgz",
|
"resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.29.0.tgz",
|
||||||
@@ -1396,6 +1689,15 @@
|
|||||||
"integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
|
"integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
|
"node_modules/@tootallnate/once": {
|
||||||
|
"version": "2.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.1.tgz",
|
||||||
|
"integrity": "sha512-HqmEUIGRJ5fSXchkVgR5F7qn48bDBzv0kWj/Kfu5e6uci4UlEeng4331LnBkWffb++Ei3FOVLxo8JJWMFBDMeQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 10"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@tybys/wasm-util": {
|
"node_modules/@tybys/wasm-util": {
|
||||||
"version": "0.10.3",
|
"version": "0.10.3",
|
||||||
"resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz",
|
"resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz",
|
||||||
@@ -1735,6 +2037,15 @@
|
|||||||
"proxy-from-env": "^2.1.0"
|
"proxy-from-env": "^2.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/balanced-match": {
|
||||||
|
"version": "4.0.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
|
||||||
|
"integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": "18 || 20 || >=22"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/body-parser": {
|
"node_modules/body-parser": {
|
||||||
"version": "2.3.0",
|
"version": "2.3.0",
|
||||||
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.3.0.tgz",
|
||||||
@@ -1774,6 +2085,18 @@
|
|||||||
"url": "https://opencollective.com/express"
|
"url": "https://opencollective.com/express"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/brace-expansion": {
|
||||||
|
"version": "5.0.7",
|
||||||
|
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.7.tgz",
|
||||||
|
"integrity": "sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"balanced-match": "^4.0.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": "18 || 20 || >=22"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/bytes": {
|
"node_modules/bytes": {
|
||||||
"version": "3.1.2",
|
"version": "3.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
|
||||||
@@ -2055,7 +2378,6 @@
|
|||||||
"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
|
||||||
"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
|
"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 0.8"
|
"node": ">= 0.8"
|
||||||
}
|
}
|
||||||
@@ -2248,8 +2570,7 @@
|
|||||||
"version": "1.0.3",
|
"version": "1.0.3",
|
||||||
"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
|
"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
|
||||||
"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
|
"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
|
||||||
"license": "MIT",
|
"license": "MIT"
|
||||||
"peer": true
|
|
||||||
},
|
},
|
||||||
"node_modules/estree-walker": {
|
"node_modules/estree-walker": {
|
||||||
"version": "3.0.3",
|
"version": "3.0.3",
|
||||||
@@ -2748,6 +3069,23 @@
|
|||||||
"giget": "dist/cli.mjs"
|
"giget": "dist/cli.mjs"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/glob": {
|
||||||
|
"version": "13.0.6",
|
||||||
|
"resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz",
|
||||||
|
"integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==",
|
||||||
|
"license": "BlueOak-1.0.0",
|
||||||
|
"dependencies": {
|
||||||
|
"minimatch": "^10.2.2",
|
||||||
|
"minipass": "^7.1.3",
|
||||||
|
"path-scurry": "^2.0.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": "18 || 20 || >=22"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sponsors/isaacs"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/gopd": {
|
"node_modules/gopd": {
|
||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
|
||||||
@@ -2814,7 +3152,6 @@
|
|||||||
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
|
||||||
"integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==",
|
"integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"depd": "~2.0.0",
|
"depd": "~2.0.0",
|
||||||
"inherits": "~2.0.4",
|
"inherits": "~2.0.4",
|
||||||
@@ -2830,6 +3167,20 @@
|
|||||||
"url": "https://opencollective.com/express"
|
"url": "https://opencollective.com/express"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/http-proxy-agent": {
|
||||||
|
"version": "5.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
|
||||||
|
"integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@tootallnate/once": "2",
|
||||||
|
"agent-base": "6",
|
||||||
|
"debug": "4"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 6"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/https-proxy-agent": {
|
"node_modules/https-proxy-agent": {
|
||||||
"version": "5.0.1",
|
"version": "5.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
|
||||||
@@ -2843,6 +3194,25 @@
|
|||||||
"node": ">= 6"
|
"node": ">= 6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/httpx": {
|
||||||
|
"version": "2.3.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/httpx/-/httpx-2.3.3.tgz",
|
||||||
|
"integrity": "sha512-k1qv94u1b6e+XKCxVbLgYlOypVP9MPGpnN5G/vxFf6tDO4V3xpz3d6FUOY/s8NtPgaq5RBVVgSB+7IHpVxMYzw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@types/node": "^20",
|
||||||
|
"debug": "^4.1.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/httpx/node_modules/@types/node": {
|
||||||
|
"version": "20.19.43",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.43.tgz",
|
||||||
|
"integrity": "sha512-6oYBAi5ikg4Pl+kGsoYtawUMBT2zZMCvPNF7pVLnHZfd1zf38DRiWn/gT01RYCdUqkv7Fhr+C9ot4/tb+2sVvA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"undici-types": "~6.21.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/iconv-lite": {
|
"node_modules/iconv-lite": {
|
||||||
"version": "0.7.3",
|
"version": "0.7.3",
|
||||||
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz",
|
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz",
|
||||||
@@ -2864,15 +3234,19 @@
|
|||||||
"version": "2.0.4",
|
"version": "2.0.4",
|
||||||
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
|
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
|
||||||
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
|
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
|
||||||
"license": "ISC",
|
"license": "ISC"
|
||||||
"peer": true
|
},
|
||||||
|
"node_modules/ini": {
|
||||||
|
"version": "1.3.8",
|
||||||
|
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
|
||||||
|
"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
|
||||||
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
"node_modules/ip-address": {
|
"node_modules/ip-address": {
|
||||||
"version": "10.2.0",
|
"version": "10.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz",
|
||||||
"integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==",
|
"integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 12"
|
"node": ">= 12"
|
||||||
}
|
}
|
||||||
@@ -2972,6 +3346,15 @@
|
|||||||
"license": "BSD-2-Clause",
|
"license": "BSD-2-Clause",
|
||||||
"peer": true
|
"peer": true
|
||||||
},
|
},
|
||||||
|
"node_modules/kitx": {
|
||||||
|
"version": "2.2.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/kitx/-/kitx-2.2.0.tgz",
|
||||||
|
"integrity": "sha512-tBMwe6AALTBQJb0woQDD40734NKzb0Kzi3k7wQj9ar3AbP9oqhoVrdXPh7rk2r00/glIgd0YbToIUJsnxWMiIg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@types/node": "^22.5.4"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/light-my-request": {
|
"node_modules/light-my-request": {
|
||||||
"version": "6.6.0",
|
"version": "6.6.0",
|
||||||
"resolved": "https://registry.npmjs.org/light-my-request/-/light-my-request-6.6.0.tgz",
|
"resolved": "https://registry.npmjs.org/light-my-request/-/light-my-request-6.6.0.tgz",
|
||||||
@@ -3270,6 +3653,12 @@
|
|||||||
"url": "https://opencollective.com/parcel"
|
"url": "https://opencollective.com/parcel"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/lodash": {
|
||||||
|
"version": "4.18.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
|
||||||
|
"integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/lodash.identity": {
|
"node_modules/lodash.identity": {
|
||||||
"version": "3.0.0",
|
"version": "3.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/lodash.identity/-/lodash.identity-3.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/lodash.identity/-/lodash.identity-3.0.0.tgz",
|
||||||
@@ -3294,6 +3683,15 @@
|
|||||||
"integrity": "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==",
|
"integrity": "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==",
|
||||||
"license": "Apache-2.0"
|
"license": "Apache-2.0"
|
||||||
},
|
},
|
||||||
|
"node_modules/lru-cache": {
|
||||||
|
"version": "11.5.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.2.tgz",
|
||||||
|
"integrity": "sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==",
|
||||||
|
"license": "BlueOak-1.0.0",
|
||||||
|
"engines": {
|
||||||
|
"node": "20 || >=22"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/magic-string": {
|
"node_modules/magic-string": {
|
||||||
"version": "0.30.21",
|
"version": "0.30.21",
|
||||||
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
|
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
|
||||||
@@ -3336,6 +3734,18 @@
|
|||||||
"url": "https://github.com/sponsors/sindresorhus"
|
"url": "https://github.com/sponsors/sindresorhus"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/mime": {
|
||||||
|
"version": "3.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
|
||||||
|
"integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
|
||||||
|
"license": "MIT",
|
||||||
|
"bin": {
|
||||||
|
"mime": "cli.js"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=10.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/mime-db": {
|
"node_modules/mime-db": {
|
||||||
"version": "1.52.0",
|
"version": "1.52.0",
|
||||||
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
|
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
|
||||||
@@ -3357,6 +3767,51 @@
|
|||||||
"node": ">= 0.6"
|
"node": ">= 0.6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/minimatch": {
|
||||||
|
"version": "10.2.5",
|
||||||
|
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
|
||||||
|
"integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
|
||||||
|
"license": "BlueOak-1.0.0",
|
||||||
|
"dependencies": {
|
||||||
|
"brace-expansion": "^5.0.5"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": "18 || 20 || >=22"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sponsors/isaacs"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/minipass": {
|
||||||
|
"version": "7.1.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
|
||||||
|
"integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
|
||||||
|
"license": "BlueOak-1.0.0",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=16 || 14 >=14.17"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/moment": {
|
||||||
|
"version": "2.30.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
|
||||||
|
"integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": "*"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/moment-timezone": {
|
||||||
|
"version": "0.5.48",
|
||||||
|
"resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.48.tgz",
|
||||||
|
"integrity": "sha512-f22b8LV1gbTO2ms2j2z13MuPogNoh5UzxL3nzNAYKGraILnbGc9NEE6dyiiiLv46DGRb8A4kg8UKWLjPthxBHw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"moment": "^2.29.4"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": "*"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/ms": {
|
"node_modules/ms": {
|
||||||
"version": "2.1.3",
|
"version": "2.1.3",
|
||||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
|
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
|
||||||
@@ -3519,6 +3974,22 @@
|
|||||||
"node": ">=8"
|
"node": ">=8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/path-scurry": {
|
||||||
|
"version": "2.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
|
||||||
|
"integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
|
||||||
|
"license": "BlueOak-1.0.0",
|
||||||
|
"dependencies": {
|
||||||
|
"lru-cache": "^11.0.0",
|
||||||
|
"minipass": "^7.1.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": "18 || 20 || >=22"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sponsors/isaacs"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/path-to-regexp": {
|
"node_modules/path-to-regexp": {
|
||||||
"version": "8.4.2",
|
"version": "8.4.2",
|
||||||
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz",
|
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz",
|
||||||
@@ -3976,6 +4447,15 @@
|
|||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true
|
"peer": true
|
||||||
},
|
},
|
||||||
|
"node_modules/sax": {
|
||||||
|
"version": "1.6.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/sax/-/sax-1.6.0.tgz",
|
||||||
|
"integrity": "sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==",
|
||||||
|
"license": "BlueOak-1.0.0",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=11.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/secure-json-parse": {
|
"node_modules/secure-json-parse": {
|
||||||
"version": "4.1.0",
|
"version": "4.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-4.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-4.1.0.tgz",
|
||||||
@@ -4088,8 +4568,7 @@
|
|||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
|
||||||
"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
|
"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
|
||||||
"license": "ISC",
|
"license": "ISC"
|
||||||
"peer": true
|
|
||||||
},
|
},
|
||||||
"node_modules/shebang-command": {
|
"node_modules/shebang-command": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
@@ -4193,6 +4672,50 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
|
"node_modules/sm3": {
|
||||||
|
"version": "1.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/sm3/-/sm3-1.0.3.tgz",
|
||||||
|
"integrity": "sha512-KyFkIfr8QBlFG3uc3NaljaXdYcsbRy1KrSfc4tsQV8jW68jAktGeOcifu530Vx/5LC+PULHT0Rv8LiI8Gw+c1g==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/smart-buffer": {
|
||||||
|
"version": "4.2.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
|
||||||
|
"integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 6.0.0",
|
||||||
|
"npm": ">= 3.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/socks": {
|
||||||
|
"version": "2.8.9",
|
||||||
|
"resolved": "https://registry.npmjs.org/socks/-/socks-2.8.9.tgz",
|
||||||
|
"integrity": "sha512-LJhUYUvItdQ0LkJTmPeaEObWXAqFyfmP85x0tch/ez9cahmhlBBLbIqDFnvBnUJGagb0JbIQrkBs1wJ+yRYpEw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"ip-address": "^10.1.1",
|
||||||
|
"smart-buffer": "^4.2.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 10.0.0",
|
||||||
|
"npm": ">= 3.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/socks-proxy-agent": {
|
||||||
|
"version": "6.2.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz",
|
||||||
|
"integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"agent-base": "^6.0.2",
|
||||||
|
"debug": "^4.3.3",
|
||||||
|
"socks": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 10"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/sonic-boom": {
|
"node_modules/sonic-boom": {
|
||||||
"version": "4.2.1",
|
"version": "4.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-4.2.1.tgz",
|
"resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-4.2.1.tgz",
|
||||||
@@ -4244,7 +4767,6 @@
|
|||||||
"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
|
||||||
"integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
|
"integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 0.8"
|
"node": ">= 0.8"
|
||||||
}
|
}
|
||||||
@@ -4332,7 +4854,6 @@
|
|||||||
"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
|
||||||
"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
|
"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=0.6"
|
"node": ">=0.6"
|
||||||
}
|
}
|
||||||
@@ -4700,6 +5221,28 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/xml2js": {
|
||||||
|
"version": "0.6.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
|
||||||
|
"integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"sax": ">=0.6.0",
|
||||||
|
"xmlbuilder": "~11.0.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=4.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/xmlbuilder": {
|
||||||
|
"version": "11.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
|
||||||
|
"integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=4.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/zod": {
|
"node_modules/zod": {
|
||||||
"version": "4.4.3",
|
"version": "4.4.3",
|
||||||
"resolved": "https://registry.npmjs.org/zod/-/zod-4.4.3.tgz",
|
"resolved": "https://registry.npmjs.org/zod/-/zod-4.4.3.tgz",
|
||||||
|
|||||||
+10
-4
@@ -1,14 +1,18 @@
|
|||||||
{
|
{
|
||||||
"name": "@paradigm/hub",
|
"name": "@paradigm/hub",
|
||||||
"version": "0.0.29",
|
"version": "0.0.36",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=24"
|
"node": ">=24"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@alicloud/credentials": "^2.4.5",
|
||||||
|
"@alicloud/docmind-api20220711": "^1.4.15",
|
||||||
|
"@alicloud/tea-util": "^1.4.11",
|
||||||
"@anthropic-ai/claude-agent-sdk": "^0.3.202",
|
"@anthropic-ai/claude-agent-sdk": "^0.3.202",
|
||||||
"@fastify/cookie": "^11.0.2",
|
"@fastify/cookie": "^11.0.2",
|
||||||
|
"@fastify/static": "^10.1.2",
|
||||||
"@larksuiteoapi/node-sdk": "^1.70.0",
|
"@larksuiteoapi/node-sdk": "^1.70.0",
|
||||||
"@prisma/client": "^6.19.3",
|
"@prisma/client": "^6.19.3",
|
||||||
"ai": "^7.0.16",
|
"ai": "^7.0.16",
|
||||||
@@ -27,10 +31,10 @@
|
|||||||
"axios": "1.18.1"
|
"axios": "1.18.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description": "Curriculum Project Hub — org-scoped Feishu collaboration and confined Agent runtime. Aligns to spec/System through ADR-0024.",
|
"description": "Curriculum Project Hub — org-scoped Feishu collaboration and confined Agent runtime. Semantics pinned by docs/adr/ (ADR-0001 through ADR-0027).",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "npm run prisma:migrate && tsx watch src/server.ts",
|
"dev": "npm run prisma:migrate && tsx watch src/server.ts",
|
||||||
"build": "tsc -p tsconfig.json && npm run admin:build",
|
"build": "tsc -p tsconfig.json && npm run admin:build && npm run filelib:build",
|
||||||
"start": "npm run prisma:migrate && node dist/server.js",
|
"start": "npm run prisma:migrate && node dist/server.js",
|
||||||
"check": "tsc -p tsconfig.json --noEmit",
|
"check": "tsc -p tsconfig.json --noEmit",
|
||||||
"audit:production": "npm audit --omit=dev --audit-level=high",
|
"audit:production": "npm audit --omit=dev --audit-level=high",
|
||||||
@@ -45,6 +49,8 @@
|
|||||||
"test": "vitest run",
|
"test": "vitest run",
|
||||||
"test:watch": "vitest",
|
"test:watch": "vitest",
|
||||||
"admin:dev": "npm run dev --prefix admin-web",
|
"admin:dev": "npm run dev --prefix admin-web",
|
||||||
"admin:build": "npm run build --prefix admin-web"
|
"admin:build": "npm run build --prefix admin-web",
|
||||||
|
"filelib:dev": "npm run dev --prefix filelib-web",
|
||||||
|
"filelib:build": "npm run build --prefix filelib-web"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
-- ADR-0023 rejected the legacy `PlatformRoleAssignment` / `PlatformRole`{ADMIN,TEACHER}
|
-- ADR-0023 rejected the legacy `PlatformRoleAssignment` / `PlatformRole`{ADMIN,TEACHER}
|
||||||
-- model: the platform administration control plane is a separate identity/session/
|
-- model: the platform administration control plane is a separate identity/session/
|
||||||
-- audit surface (see `Spec.System.PlatformAdministration`), intentionally not built
|
-- audit surface, intentionally not built
|
||||||
-- in alpha (ADR-0025, `hub/deploy/README.md`). The legacy table has no runtime
|
-- in alpha (ADR-0025, `hub/deploy/README.md`). The legacy table has no runtime
|
||||||
-- reader — no guard, route, or service queries it for an authorization decision —
|
-- reader — no guard, route, or service queries it for an authorization decision —
|
||||||
-- and ADR-0023 requires it to be migrated/replaced before the platform panel ships.
|
-- and ADR-0023 requires it to be migrated/replaced before the platform panel ships.
|
||||||
|
|||||||
@@ -0,0 +1,64 @@
|
|||||||
|
-- ADR-0026: append-only UsageFact ledger. AgentRun.costUsd/inputTokens/
|
||||||
|
-- outputTokens become a derived rollup cache; the truth is in UsageFact.
|
||||||
|
|
||||||
|
CREATE TABLE "UsageFact" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"runId" TEXT NOT NULL,
|
||||||
|
"occurredAt" TIMESTAMP(3) NOT NULL,
|
||||||
|
"kind" TEXT NOT NULL,
|
||||||
|
"provider" TEXT NOT NULL,
|
||||||
|
"model" TEXT,
|
||||||
|
"inputTokens" INTEGER,
|
||||||
|
"outputTokens" INTEGER,
|
||||||
|
"quantity" DECIMAL(18, 6),
|
||||||
|
"unit" TEXT,
|
||||||
|
"costUsd" DECIMAL(18, 8),
|
||||||
|
"costSource" TEXT NOT NULL,
|
||||||
|
"capabilityId" TEXT,
|
||||||
|
"correlationId" TEXT,
|
||||||
|
"metadata" JSONB NOT NULL,
|
||||||
|
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
CONSTRAINT "UsageFact_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX "UsageFact_runId_occurredAt_idx" ON "UsageFact"("runId", "occurredAt");
|
||||||
|
CREATE INDEX "UsageFact_runId_kind_idx" ON "UsageFact"("runId", "kind");
|
||||||
|
CREATE INDEX "UsageFact_provider_model_occurredAt_idx"
|
||||||
|
ON "UsageFact"("provider", "model", "occurredAt");
|
||||||
|
CREATE INDEX "UsageFact_capabilityId_occurredAt_idx"
|
||||||
|
ON "UsageFact"("capabilityId", "occurredAt");
|
||||||
|
|
||||||
|
ALTER TABLE "UsageFact"
|
||||||
|
ADD CONSTRAINT "UsageFact_runId_fkey"
|
||||||
|
FOREIGN KEY ("runId") REFERENCES "AgentRun"("id")
|
||||||
|
ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- Backfill: one synthetic model_completion fact per AgentRun that has any
|
||||||
|
-- recorded usage (cost or tokens). correlationId = run id marks these as
|
||||||
|
-- backfill artefacts (real facts use an external correlation id or null).
|
||||||
|
-- Runs with no recorded usage stay fact-less and remain runsWithoutCost,
|
||||||
|
-- matching ADR-0022's "missing cost ≠ zero" rule and the pre-existing
|
||||||
|
-- migration 20260709143000_agent_run_cost_tracking's "no backfill for the
|
||||||
|
-- truly unrecorded" stance.
|
||||||
|
INSERT INTO "UsageFact" (
|
||||||
|
"id", "runId", "occurredAt", "kind", "provider", "model",
|
||||||
|
"inputTokens", "outputTokens", "costUsd", "costSource",
|
||||||
|
"correlationId", "metadata"
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
'usagefact_backfill_' || "AgentRun"."id",
|
||||||
|
"AgentRun"."id",
|
||||||
|
COALESCE("AgentRun"."finishedAt", "AgentRun"."startedAt", CURRENT_TIMESTAMP),
|
||||||
|
'model_completion',
|
||||||
|
"AgentRun"."provider",
|
||||||
|
"AgentRun"."model",
|
||||||
|
"AgentRun"."inputTokens",
|
||||||
|
"AgentRun"."outputTokens",
|
||||||
|
"AgentRun"."costUsd",
|
||||||
|
COALESCE("AgentRun"."costSource", 'unknown'),
|
||||||
|
"AgentRun"."id",
|
||||||
|
'{}'::jsonb
|
||||||
|
FROM "AgentRun"
|
||||||
|
WHERE "AgentRun"."costUsd" IS NOT NULL
|
||||||
|
OR "AgentRun"."inputTokens" IS NOT NULL
|
||||||
|
OR "AgentRun"."outputTokens" IS NOT NULL;
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
-- ADR-0027: org-scoped capability connections for external document/media
|
||||||
|
-- transforms (PDF→MD, audio/video→text, …). Mirrors the Feishu Application
|
||||||
|
-- Connection shape: reuses the ADR-0024 envelope machinery with its own
|
||||||
|
-- payload schema and readiness probe, distinct from the model-provider
|
||||||
|
-- connection.
|
||||||
|
|
||||||
|
CREATE TABLE "OrganizationCapabilityConnection" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"organizationId" TEXT NOT NULL,
|
||||||
|
"capabilityId" TEXT NOT NULL,
|
||||||
|
"status" "OrganizationConnectionStatus" NOT NULL DEFAULT 'DRAFT',
|
||||||
|
"activeSecretVersionId" TEXT,
|
||||||
|
"activatedAt" TIMESTAMP(3),
|
||||||
|
"disabledAt" TIMESTAMP(3),
|
||||||
|
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"updatedAt" TIMESTAMP(3) NOT NULL,
|
||||||
|
CONSTRAINT "OrganizationCapabilityConnection_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE UNIQUE INDEX "OrganizationCapabilityConnection_organizationId_capabilityId_key"
|
||||||
|
ON "OrganizationCapabilityConnection"("organizationId", "capabilityId");
|
||||||
|
CREATE UNIQUE INDEX "OrganizationCapabilityConnection_activeSecretVersionId_key"
|
||||||
|
ON "OrganizationCapabilityConnection"("activeSecretVersionId");
|
||||||
|
CREATE INDEX "OrganizationCapabilityConnection_organizationId_status_idx"
|
||||||
|
ON "OrganizationCapabilityConnection"("organizationId", "status");
|
||||||
|
CREATE INDEX "OrganizationCapabilityConnection_capabilityId_status_idx"
|
||||||
|
ON "OrganizationCapabilityConnection"("capabilityId", "status");
|
||||||
|
|
||||||
|
CREATE TABLE "CapabilityCredentialVersion" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"connectionId" TEXT NOT NULL,
|
||||||
|
"version" INTEGER NOT NULL,
|
||||||
|
"envelopeVersion" INTEGER NOT NULL DEFAULT 1,
|
||||||
|
"keyId" TEXT NOT NULL,
|
||||||
|
"envelope" JSONB NOT NULL,
|
||||||
|
"createdByUserId" TEXT,
|
||||||
|
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"retiredAt" TIMESTAMP(3),
|
||||||
|
CONSTRAINT "CapabilityCredentialVersion_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE UNIQUE INDEX "CapabilityCredentialVersion_connectionId_version_key"
|
||||||
|
ON "CapabilityCredentialVersion"("connectionId", "version");
|
||||||
|
CREATE INDEX "CapabilityCredentialVersion_connectionId_retiredAt_idx"
|
||||||
|
ON "CapabilityCredentialVersion"("connectionId", "retiredAt");
|
||||||
|
CREATE INDEX "CapabilityCredentialVersion_keyId_idx"
|
||||||
|
ON "CapabilityCredentialVersion"("keyId");
|
||||||
|
CREATE INDEX "CapabilityCredentialVersion_createdByUserId_idx"
|
||||||
|
ON "CapabilityCredentialVersion"("createdByUserId");
|
||||||
|
|
||||||
|
ALTER TABLE "OrganizationCapabilityConnection"
|
||||||
|
ADD CONSTRAINT "OrganizationCapabilityConnection_organizationId_fkey"
|
||||||
|
FOREIGN KEY ("organizationId") REFERENCES "Organization"("id")
|
||||||
|
ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
ALTER TABLE "OrganizationCapabilityConnection"
|
||||||
|
ADD CONSTRAINT "OrganizationCapabilityConnection_activeSecretVersionId_fkey"
|
||||||
|
FOREIGN KEY ("activeSecretVersionId") REFERENCES "CapabilityCredentialVersion"("id")
|
||||||
|
ON DELETE RESTRICT ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
ALTER TABLE "CapabilityCredentialVersion"
|
||||||
|
ADD CONSTRAINT "CapabilityCredentialVersion_connectionId_fkey"
|
||||||
|
FOREIGN KEY ("connectionId") REFERENCES "OrganizationCapabilityConnection"("id")
|
||||||
|
ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
ALTER TABLE "CapabilityCredentialVersion"
|
||||||
|
ADD CONSTRAINT "CapabilityCredentialVersion_createdByUserId_fkey"
|
||||||
|
FOREIGN KEY ("createdByUserId") REFERENCES "User"("id")
|
||||||
|
ON DELETE SET NULL ON UPDATE CASCADE;
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
-- File library (文件库) — 语义锚定:仓库根《文件库-接口契约.md》、.omo/文件库-开工计划.md (D11–D19)。
|
||||||
|
-- 本地无 PG 时手写;有 PG 后可用 `prisma migrate diff` 核对与 schema 的一致性。
|
||||||
|
|
||||||
|
-- CreateEnum
|
||||||
|
CREATE TYPE "FileLibNodeKind" AS ENUM ('FOLDER', 'PROJECT');
|
||||||
|
CREATE TYPE "FileLibProvisionStatus" AS ENUM ('PROVISIONING', 'READY', 'FAILED');
|
||||||
|
CREATE TYPE "FileLibRole" AS ENUM ('VIEW', 'EDIT', 'MANAGE');
|
||||||
|
CREATE TYPE "FileLibPrincipalType" AS ENUM ('USER', 'GROUP');
|
||||||
|
CREATE TYPE "FileLibExportStatus" AS ENUM ('QUEUED', 'RUNNING', 'DONE', 'FAILED');
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "FileLibNode" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"organizationId" TEXT NOT NULL,
|
||||||
|
"parentId" TEXT,
|
||||||
|
"kind" "FileLibNodeKind" NOT NULL,
|
||||||
|
"name" TEXT NOT NULL,
|
||||||
|
"nameLower" TEXT NOT NULL,
|
||||||
|
"pathIds" TEXT NOT NULL,
|
||||||
|
"creatorId" TEXT NOT NULL,
|
||||||
|
"provisionStatus" "FileLibProvisionStatus" NOT NULL DEFAULT 'READY',
|
||||||
|
"storageDir" TEXT,
|
||||||
|
"deletedAt" TIMESTAMP(3),
|
||||||
|
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"updatedAt" TIMESTAMP(3) NOT NULL,
|
||||||
|
|
||||||
|
CONSTRAINT "FileLibNode_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE "FileLibGrant" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"organizationId" TEXT NOT NULL,
|
||||||
|
"nodeId" TEXT NOT NULL,
|
||||||
|
"principalType" "FileLibPrincipalType" NOT NULL,
|
||||||
|
"principalId" TEXT NOT NULL,
|
||||||
|
"role" "FileLibRole" NOT NULL,
|
||||||
|
"isCreatorGrant" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
"createdByUserId" TEXT,
|
||||||
|
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"revokedAt" TIMESTAMP(3),
|
||||||
|
|
||||||
|
CONSTRAINT "FileLibGrant_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE "FileLibProjectSettings" (
|
||||||
|
"nodeId" TEXT NOT NULL,
|
||||||
|
"independentPermissionsEnabled" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
|
||||||
|
CONSTRAINT "FileLibProjectSettings_pkey" PRIMARY KEY ("nodeId")
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE "FileLibExportJob" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"organizationId" TEXT NOT NULL,
|
||||||
|
"nodeId" TEXT NOT NULL,
|
||||||
|
"target" TEXT NOT NULL,
|
||||||
|
"params" JSONB NOT NULL,
|
||||||
|
"status" "FileLibExportStatus" NOT NULL DEFAULT 'QUEUED',
|
||||||
|
"downloadUrl" TEXT,
|
||||||
|
"error" TEXT,
|
||||||
|
"createdByUserId" TEXT NOT NULL,
|
||||||
|
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"updatedAt" TIMESTAMP(3) NOT NULL,
|
||||||
|
|
||||||
|
CONSTRAINT "FileLibExportJob_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- CreateIndex (schema-declared)
|
||||||
|
CREATE INDEX "FileLibNode_organizationId_parentId_deletedAt_idx" ON "FileLibNode"("organizationId", "parentId", "deletedAt");
|
||||||
|
CREATE INDEX "FileLibNode_organizationId_pathIds_idx" ON "FileLibNode"("organizationId", "pathIds");
|
||||||
|
CREATE INDEX "FileLibNode_creatorId_idx" ON "FileLibNode"("creatorId");
|
||||||
|
CREATE INDEX "FileLibGrant_organizationId_revokedAt_idx" ON "FileLibGrant"("organizationId", "revokedAt");
|
||||||
|
CREATE INDEX "FileLibGrant_principalType_principalId_revokedAt_idx" ON "FileLibGrant"("principalType", "principalId", "revokedAt");
|
||||||
|
CREATE INDEX "FileLibGrant_nodeId_revokedAt_idx" ON "FileLibGrant"("nodeId", "revokedAt");
|
||||||
|
CREATE INDEX "FileLibExportJob_organizationId_status_idx" ON "FileLibExportJob"("organizationId", "status");
|
||||||
|
|
||||||
|
-- D14:活跃兄弟节点大小写不敏感唯一。root 的 parentId 为 NULL,用 COALESCE 归入同一键空间。
|
||||||
|
CREATE UNIQUE INDEX "FileLibNode_active_sibling_name_key"
|
||||||
|
ON "FileLibNode"("organizationId", COALESCE("parentId", ''), "nameLower")
|
||||||
|
WHERE "deletedAt" IS NULL;
|
||||||
|
|
||||||
|
-- 契约 2.3:同一节点上同一 principal 至多一条活跃授权(Postgres 原生 UNIQUE 无法约束 NULL revokedAt)。
|
||||||
|
CREATE UNIQUE INDEX "FileLibGrant_active_unique"
|
||||||
|
ON "FileLibGrant"("nodeId", "principalType", "principalId")
|
||||||
|
WHERE "revokedAt" IS NULL;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "FileLibNode" ADD CONSTRAINT "FileLibNode_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
ALTER TABLE "FileLibNode" ADD CONSTRAINT "FileLibNode_parentId_fkey" FOREIGN KEY ("parentId") REFERENCES "FileLibNode"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
|
||||||
|
ALTER TABLE "FileLibGrant" ADD CONSTRAINT "FileLibGrant_nodeId_fkey" FOREIGN KEY ("nodeId") REFERENCES "FileLibNode"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
ALTER TABLE "FileLibProjectSettings" ADD CONSTRAINT "FileLibProjectSettings_nodeId_fkey" FOREIGN KEY ("nodeId") REFERENCES "FileLibNode"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
ALTER TABLE "FileLibExportJob" ADD CONSTRAINT "FileLibExportJob_nodeId_fkey" FOREIGN KEY ("nodeId") REFERENCES "FileLibNode"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
-- 为 FileLibNode 加简介字段,老师在创建/概览页填写。
|
||||||
|
ALTER TABLE "FileLibNode" ADD COLUMN "description" TEXT;
|
||||||
+237
-6
@@ -1,6 +1,6 @@
|
|||||||
// Prisma schema for Curriculum Project Hub.
|
// Prisma schema for Curriculum Project Hub.
|
||||||
//
|
//
|
||||||
// Aligns to spec/System (ADR-0001..0004, 0017). Key divergences from the
|
// Aligns to ADR-0001..0004, 0017. Key divergences from the
|
||||||
// legacy teaching-material-host-service schema, each deliberate:
|
// legacy teaching-material-host-service schema, each deliberate:
|
||||||
//
|
//
|
||||||
// - AgentSession is provider/model-bound. Provider runtime cursors such as
|
// - AgentSession is provider/model-bound. Provider runtime cursors such as
|
||||||
@@ -11,8 +11,8 @@
|
|||||||
// - ProjectGroupBinding is project→chat only (ADR-0001 1:1); legacy mixed
|
// - ProjectGroupBinding is project→chat only (ADR-0001 1:1); legacy mixed
|
||||||
// user/chat targets into one binding table.
|
// user/chat targets into one binding table.
|
||||||
// - PermissionGrant + PermissionSettings land (ADR-0004), missing in legacy.
|
// - PermissionGrant + PermissionSettings land (ADR-0004), missing in legacy.
|
||||||
// - AgentRunStatus adds WAITING_FOR_USER + TIMED_OUT (spec RunState; enum
|
// - AgentRunStatus adds WAITING_FOR_USER + TIMED_OUT (the run-state set is
|
||||||
// completeness OPEN — add states without a schema migration war).
|
// open — add states without a schema migration war).
|
||||||
|
|
||||||
generator client {
|
generator client {
|
||||||
provider = "prisma-client-js"
|
provider = "prisma-client-js"
|
||||||
@@ -44,11 +44,13 @@ model Organization {
|
|||||||
externalDirectoryConnections ExternalDirectoryConnection[]
|
externalDirectoryConnections ExternalDirectoryConnection[]
|
||||||
providerConnections OrganizationProviderConnection[]
|
providerConnections OrganizationProviderConnection[]
|
||||||
feishuApplicationConnection OrganizationFeishuApplicationConnection?
|
feishuApplicationConnection OrganizationFeishuApplicationConnection?
|
||||||
|
capabilityConnections OrganizationCapabilityConnection[]
|
||||||
agentSkills OrganizationAgentSkill[]
|
agentSkills OrganizationAgentSkill[]
|
||||||
agentRoles OrganizationAgentRole[]
|
agentRoles OrganizationAgentRole[]
|
||||||
projectGroupBindings ProjectGroupBinding[]
|
projectGroupBindings ProjectGroupBinding[]
|
||||||
auditEntries AuditEntry[] @relation("organizationAudit")
|
auditEntries AuditEntry[] @relation("organizationAudit")
|
||||||
projectSearchDocuments ProjectSearchDocument[]
|
projectSearchDocuments ProjectSearchDocument[]
|
||||||
|
fileLibNodes FileLibNode[]
|
||||||
|
|
||||||
@@index([status])
|
@@index([status])
|
||||||
}
|
}
|
||||||
@@ -60,7 +62,7 @@ enum OrganizationStatus {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Org-scoped membership role. Distinct from project PermissionRole and from
|
/// Org-scoped membership role. Distinct from project PermissionRole and from
|
||||||
/// the platform administrator surface (ADR-0023 / Spec.System.PlatformAdministration),
|
/// the platform administrator surface (ADR-0023),
|
||||||
/// which is a separate control plane not modeled in alpha (ADR-0025).
|
/// which is a separate control plane not modeled in alpha (ADR-0025).
|
||||||
model OrganizationMembership {
|
model OrganizationMembership {
|
||||||
id String @id @default(cuid())
|
id String @id @default(cuid())
|
||||||
@@ -198,6 +200,7 @@ model User {
|
|||||||
auditEntries AuditEntry[] @relation("auditActor")
|
auditEntries AuditEntry[] @relation("auditActor")
|
||||||
providerCredentialVersions ProviderCredentialVersion[] @relation("providerCredentialVersionCreator")
|
providerCredentialVersions ProviderCredentialVersion[] @relation("providerCredentialVersionCreator")
|
||||||
feishuCredentialVersions FeishuApplicationCredentialVersion[] @relation("feishuCredentialVersionCreator")
|
feishuCredentialVersions FeishuApplicationCredentialVersion[] @relation("feishuCredentialVersionCreator")
|
||||||
|
capabilityCredentialVersions CapabilityCredentialVersion[] @relation("capabilityCredentialVersionCreator")
|
||||||
feishuIdentities FeishuUserIdentity[]
|
feishuIdentities FeishuUserIdentity[]
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -596,9 +599,13 @@ model AgentRun {
|
|||||||
summary String?
|
summary String?
|
||||||
inputTokens Int?
|
inputTokens Int?
|
||||||
outputTokens Int?
|
outputTokens Int?
|
||||||
/// Provider/gateway-reported cost in USD. Null means this run has no trusted cost fact.
|
/// ADR-0026: derived rollup cache of UsageFact rows for this run. The truth
|
||||||
|
/// is in UsageFact; this column is convenience for existing readers. Null
|
||||||
|
/// means this run has no trusted cost fact (ADR-0022: missing cost ≠ zero).
|
||||||
costUsd Decimal? @db.Decimal(18, 8)
|
costUsd Decimal? @db.Decimal(18, 8)
|
||||||
/// Semantic source of costUsd, e.g. provider_reported. Not a pricing-estimate fallback.
|
/// ADR-0026: semantic source of the rolled-up costUsd (provider_reported |
|
||||||
|
/// pricebook_derived | unknown). Mirrors the dominant CostSource of the
|
||||||
|
/// run's facts; not a pricing-estimate fallback.
|
||||||
costSource String?
|
costSource String?
|
||||||
metadata Json
|
metadata Json
|
||||||
error String?
|
error String?
|
||||||
@@ -612,6 +619,7 @@ model AgentRun {
|
|||||||
projectLock ProjectAgentLock?
|
projectLock ProjectAgentLock?
|
||||||
messages AgentMessage[] @relation("runMessages")
|
messages AgentMessage[] @relation("runMessages")
|
||||||
fileChanges AgentFileChange[] @relation("runFileChanges")
|
fileChanges AgentFileChange[] @relation("runFileChanges")
|
||||||
|
usageFacts UsageFact[] @relation("runUsageFacts")
|
||||||
|
|
||||||
@@index([projectId, status])
|
@@index([projectId, status])
|
||||||
@@index([projectId, finishedAt])
|
@@index([projectId, finishedAt])
|
||||||
@@ -817,3 +825,226 @@ model AgentFileChange {
|
|||||||
@@index([projectId])
|
@@index([projectId])
|
||||||
@@index([path])
|
@@index([path])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// --- Usage fact ledger (ADR-0026) ----------------------------------------
|
||||||
|
|
||||||
|
/// ADR-0026: one billable consumption event inside an AgentRun. Append-only;
|
||||||
|
/// the run's AgentRun.costUsd/inputTokens/outputTokens are a derived rollup
|
||||||
|
/// of these rows, not the truth. kind=external_capability carries capabilityId
|
||||||
|
/// for media transforms (PDF→MD, audio/video→text, …). costUsd=null means
|
||||||
|
/// unknown, not zero (ADR-0022). The kind set is OPEN: new kinds must be
|
||||||
|
/// surfaced, not silently folded in.
|
||||||
|
model UsageFact {
|
||||||
|
id String @id @default(cuid())
|
||||||
|
runId String
|
||||||
|
/// When the consumption happened. Pricebook derivation uses this, not
|
||||||
|
/// AgentRun.finishedAt, because an external capability may finish before
|
||||||
|
/// the run ends.
|
||||||
|
occurredAt DateTime
|
||||||
|
/// model_completion | external_capability | tool_proxy. OPEN set.
|
||||||
|
kind String
|
||||||
|
/// e.g. openrouter, mineru, openai_whisper.
|
||||||
|
provider String
|
||||||
|
model String?
|
||||||
|
inputTokens Int?
|
||||||
|
outputTokens Int?
|
||||||
|
/// Non-token meter (pages, audio_seconds, invocations). Coexists with tokens.
|
||||||
|
quantity Decimal? @db.Decimal(18, 6)
|
||||||
|
unit String?
|
||||||
|
/// USD. Null = unknown, NOT zero (ADR-0022). When null, costSource=unknown.
|
||||||
|
costUsd Decimal? @db.Decimal(18, 8)
|
||||||
|
/// provider_reported | pricebook_derived | unknown. Required even when
|
||||||
|
/// costUsd is null, so a reader can distinguish "reported zero" from
|
||||||
|
/// "no report at all".
|
||||||
|
costSource String
|
||||||
|
/// For kind=external_capability, the registered capability id
|
||||||
|
/// (e.g. pdf_to_md_bundle, audio_video_to_text). Null for model_completion.
|
||||||
|
capabilityId String?
|
||||||
|
/// External request id for reconciliation / idempotency. Not an aggregation key.
|
||||||
|
correlationId String?
|
||||||
|
metadata Json
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
|
||||||
|
run AgentRun @relation("runUsageFacts", fields: [runId], references: [id], onDelete: Cascade)
|
||||||
|
|
||||||
|
@@index([runId, occurredAt])
|
||||||
|
@@index([runId, kind])
|
||||||
|
@@index([provider, model, occurredAt])
|
||||||
|
@@index([capabilityId, occurredAt])
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- External capability connections (ADR-0027) -------------------------
|
||||||
|
|
||||||
|
/// ADR-0027: org-scoped credential connection for an external capability
|
||||||
|
/// (PDF→MD, audio/video→text, …). Structurally mirrors the Feishu Application
|
||||||
|
/// Connection: reuses the ADR-0024 envelope (KEK→DEK→AES-256-GCM, AAD-bound)
|
||||||
|
/// but has its own payload schema and readiness probe, distinct from the
|
||||||
|
/// model-provider connection. Unique by (organizationId, capabilityId).
|
||||||
|
model OrganizationCapabilityConnection {
|
||||||
|
id String @id @default(cuid())
|
||||||
|
organizationId String
|
||||||
|
capabilityId String
|
||||||
|
status OrganizationConnectionStatus @default(DRAFT)
|
||||||
|
activeSecretVersionId String? @unique
|
||||||
|
activatedAt DateTime?
|
||||||
|
disabledAt DateTime?
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
updatedAt DateTime @updatedAt
|
||||||
|
|
||||||
|
organization Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade)
|
||||||
|
secretVersions CapabilityCredentialVersion[] @relation("capabilityCredentialVersions")
|
||||||
|
activeSecretVersion CapabilityCredentialVersion? @relation("activeCapabilityCredentialVersion", fields: [activeSecretVersionId], references: [id], onDelete: Restrict)
|
||||||
|
|
||||||
|
@@unique([organizationId, capabilityId])
|
||||||
|
@@index([organizationId, status])
|
||||||
|
@@index([capabilityId, status])
|
||||||
|
}
|
||||||
|
|
||||||
|
/// ADR-0024/0027: one immutable authenticated envelope per capability secret
|
||||||
|
/// version. Same encryption machinery as Provider/Feishu credential versions;
|
||||||
|
/// the payload inside is CapabilitySecretPayloadV1 (baseUrl, apiToken,
|
||||||
|
/// optional projectId).
|
||||||
|
model CapabilityCredentialVersion {
|
||||||
|
id String @id @default(cuid())
|
||||||
|
connectionId String
|
||||||
|
version Int
|
||||||
|
envelopeVersion Int @default(1)
|
||||||
|
keyId String
|
||||||
|
envelope Json
|
||||||
|
createdByUserId String?
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
retiredAt DateTime?
|
||||||
|
|
||||||
|
connection OrganizationCapabilityConnection @relation("capabilityCredentialVersions", fields: [connectionId], references: [id], onDelete: Cascade)
|
||||||
|
activeFor OrganizationCapabilityConnection? @relation("activeCapabilityCredentialVersion")
|
||||||
|
createdBy User? @relation("capabilityCredentialVersionCreator", fields: [createdByUserId], references: [id], onDelete: SetNull)
|
||||||
|
|
||||||
|
@@unique([connectionId, version])
|
||||||
|
@@index([connectionId, retiredAt])
|
||||||
|
@@index([keyId])
|
||||||
|
@@index([createdByUserId])
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- File library (文件库) -------------------------------------------------
|
||||||
|
//
|
||||||
|
// 独立模块,语义由仓库根《文件库-接口契约.md》(C/D 编号)与 .omo/文件库-开工计划.md
|
||||||
|
// (D11–D19)锚定。与上面的 Folder/Project(hub 自己的 explorer,ADR-0021)是两套
|
||||||
|
// 体系,不复用、不互相引用。
|
||||||
|
|
||||||
|
/// 文件库目录树节点:文件夹(容器)或项目(叶子,关联 git 仓库)。
|
||||||
|
/// parentId 是树的权威关系;pathIds 是 id 编码的物化路径(派生),随 create/move
|
||||||
|
/// 在事务内维护(计划 D12;name 不入路径,rename 不重写后代)。
|
||||||
|
model FileLibNode {
|
||||||
|
id String @id
|
||||||
|
organizationId String
|
||||||
|
parentId String?
|
||||||
|
kind FileLibNodeKind
|
||||||
|
name String
|
||||||
|
/// D14:NFC+trim 的小写形式;活跃兄弟节点大小写不敏感唯一(部分唯一索引在迁移 SQL)。
|
||||||
|
nameLower String
|
||||||
|
/// id 编码物化路径,形如 "/rootId/childId/selfId"。祖先展开与前缀查询都用它。
|
||||||
|
pathIds String
|
||||||
|
/// D11:创建者不可变,自动持有 isCreatorGrant=true 的 MANAGE grant。
|
||||||
|
/// 故意不建 FK:这是不可变历史事实,不随 User 生命周期变化。
|
||||||
|
creatorId String
|
||||||
|
/// 老师可填写的简介,创建/概览页展示,通俗易懂地说明这个节点的用途。
|
||||||
|
description String?
|
||||||
|
/// 项目 provisioning 状态机(DB/git 双写协调,Metis 风险#1);文件夹恒 READY。
|
||||||
|
provisionStatus FileLibProvisionStatus @default(READY)
|
||||||
|
/// 项目仓库目录(绝对路径);文件夹为 null。
|
||||||
|
storageDir String?
|
||||||
|
deletedAt DateTime?
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
updatedAt DateTime @updatedAt
|
||||||
|
|
||||||
|
organization Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade)
|
||||||
|
parent FileLibNode? @relation("fileLibTree", fields: [parentId], references: [id], onDelete: Restrict)
|
||||||
|
children FileLibNode[] @relation("fileLibTree")
|
||||||
|
grants FileLibGrant[]
|
||||||
|
projectSettings FileLibProjectSettings?
|
||||||
|
exportJobs FileLibExportJob[]
|
||||||
|
|
||||||
|
@@index([organizationId, parentId, deletedAt])
|
||||||
|
@@index([organizationId, pathIds])
|
||||||
|
@@index([creatorId])
|
||||||
|
}
|
||||||
|
|
||||||
|
enum FileLibNodeKind {
|
||||||
|
FOLDER
|
||||||
|
PROJECT
|
||||||
|
}
|
||||||
|
|
||||||
|
enum FileLibProvisionStatus {
|
||||||
|
PROVISIONING
|
||||||
|
READY
|
||||||
|
FAILED
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 文件库权限级别:MANAGE > EDIT > VIEW(契约 2.2,只取最高、无降权)。
|
||||||
|
enum FileLibRole {
|
||||||
|
VIEW
|
||||||
|
EDIT
|
||||||
|
MANAGE
|
||||||
|
}
|
||||||
|
|
||||||
|
enum FileLibPrincipalType {
|
||||||
|
USER
|
||||||
|
GROUP
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 契约 2.3:grant 直接挂在节点上,最终权限 = max(个人, 递归 Group, 祖先继承)。
|
||||||
|
/// 活跃授权唯一性由迁移里的部分唯一索引保证(revokedAt IS NULL)。
|
||||||
|
model FileLibGrant {
|
||||||
|
id String @id @default(cuid())
|
||||||
|
organizationId String
|
||||||
|
nodeId String
|
||||||
|
principalType FileLibPrincipalType
|
||||||
|
principalId String
|
||||||
|
role FileLibRole
|
||||||
|
/// D11:创建者自动 grant;独立权限开关关闭时,项目级 grant 里只有它仍生效。
|
||||||
|
isCreatorGrant Boolean @default(false)
|
||||||
|
createdByUserId String?
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
revokedAt DateTime?
|
||||||
|
|
||||||
|
node FileLibNode @relation(fields: [nodeId], references: [id], onDelete: Cascade)
|
||||||
|
|
||||||
|
@@index([organizationId, revokedAt])
|
||||||
|
@@index([principalType, principalId, revokedAt])
|
||||||
|
@@index([nodeId, revokedAt])
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 契约 P5/D11:项目独立权限开关。默认关闭(仅继承);关闭时项目级非创建者
|
||||||
|
/// grant 冻结不删除,重新开启即恢复。
|
||||||
|
model FileLibProjectSettings {
|
||||||
|
nodeId String @id
|
||||||
|
independentPermissionsEnabled Boolean @default(false)
|
||||||
|
|
||||||
|
node FileLibNode @relation(fields: [nodeId], references: [id], onDelete: Cascade)
|
||||||
|
}
|
||||||
|
|
||||||
|
enum FileLibExportStatus {
|
||||||
|
QUEUED
|
||||||
|
RUNNING
|
||||||
|
DONE
|
||||||
|
FAILED
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 契约 D10:导出为异步任务。外部导出工具参数 OPEN-6,adapter 就位前先建模型。
|
||||||
|
model FileLibExportJob {
|
||||||
|
id String @id @default(cuid())
|
||||||
|
organizationId String
|
||||||
|
nodeId String
|
||||||
|
target String
|
||||||
|
params Json
|
||||||
|
status FileLibExportStatus @default(QUEUED)
|
||||||
|
downloadUrl String?
|
||||||
|
error String?
|
||||||
|
createdByUserId String
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
updatedAt DateTime @updatedAt
|
||||||
|
|
||||||
|
node FileLibNode @relation(fields: [nodeId], references: [id], onDelete: Cascade)
|
||||||
|
|
||||||
|
@@index([organizationId, status])
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,89 @@
|
|||||||
|
/**
|
||||||
|
* Smoke test: real Aliyun docmind API call using createReadStream.
|
||||||
|
* Run: node --experimental-strip-types scripts/smoke-docmind.ts <pdf-path>
|
||||||
|
*/
|
||||||
|
import DocmindClient from "@alicloud/docmind-api20220711";
|
||||||
|
import { RuntimeOptions } from "@alicloud/tea-util";
|
||||||
|
import { createReadStream } from "node:fs";
|
||||||
|
import { basename } from "node:path";
|
||||||
|
|
||||||
|
const accessKeyId = process.env["ALIBABA_CLOUD_ACCESS_KEY_ID"];
|
||||||
|
const accessKeySecret = process.env["ALIBABA_CLOUD_ACCESS_KEY_SECRET"];
|
||||||
|
if (accessKeyId === undefined || accessKeySecret === undefined) {
|
||||||
|
console.error("Set ALIBABA_CLOUD_ACCESS_KEY_ID and ALIBABA_CLOUD_ACCESS_KEY_SECRET env vars.");
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
const pdfPath = process.argv[2] ?? "../examples/trial/prime_sieve.pdf";
|
||||||
|
console.log(`Parsing: ${pdfPath}`);
|
||||||
|
|
||||||
|
const client = new DocmindClient.default({
|
||||||
|
endpoint: "docmind-api.cn-hangzhou.aliyuncs.com",
|
||||||
|
accessKeyId,
|
||||||
|
accessKeySecret,
|
||||||
|
type: "access_key",
|
||||||
|
regionId: "cn-hangzhou",
|
||||||
|
} as never);
|
||||||
|
|
||||||
|
const fileStream = createReadStream(pdfPath);
|
||||||
|
const runtime = new RuntimeOptions({});
|
||||||
|
|
||||||
|
console.log("Submitting job...");
|
||||||
|
const submitResp = await client.submitDocParserJobAdvance(
|
||||||
|
new DocmindClient.SubmitDocParserJobAdvanceRequest({
|
||||||
|
fileUrlObject: fileStream,
|
||||||
|
fileName: basename(pdfPath),
|
||||||
|
outputFormat: ["markdown"],
|
||||||
|
formulaEnhancement: true,
|
||||||
|
}),
|
||||||
|
runtime,
|
||||||
|
);
|
||||||
|
const jobId = submitResp.body?.data?.id;
|
||||||
|
console.log("Job ID:", jobId);
|
||||||
|
|
||||||
|
if (jobId === undefined) {
|
||||||
|
console.error("No job id:", JSON.stringify(submitResp.body));
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("Polling...");
|
||||||
|
const deadline = Date.now() + 5 * 60_000;
|
||||||
|
let status = "";
|
||||||
|
let markdownUrl = "";
|
||||||
|
let pageCount = 0;
|
||||||
|
while (Date.now() < deadline) {
|
||||||
|
await new Promise((r) => setTimeout(r, 10_000));
|
||||||
|
const resp = await client.queryDocParserStatus(
|
||||||
|
new DocmindClient.QueryDocParserStatusRequest({ id: jobId }),
|
||||||
|
);
|
||||||
|
const data = (resp.body as { data?: { status?: string; pageCountEstimate?: number; outputFormatResult?: Array<{ outputFileUrl?: string; outputType?: string }> } }).data;
|
||||||
|
status = data?.status ?? "";
|
||||||
|
console.log(` status: ${status}`);
|
||||||
|
if (status === "success") {
|
||||||
|
const md = data?.outputFormatResult?.find((r) => r.outputType === "markdown");
|
||||||
|
markdownUrl = md?.outputFileUrl ?? "";
|
||||||
|
pageCount = data?.pageCountEstimate ?? 0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (status === "fail") {
|
||||||
|
console.error("Job failed!");
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (status !== "success" || markdownUrl === "") {
|
||||||
|
console.error("Failed or timed out:", status);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("Downloading markdown from OSS...");
|
||||||
|
const mdResp = await fetch(markdownUrl);
|
||||||
|
const markdown = await mdResp.text();
|
||||||
|
|
||||||
|
console.log("--- Result ---");
|
||||||
|
console.log("Pages:", pageCount);
|
||||||
|
console.log("Cost (USD, est):", ((pageCount > 0 ? pageCount : 1) * 0.0056).toFixed(4));
|
||||||
|
console.log("Job ID:", jobId);
|
||||||
|
console.log("Markdown length:", markdown.length, "chars");
|
||||||
|
console.log("--- Markdown (first 1000 chars) ---");
|
||||||
|
console.log(markdown.slice(0, 1000));
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
---
|
||||||
|
name: pdf-to-md
|
||||||
|
description: >
|
||||||
|
Convert PDF documents to Markdown bundles using the convert_pdf_to_md tool.
|
||||||
|
Handles PDFs from Feishu messages, local workspace files, and produces
|
||||||
|
high-quality Markdown with LaTeX formulas and extracted images.
|
||||||
|
---
|
||||||
|
|
||||||
|
# PDF to Markdown Conversion
|
||||||
|
|
||||||
|
## When to use
|
||||||
|
|
||||||
|
Use this skill when the user asks to convert a PDF to Markdown, extract text
|
||||||
|
from a PDF, or turn a PDF document into an editable format.
|
||||||
|
|
||||||
|
## How it works
|
||||||
|
|
||||||
|
The `convert_pdf_to_md` tool (provided by the `cph_hub` MCP server) calls
|
||||||
|
Alibaba Cloud Document Mind to parse the PDF. It:
|
||||||
|
|
||||||
|
- Extracts text in reading order (handles multi-column, scanned, and
|
||||||
|
multi-language documents)
|
||||||
|
- Converts mathematical formulas to **LaTeX** (`$...$` inline, `$$...$$` block)
|
||||||
|
- Extracts tables as Markdown tables
|
||||||
|
- Downloads embedded images into the output directory
|
||||||
|
- Writes a single `document.md` file plus image files
|
||||||
|
|
||||||
|
## Workflow
|
||||||
|
|
||||||
|
### PDF from a Feishu message
|
||||||
|
|
||||||
|
1. Use `feishu_read_context` to find the `file_key` of the PDF attachment.
|
||||||
|
2. Use `feishu_download_resource` to download it into the workspace.
|
||||||
|
3. Use `convert_pdf_to_md` with the downloaded file path and an output directory.
|
||||||
|
|
||||||
|
### PDF already in the workspace
|
||||||
|
|
||||||
|
1. Use `convert_pdf_to_md` directly with the file path and an output directory.
|
||||||
|
|
||||||
|
## Important rules
|
||||||
|
|
||||||
|
- **Always** use `convert_pdf_to_md` for PDF→Markdown. Do NOT attempt to parse
|
||||||
|
PDFs yourself with Read, Bash, Python, or any other method. The tool provides
|
||||||
|
accurate formula, table, and image extraction that manual methods cannot
|
||||||
|
match.
|
||||||
|
- If `convert_pdf_to_md` fails because no capability connection is configured,
|
||||||
|
tell the user to ask their organization admin to configure the Aliyun
|
||||||
|
docmind credential in the admin web UI (组织后台 → 能力).
|
||||||
|
- The output directory will be created if it does not exist.
|
||||||
|
- After conversion, use `send_file` to send the generated markdown back to the
|
||||||
|
user if they requested it.
|
||||||
|
|
||||||
|
## Output
|
||||||
|
|
||||||
|
The tool returns a list of generated files:
|
||||||
|
- `document.md` — the main markdown file
|
||||||
|
- `*.jpg` / `*.png` — extracted images, referenced from the markdown
|
||||||
|
|
||||||
|
## Cost
|
||||||
|
|
||||||
|
The conversion is billed per page (0.04 CNY/page ≈ $0.0056/page for the
|
||||||
|
enhanced formula mode). The cost is automatically recorded on the run's
|
||||||
|
usage ledger.
|
||||||
@@ -1,10 +1,12 @@
|
|||||||
/**
|
/**
|
||||||
* Org-admin Agent configuration routes (ADR-0017 / ADR-0018).
|
* Org-admin Agent configuration routes (ADR-0017 / ADR-0018).
|
||||||
*
|
*
|
||||||
* Surface for browsing and editing Organization-scoped Agent roles and skills.
|
* Surface for browsing and editing Organization-scoped Agent roles, the skills
|
||||||
* Roles are org-owned data; the default-model picker is constrained to the
|
* bound to them, and the model picker. The model list is **derived** from the
|
||||||
* env-default model registry (ADR-0017: there is no org-scoped model list —
|
* org's ACTIVE provider connection via OpenRouter's /v1/models API — there is
|
||||||
* `OrganizationAgentRole.defaultModel` selects from the platform-enabled set).
|
* no separate model table to maintain. When no ACTIVE provider exists, the
|
||||||
|
* route falls back to the env-default model registry so the admin surface
|
||||||
|
* remains usable.
|
||||||
*
|
*
|
||||||
* Skill management (create, read, edit, disable) is performed in-band through
|
* Skill management (create, read, edit, disable) is performed in-band through
|
||||||
* the deep module `OrganizationAgentConfiguration`, which writes to the same
|
* the deep module `OrganizationAgentConfiguration`, which writes to the same
|
||||||
@@ -17,7 +19,9 @@
|
|||||||
import type { PrismaClient } from "@prisma/client";
|
import type { PrismaClient } from "@prisma/client";
|
||||||
import type { FastifyInstance } from "fastify";
|
import type { FastifyInstance } from "fastify";
|
||||||
import { OrganizationAgentConfiguration } from "../../agent/configuration.js";
|
import { OrganizationAgentConfiguration } from "../../agent/configuration.js";
|
||||||
|
import { ProviderModelCatalog } from "../../connections/providerModelCatalog.js";
|
||||||
import { createDefaultModelRegistry } from "../../settings/runtime.js";
|
import { createDefaultModelRegistry } from "../../settings/runtime.js";
|
||||||
|
import type { LocalSecretEnvelope } from "../../security/secretEnvelope.js";
|
||||||
import { requireOrgRole, type GuardDeps } from "../auth/guards.js";
|
import { requireOrgRole, type GuardDeps } from "../auth/guards.js";
|
||||||
import { handleRouteError } from "../errors.js";
|
import { handleRouteError } from "../errors.js";
|
||||||
|
|
||||||
@@ -25,6 +29,7 @@ export interface AgentConfigRouteConfig {
|
|||||||
readonly prisma: PrismaClient;
|
readonly prisma: PrismaClient;
|
||||||
readonly sessionSecret: string;
|
readonly sessionSecret: string;
|
||||||
readonly skillStoreRoot: string;
|
readonly skillStoreRoot: string;
|
||||||
|
readonly secretEnvelope: LocalSecretEnvelope;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function registerAgentConfigRoutes(
|
export async function registerAgentConfigRoutes(
|
||||||
@@ -33,6 +38,7 @@ export async function registerAgentConfigRoutes(
|
|||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const guardDeps: GuardDeps = { prisma: config.prisma, sessionSecret: config.sessionSecret };
|
const guardDeps: GuardDeps = { prisma: config.prisma, sessionSecret: config.sessionSecret };
|
||||||
const agentConfig = new OrganizationAgentConfiguration(config.prisma, config.skillStoreRoot);
|
const agentConfig = new OrganizationAgentConfiguration(config.prisma, config.skillStoreRoot);
|
||||||
|
const modelCatalog = new ProviderModelCatalog(config.prisma, config.secretEnvelope);
|
||||||
|
|
||||||
app.get("/api/org/:orgSlug/agent-roles", async (request, reply) => {
|
app.get("/api/org/:orgSlug/agent-roles", async (request, reply) => {
|
||||||
try {
|
try {
|
||||||
@@ -226,8 +232,13 @@ export async function registerAgentConfigRoutes(
|
|||||||
const { orgSlug } = request.params as { orgSlug: string };
|
const { orgSlug } = request.params as { orgSlug: string };
|
||||||
const auth = await requireOrgRole(request, reply, guardDeps, { orgSlug });
|
const auth = await requireOrgRole(request, reply, guardDeps, { orgSlug });
|
||||||
if (auth === null) return;
|
if (auth === null) return;
|
||||||
const registry = createDefaultModelRegistry(process.env);
|
const providerModels = await modelCatalog.listModels(auth.organization.id);
|
||||||
return { models: registry.listModels() };
|
// Fall back to env-default registry when the org has no ACTIVE provider
|
||||||
|
// (or the provider API is unreachable on first load).
|
||||||
|
const models = providerModels.length > 0
|
||||||
|
? providerModels
|
||||||
|
: createDefaultModelRegistry(process.env).listModels();
|
||||||
|
return { models };
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
return handleRouteError(reply, err);
|
return handleRouteError(reply, err);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -432,16 +432,16 @@ async function resolvePostLoginRedirect(
|
|||||||
select: { organization: { select: { slug: true, name: true } } },
|
select: { organization: { select: { slug: true, name: true } } },
|
||||||
});
|
});
|
||||||
if (intended === null) return "/admin?error=not_an_active_org_member";
|
if (intended === null) return "/admin?error=not_an_active_org_member";
|
||||||
const orgRoot = `/admin/org/${intended.organization.slug}`;
|
const orgRoot = "/admin";
|
||||||
// Default / missing returnTo sanitizes to "/admin". Always land in the org
|
// Default / missing returnTo sanitizes to "/admin". Always land in the org
|
||||||
// admin SPA (not the legacy static "close this tab" complete page).
|
// admin SPA (not the legacy static "close this tab" complete page).
|
||||||
if (returnTo === "/admin") {
|
if (returnTo === "/admin") {
|
||||||
return orgRoot;
|
return orgRoot;
|
||||||
}
|
}
|
||||||
return returnTo === orgRoot || returnTo.startsWith(`${orgRoot}/`) ? returnTo : orgRoot;
|
return normalizeAdminReturnTo(returnTo) ?? orgRoot;
|
||||||
}
|
}
|
||||||
if (returnTo !== "/admin" && returnTo.startsWith("/admin")) {
|
if (returnTo !== "/admin" && returnTo.startsWith("/admin")) {
|
||||||
return returnTo;
|
return normalizeAdminReturnTo(returnTo) ?? "/admin";
|
||||||
}
|
}
|
||||||
const membership = await prisma.organizationMembership.findFirst({
|
const membership = await prisma.organizationMembership.findFirst({
|
||||||
where: {
|
where: {
|
||||||
@@ -454,7 +454,7 @@ async function resolvePostLoginRedirect(
|
|||||||
orderBy: { createdAt: "asc" },
|
orderBy: { createdAt: "asc" },
|
||||||
});
|
});
|
||||||
if (membership !== null) {
|
if (membership !== null) {
|
||||||
return `/admin/org/${membership.organization.slug}`;
|
return "/admin";
|
||||||
}
|
}
|
||||||
// Member-only or no org: still land on a shell page (SPA will explain).
|
// Member-only or no org: still land on a shell page (SPA will explain).
|
||||||
const any = await prisma.organizationMembership.findFirst({
|
const any = await prisma.organizationMembership.findFirst({
|
||||||
@@ -463,7 +463,7 @@ async function resolvePostLoginRedirect(
|
|||||||
orderBy: { createdAt: "asc" },
|
orderBy: { createdAt: "asc" },
|
||||||
});
|
});
|
||||||
if (any !== null) {
|
if (any !== null) {
|
||||||
return `/admin/org/${any.organization.slug}`;
|
return "/admin/projects";
|
||||||
}
|
}
|
||||||
return "/admin/login?error=no_organization";
|
return "/admin/login?error=no_organization";
|
||||||
}
|
}
|
||||||
@@ -489,7 +489,18 @@ export function sanitizeReturnTo(raw: string): string {
|
|||||||
if (!raw.startsWith("/admin")) {
|
if (!raw.startsWith("/admin")) {
|
||||||
return "/admin";
|
return "/admin";
|
||||||
}
|
}
|
||||||
return raw;
|
return normalizeAdminReturnTo(raw) ?? "/admin";
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Map legacy `/admin/org/:slug[...]` bookmarks onto slugless `/admin[...]` paths. */
|
||||||
|
export function normalizeAdminReturnTo(path: string): string | null {
|
||||||
|
if (!path.startsWith("/admin")) return null;
|
||||||
|
const legacy = path.match(/^\/admin\/org\/[^/]+(\/.*)?$/);
|
||||||
|
if (legacy) {
|
||||||
|
const rest = legacy[1] ?? "";
|
||||||
|
return rest === "" ? "/admin" : `/admin${rest}`;
|
||||||
|
}
|
||||||
|
return path;
|
||||||
}
|
}
|
||||||
|
|
||||||
function trimTrailingSlash(url: string): string {
|
function trimTrailingSlash(url: string): string {
|
||||||
|
|||||||
@@ -0,0 +1,131 @@
|
|||||||
|
/**
|
||||||
|
* ADR-0027: Admin routes for organization-scoped capability connections.
|
||||||
|
* GET /api/org/:orgSlug/capability-connections — list all
|
||||||
|
* GET /api/org/:orgSlug/capability-connections/:capId — read one
|
||||||
|
* PUT /api/org/:orgSlug/capability-connections/:capId — rotate/create
|
||||||
|
* DELETE /api/org/:orgSlug/capability-connections/:capId — disable
|
||||||
|
*/
|
||||||
|
import type { PrismaClient } from "@prisma/client";
|
||||||
|
import type { FastifyInstance } from "fastify";
|
||||||
|
import { CapabilityConnectionService } from "../../capability/capabilityConnectionService.js";
|
||||||
|
import { CapabilityReadinessError, type CapabilityReadinessProbe } from "../../capability/capabilityReadiness.js";
|
||||||
|
import type { LocalSecretEnvelope } from "../../security/secretEnvelope.js";
|
||||||
|
import { requireOrgRole, type GuardDeps } from "../auth/guards.js";
|
||||||
|
import { handleRouteError } from "../errors.js";
|
||||||
|
|
||||||
|
export interface CapabilityConnectionRouteConfig {
|
||||||
|
readonly prisma: PrismaClient;
|
||||||
|
readonly sessionSecret: string;
|
||||||
|
readonly secretEnvelope: LocalSecretEnvelope;
|
||||||
|
readonly readinessProbe?: CapabilityReadinessProbe;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function registerCapabilityConnectionRoutes(
|
||||||
|
app: FastifyInstance,
|
||||||
|
config: CapabilityConnectionRouteConfig,
|
||||||
|
): Promise<void> {
|
||||||
|
const guardDeps: GuardDeps = { prisma: config.prisma, sessionSecret: config.sessionSecret };
|
||||||
|
const connections = new CapabilityConnectionService(
|
||||||
|
config.prisma,
|
||||||
|
config.secretEnvelope,
|
||||||
|
config.readinessProbe,
|
||||||
|
);
|
||||||
|
|
||||||
|
app.get("/api/org/:orgSlug/capability-connections", async (request, reply) => {
|
||||||
|
try {
|
||||||
|
const { orgSlug } = request.params as { orgSlug: string };
|
||||||
|
const auth = await requireOrgRole(request, reply, guardDeps, { orgSlug });
|
||||||
|
if (auth === null) return;
|
||||||
|
return { connections: await connections.list(auth.organization.id) };
|
||||||
|
} catch (error) {
|
||||||
|
request.log.error({ requestId: request.id, operation: "capability_connection.list" }, "list failed");
|
||||||
|
return handleRouteError(reply, error);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
app.get("/api/org/:orgSlug/capability-connections/:capabilityId", async (request, reply) => {
|
||||||
|
try {
|
||||||
|
const { orgSlug, capabilityId } = request.params as { orgSlug: string; capabilityId: string };
|
||||||
|
const auth = await requireOrgRole(request, reply, guardDeps, { orgSlug });
|
||||||
|
if (auth === null) return;
|
||||||
|
return { connection: await connections.read(auth.organization.id, capabilityId) };
|
||||||
|
} catch (error) {
|
||||||
|
request.log.error({ requestId: request.id, operation: "capability_connection.read" }, "read failed");
|
||||||
|
return handleRouteError(reply, error);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
app.put("/api/org/:orgSlug/capability-connections/:capabilityId", async (request, reply) => {
|
||||||
|
try {
|
||||||
|
const { orgSlug, capabilityId } = request.params as { orgSlug: string; capabilityId: string };
|
||||||
|
const auth = await requireOrgRole(request, reply, guardDeps, { orgSlug });
|
||||||
|
if (auth === null) return;
|
||||||
|
const body = parseBody(request.body);
|
||||||
|
const result = await connections.rotate({
|
||||||
|
organizationId: auth.organization.id,
|
||||||
|
capabilityId,
|
||||||
|
actorUserId: auth.user.id,
|
||||||
|
...body,
|
||||||
|
});
|
||||||
|
request.log.info({
|
||||||
|
organizationId: auth.organization.id,
|
||||||
|
capabilityId,
|
||||||
|
connectionId: result.id,
|
||||||
|
status: result.status,
|
||||||
|
secretVersion: result.activeVersion,
|
||||||
|
}, result.created ? "Capability Connection created" : "Capability Connection rotated");
|
||||||
|
const { created, ...metadata } = result;
|
||||||
|
return reply.status(created ? 201 : 200).send(metadata);
|
||||||
|
} catch (error) {
|
||||||
|
const facts = error instanceof CapabilityReadinessError
|
||||||
|
? {
|
||||||
|
errorCode: error.code,
|
||||||
|
failureCategory: error.category,
|
||||||
|
...(error.upstreamStatus !== undefined ? { upstreamStatus: error.upstreamStatus } : {}),
|
||||||
|
}
|
||||||
|
: { errorCode: "capability_connection_write_failed" };
|
||||||
|
request.log.error({ requestId: request.id, operation: "capability_connection.rotate", ...facts }, "rotate failed");
|
||||||
|
return handleRouteError(reply, error);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
app.delete("/api/org/:orgSlug/capability-connections/:capabilityId", async (request, reply) => {
|
||||||
|
try {
|
||||||
|
const { orgSlug, capabilityId } = request.params as { orgSlug: string; capabilityId: string };
|
||||||
|
const auth = await requireOrgRole(request, reply, guardDeps, { orgSlug });
|
||||||
|
if (auth === null) return;
|
||||||
|
const result = await connections.disable({
|
||||||
|
organizationId: auth.organization.id,
|
||||||
|
capabilityId,
|
||||||
|
actorUserId: auth.user.id,
|
||||||
|
});
|
||||||
|
request.log.info({
|
||||||
|
organizationId: auth.organization.id,
|
||||||
|
capabilityId,
|
||||||
|
connectionId: result.id,
|
||||||
|
status: result.status,
|
||||||
|
}, "Capability Connection disabled");
|
||||||
|
return reply.send(result);
|
||||||
|
} catch (error) {
|
||||||
|
request.log.error({ requestId: request.id, operation: "capability_connection.disable" }, "disable failed");
|
||||||
|
return handleRouteError(reply, error);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseBody(value: unknown): { readonly accessKeyId: string; readonly accessKeySecret: string; readonly endpoint: string } {
|
||||||
|
if (typeof value !== "object" || value === null || Array.isArray(value)) {
|
||||||
|
throw new Error("invalid capability credential body");
|
||||||
|
}
|
||||||
|
const body = value as Record<string, unknown>;
|
||||||
|
for (const name of ["accessKeyId", "accessKeySecret", "endpoint"] as const) {
|
||||||
|
if (typeof body[name] !== "string" || (body[name] as string).trim() === "") {
|
||||||
|
throw new Error(`${name} is required`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
accessKeyId: body["accessKeyId"] as string,
|
||||||
|
accessKeySecret: body["accessKeySecret"] as string,
|
||||||
|
endpoint: body["endpoint"] as string,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -22,6 +22,8 @@ import type { LocalSecretEnvelope } from "../../security/secretEnvelope.js";
|
|||||||
import type { ProviderReadinessProbe } from "../../connections/providerReadiness.js";
|
import type { ProviderReadinessProbe } from "../../connections/providerReadiness.js";
|
||||||
import type { FeishuReadinessProbe } from "../../connections/feishuReadiness.js";
|
import type { FeishuReadinessProbe } from "../../connections/feishuReadiness.js";
|
||||||
import { registerFeishuApplicationConnectionRoutes } from "./feishuApplicationConnectionRoutes.js";
|
import { registerFeishuApplicationConnectionRoutes } from "./feishuApplicationConnectionRoutes.js";
|
||||||
|
import { registerCapabilityConnectionRoutes } from "./capabilityConnectionRoutes.js";
|
||||||
|
import type { CapabilityReadinessProbe } from "../../capability/capabilityReadiness.js";
|
||||||
|
|
||||||
export interface OrgRouteConfig {
|
export interface OrgRouteConfig {
|
||||||
readonly prisma: PrismaClient;
|
readonly prisma: PrismaClient;
|
||||||
@@ -30,6 +32,7 @@ export interface OrgRouteConfig {
|
|||||||
readonly secretEnvelope: LocalSecretEnvelope;
|
readonly secretEnvelope: LocalSecretEnvelope;
|
||||||
readonly providerReadinessProbe?: ProviderReadinessProbe;
|
readonly providerReadinessProbe?: ProviderReadinessProbe;
|
||||||
readonly feishuConnectionReadinessProbe?: FeishuReadinessProbe;
|
readonly feishuConnectionReadinessProbe?: FeishuReadinessProbe;
|
||||||
|
readonly capabilityReadinessProbe?: CapabilityReadinessProbe;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function registerOrgRoutes(app: FastifyInstance, config: OrgRouteConfig): Promise<void> {
|
export async function registerOrgRoutes(app: FastifyInstance, config: OrgRouteConfig): Promise<void> {
|
||||||
@@ -116,6 +119,7 @@ export async function registerOrgRoutes(app: FastifyInstance, config: OrgRouteCo
|
|||||||
prisma: config.prisma,
|
prisma: config.prisma,
|
||||||
sessionSecret: config.sessionSecret,
|
sessionSecret: config.sessionSecret,
|
||||||
skillStoreRoot: readSkillStoreRoot(),
|
skillStoreRoot: readSkillStoreRoot(),
|
||||||
|
secretEnvelope: config.secretEnvelope,
|
||||||
});
|
});
|
||||||
await registerSessionsAndUsageRoutes(app, {
|
await registerSessionsAndUsageRoutes(app, {
|
||||||
prisma: config.prisma,
|
prisma: config.prisma,
|
||||||
@@ -137,4 +141,12 @@ export async function registerOrgRoutes(app: FastifyInstance, config: OrgRouteCo
|
|||||||
? { readinessProbe: config.feishuConnectionReadinessProbe }
|
? { readinessProbe: config.feishuConnectionReadinessProbe }
|
||||||
: {}),
|
: {}),
|
||||||
});
|
});
|
||||||
|
await registerCapabilityConnectionRoutes(app, {
|
||||||
|
prisma: config.prisma,
|
||||||
|
sessionSecret: config.sessionSecret,
|
||||||
|
secretEnvelope: config.secretEnvelope,
|
||||||
|
...(config.capabilityReadinessProbe !== undefined
|
||||||
|
? { readinessProbe: config.capabilityReadinessProbe }
|
||||||
|
: {}),
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,12 @@
|
|||||||
export const DEFAULT_CLAUDE_BUILT_IN_TOOLS = ["Read", "Write", "Bash", "Glob", "Grep"] as const;
|
export const DEFAULT_CLAUDE_BUILT_IN_TOOLS = [
|
||||||
|
"Read",
|
||||||
|
"Write",
|
||||||
|
"Bash",
|
||||||
|
"Glob",
|
||||||
|
"Grep",
|
||||||
|
"WebFetch",
|
||||||
|
"WebSearch",
|
||||||
|
] as const;
|
||||||
|
|
||||||
export const CPH_HUB_MCP_SERVER_NAME = "cph_hub";
|
export const CPH_HUB_MCP_SERVER_NAME = "cph_hub";
|
||||||
export const CPH_HUB_MCP_TOOL_IDS = [
|
export const CPH_HUB_MCP_TOOL_IDS = [
|
||||||
@@ -6,6 +14,7 @@ export const CPH_HUB_MCP_TOOL_IDS = [
|
|||||||
"feishu_read_context",
|
"feishu_read_context",
|
||||||
"feishu_download_resource",
|
"feishu_download_resource",
|
||||||
"request_approval",
|
"request_approval",
|
||||||
|
"convert_pdf_to_md",
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
export type CphHubMcpToolId = (typeof CPH_HUB_MCP_TOOL_IDS)[number];
|
export type CphHubMcpToolId = (typeof CPH_HUB_MCP_TOOL_IDS)[number];
|
||||||
@@ -26,11 +35,15 @@ const ROLE_TOOL_TO_CLAUDE_BUILT_INS = new Map<string, readonly string[]>([
|
|||||||
// would need a separate command-policy layer.
|
// would need a separate command-policy layer.
|
||||||
["cph_check", ["Bash"]],
|
["cph_check", ["Bash"]],
|
||||||
["cph_build", ["Bash"]],
|
["cph_build", ["Bash"]],
|
||||||
|
["web_fetch", ["WebFetch"]],
|
||||||
|
["web_search", ["WebSearch"]],
|
||||||
["Read", ["Read"]],
|
["Read", ["Read"]],
|
||||||
["Write", ["Write"]],
|
["Write", ["Write"]],
|
||||||
["Bash", ["Bash"]],
|
["Bash", ["Bash"]],
|
||||||
["Glob", ["Glob"]],
|
["Glob", ["Glob"]],
|
||||||
["Grep", ["Grep"]],
|
["Grep", ["Grep"]],
|
||||||
|
["WebFetch", ["WebFetch"]],
|
||||||
|
["WebSearch", ["WebSearch"]],
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const ROLE_TOOL_TO_CPH_HUB_MCP_TOOL = new Map<string, CphHubMcpToolId>([
|
const ROLE_TOOL_TO_CPH_HUB_MCP_TOOL = new Map<string, CphHubMcpToolId>([
|
||||||
@@ -38,10 +51,12 @@ const ROLE_TOOL_TO_CPH_HUB_MCP_TOOL = new Map<string, CphHubMcpToolId>([
|
|||||||
["feishu_read_context", "feishu_read_context"],
|
["feishu_read_context", "feishu_read_context"],
|
||||||
["feishu_download_resource", "feishu_download_resource"],
|
["feishu_download_resource", "feishu_download_resource"],
|
||||||
["request_approval", "request_approval"],
|
["request_approval", "request_approval"],
|
||||||
|
["convert_pdf_to_md", "convert_pdf_to_md"],
|
||||||
["mcp__cph_hub__send_file", "send_file"],
|
["mcp__cph_hub__send_file", "send_file"],
|
||||||
["mcp__cph_hub__feishu_read_context", "feishu_read_context"],
|
["mcp__cph_hub__feishu_read_context", "feishu_read_context"],
|
||||||
["mcp__cph_hub__feishu_download_resource", "feishu_download_resource"],
|
["mcp__cph_hub__feishu_download_resource", "feishu_download_resource"],
|
||||||
["mcp__cph_hub__request_approval", "request_approval"],
|
["mcp__cph_hub__request_approval", "request_approval"],
|
||||||
|
["mcp__cph_hub__convert_pdf_to_md", "convert_pdf_to_md"],
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const SUPPORTED_ROLE_TOOLS = new Set([
|
const SUPPORTED_ROLE_TOOLS = new Set([
|
||||||
|
|||||||
@@ -24,10 +24,10 @@
|
|||||||
* denied by default and re-opened only for the workspace plus named system
|
* denied by default and re-opened only for the workspace plus named system
|
||||||
* runtimes, and `failIfUnavailable` hard-fails if the sandbox can't start. The
|
* runtimes, and `failIfUnavailable` hard-fails if the sandbox can't start. The
|
||||||
* subprocess gets a minimal environment and SDK credential protection removes
|
* subprocess gets a minimal environment and SDK credential protection removes
|
||||||
* provider secrets from Bash. This upholds `AgentFileOp.Authorized`
|
* provider secrets from Bash. This upholds the workspace-bounded file-op
|
||||||
* (ADR-0018 / `Spec.System.AgentSurface`) without re-implementing the
|
* invariant (ADR-0018) without re-implementing the
|
||||||
* `workspace.ts` `confine()` path validator as a tool wrapper — the OS sandbox
|
* `workspace.ts` `confine()` path validator as a tool wrapper — the OS sandbox
|
||||||
* is the mechanism, the contract pins the invariant.
|
* is the mechanism, the ADR pins the invariant.
|
||||||
*/
|
*/
|
||||||
import { query, type HookCallback, type McpServerConfig, type SDKMessage, type SDKAssistantMessage, type SDKUserMessage, type SDKResultMessage, type SDKPartialAssistantMessage, type SDKSystemMessage } from "@anthropic-ai/claude-agent-sdk";
|
import { query, type HookCallback, type McpServerConfig, type SDKMessage, type SDKAssistantMessage, type SDKUserMessage, type SDKResultMessage, type SDKPartialAssistantMessage, type SDKSystemMessage } from "@anthropic-ai/claude-agent-sdk";
|
||||||
import type { PrismaClient } from "@prisma/client";
|
import type { PrismaClient } from "@prisma/client";
|
||||||
|
|||||||
@@ -0,0 +1,266 @@
|
|||||||
|
/**
|
||||||
|
* ADR-0027: Organization-scoped capability connection service. Manages the
|
||||||
|
* lifecycle (rotate / read / disable) of capability credentials stored in
|
||||||
|
* ADR-0024 encrypted envelopes with purpose="capability".
|
||||||
|
*
|
||||||
|
* Mirrors FeishuApplicationConnectionService, but keyed by (organizationId,
|
||||||
|
* capabilityId) instead of 1:1 — an org may have multiple capabilities.
|
||||||
|
*/
|
||||||
|
import { randomUUID } from "node:crypto";
|
||||||
|
import type { Prisma, PrismaClient } from "@prisma/client";
|
||||||
|
import { lockActiveOrganization } from "../org/status.js";
|
||||||
|
import { LocalSecretEnvelope } from "../security/secretEnvelope.js";
|
||||||
|
import { probeDocmindCredential, type CapabilityReadinessProbe } from "./capabilityReadiness.js";
|
||||||
|
import type { CapabilitySecretPayload } from "./types.js";
|
||||||
|
|
||||||
|
const CAPABILITY_ID_PATTERN = /^[a-z0-9][a-z0-9._-]{0,63}$/;
|
||||||
|
const KNOWN_CAPABILITY_IDS = new Set(["pdf_to_md_bundle", "audio_video_to_text"]);
|
||||||
|
|
||||||
|
export interface CapabilityCredentialInput {
|
||||||
|
readonly accessKeyId: string;
|
||||||
|
readonly accessKeySecret: string;
|
||||||
|
readonly endpoint: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface RotateCapabilityInput extends CapabilityCredentialInput {
|
||||||
|
readonly organizationId: string;
|
||||||
|
readonly capabilityId: string;
|
||||||
|
readonly actorUserId: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CapabilityConnectionMetadata {
|
||||||
|
readonly id: string;
|
||||||
|
readonly capabilityId: string;
|
||||||
|
readonly status: "DRAFT" | "ACTIVE" | "DISABLED";
|
||||||
|
readonly activeVersion: number | null;
|
||||||
|
readonly keyId: string | null;
|
||||||
|
readonly createdAt: Date;
|
||||||
|
readonly updatedAt: Date;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CapabilityConnectionWriteResult extends CapabilityConnectionMetadata {
|
||||||
|
readonly created: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type CapabilitySecretPayloadV1 = CapabilitySecretPayload;
|
||||||
|
|
||||||
|
export class CapabilityConnectionService {
|
||||||
|
constructor(
|
||||||
|
private readonly prisma: PrismaClient,
|
||||||
|
private readonly secrets: LocalSecretEnvelope,
|
||||||
|
private readonly readinessProbe: CapabilityReadinessProbe = probeDocmindCredential,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async rotate(input: RotateCapabilityInput): Promise<CapabilityConnectionWriteResult> {
|
||||||
|
if (!CAPABILITY_ID_PATTERN.test(input.capabilityId)) {
|
||||||
|
throw new Error(`invalid capabilityId: ${input.capabilityId}`);
|
||||||
|
}
|
||||||
|
const payload = validateCredential(input);
|
||||||
|
await this.prisma.$transaction(async (tx) => {
|
||||||
|
await requireCapabilityAdmin(tx, input);
|
||||||
|
});
|
||||||
|
await this.readinessProbe({
|
||||||
|
endpoint: payload.endpoint,
|
||||||
|
accessKeyId: payload.accessKeyId,
|
||||||
|
accessKeySecret: payload.accessKeySecret,
|
||||||
|
});
|
||||||
|
|
||||||
|
return this.prisma.$transaction(async (tx) => {
|
||||||
|
await requireCapabilityAdmin(tx, input);
|
||||||
|
const connection = await tx.organizationCapabilityConnection.upsert({
|
||||||
|
where: {
|
||||||
|
organizationId_capabilityId: {
|
||||||
|
organizationId: input.organizationId,
|
||||||
|
capabilityId: input.capabilityId,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
update: {},
|
||||||
|
create: {
|
||||||
|
id: randomUUID(),
|
||||||
|
organizationId: input.organizationId,
|
||||||
|
capabilityId: input.capabilityId,
|
||||||
|
status: "DRAFT",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
await tx.$queryRaw`SELECT "id" FROM "OrganizationCapabilityConnection" WHERE "id" = ${connection.id} FOR UPDATE`;
|
||||||
|
const locked = await tx.organizationCapabilityConnection.findUniqueOrThrow({
|
||||||
|
where: { id: connection.id },
|
||||||
|
include: {
|
||||||
|
activeSecretVersion: true,
|
||||||
|
secretVersions: { orderBy: { version: "desc" }, take: 1, select: { version: true } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (locked.organizationId !== input.organizationId) {
|
||||||
|
throw new Error("Capability Connection scope changed during rotation");
|
||||||
|
}
|
||||||
|
const version = (locked.secretVersions[0]?.version ?? 0) + 1;
|
||||||
|
const secretVersionId = randomUUID();
|
||||||
|
const envelope = this.secrets.encryptJson(
|
||||||
|
{
|
||||||
|
purpose: "capability",
|
||||||
|
organizationId: input.organizationId,
|
||||||
|
connectionId: locked.id,
|
||||||
|
secretVersionId,
|
||||||
|
},
|
||||||
|
payload,
|
||||||
|
);
|
||||||
|
const now = new Date();
|
||||||
|
const secretVersion = await tx.capabilityCredentialVersion.create({
|
||||||
|
data: {
|
||||||
|
id: secretVersionId,
|
||||||
|
connectionId: locked.id,
|
||||||
|
version,
|
||||||
|
envelopeVersion: envelope.version,
|
||||||
|
keyId: envelope.keyId,
|
||||||
|
envelope: envelope as unknown as Prisma.InputJsonValue,
|
||||||
|
createdByUserId: input.actorUserId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (locked.activeSecretVersion !== null) {
|
||||||
|
await tx.capabilityCredentialVersion.update({
|
||||||
|
where: { id: locked.activeSecretVersion.id },
|
||||||
|
data: { retiredAt: now },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
const activated = await tx.organizationCapabilityConnection.update({
|
||||||
|
where: { id: locked.id },
|
||||||
|
data: {
|
||||||
|
status: "ACTIVE",
|
||||||
|
activeSecretVersionId: secretVersion.id,
|
||||||
|
activatedAt: now,
|
||||||
|
disabledAt: null,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
await tx.auditEntry.create({
|
||||||
|
data: {
|
||||||
|
organizationId: input.organizationId,
|
||||||
|
actorUserId: input.actorUserId,
|
||||||
|
action: version === 1 ? "capability.created" : "capability.rotated",
|
||||||
|
metadata: {
|
||||||
|
connectionId: locked.id,
|
||||||
|
capabilityId: input.capabilityId,
|
||||||
|
status: "ACTIVE",
|
||||||
|
secretVersion: version,
|
||||||
|
keyId: envelope.keyId,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return {
|
||||||
|
...toMetadata(activated, { version, keyId: secretVersion.keyId }),
|
||||||
|
created: version === 1,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async list(organizationId: string): Promise<CapabilityConnectionMetadata[]> {
|
||||||
|
const connections = await this.prisma.organizationCapabilityConnection.findMany({
|
||||||
|
where: { organizationId },
|
||||||
|
include: { activeSecretVersion: { select: { version: true, keyId: true } } },
|
||||||
|
orderBy: { capabilityId: "asc" },
|
||||||
|
});
|
||||||
|
return connections.map((c) => toMetadata(c, c.activeSecretVersion));
|
||||||
|
}
|
||||||
|
|
||||||
|
async read(organizationId: string, capabilityId: string): Promise<CapabilityConnectionMetadata | null> {
|
||||||
|
const connection = await this.prisma.organizationCapabilityConnection.findFirst({
|
||||||
|
where: { organizationId, capabilityId },
|
||||||
|
include: { activeSecretVersion: { select: { version: true, keyId: true } } },
|
||||||
|
});
|
||||||
|
return connection === null ? null : toMetadata(connection, connection.activeSecretVersion);
|
||||||
|
}
|
||||||
|
|
||||||
|
async disable(input: {
|
||||||
|
readonly organizationId: string;
|
||||||
|
readonly capabilityId: string;
|
||||||
|
readonly actorUserId: string;
|
||||||
|
}): Promise<CapabilityConnectionMetadata> {
|
||||||
|
return this.prisma.$transaction(async (tx) => {
|
||||||
|
await requireCapabilityAdmin(tx, input);
|
||||||
|
const connection = await tx.organizationCapabilityConnection.findFirst({
|
||||||
|
where: { organizationId: input.organizationId, capabilityId: input.capabilityId },
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (connection === null) throw new Error("Capability Connection not found");
|
||||||
|
await tx.$queryRaw`SELECT "id" FROM "OrganizationCapabilityConnection" WHERE "id" = ${connection.id} FOR UPDATE`;
|
||||||
|
const locked = await tx.organizationCapabilityConnection.findUniqueOrThrow({
|
||||||
|
where: { id: connection.id },
|
||||||
|
include: { activeSecretVersion: { select: { version: true, keyId: true } } },
|
||||||
|
});
|
||||||
|
if (locked.status === "DISABLED") return toMetadata(locked, locked.activeSecretVersion);
|
||||||
|
const disabled = await tx.organizationCapabilityConnection.update({
|
||||||
|
where: { id: locked.id },
|
||||||
|
data: { status: "DISABLED", disabledAt: new Date() },
|
||||||
|
});
|
||||||
|
await tx.auditEntry.create({
|
||||||
|
data: {
|
||||||
|
organizationId: input.organizationId,
|
||||||
|
actorUserId: input.actorUserId,
|
||||||
|
action: "capability.disabled",
|
||||||
|
metadata: {
|
||||||
|
connectionId: locked.id,
|
||||||
|
capabilityId: input.capabilityId,
|
||||||
|
previousStatus: locked.status,
|
||||||
|
status: "DISABLED",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return toMetadata(disabled, locked.activeSecretVersion);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function validateCredential(input: RotateCapabilityInput): CapabilitySecretPayloadV1 {
|
||||||
|
if (!KNOWN_CAPABILITY_IDS.has(input.capabilityId)) {
|
||||||
|
throw new Error(`unsupported capabilityId: ${input.capabilityId}`);
|
||||||
|
}
|
||||||
|
const accessKeyId = nonEmpty(input.accessKeyId, "accessKeyId");
|
||||||
|
const accessKeySecret = nonEmpty(input.accessKeySecret, "accessKeySecret");
|
||||||
|
const endpoint = nonEmpty(input.endpoint, "endpoint");
|
||||||
|
return { schemaVersion: 1, accessKeyId, accessKeySecret, endpoint };
|
||||||
|
}
|
||||||
|
|
||||||
|
function toMetadata(
|
||||||
|
connection: {
|
||||||
|
readonly id: string;
|
||||||
|
readonly capabilityId: string;
|
||||||
|
readonly status: string;
|
||||||
|
readonly createdAt: Date;
|
||||||
|
readonly updatedAt: Date;
|
||||||
|
},
|
||||||
|
secret: { readonly version: number; readonly keyId: string } | null,
|
||||||
|
): CapabilityConnectionMetadata {
|
||||||
|
return {
|
||||||
|
id: connection.id,
|
||||||
|
capabilityId: connection.capabilityId,
|
||||||
|
status: connection.status as CapabilityConnectionMetadata["status"],
|
||||||
|
activeVersion: secret?.version ?? null,
|
||||||
|
keyId: secret?.keyId ?? null,
|
||||||
|
createdAt: connection.createdAt,
|
||||||
|
updatedAt: connection.updatedAt,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async function requireCapabilityAdmin(
|
||||||
|
tx: Prisma.TransactionClient,
|
||||||
|
input: { readonly organizationId: string; readonly actorUserId: string },
|
||||||
|
): Promise<void> {
|
||||||
|
await lockActiveOrganization(tx, input.organizationId);
|
||||||
|
const membership = await tx.organizationMembership.findFirst({
|
||||||
|
where: {
|
||||||
|
organizationId: input.organizationId,
|
||||||
|
userId: input.actorUserId,
|
||||||
|
role: { in: ["OWNER", "ADMIN"] },
|
||||||
|
revokedAt: null,
|
||||||
|
},
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (membership === null) {
|
||||||
|
throw new Error("only Organization OWNER or ADMIN may manage capability connections");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function nonEmpty(value: string, label: string): string {
|
||||||
|
const trimmed = value.trim();
|
||||||
|
if (trimmed === "") throw new Error(`${label} must not be empty`);
|
||||||
|
return trimmed;
|
||||||
|
}
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
/**
|
||||||
|
* ADR-0027: org-scoped capability credential resolver. Reuses the ADR-0024
|
||||||
|
* envelope decryption machinery (LocalSecretEnvelope) with
|
||||||
|
* purpose="capability", distinct from the model-provider and Feishu
|
||||||
|
* application connections. Fail-closed: no process-global fallback.
|
||||||
|
*
|
||||||
|
* Mirrors the Feishu application connection resolver shape, minus the
|
||||||
|
* readiness probe (capability probes are per-capability and injected by the
|
||||||
|
* adapter wiring, not this resolver).
|
||||||
|
*/
|
||||||
|
import type { PrismaClient } from "@prisma/client";
|
||||||
|
import { LocalSecretEnvelope, type SecretEnvelopeV1 } from "../security/secretEnvelope.js";
|
||||||
|
import {
|
||||||
|
CapabilityConnectionUnavailable,
|
||||||
|
type CapabilitySecretPayload,
|
||||||
|
type CapabilityId,
|
||||||
|
} from "./types.js";
|
||||||
|
|
||||||
|
const CAPABILITY_PURPOSE = "capability";
|
||||||
|
|
||||||
|
export interface ResolvedCapabilityCredential extends CapabilitySecretPayload {
|
||||||
|
readonly connectionId: string;
|
||||||
|
readonly organizationId: string;
|
||||||
|
readonly capabilityId: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resolve the active capability credential for an organization. Throws
|
||||||
|
* CapabilityConnectionUnavailable when the org has no ACTIVE connection
|
||||||
|
* (fail-closed, ADR-0024). Decrypted plaintext exists only in the returned
|
||||||
|
* object for the duration of the capability call; it is never cached, logged,
|
||||||
|
* or passed to the Agent process.
|
||||||
|
*/
|
||||||
|
export async function resolveCapabilityCredential(
|
||||||
|
prisma: PrismaClient,
|
||||||
|
secrets: LocalSecretEnvelope,
|
||||||
|
input: { readonly organizationId: string; readonly capabilityId: CapabilityId },
|
||||||
|
): Promise<ResolvedCapabilityCredential> {
|
||||||
|
const connection = await prisma.organizationCapabilityConnection.findFirst({
|
||||||
|
where: {
|
||||||
|
organizationId: input.organizationId,
|
||||||
|
capabilityId: input.capabilityId,
|
||||||
|
status: "ACTIVE",
|
||||||
|
},
|
||||||
|
include: { activeSecretVersion: true },
|
||||||
|
});
|
||||||
|
if (connection === null || connection.activeSecretVersion === null) {
|
||||||
|
throw new CapabilityConnectionUnavailable(input.capabilityId, input.organizationId);
|
||||||
|
}
|
||||||
|
const version = connection.activeSecretVersion;
|
||||||
|
const binding = {
|
||||||
|
purpose: CAPABILITY_PURPOSE,
|
||||||
|
organizationId: connection.organizationId,
|
||||||
|
connectionId: connection.id,
|
||||||
|
secretVersionId: version.id,
|
||||||
|
};
|
||||||
|
const payload = secrets.decryptJson<CapabilitySecretPayload>(binding, version.envelope as unknown as SecretEnvelopeV1);
|
||||||
|
if (payload.schemaVersion !== 1) {
|
||||||
|
throw new Error(`unsupported capability secret schemaVersion: ${payload.schemaVersion}`);
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
connectionId: connection.id,
|
||||||
|
organizationId: connection.organizationId,
|
||||||
|
capabilityId: connection.capabilityId,
|
||||||
|
schemaVersion: 1,
|
||||||
|
accessKeyId: payload.accessKeyId,
|
||||||
|
accessKeySecret: payload.accessKeySecret,
|
||||||
|
endpoint: payload.endpoint,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
/**
|
||||||
|
* ADR-0027: Capability readiness probe. Validates the Alibaba Cloud docmind
|
||||||
|
* credential by calling QueryDocParserStatus with a dummy id — a 400 (bad
|
||||||
|
* request) means the credential is valid (the API accepted auth but rejected
|
||||||
|
* the id); a 401/403 means the credential is bad.
|
||||||
|
*/
|
||||||
|
import { classifyNetworkFailure, type NetworkFailureCategory } from "../connections/networkFailure.js";
|
||||||
|
|
||||||
|
export interface CapabilityReadinessInput {
|
||||||
|
readonly endpoint: string;
|
||||||
|
readonly accessKeyId: string;
|
||||||
|
readonly accessKeySecret: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type CapabilityReadinessProbe = (input: CapabilityReadinessInput) => Promise<void>;
|
||||||
|
|
||||||
|
export class CapabilityReadinessError extends Error {
|
||||||
|
constructor(
|
||||||
|
readonly code: "capability_readiness_unsupported" | "capability_readiness_unreachable" | "capability_readiness_rejected",
|
||||||
|
message: string,
|
||||||
|
readonly category: NetworkFailureCategory | "configuration" | "http",
|
||||||
|
readonly upstreamStatus?: number,
|
||||||
|
) {
|
||||||
|
super(message);
|
||||||
|
this.name = "CapabilityReadinessError";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Probe the Alibaba Cloud docmind credential. We call QueryDocParserStatus
|
||||||
|
* with a dummy id. The API will return:
|
||||||
|
* - 400 (InvalidParameter) → credential valid, just a bad id → probe passes
|
||||||
|
* - 401/403 (InvalidAccessKey/Forbidden) → credential invalid → probe fails
|
||||||
|
* - network error → unreachable
|
||||||
|
*/
|
||||||
|
export const probeDocmindCredential: CapabilityReadinessProbe = async (input) => {
|
||||||
|
const url = `https://${input.endpoint}/?Action=QueryDocParserStatus&Id=probe-test&Version=2022-07-11`;
|
||||||
|
const authHeader = makeBasicAuth(input.accessKeyId, input.accessKeySecret);
|
||||||
|
|
||||||
|
let response: Response;
|
||||||
|
try {
|
||||||
|
response = await fetch(url, {
|
||||||
|
method: "GET",
|
||||||
|
headers: { authorization: authHeader, accept: "application/json" },
|
||||||
|
redirect: "manual",
|
||||||
|
signal: AbortSignal.timeout(10_000),
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
throw new CapabilityReadinessError(
|
||||||
|
"capability_readiness_unreachable",
|
||||||
|
"docmind credential readiness check could not reach the API",
|
||||||
|
classifyNetworkFailure(error),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
await response.body?.cancel();
|
||||||
|
if (response.status === 401 || response.status === 403) {
|
||||||
|
throw new CapabilityReadinessError(
|
||||||
|
"capability_readiness_rejected",
|
||||||
|
`docmind credential rejected: status ${response.status}`,
|
||||||
|
"http",
|
||||||
|
response.status,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
function makeBasicAuth(accessKeyId: string, accessKeySecret: string): string {
|
||||||
|
const credentials = Buffer.from(`${accessKeyId}:${accessKeySecret}`).toString("base64");
|
||||||
|
return `Basic ${credentials}`;
|
||||||
|
}
|
||||||
@@ -0,0 +1,231 @@
|
|||||||
|
/**
|
||||||
|
* ADR-0027: Alibaba Cloud Document Mind (docmind) client.
|
||||||
|
*
|
||||||
|
* Uses the official @alicloud/docmind-api20220711 SDK to call the document
|
||||||
|
* parsing (large model version) API. The API is asynchronous:
|
||||||
|
* 1. SubmitDocParserJobAdvance — upload local file as a stream, get job id
|
||||||
|
* 2. QueryDocParserStatus — poll until data.status === "success";
|
||||||
|
* the markdown output URL is returned in outputFormatResult
|
||||||
|
* 3. Download markdown from OSS, extract and download referenced images
|
||||||
|
*
|
||||||
|
* Pricing (2025-07, aliyun docmind):
|
||||||
|
* - 图文文档基础链路: 0.02元/页
|
||||||
|
* - 图文文档增强链路 (含公式 LaTeX): 0.04元/页
|
||||||
|
* - 视频: 0.002元/秒
|
||||||
|
* - 音频: 0.00035元/秒
|
||||||
|
*/
|
||||||
|
import $DocmindClient, {
|
||||||
|
SubmitDocParserJobAdvanceRequest,
|
||||||
|
QueryDocParserStatusRequest,
|
||||||
|
} from "@alicloud/docmind-api20220711";
|
||||||
|
import { RuntimeOptions } from "@alicloud/tea-util";
|
||||||
|
import { createReadStream } from "node:fs";
|
||||||
|
import { basename } from "node:path";
|
||||||
|
import type { CapabilitySecretPayload } from "./types.js";
|
||||||
|
|
||||||
|
/** A single extracted image downloaded from the markdown's OSS image URLs. */
|
||||||
|
export interface DocmindExtractedImage {
|
||||||
|
readonly filename: string;
|
||||||
|
readonly data: Uint8Array;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The structured result of parsing one document. */
|
||||||
|
export interface DocmindParseResult {
|
||||||
|
readonly markdown: string;
|
||||||
|
readonly images: readonly DocmindExtractedImage[];
|
||||||
|
readonly pageCount: number;
|
||||||
|
readonly costUsd: number | null;
|
||||||
|
readonly requestId: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface DocmindParseOptions {
|
||||||
|
readonly inputFilePath: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CapabilityProviderClient {
|
||||||
|
parse(credential: CapabilitySecretPayload, options: DocmindParseOptions): Promise<DocmindParseResult>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class DocmindClientError extends Error {
|
||||||
|
constructor(
|
||||||
|
message: string,
|
||||||
|
readonly code: "docmind_unreachable" | "docmind_rejected" | "docmind_invalid_response" | "docmind_no_output" | "docmind_timeout",
|
||||||
|
readonly upstreamStatus?: number,
|
||||||
|
) {
|
||||||
|
super(message);
|
||||||
|
this.name = "DocmindClientError";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Cost per page in USD (0.04 CNY/page ≈ 0.0056 USD). */
|
||||||
|
const COST_PER_PAGE_USD = 0.0056;
|
||||||
|
const POLL_INTERVAL_MS = 10_000;
|
||||||
|
const POLL_TIMEOUT_MS = 5 * 60_000;
|
||||||
|
|
||||||
|
type DocmindConfig = ConstructorParameters<typeof $DocmindClient.default>[0];
|
||||||
|
|
||||||
|
export class AliyunDocmindClient implements CapabilityProviderClient {
|
||||||
|
async parse(credential: CapabilitySecretPayload, options: DocmindParseOptions): Promise<DocmindParseResult> {
|
||||||
|
const config: DocmindConfig = {
|
||||||
|
endpoint: credential.endpoint,
|
||||||
|
accessKeyId: credential.accessKeyId,
|
||||||
|
accessKeySecret: credential.accessKeySecret,
|
||||||
|
type: "access_key",
|
||||||
|
regionId: "cn-hangzhou",
|
||||||
|
} as DocmindConfig;
|
||||||
|
const client = new $DocmindClient.default(config);
|
||||||
|
|
||||||
|
// 1. Submit job with local file as a ReadStream (not a Buffer — the SDK
|
||||||
|
// serializes Buffers as JSON {type:"Buffer",data:[...]} which the API
|
||||||
|
// can't read; a Stream is uploaded as multipart form data).
|
||||||
|
const fileName = basename(options.inputFilePath);
|
||||||
|
const fileStream = createReadStream(options.inputFilePath);
|
||||||
|
const advanceRequest = new SubmitDocParserJobAdvanceRequest({
|
||||||
|
fileUrlObject: fileStream,
|
||||||
|
fileName,
|
||||||
|
outputFormat: ["markdown"],
|
||||||
|
formulaEnhancement: true,
|
||||||
|
});
|
||||||
|
const runtime = new RuntimeOptions({});
|
||||||
|
let submitResponse;
|
||||||
|
try {
|
||||||
|
submitResponse = await client.submitDocParserJobAdvance(advanceRequest, runtime);
|
||||||
|
} catch (e) {
|
||||||
|
throw new DocmindClientError(
|
||||||
|
e instanceof Error ? e.message : String(e),
|
||||||
|
"docmind_unreachable",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const jobId = submitResponse.body?.data?.id;
|
||||||
|
if (jobId === undefined || jobId === null || jobId === "") {
|
||||||
|
throw new DocmindClientError("docmind submit returned no job id", "docmind_invalid_response");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Poll QueryDocParserStatus until data.status === "success" or "fail".
|
||||||
|
const deadline = Date.now() + POLL_TIMEOUT_MS;
|
||||||
|
let status = "";
|
||||||
|
let markdownUrl: string | null = null;
|
||||||
|
let pageCount = 0;
|
||||||
|
while (Date.now() < deadline) {
|
||||||
|
await sleep(POLL_INTERVAL_MS);
|
||||||
|
const statusReq = new QueryDocParserStatusRequest({ id: jobId });
|
||||||
|
const statusResponse = await client.queryDocParserStatus(statusReq);
|
||||||
|
const body = statusResponse.body as {
|
||||||
|
data?: {
|
||||||
|
status?: string;
|
||||||
|
pageCountEstimate?: number;
|
||||||
|
outputFormatResult?: Array<{ outputFileUrl?: string; outputType?: string }>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
status = body.data?.status ?? "";
|
||||||
|
if (status === "success") {
|
||||||
|
const mdResult = body.data?.outputFormatResult?.find((r) => r.outputType === "markdown");
|
||||||
|
markdownUrl = mdResult?.outputFileUrl ?? null;
|
||||||
|
pageCount = body.data?.pageCountEstimate ?? 0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (status === "fail") {
|
||||||
|
throw new DocmindClientError(`docmind job ${jobId} failed`, "docmind_rejected");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (status !== "success") {
|
||||||
|
throw new DocmindClientError(`docmind job ${jobId} timed out (status: ${status})`, "docmind_timeout");
|
||||||
|
}
|
||||||
|
if (markdownUrl === null) {
|
||||||
|
throw new DocmindClientError("docmind returned no markdown output URL", "docmind_no_output");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Download the markdown file from OSS.
|
||||||
|
let markdown: string;
|
||||||
|
try {
|
||||||
|
const mdResp = await fetch(markdownUrl);
|
||||||
|
if (!mdResp.ok) {
|
||||||
|
throw new DocmindClientError(`failed to download markdown: HTTP ${mdResp.status}`, "docmind_unreachable");
|
||||||
|
}
|
||||||
|
markdown = await mdResp.text();
|
||||||
|
} catch (e) {
|
||||||
|
if (e instanceof DocmindClientError) throw e;
|
||||||
|
throw new DocmindClientError(
|
||||||
|
e instanceof Error ? e.message : String(e),
|
||||||
|
"docmind_unreachable",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (markdown === "") {
|
||||||
|
throw new DocmindClientError("docmind returned empty markdown", "docmind_no_output");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 4. Download images referenced in the markdown (OSS URLs).
|
||||||
|
// Markdown contains  entries.
|
||||||
|
// We rewrite them to local relative paths and download the images.
|
||||||
|
const images: DocmindExtractedImage[] = [];
|
||||||
|
const imageRefRegex = /!\[([^\]]*)\]\((https?:\/\/[^)]+)\)/g;
|
||||||
|
const localMarkdown = markdown.replace(imageRefRegex, (match, altText: string, url: string) => {
|
||||||
|
const idx = images.findIndex((img) => img.filename === extractFilename(altText, url, images.length));
|
||||||
|
if (idx >= 0) {
|
||||||
|
const img = images[idx]!;
|
||||||
|
return ``;
|
||||||
|
}
|
||||||
|
return match;
|
||||||
|
});
|
||||||
|
|
||||||
|
// Collect all image URLs first, then download.
|
||||||
|
const imageUrls: Array<{ url: string; altText: string }> = [];
|
||||||
|
let match: RegExpExecArray | null;
|
||||||
|
const collectRegex = /!\[([^\]]*)\]\((https?:\/\/[^)]+)\)/g;
|
||||||
|
while ((match = collectRegex.exec(markdown)) !== null) {
|
||||||
|
imageUrls.push({ url: match[2]!, altText: match[1]! });
|
||||||
|
}
|
||||||
|
|
||||||
|
for (let i = 0; i < imageUrls.length; i++) {
|
||||||
|
const { url, altText } = imageUrls[i]!;
|
||||||
|
const filename = extractFilename(altText, url, i);
|
||||||
|
try {
|
||||||
|
const imgResp = await fetch(url);
|
||||||
|
if (!imgResp.ok) continue;
|
||||||
|
const data = new Uint8Array(await imgResp.arrayBuffer());
|
||||||
|
images.push({ filename, data });
|
||||||
|
} catch {
|
||||||
|
// Best-effort: skip images that fail to download.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rewrite markdown with local image paths.
|
||||||
|
let finalMarkdown = markdown;
|
||||||
|
let imageIdx = 0;
|
||||||
|
finalMarkdown = finalMarkdown.replace(imageRefRegex, (match, altText: string, _url: string) => {
|
||||||
|
if (imageIdx < images.length) {
|
||||||
|
const img = images[imageIdx]!;
|
||||||
|
imageIdx++;
|
||||||
|
return ``;
|
||||||
|
}
|
||||||
|
return match;
|
||||||
|
});
|
||||||
|
|
||||||
|
if (pageCount === 0) {
|
||||||
|
pageCount = Math.max(1, images.length);
|
||||||
|
}
|
||||||
|
const costUsd = (pageCount > 0 ? pageCount : 1) * COST_PER_PAGE_USD;
|
||||||
|
|
||||||
|
return { markdown: finalMarkdown, images, pageCount, costUsd, requestId: jobId };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function sleep(ms: number): Promise<void> {
|
||||||
|
return new Promise((resolve) => {
|
||||||
|
setTimeout(resolve, ms);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Derive a clean filename from the alt text or URL. */
|
||||||
|
function extractFilename(altText: string, url: string, index: number): string {
|
||||||
|
// Try alt text first (docmind often puts the original filename).
|
||||||
|
if (altText !== "" && altText.length < 100) {
|
||||||
|
const cleaned = altText.replace(/[^a-zA-Z0-9._-]/g, "_");
|
||||||
|
if (cleaned.length > 0) return cleaned;
|
||||||
|
}
|
||||||
|
// Fall back to URL path.
|
||||||
|
const urlPath = new URL(url).pathname;
|
||||||
|
const base = basename(urlPath);
|
||||||
|
if (base !== "" && base !== "/") return base;
|
||||||
|
return `image_${index + 1}.png`;
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user