Compare commits
83 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 251ad43ca2 | |||
| 5e10419fc8 | |||
| 64b3d1fc64 | |||
| b673dd1fe9 | |||
| aaa098bb8b | |||
| 97f7972cc5 | |||
| cc42e6a7c6 | |||
| 4e01c18cac | |||
|
a12984d174
|
|||
| b93acd8e8c | |||
| 35251986af | |||
| 3ee6da7ceb | |||
| 79f72ecca8 | |||
| ae5f78f036 | |||
| 0782e155f6 | |||
|
0726dc13c8
|
|||
|
fb66614e38
|
|||
| 11de9e81db | |||
| 46ce942aec | |||
| 8990277916 | |||
| b217c16c1b | |||
| 78f94fcc8c | |||
| 7269480abb | |||
| 1d2f4657ba | |||
| 4ad0259193 | |||
| 4e2699d0a5 | |||
|
153d74d033
|
|||
|
080efa70c5
|
|||
|
ab9dfad53a
|
|||
|
adce8fb6f5
|
|||
|
b574ef871c
|
|||
|
cbe569d7e6
|
|||
|
ae870a9b73
|
|||
|
18acc823c3
|
|||
|
8d2e0cb2c6
|
|||
|
3ae0cc3e60
|
|||
|
b1ddf32238
|
|||
|
9c33a4e9b9
|
|||
|
acf7ae0cd7
|
|||
|
0968545b5a
|
|||
|
552c1c353e
|
|||
|
461d2e89b0
|
|||
| 93f252b177 | |||
| 2211beb42c | |||
| 2f0e0f2cd7 | |||
| 69837bd50c | |||
| 82f57317df | |||
| d94cc787b2 | |||
| 4f8df12fb0 | |||
|
3ebe4b754d
|
|||
|
3fa6a5a5a5
|
|||
|
be4260bcd0
|
|||
|
a4449f03c4
|
|||
|
01bc20d25f
|
|||
|
38c3231190
|
|||
|
63416e06ea
|
|||
|
39bd2c9ff7
|
|||
|
e17e038232
|
|||
|
678bc9f56c
|
|||
| 07aa10ef27 | |||
| 816af1abdb | |||
|
3a50ed0ce2
|
|||
| 53d372e29b | |||
| 530fcdd2b7 | |||
| 53998d2651 | |||
| 5b55cf18a8 | |||
| b0d691d53f | |||
| 1f48c5b707 | |||
| 12a2f3117f | |||
| 2ee84d9543 | |||
| 3087132083 | |||
| 63c86322de | |||
| ebf870249f | |||
| f065f9f978 | |||
| e7ad5580ec | |||
| 19d942e812 | |||
| e5e923dd34 | |||
| df0b12e38b | |||
| 83ec835d4c | |||
| 6ed56ddfc8 | |||
| 3bf643ff4d | |||
| d36b00bbec | |||
| 17c0536958 |
@@ -0,0 +1,126 @@
|
|||||||
|
name: deploy admin (hub fleet)
|
||||||
|
|
||||||
|
# Rolls Hub releases that include the org-admin SPA (`admin-web` → registerStaticSpa)
|
||||||
|
# onto the managed Alpha host. Two fleets share one machine and are separated by
|
||||||
|
# the middle DNS label of each Silo's public URL:
|
||||||
|
#
|
||||||
|
# dev → https://<slug>.educraft-dev.paradigm-edu.net (every push + PR)
|
||||||
|
# prod → https://<slug>.educraft.paradigm-edu.net (main + tags)
|
||||||
|
#
|
||||||
|
# Example prod tenant:
|
||||||
|
# https://para-26071100.educraft.paradigm-edu.net/auth/feishu/para-26071100
|
||||||
|
#
|
||||||
|
# Required Gitea secret:
|
||||||
|
# DEPLOY_SSH_KEY — private key for root@39.107.254.4
|
||||||
|
#
|
||||||
|
# Optional secrets / vars (defaults match NEW_SILO_RUNBOOK):
|
||||||
|
# DEPLOY_HOST, DEPLOY_USER, DEPLOY_SSH_PORT, DEPLOY_BASE
|
||||||
|
# vars.ALLOW_EMPTY_FLEET=1 — green when the fleet has no silos yet
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
paths:
|
||||||
|
- "hub/**"
|
||||||
|
- ".gitea/workflows/deploy-admin.yml"
|
||||||
|
pull_request:
|
||||||
|
paths:
|
||||||
|
- "hub/**"
|
||||||
|
- ".gitea/workflows/deploy-admin.yml"
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
fleet:
|
||||||
|
description: "Which fleet to deploy (dev | prod | both)"
|
||||||
|
required: true
|
||||||
|
default: both
|
||||||
|
allow_empty_fleet:
|
||||||
|
description: "Succeed if no silo matches (1/0)"
|
||||||
|
required: false
|
||||||
|
default: "0"
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: deploy-admin-host
|
||||||
|
cancel-in-progress: false
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
deploy-dev:
|
||||||
|
name: deploy fleet dev (educraft-dev)
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: >
|
||||||
|
github.event_name == 'pull_request' ||
|
||||||
|
(github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/')) ||
|
||||||
|
(github.event_name == 'workflow_dispatch' &&
|
||||||
|
(github.event.inputs.fleet == 'dev' || github.event.inputs.fleet == 'both'))
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v5
|
||||||
|
|
||||||
|
- name: Install rsync + ssh
|
||||||
|
run: sudo apt-get update && sudo apt-get install -y rsync openssh-client
|
||||||
|
|
||||||
|
- name: Deploy Hub + admin SPA to educraft-dev fleet
|
||||||
|
env:
|
||||||
|
CPH_FLEET: dev
|
||||||
|
PLATFORM_DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
|
||||||
|
PLATFORM_DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
|
||||||
|
PLATFORM_DEPLOY_PORT: ${{ secrets.DEPLOY_SSH_PORT }}
|
||||||
|
PLATFORM_DEPLOY_BASE: ${{ secrets.DEPLOY_BASE }}
|
||||||
|
PLATFORM_DEPLOY_RELEASE: ${{ github.sha }}
|
||||||
|
ALLOW_EMPTY_FLEET: ${{ github.event.inputs.allow_empty_fleet || vars.ALLOW_EMPTY_FLEET || '0' }}
|
||||||
|
DEPLOY_SSH_KEY_BODY: ${{ secrets.DEPLOY_SSH_KEY }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
if [ -z "${DEPLOY_SSH_KEY_BODY:-}" ]; then
|
||||||
|
echo "missing secret DEPLOY_SSH_KEY" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
key="$(mktemp)"
|
||||||
|
trap 'rm -f "$key"' EXIT
|
||||||
|
printf '%s\n' "$DEPLOY_SSH_KEY_BODY" >"$key"
|
||||||
|
chmod 600 "$key"
|
||||||
|
export PLATFORM_DEPLOY_SSH_KEY="$key"
|
||||||
|
# Apply managed-host defaults when secrets are unset.
|
||||||
|
export PLATFORM_DEPLOY_HOST="${PLATFORM_DEPLOY_HOST:-39.107.254.4}"
|
||||||
|
export PLATFORM_DEPLOY_USER="${PLATFORM_DEPLOY_USER:-root}"
|
||||||
|
export PLATFORM_DEPLOY_PORT="${PLATFORM_DEPLOY_PORT:-22}"
|
||||||
|
export PLATFORM_DEPLOY_BASE="${PLATFORM_DEPLOY_BASE:-/srv/curriculum-project-hub}"
|
||||||
|
bash hub/deploy/deploy_fleet_release.sh
|
||||||
|
|
||||||
|
deploy-prod:
|
||||||
|
name: deploy fleet prod (educraft)
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: >
|
||||||
|
(github.event_name == 'push' && github.ref == 'refs/heads/main') ||
|
||||||
|
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) ||
|
||||||
|
(github.event_name == 'workflow_dispatch' &&
|
||||||
|
(github.event.inputs.fleet == 'prod' || github.event.inputs.fleet == 'both'))
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v5
|
||||||
|
|
||||||
|
- name: Install rsync + ssh
|
||||||
|
run: sudo apt-get update && sudo apt-get install -y rsync openssh-client
|
||||||
|
|
||||||
|
- name: Deploy Hub + admin SPA to educraft fleet
|
||||||
|
env:
|
||||||
|
CPH_FLEET: prod
|
||||||
|
PLATFORM_DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
|
||||||
|
PLATFORM_DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
|
||||||
|
PLATFORM_DEPLOY_PORT: ${{ secrets.DEPLOY_SSH_PORT }}
|
||||||
|
PLATFORM_DEPLOY_BASE: ${{ secrets.DEPLOY_BASE }}
|
||||||
|
PLATFORM_DEPLOY_RELEASE: ${{ github.sha }}
|
||||||
|
ALLOW_EMPTY_FLEET: ${{ github.event.inputs.allow_empty_fleet || vars.ALLOW_EMPTY_FLEET || '0' }}
|
||||||
|
DEPLOY_SSH_KEY_BODY: ${{ secrets.DEPLOY_SSH_KEY }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
if [ -z "${DEPLOY_SSH_KEY_BODY:-}" ]; then
|
||||||
|
echo "missing secret DEPLOY_SSH_KEY" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
key="$(mktemp)"
|
||||||
|
trap 'rm -f "$key"' EXIT
|
||||||
|
printf '%s\n' "$DEPLOY_SSH_KEY_BODY" >"$key"
|
||||||
|
chmod 600 "$key"
|
||||||
|
export PLATFORM_DEPLOY_SSH_KEY="$key"
|
||||||
|
export PLATFORM_DEPLOY_HOST="${PLATFORM_DEPLOY_HOST:-39.107.254.4}"
|
||||||
|
export PLATFORM_DEPLOY_USER="${PLATFORM_DEPLOY_USER:-root}"
|
||||||
|
export PLATFORM_DEPLOY_PORT="${PLATFORM_DEPLOY_PORT:-22}"
|
||||||
|
export PLATFORM_DEPLOY_BASE="${PLATFORM_DEPLOY_BASE:-/srv/curriculum-project-hub}"
|
||||||
|
bash hub/deploy/deploy_fleet_release.sh
|
||||||
@@ -11,6 +11,9 @@
|
|||||||
# regenerable, not for VCS. The embedded engine mounts cph-render directly.
|
# regenerable, not for VCS. The embedded engine mounts cph-render directly.
|
||||||
render/vendor/local-packages/
|
render/vendor/local-packages/
|
||||||
|
|
||||||
|
# Environment
|
||||||
|
.env
|
||||||
|
|
||||||
# Node (hub/ TS workspace and any future JS package)
|
# Node (hub/ TS workspace and any future JS package)
|
||||||
node_modules/
|
node_modules/
|
||||||
|
|
||||||
|
|||||||
@@ -28,9 +28,19 @@
|
|||||||
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
|
||||||
控制面与 Docker adapter 后置(见 ADR-0025)。
|
控制面与 Docker adapter 后置(见 ADR-0025)。
|
||||||
- Agent skill 只来自 Hub release 内审核过的显式 allowlist,以 release-owned 只读 local
|
- Agent role 与 skill 是 Organization-scoped 动态运行配置:role 组合 model、system prompt、
|
||||||
plugin 加载;`settingSources: []` 继续禁用项目/用户配置加载。不得把任意 workspace
|
tools 与已安装 skill;skill 版本进入 content-addressed 持久存储,run 只读加载所选快照。
|
||||||
`.claude` 配置或未审核 skill 变成运行时能力(见 ADR-0018)。
|
每个 Organization 必须且只能有一个启用中的默认 role;新建群绑定从该默认值初始化,之后
|
||||||
|
`ProjectGroupBinding` 持久化群内当前 role,run 在接纳时冻结该 role。飞书公开 slash 协议只含
|
||||||
|
`/project`、`/usage`、`/help`;role、会话、目录操作走 `/project` 卡片,Claude 原生
|
||||||
|
`/compact` 只能由卡片动作以未经包装的精确 prompt 转发。
|
||||||
|
`settingSources: []` 继续禁用项目/用户配置加载,不得把任意 workspace `.claude` 配置变成
|
||||||
|
运行时能力(见 ADR-0018)。
|
||||||
|
- 项目发现由 `ProjectDiscovery` 模块统一承载:PostgreSQL `pg_trgm` 搜索派生文档、项目编号
|
||||||
|
归一化、完整 Folder breadcrumb、MANAGE 授权过滤与分页都在该模块内;飞书卡片只是 adapter。
|
||||||
|
`Project`/`Folder` 仍是事实来源,搜索文档必须可重建且由数据库触发器同步,禁止调用方双写。
|
||||||
|
系统 `Inbox` 只作为未分类项目的内部落点,不作为业务 folder 暴露;已绑定群通过
|
||||||
|
`@bot /project` 随时打开项目管理卡片,重命名仍走 org-scoped MANAGE 授权与审计。
|
||||||
|
|
||||||
## 纪律
|
## 纪律
|
||||||
|
|
||||||
|
|||||||
@@ -34,8 +34,36 @@ provider runtime cursor needed to continue a conversation. For Claude Code SDK,
|
|||||||
that cursor is the `result.session_id`; store it in `AgentSession.metadata` as
|
that cursor is the `result.session_id`; store it in `AgentSession.metadata` as
|
||||||
`claudeSessionId` and pass it back to the next `query()` call as
|
`claudeSessionId` and pass it back to the next `query()` call as
|
||||||
`options.resume`. Role is part of the session binding because role prompts and
|
`options.resume`. Role is part of the session binding because role prompts and
|
||||||
tool surfaces can differ even when the underlying model is the same; `/draft`
|
tool surfaces can differ even when the underlying model is the same. A Feishu
|
||||||
and `/review` must not resume the same Claude runtime cursor by accident.
|
project group's active binding selects one Organization role for ordinary
|
||||||
|
messages. Switching that selection routes future messages to the selected
|
||||||
|
role's own session; it never mutates or merges provider cursors across roles.
|
||||||
|
Work freezes the selected role when accepted so queued requests cannot drift
|
||||||
|
after a later switch.
|
||||||
|
|
||||||
|
Role definitions are Organization-scoped runtime data. A role bundle selects
|
||||||
|
its default model, system prompt, tool allowlist and installed Agent skill
|
||||||
|
versions. PostgreSQL is authoritative for role composition and skill metadata;
|
||||||
|
skill bytes live in a content-addressed persistent store selected only by the
|
||||||
|
recorded SHA-256 digest. Updating a role or binding skills takes effect without
|
||||||
|
a Hub release or process restart. A change to the role's execution surface
|
||||||
|
(model, prompt, tools, selected skill content) archives its active sessions so
|
||||||
|
the next run cannot resume a provider context created under stale instructions;
|
||||||
|
label and ordering-only changes preserve conversational continuity.
|
||||||
|
|
||||||
|
Exactly one active role per Organization is the default used when a project
|
||||||
|
group is first bound. The default is configuration data, not a hard-coded role
|
||||||
|
name. Roles are selected through the Hub project console; role ids are not
|
||||||
|
public slash commands. A project participant may change the group's shared
|
||||||
|
selection only when both `agent.trigger` for the project and `role.trigger` for
|
||||||
|
the target role authorize that actor. The selection affects every participant's
|
||||||
|
future messages, while already accepted work keeps its frozen role.
|
||||||
|
|
||||||
|
Hub slash commands are a closed control-plane protocol. Unknown commands fail
|
||||||
|
explicitly and are never downgraded to Agent text. Claude SDK session commands
|
||||||
|
are invoked only through typed Hub actions. In particular, compaction resumes
|
||||||
|
the selected role session and sends the exact `/compact` prompt without
|
||||||
|
prepending Feishu context.
|
||||||
|
|
||||||
Environment variables:
|
Environment variables:
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -122,14 +122,24 @@ The boundary is enforced by the Claude Code SDK's built-in sandbox
|
|||||||
- `settingSources: []` and strict MCP configuration prevent an untrusted
|
- `settingSources: []` and strict MCP configuration prevent an untrusted
|
||||||
workspace or service-user config from widening tools, hooks, MCP servers, or
|
workspace or service-user config from widening tools, hooks, MCP servers, or
|
||||||
sandbox paths.
|
sandbox paths.
|
||||||
- Platform-curated Agent skills are immutable Hub release assets, loaded as a
|
- Agent skills are Organization-scoped runtime configuration, not Hub release
|
||||||
programmatic local plugin from a release-owned path. The sandbox exposes that
|
assets. Skill content is imported into a content-addressed persistent store
|
||||||
path read-only, and the SDK receives only plugin-qualified allowlist names
|
through a shared ingestion pipeline (`importSkillDirectory` for host-console
|
||||||
through its `skills` option. Filesystem setting sources remain disabled, so a
|
CLI, `importSkillFromFiles` for org-admin web surface) that enforces the same
|
||||||
project cannot register another skill or widen its tools through `.claude`
|
safety checks: `SKILL.md` manifest required, 512-file / 16-byte limits,
|
||||||
settings. Requested skill ids are recorded on `run.created`; SDK
|
symlink rejection, SHA-256 content addressing. The web surface
|
||||||
initialization/results remain the authoritative evidence that loading
|
(`OrganizationAgentConfiguration.installSkillFromFiles`) writes to the same
|
||||||
actually succeeded.
|
store as the host-console CLI (`installSkill`); both flow through
|
||||||
|
`commitSkillContent` for deduplication and atomic rename into
|
||||||
|
`versions/<digest>/`. Org-admin authentication gates the web surface; the
|
||||||
|
content-addressed store remains platform-controlled. A role selects enabled
|
||||||
|
Organization skills alongside its model, system prompt and tool allowlist.
|
||||||
|
Each run copies only those selected immutable versions into a run-scoped
|
||||||
|
plugin outside the project workspace; the sandbox exposes that snapshot
|
||||||
|
read-only and deletes it after the run. SDK-bundled skills and filesystem
|
||||||
|
setting sources remain disabled, so project `.claude` content cannot register
|
||||||
|
skills or widen tools. Requested skill versions are recorded on
|
||||||
|
`run.created`; SDK initialization remains authoritative loading evidence.
|
||||||
- Network: open (see Open Questions).
|
- Network: open (see Open Questions).
|
||||||
|
|
||||||
`bypassPermissions` is kept (headless server — no interactive prompts); the
|
`bypassPermissions` is kept (headless server — no interactive prompts); the
|
||||||
|
|||||||
@@ -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.
|
||||||
|
After Width: | Height: | Size: 106 KiB |
|
After Width: | Height: | Size: 159 KiB |
|
After Width: | Height: | Size: 140 KiB |
|
After Width: | Height: | Size: 135 KiB |
|
After Width: | Height: | Size: 128 KiB |
|
After Width: | Height: | Size: 101 KiB |
@@ -1,81 +1,221 @@
|
|||||||
# para-26071100 飞书应用配置清单
|
# Educraft 组织接入与飞书应用配置指南
|
||||||
|
|
||||||
本文供 `para-26071100` 的飞书企业管理员操作。不要把 App Secret 粘贴到群聊、工单或本文档中;请通过约定的安全渠道交给平台部署人员。
|
本文供准备接入 Educraft Alpha Silo 的学校、教培机构和组织管理员使用。完成本文后,请把末尾的“部署信息交付单”交给 Educraft 部署人员;我们会为组织创建独立的服务账号、数据库、运行目录和域名入口。
|
||||||
|
|
||||||
## 1. 创建企业自建应用
|
> **安全提醒:** App Secret、模型 Provider Token 属于密钥,禁止粘贴到飞书群、普通云文档、工单正文或截图中。请只通过双方约定的安全渠道传递。
|
||||||
|
|
||||||
1. 打开飞书开放平台开发者后台。
|
## 1. 双方分别负责什么
|
||||||
2. 在目标企业下创建“企业自建应用”。
|
|
||||||
3. 应用名称可填写 `Educraft para-26071100`。
|
|
||||||
4. 在“凭证与基础信息”记录:
|
|
||||||
- App ID(通常以 `cli_` 开头)
|
|
||||||
- App Secret
|
|
||||||
5. 添加并启用“机器人”能力。
|
|
||||||
|
|
||||||
Bot Open ID 不需要管理员手工寻找。平台部署人员会使用 App ID/App Secret 调用飞书 Bot Info API 获取,并在 bootstrap 时校验它确实属于这一个应用。
|
| 角色 | 负责事项 |
|
||||||
|
| --- | --- |
|
||||||
|
| 组织管理员 | 创建企业自建应用、启用机器人、开通最小权限、配置事件、回调和 OAuth 重定向 URL、发布应用、提供 OWNER 身份 |
|
||||||
|
| Educraft 部署人员 | 分配组织 slug 和域名、部署独立 Silo、加密保存应用及模型密钥、初始化 OWNER、联调和验收 |
|
||||||
|
| 试点 OWNER | 把机器人加入试点群、创建或绑定项目、组织首轮验收 |
|
||||||
|
|
||||||
## 2. 开通权限
|
## 2. 创建企业自建应用
|
||||||
|
|
||||||
在“权限管理”中搜索并申请下列能力。飞书控制台的中文名称可能随版本调整;如控制台同时显示 scope,可优先核对括号中的 scope。
|
1. 打开[飞书开放平台开发者后台](https://open.feishu.cn/app)。
|
||||||
|
2. 在目标企业下点击“创建企业自建应用”。应用名称建议填写“Educraft + 组织简称”。
|
||||||
|
3. 进入“凭证与基础信息”,记录 App ID 和 App Secret。
|
||||||
|
4. 进入“添加应用能力”,添加并启用“机器人”。
|
||||||
|
|
||||||
- 接收群聊中 @ 机器人的消息(`im:message.group_at_msg:readonly`)
|

|
||||||
- 以应用身份发送消息(`im:message:send_as_bot`)
|
|
||||||
- 获取消息内容,用于读取触发消息和线程上下文(`im:message:readonly`)
|
|
||||||
- 获取与上传图片或文件资源(`im:resource`)
|
|
||||||
- 添加、删除消息表情回复(`im:message.reactions:write_only`)
|
|
||||||
- 获取用户基本信息(`contact:user.base:readonly`、`contact:user.basic_profile:readonly`)
|
|
||||||
|
|
||||||
如果飞书 API 调试台提示某个上述操作缺少更细粒度权限,请把提示截图交给平台部署人员,不要直接勾选通讯录全量读取或其他超出清单的权限。
|
App ID 通常以 `cli_` 开头,可以写入交付单。App Secret 必须通过安全渠道单独发送。Bot Open ID 不需要管理员手工查找;部署程序会用 App ID/App Secret 调用 Bot Info API 获取并校验归属。
|
||||||
|
|
||||||
## 3. 配置事件与卡片回调
|
## 3. 开通最小权限
|
||||||
|
|
||||||
1. 进入“事件与回调”。
|
进入“权限管理”,点击“开通权限”,搜索并申请以下应用身份权限。控制台中文名称可能调整,请优先核对 scope。
|
||||||
2. 订阅方式选择“使用长连接接收事件”。
|
|
||||||
3. 添加事件 `im.message.receive_v1`(接收消息)。
|
|
||||||
4. 启用卡片交互回调 `card.action.trigger`,用于审批、中断运行和群聊建项目按钮。
|
|
||||||
5. 不需要填写公网 Event Callback URL;Hub 使用飞书长连接。
|
|
||||||
|
|
||||||
## 4. 配置 OAuth 回调
|
| 用途 | Scope |
|
||||||
|
| --- | --- |
|
||||||
|
| 接收群聊中 @ 机器人的消息 | `im:message.group_at_msg:readonly` |
|
||||||
|
| 以应用身份发送消息 | `im:message:send_as_bot` |
|
||||||
|
| 读取触发消息和线程上下文 | `im:message:readonly` |
|
||||||
|
| 获取与上传图片或文件 | `im:resource` |
|
||||||
|
| 添加、删除消息表情回复 | `im:message.reactions:write_only` |
|
||||||
|
| 获取用户基本信息 | `contact:user.base:readonly` |
|
||||||
|
| 获取用户基本资料 | `contact:user.basic_profile:readonly` |
|
||||||
|
| 通过手机号或邮箱查询 OWNER Open ID | `contact:user.id:readonly` |
|
||||||
|
|
||||||
域名 DNS 和 TLS 生效后,在安全设置/重定向 URL 中添加:
|
### 批量导入权限(推荐)
|
||||||
|
|
||||||
```text
|
在“权限管理”页面点击“批量处理 → 导入”,粘贴以下 JSON 后确认。导入只会新增本次列出的权限,不会删除或影响应用已经申请、开通的其他权限。
|
||||||
https://para-26071100.educraft.paradigm-edu.net/auth/feishu/callback
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"scopes": {
|
||||||
|
"tenant": [
|
||||||
|
"im:message.group_at_msg:readonly",
|
||||||
|
"im:message:send_as_bot",
|
||||||
|
"im:message:readonly",
|
||||||
|
"im:resource",
|
||||||
|
"im:message.reactions:write_only",
|
||||||
|
"contact:user.base:readonly",
|
||||||
|
"contact:user.basic_profile:readonly",
|
||||||
|
"contact:user.id:readonly"
|
||||||
|
],
|
||||||
|
"user": []
|
||||||
|
}
|
||||||
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
该回调用于 OWNER 登录受控的 Host Console。飞书群机器人长连接本身不依赖这个 URL。
|
Educraft 机器人以应用身份调用上述 API,因此这些 scope 全部放在 `tenant`,不要为了省事把相同权限重复放进 `user`。
|
||||||
|
|
||||||
## 5. 发布并安装应用
|

|
||||||
|
|
||||||
1. 创建应用版本并提交企业管理员审核。
|
如果 API 调试台提示缺少更细粒度权限,请把错误提示和发生时间截图给部署人员。不要自行开通通讯录全量读取等超出本表的权限。
|
||||||
2. 将应用可用范围至少包含试点 OWNER 和试点群成员。
|
|
||||||
3. 发布版本。
|
|
||||||
4. 将机器人加入准备试用的飞书群。
|
|
||||||
|
|
||||||
## 6. 获取首位 OWNER 身份
|
## 4. 配置事件与卡片回调
|
||||||
|
|
||||||
平台 bootstrap 需要 OWNER 的飞书 Open ID 和显示名称。可通过飞书 API 调试台的用户信息接口查询;Open ID 通常以 `ou_` 开头。Union ID 可选,不影响首次部署。
|
进入“事件与回调”。
|
||||||
|
|
||||||
请把以下结果通过安全渠道交给平台部署人员:
|
1. 在“事件配置”中将订阅方式设为“使用长连接接收事件”。
|
||||||
|
2. 添加事件“接收消息” `im.message.receive_v1`。
|
||||||
|
3. 添加事件“解散群” `im.chat.disbanded_v1`,用于立即归档该群的项目绑定。
|
||||||
|
4. 添加事件“机器人被移出群” `im.chat.member.bot.deleted_v1`,用于立即归档该群的项目绑定。
|
||||||
|
5. 在“回调配置”中同样选择长连接。
|
||||||
|
6. 添加回调“卡片回传交互” `card.action.trigger`,用于审批、运行中断和项目创建/绑定按钮。
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
这里不需要填写公网 Event Callback URL。Educraft Hub 使用飞书官方 SDK 的长连接模式。
|
||||||
|
|
||||||
|
## 5. 配置用户 OAuth 重定向 URL(必需)
|
||||||
|
|
||||||
|
普通群成员首次使用前,需要通过飞书 OAuth 建立其在本应用下的用户身份。进入“安全设置 → 重定向 URL”,添加组织专属 callback:
|
||||||
|
|
||||||
```text
|
```text
|
||||||
Organization: para-26071100
|
https://<organization-slug>.educraft.paradigm-edu.net/auth/feishu/callback
|
||||||
App ID: cli_...
|
|
||||||
App Secret: (安全渠道发送)
|
|
||||||
OWNER Open ID: ou_...
|
|
||||||
OWNER 显示名称:
|
|
||||||
OWNER Union ID: (可选)
|
|
||||||
试点群名称: (可选,便于验收)
|
|
||||||
```
|
```
|
||||||
|
|
||||||
## 7. 验收动作
|
例如组织 slug 为 `example-school`:
|
||||||
|
|
||||||
平台通知部署完成后:
|
```text
|
||||||
|
https://example-school.educraft.paradigm-edu.net/auth/feishu/callback
|
||||||
|
```
|
||||||
|
|
||||||
1. OWNER 打开 Host Console,完成飞书 OAuth 登录。
|

|
||||||
2. 在试点群中 @机器人发送一条纯文本消息。
|
|
||||||
3. 如果群尚未绑定项目,机器人应返回项目创建/绑定卡片。
|
|
||||||
4. 创建项目后再次 @机器人,确认出现处理状态、流式卡片和最终回答。
|
|
||||||
5. 再测试一个小文件附件,以及运行中断按钮。
|
|
||||||
|
|
||||||
任何一步失败时,请保留发生时间、群名、消息截图和飞书 request/log ID;不要在截图中包含 App Secret 或 Provider token。
|
必须使用 Educraft 部署人员最终确认的 slug;不要直接照抄示例。该 URL 用于 OAuth 返回并创建应用作用域下的飞书用户身份,不代表当前已经开放组织管理台。
|
||||||
|
|
||||||
|
组织专属 OAuth 同时完成身份建立和入组:首次成功登录的用户会自动成为当前 Organization 的 `MEMBER`,回到群聊即可使用。`OWNER` 和 `ADMIN` 仍只能由部署人员或管理员显式授予;曾被移除的成员重新登录不会自动恢复资格。
|
||||||
|
|
||||||
|
## 6. 发布并安装应用
|
||||||
|
|
||||||
|
1. 进入“版本管理与发布”,点击“创建版本”。
|
||||||
|
2. 将应用可用范围至少覆盖试点 OWNER 和试点群成员。
|
||||||
|
3. 提交企业管理员审核并发布。
|
||||||
|
4. 发布成功后,将机器人加入准备试用的群。
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
仅保存开发配置但未发布时,新增权限、事件和可用范围通常不会对试点用户生效。
|
||||||
|
|
||||||
|
## 7. 获取首位 OWNER 身份
|
||||||
|
|
||||||
|
首次部署必须指定一位组织 OWNER。OWNER 是 Educraft 组织内的初始管理员,不等同于飞书应用所有者;两者可以是同一个人,也可以不同。部署所需的 Open ID 必须由本次创建的企业自建应用查询,因为同一用户在不同应用下的 Open ID 不同,不能复用其他应用查到的值。
|
||||||
|
|
||||||
|
### 7.1 确认 OWNER
|
||||||
|
|
||||||
|
先确认哪一位企业成员将担任 OWNER。记录其飞书显示名称,并准备在飞书的成员选择器中按姓名找到本人。若企业内有同名成员,选择前须通过部门等信息核对身份。
|
||||||
|
|
||||||
|
### 7.2 开通查询权限和数据范围
|
||||||
|
|
||||||
|
确认应用已开通上文列出的用户基本信息和用户 ID 权限。如果使用上文的批量导入 JSON,这些权限已包含在内。
|
||||||
|
|
||||||
|
应用的通讯录数据范围还必须覆盖这位 OWNER。最小做法是把 OWNER 加入应用可用范围;不需要为此开放全企业通讯录。
|
||||||
|
|
||||||
|
### 7.3 在官方接口页面获取 Open ID
|
||||||
|
|
||||||
|
1. 打开飞书开放平台的[“获取单个用户信息”接口页面](https://open.feishu.cn/document/server-docs/contact-v3/user/get)。如果使用带 `appId` 参数的页面链接,可以直接进入对应应用;本文不提供固定 App ID,请在页面顶部选择本组织刚创建的企业自建应用,并核对 App ID 与交付单一致。
|
||||||
|
2. 找到路径参数 `user_id`,点击参数输入框旁的“获取”。
|
||||||
|
3. 在成员选择器中找到并选择 OWNER;如有同名成员,依据部门等信息确认本人。
|
||||||
|
4. ID 类型选择 `open_id`。将选择器返回的值填入 `user_id`,并保持查询参数 `user_id_type=open_id`。
|
||||||
|
5. 以应用身份(`tenant_access_token`)调用接口,核对成功响应中 `data.user.name` 与 OWNER 本人一致。
|
||||||
|
6. 复制完整的 `data.user.open_id` 交给 Educraft 部署人员。Open ID 通常以 `ou_` 开头。
|
||||||
|
|
||||||
|
参数旁的“获取”是飞书文档调试台提供的成员选择功能,不是要求管理员预先知道 Open ID。不要复用其他应用查到的 Open ID;同一用户在不同应用下的 Open ID 不同。若无法选择成员或接口调用失败,依次检查:页面当前选择的 App ID、应用可用范围和通讯录数据范围是否覆盖 OWNER、用户基本信息与用户 ID 权限是否已开通并随应用版本发布。
|
||||||
|
|
||||||
|
### 7.4 核对并交付
|
||||||
|
|
||||||
|
交付前完成以下检查:
|
||||||
|
|
||||||
|
- 返回用户的姓名与 OWNER 本人一致;
|
||||||
|
- Open ID 来自本次组织的这一个 App ID;
|
||||||
|
- Open ID 完整复制,没有空格或省略号;
|
||||||
|
- 显示名称使用组织希望在 Educraft 中展示的姓名;
|
||||||
|
- Union ID 不是必填项,查不到可以留空。
|
||||||
|
|
||||||
|
最终向部署人员提供:
|
||||||
|
|
||||||
|
```text
|
||||||
|
OWNER Open ID:ou_...
|
||||||
|
OWNER 显示名称:
|
||||||
|
OWNER Union ID:(可选)
|
||||||
|
用于查询的 App ID:cli_...
|
||||||
|
```
|
||||||
|
|
||||||
|
Open ID 和显示名称可以放在普通交付单中;不要把 App Secret 一起粘贴进去。
|
||||||
|
|
||||||
|
## 8. 部署信息交付单
|
||||||
|
|
||||||
|
请复制下面的模板填写。标注“安全渠道”的字段不要与普通字段放在同一条群消息或云文档中。
|
||||||
|
|
||||||
|
```text
|
||||||
|
【组织信息】
|
||||||
|
组织正式名称:
|
||||||
|
组织简称:
|
||||||
|
期望 organization slug:(小写字母、数字和连字符,例如 example-school)
|
||||||
|
期望机器人显示名称:
|
||||||
|
|
||||||
|
【飞书应用】
|
||||||
|
App ID:cli_...
|
||||||
|
App Secret:(通过安全渠道单独发送)
|
||||||
|
应用已发布:是 / 否
|
||||||
|
机器人能力已启用:是 / 否
|
||||||
|
消息事件(含解散群、机器人被移出群)和卡片回调已配置:是 / 否
|
||||||
|
OAuth 重定向 URL 已配置:是 / 否
|
||||||
|
|
||||||
|
【首位 OWNER】
|
||||||
|
OWNER Open ID:ou_...
|
||||||
|
OWNER 显示名称:
|
||||||
|
OWNER Union ID:(可选)
|
||||||
|
|
||||||
|
【试点范围】
|
||||||
|
试点群名称:(可选,用于验收定位)
|
||||||
|
初始 Team 名称:(可选;没有 Team 不影响首次部署)
|
||||||
|
预计试用人数:
|
||||||
|
|
||||||
|
【模型配置】
|
||||||
|
Provider 名称:(例如 OpenRouter)
|
||||||
|
Provider Base URL:
|
||||||
|
Provider Token:(通过安全渠道单独发送)
|
||||||
|
启用的模型 ID:
|
||||||
|
```
|
||||||
|
|
||||||
|
Educraft 部署人员收到信息后,会回传最终 organization slug、访问域名、部署窗口和验收时间。若期望 slug 已被占用或不符合命名规则,会在部署前协调调整。
|
||||||
|
|
||||||
|
## 9. 上线验收
|
||||||
|
|
||||||
|
部署人员通知服务就绪后,由 OWNER 完成:
|
||||||
|
|
||||||
|
1. OWNER 在试点群中 @机器人发送一条纯文本消息。
|
||||||
|
2. 如果群尚未绑定项目,确认机器人返回项目创建/绑定卡片。
|
||||||
|
3. 创建项目后再次 @机器人,确认出现处理状态、流式卡片和最终回答。
|
||||||
|
4. 选择一位非 OWNER 试点成员完成 OAuth 登录,确认其自动以 MEMBER 身份加入组织。
|
||||||
|
5. 该成员在同一群中 @机器人,确认能够进入已绑定项目。
|
||||||
|
6. 测试一个小文件附件、一次运行中断,以及一个需要生成文档的任务。
|
||||||
|
|
||||||
|
出现问题时,请保留发生时间、群名、消息截图和飞书 request/log ID。截图前确认其中不包含 App Secret、Provider Token 或其他密钥。
|
||||||
|
|
||||||
|
## 10. Alpha 阶段边界
|
||||||
|
|
||||||
|
- 每个组织运行在独立的系统用户、服务实例、数据库和持久化目录中。
|
||||||
|
- 组织的 role、system prompt、tools 和 skills 是运行时配置,不需要跟随版本发布。
|
||||||
|
- 同一项目同一时间只执行一个任务,避免并发修改同一个 workspace;组织级并发上限由部署配置决定。
|
||||||
|
- 当前由 Educraft 人工创建组织、OWNER、Provider Connection 和初始 Team,并通过服务器上的受控管理命令运维;组织管理台尚未开放。
|
||||||
|
- 非 OWNER 试点成员通过组织专属 OAuth 首次登录后自动成为 MEMBER;OWNER/ADMIN 提权和被移除成员的恢复仍需人工操作。
|
||||||
|
- Alpha 不提供开放注册、自助密钥管理或跨组织资源共享。
|
||||||
|
|||||||
@@ -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=""
|
||||||
|
|||||||
@@ -4,3 +4,7 @@ dist/
|
|||||||
.env
|
.env
|
||||||
.env.*
|
.env.*
|
||||||
!.env.example
|
!.env.example
|
||||||
|
.secrets/
|
||||||
|
admin-web/node_modules/
|
||||||
|
admin-web/build/
|
||||||
|
admin-web/.svelte-kit/
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
node_modules
|
||||||
|
|
||||||
|
# Output
|
||||||
|
.output
|
||||||
|
.vercel
|
||||||
|
.netlify
|
||||||
|
.wrangler
|
||||||
|
/.svelte-kit
|
||||||
|
/build
|
||||||
|
|
||||||
|
# OS
|
||||||
|
.DS_Store
|
||||||
|
Thumbs.db
|
||||||
|
|
||||||
|
# Env
|
||||||
|
.env
|
||||||
|
.env.*
|
||||||
|
!.env.example
|
||||||
|
!.env.test
|
||||||
|
|
||||||
|
# Vite
|
||||||
|
vite.config.js.timestamp-*
|
||||||
|
vite.config.ts.timestamp-*
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
engine-strict=true
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
build
|
||||||
|
.svelte-kit
|
||||||
|
node_modules
|
||||||
|
package-lock.json
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"useTabs": true,
|
||||||
|
"singleQuote": true,
|
||||||
|
"semi": true,
|
||||||
|
"trailingComma": "all",
|
||||||
|
"printWidth": 120,
|
||||||
|
"plugins": ["prettier-plugin-svelte"],
|
||||||
|
"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"recommendations": ["svelte.svelte-vscode"]
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
# sv
|
||||||
|
|
||||||
|
Everything you need to build a Svelte project, powered by [`sv`](https://github.com/sveltejs/cli).
|
||||||
|
|
||||||
|
## Creating a project
|
||||||
|
|
||||||
|
If you're seeing this, you've probably already done this step. Congrats!
|
||||||
|
|
||||||
|
```sh
|
||||||
|
# create a new project
|
||||||
|
npx sv create my-app
|
||||||
|
```
|
||||||
|
|
||||||
|
To recreate this project with the same configuration:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
# recreate this project
|
||||||
|
npx sv@0.16.2 create --template minimal --types ts --install npm D:/Projects/curriculum-project-hub/hub/admin-web
|
||||||
|
```
|
||||||
|
|
||||||
|
## Developing
|
||||||
|
|
||||||
|
Once you've created a project and installed dependencies with `npm install` (or `pnpm install` or `yarn`), start a development server:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
npm run dev
|
||||||
|
|
||||||
|
# or start the server and open the app in a new browser tab
|
||||||
|
npm run dev -- --open
|
||||||
|
```
|
||||||
|
|
||||||
|
## Building
|
||||||
|
|
||||||
|
To create a production version of your app:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
npm run build
|
||||||
|
```
|
||||||
|
|
||||||
|
You can preview the production build with `npm run preview`.
|
||||||
|
|
||||||
|
> To deploy your app, you may need to install an [adapter](https://svelte.dev/docs/kit/adapters) for your target environment.
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
{
|
||||||
|
"name": "admin-web",
|
||||||
|
"private": true,
|
||||||
|
"version": "0.0.1",
|
||||||
|
"type": "module",
|
||||||
|
"scripts": {
|
||||||
|
"dev": "vite dev",
|
||||||
|
"build": "vite build",
|
||||||
|
"preview": "vite preview",
|
||||||
|
"prepare": "svelte-kit sync || echo ''",
|
||||||
|
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
|
||||||
|
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
|
||||||
|
"format": "prettier --write .",
|
||||||
|
"format:check": "prettier --check ."
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@skeletonlabs/skeleton": "^4.15.2",
|
||||||
|
"@skeletonlabs/skeleton-svelte": "^4.15.2",
|
||||||
|
"@sveltejs/adapter-auto": "^7.0.1",
|
||||||
|
"@sveltejs/adapter-static": "^3.0.10",
|
||||||
|
"@sveltejs/kit": "^2.63.0",
|
||||||
|
"@sveltejs/vite-plugin-svelte": "^7.1.2",
|
||||||
|
"@tailwindcss/vite": "^4.3.2",
|
||||||
|
"bits-ui": "^2.18.1",
|
||||||
|
"prettier": "^3.9.5",
|
||||||
|
"prettier-plugin-svelte": "^4.1.1",
|
||||||
|
"svelte": "^5.56.1",
|
||||||
|
"svelte-check": "^4.6.0",
|
||||||
|
"tailwindcss": "^4.3.2",
|
||||||
|
"typescript": "^6.0.3",
|
||||||
|
"vite": "^8.0.16"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
// See https://svelte.dev/docs/kit/types#app.d.ts
|
||||||
|
// for information about these interfaces
|
||||||
|
declare global {
|
||||||
|
namespace App {
|
||||||
|
// interface Error {}
|
||||||
|
// interface Locals {}
|
||||||
|
// interface PageData {}
|
||||||
|
// interface PageState {}
|
||||||
|
// interface Platform {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export {};
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="zh-CN" data-theme="hamlindigo">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
|
<meta name="text-scale" content="scale" />
|
||||||
|
<meta name="description" content="Curriculum Project Hub — 组织管理后台" />
|
||||||
|
<link rel="icon" href="%sveltekit.assets%/favicon.svg" type="image/svg+xml" />
|
||||||
|
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
||||||
|
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
|
||||||
|
<link
|
||||||
|
href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&family=JetBrains+Mono:wght@400;500&family=Noto+Sans+SC:wght@400;500;600;700&display=swap"
|
||||||
|
rel="stylesheet"
|
||||||
|
/>
|
||||||
|
<style>
|
||||||
|
/* Fallback before CSS bundle: CJK-first industrial base */
|
||||||
|
html {
|
||||||
|
font-family: 'Noto Sans SC', 'PingFang SC', 'Microsoft YaHei', 'Inter', sans-serif;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<title>CPH Admin</title>
|
||||||
|
%sveltekit.head%
|
||||||
|
</head>
|
||||||
|
<body data-sveltekit-preload-data="hover">
|
||||||
|
<div style="display: contents">%sveltekit.body%</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,438 @@
|
|||||||
|
/**
|
||||||
|
* Thin API client for the org admin backend. Same-origin cookie auth.
|
||||||
|
*/
|
||||||
|
|
||||||
|
export class ApiError extends Error {
|
||||||
|
code: string;
|
||||||
|
status: number;
|
||||||
|
constructor(code: string, message: string, status: number) {
|
||||||
|
super(message);
|
||||||
|
this.name = 'ApiError';
|
||||||
|
this.code = code;
|
||||||
|
this.status = status;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function request(method: string, url: string, body?: unknown): Promise<unknown> {
|
||||||
|
const init: RequestInit = {
|
||||||
|
method,
|
||||||
|
credentials: 'same-origin',
|
||||||
|
headers: body !== undefined ? { 'content-type': 'application/json' } : undefined,
|
||||||
|
body: body !== undefined ? JSON.stringify(body) : undefined,
|
||||||
|
};
|
||||||
|
const res = await fetch(url, init);
|
||||||
|
const text = await res.text();
|
||||||
|
let data: unknown = null;
|
||||||
|
if (text !== '') {
|
||||||
|
try {
|
||||||
|
data = JSON.parse(text);
|
||||||
|
} catch {
|
||||||
|
data = text;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!res.ok) {
|
||||||
|
const err = (data as { error?: { code?: string; message?: string } } | null)?.error;
|
||||||
|
throw new ApiError(err?.code ?? 'http_error', err?.message ?? `HTTP ${res.status}`, res.status);
|
||||||
|
}
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
const get = (u: string) => request('GET', u);
|
||||||
|
const post = (u: string, b?: unknown) => request('POST', u, b);
|
||||||
|
const put = (u: string, b?: unknown) => request('PUT', u, b);
|
||||||
|
const patch = (u: string, b?: unknown) => request('PATCH', u, b);
|
||||||
|
const del = (u: string) => request('DELETE', u);
|
||||||
|
|
||||||
|
const orgBase = (slug: string) => `/api/org/${encodeURIComponent(slug)}`;
|
||||||
|
|
||||||
|
// --- Types ---
|
||||||
|
|
||||||
|
export interface OrgMembership {
|
||||||
|
id: string;
|
||||||
|
slug: string;
|
||||||
|
name: string;
|
||||||
|
status: string;
|
||||||
|
role: 'OWNER' | 'ADMIN' | 'MEMBER';
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface MeResponse {
|
||||||
|
user: {
|
||||||
|
id: string;
|
||||||
|
feishuOpenId: string;
|
||||||
|
displayName: string;
|
||||||
|
avatarUrl: string | null;
|
||||||
|
};
|
||||||
|
organizations: OrgMembership[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface OrgMember {
|
||||||
|
userId: string;
|
||||||
|
feishuOpenId: string;
|
||||||
|
displayName: string;
|
||||||
|
avatarUrl: string | null;
|
||||||
|
role: 'OWNER' | 'ADMIN' | 'MEMBER';
|
||||||
|
createdAt: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TeamRow {
|
||||||
|
id: string;
|
||||||
|
slug: string;
|
||||||
|
name: string;
|
||||||
|
description: string | null;
|
||||||
|
memberCount: number;
|
||||||
|
createdAt: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TeamMemberRow {
|
||||||
|
userId: string;
|
||||||
|
feishuOpenId: string;
|
||||||
|
displayName: string;
|
||||||
|
createdAt: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ExplorerFolder {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
parentId: string | null;
|
||||||
|
sortKey: string;
|
||||||
|
projectCount: number;
|
||||||
|
childFolderCount: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ExplorerProject {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
folderId: string | null;
|
||||||
|
createdAt: string;
|
||||||
|
binding: { chatId: string; createdAt: string } | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ExplorerData {
|
||||||
|
folders: ExplorerFolder[];
|
||||||
|
projects: ExplorerProject[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ProjectDetail {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
folderId: string | null;
|
||||||
|
folder: { id: string; name: string } | null;
|
||||||
|
workspaceDir: string;
|
||||||
|
createdAt: string;
|
||||||
|
archivedAt: string | null;
|
||||||
|
createdBy: { id: string; displayName: string; feishuOpenId: string } | null;
|
||||||
|
binding: { chatId: string; createdAt: string } | null;
|
||||||
|
actorIsOrgAdmin?: boolean;
|
||||||
|
actorCanManageProject?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TeamAccessEntry {
|
||||||
|
grantId: string;
|
||||||
|
projectId: string;
|
||||||
|
organizationId: string;
|
||||||
|
teamId: string;
|
||||||
|
teamSlug: string;
|
||||||
|
teamName: string;
|
||||||
|
role: 'READ' | 'EDIT' | 'MANAGE';
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SessionSummary {
|
||||||
|
id: string;
|
||||||
|
provider: string;
|
||||||
|
roleId: string;
|
||||||
|
model: string;
|
||||||
|
title: string | null;
|
||||||
|
runCount: number;
|
||||||
|
createdAt: string;
|
||||||
|
updatedAt: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ProviderConnectionRow {
|
||||||
|
id: string;
|
||||||
|
providerId: string;
|
||||||
|
mode: 'BYOK' | 'PLATFORM_MANAGED';
|
||||||
|
status: 'DRAFT' | 'ACTIVE' | 'DISABLED';
|
||||||
|
activeVersion: number | null;
|
||||||
|
keyId: string | null;
|
||||||
|
createdAt: string;
|
||||||
|
updatedAt: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface FeishuApplicationConnection {
|
||||||
|
id: string;
|
||||||
|
appFingerprint: string;
|
||||||
|
status: 'DRAFT' | 'ACTIVE' | 'DISABLED';
|
||||||
|
activeVersion: number | null;
|
||||||
|
keyId: string | null;
|
||||||
|
createdAt: 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 {
|
||||||
|
runCount: number;
|
||||||
|
runsWithCost: number;
|
||||||
|
runsWithoutCost: number;
|
||||||
|
inputTokens: number;
|
||||||
|
outputTokens: number;
|
||||||
|
costUsd: number | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ProjectUsageRow extends UsageTotals {
|
||||||
|
projectId: string;
|
||||||
|
projectName: string;
|
||||||
|
folderId: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface UsageReport {
|
||||||
|
from: string | null;
|
||||||
|
to: string | null;
|
||||||
|
projects: ProjectUsageRow[];
|
||||||
|
totals: UsageTotals;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type CapacityDimension =
|
||||||
|
| 'requestRate'
|
||||||
|
| 'requestBodySize'
|
||||||
|
| 'agentConcurrency'
|
||||||
|
| 'admissionQueueLength'
|
||||||
|
| 'admissionQueueWait'
|
||||||
|
| 'fileSize'
|
||||||
|
| 'attachmentCount'
|
||||||
|
| 'archiveExpansion'
|
||||||
|
| 'projectStorage'
|
||||||
|
| 'organizationStorage'
|
||||||
|
| 'memberCount'
|
||||||
|
| 'projectCount'
|
||||||
|
| 'teamCount'
|
||||||
|
| 'folderCount'
|
||||||
|
| 'sessionCount'
|
||||||
|
| 'runWallTime'
|
||||||
|
| 'runTurns'
|
||||||
|
| 'runToolCalls'
|
||||||
|
| 'toolWallTime'
|
||||||
|
| 'runOutputSize'
|
||||||
|
| 'processMemory'
|
||||||
|
| 'processCpu'
|
||||||
|
| 'processCount';
|
||||||
|
|
||||||
|
export interface CapacityDimensionRow {
|
||||||
|
dimension: CapacityDimension;
|
||||||
|
platformCeiling: number | null;
|
||||||
|
organizationLimit: number | null;
|
||||||
|
effective: number | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CapacityPolicyView {
|
||||||
|
dimensions: CapacityDimensionRow[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AgentRoleRow {
|
||||||
|
id: string;
|
||||||
|
roleId: string;
|
||||||
|
label: string;
|
||||||
|
defaultModel: string | null;
|
||||||
|
systemPrompt: string | null;
|
||||||
|
tools: readonly string[] | null;
|
||||||
|
sortOrder: number;
|
||||||
|
isDefault: boolean;
|
||||||
|
disabledAt: string | null;
|
||||||
|
createdAt: string;
|
||||||
|
updatedAt: string;
|
||||||
|
skillNames: readonly string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AgentSkillRow {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
version: string;
|
||||||
|
description: string | null;
|
||||||
|
contentDigest: string;
|
||||||
|
disabledAt: string | null;
|
||||||
|
createdAt: string;
|
||||||
|
updatedAt: string;
|
||||||
|
boundRoleIds: readonly string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SkillFileEntry {
|
||||||
|
path: string;
|
||||||
|
content: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface InstalledSkillResult {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
contentDigest: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AgentModelRow {
|
||||||
|
id: string;
|
||||||
|
label: string;
|
||||||
|
toolCapable: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- API ---
|
||||||
|
|
||||||
|
export const api = {
|
||||||
|
me: () => get('/api/me') as Promise<MeResponse>,
|
||||||
|
logout: () => post('/auth/logout'),
|
||||||
|
|
||||||
|
org: (slug: string) =>
|
||||||
|
get(orgBase(slug)) as Promise<{
|
||||||
|
organization: { id: string; slug: string; name: string; status: string };
|
||||||
|
actorRole: string;
|
||||||
|
}>,
|
||||||
|
settings: (slug: string) => get(`${orgBase(slug)}/settings`) as Promise<{ membersCanCreateProjects: boolean }>,
|
||||||
|
setSettings: (slug: string, body: { membersCanCreateProjects: boolean }) =>
|
||||||
|
patch(`${orgBase(slug)}/settings`, body) as Promise<{ membersCanCreateProjects: boolean }>,
|
||||||
|
|
||||||
|
members: (slug: string) => get(`${orgBase(slug)}/members`) as Promise<{ members: OrgMember[] }>,
|
||||||
|
addMember: (slug: string, body: { feishuOpenId: string; displayName?: string; role: string }) =>
|
||||||
|
post(`${orgBase(slug)}/members`, body) as Promise<OrgMember>,
|
||||||
|
setMemberRole: (slug: string, userId: string, role: string) => patch(`${orgBase(slug)}/members/${userId}`, { role }),
|
||||||
|
revokeMember: (slug: string, userId: string) => post(`${orgBase(slug)}/members/${userId}/revoke`),
|
||||||
|
|
||||||
|
teams: (slug: string) => get(`${orgBase(slug)}/teams`) as Promise<{ teams: TeamRow[] }>,
|
||||||
|
createTeam: (slug: string, body: { slug: string; name: string; description?: string }) =>
|
||||||
|
post(`${orgBase(slug)}/teams`, body) as Promise<TeamRow>,
|
||||||
|
updateTeam: (slug: string, teamId: string, body: { name?: string; description?: string | null }) =>
|
||||||
|
patch(`${orgBase(slug)}/teams/${teamId}`, body) as Promise<TeamRow>,
|
||||||
|
archiveTeam: (slug: string, teamId: string) => post(`${orgBase(slug)}/teams/${teamId}/archive`),
|
||||||
|
teamMembers: (slug: string, teamId: string) =>
|
||||||
|
get(`${orgBase(slug)}/teams/${teamId}/members`) as Promise<{ members: TeamMemberRow[] }>,
|
||||||
|
addTeamMember: (slug: string, teamId: string, body: { userId?: string; feishuOpenId?: string }) =>
|
||||||
|
post(`${orgBase(slug)}/teams/${teamId}/members`, body) as Promise<TeamMemberRow>,
|
||||||
|
revokeTeamMember: (slug: string, teamId: string, userId: string) =>
|
||||||
|
post(`${orgBase(slug)}/teams/${teamId}/members/${userId}/revoke`),
|
||||||
|
|
||||||
|
explorer: (slug: string) => get(`${orgBase(slug)}/explorer`) as Promise<ExplorerData>,
|
||||||
|
myProjects: (slug: string) => get(`${orgBase(slug)}/my-projects`) as Promise<{ projects: ExplorerProject[] }>,
|
||||||
|
createFolder: (slug: string, body: { name: string; parentId?: string; sortKey?: string }) =>
|
||||||
|
post(`${orgBase(slug)}/folders`, body) as Promise<{
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
parentId: string | null;
|
||||||
|
sortKey: string;
|
||||||
|
}>,
|
||||||
|
renameFolder: (slug: string, folderId: string, body: { name?: string; sortKey?: string; parentId?: string | null }) =>
|
||||||
|
patch(`${orgBase(slug)}/folders/${folderId}`, body) as Promise<{
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
parentId: string | null;
|
||||||
|
sortKey: string;
|
||||||
|
}>,
|
||||||
|
archiveFolder: (slug: string, folderId: string) =>
|
||||||
|
post(`${orgBase(slug)}/folders/${folderId}/archive`) as Promise<{ archived: true; folderId: string }>,
|
||||||
|
createProject: (slug: string, body: { name: string; folderId?: string }) =>
|
||||||
|
post(`${orgBase(slug)}/projects`, body) as Promise<{ id: string; name: string }>,
|
||||||
|
project: (slug: string, projectId: string) => get(`${orgBase(slug)}/projects/${projectId}`) as Promise<ProjectDetail>,
|
||||||
|
renameProject: (slug: string, projectId: string, name: string) =>
|
||||||
|
patch(`${orgBase(slug)}/projects/${projectId}`, { name }),
|
||||||
|
moveProject: (slug: string, projectId: string, folderId: string | null) =>
|
||||||
|
patch(`${orgBase(slug)}/projects/${projectId}/folder`, { folderId }),
|
||||||
|
archiveProject: (slug: string, projectId: string) => post(`${orgBase(slug)}/projects/${projectId}/archive`),
|
||||||
|
archiveBinding: (slug: string, projectId: string) => post(`${orgBase(slug)}/projects/${projectId}/binding/archive`),
|
||||||
|
|
||||||
|
teamAccess: (slug: string, projectId: string) =>
|
||||||
|
get(`${orgBase(slug)}/projects/${projectId}/team-access`) as Promise<{ access: TeamAccessEntry[] }>,
|
||||||
|
grantTeamAccess: (slug: string, projectId: string, body: { teamId?: string; teamSlug?: string; role: string }) =>
|
||||||
|
put(`${orgBase(slug)}/projects/${projectId}/team-access`, body) as Promise<TeamAccessEntry>,
|
||||||
|
revokeTeamAccess: (slug: string, projectId: string, teamId: string) =>
|
||||||
|
del(`${orgBase(slug)}/projects/${projectId}/team-access/${teamId}`),
|
||||||
|
|
||||||
|
sessions: (slug: string, projectId: string, limit?: number) =>
|
||||||
|
get(`${orgBase(slug)}/projects/${projectId}/sessions${limit !== undefined ? `?limit=${limit}` : ''}`) as Promise<{
|
||||||
|
sessions: SessionSummary[];
|
||||||
|
}>,
|
||||||
|
usage: (slug: string, params?: { from?: string; to?: string; folderId?: string }) => {
|
||||||
|
const q = new URLSearchParams();
|
||||||
|
if (params?.from) q.set('from', params.from);
|
||||||
|
if (params?.to) q.set('to', params.to);
|
||||||
|
if (params?.folderId) q.set('folderId', params.folderId);
|
||||||
|
const qs = q.toString();
|
||||||
|
return get(`${orgBase(slug)}/usage${qs ? `?${qs}` : ''}`) as Promise<UsageReport>;
|
||||||
|
},
|
||||||
|
|
||||||
|
providerConnections: (slug: string) =>
|
||||||
|
get(`${orgBase(slug)}/provider-connections`) as Promise<{ connections: ProviderConnectionRow[] }>,
|
||||||
|
rotateProviderConnection: (
|
||||||
|
slug: string,
|
||||||
|
providerId: string,
|
||||||
|
body: { baseUrl: string; authToken: string; anthropicApiKey?: string },
|
||||||
|
) =>
|
||||||
|
put(
|
||||||
|
`${orgBase(slug)}/provider-connections/${encodeURIComponent(providerId)}`,
|
||||||
|
body,
|
||||||
|
) as Promise<ProviderConnectionRow>,
|
||||||
|
|
||||||
|
feishuApplication: (slug: string) =>
|
||||||
|
get(`${orgBase(slug)}/feishu-application-connection`) as Promise<{
|
||||||
|
connection: FeishuApplicationConnection | null;
|
||||||
|
}>,
|
||||||
|
rotateFeishuApplication: (
|
||||||
|
slug: string,
|
||||||
|
body: {
|
||||||
|
appId: string;
|
||||||
|
appSecret: string;
|
||||||
|
botOpenId: string;
|
||||||
|
verificationToken?: string;
|
||||||
|
encryptKey?: string;
|
||||||
|
},
|
||||||
|
) => put(`${orgBase(slug)}/feishu-application-connection`, body) as Promise<FeishuApplicationConnection>,
|
||||||
|
disableFeishuApplication: (slug: string) =>
|
||||||
|
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>,
|
||||||
|
setCapacityPolicy: (slug: string, body: { limits: Partial<Record<CapacityDimension, number | null>> }) =>
|
||||||
|
put(`${orgBase(slug)}/capacity-policy`, body) as Promise<CapacityPolicyView>,
|
||||||
|
|
||||||
|
agentRoles: (slug: string) => get(`${orgBase(slug)}/agent-roles`) as Promise<{ roles: AgentRoleRow[] }>,
|
||||||
|
upsertAgentRole: (
|
||||||
|
slug: string,
|
||||||
|
roleId: string,
|
||||||
|
body: {
|
||||||
|
label: string;
|
||||||
|
defaultModel?: string | null;
|
||||||
|
systemPrompt?: string | null;
|
||||||
|
tools?: readonly string[] | null;
|
||||||
|
sortOrder?: number;
|
||||||
|
isDefault?: boolean;
|
||||||
|
},
|
||||||
|
) => put(`${orgBase(slug)}/agent-roles/${encodeURIComponent(roleId)}`, body) as Promise<AgentRoleRow>,
|
||||||
|
setAgentRoleSkills: (slug: string, roleId: string, skillNames: readonly string[]) =>
|
||||||
|
put(`${orgBase(slug)}/agent-roles/${encodeURIComponent(roleId)}/skills`, { skillNames }) as Promise<{
|
||||||
|
skillNames: string[];
|
||||||
|
}>,
|
||||||
|
agentSkills: (slug: string) => get(`${orgBase(slug)}/agent-skills`) as Promise<{ skills: AgentSkillRow[] }>,
|
||||||
|
agentSkillFiles: (slug: string, name: string) =>
|
||||||
|
get(`${orgBase(slug)}/agent-skills/${encodeURIComponent(name)}/files`) as Promise<{ files: SkillFileEntry[] }>,
|
||||||
|
installAgentSkill: (slug: string, name: string, body: { version: string; files: readonly SkillFileEntry[] }) =>
|
||||||
|
put(`${orgBase(slug)}/agent-skills/${encodeURIComponent(name)}`, body) as Promise<InstalledSkillResult>,
|
||||||
|
patchAgentSkill: (slug: string, name: string, body: { description?: string; disabled?: boolean }) =>
|
||||||
|
patch(`${orgBase(slug)}/agent-skills/${encodeURIComponent(name)}`, body) as Promise<{ disabled?: boolean; updated?: boolean }>,
|
||||||
|
agentModels: (slug: string) => get(`${orgBase(slug)}/agent-models`) as Promise<{ models: AgentModelRow[] }>,
|
||||||
|
};
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="107" height="128" viewBox="0 0 107 128"><title>svelte-logo</title><path d="M94.157 22.819c-10.4-14.885-30.94-19.297-45.792-9.835L22.282 29.608A29.92 29.92 0 0 0 8.764 49.65a31.5 31.5 0 0 0 3.108 20.231 30 30 0 0 0-4.477 11.183 31.9 31.9 0 0 0 5.448 24.116c10.402 14.887 30.942 19.297 45.791 9.835l26.083-16.624A29.92 29.92 0 0 0 98.235 78.35a31.53 31.53 0 0 0-3.105-20.232 30 30 0 0 0 4.474-11.182 31.88 31.88 0 0 0-5.447-24.116" style="fill:#ff3e00"/><path d="M45.817 106.582a20.72 20.72 0 0 1-22.237-8.243 19.17 19.17 0 0 1-3.277-14.503 18 18 0 0 1 .624-2.435l.49-1.498 1.337.981a33.6 33.6 0 0 0 10.203 5.098l.97.294-.09.968a5.85 5.85 0 0 0 1.052 3.878 6.24 6.24 0 0 0 6.695 2.485 5.8 5.8 0 0 0 1.603-.704L69.27 76.28a5.43 5.43 0 0 0 2.45-3.631 5.8 5.8 0 0 0-.987-4.371 6.24 6.24 0 0 0-6.698-2.487 5.7 5.7 0 0 0-1.6.704l-9.953 6.345a19 19 0 0 1-5.296 2.326 20.72 20.72 0 0 1-22.237-8.243 19.17 19.17 0 0 1-3.277-14.502 17.99 17.99 0 0 1 8.13-12.052l26.081-16.623a19 19 0 0 1 5.3-2.329 20.72 20.72 0 0 1 22.237 8.243 19.17 19.17 0 0 1 3.277 14.503 18 18 0 0 1-.624 2.435l-.49 1.498-1.337-.98a33.6 33.6 0 0 0-10.203-5.1l-.97-.294.09-.968a5.86 5.86 0 0 0-1.052-3.878 6.24 6.24 0 0 0-6.696-2.485 5.8 5.8 0 0 0-1.602.704L37.73 51.72a5.42 5.42 0 0 0-2.449 3.63 5.79 5.79 0 0 0 .986 4.372 6.24 6.24 0 0 0 6.698 2.486 5.8 5.8 0 0 0 1.602-.704l9.952-6.342a19 19 0 0 1 5.295-2.328 20.72 20.72 0 0 1 22.237 8.242 19.17 19.17 0 0 1 3.277 14.503 18 18 0 0 1-8.13 12.053l-26.081 16.622a19 19 0 0 1-5.3 2.328" style="fill:#fff"/></svg>
|
||||||
|
After Width: | Height: | Size: 1.5 KiB |
@@ -0,0 +1,32 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { Checkbox } from 'bits-ui';
|
||||||
|
import Icon from './Icon.svelte';
|
||||||
|
|
||||||
|
let {
|
||||||
|
checked = $bindable(false),
|
||||||
|
disabled = false,
|
||||||
|
class: className = '',
|
||||||
|
onchange,
|
||||||
|
}: {
|
||||||
|
checked?: boolean;
|
||||||
|
disabled?: boolean;
|
||||||
|
class?: string;
|
||||||
|
onchange?: (checked: boolean) => void;
|
||||||
|
} = $props();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<Checkbox.Root
|
||||||
|
class="saas-checkbox {className}"
|
||||||
|
{disabled}
|
||||||
|
{checked}
|
||||||
|
onCheckedChange={(next) => {
|
||||||
|
checked = next;
|
||||||
|
onchange?.(next);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{#snippet children({ checked: isChecked })}
|
||||||
|
{#if isChecked}
|
||||||
|
<Icon name="check" class="h-3.5 w-3.5" />
|
||||||
|
{/if}
|
||||||
|
{/snippet}
|
||||||
|
</Checkbox.Root>
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import type { Snippet } from 'svelte';
|
||||||
|
|
||||||
|
let {
|
||||||
|
title = '暂无数据',
|
||||||
|
description,
|
||||||
|
action,
|
||||||
|
}: {
|
||||||
|
title?: string;
|
||||||
|
description?: string;
|
||||||
|
action?: Snippet;
|
||||||
|
} = $props();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="saas-empty">
|
||||||
|
<div
|
||||||
|
class="mb-1 flex h-12 w-12 items-center justify-center border border-surface-300 bg-surface-100 text-surface-600"
|
||||||
|
>
|
||||||
|
<svg class="h-6 w-6" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25H12" />
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
<p class="text-sm font-medium text-surface-900">{title}</p>
|
||||||
|
{#if description}
|
||||||
|
<p class="max-w-sm text-sm text-surface-600">{description}</p>
|
||||||
|
{/if}
|
||||||
|
{#if action}
|
||||||
|
<div class="mt-2">
|
||||||
|
{@render action()}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
let {
|
||||||
|
message,
|
||||||
|
onretry,
|
||||||
|
}: {
|
||||||
|
message: string;
|
||||||
|
onretry?: () => void;
|
||||||
|
} = $props();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="saas-card flex flex-wrap items-start gap-3 border-error-200 bg-error-50 p-4 text-error-700">
|
||||||
|
<svg class="mt-0.5 h-5 w-5 shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75">
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="M12 9v3.75m9-.75a9 9 0 11-18 0 9 9 0 0118 0zm-9 3.75h.008v.008H12v-.008z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
<div class="min-w-0 flex-1">
|
||||||
|
<p class="text-sm font-medium">请求失败</p>
|
||||||
|
<p class="mt-0.5 text-sm opacity-90">{message}</p>
|
||||||
|
</div>
|
||||||
|
{#if onretry}
|
||||||
|
<button type="button" class="saas-btn-ghost text-sm" onclick={onretry}>重试</button>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import type { ExplorerFolder } from '$lib/api';
|
||||||
|
import Icon from './Icon.svelte';
|
||||||
|
import FolderTree from './FolderTree.svelte';
|
||||||
|
|
||||||
|
let {
|
||||||
|
folder,
|
||||||
|
folders,
|
||||||
|
projects,
|
||||||
|
slug,
|
||||||
|
onCreateFolder,
|
||||||
|
onCreateProject,
|
||||||
|
}: {
|
||||||
|
folder: ExplorerFolder;
|
||||||
|
folders: ExplorerFolder[];
|
||||||
|
projects: {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
folderId: string | null;
|
||||||
|
createdAt: string;
|
||||||
|
binding: { chatId: string } | null;
|
||||||
|
}[];
|
||||||
|
slug: string;
|
||||||
|
onCreateFolder?: (parentId: string) => void;
|
||||||
|
onCreateProject?: (folderId: string) => void;
|
||||||
|
} = $props();
|
||||||
|
|
||||||
|
let open = $state(true);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<div class="group flex w-full items-center gap-2.5 px-3 py-2.5 text-sm transition hover:bg-surface-100">
|
||||||
|
<button type="button" class="flex min-w-0 flex-1 items-center gap-2.5 text-left" onclick={() => (open = !open)}>
|
||||||
|
<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">
|
||||||
|
<Icon name="folder" class="h-4 w-4" />
|
||||||
|
</span>
|
||||||
|
<span class="min-w-0 flex-1 truncate font-medium text-surface-900">{folder.name}</span>
|
||||||
|
<span class="saas-badge-neutral">{folder.projectCount} 项目</span>
|
||||||
|
{#if folder.childFolderCount > 0}
|
||||||
|
<span class="saas-badge-neutral">{folder.childFolderCount} 子夹</span>
|
||||||
|
{/if}
|
||||||
|
</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}
|
||||||
|
<div class="ml-4 border-l border-surface-300 pl-2">
|
||||||
|
<FolderTree {folders} {projects} parentId={folder.id} {slug} {onCreateFolder} {onCreateProject} />
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import type { ExplorerFolder } from '$lib/api';
|
||||||
|
import { fmtDate } from '$lib/format';
|
||||||
|
import Icon from './Icon.svelte';
|
||||||
|
import FolderNode from './FolderNode.svelte';
|
||||||
|
|
||||||
|
let {
|
||||||
|
folders,
|
||||||
|
projects,
|
||||||
|
parentId,
|
||||||
|
slug,
|
||||||
|
onCreateFolder,
|
||||||
|
onCreateProject,
|
||||||
|
}: {
|
||||||
|
folders: ExplorerFolder[];
|
||||||
|
projects: {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
folderId: string | null;
|
||||||
|
createdAt: string;
|
||||||
|
binding: { chatId: string } | null;
|
||||||
|
}[];
|
||||||
|
parentId: string | null;
|
||||||
|
slug: string;
|
||||||
|
onCreateFolder?: (parentId: string) => void;
|
||||||
|
onCreateProject?: (folderId: string) => void;
|
||||||
|
} = $props();
|
||||||
|
|
||||||
|
let childFolders = $derived(folders.filter((f) => f.parentId === parentId));
|
||||||
|
let childProjects = $derived(projects.filter((p) => p.folderId === parentId));
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="space-y-0.5">
|
||||||
|
{#each childProjects as p (p.id)}
|
||||||
|
<a
|
||||||
|
href={`/admin/org/${slug}/projects/${p.id}`}
|
||||||
|
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">
|
||||||
|
<Icon name="file" class="h-4 w-4" />
|
||||||
|
</span>
|
||||||
|
<span class="min-w-0 flex-1 truncate font-medium text-surface-900">{p.name}</span>
|
||||||
|
{#if p.binding}
|
||||||
|
<span class="saas-badge-success">已绑定</span>
|
||||||
|
{/if}
|
||||||
|
<span class="hidden text-xs text-surface-600 sm:inline">{fmtDate(p.createdAt)}</span>
|
||||||
|
</a>
|
||||||
|
{/each}
|
||||||
|
|
||||||
|
{#each childFolders as f (f.id)}
|
||||||
|
<FolderNode folder={f} {folders} {projects} {slug} {onCreateFolder} {onCreateProject} />
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,155 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
/** Inline nav icons for the admin shell. */
|
||||||
|
let {
|
||||||
|
name,
|
||||||
|
class: className = 'h-4 w-4',
|
||||||
|
}: {
|
||||||
|
name:
|
||||||
|
| 'overview'
|
||||||
|
| 'members'
|
||||||
|
| 'teams'
|
||||||
|
| 'projects'
|
||||||
|
| 'provider'
|
||||||
|
| 'feishu'
|
||||||
|
| 'menu'
|
||||||
|
| 'logout'
|
||||||
|
| 'org'
|
||||||
|
| 'chevron'
|
||||||
|
| 'arrow-left'
|
||||||
|
| 'folder'
|
||||||
|
| 'file'
|
||||||
|
| 'folder-plus'
|
||||||
|
| 'file-plus'
|
||||||
|
| 'check'
|
||||||
|
| 'roles';
|
||||||
|
class?: string;
|
||||||
|
} = $props();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{#if name === 'overview'}
|
||||||
|
<svg class={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75">
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="M3 12l9-9 9 9M5 10v9a1 1 0 001 1h3v-5h6v5h3a1 1 0 001-1v-9"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{:else if name === 'members'}
|
||||||
|
<svg class={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75">
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="M15.75 7.5a3.75 3.75 0 11-7.5 0 3.75 3.75 0 017.5 0zM4.5 19.5a7.5 7.5 0 0115 0"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{:else if name === 'teams'}
|
||||||
|
<svg class={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75">
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="M18 18.72a9.09 9.09 0 003.74-.72 9 9 0 00-5.07-5.95M15 11a4 4 0 10-8 0 4 4 0 008 0zM4.26 18a9 9 0 0115.48 0"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{:else if name === 'projects'}
|
||||||
|
<svg class={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75">
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="M3.75 6.75A2.25 2.25 0 016 4.5h3.379c.6 0 1.175.238 1.6.66l.842.84c.424.423 1 .66 1.6.66H18A2.25 2.25 0 0120.25 9v8.25A2.25 2.25 0 0118 19.5H6a2.25 2.25 0 01-2.25-2.25V6.75z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{:else if name === 'provider'}
|
||||||
|
<svg class={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75">
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="M13.19 8.688a4.5 4.5 0 016.364 6.364l-3.182 3.182a4.5 4.5 0 01-6.364-6.364"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="M10.81 15.312a4.5 4.5 0 01-6.364-6.364l3.182-3.182a4.5 4.5 0 016.364 6.364"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{:else if name === 'feishu'}
|
||||||
|
<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 8.25h15a8.25 8.25 0 01-8.25 8.25A8.25 8.25 0 014.5 8.25z"
|
||||||
|
/>
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M8.25 11.25h.01M12 11.25h.01M15.75 11.25h.01" />
|
||||||
|
</svg>
|
||||||
|
{:else if name === 'menu'}
|
||||||
|
<svg class={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5" />
|
||||||
|
</svg>
|
||||||
|
{:else if name === 'logout'}
|
||||||
|
<svg class={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75">
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="M15.75 9V5.25A2.25 2.25 0 0013.5 3h-6A2.25 2.25 0 005.25 5.25v13.5A2.25 2.25 0 007.5 21h6a2.25 2.25 0 002.25-2.25V15M12 9l3 3m0 0l-3 3m3-3H6"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{:else if name === 'org'}
|
||||||
|
<svg class={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75">
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="M3.75 21h16.5M4.5 3h15M5.25 3v18m13.5-18v18M9 6.75h1.5m-1.5 3h1.5m-1.5 3h1.5m3-6H15m-1.5 3H15m-1.5 3H15M9 21v-3.375c0-.621.504-1.125 1.125-1.125h3.75c.621 0 1.125.504 1.125 1.125V21"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{:else if name === 'chevron'}
|
||||||
|
<svg class={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M8.25 4.5l7.5 7.5-7.5 7.5" />
|
||||||
|
</svg>
|
||||||
|
{:else if name === 'arrow-left'}
|
||||||
|
<svg class={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M10.5 19.5L3 12m0 0l7.5-7.5M3 12h18" />
|
||||||
|
</svg>
|
||||||
|
{:else if name === 'folder'}
|
||||||
|
<svg class={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75">
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="M3.75 6.75A2.25 2.25 0 016 4.5h3.379c.6 0 1.175.238 1.6.66l.842.84c.424.423 1 .66 1.6.66H18A2.25 2.25 0 0120.25 9v8.25A2.25 2.25 0 0118 19.5H6a2.25 2.25 0 01-2.25-2.25V6.75z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{:else if name === 'file'}
|
||||||
|
<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.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>
|
||||||
|
{: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'}
|
||||||
|
<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" />
|
||||||
|
</svg>
|
||||||
|
{:else if name === 'roles'}
|
||||||
|
<svg class={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75">
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="M9.813 15.904L9 18.75l-.813-2.846a4.5 4.5 0 00-3.09-3.09L2.25 12l2.847-.813a4.5 4.5 0 003.09-3.09L9 5.25l.813 2.846a4.5 4.5 0 003.09 3.09L15.75 12l-2.847.813a4.5 4.5 0 00-3.09 3.09zM18.259 8.715L18 9.75l-.259-1.035a3.375 3.375 0 00-2.456-2.456L14.25 6l1.035-.259a3.375 3.375 0 002.456-2.456L18 2.25l.259 1.035a3.375 3.375 0 002.456 2.456L21.75 6l-1.035.259a3.375 3.375 0 00-2.456 2.456zM16.894 20.567L16.5 21.75l-.394-1.183a2.25 2.25 0 00-1.423-1.423L13.5 18.75l1.183-.394a2.25 2.25 0 001.423-1.423l.394-1.183.394 1.183a2.25 2.25 0 001.423 1.423l1.183.394-1.183.394a2.25 2.25 0 00-1.423 1.423z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{/if}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
let { label = '加载中…' }: { label?: string } = $props();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="flex flex-col items-center justify-center gap-3 py-16 text-surface-600">
|
||||||
|
<svg class="h-7 w-7 animate-spin text-primary-500" viewBox="0 0 24 24" fill="none">
|
||||||
|
<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
|
||||||
|
<path
|
||||||
|
class="opacity-90"
|
||||||
|
fill="currentColor"
|
||||||
|
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>
|
||||||
|
</svg>
|
||||||
|
<p class="text-sm">{label}</p>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import type { Snippet } from 'svelte';
|
||||||
|
import { Dialog } from 'bits-ui';
|
||||||
|
|
||||||
|
let {
|
||||||
|
open = $bindable(false),
|
||||||
|
title,
|
||||||
|
children,
|
||||||
|
onclose,
|
||||||
|
}: {
|
||||||
|
open?: boolean;
|
||||||
|
title: string;
|
||||||
|
children: Snippet;
|
||||||
|
onclose?: () => void;
|
||||||
|
} = $props();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<Dialog.Root
|
||||||
|
bind:open
|
||||||
|
onOpenChange={(next) => {
|
||||||
|
if (!next) onclose?.();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Dialog.Portal>
|
||||||
|
<Dialog.Overlay class="saas-modal-backdrop" />
|
||||||
|
<Dialog.Content class="saas-modal">
|
||||||
|
<div class="mb-4 flex items-start justify-between gap-3">
|
||||||
|
<Dialog.Title class="text-lg font-semibold text-surface-900">{title}</Dialog.Title>
|
||||||
|
<Dialog.Close class="saas-btn-ghost px-2! py-1! text-surface-600" aria-label="关闭">
|
||||||
|
<svg class="h-5 w-5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
|
||||||
|
</svg>
|
||||||
|
</Dialog.Close>
|
||||||
|
</div>
|
||||||
|
{@render children()}
|
||||||
|
</Dialog.Content>
|
||||||
|
</Dialog.Portal>
|
||||||
|
</Dialog.Root>
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import type { Snippet } from 'svelte';
|
||||||
|
|
||||||
|
let {
|
||||||
|
title,
|
||||||
|
description,
|
||||||
|
actions,
|
||||||
|
}: {
|
||||||
|
title: string;
|
||||||
|
description?: string;
|
||||||
|
actions?: Snippet;
|
||||||
|
} = $props();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="saas-toolbar">
|
||||||
|
<div class="min-w-0">
|
||||||
|
<h1 class="saas-page-title">{title}</h1>
|
||||||
|
{#if description}
|
||||||
|
<p class="saas-muted mt-1">{description}</p>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{#if actions}
|
||||||
|
<div class="ml-auto flex flex-wrap items-center gap-2">
|
||||||
|
{@render actions()}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,208 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { Checkbox, Label } from 'bits-ui';
|
||||||
|
import type { AgentRoleRow, AgentModelRow, AgentSkillRow } from '$lib/api';
|
||||||
|
import { api } from '$lib/api';
|
||||||
|
import { fmtDate } from '$lib/format';
|
||||||
|
import { TOOL_OPTIONS } from '$lib/constants';
|
||||||
|
import SelectField from '$lib/components/SelectField.svelte';
|
||||||
|
import CheckboxControl from '$lib/components/CheckboxControl.svelte';
|
||||||
|
import Icon from '$lib/components/Icon.svelte';
|
||||||
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
|
let {
|
||||||
|
r,
|
||||||
|
models,
|
||||||
|
skills,
|
||||||
|
slug,
|
||||||
|
onupdated,
|
||||||
|
onskillschanged,
|
||||||
|
}: {
|
||||||
|
r: AgentRoleRow;
|
||||||
|
models: AgentModelRow[];
|
||||||
|
skills: AgentSkillRow[];
|
||||||
|
slug: string;
|
||||||
|
onupdated: (updated: AgentRoleRow) => void;
|
||||||
|
onskillschanged: (roleId: string, skillNames: string[]) => void;
|
||||||
|
} = $props();
|
||||||
|
|
||||||
|
const initial = {
|
||||||
|
label: r.label,
|
||||||
|
defaultModel: r.defaultModel ?? '',
|
||||||
|
systemPrompt: r.systemPrompt ?? '',
|
||||||
|
unrestricted: r.tools === null,
|
||||||
|
tools: r.tools ?? [],
|
||||||
|
sortOrder: String(r.sortOrder),
|
||||||
|
isDefault: r.isDefault,
|
||||||
|
skillNames: r.skillNames,
|
||||||
|
};
|
||||||
|
let label = $state(initial.label);
|
||||||
|
let defaultModel = $state(initial.defaultModel);
|
||||||
|
let systemPrompt = $state(initial.systemPrompt);
|
||||||
|
let unrestricted = $state(initial.unrestricted);
|
||||||
|
let selectedTools = $state<string[]>([...initial.tools]);
|
||||||
|
let sortOrder = $state(initial.sortOrder);
|
||||||
|
let isDefault = $state(initial.isDefault);
|
||||||
|
let selectedSkills = $state<string[]>([...initial.skillNames]);
|
||||||
|
let saving = $state(false);
|
||||||
|
|
||||||
|
const groupedTools = TOOL_OPTIONS.reduce(
|
||||||
|
(acc, t) => {
|
||||||
|
(acc[t.group] ??= []).push(t);
|
||||||
|
return acc;
|
||||||
|
},
|
||||||
|
{} as Record<string, typeof TOOL_OPTIONS>,
|
||||||
|
);
|
||||||
|
|
||||||
|
const modelItems = $derived([
|
||||||
|
{ value: '', label: '(使用平台默认模型)' },
|
||||||
|
...models.map((m) => ({ value: m.id, label: `${m.label}(${m.id})` })),
|
||||||
|
]);
|
||||||
|
|
||||||
|
const skillItems = $derived(skills.map((s) => ({ value: s.name, label: s.name })));
|
||||||
|
|
||||||
|
function skillsDirty(): boolean {
|
||||||
|
const a = [...selectedSkills].sort();
|
||||||
|
const b = [...r.skillNames].sort();
|
||||||
|
return a.length !== b.length || a.some((v, i) => v !== b[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function save() {
|
||||||
|
const trimmedLabel = label.trim();
|
||||||
|
if (trimmedLabel === '') {
|
||||||
|
toastError('显示名不能为空');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const order = Number(sortOrder);
|
||||||
|
if (sortKeyDirty() && (!Number.isSafeInteger(order) || order < 0)) {
|
||||||
|
toastError('排序必须为非负整数');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
saving = true;
|
||||||
|
const tools = unrestricted ? null : selectedTools;
|
||||||
|
try {
|
||||||
|
const updated = await api.upsertAgentRole(slug, r.roleId, {
|
||||||
|
label: trimmedLabel,
|
||||||
|
defaultModel: defaultModel === '' ? null : defaultModel,
|
||||||
|
systemPrompt: systemPrompt === '' ? null : systemPrompt,
|
||||||
|
tools,
|
||||||
|
...(sortKeyDirty() ? { sortOrder: order } : {}),
|
||||||
|
isDefault,
|
||||||
|
});
|
||||||
|
onupdated(updated);
|
||||||
|
if (skillsDirty()) {
|
||||||
|
const res = await api.setAgentRoleSkills(slug, r.roleId, selectedSkills);
|
||||||
|
selectedSkills = [...res.skillNames];
|
||||||
|
onskillschanged(r.roleId, res.skillNames);
|
||||||
|
}
|
||||||
|
toastSuccess('角色已保存');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
} finally {
|
||||||
|
saving = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function sortKeyDirty(): boolean {
|
||||||
|
return Number(sortOrder) !== r.sortOrder;
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="saas-card-pad">
|
||||||
|
<div class="mb-4 flex flex-wrap items-center gap-2">
|
||||||
|
<span class="saas-badge-primary font-mono">/{r.roleId}</span>
|
||||||
|
<span class="text-sm text-surface-700">{label || r.label}</span>
|
||||||
|
{#if r.isDefault}
|
||||||
|
<span class="saas-badge-success">默认</span>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
|
||||||
|
<div>
|
||||||
|
<Label.Root for="role-label-{r.id}" class="saas-label">显示名</Label.Root>
|
||||||
|
<input id="role-label-{r.id}" class="saas-input" bind:value={label} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<Label.Root for="role-sort-{r.id}" class="saas-label">排序</Label.Root>
|
||||||
|
<input id="role-sort-{r.id}" class="saas-input" type="number" min="0" bind:value={sortOrder} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-4">
|
||||||
|
<p class="saas-label">默认模型</p>
|
||||||
|
<SelectField items={modelItems} bind:value={defaultModel} />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-4">
|
||||||
|
<span class="saas-label">工具白名单</span>
|
||||||
|
<label class="mb-3 flex cursor-pointer items-center gap-2 border border-surface-300 bg-surface-100 px-3 py-2">
|
||||||
|
<CheckboxControl bind:checked={unrestricted} />
|
||||||
|
<span class="text-sm">不限(使用全部注册工具)</span>
|
||||||
|
</label>
|
||||||
|
<div class="space-y-3 {unrestricted ? 'pointer-events-none opacity-40' : ''}">
|
||||||
|
<Checkbox.Group bind:value={selectedTools} disabled={unrestricted}>
|
||||||
|
{#each Object.entries(groupedTools) as [group, tools]}
|
||||||
|
<div>
|
||||||
|
<p class="mb-1.5 text-xs font-semibold uppercase tracking-wide text-surface-600">{group}</p>
|
||||||
|
<div class="grid grid-cols-1 gap-1.5 sm:grid-cols-2">
|
||||||
|
{#each tools as t}
|
||||||
|
<label class="flex cursor-pointer items-center gap-2 px-2 py-1.5 text-sm hover:bg-surface-100">
|
||||||
|
<Checkbox.Root class="saas-checkbox" value={t.id} id={`tool-${r.id}-${t.id}`}>
|
||||||
|
{#snippet children({ checked })}
|
||||||
|
{#if checked}
|
||||||
|
<Icon name="check" class="h-3.5 w-3.5" />
|
||||||
|
{/if}
|
||||||
|
{/snippet}
|
||||||
|
</Checkbox.Root>
|
||||||
|
<span>{t.label}</span>
|
||||||
|
</label>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/each}
|
||||||
|
</Checkbox.Group>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-4">
|
||||||
|
<span class="saas-label">技能绑定</span>
|
||||||
|
{#if skills.length === 0}
|
||||||
|
<p class="text-sm text-surface-600">组织内暂无已安装技能。技能通过 CLI / seed 安装(ADR-0018)。</p>
|
||||||
|
{:else}
|
||||||
|
<div class="grid grid-cols-1 gap-1.5 sm:grid-cols-2">
|
||||||
|
{#each skillItems as s}
|
||||||
|
<label class="flex cursor-pointer items-center gap-2 px-2 py-1.5 text-sm hover:bg-surface-100">
|
||||||
|
<CheckboxControl
|
||||||
|
checked={selectedSkills.includes(s.value)}
|
||||||
|
onchange={(checked) => {
|
||||||
|
selectedSkills = checked ? [...selectedSkills, s.value] : selectedSkills.filter((x) => x !== s.value);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<span class="font-mono text-xs">{s.label}</span>
|
||||||
|
</label>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-4">
|
||||||
|
<Label.Root for="role-prompt-{r.id}" class="saas-label">系统提示词</Label.Root>
|
||||||
|
<textarea
|
||||||
|
id="role-prompt-{r.id}"
|
||||||
|
class="saas-textarea"
|
||||||
|
rows="4"
|
||||||
|
placeholder="系统提示词(可选)。会话开始时注入,定义智能体人格/指令。"
|
||||||
|
bind:value={systemPrompt}></textarea>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-4 flex flex-wrap items-center gap-3 border-t border-surface-100 pt-4">
|
||||||
|
<label class="flex cursor-pointer items-center gap-2">
|
||||||
|
<CheckboxControl bind:checked={isDefault} />
|
||||||
|
<span class="text-sm">设为组织默认角色</span>
|
||||||
|
</label>
|
||||||
|
<span class="text-xs text-surface-600">更新于 {fmtDate(r.updatedAt)}</span>
|
||||||
|
<div class="flex-1"></div>
|
||||||
|
<button class="saas-btn-primary" onclick={save} disabled={saving}>
|
||||||
|
{saving ? '保存中…' : '保存'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { Select } from 'bits-ui';
|
||||||
|
import Icon from './Icon.svelte';
|
||||||
|
|
||||||
|
export type SelectItem = { label: string; value: string; disabled?: boolean };
|
||||||
|
|
||||||
|
let {
|
||||||
|
items,
|
||||||
|
value = $bindable(''),
|
||||||
|
class: className = '',
|
||||||
|
disabled = false,
|
||||||
|
placeholder = '请选择…',
|
||||||
|
onchange,
|
||||||
|
}: {
|
||||||
|
items: SelectItem[];
|
||||||
|
value?: string;
|
||||||
|
class?: string;
|
||||||
|
disabled?: boolean;
|
||||||
|
placeholder?: string;
|
||||||
|
onchange?: (value: string) => void;
|
||||||
|
} = $props();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<Select.Root
|
||||||
|
type="single"
|
||||||
|
{items}
|
||||||
|
{disabled}
|
||||||
|
{value}
|
||||||
|
onValueChange={(next) => {
|
||||||
|
value = next;
|
||||||
|
onchange?.(next);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Select.Trigger class="saas-select-trigger {className}" {disabled}>
|
||||||
|
<span class="min-w-0 flex-1 truncate text-left">
|
||||||
|
<Select.Value {placeholder} />
|
||||||
|
</span>
|
||||||
|
<svg
|
||||||
|
class="ml-2 h-4 w-4 shrink-0 text-surface-600"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-width="1.75"
|
||||||
|
aria-hidden="true"
|
||||||
|
>
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M8.25 15l3.75 3.75L15.75 15" />
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M8.25 9l3.75-3.75L15.75 9" />
|
||||||
|
</svg>
|
||||||
|
</Select.Trigger>
|
||||||
|
<Select.Portal>
|
||||||
|
<Select.Content class="saas-select-content" sideOffset={6} collisionPadding={8}>
|
||||||
|
<Select.Viewport class="p-1">
|
||||||
|
{#each items as item (item.value)}
|
||||||
|
<Select.Item class="saas-select-item" value={item.value} label={item.label} disabled={item.disabled}>
|
||||||
|
{#snippet children({ selected })}
|
||||||
|
<span class="min-w-0 flex-1 truncate">{item.label}</span>
|
||||||
|
{#if selected}
|
||||||
|
<Icon name="check" class="ml-2 h-4 w-4 shrink-0 text-primary-600" />
|
||||||
|
{/if}
|
||||||
|
{/snippet}
|
||||||
|
</Select.Item>
|
||||||
|
{/each}
|
||||||
|
</Select.Viewport>
|
||||||
|
</Select.Content>
|
||||||
|
</Select.Portal>
|
||||||
|
</Select.Root>
|
||||||
@@ -0,0 +1,305 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import type { AgentSkillRow, SkillFileEntry } from '$lib/api';
|
||||||
|
import { api } from '$lib/api';
|
||||||
|
import { fmtDate } from '$lib/format';
|
||||||
|
import Icon from '$lib/components/Icon.svelte';
|
||||||
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
|
let {
|
||||||
|
slug,
|
||||||
|
skill,
|
||||||
|
oninstalled,
|
||||||
|
ondisabled,
|
||||||
|
}: {
|
||||||
|
slug: string;
|
||||||
|
skill: AgentSkillRow;
|
||||||
|
oninstalled: (result: { id: string; name: string; contentDigest: string }) => void;
|
||||||
|
ondisabled: (name: string) => void;
|
||||||
|
} = $props();
|
||||||
|
|
||||||
|
type FileNode = { path: string; content: string };
|
||||||
|
|
||||||
|
let files = $state<FileNode[]>([]);
|
||||||
|
let selectedPath = $state<string | null>(null);
|
||||||
|
let version = $state(skill.version);
|
||||||
|
let description = $state(skill.description ?? '');
|
||||||
|
let loading = $state(false);
|
||||||
|
let saving = $state(false);
|
||||||
|
let dirty = $state(false);
|
||||||
|
let newFilePath = $state('');
|
||||||
|
let showNewFile = $state(false);
|
||||||
|
|
||||||
|
const selectedFile = $derived(files.find((f) => f.path === selectedPath) ?? null);
|
||||||
|
const hasManifest = $derived(files.some((f) => f.path === 'SKILL.md'));
|
||||||
|
const sortedFiles = $derived([...files].sort((a, b) => a.path.localeCompare(b.path)));
|
||||||
|
|
||||||
|
async function loadFiles() {
|
||||||
|
loading = true;
|
||||||
|
try {
|
||||||
|
const res = await api.agentSkillFiles(slug, skill.name);
|
||||||
|
files = res.files.map((f) => ({ path: f.path, content: f.content }));
|
||||||
|
if (files.length > 0 && selectedPath === null) {
|
||||||
|
selectedPath = files[0]!.path;
|
||||||
|
}
|
||||||
|
dirty = false;
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
} finally {
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function selectFile(path: string) {
|
||||||
|
selectedPath = path;
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateContent(path: string, content: string) {
|
||||||
|
const file = files.find((f) => f.path === path);
|
||||||
|
if (file) {
|
||||||
|
file.content = content;
|
||||||
|
dirty = true;
|
||||||
|
if (path === 'SKILL.md') {
|
||||||
|
const desc = parseDescription(content);
|
||||||
|
if (desc !== null) description = desc;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function addFile() {
|
||||||
|
const path = newFilePath.trim();
|
||||||
|
if (path === '') {
|
||||||
|
toastError('文件路径不能为空');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (files.some((f) => f.path === path)) {
|
||||||
|
toastError(`文件已存在:${path}`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (path.startsWith('/') || path.includes('..')) {
|
||||||
|
toastError('文件路径必须为相对路径');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
files.push({ path, content: '' });
|
||||||
|
selectedPath = path;
|
||||||
|
newFilePath = '';
|
||||||
|
showNewFile = false;
|
||||||
|
dirty = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function deleteFile(path: string) {
|
||||||
|
if (path === 'SKILL.md') {
|
||||||
|
toastError('SKILL.md 是必需的 manifest,不能删除');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
files = files.filter((f) => f.path !== path);
|
||||||
|
if (selectedPath === path) {
|
||||||
|
selectedPath = files.length > 0 ? files[0]!.path : null;
|
||||||
|
}
|
||||||
|
dirty = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseDescription(manifest: string): string | null {
|
||||||
|
const match = /^description:\s*['"]?([^'"\r\n]+)['"]?\s*$/m.exec(manifest);
|
||||||
|
return match ? match[1]!.trim() : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function save() {
|
||||||
|
if (!hasManifest) {
|
||||||
|
toastError('缺少 SKILL.md manifest 文件');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const trimmedVersion = version.trim();
|
||||||
|
if (trimmedVersion === '') {
|
||||||
|
toastError('版本号不能为空');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
saving = true;
|
||||||
|
try {
|
||||||
|
const fileEntries: SkillFileEntry[] = files.map((f) => ({ path: f.path, content: f.content }));
|
||||||
|
const result = await api.installAgentSkill(slug, skill.name, {
|
||||||
|
version: trimmedVersion,
|
||||||
|
files: fileEntries,
|
||||||
|
});
|
||||||
|
dirty = false;
|
||||||
|
toastSuccess('技能已保存');
|
||||||
|
oninstalled(result);
|
||||||
|
await loadFiles();
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
} finally {
|
||||||
|
saving = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function disable() {
|
||||||
|
saving = true;
|
||||||
|
try {
|
||||||
|
await api.patchAgentSkill(slug, skill.name, { disabled: true });
|
||||||
|
toastSuccess('技能已禁用');
|
||||||
|
ondisabled(skill.name);
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
} finally {
|
||||||
|
saving = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function saveDescription() {
|
||||||
|
const manifest = files.find((f) => f.path === 'SKILL.md');
|
||||||
|
if (!manifest) return;
|
||||||
|
const updated = updateFrontmatter(manifest.content, 'description', description.trim());
|
||||||
|
manifest.content = updated;
|
||||||
|
dirty = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateFrontmatter(content: string, key: string, value: string): string {
|
||||||
|
const regex = new RegExp(`^(${key}:\\s*)(.*?)(\\s*)$`, 'm');
|
||||||
|
if (regex.test(content)) {
|
||||||
|
return content.replace(regex, `${key}: ${value}`);
|
||||||
|
}
|
||||||
|
const lines = content.split('\n');
|
||||||
|
if (lines[0] === '---') {
|
||||||
|
lines.splice(1, 0, `${key}: ${value}`);
|
||||||
|
} else {
|
||||||
|
lines.unshift('---', `${key}: ${value}`, '---');
|
||||||
|
}
|
||||||
|
return lines.join('\n');
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
if (skill.name) loadFiles();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="saas-card-pad">
|
||||||
|
<div class="mb-4 flex flex-wrap items-center gap-2">
|
||||||
|
<span class="saas-badge-primary font-mono">{skill.name}</span>
|
||||||
|
<span class="text-sm text-surface-700">v{skill.version}</span>
|
||||||
|
{#if skill.disabledAt}
|
||||||
|
<span class="saas-badge-error">已禁用</span>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-4 grid grid-cols-1 gap-4 md:grid-cols-2">
|
||||||
|
<div>
|
||||||
|
<label for="skill-version-{skill.id}" class="saas-label">版本号</label>
|
||||||
|
<input id="skill-version-{skill.id}" class="saas-input" bind:value={version} placeholder="如 0.1.0" />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label for="skill-desc-{skill.id}" class="saas-label">描述(同步到 SKILL.md frontmatter)</label>
|
||||||
|
<div class="flex gap-2">
|
||||||
|
<input id="skill-desc-{skill.id}" class="saas-input" bind:value={description} onchange={saveDescription} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-4 flex flex-wrap items-center gap-2 text-xs text-surface-600">
|
||||||
|
<span>digest: <code class="font-mono">{skill.contentDigest.slice(0, 12)}</code></span>
|
||||||
|
<span>·</span>
|
||||||
|
<span>更新于 {fmtDate(skill.updatedAt)}</span>
|
||||||
|
{#if skill.boundRoleIds.length > 0}
|
||||||
|
<span>·</span>
|
||||||
|
<span>绑定角色: {skill.boundRoleIds.join(', ')}</span>
|
||||||
|
{/if}
|
||||||
|
{#if dirty}
|
||||||
|
<span>·</span>
|
||||||
|
<span class="font-medium text-warning-700">未保存</span>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if loading}
|
||||||
|
<div class="py-8 text-center text-sm text-surface-600">加载文件中…</div>
|
||||||
|
{:else}
|
||||||
|
<div class="grid grid-cols-1 gap-4 md:grid-cols-[16rem_1fr]">
|
||||||
|
<div class="border border-surface-300 bg-surface-100">
|
||||||
|
<div class="flex items-center justify-between border-b border-surface-300 px-3 py-2">
|
||||||
|
<span class="text-xs font-medium text-surface-700">文件</span>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="text-xs text-primary-700 hover:text-primary-900"
|
||||||
|
onclick={() => (showNewFile = !showNewFile)}
|
||||||
|
>
|
||||||
|
{showNewFile ? '取消' : '+ 新增'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{#if showNewFile}
|
||||||
|
<div class="border-b border-surface-300 px-3 py-2">
|
||||||
|
<input
|
||||||
|
class="saas-input text-xs"
|
||||||
|
placeholder="如 reference.md"
|
||||||
|
bind:value={newFilePath}
|
||||||
|
onkeydown={(e) => {
|
||||||
|
if (e.key === 'Enter') addFile();
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
<div class="max-h-80 overflow-y-auto">
|
||||||
|
{#each sortedFiles as f (f.path)}
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="flex w-full items-center gap-2 px-3 py-1.5 text-left text-sm transition hover:bg-surface-200
|
||||||
|
{selectedPath === f.path ? 'bg-primary-100 text-primary-900' : 'text-surface-800'}"
|
||||||
|
onclick={() => selectFile(f.path)}
|
||||||
|
>
|
||||||
|
<Icon name="file" class="h-3.5 w-3.5 shrink-0 opacity-60" />
|
||||||
|
<span class="truncate font-mono text-xs">{f.path}</span>
|
||||||
|
{#if f.path === 'SKILL.md'}
|
||||||
|
<span class="ml-auto text-[10px] text-primary-700">manifest</span>
|
||||||
|
{:else}
|
||||||
|
<span
|
||||||
|
class="ml-auto text-xs text-surface-500 hover:text-error-700"
|
||||||
|
role="button"
|
||||||
|
tabindex="0"
|
||||||
|
onclick={(e) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
deleteFile(f.path);
|
||||||
|
}}
|
||||||
|
onkeydown={(e) => {
|
||||||
|
if (e.key === 'Enter' || e.key === ' ') {
|
||||||
|
e.stopPropagation();
|
||||||
|
deleteFile(f.path);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
×
|
||||||
|
</span>
|
||||||
|
{/if}
|
||||||
|
</button>
|
||||||
|
{/each}
|
||||||
|
{#if files.length === 0}
|
||||||
|
<div class="px-3 py-4 text-center text-xs text-surface-600">暂无文件</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
{#if selectedFile}
|
||||||
|
<div class="mb-2 flex items-center gap-2">
|
||||||
|
<span class="font-mono text-xs text-surface-600">{selectedFile.path}</span>
|
||||||
|
</div>
|
||||||
|
<textarea
|
||||||
|
class="h-80 w-full resize-y border border-surface-300 bg-white p-3 font-mono text-xs text-surface-900 focus:border-primary-500 focus:outline-none"
|
||||||
|
bind:value={selectedFile.content}
|
||||||
|
oninput={() => (dirty = true)}
|
||||||
|
></textarea>
|
||||||
|
{:else}
|
||||||
|
<div class="flex h-80 items-center justify-center border border-surface-300 bg-surface-100 text-sm text-surface-600">
|
||||||
|
选择一个文件或新建文件
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-4 flex flex-wrap items-center gap-3 border-t border-surface-100 pt-4">
|
||||||
|
<button class="saas-btn-primary" onclick={save} disabled={saving || !dirty}>
|
||||||
|
{saving ? '保存中…' : '保存'}
|
||||||
|
</button>
|
||||||
|
{#if !skill.disabledAt}
|
||||||
|
<button class="saas-btn-danger" onclick={disable} disabled={saving}>
|
||||||
|
禁用
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
let {
|
||||||
|
label,
|
||||||
|
value,
|
||||||
|
hint,
|
||||||
|
}: {
|
||||||
|
label: string;
|
||||||
|
value: string;
|
||||||
|
hint?: string;
|
||||||
|
} = $props();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="saas-stat">
|
||||||
|
<div class="saas-stat-label">{label}</div>
|
||||||
|
<div class="saas-stat-value">{value}</div>
|
||||||
|
{#if hint}
|
||||||
|
<div class="saas-help">{hint}</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { Switch } from 'bits-ui';
|
||||||
|
|
||||||
|
let {
|
||||||
|
checked = $bindable(false),
|
||||||
|
disabled = false,
|
||||||
|
class: className = '',
|
||||||
|
onchange,
|
||||||
|
}: {
|
||||||
|
checked?: boolean;
|
||||||
|
disabled?: boolean;
|
||||||
|
class?: string;
|
||||||
|
onchange?: (checked: boolean) => void;
|
||||||
|
} = $props();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<Switch.Root
|
||||||
|
class="saas-switch {className}"
|
||||||
|
{disabled}
|
||||||
|
{checked}
|
||||||
|
onCheckedChange={(next) => {
|
||||||
|
checked = next;
|
||||||
|
onchange?.(next);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Switch.Thumb class="saas-switch-thumb" />
|
||||||
|
</Switch.Root>
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { dismissToast, toasts } from '$lib/toast';
|
||||||
|
|
||||||
|
const kindClass: Record<string, string> = {
|
||||||
|
info: 'border-surface-200 bg-surface-50 text-surface-800',
|
||||||
|
success: 'border-success-200 bg-success-50 text-success-800',
|
||||||
|
error: 'border-error-200 bg-error-50 text-error-800',
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="pointer-events-none fixed inset-x-0 top-0 z-100 flex flex-col items-end gap-2 p-4">
|
||||||
|
{#each $toasts as t (t.id)}
|
||||||
|
<div
|
||||||
|
class="pointer-events-auto flex max-w-sm items-start gap-3 border px-4 py-3 text-sm shadow-[4px_4px_0_rgb(15_23_42/0.12)] {kindClass[
|
||||||
|
t.kind
|
||||||
|
] ?? kindClass.info}"
|
||||||
|
role="status"
|
||||||
|
>
|
||||||
|
<p class="min-w-0 flex-1">{t.message}</p>
|
||||||
|
<button type="button" class="opacity-60 hover:opacity-100" onclick={() => dismissToast(t.id)} aria-label="关闭">
|
||||||
|
×
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
export interface ToolOption {
|
||||||
|
id: string;
|
||||||
|
label: string;
|
||||||
|
group: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const TOOL_OPTIONS: ToolOption[] = [
|
||||||
|
{ id: 'read_file', label: '读取文件', group: '文件' },
|
||||||
|
{ id: 'write_file', label: '写入文件', group: '文件' },
|
||||||
|
{ id: 'list_files', label: '列目录', group: '文件' },
|
||||||
|
{ id: 'search_files', label: '搜索', group: '文件' },
|
||||||
|
{ 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_build', label: 'cph build', group: 'CPH' },
|
||||||
|
{ id: 'send_file', label: '发送文件(飞书)', group: '飞书' },
|
||||||
|
{ id: 'feishu_read_context', label: '读飞书上下文', group: '飞书' },
|
||||||
|
{ id: 'feishu_download_resource', label: '下载飞书资源', group: '飞书' },
|
||||||
|
{ id: 'request_approval', label: '请求审批', group: '飞书' },
|
||||||
|
];
|
||||||
|
|
||||||
|
/** 组织成员角色(接口枚举保持英文,界面用 orgRoleLabel) */
|
||||||
|
export const ORG_ROLES = ['OWNER', 'ADMIN', 'MEMBER'] as const;
|
||||||
|
export type OrgRole = (typeof ORG_ROLES)[number];
|
||||||
|
|
||||||
|
export const ORG_ROLE_LABELS: Record<OrgRole, string> = {
|
||||||
|
OWNER: '所有者',
|
||||||
|
ADMIN: '管理员',
|
||||||
|
MEMBER: '成员',
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 项目团队授权角色(接口枚举保持英文,界面用 permissionRoleLabel) */
|
||||||
|
export const PERMISSION_ROLES = ['READ', 'EDIT', 'MANAGE'] as const;
|
||||||
|
export type PermissionRole = (typeof PERMISSION_ROLES)[number];
|
||||||
|
|
||||||
|
export const PERMISSION_ROLE_LABELS: Record<PermissionRole, string> = {
|
||||||
|
READ: '只读',
|
||||||
|
EDIT: '编辑',
|
||||||
|
MANAGE: '管理',
|
||||||
|
};
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
import { ORG_ROLE_LABELS, PERMISSION_ROLE_LABELS, type OrgRole, type PermissionRole } from './constants';
|
||||||
|
|
||||||
|
export function fmtDate(iso: string): string {
|
||||||
|
if (!iso) return '—';
|
||||||
|
const d = new Date(iso);
|
||||||
|
if (Number.isNaN(d.getTime())) return iso;
|
||||||
|
return d.toLocaleString(undefined, {
|
||||||
|
year: 'numeric',
|
||||||
|
month: 'short',
|
||||||
|
day: '2-digit',
|
||||||
|
hour: '2-digit',
|
||||||
|
minute: '2-digit',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function fmtDateOnly(iso: string): string {
|
||||||
|
if (!iso) return '—';
|
||||||
|
const d = new Date(iso);
|
||||||
|
if (Number.isNaN(d.getTime())) return iso;
|
||||||
|
return d.toLocaleDateString(undefined, { year: 'numeric', month: 'short', day: '2-digit' });
|
||||||
|
}
|
||||||
|
|
||||||
|
export function fmtCost(usd: number | null): string {
|
||||||
|
if (usd === null) return '—';
|
||||||
|
return `$${Number(usd).toFixed(4)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function fmtNum(n: number): string {
|
||||||
|
return n.toLocaleString();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function orgRoleLabel(role: string): string {
|
||||||
|
const key = role.toUpperCase() as OrgRole;
|
||||||
|
return ORG_ROLE_LABELS[key] ?? role;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function permissionRoleLabel(role: string): string {
|
||||||
|
const key = role.toUpperCase() as PermissionRole;
|
||||||
|
return PERMISSION_ROLE_LABELS[key] ?? role;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function providerModeLabel(mode: string): string {
|
||||||
|
if (mode === 'BYOK') return '自带密钥';
|
||||||
|
if (mode === 'PLATFORM_MANAGED') return '平台托管';
|
||||||
|
return mode;
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
// place files you want to import through the `$lib` alias in this folder.
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
import { writable } from 'svelte/store';
|
||||||
|
import { api, type MeResponse } from './api';
|
||||||
|
|
||||||
|
interface SessionState {
|
||||||
|
loading: boolean;
|
||||||
|
me: MeResponse | null;
|
||||||
|
error: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const session = writable<SessionState>({
|
||||||
|
loading: true,
|
||||||
|
me: null,
|
||||||
|
error: null,
|
||||||
|
});
|
||||||
|
|
||||||
|
export async function loadSession(): Promise<void> {
|
||||||
|
session.update((s) => ({ ...s, loading: true, error: null }));
|
||||||
|
try {
|
||||||
|
const me = await api.me();
|
||||||
|
session.set({ loading: false, me, error: null });
|
||||||
|
} catch (err) {
|
||||||
|
const status = (err as { status?: number }).status;
|
||||||
|
if (status === 401) {
|
||||||
|
redirectToLogin();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
session.set({
|
||||||
|
loading: false,
|
||||||
|
me: null,
|
||||||
|
error: err instanceof Error ? err.message : String(err),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resolve org slug for org-scoped Feishu OAuth (`GET /auth/feishu/:orgSlug`).
|
||||||
|
* Unscoped `/auth/feishu` is disabled unless allowLegacyFeishuOAuth is on.
|
||||||
|
*/
|
||||||
|
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');
|
||||||
|
if (q && q.trim() !== '') return q.trim();
|
||||||
|
|
||||||
|
// Alpha Silo public host: <slug>.educraft.paradigm-edu.net (or educraft-dev)
|
||||||
|
const host = window.location.hostname.toLowerCase();
|
||||||
|
const m = host.match(/^([a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)\.educraft(?:-dev)?\./);
|
||||||
|
if (m?.[1]) return m[1];
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function redirectToLogin(): void {
|
||||||
|
if (window.location.pathname === '/admin/login') return;
|
||||||
|
const ret = encodeURIComponent(
|
||||||
|
window.location.pathname + window.location.search + window.location.hash,
|
||||||
|
);
|
||||||
|
const slug = resolveLoginOrgSlug();
|
||||||
|
if (slug === null) {
|
||||||
|
// Need an org slug for scoped OAuth — backend login helper can prompt.
|
||||||
|
window.location.href = `/admin/login?returnTo=${ret}`;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
window.location.href = `/auth/feishu/${encodeURIComponent(slug)}?returnTo=${ret}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function logout(): Promise<void> {
|
||||||
|
await api.logout();
|
||||||
|
redirectToLogin();
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
import { writable } from 'svelte/store';
|
||||||
|
|
||||||
|
export type ToastKind = 'info' | 'success' | 'error';
|
||||||
|
|
||||||
|
export interface ToastItem {
|
||||||
|
id: number;
|
||||||
|
message: string;
|
||||||
|
kind: ToastKind;
|
||||||
|
}
|
||||||
|
|
||||||
|
let seq = 0;
|
||||||
|
export const toasts = writable<ToastItem[]>([]);
|
||||||
|
|
||||||
|
export function pushToast(message: string, kind: ToastKind = 'info', ms = 3200): void {
|
||||||
|
const id = ++seq;
|
||||||
|
toasts.update((list) => [...list, { id, message, kind }]);
|
||||||
|
if (ms > 0) {
|
||||||
|
setTimeout(() => {
|
||||||
|
toasts.update((list) => list.filter((t) => t.id !== id));
|
||||||
|
}, ms);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function dismissToast(id: number): void {
|
||||||
|
toasts.update((list) => list.filter((t) => t.id !== id));
|
||||||
|
}
|
||||||
|
|
||||||
|
export function toastSuccess(message: string): void {
|
||||||
|
pushToast(message, 'success');
|
||||||
|
}
|
||||||
|
|
||||||
|
export function toastError(message: string): void {
|
||||||
|
pushToast(message, 'error', 5000);
|
||||||
|
}
|
||||||
@@ -0,0 +1,388 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import '../routes/app.css';
|
||||||
|
import { onMount } from 'svelte';
|
||||||
|
import { goto } from '$app/navigation';
|
||||||
|
import { page } from '$app/state';
|
||||||
|
import { session, loadSession, logout, redirectToLogin } from '$lib/session';
|
||||||
|
import type { OrgMembership } from '$lib/api';
|
||||||
|
import { orgRoleLabel } from '$lib/format';
|
||||||
|
import Icon from '$lib/components/Icon.svelte';
|
||||||
|
import ToastHost from '$lib/components/ToastHost.svelte';
|
||||||
|
import SelectField from '$lib/components/SelectField.svelte';
|
||||||
|
|
||||||
|
let { children } = $props();
|
||||||
|
let mobileNavOpen = $state(false);
|
||||||
|
let redirecting = $state(false);
|
||||||
|
|
||||||
|
onMount(() => {
|
||||||
|
loadSession();
|
||||||
|
});
|
||||||
|
|
||||||
|
const navItems = [
|
||||||
|
{ key: 'overview', label: '概览', icon: 'overview' as const },
|
||||||
|
{ key: 'members', label: '成员', icon: 'members' as const },
|
||||||
|
{ key: 'teams', label: '团队', icon: 'teams' as const },
|
||||||
|
{ key: 'projects', label: '项目', icon: 'projects' as const },
|
||||||
|
{ key: 'capacity', label: '容量', icon: 'overview' as const },
|
||||||
|
{ key: 'provider', label: '供应方', icon: 'provider' as const },
|
||||||
|
{ key: 'skills', label: '技能', icon: 'roles' as const },
|
||||||
|
{ key: 'roles', label: '角色', icon: 'roles' 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[] {
|
||||||
|
return $session.me?.organizations ?? [];
|
||||||
|
}
|
||||||
|
|
||||||
|
function adminOrgs(): OrgMembership[] {
|
||||||
|
return memberships().filter(isAdmin);
|
||||||
|
}
|
||||||
|
|
||||||
|
function currentOrg(): OrgMembership | null {
|
||||||
|
const slug = orgSlugFromPath();
|
||||||
|
if (!slug) return null;
|
||||||
|
return memberships().find((o) => o.slug === slug) ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function pickHomeOrg(): OrgMembership | null {
|
||||||
|
const admin = adminOrgs()[0];
|
||||||
|
if (admin) return admin;
|
||||||
|
return memberships()[0] ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function activeKey(): string {
|
||||||
|
const parts = page.url.pathname.split('/').filter(Boolean);
|
||||||
|
if (parts[0] !== 'admin' || parts[1] !== 'org' || !parts[2]) return '';
|
||||||
|
return parts[3] ?? 'overview';
|
||||||
|
}
|
||||||
|
|
||||||
|
function navHref(key: string): string {
|
||||||
|
const slug = currentOrg()?.slug ?? pickHomeOrg()?.slug;
|
||||||
|
if (!slug) return '/';
|
||||||
|
if (key === 'overview') return `/admin/org/${slug}`;
|
||||||
|
return `/admin/org/${slug}/${key}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function pageTitle(): string {
|
||||||
|
const key = activeKey();
|
||||||
|
if (key === 'overview' || key === '') return '概览';
|
||||||
|
return navItems.find((i) => i.key === key)?.label ?? '管理后台';
|
||||||
|
}
|
||||||
|
|
||||||
|
function switchOrg(nextSlug: string) {
|
||||||
|
if (!nextSlug || nextSlug === currentOrg()?.slug) return;
|
||||||
|
void goto(`/admin/org/${nextSlug}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleLogout(e: Event) {
|
||||||
|
e.preventDefault();
|
||||||
|
logout();
|
||||||
|
}
|
||||||
|
|
||||||
|
function orgSelectItems(list: OrgMembership[]) {
|
||||||
|
return list.map((o) => ({
|
||||||
|
value: o.slug,
|
||||||
|
label: `${o.name} · ${orgRoleLabel(o.role)}`,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
page.url.pathname;
|
||||||
|
mobileNavOpen = false;
|
||||||
|
});
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
if ($session.loading || !$session.me) return;
|
||||||
|
|
||||||
|
const slug = orgSlugFromPath();
|
||||||
|
const matched = slug ? memberships().find((o) => o.slug === slug) : null;
|
||||||
|
|
||||||
|
// Org admins: route to their first admin org if none matched as admin.
|
||||||
|
const admins = adminOrgs();
|
||||||
|
if (matched && isAdmin(matched)) {
|
||||||
|
redirecting = false;
|
||||||
|
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;
|
||||||
|
// the org overview and other admin-only surfaces are not for them.
|
||||||
|
if (matched && !isAdmin(matched)) {
|
||||||
|
redirecting = false;
|
||||||
|
const parts = page.url.pathname.split('/').filter(Boolean);
|
||||||
|
const onOverview = parts.length === 3; // /admin/org/:slug
|
||||||
|
if (onOverview) {
|
||||||
|
const target = `/admin/org/${matched.slug}/projects`;
|
||||||
|
if (page.url.pathname !== target) {
|
||||||
|
redirecting = true;
|
||||||
|
void goto(target, { replaceState: true });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// No matched org and no admin orgs: route a member to their first org's
|
||||||
|
// projects page so they can reach project MANAGE surfaces.
|
||||||
|
if (!matched && memberships().length > 0) {
|
||||||
|
const home = memberships()[0];
|
||||||
|
const target = `/admin/org/${home.slug}/projects`;
|
||||||
|
if (page.url.pathname !== target && !page.url.pathname.startsWith(`${target}/`)) {
|
||||||
|
redirecting = true;
|
||||||
|
void goto(target, { replaceState: true });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<ToastHost />
|
||||||
|
|
||||||
|
{#if $session.loading || redirecting}
|
||||||
|
<div class="saas-status-panel">
|
||||||
|
<div class="flex flex-col items-center gap-3 text-surface-600">
|
||||||
|
<svg class="h-8 w-8 animate-spin text-primary-500" viewBox="0 0 24 24" fill="none">
|
||||||
|
<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
|
||||||
|
<path
|
||||||
|
class="opacity-90"
|
||||||
|
fill="currentColor"
|
||||||
|
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>
|
||||||
|
</svg>
|
||||||
|
<p class="text-sm">{redirecting ? '正在进入组织…' : '正在加载会话…'}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{:else if $session.error}
|
||||||
|
<div class="saas-status-panel">
|
||||||
|
<div class="saas-status-card">
|
||||||
|
<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"
|
||||||
|
>
|
||||||
|
!
|
||||||
|
</div>
|
||||||
|
<h2 class="mb-1 text-lg font-semibold">无法连接到后端</h2>
|
||||||
|
<p class="mb-5 text-sm text-surface-700">{$session.error}</p>
|
||||||
|
<button class="saas-btn-primary" onclick={() => loadSession()}>重试</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{:else if !$session.me}
|
||||||
|
<div class="saas-status-panel">
|
||||||
|
<div class="saas-status-card">
|
||||||
|
<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"
|
||||||
|
>
|
||||||
|
CPH
|
||||||
|
</div>
|
||||||
|
<h1 class="text-xl font-semibold">Curriculum Project Hub</h1>
|
||||||
|
<p class="mt-2 mb-6 text-sm text-surface-700">登录以管理组织、项目、团队与模型供应。</p>
|
||||||
|
<button class="saas-btn-primary w-full" onclick={() => redirectToLogin()}>使用飞书登录</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{:else if currentOrg() && isAdmin(currentOrg()!)}
|
||||||
|
{@const org = currentOrg()!}
|
||||||
|
{@const me = $session.me!}
|
||||||
|
<div class="saas-shell">
|
||||||
|
{#if mobileNavOpen}
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="fixed inset-0 z-40 bg-surface-950/40 md:hidden"
|
||||||
|
aria-label="关闭导航"
|
||||||
|
onclick={() => (mobileNavOpen = false)}
|
||||||
|
></button>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<aside
|
||||||
|
class="saas-sidebar fixed inset-y-0 left-0 z-50 transition-transform md:static md:translate-x-0
|
||||||
|
{mobileNavOpen ? 'translate-x-0' : '-translate-x-full md:translate-x-0'}"
|
||||||
|
>
|
||||||
|
<div class="flex items-center gap-2.5 px-4 py-4">
|
||||||
|
<div
|
||||||
|
class="flex h-9 w-9 items-center justify-center border border-primary-700 bg-primary-600 text-xs font-bold tracking-wide text-white"
|
||||||
|
>
|
||||||
|
CPH
|
||||||
|
</div>
|
||||||
|
<div class="min-w-0">
|
||||||
|
<div class="truncate text-sm font-semibold text-surface-900">组织后台</div>
|
||||||
|
<div class="truncate text-xs text-surface-600">Curriculum Hub</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="px-3 pb-3">
|
||||||
|
<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" />
|
||||||
|
组织
|
||||||
|
</div>
|
||||||
|
<SelectField items={orgSelectItems(me.organizations)} value={org.slug} onchange={switchOrg} />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<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>
|
||||||
|
{#each navItems as item}
|
||||||
|
{@const active =
|
||||||
|
activeKey() === item.key || (item.key === 'overview' && (activeKey() === '' || activeKey() === 'overview'))}
|
||||||
|
<a href={navHref(item.key)} class="saas-nav-item" data-active={active ? 'true' : 'false'}>
|
||||||
|
<Icon name={item.icon} class="h-4 w-4 shrink-0 opacity-80" />
|
||||||
|
<span>{item.label}</span>
|
||||||
|
</a>
|
||||||
|
{/each}
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
<div class="border-t border-surface-300 p-3">
|
||||||
|
<div class="flex items-center gap-2.5 border border-surface-300 bg-surface-100 px-2.5 py-2">
|
||||||
|
{#if me.user.avatarUrl}
|
||||||
|
<img src={me.user.avatarUrl} alt="" class="h-8 w-8 object-cover" />
|
||||||
|
{:else}
|
||||||
|
<div
|
||||||
|
class="flex h-8 w-8 items-center justify-center border border-primary-300 bg-primary-100 text-xs font-semibold text-primary-800"
|
||||||
|
>
|
||||||
|
{me.user.displayName.slice(0, 1)}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
<div class="min-w-0 flex-1">
|
||||||
|
<div class="truncate text-sm font-medium text-surface-900">{me.user.displayName}</div>
|
||||||
|
<div class="truncate text-[11px] text-surface-600">{orgRoleLabel(org.role)}</div>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="p-1.5 text-surface-600 transition hover:bg-surface-200 hover:text-error-700"
|
||||||
|
title="退出登录"
|
||||||
|
onclick={handleLogout}
|
||||||
|
>
|
||||||
|
<Icon name="logout" class="h-4 w-4" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</aside>
|
||||||
|
|
||||||
|
<div class="saas-main">
|
||||||
|
<header class="saas-topbar">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="saas-btn-ghost px-2! md:hidden"
|
||||||
|
onclick={() => (mobileNavOpen = !mobileNavOpen)}
|
||||||
|
aria-label="打开导航"
|
||||||
|
>
|
||||||
|
<Icon name="menu" class="h-5 w-5" />
|
||||||
|
</button>
|
||||||
|
<div class="min-w-0">
|
||||||
|
<div class="flex items-center gap-1.5 text-xs text-surface-600">
|
||||||
|
<span class="truncate">{org.name}</span>
|
||||||
|
<span>/</span>
|
||||||
|
<span class="truncate font-medium text-surface-900">{pageTitle()}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="ml-auto hidden items-center gap-2 sm:flex">
|
||||||
|
<span class="saas-badge-primary">{org.status}</span>
|
||||||
|
<span class="saas-badge-neutral font-mono">/{org.slug}</span>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
<main class="saas-content">
|
||||||
|
<div class="saas-content-inner">
|
||||||
|
{@render children()}
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{:else if currentOrg() && !isAdmin(currentOrg()!) && isOnProjectRoute()}
|
||||||
|
{@const org = currentOrg()!}
|
||||||
|
{@const me = $session.me!}
|
||||||
|
<div class="saas-shell">
|
||||||
|
<div class="saas-main">
|
||||||
|
<header class="saas-topbar">
|
||||||
|
<a href={`/admin/org/${org.slug}/projects`} class="saas-btn-ghost px-2!" aria-label="返回项目列表">
|
||||||
|
<Icon name="menu" class="h-5 w-5" />
|
||||||
|
</a>
|
||||||
|
<div class="min-w-0">
|
||||||
|
<div class="flex items-center gap-1.5 text-xs text-surface-600">
|
||||||
|
<span class="truncate">{org.name}</span>
|
||||||
|
<span>/</span>
|
||||||
|
<span class="truncate font-medium text-surface-900">项目</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="ml-auto flex items-center gap-2">
|
||||||
|
<span class="saas-badge-neutral font-mono">/{org.slug}</span>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="p-1.5 text-surface-600 transition hover:bg-surface-200 hover:text-error-700"
|
||||||
|
title="退出登录"
|
||||||
|
onclick={handleLogout}
|
||||||
|
>
|
||||||
|
<Icon name="logout" class="h-4 w-4" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
<main class="saas-content">
|
||||||
|
<div class="saas-content-inner">
|
||||||
|
{@render children()}
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{:else if currentOrg() && !isAdmin(currentOrg()!)}
|
||||||
|
{@const denied = currentOrg()!}
|
||||||
|
<div class="saas-status-panel">
|
||||||
|
<div class="saas-status-card">
|
||||||
|
<h2 class="mb-2 text-lg font-semibold">无权访问管理后台</h2>
|
||||||
|
<p class="mb-3 text-sm text-surface-700">
|
||||||
|
组织 <strong>{denied.name}</strong>(/{denied.slug})中你的角色是
|
||||||
|
<span class="saas-badge-neutral mx-1">{orgRoleLabel(denied.role)}</span>。普通成员仅可访问自己有授权的项目。
|
||||||
|
</p>
|
||||||
|
<a class="saas-btn-primary" href={`/admin/org/${denied.slug}/projects`}>查看我的项目</a>
|
||||||
|
{#if memberships().length > 1}
|
||||||
|
<p class="saas-label text-left mb-1.5 mt-3">切换到其他组织</p>
|
||||||
|
<div class="mb-4">
|
||||||
|
<SelectField items={orgSelectItems(memberships())} value={denied.slug} onchange={switchOrg} />
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
<button class="saas-btn-ghost mt-3" onclick={handleLogout}>退出登录</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{:else if memberships().length > 0}
|
||||||
|
{@const denied = pickHomeOrg()!}
|
||||||
|
<div class="saas-status-panel">
|
||||||
|
<div class="saas-status-card">
|
||||||
|
<h2 class="mb-2 text-lg font-semibold">正在跳转…</h2>
|
||||||
|
<p class="mb-5 text-sm text-surface-700">
|
||||||
|
即将进入 <strong>{denied.name}</strong>(/{denied.slug})的项目。
|
||||||
|
</p>
|
||||||
|
<a class="saas-btn-primary" href={`/admin/org/${denied.slug}/projects`}>立即进入</a>
|
||||||
|
<button class="saas-btn-ghost mt-3" onclick={handleLogout}>退出登录</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<div class="saas-status-panel">
|
||||||
|
<div class="saas-status-card">
|
||||||
|
<h2 class="mb-2 text-lg font-semibold">未加入组织</h2>
|
||||||
|
<p class="mb-3 text-sm text-surface-700">飞书账号已登录,但当前账号尚未加入任何组织。</p>
|
||||||
|
<p class="mb-5 text-left text-xs text-surface-600">
|
||||||
|
open_id:
|
||||||
|
<code class="break-all font-mono text-surface-600">{$session.me!.user.feishuOpenId}</code>
|
||||||
|
</p>
|
||||||
|
<button class="saas-btn-primary" onclick={handleLogout}>退出登录</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { onMount } from 'svelte';
|
||||||
|
import { goto } from '$app/navigation';
|
||||||
|
import { session, redirectToLogin } from '$lib/session';
|
||||||
|
|
||||||
|
function homeForSession(): string | null {
|
||||||
|
const me = $session.me;
|
||||||
|
if (!me) return null;
|
||||||
|
const admin = me.organizations.find((o) => {
|
||||||
|
const r = String(o.role ?? '').toUpperCase();
|
||||||
|
return r === 'OWNER' || r === 'ADMIN';
|
||||||
|
});
|
||||||
|
const target = admin ?? me.organizations[0];
|
||||||
|
return target ? `/admin/org/${target.slug}` : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
onMount(() => {
|
||||||
|
const unsub = session.subscribe((s) => {
|
||||||
|
if (s.loading) return;
|
||||||
|
if (!s.me) {
|
||||||
|
redirectToLogin();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const dest = homeForSession();
|
||||||
|
if (dest) void goto(dest, { replaceState: true });
|
||||||
|
});
|
||||||
|
return unsub;
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="saas-status-panel">
|
||||||
|
<div class="flex flex-col items-center gap-3 text-surface-600">
|
||||||
|
<svg class="h-7 w-7 animate-spin text-primary-500" viewBox="0 0 24 24" fill="none">
|
||||||
|
<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
|
||||||
|
<path
|
||||||
|
class="opacity-90"
|
||||||
|
fill="currentColor"
|
||||||
|
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>
|
||||||
|
</svg>
|
||||||
|
<p class="text-sm">正在进入工作台…</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,147 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { page } from '$app/state';
|
||||||
|
import { api, type OrgMembership } from '$lib/api';
|
||||||
|
import { session } from '$lib/session';
|
||||||
|
import { fmtCost, fmtNum, orgRoleLabel } 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 SwitchControl from '$lib/components/SwitchControl.svelte';
|
||||||
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
|
let orgSlug = $derived(page.params.slug ?? '');
|
||||||
|
let org = $derived($session.me?.organizations.find((o) => o.slug === orgSlug) as OrgMembership | undefined);
|
||||||
|
|
||||||
|
let settings = $state<{ membersCanCreateProjects: boolean } | null>(null);
|
||||||
|
let usage = $state<Awaited<ReturnType<typeof api.usage>> | null>(null);
|
||||||
|
let loading = $state(true);
|
||||||
|
let error = $state<string | null>(null);
|
||||||
|
let saving = $state(false);
|
||||||
|
|
||||||
|
async function load() {
|
||||||
|
loading = true;
|
||||||
|
error = null;
|
||||||
|
try {
|
||||||
|
[settings, usage] = await Promise.all([api.settings(orgSlug), api.usage(orgSlug)]);
|
||||||
|
} catch (err) {
|
||||||
|
error = err instanceof Error ? err.message : String(err);
|
||||||
|
} finally {
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function setMembersCanCreate(next: boolean) {
|
||||||
|
if (!settings || settings.membersCanCreateProjects === next) return;
|
||||||
|
saving = true;
|
||||||
|
const prev = settings.membersCanCreateProjects;
|
||||||
|
settings.membersCanCreateProjects = next;
|
||||||
|
try {
|
||||||
|
await api.setSettings(orgSlug, { membersCanCreateProjects: next });
|
||||||
|
toastSuccess(next ? '已允许成员自助建项' : '已关闭成员自助建项');
|
||||||
|
} catch (err) {
|
||||||
|
settings.membersCanCreateProjects = prev;
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
} finally {
|
||||||
|
saving = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
if (orgSlug) load();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{#if loading}
|
||||||
|
<LoadingState />
|
||||||
|
{:else if error}
|
||||||
|
<ErrorBanner message={error} onretry={load} />
|
||||||
|
{:else if org && settings && usage}
|
||||||
|
<PageHeader title={org.name} description="组织健康度、用量与生产策略一览。" />
|
||||||
|
|
||||||
|
<div class="mb-6 grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
|
||||||
|
<div class="saas-card-pad sm:col-span-2 lg:col-span-1">
|
||||||
|
<p class="saas-section-title mb-3">组织信息</p>
|
||||||
|
<dl class="space-y-2.5 text-sm">
|
||||||
|
<div class="flex items-center justify-between gap-3">
|
||||||
|
<dt class="text-surface-700">Slug</dt>
|
||||||
|
<dd class="font-mono text-xs text-surface-800">/{org.slug}</dd>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center justify-between gap-3">
|
||||||
|
<dt class="text-surface-700">状态</dt>
|
||||||
|
<dd><span class="saas-badge-success">{org.status}</span></dd>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center justify-between gap-3">
|
||||||
|
<dt class="text-surface-700">你的角色</dt>
|
||||||
|
<dd><span class="saas-badge-primary">{orgRoleLabel(org.role)}</span></dd>
|
||||||
|
</div>
|
||||||
|
</dl>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="saas-card-pad sm:col-span-2">
|
||||||
|
<p class="saas-section-title mb-1">项目自助创建策略</p>
|
||||||
|
<p class="saas-muted mb-4">开启后,普通老师可在飞书群自助创建项目;关闭后仅所有者与管理员可建。</p>
|
||||||
|
<div class="flex items-center gap-3 border border-surface-300 bg-surface-100 px-4 py-3">
|
||||||
|
<SwitchControl checked={settings.membersCanCreateProjects} disabled={saving} onchange={setMembersCanCreate} />
|
||||||
|
<div>
|
||||||
|
<div class="text-sm font-medium text-surface-900">允许成员自助创建项目</div>
|
||||||
|
<div class="text-xs text-surface-600">普通成员在飞书群中自助建项</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-4 flex items-end justify-between gap-3">
|
||||||
|
<div>
|
||||||
|
<h2 class="saas-section-title">用量概览</h2>
|
||||||
|
<p class="saas-muted">全组织智能体运行汇总</p>
|
||||||
|
</div>
|
||||||
|
</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)} />
|
||||||
|
<StatCard label="无成本运行" value={fmtNum(usage.totals.runsWithoutCost)} />
|
||||||
|
<StatCard label="输入 tokens" value={fmtNum(usage.totals.inputTokens)} />
|
||||||
|
<StatCard label="输出 tokens" value={fmtNum(usage.totals.outputTokens)} />
|
||||||
|
<StatCard label="成本 (USD)" value={fmtCost(usage.totals.costUsd)} />
|
||||||
|
</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>
|
||||||
|
</div>
|
||||||
|
{#if usage.projects.length === 0}
|
||||||
|
<div class="saas-empty">
|
||||||
|
<p class="text-sm text-surface-600">暂无项目用量数据</p>
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<div class="overflow-x-auto">
|
||||||
|
<table class="data-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>项目</th>
|
||||||
|
<th>运行</th>
|
||||||
|
<th>in / out tokens</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-600">{fmtNum(p.inputTokens)} / {fmtNum(p.outputTokens)}</td>
|
||||||
|
<td class="tabular-nums">{fmtCost(p.costUsd)}</td>
|
||||||
|
</tr>
|
||||||
|
{/each}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<div class="saas-empty">
|
||||||
|
<p class="text-sm text-surface-600">组织数据不可用</p>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
@@ -0,0 +1,202 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { page } from '$app/state';
|
||||||
|
import { api, type CapabilityConnection } from '$lib/api';
|
||||||
|
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 slug = $derived(page.params.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}
|
||||||
@@ -0,0 +1,310 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { page } from '$app/state';
|
||||||
|
import { api, type CapacityDimension, type CapacityDimensionRow, type CapacityPolicyView } from '$lib/api';
|
||||||
|
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 { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
|
const slug = $derived(page.params.slug ?? '');
|
||||||
|
|
||||||
|
// Friendlier, user-facing labels. No spec jargon (墙钟 → 运行时长, etc.).
|
||||||
|
const DIMENSION_LABELS: Record<CapacityDimension, string> = {
|
||||||
|
requestRate: '请求速率',
|
||||||
|
requestBodySize: '请求体大小',
|
||||||
|
agentConcurrency: '并发数',
|
||||||
|
admissionQueueLength: '队列长度',
|
||||||
|
admissionQueueWait: '队列等待',
|
||||||
|
fileSize: '单文件大小',
|
||||||
|
attachmentCount: '附件数',
|
||||||
|
archiveExpansion: '归档展开',
|
||||||
|
projectStorage: '项目存储',
|
||||||
|
organizationStorage: '组织存储',
|
||||||
|
memberCount: '成员数',
|
||||||
|
projectCount: '项目数',
|
||||||
|
teamCount: '团队数',
|
||||||
|
folderCount: '文件夹数',
|
||||||
|
sessionCount: '会话数',
|
||||||
|
runWallTime: '运行时长',
|
||||||
|
runTurns: '对话轮次',
|
||||||
|
runToolCalls: '工具调用数',
|
||||||
|
toolWallTime: '工具执行时长',
|
||||||
|
runOutputSize: '输出大小',
|
||||||
|
processMemory: '内存',
|
||||||
|
processCpu: 'CPU',
|
||||||
|
processCount: '进程数',
|
||||||
|
};
|
||||||
|
|
||||||
|
// Logical groupings for higher information density.
|
||||||
|
const GROUPS: { title: string; dims: CapacityDimension[] }[] = [
|
||||||
|
{ title: 'HTTP 接入', dims: ['requestRate', 'requestBodySize'] },
|
||||||
|
{ title: '智能体运行', dims: ['agentConcurrency', 'runWallTime', 'runTurns', 'runToolCalls', 'toolWallTime', 'runOutputSize'] },
|
||||||
|
{ title: '接纳队列', dims: ['admissionQueueLength', 'admissionQueueWait'] },
|
||||||
|
{ title: '附件与存储', dims: ['fileSize', 'attachmentCount', 'archiveExpansion', 'projectStorage', 'organizationStorage'] },
|
||||||
|
{ title: '组织配额', dims: ['memberCount', 'projectCount', 'teamCount', 'folderCount', 'sessionCount'] },
|
||||||
|
{ title: '进程资源', dims: ['processMemory', 'processCpu', 'processCount'] },
|
||||||
|
];
|
||||||
|
|
||||||
|
let view = $state<CapacityPolicyView | null>(null);
|
||||||
|
let drafts = $state<Partial<Record<CapacityDimension, string | number>>>({});
|
||||||
|
let loading = $state(true);
|
||||||
|
let saving = $state(false);
|
||||||
|
let error = $state<string | null>(null);
|
||||||
|
|
||||||
|
async function load() {
|
||||||
|
loading = true;
|
||||||
|
error = null;
|
||||||
|
try {
|
||||||
|
view = await api.capacityPolicy(slug);
|
||||||
|
drafts = {};
|
||||||
|
for (const row of view.dimensions) {
|
||||||
|
drafts[row.dimension] = row.organizationLimit === null ? '' : String(row.organizationLimit);
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
error = err instanceof Error ? err.message : String(err);
|
||||||
|
} finally {
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function draftText(dim: CapacityDimension): string {
|
||||||
|
const raw = drafts[dim];
|
||||||
|
if (raw === undefined || raw === null) return '';
|
||||||
|
return String(raw).trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Inline validation: surfaced as the user edits, not on submit. Returns null
|
||||||
|
// when the draft is empty (means "use platform ceiling") or valid.
|
||||||
|
function draftError(row: CapacityDimensionRow): string | null {
|
||||||
|
const text = draftText(row.dimension);
|
||||||
|
if (text === '') return null;
|
||||||
|
const n = Number.parseInt(text, 10);
|
||||||
|
if (!Number.isFinite(n) || n < 1) return '需为正整数';
|
||||||
|
if (row.platformCeiling !== null && n > row.platformCeiling) return `不得超过 ${row.platformCeiling}`;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Live effective value: min(platform ceiling, draft). Reflects the draft
|
||||||
|
// before save so the user sees the outcome as they type.
|
||||||
|
function liveEffective(row: CapacityDimensionRow): number | null {
|
||||||
|
if (row.platformCeiling === null) return null;
|
||||||
|
const text = draftText(row.dimension);
|
||||||
|
if (text === '') return row.platformCeiling;
|
||||||
|
const n = Number.parseInt(text, 10);
|
||||||
|
if (!Number.isFinite(n) || n < 1) return row.platformCeiling;
|
||||||
|
return Math.min(row.platformCeiling, n);
|
||||||
|
}
|
||||||
|
|
||||||
|
function isLowered(row: CapacityDimensionRow): boolean {
|
||||||
|
const eff = liveEffective(row);
|
||||||
|
return eff !== null && eff < row.platformCeiling!;
|
||||||
|
}
|
||||||
|
|
||||||
|
const hasErrors = $derived(
|
||||||
|
view?.dimensions.some((row) => draftError(row) !== null) ?? false,
|
||||||
|
);
|
||||||
|
|
||||||
|
async function save() {
|
||||||
|
if (!view || hasErrors) return;
|
||||||
|
saving = true;
|
||||||
|
const limits: Partial<Record<CapacityDimension, number | null>> = {};
|
||||||
|
for (const row of view.dimensions) {
|
||||||
|
const text = draftText(row.dimension);
|
||||||
|
limits[row.dimension] = text === '' ? null : Number.parseInt(text, 10);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
view = await api.setCapacityPolicy(slug, { limits });
|
||||||
|
drafts = {};
|
||||||
|
for (const row of view.dimensions) {
|
||||||
|
drafts[row.dimension] = row.organizationLimit === null ? '' : String(row.organizationLimit);
|
||||||
|
}
|
||||||
|
toastSuccess('容量策略已保存');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
} finally {
|
||||||
|
saving = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
if (slug) load();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<PageHeader
|
||||||
|
title="容量策略"
|
||||||
|
description="平台上限不可突破。组织可在此设更低限制,未设置时按平台上限执行。"
|
||||||
|
>
|
||||||
|
{#snippet actions()}
|
||||||
|
<button class="saas-btn-primary" disabled={saving || !view || hasErrors} onclick={save}>
|
||||||
|
{saving ? '保存中…' : '保存'}
|
||||||
|
</button>
|
||||||
|
{/snippet}
|
||||||
|
</PageHeader>
|
||||||
|
|
||||||
|
<p class="saas-muted mb-6">
|
||||||
|
未配置平台上限的维度暂不可设置组织限制。输入框留空即沿用平台上限。
|
||||||
|
</p>
|
||||||
|
|
||||||
|
{#if loading}
|
||||||
|
<LoadingState />
|
||||||
|
{:else if error}
|
||||||
|
<ErrorBanner message={error} onretry={load} />
|
||||||
|
{:else if view}
|
||||||
|
{#if view.dimensions.length === 0}
|
||||||
|
<EmptyState title="暂无容量维度" description="容量维度由平台定义。" />
|
||||||
|
{:else}
|
||||||
|
{@const policy = view}
|
||||||
|
<div class="grid gap-4 md:grid-cols-2">
|
||||||
|
{#each GROUPS as group}
|
||||||
|
{@const rows = group.dims
|
||||||
|
.map((d) => policy.dimensions.find((r) => r.dimension === d))
|
||||||
|
.filter((r): r is CapacityDimensionRow => r !== undefined)}
|
||||||
|
{#if rows.length > 0}
|
||||||
|
<section class="saas-card">
|
||||||
|
<header class="group-header">
|
||||||
|
<h3 class="group-title">{group.title}</h3>
|
||||||
|
<span class="group-count">{rows.length} 项</span>
|
||||||
|
</header>
|
||||||
|
<div class="dim-list">
|
||||||
|
{#each rows as row (row.dimension)}
|
||||||
|
{@const err = draftError(row)}
|
||||||
|
{@const eff = liveEffective(row)}
|
||||||
|
{@const lowered = isLowered(row)}
|
||||||
|
{@const disabled = row.platformCeiling === null}
|
||||||
|
<div class="dim-row" class:dim-row-error={err !== null}>
|
||||||
|
<div class="dim-label">{DIMENSION_LABELS[row.dimension] ?? row.dimension}</div>
|
||||||
|
<div class="dim-ceiling">
|
||||||
|
{#if disabled}
|
||||||
|
<span class="text-surface-400">未配置</span>
|
||||||
|
{:else}
|
||||||
|
<span class="tabular-nums">平台 ≤ {row.platformCeiling}</span>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
<input
|
||||||
|
class="saas-input dim-input"
|
||||||
|
type="number"
|
||||||
|
placeholder="用平台值"
|
||||||
|
disabled={disabled}
|
||||||
|
bind:value={drafts[row.dimension]}
|
||||||
|
/>
|
||||||
|
<div class="dim-effective">
|
||||||
|
{#if eff === null}
|
||||||
|
<span class="text-surface-400">—</span>
|
||||||
|
{:else if lowered}
|
||||||
|
<span class="saas-badge saas-badge-primary tabular-nums">有效 {eff}</span>
|
||||||
|
{:else}
|
||||||
|
<span class="saas-badge saas-badge-neutral tabular-nums">有效 {eff}</span>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{#if err !== null}
|
||||||
|
<div class="dim-error">{err}</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
{/if}
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
{:else}
|
||||||
|
<EmptyState title="容量数据不可用" description="无法加载容量策略。" />
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.group-header {
|
||||||
|
display: flex;
|
||||||
|
align-items: baseline;
|
||||||
|
justify-content: space-between;
|
||||||
|
padding: 0.5rem 0.75rem;
|
||||||
|
border-bottom: 1px solid var(--color-surface-200);
|
||||||
|
background: var(--color-surface-100);
|
||||||
|
}
|
||||||
|
.group-title {
|
||||||
|
font-size: 0.8125rem;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--color-surface-800);
|
||||||
|
letter-spacing: 0.02em;
|
||||||
|
}
|
||||||
|
.group-count {
|
||||||
|
font-size: 0.6875rem;
|
||||||
|
color: var(--color-surface-500);
|
||||||
|
}
|
||||||
|
.dim-list {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
.dim-row {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(5rem, 1fr) auto minmax(7rem, 8.5rem) 6.5rem;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.5rem;
|
||||||
|
padding: 0.4rem 0.75rem;
|
||||||
|
border-bottom: 1px solid var(--color-surface-100);
|
||||||
|
}
|
||||||
|
.dim-row:last-child {
|
||||||
|
border-bottom: none;
|
||||||
|
}
|
||||||
|
.dim-row-error {
|
||||||
|
background: color-mix(in oklab, var(--color-error-100) 40%, transparent);
|
||||||
|
}
|
||||||
|
.dim-label {
|
||||||
|
font-size: 0.8125rem;
|
||||||
|
font-weight: 500;
|
||||||
|
color: var(--color-surface-900);
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
.dim-ceiling {
|
||||||
|
font-size: 0.6875rem;
|
||||||
|
color: var(--color-surface-500);
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
.dim-input {
|
||||||
|
padding: 0.25rem 0.5rem;
|
||||||
|
font-size: 0.8125rem;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
.dim-effective {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
}
|
||||||
|
.dim-effective > .saas-badge {
|
||||||
|
width: 100%;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
.dim-error {
|
||||||
|
grid-column: 1 / -1;
|
||||||
|
font-size: 0.6875rem;
|
||||||
|
color: var(--color-error-700);
|
||||||
|
padding-bottom: 0.2rem;
|
||||||
|
}
|
||||||
|
@media (max-width: 480px) {
|
||||||
|
.dim-row {
|
||||||
|
grid-template-columns: 1fr 5rem;
|
||||||
|
grid-template-rows: auto auto auto;
|
||||||
|
row-gap: 0.25rem;
|
||||||
|
}
|
||||||
|
.dim-label {
|
||||||
|
grid-column: 1;
|
||||||
|
}
|
||||||
|
.dim-ceiling {
|
||||||
|
grid-column: 2;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
.dim-input {
|
||||||
|
grid-column: 1 / -1;
|
||||||
|
}
|
||||||
|
.dim-effective {
|
||||||
|
grid-column: 1 / -1;
|
||||||
|
justify-content: flex-start;
|
||||||
|
}
|
||||||
|
.dim-effective > .saas-badge {
|
||||||
|
width: auto;
|
||||||
|
justify-content: flex-start;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -0,0 +1,176 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { page } from '$app/state';
|
||||||
|
import { api, type FeishuApplicationConnection } from '$lib/api';
|
||||||
|
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 slug = $derived(page.params.slug ?? '');
|
||||||
|
|
||||||
|
let connection = $state<FeishuApplicationConnection | null>(null);
|
||||||
|
let loading = $state(true);
|
||||||
|
let error = $state<string | null>(null);
|
||||||
|
|
||||||
|
let appId = $state('');
|
||||||
|
let appSecret = $state('');
|
||||||
|
let botOpenId = $state('');
|
||||||
|
let verificationToken = $state('');
|
||||||
|
let encryptKey = $state('');
|
||||||
|
let saving = $state(false);
|
||||||
|
let disabling = $state(false);
|
||||||
|
|
||||||
|
async function load() {
|
||||||
|
loading = true;
|
||||||
|
error = null;
|
||||||
|
try {
|
||||||
|
const res = await api.feishuApplication(slug);
|
||||||
|
connection = res.connection;
|
||||||
|
} catch (err) {
|
||||||
|
error = err instanceof Error ? err.message : String(err);
|
||||||
|
} finally {
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function resetForm() {
|
||||||
|
appId = '';
|
||||||
|
appSecret = '';
|
||||||
|
botOpenId = '';
|
||||||
|
verificationToken = '';
|
||||||
|
encryptKey = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
async function save() {
|
||||||
|
const id = appId.trim();
|
||||||
|
const secret = appSecret.trim();
|
||||||
|
const bot = botOpenId.trim();
|
||||||
|
if (id === '' || secret === '' || bot === '') {
|
||||||
|
toastError('App ID、App Secret、Bot Open ID 均为必填');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
saving = true;
|
||||||
|
const body: {
|
||||||
|
appId: string;
|
||||||
|
appSecret: string;
|
||||||
|
botOpenId: string;
|
||||||
|
verificationToken?: string;
|
||||||
|
encryptKey?: string;
|
||||||
|
} = { appId: id, appSecret: secret, botOpenId: bot };
|
||||||
|
const vt = verificationToken.trim();
|
||||||
|
if (vt !== '') body.verificationToken = vt;
|
||||||
|
const ek = encryptKey.trim();
|
||||||
|
if (ek !== '') body.encryptKey = ek;
|
||||||
|
try {
|
||||||
|
connection = await api.rotateFeishuApplication(slug, body);
|
||||||
|
resetForm();
|
||||||
|
toastSuccess('飞书应用凭据已保存');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
} finally {
|
||||||
|
saving = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function disable() {
|
||||||
|
if (!connection) return;
|
||||||
|
if (!confirm('停用后该组织将无法收发飞书消息,确定停用?')) return;
|
||||||
|
disabling = true;
|
||||||
|
try {
|
||||||
|
connection = await api.disableFeishuApplication(slug);
|
||||||
|
toastSuccess('已停用飞书应用连接');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
} finally {
|
||||||
|
disabling = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
if (slug) load();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<PageHeader
|
||||||
|
title="飞书应用"
|
||||||
|
description="本组织绑定的飞书应用凭据(ADR-0021:组织与应用 1:1)。凭据按组织隔离、版本化信封存储,缺失或校验失败即 fail-closed。"
|
||||||
|
/>
|
||||||
|
|
||||||
|
{#if loading}
|
||||||
|
<LoadingState />
|
||||||
|
{:else if error}
|
||||||
|
<ErrorBanner message={error} onretry={load} />
|
||||||
|
{:else}
|
||||||
|
{#if connection}
|
||||||
|
<div class="saas-card-pad mb-6">
|
||||||
|
<p class="saas-section-title mb-3">当前连接</p>
|
||||||
|
<dl class="space-y-2.5 text-sm">
|
||||||
|
<div class="flex items-center justify-between gap-3">
|
||||||
|
<dt class="text-surface-700">状态</dt>
|
||||||
|
<dd><span class="saas-badge-success">{connection.status}</span></dd>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center justify-between gap-3">
|
||||||
|
<dt class="text-surface-700">App 指纹</dt>
|
||||||
|
<dd class="font-mono text-xs text-surface-800">{connection.appFingerprint}</dd>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center justify-between gap-3">
|
||||||
|
<dt class="text-surface-700">版本</dt>
|
||||||
|
<dd class="tabular-nums">{connection.activeVersion ?? '—'}</dd>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center justify-between gap-3">
|
||||||
|
<dt class="text-surface-700">更新于</dt>
|
||||||
|
<dd class="text-surface-600">{fmtDate(connection.updatedAt)}</dd>
|
||||||
|
</div>
|
||||||
|
</dl>
|
||||||
|
{#if connection.status !== 'DISABLED'}
|
||||||
|
<div class="mt-5 flex items-center justify-end gap-3 border-t border-surface-100 pt-4">
|
||||||
|
<button class="saas-btn-ghost" onclick={disable} disabled={disabling}>
|
||||||
|
{disabling ? '停用中…' : '停用连接'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<div class="saas-card-pad mb-6">
|
||||||
|
<p class="text-sm text-surface-700">本组织尚未绑定飞书应用。填写下方凭据以创建连接。</p>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<div class="saas-card-pad">
|
||||||
|
<h3 class="saas-section-title mb-1">{connection ? '轮换凭据' : '创建连接'}</h3>
|
||||||
|
<p class="saas-muted mb-4">
|
||||||
|
密钥仅写入新版本,旧版本归档。{#if connection}App ID 不可变更,须与现有应用一致。{/if}
|
||||||
|
</p>
|
||||||
|
<div class="grid gap-5">
|
||||||
|
<div>
|
||||||
|
<Label.Root class="saas-label" for="app-id">App ID</Label.Root>
|
||||||
|
<input id="app-id" class="saas-input font-mono text-sm" bind:value={appId} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<Label.Root class="saas-label" for="app-secret">App Secret</Label.Root>
|
||||||
|
<input id="app-secret" class="saas-input" type="password" bind:value={appSecret} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<Label.Root class="saas-label" for="bot-open-id">Bot Open ID</Label.Root>
|
||||||
|
<input id="bot-open-id" class="saas-input font-mono text-sm" bind:value={botOpenId} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<Label.Root class="saas-label" for="verification-token">Verification Token(可选)</Label.Root>
|
||||||
|
<input id="verification-token" class="saas-input" type="password" bind:value={verificationToken} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<Label.Root class="saas-label" for="encrypt-key">Encrypt Key(可选)</Label.Root>
|
||||||
|
<input id="encrypt-key" class="saas-input" type="password" bind:value={encryptKey} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="mt-6 flex items-center gap-3 border-t border-surface-100 pt-4">
|
||||||
|
<div class="flex-1"></div>
|
||||||
|
<button class="saas-btn-ghost" onclick={resetForm} disabled={saving}>清空</button>
|
||||||
|
<button class="saas-btn-primary" onclick={save} disabled={saving}>
|
||||||
|
{saving ? '保存中…' : '保存'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
@@ -0,0 +1,164 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { page } from '$app/state';
|
||||||
|
import { api, type OrgMember } from '$lib/api';
|
||||||
|
import { fmtDate } from '$lib/format';
|
||||||
|
import { ORG_ROLES, ORG_ROLE_LABELS, PERMISSION_ROLE_LABELS } from '$lib/constants';
|
||||||
|
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 SelectField from '$lib/components/SelectField.svelte';
|
||||||
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
|
const slug = $derived(page.params.slug ?? '');
|
||||||
|
const roleItems = ORG_ROLES.map((r) => ({ value: r, label: ORG_ROLE_LABELS[r] }));
|
||||||
|
const permHint = Object.values(PERMISSION_ROLE_LABELS).join(' / ');
|
||||||
|
|
||||||
|
let members = $state<OrgMember[]>([]);
|
||||||
|
let loading = $state(true);
|
||||||
|
let error = $state<string | null>(null);
|
||||||
|
|
||||||
|
let newOpenId = $state('');
|
||||||
|
let newName = $state('');
|
||||||
|
let newRole = $state<string>('MEMBER');
|
||||||
|
let adding = $state(false);
|
||||||
|
|
||||||
|
async function load() {
|
||||||
|
loading = true;
|
||||||
|
error = null;
|
||||||
|
try {
|
||||||
|
const res = await api.members(slug);
|
||||||
|
members = res.members;
|
||||||
|
} catch (err) {
|
||||||
|
error = err instanceof Error ? err.message : String(err);
|
||||||
|
} finally {
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function addMember() {
|
||||||
|
if (!newOpenId.trim()) return;
|
||||||
|
adding = true;
|
||||||
|
try {
|
||||||
|
const m = await api.addMember(slug, {
|
||||||
|
feishuOpenId: newOpenId.trim(),
|
||||||
|
role: newRole,
|
||||||
|
...(newName.trim() ? { displayName: newName.trim() } : {}),
|
||||||
|
});
|
||||||
|
members = [...members, m].sort((a, b) => a.role.localeCompare(b.role) || a.createdAt.localeCompare(b.createdAt));
|
||||||
|
newOpenId = '';
|
||||||
|
newName = '';
|
||||||
|
toastSuccess('成员已添加');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
} finally {
|
||||||
|
adding = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function changeRole(m: OrgMember, role: string) {
|
||||||
|
try {
|
||||||
|
await api.setMemberRole(slug, m.userId, role);
|
||||||
|
await load();
|
||||||
|
toastSuccess('角色已更新');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function revoke(m: OrgMember) {
|
||||||
|
if (!confirm(`移除成员 ${m.displayName} 出本组织?`)) return;
|
||||||
|
try {
|
||||||
|
await api.revokeMember(slug, m.userId);
|
||||||
|
await load();
|
||||||
|
toastSuccess('成员已移除');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
if (slug) load();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<PageHeader title="成员与权限" description="管理组织角色:所有者与管理员可访问本后台,成员不可。" />
|
||||||
|
|
||||||
|
{#if loading}
|
||||||
|
<LoadingState />
|
||||||
|
{:else if error}
|
||||||
|
<ErrorBanner message={error} onretry={load} />
|
||||||
|
{:else}
|
||||||
|
<div class="saas-card-pad mb-6">
|
||||||
|
<h2 class="saas-section-title mb-4">添加成员</h2>
|
||||||
|
<div class="grid gap-3 md:grid-cols-[1.2fr_1fr_12rem_auto]">
|
||||||
|
<input class="saas-input" placeholder="飞书 open_id" bind:value={newOpenId} />
|
||||||
|
<input class="saas-input" placeholder="显示名(可选)" bind:value={newName} />
|
||||||
|
<SelectField items={roleItems} bind:value={newRole} />
|
||||||
|
<button class="saas-btn-primary" onclick={addMember} disabled={adding}>
|
||||||
|
{adding ? '添加中…' : '添加成员'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="saas-card overflow-hidden">
|
||||||
|
<div class="flex items-center justify-between border-b border-surface-200 px-5 py-3">
|
||||||
|
<h2 class="text-sm font-semibold">成员列表</h2>
|
||||||
|
<span class="saas-badge-neutral">{members.length}</span>
|
||||||
|
</div>
|
||||||
|
{#if members.length === 0}
|
||||||
|
<EmptyState title="暂无成员" description="使用上方表单按飞书 open_id 添加成员。" />
|
||||||
|
{:else}
|
||||||
|
<div class="overflow-x-auto">
|
||||||
|
<table class="data-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>用户</th>
|
||||||
|
<th>open_id</th>
|
||||||
|
<th>组织角色</th>
|
||||||
|
<th>加入时间</th>
|
||||||
|
<th></th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{#each members as m}
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<div class="flex items-center gap-2.5">
|
||||||
|
{#if m.avatarUrl}
|
||||||
|
<img src={m.avatarUrl} alt="" class="h-7 w-7 border border-surface-300 object-cover" />
|
||||||
|
{:else}
|
||||||
|
<div
|
||||||
|
class="flex h-7 w-7 items-center justify-center border border-primary-300 bg-primary-100 text-xs font-semibold text-primary-800"
|
||||||
|
>
|
||||||
|
{m.displayName.slice(0, 1)}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
<span class="font-medium">{m.displayName}</span>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td class="font-mono text-xs text-surface-700">{m.feishuOpenId}</td>
|
||||||
|
<td class="min-w-36">
|
||||||
|
<SelectField
|
||||||
|
items={roleItems}
|
||||||
|
value={m.role}
|
||||||
|
onchange={(role) => {
|
||||||
|
if (role !== m.role) changeRole(m, role);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</td>
|
||||||
|
<td class="text-surface-700">{fmtDate(m.createdAt)}</td>
|
||||||
|
<td class="text-right">
|
||||||
|
<button class="saas-btn-danger py-1! text-sm" onclick={() => revoke(m)}>移除</button>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{/each}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
<p class="border-t border-surface-300 px-5 py-3 text-xs text-surface-600">
|
||||||
|
组织角色控制后台访问;项目级权限由「项目」页团队授权({permHint})决定。
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
@@ -0,0 +1,222 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { page } from '$app/state';
|
||||||
|
import { api, type ExplorerData, type ExplorerFolder, type ExplorerProject, type OrgMembership } from '$lib/api';
|
||||||
|
import { session } from '$lib/session';
|
||||||
|
import FolderTree from '$lib/components/FolderTree.svelte';
|
||||||
|
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 { Label } from 'bits-ui';
|
||||||
|
import Modal from '$lib/components/Modal.svelte';
|
||||||
|
import SelectField from '$lib/components/SelectField.svelte';
|
||||||
|
import { fmtDate } from '$lib/format';
|
||||||
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
|
const slug = $derived(page.params.slug ?? '');
|
||||||
|
const org = $derived(($session.me?.organizations.find((o) => o.slug === slug) as OrgMembership | undefined) ?? null);
|
||||||
|
const isAdmin = $derived(!!org && (org.role === 'OWNER' || org.role === 'ADMIN'));
|
||||||
|
|
||||||
|
let data = $state<ExplorerData | null>(null);
|
||||||
|
let myProjects = $state<ExplorerProject[] | null>(null);
|
||||||
|
let loading = $state(true);
|
||||||
|
let error = $state<string | null>(null);
|
||||||
|
|
||||||
|
let showFolderModal = $state(false);
|
||||||
|
let folderName = $state('');
|
||||||
|
let folderParent = $state('');
|
||||||
|
|
||||||
|
let showProjectModal = $state(false);
|
||||||
|
let projectName = $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() {
|
||||||
|
loading = true;
|
||||||
|
error = null;
|
||||||
|
try {
|
||||||
|
if (isAdmin) {
|
||||||
|
data = await api.explorer(slug);
|
||||||
|
myProjects = null;
|
||||||
|
} else {
|
||||||
|
myProjects = (await api.myProjects(slug)).projects;
|
||||||
|
data = null;
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
error = err instanceof Error ? err.message : String(err);
|
||||||
|
} finally {
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function createFolder() {
|
||||||
|
if (!folderName.trim()) return;
|
||||||
|
try {
|
||||||
|
await api.createFolder(slug, {
|
||||||
|
name: folderName.trim(),
|
||||||
|
...(folderParent ? { parentId: folderParent } : {}),
|
||||||
|
});
|
||||||
|
folderName = '';
|
||||||
|
folderParent = '';
|
||||||
|
showFolderModal = false;
|
||||||
|
await load();
|
||||||
|
toastSuccess('文件夹已创建');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function createProject() {
|
||||||
|
if (!projectName.trim()) return;
|
||||||
|
try {
|
||||||
|
const res = await api.createProject(slug, {
|
||||||
|
name: projectName.trim(),
|
||||||
|
...(projectFolder ? { folderId: projectFolder } : {}),
|
||||||
|
});
|
||||||
|
projectName = '';
|
||||||
|
projectFolder = '';
|
||||||
|
showProjectModal = false;
|
||||||
|
window.location.href = `/admin/org/${slug}/projects/${res.id}`;
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function folderPath(f: ExplorerFolder): string {
|
||||||
|
if (!data) return f.name;
|
||||||
|
const parts: string[] = [f.name];
|
||||||
|
let cur: ExplorerFolder | undefined = f;
|
||||||
|
while (cur?.parentId) {
|
||||||
|
const parent = data.folders.find((x) => x.id === cur!.parentId);
|
||||||
|
if (!parent) break;
|
||||||
|
parts.unshift(parent.name);
|
||||||
|
cur = parent;
|
||||||
|
}
|
||||||
|
return parts.join(' / ');
|
||||||
|
}
|
||||||
|
|
||||||
|
function folderItems() {
|
||||||
|
if (!data) return [{ value: '', label: '(根)' }];
|
||||||
|
return [{ value: '', label: '(根)' }, ...data.folders.map((f) => ({ value: f.id, label: folderPath(f) }))];
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
if (slug && org) load();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{#if loading}
|
||||||
|
<LoadingState />
|
||||||
|
{:else if error}
|
||||||
|
<ErrorBanner message={error} onretry={load} />
|
||||||
|
{:else if isAdmin && data}
|
||||||
|
<PageHeader title="项目" description="文件夹是透明组织节点;项目是权限边界。">
|
||||||
|
{#snippet actions()}
|
||||||
|
<button class="saas-btn-secondary" onclick={() => openFolderModal('')}>新建文件夹</button>
|
||||||
|
<button class="saas-btn-primary" onclick={() => openProjectModal('')}>新建项目</button>
|
||||||
|
{/snippet}
|
||||||
|
</PageHeader>
|
||||||
|
|
||||||
|
<div class="saas-card p-2 sm:p-3">
|
||||||
|
{#if data.projects.filter((p) => !p.folderId).length === 0 && data.folders.filter((f) => !f.parentId).length === 0}
|
||||||
|
<EmptyState title="暂无项目" description="新建文件夹或项目,开始组织你的教研资产。" />
|
||||||
|
{:else}
|
||||||
|
<FolderTree
|
||||||
|
folders={data.folders}
|
||||||
|
projects={data.projects}
|
||||||
|
parentId={null}
|
||||||
|
{slug}
|
||||||
|
onCreateFolder={openFolderModal}
|
||||||
|
onCreateProject={openProjectModal}
|
||||||
|
/>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Modal bind:open={showFolderModal} title="新建文件夹">
|
||||||
|
<Label.Root class="saas-label" for="folder-name">名称</Label.Root>
|
||||||
|
<input
|
||||||
|
id="folder-name"
|
||||||
|
class="saas-input mb-4"
|
||||||
|
bind:value={folderName}
|
||||||
|
onkeydown={(e) => {
|
||||||
|
if (e.key === 'Enter') createFolder();
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
{#if data && data.folders.length > 0}
|
||||||
|
<p class="saas-label">父文件夹(可选)</p>
|
||||||
|
<div class="mb-4">
|
||||||
|
<SelectField items={folderItems()} bind:value={folderParent} />
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
<div class="flex justify-end gap-2">
|
||||||
|
<button class="saas-btn-ghost" onclick={() => (showFolderModal = false)}>取消</button>
|
||||||
|
<button class="saas-btn-primary" onclick={createFolder}>创建</button>
|
||||||
|
</div>
|
||||||
|
</Modal>
|
||||||
|
|
||||||
|
<Modal bind:open={showProjectModal} title="新建项目">
|
||||||
|
<Label.Root class="saas-label" for="project-name">项目名</Label.Root>
|
||||||
|
<input
|
||||||
|
id="project-name"
|
||||||
|
class="saas-input mb-4"
|
||||||
|
bind:value={projectName}
|
||||||
|
onkeydown={(e) => {
|
||||||
|
if (e.key === 'Enter') createProject();
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
{#if data && data.folders.length > 0}
|
||||||
|
<p class="saas-label">文件夹(可选)</p>
|
||||||
|
<div class="mb-4">
|
||||||
|
<SelectField items={folderItems()} bind:value={projectFolder} />
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
<div class="flex justify-end gap-2">
|
||||||
|
<button class="saas-btn-ghost" onclick={() => (showProjectModal = false)}>取消</button>
|
||||||
|
<button class="saas-btn-primary" onclick={createProject}>创建</button>
|
||||||
|
</div>
|
||||||
|
</Modal>
|
||||||
|
{:else if myProjects !== null}
|
||||||
|
<PageHeader title="我的项目" description="你拥有访问授权的项目。">
|
||||||
|
{#snippet actions()}
|
||||||
|
<span class="saas-badge-neutral">仅显示已授权项目</span>
|
||||||
|
{/snippet}
|
||||||
|
</PageHeader>
|
||||||
|
|
||||||
|
<div class="saas-card overflow-hidden">
|
||||||
|
{#if myProjects.length === 0}
|
||||||
|
<EmptyState title="暂无可访问项目" description="当团队被授予项目访问权限时,项目会出现在这里。" />
|
||||||
|
{:else}
|
||||||
|
<table class="data-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>项目</th>
|
||||||
|
<th>飞书群</th>
|
||||||
|
<th>创建时间</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{#each myProjects as p}
|
||||||
|
<tr class="cursor-pointer" onclick={() => (window.location.href = `/admin/org/${slug}/projects/${p.id}`)}>
|
||||||
|
<td class="font-medium">{p.name}</td>
|
||||||
|
<td class="font-mono text-xs">{p.binding ? `群 ${p.binding.chatId}` : '—'}</td>
|
||||||
|
<td class="text-surface-700">{fmtDate(p.createdAt)}</td>
|
||||||
|
</tr>
|
||||||
|
{/each}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<EmptyState title="项目数据不可用" description="无法加载项目列表。" />
|
||||||
|
{/if}
|
||||||
@@ -0,0 +1,306 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { page } from '$app/state';
|
||||||
|
import {
|
||||||
|
api,
|
||||||
|
type ProjectDetail,
|
||||||
|
type TeamAccessEntry,
|
||||||
|
type TeamRow,
|
||||||
|
type SessionSummary,
|
||||||
|
type ExplorerData,
|
||||||
|
} from '$lib/api';
|
||||||
|
import { fmtDate, permissionRoleLabel } from '$lib/format';
|
||||||
|
import { PERMISSION_ROLES, PERMISSION_ROLE_LABELS } from '$lib/constants';
|
||||||
|
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 SelectField from '$lib/components/SelectField.svelte';
|
||||||
|
import Icon from '$lib/components/Icon.svelte';
|
||||||
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
|
const slug = $derived(page.params.slug ?? '');
|
||||||
|
const projectId = $derived(page.params.projectId ?? '');
|
||||||
|
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}`;
|
||||||
|
|
||||||
|
let proj = $state<ProjectDetail | null>(null);
|
||||||
|
let access = $state<TeamAccessEntry[]>([]);
|
||||||
|
let sessions = $state<SessionSummary[]>([]);
|
||||||
|
let teams = $state<TeamRow[]>([]);
|
||||||
|
let explorer = $state<ExplorerData | null>(null);
|
||||||
|
let loading = $state(true);
|
||||||
|
let error = $state<string | null>(null);
|
||||||
|
|
||||||
|
let grantTeam = $state('');
|
||||||
|
let grantRole = $state<string>('EDIT');
|
||||||
|
let moveFolder = $state('');
|
||||||
|
|
||||||
|
const actorIsOrgAdmin = $derived(proj?.actorIsOrgAdmin ?? false);
|
||||||
|
const actorCanManage = $derived(proj?.actorCanManageProject ?? false);
|
||||||
|
|
||||||
|
async function load() {
|
||||||
|
loading = true;
|
||||||
|
error = null;
|
||||||
|
try {
|
||||||
|
// Project detail + team-access list are gated to project read/oversight.
|
||||||
|
const [p, a] = await Promise.all([api.project(slug, projectId), api.teamAccess(slug, projectId)]);
|
||||||
|
proj = p;
|
||||||
|
access = a.access;
|
||||||
|
// Team list is needed for grant UI whenever the actor has project MANAGE
|
||||||
|
// (org admin or member). Sessions/explorer stay org-admin oversight only.
|
||||||
|
const needTeams = p.actorIsOrgAdmin === true || p.actorCanManageProject === true;
|
||||||
|
const [s, t, e] = await Promise.all([
|
||||||
|
p.actorIsOrgAdmin ? api.sessions(slug, projectId) : Promise.resolve({ sessions: [] as SessionSummary[] }),
|
||||||
|
needTeams ? api.teams(slug) : Promise.resolve({ teams: [] as TeamRow[] }),
|
||||||
|
p.actorIsOrgAdmin ? api.explorer(slug) : Promise.resolve(null as ExplorerData | null),
|
||||||
|
]);
|
||||||
|
sessions = s.sessions;
|
||||||
|
teams = t.teams;
|
||||||
|
explorer = e;
|
||||||
|
if (p.actorIsOrgAdmin) {
|
||||||
|
moveFolder = p.folderId ?? '';
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
error = err instanceof Error ? err.message : String(err);
|
||||||
|
} finally {
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function rename() {
|
||||||
|
if (!proj) return;
|
||||||
|
const name = prompt('新名称', proj.name);
|
||||||
|
if (!name) return;
|
||||||
|
try {
|
||||||
|
await api.renameProject(slug, projectId, name);
|
||||||
|
await load();
|
||||||
|
toastSuccess('已重命名');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function archiveBinding() {
|
||||||
|
if (!confirm('解绑当前飞书群? 用户将无法通过该群触发智能体。')) return;
|
||||||
|
try {
|
||||||
|
await api.archiveBinding(slug, projectId);
|
||||||
|
await load();
|
||||||
|
toastSuccess('已解绑飞书群');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function archiveProject() {
|
||||||
|
if (!confirm(`归档项目 ${proj?.name}?`)) return;
|
||||||
|
try {
|
||||||
|
await api.archiveProject(slug, projectId);
|
||||||
|
window.location.href = `/admin/org/${slug}/projects`;
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function move() {
|
||||||
|
try {
|
||||||
|
await api.moveProject(slug, projectId, moveFolder || null);
|
||||||
|
await load();
|
||||||
|
toastSuccess('已移动');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function grant() {
|
||||||
|
if (!grantTeam) return;
|
||||||
|
try {
|
||||||
|
await api.grantTeamAccess(slug, projectId, { teamId: grantTeam, role: grantRole });
|
||||||
|
grantTeam = '';
|
||||||
|
await load();
|
||||||
|
toastSuccess('已授权');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function revoke(t: TeamAccessEntry) {
|
||||||
|
if (!confirm(`撤销 ${t.teamName} 对此项目的授权?`)) return;
|
||||||
|
try {
|
||||||
|
await api.revokeTeamAccess(slug, projectId, t.teamId);
|
||||||
|
await load();
|
||||||
|
toastSuccess('已撤销授权');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function folderItems() {
|
||||||
|
const items = [{ value: '', label: '(根)' }];
|
||||||
|
if (!explorer) return items;
|
||||||
|
return [...items, ...explorer.folders.map((f) => ({ value: f.id, label: f.name }))];
|
||||||
|
}
|
||||||
|
|
||||||
|
function teamItems() {
|
||||||
|
return [{ value: '', label: '选择团队…' }, ...teams.map((t) => ({ value: t.id, label: `${t.name}(${t.slug})` }))];
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
if (slug && projectId) load();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{#if loading}
|
||||||
|
<LoadingState />
|
||||||
|
{:else if error}
|
||||||
|
<ErrorBanner message={error} onretry={load} />
|
||||||
|
{:else if proj}
|
||||||
|
<div class="mb-2">
|
||||||
|
<a
|
||||||
|
href={`/admin/org/${slug}/projects`}
|
||||||
|
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" />
|
||||||
|
返回项目列表
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{@const detail = proj}
|
||||||
|
<PageHeader title={detail.name} description={`项目是权限边界;通过团队授予 ${roleChain}。`}>
|
||||||
|
{#snippet actions()}
|
||||||
|
{#if actorIsOrgAdmin}
|
||||||
|
<button class="saas-btn-secondary py-1.5! text-sm" onclick={rename}>重命名</button>
|
||||||
|
{#if detail.binding}
|
||||||
|
<button class="saas-btn-secondary py-1.5! text-sm" onclick={archiveBinding}>解绑飞书群</button>
|
||||||
|
{/if}
|
||||||
|
<button class="saas-btn-danger py-1.5! text-sm" onclick={archiveProject}>归档</button>
|
||||||
|
{/if}
|
||||||
|
{/snippet}
|
||||||
|
</PageHeader>
|
||||||
|
|
||||||
|
<div class="saas-card-pad mb-6">
|
||||||
|
<dl class="grid gap-x-8 gap-y-3 text-sm sm:grid-cols-2">
|
||||||
|
<div>
|
||||||
|
<dt class="text-xs font-medium uppercase tracking-wide text-surface-600">工作区路径</dt>
|
||||||
|
<dd class="mt-0.5 break-all font-mono text-xs text-surface-700">{proj.workspaceDir}</dd>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<dt class="text-xs font-medium uppercase tracking-wide text-surface-600">创建者</dt>
|
||||||
|
<dd class="mt-0.5 text-surface-800">
|
||||||
|
{proj.createdBy ? `${proj.createdBy.displayName} (${proj.createdBy.feishuOpenId})` : '—'}
|
||||||
|
</dd>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<dt class="text-xs font-medium uppercase tracking-wide text-surface-600">文件夹</dt>
|
||||||
|
<dd class="mt-0.5 text-surface-800">{proj.folder ? proj.folder.name : '(根)'}</dd>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<dt class="text-xs font-medium uppercase tracking-wide text-surface-600">飞书群</dt>
|
||||||
|
<dd class="mt-0.5 text-surface-800">
|
||||||
|
{#if proj.binding}
|
||||||
|
<span class="saas-badge-success mr-1">已绑定</span>
|
||||||
|
<span class="font-mono text-xs">群 {proj.binding.chatId}</span>
|
||||||
|
<span class="text-surface-600"> · {fmtDate(proj.binding.createdAt)}</span>
|
||||||
|
{:else}
|
||||||
|
<span class="saas-badge-neutral">未绑定</span>
|
||||||
|
{/if}
|
||||||
|
</dd>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<dt class="text-xs font-medium uppercase tracking-wide text-surface-600">创建时间</dt>
|
||||||
|
<dd class="mt-0.5 text-surface-800">{fmtDate(proj.createdAt)}</dd>
|
||||||
|
</div>
|
||||||
|
</dl>
|
||||||
|
|
||||||
|
{#if explorer}
|
||||||
|
<div class="mt-5 flex flex-wrap items-end gap-2 border-t border-surface-100 pt-4">
|
||||||
|
<div class="min-w-48 flex-1">
|
||||||
|
<p class="saas-label">移动到文件夹</p>
|
||||||
|
<SelectField items={folderItems()} bind:value={moveFolder} />
|
||||||
|
</div>
|
||||||
|
<button class="saas-btn-secondary" onclick={move}>移动</button>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="saas-card-pad mb-6">
|
||||||
|
<h3 class="saas-section-title mb-1">团队授权</h3>
|
||||||
|
<p class="saas-muted mb-4">通过团队授权项目访问。一项目可授多团队,一团队可访问多项目。</p>
|
||||||
|
|
||||||
|
{#if actorCanManage}
|
||||||
|
<div class="mb-4 grid gap-2 sm:grid-cols-[1fr_10rem_auto]">
|
||||||
|
<SelectField items={teamItems()} bind:value={grantTeam} />
|
||||||
|
<SelectField items={roleItems} bind:value={grantRole} />
|
||||||
|
<button class="saas-btn-primary" onclick={grant}>授权</button>
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<p class="mb-4 text-xs text-surface-600">需要项目 MANAGE 授权才能增删团队访问。</p>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
{#if access.length === 0}
|
||||||
|
<EmptyState title="暂无团队授权" description="选择团队并授予角色以开放项目访问。" />
|
||||||
|
{:else}
|
||||||
|
<table class="data-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>团队</th>
|
||||||
|
<th>标识</th>
|
||||||
|
<th>角色</th>
|
||||||
|
<th></th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{#each access as g}
|
||||||
|
<tr>
|
||||||
|
<td class="font-medium">{g.teamName}</td>
|
||||||
|
<td class="font-mono text-xs">/{g.teamSlug}</td>
|
||||||
|
<td><span class="saas-badge-primary">{permissionRoleLabel(g.role)}</span></td>
|
||||||
|
<td class="text-right">
|
||||||
|
{#if actorCanManage}
|
||||||
|
<button class="saas-btn-danger py-1! text-xs" onclick={() => revoke(g)}>撤销</button>
|
||||||
|
{:else}
|
||||||
|
<span class="text-xs text-surface-500">—</span>
|
||||||
|
{/if}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{/each}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if actorIsOrgAdmin}
|
||||||
|
<div class="saas-card overflow-hidden">
|
||||||
|
<div class="border-b border-surface-200 px-5 py-3">
|
||||||
|
<h3 class="text-sm font-semibold">智能体会话</h3>
|
||||||
|
</div>
|
||||||
|
{#if sessions.length === 0}
|
||||||
|
<EmptyState title="暂无会话" description="飞书侧触发智能体后会显示在此。" />
|
||||||
|
{:else}
|
||||||
|
<table class="data-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>供应方 / 角色</th>
|
||||||
|
<th>模型</th>
|
||||||
|
<th>运行次数</th>
|
||||||
|
<th>更新</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{#each sessions as s}
|
||||||
|
<tr>
|
||||||
|
<td class="font-mono text-xs">{s.provider} / {s.roleId}</td>
|
||||||
|
<td class="font-mono text-xs">{s.model}</td>
|
||||||
|
<td class="tabular-nums">{s.runCount}</td>
|
||||||
|
<td class="text-surface-700">{fmtDate(s.updatedAt)}</td>
|
||||||
|
</tr>
|
||||||
|
{/each}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
{:else}
|
||||||
|
<div class="saas-empty">
|
||||||
|
<p class="text-sm text-surface-600">项目数据不可用</p>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
@@ -0,0 +1,169 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { page } from '$app/state';
|
||||||
|
import { api, type ProviderConnectionRow } from '$lib/api';
|
||||||
|
import { fmtDate, providerModeLabel } 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 slug = $derived(page.params.slug ?? '');
|
||||||
|
|
||||||
|
let connections = $state<ProviderConnectionRow[]>([]);
|
||||||
|
let loading = $state(true);
|
||||||
|
let error = $state<string | null>(null);
|
||||||
|
|
||||||
|
let providerId = $state('');
|
||||||
|
let baseUrl = $state('');
|
||||||
|
let authToken = $state('');
|
||||||
|
let anthropicApiKey = $state('');
|
||||||
|
let saving = $state(false);
|
||||||
|
|
||||||
|
async function load() {
|
||||||
|
loading = true;
|
||||||
|
error = null;
|
||||||
|
try {
|
||||||
|
const res = await api.providerConnections(slug);
|
||||||
|
connections = res.connections;
|
||||||
|
} catch (err) {
|
||||||
|
error = err instanceof Error ? err.message : String(err);
|
||||||
|
} finally {
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function startRotate(row: ProviderConnectionRow) {
|
||||||
|
providerId = row.providerId;
|
||||||
|
baseUrl = '';
|
||||||
|
authToken = '';
|
||||||
|
anthropicApiKey = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
function resetForm() {
|
||||||
|
providerId = '';
|
||||||
|
baseUrl = '';
|
||||||
|
authToken = '';
|
||||||
|
anthropicApiKey = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
async function save() {
|
||||||
|
const id = providerId.trim();
|
||||||
|
if (id === '') {
|
||||||
|
toastError('请填写供应方 ID');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const url = baseUrl.trim();
|
||||||
|
const token = authToken.trim();
|
||||||
|
if (url === '' || token === '') {
|
||||||
|
toastError('接口地址与访问令牌均为必填');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
saving = true;
|
||||||
|
const body: { baseUrl: string; authToken: string; anthropicApiKey?: string } = {
|
||||||
|
baseUrl: url,
|
||||||
|
authToken: token,
|
||||||
|
};
|
||||||
|
const key = anthropicApiKey.trim();
|
||||||
|
if (key !== '') body.anthropicApiKey = key;
|
||||||
|
try {
|
||||||
|
await api.rotateProviderConnection(slug, id, body);
|
||||||
|
toastSuccess('凭据已轮换');
|
||||||
|
resetForm();
|
||||||
|
await load();
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
} finally {
|
||||||
|
saving = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
if (slug) load();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<PageHeader
|
||||||
|
title="模型供应方"
|
||||||
|
description="本组织的模型供应方连接。BYOK 由组织所有者/管理员轮换;平台托管连接由平台管理员配置。凭据按组织隔离,缺失或校验失败即拒绝运行(fail-closed)。"
|
||||||
|
/>
|
||||||
|
|
||||||
|
{#if loading}
|
||||||
|
<LoadingState />
|
||||||
|
{:else if error}
|
||||||
|
<ErrorBanner message={error} onretry={load} />
|
||||||
|
{:else}
|
||||||
|
<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>
|
||||||
|
</div>
|
||||||
|
{#if connections.length === 0}
|
||||||
|
<div class="saas-empty"><p class="text-sm text-surface-600">尚无供应方连接</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>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{#each connections as row}
|
||||||
|
<tr>
|
||||||
|
<td class="font-mono text-sm">{row.providerId}</td>
|
||||||
|
<td>{providerModeLabel(row.mode)}</td>
|
||||||
|
<td>{row.status}</td>
|
||||||
|
<td class="tabular-nums">{row.activeVersion ?? '—'}</td>
|
||||||
|
<td class="text-surface-600">{fmtDate(row.updatedAt)}</td>
|
||||||
|
<td>
|
||||||
|
{#if row.mode === 'BYOK'}
|
||||||
|
<button class="saas-btn-ghost px-2! py-1! text-xs" onclick={() => startRotate(row)}>轮换</button>
|
||||||
|
{:else}
|
||||||
|
<span class="text-xs text-surface-500">平台管理</span>
|
||||||
|
{/if}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{/each}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="saas-card-pad">
|
||||||
|
<h3 class="saas-section-title mb-1">轮换 BYOK 凭据</h3>
|
||||||
|
<p class="saas-muted mb-4">
|
||||||
|
密钥仅写入新版本,旧版本归档;保存时需重新填写接口地址与访问令牌。平台托管连接不在此处管理。
|
||||||
|
</p>
|
||||||
|
<div class="grid gap-5">
|
||||||
|
<div>
|
||||||
|
<Label.Root class="saas-label" for="provider-id">供应方 ID</Label.Root>
|
||||||
|
<input id="provider-id" class="saas-input font-mono text-sm" bind:value={providerId} placeholder="openrouter" />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<Label.Root class="saas-label" for="base-url">接口地址</Label.Root>
|
||||||
|
<input id="base-url" class="saas-input" placeholder="https://openrouter.ai/api" bind:value={baseUrl} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<Label.Root class="saas-label" for="auth-token">访问令牌</Label.Root>
|
||||||
|
<input id="auth-token" class="saas-input" type="password" bind:value={authToken} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<Label.Root class="saas-label" for="anthropic-key">Anthropic API Key(可选)</Label.Root>
|
||||||
|
<input id="anthropic-key" class="saas-input" type="password" bind:value={anthropicApiKey} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="mt-6 flex items-center gap-3 border-t border-surface-100 pt-4">
|
||||||
|
<div class="flex-1"></div>
|
||||||
|
<button class="saas-btn-ghost" onclick={resetForm} disabled={saving}>清空</button>
|
||||||
|
<button class="saas-btn-primary" onclick={save} disabled={saving}>
|
||||||
|
{saving ? '保存中…' : '保存'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
@@ -0,0 +1,129 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { page } from '$app/state';
|
||||||
|
import { api, type AgentRoleRow, type AgentModelRow, type AgentSkillRow } from '$lib/api';
|
||||||
|
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 RoleCard from '$lib/components/RoleCard.svelte';
|
||||||
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
|
const slug = $derived(page.params.slug ?? '');
|
||||||
|
|
||||||
|
let roles = $state<AgentRoleRow[]>([]);
|
||||||
|
let models = $state<AgentModelRow[]>([]);
|
||||||
|
let skills = $state<AgentSkillRow[]>([]);
|
||||||
|
let loading = $state(true);
|
||||||
|
let error = $state<string | null>(null);
|
||||||
|
|
||||||
|
let newRoleId = $state('');
|
||||||
|
let newLabel = $state('');
|
||||||
|
let adding = $state(false);
|
||||||
|
|
||||||
|
async function load() {
|
||||||
|
loading = true;
|
||||||
|
error = null;
|
||||||
|
try {
|
||||||
|
const [r, s] = await Promise.all([api.agentRoles(slug), api.agentSkills(slug)]);
|
||||||
|
roles = r.roles;
|
||||||
|
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) {
|
||||||
|
error = err instanceof Error ? err.message : String(err);
|
||||||
|
} finally {
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function add() {
|
||||||
|
const roleId = newRoleId.trim();
|
||||||
|
const label = newLabel.trim();
|
||||||
|
if (roleId === '' || label === '') {
|
||||||
|
toastError('角色 ID 与显示名均为必填');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (roles.some((r) => r.roleId === roleId)) {
|
||||||
|
toastError(`角色 ID 已存在:${roleId}`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
adding = true;
|
||||||
|
try {
|
||||||
|
const created = await api.upsertAgentRole(slug, roleId, { label });
|
||||||
|
roles = [...roles, created];
|
||||||
|
newRoleId = '';
|
||||||
|
newLabel = '';
|
||||||
|
toastSuccess('角色已创建');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
} finally {
|
||||||
|
adding = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function onRoleUpdated(updated: AgentRoleRow) {
|
||||||
|
roles = roles.map((x) => (x.roleId === updated.roleId ? { ...updated, skillNames: x.skillNames } : x));
|
||||||
|
if (updated.isDefault) {
|
||||||
|
roles = roles.map((x) => (x.roleId === updated.roleId ? x : { ...x, isDefault: false }));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function onRoleSkillsChanged(roleId: string, skillNames: string[]) {
|
||||||
|
roles = roles.map((x) => (x.roleId === roleId ? { ...x, skillNames } : x));
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
if (slug) load();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<PageHeader
|
||||||
|
title="角色"
|
||||||
|
description="角色是组织级数据:组合默认模型、系统提示词、工具白名单与已绑定技能。角色 ID 即飞书斜杠命令(如 /draft)。"
|
||||||
|
/>
|
||||||
|
|
||||||
|
{#if loading}
|
||||||
|
<LoadingState />
|
||||||
|
{:else if error}
|
||||||
|
<ErrorBanner message={error} onretry={load} />
|
||||||
|
{:else}
|
||||||
|
<div class="saas-card-pad mb-6">
|
||||||
|
<h2 class="saas-section-title mb-4">新建角色</h2>
|
||||||
|
<div class="grid gap-3 sm:grid-cols-[10rem_1fr_auto]">
|
||||||
|
<input
|
||||||
|
class="saas-input font-mono text-sm"
|
||||||
|
placeholder="角色 ID(如 draft)"
|
||||||
|
bind:value={newRoleId}
|
||||||
|
onkeydown={(e) => {
|
||||||
|
if (e.key === 'Enter') add();
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<input
|
||||||
|
class="saas-input"
|
||||||
|
placeholder="显示名(如 草稿)"
|
||||||
|
bind:value={newLabel}
|
||||||
|
onkeydown={(e) => {
|
||||||
|
if (e.key === 'Enter') add();
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<button class="saas-btn-primary" onclick={add} disabled={adding}>新建</button>
|
||||||
|
</div>
|
||||||
|
<p class="mt-2 text-xs text-surface-600">角色 ID 仅允许小写字母、数字、下划线与连字符,且以字母或数字开头。</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if roles.length === 0}
|
||||||
|
<div class="saas-card">
|
||||||
|
<EmptyState title="暂无角色" description="组织必须且只能有一个启用中的默认角色;新建第一个角色将自动成为默认。" />
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<div class="space-y-4">
|
||||||
|
{#each roles as r (r.roleId)}
|
||||||
|
<RoleCard {r} {models} {skills} {slug} onupdated={onRoleUpdated} onskillschanged={onRoleSkillsChanged} />
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
{/if}
|
||||||
@@ -0,0 +1,141 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { page } from '$app/state';
|
||||||
|
import { api, type AgentSkillRow, type SkillFileEntry } from '$lib/api';
|
||||||
|
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 SkillEditor from '$lib/components/SkillEditor.svelte';
|
||||||
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
|
const slug = $derived(page.params.slug ?? '');
|
||||||
|
|
||||||
|
let skills = $state<AgentSkillRow[]>([]);
|
||||||
|
let loading = $state(true);
|
||||||
|
let error = $state<string | null>(null);
|
||||||
|
|
||||||
|
let showNewSkill = $state(false);
|
||||||
|
let newSkillName = $state('');
|
||||||
|
let newSkillVersion = $state('0.1.0');
|
||||||
|
let newSkillDescription = $state('');
|
||||||
|
let creating = $state(false);
|
||||||
|
|
||||||
|
async function load() {
|
||||||
|
loading = true;
|
||||||
|
error = null;
|
||||||
|
try {
|
||||||
|
const res = await api.agentSkills(slug);
|
||||||
|
skills = res.skills;
|
||||||
|
} catch (err) {
|
||||||
|
error = err instanceof Error ? err.message : String(err);
|
||||||
|
} finally {
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function createSkill() {
|
||||||
|
const name = newSkillName.trim();
|
||||||
|
if (name === '') {
|
||||||
|
toastError('技能名称不能为空');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!/^[a-z0-9][a-z0-9-]{0,63}$/.test(name)) {
|
||||||
|
toastError('技能名称仅允许小写字母、数字和连字符,且以字母或数字开头');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const version = newSkillVersion.trim();
|
||||||
|
if (version === '') {
|
||||||
|
toastError('版本号不能为空');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
creating = true;
|
||||||
|
try {
|
||||||
|
const manifest = buildManifest(name, newSkillDescription.trim());
|
||||||
|
const files: SkillFileEntry[] = [{ path: 'SKILL.md', content: manifest }];
|
||||||
|
const result = await api.installAgentSkill(slug, name, { version, files });
|
||||||
|
toastSuccess(`技能 ${result.name} 已创建`);
|
||||||
|
newSkillName = '';
|
||||||
|
newSkillDescription = '';
|
||||||
|
showNewSkill = false;
|
||||||
|
await load();
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
} finally {
|
||||||
|
creating = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildManifest(name: string, description: string): string {
|
||||||
|
const desc = description === '' ? name : description;
|
||||||
|
return `---\nname: ${name}\ndescription: ${desc}\n---\n# ${name}\n\n`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function onInstalled(_result: { id: string; name: string; contentDigest: string }) {
|
||||||
|
load();
|
||||||
|
}
|
||||||
|
|
||||||
|
function onDisabled(_name: string) {
|
||||||
|
load();
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
if (slug) load();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<PageHeader
|
||||||
|
title="技能"
|
||||||
|
description="技能是组织级 Agent 能力包:一个包含 SKILL.md manifest 的目录。技能内容按 SHA-256 content-addressed 存储,变更后绑定角色的活跃会话自动归档。"
|
||||||
|
/>
|
||||||
|
|
||||||
|
{#if loading}
|
||||||
|
<LoadingState />
|
||||||
|
{:else if error}
|
||||||
|
<ErrorBanner message={error} onretry={load} />
|
||||||
|
{:else}
|
||||||
|
<div class="saas-card-pad mb-6">
|
||||||
|
<div class="flex items-center justify-between">
|
||||||
|
<h2 class="saas-section-title">新建技能</h2>
|
||||||
|
<button class="text-sm text-primary-700 hover:text-primary-900" onclick={() => (showNewSkill = !showNewSkill)}>
|
||||||
|
{showNewSkill ? '取消' : '+ 新建'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{#if showNewSkill}
|
||||||
|
<div class="mt-4 grid gap-3 sm:grid-cols-[12rem_8rem_1fr_auto]">
|
||||||
|
<input
|
||||||
|
class="saas-input font-mono text-sm"
|
||||||
|
placeholder="技能名(如 typst-help)"
|
||||||
|
bind:value={newSkillName}
|
||||||
|
/>
|
||||||
|
<input
|
||||||
|
class="saas-input text-sm"
|
||||||
|
placeholder="版本号"
|
||||||
|
bind:value={newSkillVersion}
|
||||||
|
/>
|
||||||
|
<input
|
||||||
|
class="saas-input text-sm"
|
||||||
|
placeholder="描述"
|
||||||
|
bind:value={newSkillDescription}
|
||||||
|
/>
|
||||||
|
<button class="saas-btn-primary" onclick={createSkill} disabled={creating}>
|
||||||
|
{creating ? '创建中…' : '创建'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<p class="mt-2 text-xs text-surface-600">
|
||||||
|
技能名称仅允许小写字母、数字和连字符,且以字母或数字开头。创建后会生成 SKILL.md 模板。
|
||||||
|
</p>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if skills.length === 0}
|
||||||
|
<div class="saas-card">
|
||||||
|
<EmptyState title="暂无技能" description="新建一个技能,然后在角色管理中绑定到角色。" />
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<div class="space-y-4">
|
||||||
|
{#each skills as skill (skill.id)}
|
||||||
|
<SkillEditor {slug} {skill} oninstalled={onInstalled} ondisabled={onDisabled} />
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
{/if}
|
||||||
@@ -0,0 +1,233 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { Collapsible } from 'bits-ui';
|
||||||
|
import { page } from '$app/state';
|
||||||
|
import { api, type TeamRow, type TeamMemberRow } from '$lib/api';
|
||||||
|
import { fmtDate } 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 { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
|
const slug = $derived(page.params.slug ?? '');
|
||||||
|
|
||||||
|
let teams = $state<TeamRow[]>([]);
|
||||||
|
let loading = $state(true);
|
||||||
|
let error = $state<string | null>(null);
|
||||||
|
|
||||||
|
let newSlug = $state('');
|
||||||
|
let newName = $state('');
|
||||||
|
let newDesc = $state('');
|
||||||
|
let adding = $state(false);
|
||||||
|
|
||||||
|
let expandedId = $state<string | null>(null);
|
||||||
|
let teamMembers = $state<TeamMemberRow[]>([]);
|
||||||
|
let memberInput = $state('');
|
||||||
|
let loadingMembers = $state(false);
|
||||||
|
|
||||||
|
async function load() {
|
||||||
|
loading = true;
|
||||||
|
error = null;
|
||||||
|
try {
|
||||||
|
const res = await api.teams(slug);
|
||||||
|
teams = res.teams;
|
||||||
|
} catch (err) {
|
||||||
|
error = err instanceof Error ? err.message : String(err);
|
||||||
|
} finally {
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const SLUG_RE = /^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/;
|
||||||
|
|
||||||
|
async function createTeam() {
|
||||||
|
if (!newSlug.trim() || !newName.trim()) return;
|
||||||
|
const teamSlug = newSlug.trim().toLowerCase();
|
||||||
|
if (!SLUG_RE.test(teamSlug)) {
|
||||||
|
toastError('标识须为小写字母数字,可用连字符连接');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
adding = true;
|
||||||
|
try {
|
||||||
|
await api.createTeam(slug, {
|
||||||
|
slug: teamSlug,
|
||||||
|
name: newName.trim(),
|
||||||
|
...(newDesc.trim() ? { description: newDesc.trim() } : {}),
|
||||||
|
});
|
||||||
|
newSlug = '';
|
||||||
|
newName = '';
|
||||||
|
newDesc = '';
|
||||||
|
await load();
|
||||||
|
toastSuccess('团队已创建');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
} finally {
|
||||||
|
adding = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function archiveTeam(t: TeamRow) {
|
||||||
|
if (!confirm(`归档团队 ${t.name}? 归档后该团队不再解析为项目授权主体。`)) return;
|
||||||
|
try {
|
||||||
|
await api.archiveTeam(slug, t.id);
|
||||||
|
if (expandedId === t.id) expandedId = null;
|
||||||
|
await load();
|
||||||
|
toastSuccess('团队已归档');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function openMembers(t: TeamRow) {
|
||||||
|
if (expandedId === t.id) return;
|
||||||
|
expandedId = t.id;
|
||||||
|
loadingMembers = true;
|
||||||
|
memberInput = '';
|
||||||
|
try {
|
||||||
|
const res = await api.teamMembers(slug, t.id);
|
||||||
|
teamMembers = res.members;
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
} finally {
|
||||||
|
loadingMembers = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function onExpandChange(t: TeamRow, open: boolean) {
|
||||||
|
if (open) void openMembers(t);
|
||||||
|
else if (expandedId === t.id) expandedId = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function addMember(t: TeamRow) {
|
||||||
|
if (!memberInput.trim()) return;
|
||||||
|
const v = memberInput.trim();
|
||||||
|
try {
|
||||||
|
await api.addTeamMember(slug, t.id, v.startsWith('ou') ? { feishuOpenId: v } : { userId: v });
|
||||||
|
memberInput = '';
|
||||||
|
const res = await api.teamMembers(slug, t.id);
|
||||||
|
teamMembers = res.members;
|
||||||
|
await load();
|
||||||
|
toastSuccess('已加入团队');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function revokeMember(t: TeamRow, m: TeamMemberRow) {
|
||||||
|
if (!confirm(`将 ${m.displayName} 移出团队 ${t.name}?`)) return;
|
||||||
|
try {
|
||||||
|
await api.revokeTeamMember(slug, t.id, m.userId);
|
||||||
|
const res = await api.teamMembers(slug, t.id);
|
||||||
|
teamMembers = res.members;
|
||||||
|
await load();
|
||||||
|
toastSuccess('已移出团队');
|
||||||
|
} catch (err) {
|
||||||
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
if (slug) load();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<PageHeader title="团队" description="团队是项目授权主体,可被授予只读、编辑或管理权限。" />
|
||||||
|
|
||||||
|
{#if loading}
|
||||||
|
<LoadingState />
|
||||||
|
{:else if error}
|
||||||
|
<ErrorBanner message={error} onretry={load} />
|
||||||
|
{:else}
|
||||||
|
<div class="saas-card-pad mb-6">
|
||||||
|
<h2 class="saas-section-title mb-4">新建团队</h2>
|
||||||
|
<div class="grid gap-3 md:grid-cols-[1fr_1fr_1.2fr_auto]">
|
||||||
|
<input class="saas-input" placeholder="标识(如 math-g7)" bind:value={newSlug} />
|
||||||
|
<input class="saas-input" placeholder="名称" bind:value={newName} />
|
||||||
|
<input class="saas-input" placeholder="描述(可选)" bind:value={newDesc} />
|
||||||
|
<button class="saas-btn-primary" onclick={createTeam} disabled={adding}>新建</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if teams.length === 0}
|
||||||
|
<div class="saas-card">
|
||||||
|
<EmptyState title="暂无团队" description="创建团队后,可在项目页授权项目访问。" />
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<div class="space-y-3">
|
||||||
|
{#each teams as t (t.id)}
|
||||||
|
<Collapsible.Root
|
||||||
|
class="saas-card p-5"
|
||||||
|
open={expandedId === t.id}
|
||||||
|
onOpenChange={(open) => onExpandChange(t, open)}
|
||||||
|
>
|
||||||
|
<div class="flex flex-wrap items-center gap-2.5">
|
||||||
|
<span class="text-base font-semibold text-surface-900">{t.name}</span>
|
||||||
|
<span class="font-mono text-xs text-surface-600">/{t.slug}</span>
|
||||||
|
<span class="saas-badge-neutral">{t.memberCount} 成员</span>
|
||||||
|
<div class="ml-auto flex flex-wrap gap-2">
|
||||||
|
<Collapsible.Trigger class="saas-btn-secondary py-1.5! text-sm">
|
||||||
|
{expandedId === t.id ? '收起' : '管理成员'}
|
||||||
|
</Collapsible.Trigger>
|
||||||
|
<button type="button" class="saas-btn-danger py-1.5! text-sm" onclick={() => archiveTeam(t)}>
|
||||||
|
归档
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{#if t.description}
|
||||||
|
<p class="mt-1.5 text-sm text-surface-700">{t.description}</p>
|
||||||
|
{/if}
|
||||||
|
<p class="mt-1 text-xs text-surface-600">创建于 {fmtDate(t.createdAt)}</p>
|
||||||
|
|
||||||
|
<Collapsible.Content>
|
||||||
|
<div class="mt-4 border-t border-surface-200 pt-4">
|
||||||
|
{#if loadingMembers && expandedId === t.id}
|
||||||
|
<p class="text-sm text-surface-600">加载中…</p>
|
||||||
|
{:else if expandedId === t.id}
|
||||||
|
<div class="mb-4 flex gap-2">
|
||||||
|
<input
|
||||||
|
class="saas-input"
|
||||||
|
placeholder="飞书 open_id 或用户 id"
|
||||||
|
bind:value={memberInput}
|
||||||
|
onkeydown={(e) => {
|
||||||
|
if (e.key === 'Enter') addMember(t);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<button class="saas-btn-secondary shrink-0" onclick={() => addMember(t)}>加入</button>
|
||||||
|
</div>
|
||||||
|
{#if teamMembers.length === 0}
|
||||||
|
<p class="py-3 text-center text-sm text-surface-600">团队暂无成员</p>
|
||||||
|
{:else}
|
||||||
|
<table class="data-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>成员</th>
|
||||||
|
<th>open_id</th>
|
||||||
|
<th>加入时间</th>
|
||||||
|
<th></th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{#each teamMembers as m}
|
||||||
|
<tr>
|
||||||
|
<td class="font-medium">{m.displayName}</td>
|
||||||
|
<td class="font-mono text-xs">{m.feishuOpenId}</td>
|
||||||
|
<td class="text-surface-700">{fmtDate(m.createdAt)}</td>
|
||||||
|
<td class="text-right">
|
||||||
|
<button class="saas-btn-danger py-1! text-xs" onclick={() => revokeMember(t, m)}>
|
||||||
|
移除
|
||||||
|
</button>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{/each}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
{/if}
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</Collapsible.Content>
|
||||||
|
</Collapsible.Root>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
<p class="mt-4 text-xs text-surface-600">归档团队会同步撤销其活跃的项目授权。</p>
|
||||||
|
{/if}
|
||||||
@@ -0,0 +1,692 @@
|
|||||||
|
@import 'tailwindcss';
|
||||||
|
|
||||||
|
@import '@skeletonlabs/skeleton';
|
||||||
|
@import '@skeletonlabs/skeleton/themes/hamlindigo';
|
||||||
|
|
||||||
|
@source './**/*.{html,js,svelte,ts}';
|
||||||
|
@source '../lib/**/*.{html,js,svelte,ts}';
|
||||||
|
|
||||||
|
/* Flat industrial: zero radius, higher-contrast surfaces, CJK-first type */
|
||||||
|
@theme {
|
||||||
|
--font-sans:
|
||||||
|
'Noto Sans SC', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Inter', ui-sans-serif, system-ui,
|
||||||
|
-apple-system, 'Segoe UI', sans-serif;
|
||||||
|
--font-mono: 'JetBrains Mono', ui-monospace, 'SF Mono', Menlo, Consolas, monospace;
|
||||||
|
|
||||||
|
--radius-none: 0;
|
||||||
|
--radius-sm: 0;
|
||||||
|
--radius-md: 0;
|
||||||
|
--radius-lg: 0;
|
||||||
|
--radius-xl: 0;
|
||||||
|
--radius-2xl: 0;
|
||||||
|
--radius-3xl: 0;
|
||||||
|
--radius-full: 0;
|
||||||
|
--radius: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@layer base {
|
||||||
|
html {
|
||||||
|
height: 100%;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
|
text-rendering: optimizeLegibility;
|
||||||
|
font-feature-settings:
|
||||||
|
'kern' 1,
|
||||||
|
'liga' 1;
|
||||||
|
/* Prefer readable CJK metrics over Latin optical sizing */
|
||||||
|
text-size-adjust: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
min-height: 100%;
|
||||||
|
font-family: var(--font-sans);
|
||||||
|
font-size: 15px;
|
||||||
|
line-height: 1.7;
|
||||||
|
letter-spacing: 0.01em;
|
||||||
|
/* Slightly cooler industrial surface */
|
||||||
|
background: var(--color-surface-100);
|
||||||
|
color: var(--color-surface-950, var(--color-surface-900));
|
||||||
|
font-variant-east-asian: proportional-width;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* CJK headings: no negative tracking, breathing line-height */
|
||||||
|
h1,
|
||||||
|
h2,
|
||||||
|
h3,
|
||||||
|
h4,
|
||||||
|
h5,
|
||||||
|
h6 {
|
||||||
|
font-weight: 600;
|
||||||
|
line-height: 1.45;
|
||||||
|
letter-spacing: 0;
|
||||||
|
color: var(--color-surface-950, var(--color-surface-900));
|
||||||
|
}
|
||||||
|
|
||||||
|
p {
|
||||||
|
line-height: 1.75;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Harder focus ring for industrial UI */
|
||||||
|
:focus-visible {
|
||||||
|
outline: 2px solid var(--color-primary-600);
|
||||||
|
outline-offset: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
::selection {
|
||||||
|
background: color-mix(in oklab, var(--color-primary-600) 35%, transparent);
|
||||||
|
color: var(--color-surface-950, var(--color-surface-900));
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Tables: high-contrast grid, flat */
|
||||||
|
table.data-table {
|
||||||
|
width: 100%;
|
||||||
|
border-collapse: collapse;
|
||||||
|
font-size: 0.875rem;
|
||||||
|
line-height: 1.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
table.data-table thead th {
|
||||||
|
padding: 0.625rem 0.75rem;
|
||||||
|
text-align: left;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--color-surface-700);
|
||||||
|
background: var(--color-surface-100);
|
||||||
|
border-bottom: 1px solid var(--color-surface-300);
|
||||||
|
white-space: nowrap;
|
||||||
|
letter-spacing: 0.02em;
|
||||||
|
}
|
||||||
|
|
||||||
|
table.data-table tbody td {
|
||||||
|
padding: 0.75rem;
|
||||||
|
border-bottom: 1px solid var(--color-surface-200);
|
||||||
|
vertical-align: middle;
|
||||||
|
color: var(--color-surface-900);
|
||||||
|
}
|
||||||
|
|
||||||
|
table.data-table tbody tr:hover td {
|
||||||
|
background: var(--color-surface-100);
|
||||||
|
}
|
||||||
|
|
||||||
|
table.data-table tbody tr:last-child td {
|
||||||
|
border-bottom: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@layer components {
|
||||||
|
.saas-card {
|
||||||
|
border-radius: 0;
|
||||||
|
border: 1px solid var(--color-surface-300);
|
||||||
|
background: var(--color-surface-50);
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-card-pad {
|
||||||
|
border-radius: 0;
|
||||||
|
border: 1px solid var(--color-surface-300);
|
||||||
|
background: var(--color-surface-50);
|
||||||
|
box-shadow: none;
|
||||||
|
padding: 1.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-page-title {
|
||||||
|
font-size: 1.375rem;
|
||||||
|
line-height: 1.4;
|
||||||
|
font-weight: 700;
|
||||||
|
letter-spacing: 0;
|
||||||
|
color: var(--color-surface-950, var(--color-surface-900));
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-section-title {
|
||||||
|
font-size: 1rem;
|
||||||
|
line-height: 1.5;
|
||||||
|
font-weight: 600;
|
||||||
|
letter-spacing: 0;
|
||||||
|
color: var(--color-surface-950, var(--color-surface-900));
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-muted {
|
||||||
|
font-size: 0.875rem;
|
||||||
|
line-height: 1.65;
|
||||||
|
color: var(--color-surface-700);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-label {
|
||||||
|
display: block;
|
||||||
|
margin-bottom: 0.375rem;
|
||||||
|
font-size: 0.875rem;
|
||||||
|
line-height: 1.5;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--color-surface-800);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-help {
|
||||||
|
margin-top: 0.375rem;
|
||||||
|
font-size: 0.8125rem;
|
||||||
|
line-height: 1.6;
|
||||||
|
color: var(--color-surface-600);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-toolbar {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.75rem;
|
||||||
|
margin-bottom: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-stat {
|
||||||
|
border-radius: 0;
|
||||||
|
border: 1px solid var(--color-surface-300);
|
||||||
|
background: var(--color-surface-50);
|
||||||
|
padding: 1rem;
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-stat-label {
|
||||||
|
font-size: 0.75rem;
|
||||||
|
font-weight: 600;
|
||||||
|
letter-spacing: 0.04em;
|
||||||
|
text-transform: uppercase;
|
||||||
|
color: var(--color-surface-600);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-stat-value {
|
||||||
|
margin-top: 0.25rem;
|
||||||
|
font-size: 1.5rem;
|
||||||
|
line-height: 1.3;
|
||||||
|
font-weight: 700;
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
letter-spacing: 0;
|
||||||
|
color: var(--color-surface-950, var(--color-surface-900));
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-empty {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 0.5rem;
|
||||||
|
padding: 3rem 1rem;
|
||||||
|
text-align: center;
|
||||||
|
line-height: 1.7;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-shell {
|
||||||
|
display: flex;
|
||||||
|
height: 100vh;
|
||||||
|
overflow: hidden;
|
||||||
|
background: var(--color-surface-100);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-sidebar {
|
||||||
|
display: flex;
|
||||||
|
width: 16rem;
|
||||||
|
flex-shrink: 0;
|
||||||
|
flex-direction: column;
|
||||||
|
border-right: 1px solid var(--color-surface-300);
|
||||||
|
background: var(--color-surface-50);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-main {
|
||||||
|
display: flex;
|
||||||
|
min-width: 0;
|
||||||
|
flex: 1;
|
||||||
|
flex-direction: column;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-topbar {
|
||||||
|
display: flex;
|
||||||
|
height: 3.5rem;
|
||||||
|
flex-shrink: 0;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.75rem;
|
||||||
|
border-bottom: 1px solid var(--color-surface-300);
|
||||||
|
background: var(--color-surface-50);
|
||||||
|
padding: 0 1.5rem;
|
||||||
|
/* flat: no glass */
|
||||||
|
backdrop-filter: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-content {
|
||||||
|
flex: 1;
|
||||||
|
overflow-y: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-content-inner {
|
||||||
|
margin-inline: auto;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 72rem;
|
||||||
|
padding: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (min-width: 768px) {
|
||||||
|
.saas-content-inner {
|
||||||
|
padding: 2rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-nav-item {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.75rem;
|
||||||
|
border-radius: 0;
|
||||||
|
padding: 0.5rem 0.75rem;
|
||||||
|
font-size: 0.875rem;
|
||||||
|
line-height: 1.5;
|
||||||
|
font-weight: 500;
|
||||||
|
color: var(--color-surface-700);
|
||||||
|
border-left: 2px solid transparent;
|
||||||
|
transition:
|
||||||
|
color 0.1s,
|
||||||
|
background-color 0.1s,
|
||||||
|
border-color 0.1s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-nav-item:hover {
|
||||||
|
background: var(--color-surface-100);
|
||||||
|
color: var(--color-surface-950, var(--color-surface-900));
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-nav-item[data-active='true'] {
|
||||||
|
background: var(--color-primary-50, var(--color-primary-100));
|
||||||
|
color: var(--color-primary-800);
|
||||||
|
border-left-color: var(--color-primary-600);
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-badge {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
border-radius: 0;
|
||||||
|
padding: 0.125rem 0.5rem;
|
||||||
|
font-size: 0.75rem;
|
||||||
|
line-height: 1.4;
|
||||||
|
font-weight: 600;
|
||||||
|
letter-spacing: 0.02em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-badge-neutral {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
border-radius: 0;
|
||||||
|
padding: 0.125rem 0.5rem;
|
||||||
|
font-size: 0.75rem;
|
||||||
|
line-height: 1.4;
|
||||||
|
font-weight: 600;
|
||||||
|
border: 1px solid var(--color-surface-300);
|
||||||
|
background: var(--color-surface-100);
|
||||||
|
color: var(--color-surface-800);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-badge-primary {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
border-radius: 0;
|
||||||
|
padding: 0.125rem 0.5rem;
|
||||||
|
font-size: 0.75rem;
|
||||||
|
line-height: 1.4;
|
||||||
|
font-weight: 600;
|
||||||
|
border: 1px solid var(--color-primary-300);
|
||||||
|
background: var(--color-primary-100);
|
||||||
|
color: var(--color-primary-800);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-badge-success {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
border-radius: 0;
|
||||||
|
padding: 0.125rem 0.5rem;
|
||||||
|
font-size: 0.75rem;
|
||||||
|
line-height: 1.4;
|
||||||
|
font-weight: 600;
|
||||||
|
border: 1px solid var(--color-success-300);
|
||||||
|
background: var(--color-success-100);
|
||||||
|
color: var(--color-success-800);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-badge-warning {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
border-radius: 0;
|
||||||
|
padding: 0.125rem 0.5rem;
|
||||||
|
font-size: 0.75rem;
|
||||||
|
line-height: 1.4;
|
||||||
|
font-weight: 600;
|
||||||
|
border: 1px solid var(--color-warning-300);
|
||||||
|
background: var(--color-warning-100);
|
||||||
|
color: var(--color-warning-900);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-badge-error {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
border-radius: 0;
|
||||||
|
padding: 0.125rem 0.5rem;
|
||||||
|
font-size: 0.75rem;
|
||||||
|
line-height: 1.4;
|
||||||
|
font-weight: 600;
|
||||||
|
border: 1px solid var(--color-error-300);
|
||||||
|
background: var(--color-error-100);
|
||||||
|
color: var(--color-error-800);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-input,
|
||||||
|
.saas-select,
|
||||||
|
.saas-textarea {
|
||||||
|
width: 100%;
|
||||||
|
border-radius: 0;
|
||||||
|
border: 1px solid var(--color-surface-400);
|
||||||
|
background: var(--color-surface-50);
|
||||||
|
color: var(--color-surface-950, var(--color-surface-900));
|
||||||
|
padding: 0.5rem 0.75rem;
|
||||||
|
font-size: 0.875rem;
|
||||||
|
line-height: 1.5;
|
||||||
|
outline: none;
|
||||||
|
transition:
|
||||||
|
border-color 0.1s,
|
||||||
|
box-shadow 0.1s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-input::placeholder,
|
||||||
|
.saas-textarea::placeholder {
|
||||||
|
color: var(--color-surface-500);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-input:focus,
|
||||||
|
.saas-select:focus,
|
||||||
|
.saas-textarea:focus {
|
||||||
|
border-color: var(--color-primary-600);
|
||||||
|
box-shadow: inset 0 0 0 1px var(--color-primary-600);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-textarea {
|
||||||
|
font-family: var(--font-mono);
|
||||||
|
line-height: 1.55;
|
||||||
|
resize: vertical;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-select-trigger {
|
||||||
|
display: inline-flex;
|
||||||
|
width: 100%;
|
||||||
|
align-items: center;
|
||||||
|
border-radius: 0;
|
||||||
|
border: 1px solid var(--color-surface-400);
|
||||||
|
background: var(--color-surface-50);
|
||||||
|
color: var(--color-surface-950, var(--color-surface-900));
|
||||||
|
padding: 0.5rem 0.75rem;
|
||||||
|
font-size: 0.875rem;
|
||||||
|
line-height: 1.5;
|
||||||
|
outline: none;
|
||||||
|
transition:
|
||||||
|
border-color 0.1s,
|
||||||
|
box-shadow 0.1s;
|
||||||
|
cursor: pointer;
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-select-trigger:focus-visible,
|
||||||
|
.saas-select-trigger[data-state='open'] {
|
||||||
|
border-color: var(--color-primary-600);
|
||||||
|
box-shadow: inset 0 0 0 1px var(--color-primary-600);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-select-trigger:disabled,
|
||||||
|
.saas-select-trigger[data-disabled] {
|
||||||
|
cursor: not-allowed;
|
||||||
|
opacity: 0.55;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-select-trigger [data-placeholder] {
|
||||||
|
color: var(--color-surface-500);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-select-content {
|
||||||
|
z-index: 70;
|
||||||
|
max-height: min(18rem, var(--bits-select-content-available-height, 18rem));
|
||||||
|
width: var(--bits-select-anchor-width);
|
||||||
|
min-width: var(--bits-select-anchor-width);
|
||||||
|
overflow: hidden;
|
||||||
|
border-radius: 0;
|
||||||
|
border: 1px solid var(--color-surface-400);
|
||||||
|
background: var(--color-surface-50);
|
||||||
|
box-shadow: 4px 4px 0 rgb(15 23 42 / 0.12);
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-select-item {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
border-radius: 0;
|
||||||
|
padding: 0.45rem 0.65rem;
|
||||||
|
font-size: 0.875rem;
|
||||||
|
line-height: 1.5;
|
||||||
|
color: var(--color-surface-900);
|
||||||
|
cursor: pointer;
|
||||||
|
outline: none;
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-select-item[data-highlighted] {
|
||||||
|
background: var(--color-primary-100);
|
||||||
|
color: var(--color-primary-900);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-select-item[data-selected] {
|
||||||
|
color: var(--color-primary-900);
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-select-item[data-disabled] {
|
||||||
|
cursor: not-allowed;
|
||||||
|
opacity: 0.45;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-btn-primary,
|
||||||
|
.saas-btn-secondary,
|
||||||
|
.saas-btn-ghost,
|
||||||
|
.saas-btn-danger {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 0.375rem;
|
||||||
|
border-radius: 0;
|
||||||
|
padding: 0.5rem 0.875rem;
|
||||||
|
font-size: 0.875rem;
|
||||||
|
font-weight: 600;
|
||||||
|
line-height: 1.4;
|
||||||
|
letter-spacing: 0.01em;
|
||||||
|
border: 1px solid transparent;
|
||||||
|
cursor: pointer;
|
||||||
|
transition:
|
||||||
|
background-color 0.1s,
|
||||||
|
color 0.1s,
|
||||||
|
border-color 0.1s,
|
||||||
|
opacity 0.1s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-btn-primary:disabled,
|
||||||
|
.saas-btn-secondary:disabled,
|
||||||
|
.saas-btn-ghost:disabled,
|
||||||
|
.saas-btn-danger:disabled {
|
||||||
|
opacity: 0.55;
|
||||||
|
cursor: not-allowed;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-btn-primary {
|
||||||
|
background: var(--color-primary-600);
|
||||||
|
border-color: var(--color-primary-700);
|
||||||
|
color: var(--color-primary-contrast-500, white);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-btn-primary:hover:not(:disabled) {
|
||||||
|
background: var(--color-primary-700);
|
||||||
|
border-color: var(--color-primary-800);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-btn-secondary {
|
||||||
|
background: var(--color-surface-100);
|
||||||
|
border-color: var(--color-surface-400);
|
||||||
|
color: var(--color-surface-900);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-btn-secondary:hover:not(:disabled) {
|
||||||
|
background: var(--color-surface-200);
|
||||||
|
border-color: var(--color-surface-500);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-btn-ghost {
|
||||||
|
background: transparent;
|
||||||
|
border-color: transparent;
|
||||||
|
color: var(--color-surface-800);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-btn-ghost:hover:not(:disabled) {
|
||||||
|
background: var(--color-surface-200);
|
||||||
|
color: var(--color-surface-950, var(--color-surface-900));
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-btn-danger {
|
||||||
|
background: var(--color-error-100);
|
||||||
|
border-color: var(--color-error-400);
|
||||||
|
color: var(--color-error-800);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-btn-danger:hover:not(:disabled) {
|
||||||
|
background: var(--color-error-200);
|
||||||
|
border-color: var(--color-error-500);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-checkbox {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 1.1rem;
|
||||||
|
height: 1.1rem;
|
||||||
|
flex-shrink: 0;
|
||||||
|
border-radius: 0;
|
||||||
|
border: 1px solid var(--color-surface-500);
|
||||||
|
background: var(--color-surface-50);
|
||||||
|
color: white;
|
||||||
|
cursor: pointer;
|
||||||
|
transition:
|
||||||
|
background 0.1s,
|
||||||
|
border-color 0.1s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-checkbox[data-state='checked'] {
|
||||||
|
background: var(--color-primary-700);
|
||||||
|
border-color: var(--color-primary-700);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-checkbox:focus-visible {
|
||||||
|
outline: none;
|
||||||
|
box-shadow:
|
||||||
|
0 0 0 2px var(--color-surface-50),
|
||||||
|
0 0 0 4px var(--color-primary-600);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-checkbox[data-disabled] {
|
||||||
|
cursor: not-allowed;
|
||||||
|
opacity: 0.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Square industrial switch (no pill) */
|
||||||
|
.saas-switch {
|
||||||
|
position: relative;
|
||||||
|
display: inline-flex;
|
||||||
|
width: 2.5rem;
|
||||||
|
height: 1.35rem;
|
||||||
|
flex-shrink: 0;
|
||||||
|
align-items: center;
|
||||||
|
border-radius: 0;
|
||||||
|
border: 1px solid var(--color-surface-500);
|
||||||
|
background: var(--color-surface-300);
|
||||||
|
padding: 0.125rem;
|
||||||
|
cursor: pointer;
|
||||||
|
transition:
|
||||||
|
background 0.1s,
|
||||||
|
border-color 0.1s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-switch[data-state='checked'] {
|
||||||
|
background: var(--color-primary-600);
|
||||||
|
border-color: var(--color-primary-700);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-switch:focus-visible {
|
||||||
|
outline: none;
|
||||||
|
box-shadow:
|
||||||
|
0 0 0 2px var(--color-surface-50),
|
||||||
|
0 0 0 4px var(--color-primary-600);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-switch[data-disabled] {
|
||||||
|
cursor: not-allowed;
|
||||||
|
opacity: 0.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-switch-thumb {
|
||||||
|
display: block;
|
||||||
|
width: 1rem;
|
||||||
|
height: 1rem;
|
||||||
|
border-radius: 0;
|
||||||
|
background: white;
|
||||||
|
border: 1px solid var(--color-surface-400);
|
||||||
|
box-shadow: none;
|
||||||
|
transition: transform 0.1s;
|
||||||
|
transform: translateX(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-switch[data-state='checked'] .saas-switch-thumb,
|
||||||
|
.saas-switch-thumb[data-state='checked'] {
|
||||||
|
transform: translateX(1.1rem);
|
||||||
|
border-color: var(--color-primary-800);
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-modal-backdrop {
|
||||||
|
position: fixed;
|
||||||
|
inset: 0;
|
||||||
|
z-index: 50;
|
||||||
|
background: rgb(2 6 23 / 0.55);
|
||||||
|
backdrop-filter: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-modal {
|
||||||
|
position: fixed;
|
||||||
|
left: 50%;
|
||||||
|
top: 50%;
|
||||||
|
z-index: 51;
|
||||||
|
width: calc(100% - 2rem);
|
||||||
|
max-width: 28rem;
|
||||||
|
transform: translate(-50%, -50%);
|
||||||
|
border-radius: 0;
|
||||||
|
border: 1px solid var(--color-surface-400);
|
||||||
|
background: var(--color-surface-50);
|
||||||
|
padding: 1.5rem;
|
||||||
|
box-shadow: 6px 6px 0 rgb(15 23 42 / 0.15);
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-status-panel {
|
||||||
|
display: flex;
|
||||||
|
min-height: 100vh;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
background: var(--color-surface-100);
|
||||||
|
padding: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.saas-status-card {
|
||||||
|
width: 100%;
|
||||||
|
max-width: 28rem;
|
||||||
|
border-radius: 0;
|
||||||
|
border: 1px solid var(--color-surface-400);
|
||||||
|
background: var(--color-surface-50);
|
||||||
|
padding: 2rem;
|
||||||
|
text-align: center;
|
||||||
|
box-shadow: 4px 4px 0 rgb(15 23 42 / 0.1);
|
||||||
|
line-height: 1.7;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" fill="none">
|
||||||
|
<rect width="32" height="32" rx="8" fill="#4F46E5"/>
|
||||||
|
<path d="M8 10.5h7.5a3.5 3.5 0 0 1 0 7H11v4H8v-11Zm3 4.5h4.5a1.5 1.5 0 0 0 0-3H11v3Z" fill="white"/>
|
||||||
|
<path d="M20.5 21.5c1.93 0 3.5-1.34 3.5-3s-1.57-3-3.5-3S17 16.84 17 18.5s1.57 3 3.5 3Z" fill="white" opacity=".9"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 353 B |
@@ -0,0 +1,3 @@
|
|||||||
|
# allow crawling everything by default
|
||||||
|
User-agent: *
|
||||||
|
Disallow:
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
import adapter from '@sveltejs/adapter-static';
|
||||||
|
import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
|
||||||
|
|
||||||
|
/** @type {import('@sveltejs/kit').Config} */
|
||||||
|
const config = {
|
||||||
|
preprocess: vitePreprocess(),
|
||||||
|
kit: {
|
||||||
|
adapter: adapter({
|
||||||
|
pages: 'build',
|
||||||
|
assets: 'build',
|
||||||
|
fallback: 'index.html',
|
||||||
|
precompress: false,
|
||||||
|
strict: false,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
export default config;
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"extends": "./.svelte-kit/tsconfig.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"rewriteRelativeImportExtensions": true,
|
||||||
|
"allowJs": true,
|
||||||
|
"checkJs": true,
|
||||||
|
"esModuleInterop": true,
|
||||||
|
"forceConsistentCasingInFileNames": true,
|
||||||
|
"resolveJsonModule": true,
|
||||||
|
"skipLibCheck": true,
|
||||||
|
"sourceMap": true,
|
||||||
|
"strict": true,
|
||||||
|
"moduleResolution": "bundler"
|
||||||
|
}
|
||||||
|
// Path aliases are handled by https://svelte.dev/docs/kit/configuration#alias
|
||||||
|
// except $lib which is handled by https://svelte.dev/docs/kit/configuration#files
|
||||||
|
//
|
||||||
|
// To make changes to top-level options such as include and exclude, we recommend extending
|
||||||
|
// the generated config; see https://svelte.dev/docs/kit/configuration#typescript
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
import { sveltekit } from '@sveltejs/kit/vite';
|
||||||
|
import tailwindcss from '@tailwindcss/vite';
|
||||||
|
import { defineConfig } from 'vite';
|
||||||
|
|
||||||
|
export default defineConfig({
|
||||||
|
plugins: [tailwindcss(), sveltekit()],
|
||||||
|
server: {
|
||||||
|
proxy: {
|
||||||
|
'/api': 'http://127.0.0.1:8788',
|
||||||
|
'/auth': 'http://127.0.0.1:8788',
|
||||||
|
// Backend owns /admin/login (registered before the SPA fallback in
|
||||||
|
// src/admin/static.ts). Proxy it in dev so the SPA doesn't re-render
|
||||||
|
// its layout on that path and 401-redirect into a returnTo loop.
|
||||||
|
'/admin/login': 'http://127.0.0.1:8788',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "cph-curated",
|
|
||||||
"description": "Reviewed curriculum-production skills shipped with the Curriculum Project Hub.",
|
|
||||||
"version": "0.0.1"
|
|
||||||
}
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
---
|
|
||||||
name: data-processing-spec
|
|
||||||
description: 物理竞赛实验「数据处理」的两套作答规范——超严格版与考试版。当用户要出实验数据处理题、或要求题目答案/解析"按考试版写""按超严格版写""按严格规范作答",或问"什么是考试版/严格版""不确定度取几位""不确定度怎么修约""连算代入哪个值""拟合要不要算 B 类"等数据处理口径问题时使用。出题与批改时据此确定唯一口径。
|
|
||||||
---
|
|
||||||
|
|
||||||
# 数据处理作答规范(超严格版 / 考试版)
|
|
||||||
|
|
||||||
物理竞赛实验数据处理里,有效数字取位、不确定度修约、连算代入、拟合是否计 B 类等环节
|
|
||||||
**各家做法不一致**。为避免"同一份数据出现多个都对的答案",本课程把这些争议点各拍板成
|
|
||||||
两套自洽的口径:
|
|
||||||
|
|
||||||
| 版本 | 用途 | 一句话特征 |
|
|
||||||
|------|------|-----------|
|
|
||||||
| **超严格版** | 严格训练 | 每一步贴近误差理论最规范做法,接受较繁的计算量 |
|
|
||||||
| **考试版** | 考试 / 日常训练 | 在规范前提下简化计算,贴近竞赛复赛阅卷习惯 |
|
|
||||||
|
|
||||||
## 怎么用这个 skill
|
|
||||||
|
|
||||||
1. **先确定版本。** 用户出题或批改时通常会说明"按考试版"还是"按超严格版"。
|
|
||||||
- 用户明确指定 → 用该版。
|
|
||||||
- 用户没指定 → **必须先问**用户要哪一版,不要自己默认。两版在四处刻意不同,
|
|
||||||
选错会给出末位不同的答案。
|
|
||||||
2. **读对应规范全文,再动手。** 选定版本后,完整阅读对应文件,按其中每一条口径生成
|
|
||||||
题目答案 / 解析 / 评分点:
|
|
||||||
- 超严格版 → [strict-spec.md](strict-spec.md)
|
|
||||||
- 考试版 → [exam-spec.md](exam-spec.md)
|
|
||||||
3. **全程只认一版。** 一道题(含所有小问)自始至终用同一版口径,不得中途混用。
|
|
||||||
4. **需要解释"为什么有两版""某争议点各方怎么做"时** → 读 [disputes.md](disputes.md)
|
|
||||||
(中立罗列各方做法与依据,不拍板)。
|
|
||||||
|
|
||||||
## 两版差异一览(仅这四处不同)
|
|
||||||
|
|
||||||
下面四项是两版**唯一的区别**;其余约定两版完全一致(见下一节)。出题/批改时重点核对这四项。
|
|
||||||
|
|
||||||
| 争议环节 | 超严格版 | 考试版 |
|
|
||||||
|----------|----------|--------|
|
|
||||||
| **不确定度取几位有效数字** | 首位为 1/2/3 取 2 位,其余取 1 位(A2) | 一律取 1 位(A1) |
|
|
||||||
| **不确定度的修约方向** | 只进不舍(偏保守,代表:北大) | 四舍六入五凑偶(代表:中科大、第 42 届复赛) |
|
|
||||||
| **多小问连算代入哪个值** | 代入前一问**未修约的真实值**,仅终值修约 | 代入前一问**已修约的填空值**,接受逐问舍入 |
|
|
||||||
| **线性拟合不确定度** | A 类 + B 类合成(需算 `u_Bk = u_By / √Σ(xi−x̄)²`) | 只算 A 类(`u_k = σ_k`) |
|
|
||||||
|
|
||||||
> 测量值(中心值)的修约:**两版都用四舍六入五凑偶**——这一条不是差异项。
|
|
||||||
|
|
||||||
## 两版共同约定(不随版本变化)
|
|
||||||
|
|
||||||
- **A 类不确定度**:取平均值的实验标准差 `u_A = √[Σ(xi−x̄)² / (n(n−1))]`,**不做 t 因子修正**。
|
|
||||||
- **B 类不确定度**:`u_B = Δ仪 / √3`(仪器误差限按均匀分布折算)。合成 `u = √(u_A² + u_B²)`。
|
|
||||||
- **单次测量**:不假设 A 类不确定度为无穷大,**直接以仪器误差限估算**该次测量不确定度
|
|
||||||
(取 `u = Δ仪 / √3`)。出处:实验指导书"杨氏模量"实验对单次测量量的处理;措辞以本组
|
|
||||||
实际指导书为准。
|
|
||||||
- **有效数字总原则**:测量值位数必须与不确定度对齐——不确定度精确到哪一位,测量值就写到哪一位。
|
|
||||||
- **线性拟合 A 类**:斜率相对不确定度 `σ_k / k = √[ (1/(n−2)) · (1/γ² − 1) ]`(γ 为相关系数)。
|
|
||||||
|
|
||||||
## 出题/批改自检清单
|
|
||||||
|
|
||||||
确定版本后,逐项对照所选规范,确保答案在这些点上口径一致:
|
|
||||||
|
|
||||||
- [ ] A 类是否用了"不做 t 修正"的标准差公式
|
|
||||||
- [ ] B 类是否 `Δ仪/√3`;单次测量是否用仪器误差限
|
|
||||||
- [ ] 不确定度取了几位(A2 还是 A1)—— **按版本**
|
|
||||||
- [ ] 不确定度末位修约方向(只进不舍 / 四舍六入五凑偶)—— **按版本**
|
|
||||||
- [ ] 测量值是否与不确定度对齐、是否用四舍六入五凑偶
|
|
||||||
- [ ] 多小问连算代入的是真实值还是修约值 —— **按版本**
|
|
||||||
- [ ] 线性拟合是否计 B 类 —— **按版本**
|
|
||||||
- [ ] 全卷是否始终只用了这一版口径
|
|
||||||
|
|
||||||
## 配套 PDF 源码
|
|
||||||
|
|
||||||
`scripts/` 下保留了两版规范与争议点讨论的 Typst 源码,仅作为内容参考。当前 Educraft Agent
|
|
||||||
运行时不提供独立 `typst` 命令,不要尝试直接编译这些脚本,也不要安装运行时依赖。用户需要
|
|
||||||
成品 PDF 时,明确说明当前能力边界;若内容要进入课程工程,应按 `lesson-project` 的 cph
|
|
||||||
0.0.2 结构落地并使用 `cph check/build`。
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
# 数据处理争议点(中立罗列,不拍板)
|
|
||||||
|
|
||||||
本文件解释"为什么会有超严格版 / 考试版两套口径"——每个环节各家做法不一致,本课程把它们各
|
|
||||||
拍板成两版。这里**只中立罗列各方做法与依据**,不评对错。需要给学生/教练讲清来龙去脉时引用。
|
|
||||||
|
|
||||||
## 共同约定(无争议前提)
|
|
||||||
- A 类不确定度:实验标准差,**不做 t 因子修正**。
|
|
||||||
- B 类不确定度:`u_B = Δ仪 / √3`(均匀分布)。
|
|
||||||
- 测量值修约:四舍六入五凑偶。
|
|
||||||
- 有效数字总原则:测量值位数跟着不确定度走(对齐)。
|
|
||||||
- 单次测量:以仪器误差限估算,不假设 A 类无穷大(出处:实验指导书"杨氏模量"部分)。
|
|
||||||
|
|
||||||
## 争议点 A:不确定度取几位有效数字
|
|
||||||
- **A1(考试版采用)**:一律 1 位。如 `0.034→0.03`、`0.12→0.1`。
|
|
||||||
- **A2(超严格版采用)**:首位为 1/2/3 时取 2 位,其余取 1 位。如 `0.123→0.12`、`0.67→0.7`。
|
|
||||||
- 分歧本质:修约不确定度本身引入的相对误差能容忍多大;A2 为压低该相对误差而保留 2 位。
|
|
||||||
|
|
||||||
## 争议点 B:有效数字"反向多取一位"变体
|
|
||||||
- 设 `u=0.03`,再看测量值对齐位数字:≥3(如 1.87)正常对齐写 `(1.87±0.03)`;以 1/2/3 等更小
|
|
||||||
数起头(如 1.81)则允许测量值再多取一位、不确定度也反向多取一位 → `(1.812±0.034)`。
|
|
||||||
- 与 A1/A2 不完全等价,是 A 的一个更细变体。本课程两版都未采用此变体(统一走 A1 或 A2),
|
|
||||||
列出仅供识别学生可能用到的写法。
|
|
||||||
|
|
||||||
## 争议点 C:不确定度本身如何修约
|
|
||||||
- **只进不舍(超严格版采用)**:末位一律进位,报告值偏保守。代表:北京大学。
|
|
||||||
- **四舍六入五凑偶(考试版采用)**:与测量值同一规则。代表:中国科学技术大学、第 42 届复赛。
|
|
||||||
- 提示:第 42 届全国中学生物理竞赛复赛对不确定度采用四舍六入五凑偶。
|
|
||||||
|
|
||||||
## 争议点 D:多小问连算代入哪个值
|
|
||||||
- **代入未修约真实值(超严格版采用)**:用完整精度中间量,仅终值修约;避免舍入误差传播,
|
|
||||||
误差理论上更规范。
|
|
||||||
- **代入已修约填空值(考试版采用)**:用前一问写出来的修约值;便于逐问复算、阅卷可追溯。
|
|
||||||
- 两者数值通常只差最后一两位,边界情形可能影响终值末位。
|
|
||||||
|
|
||||||
## 争议点 E:线性拟合是否计入 B 类
|
|
||||||
- A 类无争议:`σ_k/k = √[ (1/(n−2))·(1/γ²−1) ]`。
|
|
||||||
- **只算 A 类(考试版采用)**:直接 `u_k=σ_k`;相当多题目/教材实际只算 A 类,且常不说明理由。
|
|
||||||
- **A 类 + B 类合成(超严格版采用)**:把斜率写成 `k=Σci·yi`,`ci=(xi−x̄)/Σ(xj−x̄)²`,
|
|
||||||
得 `u_Bk = u_By / √(Σ(xi−x̄)²)`,再 `u_k=√(σ_k²+u_Bk²)`。
|
|
||||||
- 为何常省略 B 类:点多、Σ(xi−x̄)² 大时 u_Bk 往往远小于 σ_k 被淹没——但这只是近似经验,非普遍成立。
|
|
||||||
|
|
||||||
## 速查对照
|
|
||||||
|
|
||||||
| 编号 | 争议内容 | 超严格版 | 考试版 |
|
|
||||||
|------|----------|----------|--------|
|
|
||||||
| A | 不确定度取几位 | 首位 1/2/3 取 2 位(A2) | 一律 1 位(A1) |
|
|
||||||
| C | 不确定度修约方向 | 只进不舍 | 四舍六入五凑偶 |
|
|
||||||
| D | 连算代入值 | 未修约真实值 | 已修约填空值 |
|
|
||||||
| E | 拟合是否计 B 类 | A 类 + B 类合成 | 只算 A 类 |
|
|
||||||
|
|
||||||
> B 项(反向多取一位变体)两版均不采用,故不在版本差异表内。
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
# 数据处理规范 · 考试版
|
|
||||||
|
|
||||||
> 用于**考试与日常训练**。在保证规范性的前提下**简化计算**(不确定度一律 1 位、拟合只算 A 类、
|
|
||||||
> 逐问代入修约值),贴近竞赛复赛阅卷习惯。评分以本规范为唯一口径。与超严格版在四处刻意不同
|
|
||||||
> (有效数字取位、不确定度修约方向、连算代入值、拟合是否计 B 类)——同一份数据两版可能给出
|
|
||||||
> 末位不同的答案,**全程只认本版,不可混用**。
|
|
||||||
|
|
||||||
## 共同约定(两版一致)
|
|
||||||
|
|
||||||
### A 类不确定度
|
|
||||||
多次测量,取平均值的实验标准差:
|
|
||||||
|
|
||||||
```
|
|
||||||
u_A = √[ Σ(xi − x̄)² / (n(n−1)) ]
|
|
||||||
```
|
|
||||||
|
|
||||||
- **不做 t 因子修正**,直接以上式为 u_A。
|
|
||||||
|
|
||||||
### B 类不确定度
|
|
||||||
- `u_B = Δ仪 / √3`(仪器误差限按均匀分布折算)。
|
|
||||||
- 合成:`u = √(u_A² + u_B²)`。
|
|
||||||
|
|
||||||
### 单次测量
|
|
||||||
- 不假设 A 类不确定度为无穷大,**直接以仪器误差限估算**该次测量不确定度,取 `u = Δ仪 / √3`。
|
|
||||||
- 出处批注:依据实验指导书"杨氏模量"实验对单次测量量的处理;措辞以本组实际指导书为准。
|
|
||||||
|
|
||||||
## 有效数字与修约(本版选定口径)
|
|
||||||
|
|
||||||
### 有效数字总原则
|
|
||||||
- 测量值(中心值)的位数**必须与不确定度对齐**:不确定度精确到哪一位,测量值就写到哪一位。
|
|
||||||
|
|
||||||
### 不确定度取几位有效数字 —— 统一 1 位
|
|
||||||
- **不确定度一律保留 1 位有效数字**(无论首位是几)。测量值随之对齐到该位。
|
|
||||||
- 示例:`u=0.123 → 0.1`,测量值 `1.8127 → 1.8`,记为 `(1.8 ± 0.1)`;`u=0.067 → 0.07`,对齐到该位。
|
|
||||||
|
|
||||||
### 测量值的修约 —— 四舍六入五凑偶
|
|
||||||
- 测量值采用"四舍六入五凑偶"(逢四舍、逢六入、逢五凑偶)。
|
|
||||||
|
|
||||||
### 不确定度的修约 —— 四舍六入五凑偶
|
|
||||||
- 不确定度也采用"四舍六入五凑偶",与测量值同一规则。
|
|
||||||
- 提示:第 42 届全国中学生物理竞赛复赛对不确定度即采用四舍六入五凑偶。本版选此口径以贴近
|
|
||||||
近年复赛阅卷习惯(代表:中科大、第 42 届复赛)。
|
|
||||||
|
|
||||||
## 多小问连算 —— 代入上一问修约后的结果
|
|
||||||
- 后一问用到前一问结果时,**代入前一问已修约、写进答题处的那个值**进行计算。
|
|
||||||
即接受每问修约带来的舍入误差,换取逐问可复算、便于阅卷。
|
|
||||||
- 示例:杨氏模量第 1 问报告 `d = 1.8 mm`;第 2 问算 E 时**直接代入 1.8 mm**(而非未修约的 1.8127…)。
|
|
||||||
|
|
||||||
## 线性拟合 —— 只算 A 类
|
|
||||||
设 `y = k x + b`。
|
|
||||||
|
|
||||||
- **斜率只计 A 类不确定度,不计 B 类。** 斜率相对不确定度由相关系数 γ 给出:
|
|
||||||
|
|
||||||
```
|
|
||||||
σ_k / k = √[ (1/(n−2)) · (1/γ² − 1) ]
|
|
||||||
```
|
|
||||||
|
|
||||||
- 即 `u_k = σ_k`,直接作为斜率不确定度上报。
|
|
||||||
- 说明:数据点多、Σ(xi−x̄)² 较大时拟合的 B 类分量通常远小于 A 类而可忽略,本版据此**只算 A 类**
|
|
||||||
以简化计算;如需完整合成请改用超严格版。
|
|
||||||
|
|
||||||
## 速查(考试版口径)
|
|
||||||
|
|
||||||
| 项目 | 本版做法 |
|
|
||||||
|------|----------|
|
|
||||||
| A 类不确定度 | 实验标准差,不做 t 修正 |
|
|
||||||
| B 类不确定度 | Δ仪 / √3 |
|
|
||||||
| 单次测量 | 以仪器误差限估算 |
|
|
||||||
| 有效数字 | 不确定度一律 1 位 |
|
|
||||||
| 测量值修约 | 四舍六入五凑偶 |
|
|
||||||
| 不确定度修约 | 四舍六入五凑偶 |
|
|
||||||
| 连算代入 | 代入上一问修约后的结果 |
|
|
||||||
| 线性拟合 | 只算 A 类 |
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
// 共享样式与语义框:两份规范(超严格版 / 考试版)共用
|
|
||||||
|
|
||||||
#let rule-color = rgb("#0b4f6c")
|
|
||||||
#let note-color = rgb("#6a4c00")
|
|
||||||
#let warn-color = rgb("#b3261e")
|
|
||||||
|
|
||||||
// 规范条目框(蓝色):本规范选定的做法
|
|
||||||
#let rule(body) = block(
|
|
||||||
width: 100%,
|
|
||||||
inset: 10pt,
|
|
||||||
radius: 4pt,
|
|
||||||
fill: rgb("#eaf2f6"),
|
|
||||||
stroke: (left: 3pt + rule-color),
|
|
||||||
body,
|
|
||||||
)
|
|
||||||
|
|
||||||
// 批注 / 出处框(黄色)
|
|
||||||
#let sidenote(body) = block(
|
|
||||||
width: 100%,
|
|
||||||
inset: 9pt,
|
|
||||||
radius: 4pt,
|
|
||||||
fill: rgb("#fbf6e8"),
|
|
||||||
stroke: (left: 3pt + note-color),
|
|
||||||
text(size: 9.5pt, body),
|
|
||||||
)
|
|
||||||
|
|
||||||
// 提醒框(红色)
|
|
||||||
#let warn(body) = block(
|
|
||||||
width: 100%,
|
|
||||||
inset: 9pt,
|
|
||||||
radius: 4pt,
|
|
||||||
fill: rgb("#fdeeec"),
|
|
||||||
stroke: (left: 3pt + warn-color),
|
|
||||||
text(size: 9.5pt, body),
|
|
||||||
)
|
|
||||||
|
|
||||||
// 例子框(灰色)
|
|
||||||
#let example(body) = block(
|
|
||||||
width: 100%,
|
|
||||||
inset: 9pt,
|
|
||||||
radius: 4pt,
|
|
||||||
fill: rgb("#f3f3f3"),
|
|
||||||
stroke: (left: 3pt + rgb("#999")),
|
|
||||||
text(size: 9.5pt, body),
|
|
||||||
)
|
|
||||||
|
|
||||||
// 全局配置 + 封面
|
|
||||||
#let conf(title: "", subtitle: "", badge: "", badge-color: rgb("#0b4f6c"), doc) = {
|
|
||||||
set document(title: title, author: "竞赛实验教研组")
|
|
||||||
set page(
|
|
||||||
paper: "a4",
|
|
||||||
margin: (top: 2.4cm, bottom: 2.4cm, left: 2.4cm, right: 2.4cm),
|
|
||||||
numbering: "1 / 1",
|
|
||||||
number-align: center,
|
|
||||||
)
|
|
||||||
set text(font: ("Noto Serif CJK SC",), size: 10.5pt, lang: "zh", region: "cn")
|
|
||||||
set par(justify: true, leading: 0.85em, first-line-indent: (amount: 2em, all: true))
|
|
||||||
show heading: set text(font: ("Noto Sans CJK SC",))
|
|
||||||
show heading: set block(above: 1.2em, below: 0.7em)
|
|
||||||
set heading(numbering: "1.1")
|
|
||||||
show math.equation: set text(font: "New Computer Modern Math")
|
|
||||||
|
|
||||||
// 封面
|
|
||||||
align(center)[
|
|
||||||
#v(3cm)
|
|
||||||
#box(
|
|
||||||
inset: (x: 12pt, y: 6pt),
|
|
||||||
radius: 6pt,
|
|
||||||
fill: badge-color,
|
|
||||||
text(font: ("Noto Sans CJK SC",), size: 13pt, weight: "bold", fill: white, badge),
|
|
||||||
)
|
|
||||||
#v(0.9cm)
|
|
||||||
#text(font: ("Noto Sans CJK SC",), size: 24pt, weight: "bold", title)
|
|
||||||
#v(0.5cm)
|
|
||||||
#text(size: 13pt, fill: rgb("#555"), subtitle)
|
|
||||||
#v(1.4cm)
|
|
||||||
#text(size: 11pt)[竞赛实验数据处理 · 评分口径规范]
|
|
||||||
#v(0.3cm)
|
|
||||||
#text(size: 10pt, fill: rgb("#777"))[供教练出题与学生研读使用]
|
|
||||||
]
|
|
||||||
pagebreak()
|
|
||||||
doc
|
|
||||||
}
|
|
||||||
@@ -1,311 +0,0 @@
|
|||||||
// 物理竞赛中数据处理的争议点讨论
|
|
||||||
// 定位:争议点讨论为主,只中立罗列各方做法,不给本课程拍板结论。
|
|
||||||
|
|
||||||
#set document(title: "物理竞赛中数据处理的争议点讨论", author: "竞赛实验教研组")
|
|
||||||
|
|
||||||
// ---------- 字体与页面 ----------
|
|
||||||
#set page(
|
|
||||||
paper: "a4",
|
|
||||||
margin: (top: 2.4cm, bottom: 2.4cm, left: 2.4cm, right: 2.4cm),
|
|
||||||
numbering: "1 / 1",
|
|
||||||
number-align: center,
|
|
||||||
)
|
|
||||||
|
|
||||||
#set text(
|
|
||||||
font: ("Noto Serif CJK SC",),
|
|
||||||
size: 10.5pt,
|
|
||||||
lang: "zh",
|
|
||||||
region: "cn",
|
|
||||||
)
|
|
||||||
#set par(justify: true, leading: 0.85em, first-line-indent: (amount: 2em, all: true))
|
|
||||||
#show heading: set text(font: ("Noto Sans CJK SC",))
|
|
||||||
#show heading: set block(above: 1.2em, below: 0.7em)
|
|
||||||
#set heading(numbering: "1.1")
|
|
||||||
|
|
||||||
// 数学字体不指定 CJK,公式用默认 New Computer Modern Math
|
|
||||||
#show math.equation: set text(font: "New Computer Modern Math")
|
|
||||||
|
|
||||||
// ---------- 一些可复用的语义框 ----------
|
|
||||||
#let dispute-color = rgb("#b3261e")
|
|
||||||
#let calm-color = rgb("#1b5e20")
|
|
||||||
#let note-color = rgb("#6a4c00")
|
|
||||||
|
|
||||||
// 无争议约定框
|
|
||||||
#let agreed(body) = block(
|
|
||||||
width: 100%,
|
|
||||||
inset: 10pt,
|
|
||||||
radius: 4pt,
|
|
||||||
fill: rgb("#eef6ee"),
|
|
||||||
stroke: (left: 3pt + calm-color),
|
|
||||||
body,
|
|
||||||
)
|
|
||||||
|
|
||||||
// 争议点框
|
|
||||||
#let dispute(body) = block(
|
|
||||||
width: 100%,
|
|
||||||
inset: 10pt,
|
|
||||||
radius: 4pt,
|
|
||||||
fill: rgb("#fdeeec"),
|
|
||||||
stroke: (left: 3pt + dispute-color),
|
|
||||||
body,
|
|
||||||
)
|
|
||||||
|
|
||||||
// 批注 / 出处框
|
|
||||||
#let sidenote(body) = block(
|
|
||||||
width: 100%,
|
|
||||||
inset: 9pt,
|
|
||||||
radius: 4pt,
|
|
||||||
fill: rgb("#fbf6e8"),
|
|
||||||
stroke: (left: 3pt + note-color),
|
|
||||||
text(size: 9.5pt, body),
|
|
||||||
)
|
|
||||||
|
|
||||||
// 各方做法的小标签
|
|
||||||
#let school(name) = box(
|
|
||||||
inset: (x: 5pt, y: 1.5pt),
|
|
||||||
radius: 3pt,
|
|
||||||
fill: rgb("#e8eef7"),
|
|
||||||
text(size: 9pt, weight: "bold", name),
|
|
||||||
)
|
|
||||||
|
|
||||||
// ============================================================
|
|
||||||
// 封面
|
|
||||||
// ============================================================
|
|
||||||
#align(center)[
|
|
||||||
#v(3.2cm)
|
|
||||||
#text(font: ("Noto Sans CJK SC",), size: 24pt, weight: "bold")[
|
|
||||||
物理竞赛中数据处理的\
|
|
||||||
争议点讨论
|
|
||||||
]
|
|
||||||
#v(0.6cm)
|
|
||||||
#text(size: 13pt, fill: rgb("#555"))[—— 不确定度、有效数字与拟合的多种规范对照 ——]
|
|
||||||
#v(1.4cm)
|
|
||||||
#text(size: 11pt)[竞赛实验数据处理 · 教研与教学参考]
|
|
||||||
#v(0.4cm)
|
|
||||||
#text(size: 10pt, fill: rgb("#777"))[供教练备课与学生研读使用]
|
|
||||||
]
|
|
||||||
|
|
||||||
#pagebreak()
|
|
||||||
|
|
||||||
// ============================================================
|
|
||||||
// 阅读说明
|
|
||||||
// ============================================================
|
|
||||||
= 这份文档怎么读
|
|
||||||
|
|
||||||
本文档的目的,是把竞赛实验数据处理中那些"两种甚至多种做法都在流传、却没有统一答案"的地方一次性摆清楚。它*不是*一份判定对错的评分标准,而是一份*争议点对照表*:
|
|
||||||
|
|
||||||
- 凡是本领域已有共识、几乎不会引起争论的内容,归入 #text(fill: calm-color)[*"约定"*](绿色框),作为后续讨论的共同前提;
|
|
||||||
- 凡是各家(教材、命题、竞赛习惯)做法不一致的地方,单列为 #text(fill: dispute-color)[*"争议点"*](红色框),并尽量中立地列出每一方的做法与其依据;
|
|
||||||
- 个别需要交代来源或加以提醒的内容,用#text(fill: note-color)[*批注框*](黄色框)标出。
|
|
||||||
|
|
||||||
#sidenote[
|
|
||||||
*关于"中立"。* 本文档对每个争议点*只罗列、不拍板*。哪一套规则作为本课程或某次测验的评分口径,由教练在使用时另行约定并提前告知学生——这一点务必在出题或考试前说清楚,否则同一份数据会出现多个"都对"的答案。
|
|
||||||
]
|
|
||||||
|
|
||||||
// ============================================================
|
|
||||||
// 第一部分:共同约定
|
|
||||||
// ============================================================
|
|
||||||
= 共同约定(基本无争议)
|
|
||||||
|
|
||||||
下面几条在我们的处理体系里是稳定的前提,先固定下来,后面讨论争议时不再反复。
|
|
||||||
|
|
||||||
== A 类不确定度
|
|
||||||
|
|
||||||
多次测量下,A 类不确定度按样本标准差给出(贝塞尔公式给出的实验标准差,再除以 $sqrt(n)$ 得到平均值的标准不确定度):
|
|
||||||
|
|
||||||
$ u_A = s(overline(x)) = sqrt(frac(sum_(i=1)^n (x_i - overline(x))^2, n(n-1))) $
|
|
||||||
|
|
||||||
#agreed[
|
|
||||||
*约定 1:A 类不确定度不做 $t$ 因子(学生 $t$ 分布)修正。* 即直接以上式作为 $u_A$,不再乘以与测量次数有关的 $t$ 因子或包含因子。这是本体系的固定口径。
|
|
||||||
]
|
|
||||||
|
|
||||||
== B 类不确定度(多次测量)
|
|
||||||
|
|
||||||
B 类不确定度由仪器误差限 $Delta_"仪"$ 给出,按均匀分布折算:
|
|
||||||
|
|
||||||
$ u_B = frac(Delta_"仪", sqrt(3)) $
|
|
||||||
|
|
||||||
#agreed[
|
|
||||||
*约定 2:B 类不确定度 $= Delta_"仪" \/ sqrt(3)$。* 这里取 $sqrt(3)$ 对应仪器误差在 $plus.minus Delta_"仪"$ 区间内服从均匀分布的假设。
|
|
||||||
]
|
|
||||||
|
|
||||||
合成不确定度按方和根:$u = sqrt(u_A^2 + u_B^2)$。
|
|
||||||
|
|
||||||
== 测量值的修约方式
|
|
||||||
|
|
||||||
#agreed[
|
|
||||||
*约定 3:测量值(中心值)一律采用"四舍六入五凑偶"修约。* 即逢四舍、逢六入,逢五时看前一位凑成偶数。注意:这一条只针对*测量值*;不确定度本身怎么修约是有争议的(见 @sec:round-u)。
|
|
||||||
]
|
|
||||||
|
|
||||||
#agreed[
|
|
||||||
*约定 4:测量值的位数必须与不确定度对齐。* 不确定度精确到哪一位,测量值就写到哪一位,不多写也不少写。换言之,*有效数字跟着不确定度走*——这是整个有效数字问题的总原则。争议只在于"不确定度本身取几位"以及"末位怎么修约"。
|
|
||||||
]
|
|
||||||
|
|
||||||
// ============================================================
|
|
||||||
// 第二部分:单次测量
|
|
||||||
// ============================================================
|
|
||||||
= 单次测量的特别约定
|
|
||||||
|
|
||||||
多次测量时 A 类、B 类各司其职。但有时只做*单次测量*,此时不能简单地认为"没有重复测量,A 类不确定度就趋于无穷大、结果无法估计"。
|
|
||||||
|
|
||||||
#agreed[
|
|
||||||
*约定 5(单次测量):单次测量时,直接用仪器误差限来估算该次测量的不确定度*,即把 $Delta_"仪" \/ sqrt(3)$(或按所采用规范直接用 $Delta_"仪"$)作为这一次测量结果的不确定度,而*不*假设 A 类不确定度为无穷大。
|
|
||||||
]
|
|
||||||
|
|
||||||
#sidenote[
|
|
||||||
*出处批注。* 此约定的依据来自*实验指导书中"杨氏模量"实验*的相应章节——该实验对某些只测一次的量(如仪器读数类的单次量)即采用"以仪器误差限估算单次测量误差"的处理。使用本文档时,若所在教学体系的指导书版本不同,请以本组实际采用的指导书"杨氏模量"部分为准核对此条措辞。
|
|
||||||
]
|
|
||||||
|
|
||||||
// ============================================================
|
|
||||||
// 第三部分:争议点
|
|
||||||
// ============================================================
|
|
||||||
= 争议点
|
|
||||||
|
|
||||||
以下每一条都没有"唯一正确"的答案。请教练在使用前选定口径并告知学生。
|
|
||||||
|
|
||||||
== 争议点 A:不确定度取几位有效数字 <sec:u-digits>
|
|
||||||
|
|
||||||
总原则没有争议(约定 4:测量值跟着不确定度对齐)。争议在于*不确定度本身*保留几位有效数字。
|
|
||||||
|
|
||||||
#dispute[
|
|
||||||
*做法 A1:不确定度一律取 1 位有效数字。*
|
|
||||||
无论首位是几,不确定度都只写 1 位。例如 $u = 0.034 → 0.03$,$u = 0.12 → 0.1$。对应测量值也只对齐到该位。
|
|
||||||
|
|
||||||
*做法 A2:首位为 1、2、3 时取 2 位有效数字,其余取 1 位。*
|
|
||||||
当不确定度首位较小(1、2、3)时,只留 1 位会带来较大的相对截断,故允许保留 2 位。例如 $u = 0.123 → 0.12$(首位 1,取 2 位),而 $u = 0.67 → 0.7$(首位 6,取 1 位)。
|
|
||||||
]
|
|
||||||
|
|
||||||
#sidenote[
|
|
||||||
A1 与 A2 的分歧本质,是"修约不确定度本身引入的相对误差能容忍多大"。A2 的"1/2/3 取两位"正是为压低这一相对误差而设。两套都很常见,命题时必须二选一并写明。
|
|
||||||
]
|
|
||||||
|
|
||||||
== 争议点 B:有效数字的"反向多取一位"变体 <sec:reverse-digit>
|
|
||||||
|
|
||||||
这是争议点 A 的一个更细的变体,单独列出,因为它对测量值写法的影响最直接。
|
|
||||||
|
|
||||||
#dispute[
|
|
||||||
*做法 B("看测量值末位决定是否多取一位"):*
|
|
||||||
设不确定度形如 $u = 0.03$。再看测量值在对齐位上的数字:
|
|
||||||
- 若该位数字 $>= 3$(如测量值 $= 1.87$,末位 7),则*正常对齐*,写成 $(1.87 plus.minus 0.03)$;
|
|
||||||
- 若该位数字以 1、2、3 这类较小数字开头(如测量值 $= 1.81$),则*允许测量值再多取一位*,并*相应地让不确定度也反向多取一位*,写成 $(1.81 plus.minus 0.03) → (1.812 plus.minus 0.034)$ 之类。
|
|
||||||
]
|
|
||||||
|
|
||||||
#sidenote[
|
|
||||||
做法 B 的动机与 A2 一致——都是为了在数值较小时避免过度修约损失精度,只不过 B 是"由测量值末位反推是否多留一位,并让不确定度跟着多留一位"。它与 A1/A2 不完全等价,使用时要明确到底以哪条为准,避免学生在同一题里混用三套规则。
|
|
||||||
]
|
|
||||||
|
|
||||||
== 争议点 C:不确定度本身如何修约 <sec:round-u>
|
|
||||||
|
|
||||||
测量值用四舍六入五凑偶已是约定(约定 3)。但*不确定度*的修约方向有分歧。
|
|
||||||
|
|
||||||
#dispute[
|
|
||||||
*做法 C1(只进不舍 / 向上取整):* 不确定度修约时一律*只进不舍*,即末位无论被舍去的部分是多少都进位,使报告的不确定度偏保守(偏大)。
|
|
||||||
#v(0.3em)
|
|
||||||
代表口径:#school[北京大学]
|
|
||||||
|
|
||||||
*做法 C2(四舍六入五凑偶):* 不确定度与测量值一样,采用四舍六入五凑偶修约。
|
|
||||||
#v(0.3em)
|
|
||||||
代表口径:#school[中国科学技术大学] #school[第 42 届物理竞赛复赛]
|
|
||||||
]
|
|
||||||
|
|
||||||
#sidenote[
|
|
||||||
*特别提示:* 第 42 届全国中学生物理竞赛复赛对不确定度采用的是*四舍六入五凑偶*(即做法 C2)。若以贴近近年竞赛复赛阅卷习惯为目标,这一点值得在教学时强调;但日常训练里两种都可能遇到,仍以"出题时声明口径"为准。
|
|
||||||
]
|
|
||||||
|
|
||||||
== 争议点 D:多小问连算时,代入哪一个值 <sec:carry-value>
|
|
||||||
|
|
||||||
一道大题常有多个小问,前一问的结果会被后一问用到。典型如杨氏模量:第 1 问先求直径 $d$(含不确定度),第 2 问再用 $d$ 求杨氏模量 $E$。问题是:算 $E$ 时代入哪个 $d$?
|
|
||||||
|
|
||||||
#dispute[
|
|
||||||
*做法 D1(代入未修约的"真实值"):* 用第 1 问计算过程中得到的*完整精度的 $d$*(小数点后很多位、未做修约)代入后续计算,最后只在终值处统一修约。
|
|
||||||
#v(0.3em)
|
|
||||||
依据:修约只应在*最终报告*时进行;中途代入修约值会引入*舍入误差*并逐级传播。从误差理论看这是更规范的做法。
|
|
||||||
|
|
||||||
*做法 D2(代入第 1 问已修约的填空值):* 用第 1 问*答题卡上已经修约、写进横线里的那个 $d$*(如 $d = 1.81 "mm"$)代入后续计算。
|
|
||||||
#v(0.3em)
|
|
||||||
依据:答题与阅卷的可追溯性——后一问的结果应当能由前一问"写出来的答案"复现;某些阅卷口径据此判分。
|
|
||||||
]
|
|
||||||
|
|
||||||
#sidenote[
|
|
||||||
D1 是误差理论上更干净的做法(避免人为舍入误差累积),D2 则更贴合"按填写值逐问复算"的阅卷便利。两者在数值上通常只差最后一两位,但在边界情形可能影响终值修约后的末位。出题时应明确要求学生采用哪一种,并保持全卷一致。
|
|
||||||
]
|
|
||||||
|
|
||||||
== 争议点 E:线性拟合是否计入 B 类不确定度 <sec:fit>
|
|
||||||
|
|
||||||
线性拟合 $y = k x + b$ 中,斜率 $k$ 的*A 类*不确定度有成熟公式,无争议;争议在于*要不要再算 B 类并合成*。
|
|
||||||
|
|
||||||
=== A 类(无争议部分)
|
|
||||||
|
|
||||||
斜率的 A 类相对不确定度可由相关系数 $gamma$ 表示:
|
|
||||||
|
|
||||||
$ frac(sigma_k, k) = sqrt(frac(1, n-2) (frac(1, gamma^2) - 1)) $
|
|
||||||
|
|
||||||
其中 $gamma$ 为线性相关系数,$n$ 为数据点个数。这是线性拟合 A 类不确定度的常用表达,本身不引起争议。
|
|
||||||
|
|
||||||
#agreed[
|
|
||||||
*无争议:* 线性拟合斜率的 A 类不确定度套用上面的 $sigma_k \/ k$(用 $gamma$ 表示)公式。
|
|
||||||
]
|
|
||||||
|
|
||||||
=== 争议:要不要再加 B 类
|
|
||||||
|
|
||||||
#dispute[
|
|
||||||
*做法 E1(只算 A 类,不计 B 类):* 直接以拟合给出的 $sigma_k$ 作为斜率不确定度,不再考虑各测量点仪器误差带来的 B 类分量。
|
|
||||||
#v(0.3em)
|
|
||||||
现状:*相当多的题目与教材实际上只算 A 类*,而且常常*没有把"为什么忽略 B 类"说清楚*——这正是混乱的来源。
|
|
||||||
|
|
||||||
*做法 E2(A 类与 B 类合成):* 认为每个测量点都带有 B 类不确定度,应推导出斜率的 B 类分量后与 A 类方和根合成。
|
|
||||||
#v(0.3em)
|
|
||||||
现状:原则上更完整,但*少见教材给出现成公式*,需要自行推导(见下)。
|
|
||||||
]
|
|
||||||
|
|
||||||
=== 线性拟合 B 类不确定度的推导(供采用 E2 时参考)
|
|
||||||
|
|
||||||
考虑最小二乘斜率的标准表达
|
|
||||||
|
|
||||||
$ k = frac(sum_(i) (x_i - overline(x))(y_i - overline(y)), sum_(i) (x_i - overline(x))^2) = frac(sum_i (x_i - overline(x)) y_i, sum_i (x_i - overline(x))^2). $
|
|
||||||
|
|
||||||
把 $k$ 看成各 $y_i$ 的线性组合 $k = sum_i c_i y_i$,其中权重
|
|
||||||
|
|
||||||
$ c_i = frac(x_i - overline(x), sum_j (x_j - overline(x))^2). $
|
|
||||||
|
|
||||||
若每个 $y_i$ 带有相互独立的 B 类不确定度 $u_(B,y)$(由纵轴量的仪器误差限给出,$u_(B,y) = Delta_("仪",y) \/ sqrt(3)$,且各点近似相同),按不确定度传播:
|
|
||||||
|
|
||||||
$ u_(B,k) = sqrt(sum_i c_i^2 u_(B,y)^2) = u_(B,y) sqrt(sum_i c_i^2) = frac(u_(B,y), sqrt(sum_i (x_i - overline(x))^2)). $
|
|
||||||
|
|
||||||
即*斜率的 B 类不确定度等于纵轴单点 B 类不确定度,除以自变量的"离差平方和的平方根"* $sqrt(sum_i (x_i-overline(x))^2)$。
|
|
||||||
|
|
||||||
如横轴量 $x$ 的仪器误差也不可忽略,可类似地把它折算到 $y$ 方向(乘以斜率 $k$)后并入 $u_(B,y)$;此处从略。最终斜率的合成不确定度为
|
|
||||||
|
|
||||||
$ u_k = sqrt(sigma_k^2 + u_(B,k)^2). $
|
|
||||||
|
|
||||||
#sidenote[
|
|
||||||
*为什么会有 E1 这种"只算 A 类"的现状?* 当数据点较多、且离差平方和 $sum_i (x_i-overline(x))^2$ 较大时,$u_(B,k) = u_(B,y) \/ sqrt(sum_i (x_i-overline(x))^2)$ 往往远小于 A 类的 $sigma_k$,于是 B 类被"淹没"而省略。但这只是*近似成立的经验*,并非普遍正确——所以是否计入 B 类、以及是否声明忽略理由,仍是一个需要出题时明确的争议点。
|
|
||||||
]
|
|
||||||
|
|
||||||
// ============================================================
|
|
||||||
// 速查表
|
|
||||||
// ============================================================
|
|
||||||
#pagebreak()
|
|
||||||
= 争议点速查表
|
|
||||||
|
|
||||||
#table(
|
|
||||||
columns: (auto, 1fr, 1fr),
|
|
||||||
inset: 8pt,
|
|
||||||
align: (left + horizon, left, left),
|
|
||||||
stroke: 0.5pt + rgb("#cccccc"),
|
|
||||||
fill: (_, row) => if row == 0 { rgb("#e8eef7") } else { white },
|
|
||||||
table.header(
|
|
||||||
[*编号*], [*争议内容*], [*主要分歧 / 代表口径*],
|
|
||||||
),
|
|
||||||
[A], [不确定度取几位有效数字], [A1 一律 1 位 / A2 首位为 1·2·3 时取 2 位],
|
|
||||||
[B], [有效数字"反向多取一位"变体], [测量值末位 ≥3 正常对齐;以 1·2·3 起更小时,测量值与不确定度同时多取一位],
|
|
||||||
[C], [不确定度本身如何修约], [C1 只进不舍(北大) / C2 四舍六入五凑偶(中科大、第 42 届复赛)],
|
|
||||||
[D], [多小问连算代入哪个值], [D1 代入未修约真实值(误差理论更规范) / D2 代入第一问已修约的填空值(便于复算阅卷)],
|
|
||||||
[E], [线性拟合是否计入 B 类], [E1 只算 A 类(常见但常不说明理由) / E2 A 类与 B 类合成(需自行推导 $u_(B,k)=u_(B,y)\/sqrt(sum (x_i-overline(x))^2)$)],
|
|
||||||
)
|
|
||||||
|
|
||||||
#v(0.6em)
|
|
||||||
|
|
||||||
#sidenote[
|
|
||||||
*使用建议:* 每次出题或测验前,针对表中 A–E 各项各选定一种口径,连同"A 类不做 $t$ 修正""$u_B=Delta_"仪"\/sqrt(3)$""单次测量以仪器误差限估算"等约定一并写在卷首说明里。口径一旦公布,全卷保持一致,避免同一份数据出现多个"都对"的答案。
|
|
||||||
]
|
|
||||||
@@ -1,115 +0,0 @@
|
|||||||
#import "conf.typ": conf, rule, sidenote, warn, example
|
|
||||||
|
|
||||||
#show: conf.with(
|
|
||||||
title: "数据处理规范\n考试版",
|
|
||||||
subtitle: "—— 贴近竞赛阅卷习惯、计算量适中的实用口径 ——",
|
|
||||||
badge: "考试版",
|
|
||||||
badge-color: rgb("#0b4f6c"),
|
|
||||||
)
|
|
||||||
|
|
||||||
= 规范定位
|
|
||||||
|
|
||||||
本规范用于*考试与日常训练*场景,在保证规范性的前提下*简化计算*(不确定度一律 1 位、拟合只算 A 类、逐问代入修约值),贴近竞赛复赛的阅卷习惯。学生应严格按本规范作答;评分以本规范为唯一口径。
|
|
||||||
|
|
||||||
#warn[
|
|
||||||
本规范与《超严格版》在四处刻意不同(有效数字取位、不确定度修约方向、连算代入值、拟合是否计 B 类)。同一份数据在两版下可能给出末位不同的答案,*出题与作答务必只认其中一版*,不可混用。
|
|
||||||
]
|
|
||||||
|
|
||||||
= 共同约定(两版一致)
|
|
||||||
|
|
||||||
== A 类不确定度
|
|
||||||
|
|
||||||
多次测量,A 类不确定度取平均值的实验标准差:
|
|
||||||
|
|
||||||
$ u_A = sqrt(frac(sum_(i=1)^n (x_i - overline(x))^2, n(n-1))) $
|
|
||||||
|
|
||||||
#rule[*A 类不确定度不做 $t$ 因子修正*,直接以上式为 $u_A$。]
|
|
||||||
|
|
||||||
== B 类不确定度
|
|
||||||
|
|
||||||
#rule[*B 类不确定度 $u_B = Delta_"仪" \/ sqrt(3)$*(仪器误差限按均匀分布折算)。]
|
|
||||||
|
|
||||||
合成:$u = sqrt(u_A^2 + u_B^2)$。
|
|
||||||
|
|
||||||
== 单次测量
|
|
||||||
|
|
||||||
#rule[
|
|
||||||
*单次测量*时,不假设 A 类不确定度为无穷大,*直接以仪器误差限估算该次测量的不确定度*(取 $u = Delta_"仪" \/ sqrt(3)$)。
|
|
||||||
]
|
|
||||||
|
|
||||||
#sidenote[
|
|
||||||
*出处批注:* 此条依据实验指导书"杨氏模量"实验对单次测量量的处理。使用时以本组实际采用的指导书"杨氏模量"部分为准核对措辞。
|
|
||||||
]
|
|
||||||
|
|
||||||
= 有效数字与修约(本版选定口径)
|
|
||||||
|
|
||||||
== 有效数字总原则
|
|
||||||
|
|
||||||
#rule[*测量值(中心值)的位数必须与不确定度对齐*:不确定度精确到哪一位,测量值就写到哪一位。]
|
|
||||||
|
|
||||||
== 不确定度取几位有效数字 —— 统一 1 位
|
|
||||||
|
|
||||||
#rule[
|
|
||||||
*不确定度一律保留 1 位有效数字*(无论首位是几)。测量值随之对齐到该位。
|
|
||||||
]
|
|
||||||
|
|
||||||
#example[
|
|
||||||
$u = 0.123 → 0.1$,测量值 $1.8127 → 1.8$,记为 $(1.8 plus.minus 0.1)$; $u = 0.067 → 0.07$,对齐到该位。
|
|
||||||
]
|
|
||||||
|
|
||||||
== 测量值的修约 —— 四舍六入五凑偶
|
|
||||||
|
|
||||||
#rule[*测量值采用"四舍六入五凑偶"修约*(逢四舍、逢六入、逢五凑偶)。]
|
|
||||||
|
|
||||||
== 不确定度的修约 —— 四舍六入五凑偶
|
|
||||||
|
|
||||||
#rule[
|
|
||||||
*不确定度也采用"四舍六入五凑偶"修约*,与测量值同一规则。
|
|
||||||
]
|
|
||||||
|
|
||||||
#sidenote[
|
|
||||||
*提示:* 第 42 届全国中学生物理竞赛复赛对不确定度即采用四舍六入五凑偶。本版选此口径以贴近近年复赛阅卷习惯(代表:中科大、第 42 届复赛)。
|
|
||||||
]
|
|
||||||
|
|
||||||
= 多小问连算 —— 代入上一问修约后的结果
|
|
||||||
|
|
||||||
#rule[
|
|
||||||
大题分多小问、后一问要用到前一问结果时,*代入前一问已修约、写进答题处的那个值*进行计算。即*接受每一问修约带来的舍入误差*,换取逐问可复算、便于阅卷。
|
|
||||||
]
|
|
||||||
|
|
||||||
#example[
|
|
||||||
杨氏模量:第 1 问报告 $d = 1.8 "mm"$。第 2 问算 $E$ 时*直接代入 $d = 1.8 "mm"$*(而非未修约的 $1.8127...$)。
|
|
||||||
]
|
|
||||||
|
|
||||||
= 线性拟合 —— 只算 A 类
|
|
||||||
|
|
||||||
设 $y = k x + b$。
|
|
||||||
|
|
||||||
#rule[
|
|
||||||
*线性拟合斜率只计 A 类不确定度,不计 B 类。* 斜率相对不确定度由相关系数 $gamma$ 给出:
|
|
||||||
$ frac(sigma_k, k) = sqrt(frac(1, n-2) (frac(1, gamma^2) - 1)). $
|
|
||||||
即 $u_k = sigma_k$,直接作为斜率不确定度上报。
|
|
||||||
]
|
|
||||||
|
|
||||||
#sidenote[
|
|
||||||
当数据点较多、自变量离差平方和 $sum_i (x_i-overline(x))^2$ 较大时,拟合的 B 类分量通常远小于 A 类而可忽略。本版据此*只算 A 类*以简化计算;如需完整合成请改用《超严格版》。
|
|
||||||
]
|
|
||||||
|
|
||||||
= 速查(考试版口径)
|
|
||||||
|
|
||||||
#table(
|
|
||||||
columns: (auto, 1fr),
|
|
||||||
inset: 8pt,
|
|
||||||
align: (left + horizon, left),
|
|
||||||
stroke: 0.5pt + rgb("#cccccc"),
|
|
||||||
fill: (_, row) => if row == 0 { rgb("#e3edf2") } else { white },
|
|
||||||
table.header([*项目*], [*本版做法*]),
|
|
||||||
[A 类不确定度], [实验标准差,不做 $t$ 修正],
|
|
||||||
[B 类不确定度], [$Delta_"仪" \/ sqrt(3)$],
|
|
||||||
[单次测量], [以仪器误差限估算],
|
|
||||||
[有效数字], [不确定度一律 1 位],
|
|
||||||
[测量值修约], [四舍六入五凑偶],
|
|
||||||
[不确定度修约], [四舍六入五凑偶],
|
|
||||||
[连算代入], [代入上一问修约后的结果],
|
|
||||||
[线性拟合], [只算 A 类],
|
|
||||||
)
|
|
||||||
@@ -1,130 +0,0 @@
|
|||||||
#import "conf.typ": conf, rule, sidenote, warn, example
|
|
||||||
|
|
||||||
#show: conf.with(
|
|
||||||
title: "数据处理规范\n超严格版",
|
|
||||||
subtitle: "—— 每一步都按误差理论最规范的方法处理 ——",
|
|
||||||
badge: "超严格版",
|
|
||||||
badge-color: rgb("#7a1f1f"),
|
|
||||||
)
|
|
||||||
|
|
||||||
= 规范定位
|
|
||||||
|
|
||||||
本规范用于*严格训练*场景,目标是让每一步都贴近误差理论上最规范的做法,*接受较繁的计算量以换取处理的严谨性*。学生应严格按本规范作答;评分以本规范为唯一口径。
|
|
||||||
|
|
||||||
#warn[
|
|
||||||
本规范与《考试版》在四处刻意不同(有效数字取位、不确定度修约方向、连算代入值、拟合是否计 B 类)。同一份数据在两版下可能给出末位不同的答案,*出题与作答务必只认其中一版*,不可混用。
|
|
||||||
]
|
|
||||||
|
|
||||||
= 共同约定(两版一致)
|
|
||||||
|
|
||||||
== A 类不确定度
|
|
||||||
|
|
||||||
多次测量,A 类不确定度取平均值的实验标准差:
|
|
||||||
|
|
||||||
$ u_A = sqrt(frac(sum_(i=1)^n (x_i - overline(x))^2, n(n-1))) $
|
|
||||||
|
|
||||||
#rule[*A 类不确定度不做 $t$ 因子修正*,直接以上式为 $u_A$。]
|
|
||||||
|
|
||||||
== B 类不确定度
|
|
||||||
|
|
||||||
#rule[*B 类不确定度 $u_B = Delta_"仪" \/ sqrt(3)$*(仪器误差限按均匀分布折算)。]
|
|
||||||
|
|
||||||
合成:$u = sqrt(u_A^2 + u_B^2)$。
|
|
||||||
|
|
||||||
== 单次测量
|
|
||||||
|
|
||||||
#rule[
|
|
||||||
*单次测量*时,不假设 A 类不确定度为无穷大,*直接以仪器误差限估算该次测量的不确定度*(取 $u = Delta_"仪" \/ sqrt(3)$)。
|
|
||||||
]
|
|
||||||
|
|
||||||
#sidenote[
|
|
||||||
*出处批注:* 此条依据实验指导书"杨氏模量"实验对单次测量量的处理。使用时以本组实际采用的指导书"杨氏模量"部分为准核对措辞。
|
|
||||||
]
|
|
||||||
|
|
||||||
= 有效数字与修约(本版选定口径)
|
|
||||||
|
|
||||||
== 有效数字总原则
|
|
||||||
|
|
||||||
#rule[*测量值(中心值)的位数必须与不确定度对齐*:不确定度精确到哪一位,测量值就写到哪一位。]
|
|
||||||
|
|
||||||
== 不确定度取几位有效数字 —— 采用 A2
|
|
||||||
|
|
||||||
#rule[
|
|
||||||
*不确定度首位为 1、2、3 时保留 2 位有效数字;首位为 4\~9 时保留 1 位。*
|
|
||||||
]
|
|
||||||
|
|
||||||
#example[
|
|
||||||
$u = 0.123 → 0.12$(首位 1,取 2 位); $u = 0.067 → 0.07$(首位 6,取 1 位); $u = 0.28 → 0.28$(首位 2,取 2 位)。
|
|
||||||
]
|
|
||||||
|
|
||||||
== 测量值的修约 —— 四舍六入五凑偶
|
|
||||||
|
|
||||||
#rule[*测量值一律采用"四舍六入五凑偶"修约*(逢四舍、逢六入、逢五凑偶)。]
|
|
||||||
|
|
||||||
== 不确定度的修约 —— 只进不舍
|
|
||||||
|
|
||||||
#rule[
|
|
||||||
*不确定度修约时一律"只进不舍"*:在保留位之后只要有非零数字(乃至向上保守),末位即进位,使报告的不确定度偏保守(偏大)。
|
|
||||||
]
|
|
||||||
|
|
||||||
#example[
|
|
||||||
$u = 0.121 → 0.13$(保留 2 位,末位进 1); $u = 0.341 → 0.4$(保留 1 位,进位)。
|
|
||||||
]
|
|
||||||
|
|
||||||
#sidenote[
|
|
||||||
"只进不舍"是较保守的口径(代表:北京大学)。它确保报告的不确定度不会因修约而偏小。
|
|
||||||
]
|
|
||||||
|
|
||||||
= 多小问连算 —— 代入未修约真实值
|
|
||||||
|
|
||||||
#rule[
|
|
||||||
大题分多小问、后一问要用到前一问结果时,*一律代入前一问计算所得的完整精度数值(未修约的"真实值")*,仅在每问*最终报告*时按上面的规则修约。中途不得代入已修约的填空值。
|
|
||||||
]
|
|
||||||
|
|
||||||
#example[
|
|
||||||
杨氏模量:第 1 问算得 $d = 1.8127... "mm"$(报告时修约为 $1.81 "mm"$)。第 2 问算 $E$ 时*代入 $d = 1.8127...$*,而非 $1.81$,避免逐级累积舍入误差。
|
|
||||||
]
|
|
||||||
|
|
||||||
= 线性拟合 —— A 类与 B 类合成
|
|
||||||
|
|
||||||
设 $y = k x + b$。
|
|
||||||
|
|
||||||
== A 类
|
|
||||||
|
|
||||||
斜率 A 类相对不确定度由相关系数 $gamma$ 表示:
|
|
||||||
|
|
||||||
$ frac(sigma_k, k) = sqrt(frac(1, n-2) (frac(1, gamma^2) - 1)) $
|
|
||||||
|
|
||||||
== B 类(本版必须计入)
|
|
||||||
|
|
||||||
把斜率写成各 $y_i$ 的线性组合 $k = sum_i c_i y_i$,权重 $c_i = (x_i - overline(x)) \/ sum_j (x_j - overline(x))^2$。设各点纵轴 B 类不确定度近似相同、为 $u_(B,y) = Delta_("仪",y)\/sqrt(3)$,按传播:
|
|
||||||
|
|
||||||
$ u_(B,k) = u_(B,y) sqrt(sum_i c_i^2) = frac(u_(B,y), sqrt(sum_i (x_i - overline(x))^2)). $
|
|
||||||
|
|
||||||
#rule[
|
|
||||||
*斜率不确定度取 A 类与 B 类的方和根*:
|
|
||||||
$ u_k = sqrt(sigma_k^2 + u_(B,k)^2), wide u_(B,k) = frac(u_(B,y), sqrt(sum_i (x_i - overline(x))^2)). $
|
|
||||||
]
|
|
||||||
|
|
||||||
#sidenote[
|
|
||||||
若横轴量 $x$ 的仪器误差不可忽略,可乘以斜率 $k$ 折算到 $y$ 方向后并入 $u_(B,y)$。当数据点多、$sum_i (x_i-overline(x))^2$ 大时 $u_(B,k)$ 往往很小,但本版*不因此省略*,一律计入。
|
|
||||||
]
|
|
||||||
|
|
||||||
= 速查(超严格版口径)
|
|
||||||
|
|
||||||
#table(
|
|
||||||
columns: (auto, 1fr),
|
|
||||||
inset: 8pt,
|
|
||||||
align: (left + horizon, left),
|
|
||||||
stroke: 0.5pt + rgb("#cccccc"),
|
|
||||||
fill: (_, row) => if row == 0 { rgb("#f0e6e6") } else { white },
|
|
||||||
table.header([*项目*], [*本版做法*]),
|
|
||||||
[A 类不确定度], [实验标准差,不做 $t$ 修正],
|
|
||||||
[B 类不确定度], [$Delta_"仪" \/ sqrt(3)$],
|
|
||||||
[单次测量], [以仪器误差限估算],
|
|
||||||
[有效数字], [首位 1/2/3 取 2 位,其余 1 位(A2)],
|
|
||||||
[测量值修约], [四舍六入五凑偶],
|
|
||||||
[不确定度修约], [只进不舍],
|
|
||||||
[连算代入], [代入未修约真实值],
|
|
||||||
[线性拟合], [A 类 + B 类合成],
|
|
||||||
)
|
|
||||||
@@ -1,85 +0,0 @@
|
|||||||
# 数据处理规范 · 超严格版
|
|
||||||
|
|
||||||
> 用于**严格训练**。目标:每一步贴近误差理论上最规范的做法,**接受较繁的计算量以换取严谨性**。
|
|
||||||
> 评分以本规范为唯一口径。与考试版在四处刻意不同(有效数字取位、不确定度修约方向、连算代入值、
|
|
||||||
> 拟合是否计 B 类)——同一份数据两版可能给出末位不同的答案,**全程只认本版,不可混用**。
|
|
||||||
|
|
||||||
## 共同约定(两版一致)
|
|
||||||
|
|
||||||
### A 类不确定度
|
|
||||||
多次测量,取平均值的实验标准差:
|
|
||||||
|
|
||||||
```
|
|
||||||
u_A = √[ Σ(xi − x̄)² / (n(n−1)) ]
|
|
||||||
```
|
|
||||||
|
|
||||||
- **不做 t 因子修正**,直接以上式为 u_A。
|
|
||||||
|
|
||||||
### B 类不确定度
|
|
||||||
- `u_B = Δ仪 / √3`(仪器误差限按均匀分布折算)。
|
|
||||||
- 合成:`u = √(u_A² + u_B²)`。
|
|
||||||
|
|
||||||
### 单次测量
|
|
||||||
- 不假设 A 类不确定度为无穷大,**直接以仪器误差限估算**该次测量不确定度,取 `u = Δ仪 / √3`。
|
|
||||||
- 出处批注:依据实验指导书"杨氏模量"实验对单次测量量的处理;措辞以本组实际指导书为准。
|
|
||||||
|
|
||||||
## 有效数字与修约(本版选定口径)
|
|
||||||
|
|
||||||
### 有效数字总原则
|
|
||||||
- 测量值(中心值)的位数**必须与不确定度对齐**:不确定度精确到哪一位,测量值就写到哪一位。
|
|
||||||
|
|
||||||
### 不确定度取几位有效数字 —— 采用 A2
|
|
||||||
- **首位为 1、2、3 时保留 2 位有效数字;首位为 4~9 时保留 1 位。**
|
|
||||||
- 示例:`u=0.123 → 0.12`(首位 1,取 2 位);`u=0.067 → 0.07`(首位 6,取 1 位);`u=0.28 → 0.28`(首位 2,取 2 位)。
|
|
||||||
|
|
||||||
### 测量值的修约 —— 四舍六入五凑偶
|
|
||||||
- 测量值一律采用"四舍六入五凑偶"(逢四舍、逢六入、逢五凑偶)。
|
|
||||||
|
|
||||||
### 不确定度的修约 —— 只进不舍
|
|
||||||
- 不确定度修约时一律**只进不舍**:保留位之后只要有非零数字即向上进位,使报告值偏保守(偏大)。
|
|
||||||
- 示例:`u=0.121 → 0.13`(保留 2 位,进位);`u=0.341 → 0.4`(保留 1 位,进位)。
|
|
||||||
- 说明:"只进不舍"是较保守口径(代表:北京大学),确保报告的不确定度不因修约而偏小。
|
|
||||||
|
|
||||||
## 多小问连算 —— 代入未修约真实值
|
|
||||||
- 后一问用到前一问结果时,**一律代入前一问计算所得的完整精度数值(未修约的真实值)**,
|
|
||||||
仅在每问**最终报告**时修约。中途不得代入已修约的填空值。
|
|
||||||
- 示例:杨氏模量第 1 问算得 `d = 1.8127… mm`(报告修约为 `1.81 mm`);第 2 问算 E 时
|
|
||||||
**代入 1.8127…**,而非 1.81,避免逐级累积舍入误差。
|
|
||||||
|
|
||||||
## 线性拟合 —— A 类与 B 类合成
|
|
||||||
设 `y = k x + b`。
|
|
||||||
|
|
||||||
### A 类
|
|
||||||
斜率 A 类相对不确定度由相关系数 γ 表示:
|
|
||||||
|
|
||||||
```
|
|
||||||
σ_k / k = √[ (1/(n−2)) · (1/γ² − 1) ]
|
|
||||||
```
|
|
||||||
|
|
||||||
### B 类(本版必须计入)
|
|
||||||
把斜率写成各 yi 的线性组合 `k = Σ ci·yi`,权重 `ci = (xi − x̄) / Σ(xj − x̄)²`。
|
|
||||||
设各点纵轴 B 类不确定度近似相同 `u_By = Δ仪,y / √3`,按传播:
|
|
||||||
|
|
||||||
```
|
|
||||||
u_Bk = u_By · √(Σ ci²) = u_By / √( Σ(xi − x̄)² )
|
|
||||||
```
|
|
||||||
|
|
||||||
### 斜率不确定度(本版上报值)
|
|
||||||
```
|
|
||||||
u_k = √( σ_k² + u_Bk² ), u_Bk = u_By / √( Σ(xi − x̄)² )
|
|
||||||
```
|
|
||||||
- 若横轴量 x 的仪器误差不可忽略,可乘以斜率 k 折算到 y 方向后并入 u_By。
|
|
||||||
- 即使数据点多、Σ(xi−x̄)² 大致使 u_Bk 很小,本版**也不省略**,一律计入。
|
|
||||||
|
|
||||||
## 速查(超严格版口径)
|
|
||||||
|
|
||||||
| 项目 | 本版做法 |
|
|
||||||
|------|----------|
|
|
||||||
| A 类不确定度 | 实验标准差,不做 t 修正 |
|
|
||||||
| B 类不确定度 | Δ仪 / √3 |
|
|
||||||
| 单次测量 | 以仪器误差限估算 |
|
|
||||||
| 有效数字 | 首位 1/2/3 取 2 位,其余 1 位(A2) |
|
|
||||||
| 测量值修约 | 四舍六入五凑偶 |
|
|
||||||
| 不确定度修约 | 只进不舍 |
|
|
||||||
| 连算代入 | 代入未修约真实值 |
|
|
||||||
| 线性拟合 | A 类 + B 类合成 |
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
---
|
|
||||||
name: lesson-project
|
|
||||||
description: 把项目根目录 outline.md 落成符合 cph 0.0.2 的结构化讲义工程,并用 cph check/build 验证和生成教师版、学生版 PDF。
|
|
||||||
---
|
|
||||||
|
|
||||||
# 把 outline.md 落成 cph 0.0.2 工程
|
|
||||||
|
|
||||||
只在当前项目 workspace 内工作。先完整阅读 `outline.md`,再依次阅读本 skill 的 `structure.md`、`templates.md`、`workflow.md` 和 `writing-style.md`。
|
|
||||||
|
|
||||||
## 不可违反的边界
|
|
||||||
|
|
||||||
- 当前唯一工程清单是 `manifest.toml`,版本契约是 `.cph-version`;不要创建旧格式 `project.toml`、`info.toml` 或根 `main.typ`。
|
|
||||||
- element 只允许 `segment`、`lemma`、`example`、`sop`,字段以 `structure.md` 为准。
|
|
||||||
- 不生成 commentary、hint、answer、instruction、handout、summary 等 cph 0.0.2 不支持的字段。
|
|
||||||
- 忠实于 outline;缺题面、公式或关键结论时询问用户,不擅自补写。
|
|
||||||
- 使用 `cph check .` 验证结构,使用 `cph build . --target student` 和 `cph build . --target teacher` 构建;不要直接调用 `typst compile`。
|
|
||||||
- 任一命令失败都保留完整错误并修复根因,不删除内容来糊绿。
|
|
||||||
|
|
||||||
## 完成标准
|
|
||||||
|
|
||||||
1. `cph check .` 为 0 errors。
|
|
||||||
2. 两个 `cph build` 命令退出码为 0。
|
|
||||||
3. 产物位于 `build/student.pdf` 和 `build/teacher.pdf`。
|
|
||||||
4. 简报列出落地的 element、仍需用户补充的内容和两份 PDF 路径。
|
|
||||||
@@ -1,252 +0,0 @@
|
|||||||
# 写得好的样例片段
|
|
||||||
|
|
||||||
本文件从两份现行讲义里抽取代表性片段,按 element 类型分类。看这些片段是为了对齐"写出来
|
|
||||||
就该是这样"的标准。文风、连贯性、推导风、归宿判断都靠这些样例校准——[writing-style.md]
|
|
||||||
讲方法论,本文件给出对应方法论的具体落地。
|
|
||||||
|
|
||||||
样例出处:
|
|
||||||
- EM-131 保角变换法(学生版讲义)
|
|
||||||
- 简正模(第 19 章)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## segment:物理引入的范例
|
|
||||||
|
|
||||||
样例摘自简正模 §19.1.1 动能的表示。
|
|
||||||
|
|
||||||
> 要考察一个多自由度体系在平衡位置附近的小振动,一种普适的方法是写出体系的动能和势能
|
|
||||||
> 然后代入拉格朗日方程。这里我们假设体系的广义坐标的为 $q_1, q_2, \dots, q_n$,那么动能
|
|
||||||
> 一定可以写为
|
|
||||||
>
|
|
||||||
> $$T = \frac{1}{2}\sum_{i,j} f_{i,j}(q_1, q_2, \dots, q_n)\,\dot q_i \dot q_j .$$
|
|
||||||
>
|
|
||||||
> 其中 $f_{i,j}$ 是一个关于广义坐标的函数。例如当我们选择极坐标系描述二维空间中的运动
|
|
||||||
> 的时候,有
|
|
||||||
>
|
|
||||||
> $$T = \tfrac{1}{2} m\dot r^2 + \tfrac{1}{2} m r^2 \dot\theta^2 ,$$
|
|
||||||
>
|
|
||||||
> 可见 $\dot\theta^2$ 对应的 $f$ 为 $mr^2$。考虑到这里我们考虑的振动是在平衡位置附近的
|
|
||||||
> 小振动,广义坐标的导数 $\dot q_i$ 是小量,而在振动过程中 $f$ 的改变是一阶的,因此如
|
|
||||||
> 果仅仅保留到二阶小量,我们可以将上式改写为 ……(接下来矩阵化、对角化)
|
|
||||||
|
|
||||||
**为什么写得好**:第一句直接给出物理设置(多自由度小振动 + 普适方法)。引入一般动能形式
|
|
||||||
之后立刻举一个最简单的极坐标例子让公式落地,然后顺着"小振动→二阶小量"的物理逻辑推进到
|
|
||||||
矩阵化。整段没有"接下来要做的是""本节的核心是""为后面 X 节铺垫"这类编排话——下一步是
|
|
||||||
什么由物理决定,不需要预告。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## segment:概念串联的范例
|
|
||||||
|
|
||||||
样例摘自保角变换 §1.2 复势的定义。
|
|
||||||
|
|
||||||
> 考虑一个二维静电场问题,电势 $\varphi(x,y)$ 满足拉普拉斯方程。由上一节的讨论,必然
|
|
||||||
> 存在一个共轭调和函数 $\psi(x,y)$,使得 $\varphi$ 和 $\psi$ 共同构成一个解析函数
|
|
||||||
>
|
|
||||||
> $$W(z) = \varphi(x,y) + \mathrm{i}\psi(x,y),$$
|
|
||||||
>
|
|
||||||
> 称为复势。其中 $\varphi$ 为电势,$\psi$ 为流函数,电通量则正比于两条流线的流函数差值。
|
|
||||||
> 等势线 $\varphi = \text{const}$ 与电力线 $\psi = \text{const}$ 处处正交,这与式 (3)
|
|
||||||
> 的几何意义完全吻合。
|
|
||||||
>
|
|
||||||
> 从复势中提取电场只需要做一次求导。对上式求导得到
|
|
||||||
>
|
|
||||||
> $$\frac{\mathrm{d}W}{\mathrm{d}z} = \frac{\partial\varphi}{\partial x} + \mathrm{i}\frac{\partial\psi}{\partial x} = -E_x + \mathrm{i}E_y,$$
|
|
||||||
>
|
|
||||||
> 其中最后一步利用了 $E_x = -\partial\varphi/\partial x$ 以及式 (3) 给出的 $\partial\psi/\partial x = -\partial\varphi/\partial y = E_y$。
|
|
||||||
|
|
||||||
**为什么写得好**:用"由上一节的讨论""这与式 (3) 的几何意义完全吻合""利用了式 (3)"三次
|
|
||||||
回引前文,每一次都是物理推导中真正用到了前文结论。回引方式简洁、点到为止,不展开复述。
|
|
||||||
对比之下,错误的回引是"还记得我们在第 X 节讲的那个图吗,这里就是它的回扣"。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## lemma stmt:简洁陈述的范例
|
|
||||||
|
|
||||||
样例摘自保角变换 §1.1 末,柯西-黎曼条件的引出。
|
|
||||||
|
|
||||||
> 设复变量 $z = x + \mathrm{i}y$,考虑复变函数 $f(z) = u(x,y) + \mathrm{i}v(x,y)$,
|
|
||||||
> 其中 $u$ 和 $v$ 是两个实值函数。我们要求 $f$ 的导数在复平面上处处存在且与求导方向
|
|
||||||
> 无关。沿实轴方向求导给出 ……,而沿虚轴方向求导给出 ……,两个表达式的实部和虚部分别
|
|
||||||
> 相等,立即得到柯西-黎曼条件
|
|
||||||
>
|
|
||||||
> $$\frac{\partial u}{\partial x} = \frac{\partial v}{\partial y}, \qquad \frac{\partial u}{\partial y} = -\frac{\partial v}{\partial x}.$$
|
|
||||||
>
|
|
||||||
> 满足此式的函数称为解析函数。从此式可以读出一个重要的几何性质:$u$ 的梯度与 $v$ 的
|
|
||||||
> 梯度正交。这意味着 $u = \text{const}$ 与 $v = \text{const}$ 两族曲线处处正交。
|
|
||||||
|
|
||||||
**为什么写得好**:定理陈述(柯西-黎曼条件)由前面的物理设置自然推出,给出公式之后用一
|
|
||||||
两句话陈述它的几何含义。整段没有任何"这是核心定理""务必掌握""非常重要"的元评论,几何
|
|
||||||
含义陈述本身就是对定理意义的最好说明。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## lemma proof:纯推导的范例
|
|
||||||
|
|
||||||
样例摘自简正模 §19.1.3,证明 $\frac{\partial}{\partial q_i}\bigl(\tfrac{1}{2}\boldsymbol{q}^\mathrm{T}\boldsymbol{M}\boldsymbol{q}\bigr)\boldsymbol{e}_i = \boldsymbol{M}\boldsymbol{q}$。
|
|
||||||
|
|
||||||
> 将被求导的式子展开,为
|
|
||||||
>
|
|
||||||
> $$\tfrac{1}{2}\boldsymbol{q}^\mathrm{T}\boldsymbol{M}\boldsymbol{q} = \sum_{i,j}\tfrac{1}{2} m_{ij} q_i q_j = \sum_i \sum_j \tfrac{1}{2} m_{ij} q_i q_j .$$
|
|
||||||
>
|
|
||||||
> 考察其中与 $q_i$ 有关的部分,有可能是第一个求和取 $i$,可能是第二个求和取 $i$,也可
|
|
||||||
> 能是两个求和都取 $i$,把这三类相加为
|
|
||||||
>
|
|
||||||
> $$\sum_{j\neq i}\tfrac{1}{2} m_{ij} q_i q_j + \sum_{j\neq i}\tfrac{1}{2} m_{ji} q_j q_i + \tfrac{1}{2} m_{ii} q_i^2 .$$
|
|
||||||
>
|
|
||||||
> 代回原式得到
|
|
||||||
>
|
|
||||||
> $$\text{left side} = \frac{\partial}{\partial q_i}\Bigl[\sum_{j\neq i}\tfrac{1}{2} m_{ij} q_i q_j + \sum_{j\neq i}\tfrac{1}{2} m_{ji} q_j q_i + \tfrac{1}{2} m_{ii} q_i^2\Bigr]\boldsymbol{e}_i$$
|
|
||||||
> $$= \sum_{j\neq i}\bigl[\tfrac{1}{2} m_{ij} q_j + \tfrac{1}{2} m_{ji} q_j\bigr]\boldsymbol{e}_i + m_{ii} q_i \boldsymbol{e}_i$$
|
|
||||||
> $$= \sum_j m_{ij} q_j \boldsymbol{e}_i = \boldsymbol{M}\boldsymbol{q} ,$$
|
|
||||||
>
|
|
||||||
> 倒数第二个等号利用了 $\boldsymbol{M}$ 作为对称矩阵的性质。
|
|
||||||
|
|
||||||
**为什么写得好**:整段就是一连串公式加最短衔接词——"展开为""考察……部分""相加为""代回
|
|
||||||
得到""利用了……的性质"。没有"我们要做的第一步是……""现在我们考虑……""注意到这一步非常
|
|
||||||
关键……"这类讲解语言。推导自身的逻辑就是叙事,不需要再多一层元叙述。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## lemma proof:含分步推导的范例
|
|
||||||
|
|
||||||
样例摘自简正模 §19.1.1 末段(动能对角化的几步推进)。
|
|
||||||
|
|
||||||
> 显然我们可以适当分配交叉项使得 $\boldsymbol{M}$ 是一个对称矩阵,这意味着它可对角化。
|
|
||||||
> 令 $\boldsymbol{M}$ 的对角化形式为
|
|
||||||
>
|
|
||||||
> $$\boldsymbol{M} = \boldsymbol{P}\boldsymbol{\Lambda}\boldsymbol{P}^{-1} .$$
|
|
||||||
>
|
|
||||||
> 此时动能可以改写为
|
|
||||||
>
|
|
||||||
> $$T = \dot{\boldsymbol{q}}^\mathrm{T} \boldsymbol{P}\boldsymbol{\Lambda}\boldsymbol{P}^{-1} \dot{\boldsymbol{q}} .$$
|
|
||||||
>
|
|
||||||
> 定义新的广义坐标
|
|
||||||
>
|
|
||||||
> $$\boldsymbol{q}^* = \boldsymbol{P}^{-1} \boldsymbol{q} ,$$
|
|
||||||
>
|
|
||||||
> 又由于 $\boldsymbol{P}^{-1}$ 的每一行都是 $\boldsymbol{M}$ 的本征矢量 $\boldsymbol{x}_i$,
|
|
||||||
> 也可以得到新广义坐标的各个分量为
|
|
||||||
>
|
|
||||||
> $$q_i^* = \boldsymbol{x}_i \cdot \boldsymbol{q}_i .$$
|
|
||||||
>
|
|
||||||
> 若令 $\boldsymbol{M}$ 的本征值为 $m_i$,则可以将动能写为不含广义坐标交叉项的形式,即
|
|
||||||
>
|
|
||||||
> $$T = \sum_i \tfrac{1}{2} m_i (\dot q_i^*)^2 .$$
|
|
||||||
|
|
||||||
**为什么写得好**:每一步都是一行"陈述 + 公式",陈述部分极短("令 $\boldsymbol{M}$ 的
|
|
||||||
对角化形式为""定义新的广义坐标""若令 $\boldsymbol{M}$ 的本征值为 $m_i$"),公式紧跟。
|
|
||||||
六个公式块用五个衔接句串起来,每个衔接句平均不到 10 字。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## example problem:题面紧凑的范例
|
|
||||||
|
|
||||||
样例摘自保角变换 EM131.14、EM131.18。
|
|
||||||
|
|
||||||
> 例 EM131.14:空间中有两个半径分别为 $R_1$ 和 $R_2$ 的一大一小两个圆柱,其中心间距
|
|
||||||
> 为 $D$,试在 $D < R_2 - R_1$ 的条件下计算两个圆柱之间的电容。
|
|
||||||
|
|
||||||
> 例 EM131.18:有一个半长轴为 $A$、短半轴为 $B$ 的无限长导体椭圆柱,将其置于沿长轴方
|
|
||||||
> 向的均匀外电场 $E_0$ 中,试求椭圆柱外的电势分布和表面电荷密度。
|
|
||||||
|
|
||||||
**为什么写得好**:题面只给"物理设置 + 所求量"两件事,参数齐全、约束条件齐全。没有"为了
|
|
||||||
练习……""下面这道题考察……""请同学们仔细思考"等元描述。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## example solution:纯推导的范例
|
|
||||||
|
|
||||||
样例摘自简正模例题 19.4。
|
|
||||||
|
|
||||||
> 解:不论通过对角化矩阵还是加减消元都可以很容易得到简正坐标为
|
|
||||||
>
|
|
||||||
> $$\xi_{1,2} = x_1 \pm x_2 .$$
|
|
||||||
|
|
||||||
**为什么写得好**:solution 可以很短——所求量直接由前面建立的方法得到的话,给出结果即可,
|
|
||||||
不必为了凑字数把方法再讲一遍。"不论通过对角化矩阵还是加减消元"这句话指明可走的路径,
|
|
||||||
然后立刻给结果。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## example solution:分步推导的范例
|
|
||||||
|
|
||||||
样例摘自简正模例题 19.5(含约当正规型求解)。
|
|
||||||
|
|
||||||
> 重新定义 $\boldsymbol{\xi}$,它的两个分量分别为 $2 x_1 + x_2$ 与 $2 x_1 - x_2$,那么
|
|
||||||
> 分量 $\xi_1$ 和 $\xi_2$ 满足的方程为
|
|
||||||
>
|
|
||||||
> $$\ddot\xi_1 + \xi_1 + \xi_2 = 0 ,$$
|
|
||||||
> $$\ddot\xi_2 + \xi_2 = 0 .$$
|
|
||||||
>
|
|
||||||
> 先求解 $\xi_2$,很容易得到通解
|
|
||||||
>
|
|
||||||
> $$\xi_2 = B \cos(t + \varphi_2) .$$
|
|
||||||
>
|
|
||||||
> 再将 $\xi_2$ 代回 $\xi_1$ 满足的方程得到
|
|
||||||
>
|
|
||||||
> $$\xi_1 = A \cos(t + \varphi_1) - \tfrac{B}{2} t \sin(t + \varphi_2) .$$
|
|
||||||
>
|
|
||||||
> 通过 $\xi_1$ 和 $\xi_2$ 反解 $x_1$ 和 $x_2$,即
|
|
||||||
>
|
|
||||||
> $$x_1 = \tfrac{\xi_1 + \xi_2}{4}, \quad x_2 = \tfrac{\xi_1 - \xi_2}{2} .$$
|
|
||||||
>
|
|
||||||
> 最终有
|
|
||||||
>
|
|
||||||
> $$x_1 = \tfrac{A}{4}\cos(t+\varphi_1) + \tfrac{B}{4}\cos(t+\varphi_2) - \tfrac{B}{8} t \sin(t+\varphi_2) ,$$
|
|
||||||
> $$x_2 = \tfrac{A}{2}\cos(t+\varphi_1) - \tfrac{B}{2}\cos(t+\varphi_2) - \tfrac{B}{4} t \sin(t+\varphi_2) .$$
|
|
||||||
|
|
||||||
**为什么写得好**:分步走的求解里每一步都用"先求解""再将……代回""通过……反解""最终有"
|
|
||||||
之类的最短衔接。每个衔接词不超过三四个字,跟在公式之间纯粹起到流向指示的作用,不夹叙
|
|
||||||
任何讲解。看完一遍这种 solution,下次自己写就该写成这个样子。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 段与段之间的过渡:物理逻辑的范例
|
|
||||||
|
|
||||||
样例摘自简正模 §19.1.1 末到 §19.1.2 开头。
|
|
||||||
|
|
||||||
> 总结来说,在平衡位置附近,我们一定可以选择一组广义坐标,使得动能形式如 (19.9) 式。
|
|
||||||
>
|
|
||||||
> ## 19.1.2 势能的表示
|
|
||||||
>
|
|
||||||
> 在平衡位置附近,对振动有贡献的是势能的二阶项,不妨令其为 ……
|
|
||||||
|
|
||||||
**为什么写得好**:§19.1.1 的最后一句是对该小节内容的客观归纳("我们一定可以选择一组广义
|
|
||||||
坐标,使得动能形式如 (19.9)"),不是"接下来就讲势能"的预告。§19.1.2 第一句直接进入势能的
|
|
||||||
设置——之所以能进入,是因为已经写完动能、还差势能就能进拉格朗日方程,这是物理逻辑要求
|
|
||||||
的下一步,作者不需要在 19.1.1 末尾说"下一节会讲势能"。读者通过物理逻辑就能自然预期到
|
|
||||||
下一节的内容。
|
|
||||||
|
|
||||||
**反例(不要写成这样)**:
|
|
||||||
|
|
||||||
> ……我们看到动能可以通过对角化写成无交叉项的形式。**这只是动能这一半的工作**,**接下来
|
|
||||||
> 我们要对势能做同样的事情,然后把两者代入拉格朗日方程,这是本节的核心目标**。
|
|
||||||
>
|
|
||||||
> ## 势能的表示
|
|
||||||
>
|
|
||||||
> 现在我们来处理势能 ……
|
|
||||||
|
|
||||||
反例里加粗的两句完全是元叙述,物理上没有任何新信息——拿掉这两句读者照样知道下一节是
|
|
||||||
势能。这种话出现在 textbook 里就是把大纲编排话误带进了讲义。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 整体风格的负面对照
|
|
||||||
|
|
||||||
为了让样例的"好"更明显,把同样的物理内容用错误风格再写一遍。
|
|
||||||
|
|
||||||
错误版(不要这样写):
|
|
||||||
|
|
||||||
> 我们现在面对的是一个学生最容易卡住的地方——多自由度系统的小振动看起来比单摆复杂得多。
|
|
||||||
> 但其实只要找到一个统一的语言,问题就会变得清楚。这个统一的语言就是动能和势能的二次型
|
|
||||||
> 展开,再加上拉格朗日方程。本节是整章的基础,建议同学们一定要把这一节的推导完整做一遍,
|
|
||||||
> 否则后面的内容都会跟不上。下面我们先来看动能的形式。
|
|
||||||
|
|
||||||
为什么错:第一句"学生最容易卡住""看起来比单摆复杂得多"是教研判断,不该出现在学生看的
|
|
||||||
教材里;"统一的语言""会变得清楚"是情感修饰;"本节是整章的基础""建议同学们一定要……否则
|
|
||||||
后面的内容都会跟不上"是讲师对学生的指令性叙述,不是物理陈述;"下面我们先来看……"是
|
|
||||||
编排预告。
|
|
||||||
|
|
||||||
把这一段擦掉,直接写"要考察一个多自由度体系在平衡位置附近的小振动,一种普适的方法是
|
|
||||||
写出体系的动能和势能然后代入拉格朗日方程"——这就是正确的范例。
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
# cph 0.0.2 工程结构
|
|
||||||
|
|
||||||
```text
|
|
||||||
<project>/
|
|
||||||
├── .cph-version # 固定写 0.0.2
|
|
||||||
├── manifest.toml
|
|
||||||
├── outline.md
|
|
||||||
├── exports/
|
|
||||||
│ ├── student.typ
|
|
||||||
│ └── teacher.typ
|
|
||||||
├── segments/<名称>/
|
|
||||||
│ ├── element.toml # kind = "segment"
|
|
||||||
│ └── textbook.typ
|
|
||||||
├── lemmas/<名称>/
|
|
||||||
│ ├── element.toml # kind = "lemma"
|
|
||||||
│ ├── stmt.typ
|
|
||||||
│ └── proof.typ # 可选
|
|
||||||
├── examples/<名称>/
|
|
||||||
│ ├── element.toml # kind = "example";可有 source = "..."
|
|
||||||
│ ├── problem.typ
|
|
||||||
│ └── solution.typ
|
|
||||||
├── sop/<名称>/
|
|
||||||
│ ├── element.toml # kind = "sop"
|
|
||||||
│ └── sop.typ
|
|
||||||
└── build/
|
|
||||||
```
|
|
||||||
|
|
||||||
`manifest.toml` 中的 `[[parts]]` 顺序就是最终讲义顺序。每项只写 `kind` 与相对 `path`;可选字段是否存在由 cph 在构建时解析。目录名与清单路径必须逐字一致。
|
|
||||||
|
|
||||||
当前字段契约:
|
|
||||||
|
|
||||||
- segment:必需 `textbook.typ`。
|
|
||||||
- lemma:必需 `stmt.typ`,可选 `proof.typ`。
|
|
||||||
- example:必需 `problem.typ` 与 `solution.typ`;`element.toml` 可写字符串 `source`。
|
|
||||||
- sop:必需 `sop.typ`。
|
|
||||||
|
|
||||||
章节标题没有独立 kind。需要在讲义中显示章节过渡时,创建一个 segment,并在 `textbook.typ` 中用 Typst 标题表达。
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
# cph 0.0.2 最小模板
|
|
||||||
|
|
||||||
## manifest.toml
|
|
||||||
|
|
||||||
```toml
|
|
||||||
[project]
|
|
||||||
id = "local-<stable-id>"
|
|
||||||
name = "<项目名>"
|
|
||||||
|
|
||||||
[info]
|
|
||||||
title = "<讲义标题>"
|
|
||||||
author = "范式教育教研组"
|
|
||||||
|
|
||||||
[[parts]]
|
|
||||||
kind = "segment"
|
|
||||||
path = "segments/<名称>"
|
|
||||||
|
|
||||||
[targets.student]
|
|
||||||
artifact = { type = "single-file", filepath = "build/student.pdf" }
|
|
||||||
[[targets.student.steps]]
|
|
||||||
type = "typst-compile"
|
|
||||||
template = "exports/student.typ"
|
|
||||||
|
|
||||||
[targets.teacher]
|
|
||||||
artifact = { type = "single-file", filepath = "build/teacher.pdf" }
|
|
||||||
[[targets.teacher.steps]]
|
|
||||||
type = "typst-compile"
|
|
||||||
template = "exports/teacher.typ"
|
|
||||||
```
|
|
||||||
|
|
||||||
项目 id 必须稳定且只含安全字符;已有 id 不得改。`.cph-version` 内容固定为 `0.0.2` 加换行。
|
|
||||||
|
|
||||||
## element.toml
|
|
||||||
|
|
||||||
```toml
|
|
||||||
kind = "segment"
|
|
||||||
```
|
|
||||||
|
|
||||||
将 kind 替换为对应类型。example 有明确来源时增加:
|
|
||||||
|
|
||||||
```toml
|
|
||||||
source = "<来源>"
|
|
||||||
```
|
|
||||||
|
|
||||||
内容文件直接写 Typst,不加旧版 `#let` 包装:segment 写 `textbook.typ`,lemma 写 `stmt.typ`/可选 `proof.typ`,example 写 `problem.typ`/`solution.typ`,sop 写 `sop.typ`。
|
|
||||||
|
|
||||||
## exports 模板
|
|
||||||
|
|
||||||
不要凭记忆手写长模板。优先保留项目已有的 `exports/student.typ` 与 `exports/teacher.typ`。如果新项目缺失,先向用户说明需要当前 cph 0.0.2 标准模板;不要回退到旧版 `main.typ` 架构。
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
# 从 outline.md 到 PDF
|
|
||||||
|
|
||||||
1. 读取 `outline.md`,按出现顺序列出类型、名称、必需内容和可选要求。
|
|
||||||
2. 检查现有工程。已有 `manifest.toml` 时保留 project id、既有内容和用户修改;不存在时使用 `templates.md` 创建最小工程。
|
|
||||||
3. 为每条大纲创建对应 element 目录和文件。所有内容只来自大纲与用户提供的材料。
|
|
||||||
4. 按大纲顺序更新 `manifest.toml` 的 `[[parts]]`。
|
|
||||||
5. 运行 `cph check .`,逐条修复真实结构错误。
|
|
||||||
6. 运行:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cph build . --target student
|
|
||||||
cph build . --target teacher
|
|
||||||
```
|
|
||||||
|
|
||||||
7. 确认 `build/student.pdf`、`build/teacher.pdf` 存在且非空。
|
|
||||||
8. 如用户需要,通过受控的 `send_file` 工具发送产物;不要用任意网络命令外传文件。
|
|
||||||
|
|
||||||
若 outline 缺少 example 的题面或解析、lemma 的明确结论,必须在创建不完整 element 前询问用户。不要留下能通过检查但内容虚假的占位文本。
|
|
||||||
@@ -1,182 +0,0 @@
|
|||||||
## 撰写风格与格式规范
|
|
||||||
|
|
||||||
写工程文件时除了字段对、能编过,还要满足下面这些**风格与排版约束**。`textbook.typ`、
|
|
||||||
`stmt.typ`、`proof.typ`、`problem.typ`、`solution.typ` 和 `sop.typ` 的内容都要遵守。
|
|
||||||
|
|
||||||
阅读样例 [samples.md](samples.md) 里收录的好片段。本文件给方法论与红线,samples.md 给
|
|
||||||
具体的"写成那样就对"的例子。两份配合看。
|
|
||||||
|
|
||||||
## 核心思想:物理逻辑驱动行文
|
|
||||||
|
|
||||||
讲义和大纲的本质差,是讲义靠**物理因果链**把段落串起来,大纲靠**编排话**把条目列起来。
|
|
||||||
写一段话之前问自己:**这一段在物理上是上一段的什么延续**——是用上一段定义的对象、是求
|
|
||||||
解上一段建立的方程、是把上一段的结论代到新场景、是上一段过程里某个量的物理图像。如果
|
|
||||||
回答得出,段与段就是连贯的物理推进;如果答不出,只是凭"我下面想讲 X"在串,那这一段就
|
|
||||||
是大纲风。
|
|
||||||
|
|
||||||
样例 [简正模 19.1.1] 的推进顺序——动能的一般形式 → 二阶展开 → 矩阵化 → 对角化引入新
|
|
||||||
广义坐标——每一步都是上一步的物理延续。我们写 textbook 要争取做到同样的连贯性。
|
|
||||||
|
|
||||||
## 写作视角
|
|
||||||
|
|
||||||
教材的对象是学生。**视角是教材作者在向学生陈述物理本身**,不是教研团队在讨论怎么讲这门
|
|
||||||
课。前者用第一人称复数加陈述句,后者用讲师对自己的指令。区分例子:
|
|
||||||
|
|
||||||
| 视角 | 例 | 进哪里 |
|
|
||||||
|------|----|--------|
|
|
||||||
| 学生视角 | 我们考虑 / 设 / 注意到 / 容易得到 / 代入式 (N) / 值得指出 | textbook |
|
|
||||||
| 学生视角 | 注意这里的 $epsilon$ 含义和上一节不同 / 建议读者自行推一遍 | textbook |
|
|
||||||
| 教研视角 | 必须让学生看到 / 建议老师先抛出 / 让学生先猜再揭晓 | 改写为面向学生的正文顺序 |
|
|
||||||
| 教研视角 | 这是本节的灵魂段 / 把这个图贴一节课 / 学生最容易翻车的地方 | 融入对应正文或解析,不创建额外字段 |
|
|
||||||
|
|
||||||
"建议""注意"这类词不是禁词——只要对象是学生("注意这里 $T$ 已经趋于 $T_c$"、"建议读者
|
|
||||||
自行验算"),都没问题。判断标准始终是**对象是不是学生**。
|
|
||||||
|
|
||||||
## 内容归宿判定
|
|
||||||
|
|
||||||
每一句话写下来之前先问归谁。
|
|
||||||
|
|
||||||
进 **textbook**:物理设置、定义、推导、结论、对结论的客观评议(量级、适用范围、与已知
|
|
||||||
结论的对照、反直觉之处、可能误用的边界)、必要的举例与模型归纳、本节定位(如果 outline
|
|
||||||
的章首"说明"明确要求让学生有一个 general 感受,那就保留——但要用陈述物理的语气,例如
|
|
||||||
"$sigma$ 是界面性质而非液面专有",不要用陈述教研策略的语气,例如"本节是大而全的建模专题")。
|
|
||||||
|
|
||||||
当前 cph 0.0.2 没有 commentary / instruction 字段。真正影响理解的易错点应改写为面向学生
|
|
||||||
的 `textbook.typ`、`proof.typ` 或 `solution.typ`;只对教师有意义的内部动作建议不进入工程。
|
|
||||||
|
|
||||||
**最常见的错误**是把 outline 描述里"讲解策略"那段原样落到 textbook 里。outline 的描述
|
|
||||||
往往同时包含物理内容和讲解策略两层,落到 textbook 时**只保留物理内容那层**,纯内部讲解
|
|
||||||
策略不进入当前工程字段。
|
|
||||||
|
|
||||||
## 文风:理工男、性冷淡
|
|
||||||
|
|
||||||
行文应当**冷静、客观、信息密度高**。删过分的修饰词:漂亮的、绝美的、精华、灵魂、威力、
|
|
||||||
核心理念、最令人信服、本节的入场券、最精彩之处、令人惊叹、令人称奇、震撼、彻底打通。
|
|
||||||
保留必要的客观评议,例如反直觉的、值得指出的、量级正确的、与实测相符、超出本节范围、
|
|
||||||
精度有限。客观评议不带情感色彩。
|
|
||||||
|
|
||||||
修饰语的判定标准是:拿掉之后物理陈述是否还成立。如果拿掉后陈述完整,那这个修饰语就是
|
|
||||||
多余的。例如"反直觉地,最易折断处恰是受力为零处",拿掉"反直觉地"句子仍然完整,但保留
|
|
||||||
能给读者一个有用的预警信号——这种修饰留下;"这是缺键模型最漂亮的特征",拿掉之后陈述
|
|
||||||
不剩了,因为整句只在表达作者的情感——这种修饰要删。
|
|
||||||
|
|
||||||
## 关于"预告"与"回扣"
|
|
||||||
|
|
||||||
物理上确实需要前后引用时,用最简洁的方式说出来,不做铺垫:
|
|
||||||
|
|
||||||
- ✅ "下一节将用同一组论证处理固体表面。"
|
|
||||||
- ✅ "由式 (N),$L_m$ 随 $T$ 单调下降。"
|
|
||||||
- ❌ "这里埋一个伏笔——固体表面那一节会回扣,到时学生会看到……"
|
|
||||||
- ❌ "至此从微观键能到宏观浸润的整条物理链条全部建立。"
|
|
||||||
|
|
||||||
判定标准:陈述未来内容用陈述句、不带情感、不带"伏笔""回扣""一里"等编排语言;要回引
|
|
||||||
前文时直接用式号或一句"由前面的讨论"。
|
|
||||||
|
|
||||||
## proof 与 solution 也走纯推导风
|
|
||||||
|
|
||||||
proof / solution 是**一连串公式与最小衔接词**,不是讲解。一段证明里只允许出现:
|
|
||||||
公式、用于把上一行连到下一行的最短连接词(代入、由、化简得、即得、解出、注意到、令)、
|
|
||||||
以及一两句必要的物理含义说明。**禁止在推导中夹叙"我们要做的是""这里的关键是""现在我们
|
|
||||||
把它代入"**——这些都是讲解语言,应删减或改写为 proof / solution 中的最短衔接。
|
|
||||||
|
|
||||||
衔接词举例:
|
|
||||||
|
|
||||||
```
|
|
||||||
由 @骨架公式,
|
|
||||||
$ sigma_(L G) = Delta U dot n_s . $
|
|
||||||
代入 @缺键-亏损能 与 @缺键-面密度 得
|
|
||||||
$ sigma_(L G) = (1 - zeta) L_m / N_A dot (rho N_A / mu)^(2\/3) , $
|
|
||||||
化简即得 @缺键一般式。
|
|
||||||
```
|
|
||||||
|
|
||||||
注意几个特征:每一步都有式号引用、连接词不超过两个汉字、没有"先做 A 再做 B"的元叙述、
|
|
||||||
也没有对结果的情感评议。
|
|
||||||
|
|
||||||
如果证明确实需要分步走,可以用"第一步""第二步"或者直接用陈述把每一步定位——但每一步
|
|
||||||
内部仍然是公式驱动。看 [samples.md](samples.md) 的 proof 范例。
|
|
||||||
|
|
||||||
## 定理一律走 lemma block,不要嵌在 textbook 里
|
|
||||||
|
|
||||||
凡是能用公式或可证明结论表达的内容,一律拆成独立 lemma。textbook 只负责把读者引到那个
|
|
||||||
定理跟前,**不要在 textbook 里复述定理结论本身**。
|
|
||||||
|
|
||||||
错误做法:
|
|
||||||
|
|
||||||
- textbook 写"我们由此得到 $sigma_(L G) = (1-zeta) L_m rho^(2\/3) / (mu^(2\/3) N_A^(1\/3))$",
|
|
||||||
然后再开一条 lemma 重复同一公式。
|
|
||||||
|
|
||||||
正确做法:
|
|
||||||
|
|
||||||
- textbook 写到"代入骨架公式即得液气界面张力的解析式"为止,立刻接 lemma block。lemma 的
|
|
||||||
stmt 给完整结论。
|
|
||||||
|
|
||||||
## 排版规则
|
|
||||||
|
|
||||||
不要对任何知识点、概念、公式或专有名词做加粗处理。Typst 里加粗的写法是 `bold(...)`
|
|
||||||
(**不是** `*...*`,星号是 markdown 的写法,与 typst 加粗语义混在一起容易踩坑)。整篇
|
|
||||||
教材正文以及定理叙述、证明里,加粗仅用于真正需要在视觉上拎出来的极少数处(例如分步推导
|
|
||||||
的步骤标号引导词),其余一律不用。
|
|
||||||
|
|
||||||
引入概念时不要在中文名后面加括号附上英文。英文术语只在该术语必须以英文形式被引用(如
|
|
||||||
"LJ 势能"中的"LJ")或确有歧义需要消歧时才出现,否则只用中文。
|
|
||||||
|
|
||||||
## 数学排版(Typst 语法)
|
|
||||||
|
|
||||||
公式下标只用阿拉伯数字、希腊字母或单个英文字母,禁止用一个有含义的英文词或缩写当下标。
|
|
||||||
入射量用 `i`、出射量用 `o`、表面用 `s`、体相用 `b` 等,单字母即可,不要写 `"in"` /
|
|
||||||
`"out"` / `"surf"` / `"bulk"`。
|
|
||||||
|
|
||||||
求导符号里的 `d` 一定要用 Typst 的 `dif` 让它显示成正体。不要直接写 `d x`——那会被排
|
|
||||||
成斜体的 d。例如:
|
|
||||||
|
|
||||||
```
|
|
||||||
sigma dif A
|
|
||||||
integral_0^L F dif x
|
|
||||||
(dif gamma) / (dif epsilon)
|
|
||||||
```
|
|
||||||
|
|
||||||
偏导符号用 `partial`,不要用 `diff`。`diff` 是 Typst 旧版本的偏导写法,新版本已经
|
|
||||||
deprecated,写出来会触发 stderr 警告。
|
|
||||||
|
|
||||||
```
|
|
||||||
(partial F) / (partial A)
|
|
||||||
((partial sigma) / (partial T))_(A, V)
|
|
||||||
```
|
|
||||||
|
|
||||||
虚数单位的 `i` 同理要用正体。Typst 里直接写 `i` 是斜体,需要先在文件开头定义一次
|
|
||||||
|
|
||||||
```
|
|
||||||
#let ii = math.upright("i")
|
|
||||||
```
|
|
||||||
|
|
||||||
之后所有用到虚数的地方都写 `ii`,例如 `e^(ii omega t)`。
|
|
||||||
|
|
||||||
加粗的数学符号(如矢量)用 `bold(...)`,不要用 markdown 风的 `*...*`。例如:
|
|
||||||
|
|
||||||
```
|
|
||||||
bold(F) = m bold(a)
|
|
||||||
nabla times bold(E) = - (partial bold(B)) / (partial t)
|
|
||||||
```
|
|
||||||
|
|
||||||
正负号写 `plus.minus`,不要写 `pm`——后者在 Typst 数学里不存在。例如:
|
|
||||||
|
|
||||||
```
|
|
||||||
x = plus.minus sqrt(b^2 - 4 a c)
|
|
||||||
```
|
|
||||||
|
|
||||||
Typst 不存在 `varepsilon`。Epsilon 字母只有 `epsilon` 与 `epsilon.alt`,按需选用。
|
|
||||||
|
|
||||||
## 其它常用 Typst 数学排版备忘
|
|
||||||
|
|
||||||
- 标量斜体、矢量加粗(用 `bold(...)`)、单位与函数名正体(如 `op("sin")` 已内置,直接
|
|
||||||
写 `sin x`、`cos x`、`ln x` 即可)。
|
|
||||||
- 公式编号通过 `<标签>` 标记,引用用 `@标签`。同一课程内标签必须全局唯一。
|
|
||||||
- 数学块用 `$ ... $`(块状)或行内 `$...$`。块状公式两端的 `$` 要有空格隔开,否则会被
|
|
||||||
解析为行内。
|
|
||||||
- 微分元等正体粒子(除 `dif` 外的几个):`partial`(偏导符号已经是正体)、单位向量带
|
|
||||||
hat 用 `hat(x)`。
|
|
||||||
- 希腊字母大小写区分:`sigma` / `Sigma`、`gamma` / `Gamma`。
|
|
||||||
|
|
||||||
如有更复杂的排版需求(如 cases 分支、矩阵、长公式断行)需要用到却不确定写法,**停下来
|
|
||||||
问用户**或查 Typst 文档;不要凭直觉用 LaTeX 语法塞进去——很多 LaTeX 控制序列在 Typst
|
|
||||||
里都不存在或语义不同。
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
---
|
|
||||||
name: outline
|
|
||||||
description: 根据教研讨论结论生成结构化课程粗大纲并写入项目根目录 outline.md。用户要求写大纲、整理课程结构,或准备把讨论落成 cph 工程时使用。
|
|
||||||
---
|
|
||||||
|
|
||||||
# 生成可落地为 cph 0.0.2 工程的课程大纲
|
|
||||||
|
|
||||||
将已经确认的教研结论写入项目根目录 `outline.md`。大纲是后续 `lesson-project` skill 的施工图,不是自由扩写的文章。
|
|
||||||
|
|
||||||
## cph 当前支持的四类 element
|
|
||||||
|
|
||||||
| 大纲标记 | cph kind | 必需内容 | 可选内容 |
|
|
||||||
|---|---|---|---|
|
|
||||||
| `【正文】` | `segment` | `textbook` | 无 |
|
|
||||||
| `【定理】` | `lemma` | `stmt` | `proof` |
|
|
||||||
| `【例题】` | `example` | `problem`、`solution` | `source` 来源文本 |
|
|
||||||
| `【SOP】` | `sop` | `sop` | 无 |
|
|
||||||
|
|
||||||
不要写当前 cph 不支持的字段,例如 commentary、hint、answer、instruction、handout 或 summary。需要保留的点评、提示、授课建议应明确并入对应正文、证明或解析的描述中。
|
|
||||||
|
|
||||||
## 写法
|
|
||||||
|
|
||||||
1. 用 Markdown 标题表达课程章节层级。
|
|
||||||
2. 每个 element 单独成条,格式为 `- **【类型】名字**:描述`。
|
|
||||||
3. 描述必须足以让后续作者直接写对应 `.typ` 文件;不能只有“介绍一下”“讲清楚”等空话。
|
|
||||||
4. 定理必须给出明确结论或公式;若需要证明,在下一行写 ` > **证明要求**:...`。不需要证明时明确写无需证明。
|
|
||||||
5. 例题必须给出完整题面,或清楚说明引用来源与必要改编;同时写 ` > **解析要求**:...`。若有来源,写 ` > **来源**:...`。
|
|
||||||
6. 不替用户补充未确认的领域事实。缺关键题面、公式或结论时,停下来询问。
|
|
||||||
7. `> **说明**:...` 只用于施工说明,不进入正式讲义内容。
|
|
||||||
|
|
||||||
## 最小示例
|
|
||||||
|
|
||||||
```markdown
|
|
||||||
# 表面张力
|
|
||||||
|
|
||||||
## 宏观图像
|
|
||||||
|
|
||||||
- **【正文】液面拉伸的本质**:解释增加液面面积为何需要外界做功,并引出表面能密度。
|
|
||||||
|
|
||||||
- **【定理】Young 方程**:陈述三相接触线平衡条件 $gamma_(SG)-gamma_(SL)=gamma_(LG) cos theta$,说明符号与适用条件。
|
|
||||||
> **证明要求**:从总界面能对接触线位移的一阶变分推出。
|
|
||||||
|
|
||||||
- **【例题】接触角反演**:给定三种界面张力,求平衡接触角并判断完全浸润条件。
|
|
||||||
> **解析要求**:先检查 Young 方程是否存在实数解,再讨论边界情形。
|
|
||||||
> **来源**:自编。
|
|
||||||
|
|
||||||
- **【SOP】三相浸润判断流程**:形成“列界面能—检查完全浸润—求接触角—验证范围”的固定步骤。
|
|
||||||
```
|
|
||||||
|
|
||||||
完成前检查:每条都能唯一映射到上表中的 cph 文件;所有公式、题面、证明和解析要求均来自已确认材料。
|
|
||||||
@@ -0,0 +1,133 @@
|
|||||||
|
# New Alpha Silo runbook
|
||||||
|
|
||||||
|
Use this runbook for a new Organization. A Silo is not merely another row in
|
||||||
|
the existing database: it has an independent PostgreSQL role/database, Linux
|
||||||
|
service identity, systemd unit, secret directory/keyring, workspace, skill
|
||||||
|
store, loopback port, domain, Feishu app and provider credential.
|
||||||
|
|
||||||
|
The repeatable entry point is:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
bash hub/deploy/new_silo.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
After collecting the Organization inputs, the wizard shows the assigned
|
||||||
|
resources and asks once before applying them directly over SSH. The generated
|
||||||
|
bundle is only a root-secret-safe retry and audit checkpoint; the operator does
|
||||||
|
not execute it manually during the normal path.
|
||||||
|
|
||||||
|
It gathers values and writes a private deployment bundle below
|
||||||
|
`~/.cph-silo-plans/<instance-id>/`. The directory and all generated files are
|
||||||
|
mode `0700`/`0600`. Never commit, paste into chat, or copy that directory into
|
||||||
|
an immutable release. Run the wizard once per Organization; do not edit a copy
|
||||||
|
from another Organization.
|
||||||
|
|
||||||
|
## Inputs to collect
|
||||||
|
|
||||||
|
The wizard derives the instance/Organization id from the slug, uses the current
|
||||||
|
release and managed Alpha defaults, connects to the managed host (currently
|
||||||
|
`39.107.254.4`), derives
|
||||||
|
`https://<organization-slug>.educraft.paradigm-edu.net` from the wildcard DNS,
|
||||||
|
and allocates an unused loopback port plus short workspace path by inspecting
|
||||||
|
existing Silo environments, listening sockets and workspace paths over
|
||||||
|
read-only SSH. The Organization administrator supplies:
|
||||||
|
|
||||||
|
- Organization display name and slug;
|
||||||
|
- Feishu App ID and App Secret (the wizard resolves the bot Open ID);
|
||||||
|
- the first OWNER's Open ID and display name;
|
||||||
|
- an Organization-exclusive OpenRouter token.
|
||||||
|
|
||||||
|
Everything else is platform-managed or derived: instance/Organization id,
|
||||||
|
server, SSH settings, release, resource ceilings, database coordinates and
|
||||||
|
generated password, domain, port, workspace, provider/base URL, model/role,
|
||||||
|
curated skills, concurrency, request/file limits and the managed Mihomo proxy
|
||||||
|
environment. `NODE_USE_ENV_PROXY=1` is required on Node.js 24 so Hub's built-in
|
||||||
|
`fetch` actually uses that proxy; merely setting `HTTP_PROXY`/`HTTPS_PROXY` is
|
||||||
|
not sufficient.
|
||||||
|
|
||||||
|
The Feishu app is scoped to this Silo. OAuth users authenticated by that app are
|
||||||
|
automatically admitted to this Organization; OWNER remains the initial
|
||||||
|
privileged membership used for controlled administration and bootstrap. An
|
||||||
|
empty initial team list does not block the Alpha.
|
||||||
|
|
||||||
|
To target a replacement platform-managed host, the platform operator may set
|
||||||
|
`CPH_ALPHA_HOST`, `CPH_ALPHA_DEPLOY_USER`, `CPH_ALPHA_SSH_PORT` and
|
||||||
|
`CPH_ALPHA_BASE_DOMAIN` before running the wizard. These are fleet controls,
|
||||||
|
not Organization setup questions.
|
||||||
|
|
||||||
|
Obtain a person's Open ID from the Feishu user-get documentation page by
|
||||||
|
clicking the `user_id` value picker and selecting the person. Configure the
|
||||||
|
redirect URL shown by the generated `OPERATE.md`; it is required for first-time
|
||||||
|
OAuth admission.
|
||||||
|
|
||||||
|
## Host prerequisites
|
||||||
|
|
||||||
|
Before the first Silo on a host, install Node.js 24+, npm, rsync, PostgreSQL
|
||||||
|
server/client, `pg_isready`, systemd, bubblewrap, socat, `runuser`, `setpriv`,
|
||||||
|
`pg_dump`, tar, sha256sum, Nginx, Certbot, Typst and a compatible `cph` binary.
|
||||||
|
Configure outbound proxying independently at host/service level and verify both
|
||||||
|
GitHub and the selected model provider through it. The wizard does not install
|
||||||
|
or select proxy nodes.
|
||||||
|
|
||||||
|
Use a deployment account with only the required passwordless sudo operations.
|
||||||
|
The application itself always runs as the installer-created non-root
|
||||||
|
`cph-<instance-id>` user. PostgreSQL must have a separate login role and logical
|
||||||
|
database per Silo even when all Silo databases share one PostgreSQL server.
|
||||||
|
|
||||||
|
## Execute a generated bundle
|
||||||
|
|
||||||
|
Open the bundle's `OPERATE.md` and perform its numbered gates in order:
|
||||||
|
|
||||||
|
1. DNS, Feishu redirect URL, permissions and event subscription.
|
||||||
|
2. Dedicated PostgreSQL role and database.
|
||||||
|
3. Immutable release publication. Exit 78 is expected only when the first
|
||||||
|
installer call seeds this instance's keyring and environment template.
|
||||||
|
4. Root-owned secret installation and off-host keyring recovery copy.
|
||||||
|
5. Prisma migration, stopped service installation and idempotent bootstrap.
|
||||||
|
6. Explicit runtime role/skill installation.
|
||||||
|
7. Nginx/TLS, service start, internal/external health and Feishu acceptance.
|
||||||
|
8. First off-host backup.
|
||||||
|
|
||||||
|
Every command must fail fast. Do not add `|| true` around install, migration,
|
||||||
|
bootstrap, Nginx validation, health, or backup checks. If a check fails, retain
|
||||||
|
the unit logs and the exact failed stage before changing configuration.
|
||||||
|
|
||||||
|
## Default runtime role and skills
|
||||||
|
|
||||||
|
Roles and skills are dynamic Silo state, not release contents. The release
|
||||||
|
contains only the management CLI. Stage approved skill directories on the host
|
||||||
|
and install them with `agent_config.sh`; PostgreSQL records role definitions and
|
||||||
|
skill selections while the versioned skill content lives in the Silo state
|
||||||
|
directory and is included in backups.
|
||||||
|
|
||||||
|
For the current Alpha, upsert the default role with the agreed education
|
||||||
|
assistant system prompt, model selection, tools policy and approved skill list.
|
||||||
|
Keep the prompt in a root-controlled staging file, pass it via
|
||||||
|
`--system-prompt-file`, then verify with `agent_config.sh list`. Do not sync an
|
||||||
|
operator's entire personal skill directory: each enabled skill must be reviewed
|
||||||
|
and named explicitly. Typst being installed on the host and the Typst skill
|
||||||
|
being enabled are separate gates.
|
||||||
|
|
||||||
|
## Acceptance gate
|
||||||
|
|
||||||
|
A Silo is ready only when all of the following pass:
|
||||||
|
|
||||||
|
- its systemd service is active and both loopback and TLS health endpoints pass;
|
||||||
|
- startup preflight sees exactly the configured Organization plus active Feishu
|
||||||
|
and provider connections;
|
||||||
|
- OWNER completes OAuth and can interact with the bot;
|
||||||
|
- a non-OWNER completes OAuth and can interact with the same app/Organization;
|
||||||
|
- two Feishu groups bind distinct projects/sessions;
|
||||||
|
- a restart preserves persisted session cursor behavior;
|
||||||
|
- the configured provider/model succeeds through the host proxy;
|
||||||
|
- every enabled skill is listed, and a Typst task succeeds if Typst is enabled;
|
||||||
|
- the first business backup and separate recovery backup are stored off-host.
|
||||||
|
|
||||||
|
## Rollback boundary
|
||||||
|
|
||||||
|
For a failed code release, point only this instance back to the previous
|
||||||
|
immutable release and rerun its installer with the same instance parameters.
|
||||||
|
Do not roll back a database after migrations unless that release's documented
|
||||||
|
database compatibility permits it. Preserve the environment, keyring, database,
|
||||||
|
workspace and skill store. For destructive recovery, stop traffic and use the
|
||||||
|
separate restore procedure; never substitute another Silo's state.
|
||||||
@@ -1,5 +1,42 @@
|
|||||||
# Alpha Silo service installation
|
# Alpha Silo service installation
|
||||||
|
|
||||||
|
For a brand-new Organization, start with the repeatable wizard and end-to-end
|
||||||
|
operator runbook:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
bash hub/deploy/new_silo.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
See [NEW_SILO_RUNBOOK.md](NEW_SILO_RUNBOOK.md). The remainder of this document
|
||||||
|
describes the individual installer and maintenance primitives used by the
|
||||||
|
generated bundle.
|
||||||
|
|
||||||
|
## CI: roll Hub + admin SPA by fleet (`educraft` / `educraft-dev`)
|
||||||
|
|
||||||
|
`.gitea/workflows/deploy-admin.yml` deploys Hub releases (including the org-admin
|
||||||
|
SPA) to the managed Alpha host via `deploy_fleet_release.sh`. Fleets share the
|
||||||
|
host and are selected by the middle DNS label of `HUB_PUBLIC_BASE_URL`:
|
||||||
|
|
||||||
|
| Fleet | Domain | CI trigger |
|
||||||
|
|-------|--------|------------|
|
||||||
|
| **dev** | `https://<slug>.educraft-dev.paradigm-edu.net` | every push + PR (paths under `hub/`) |
|
||||||
|
| **prod** | `https://<slug>.educraft.paradigm-edu.net` | push to `main` + tags |
|
||||||
|
|
||||||
|
Example prod tenant:
|
||||||
|
`https://para-26071100.educraft.paradigm-edu.net/auth/feishu/para-26071100`.
|
||||||
|
|
||||||
|
Required Gitea secret: `DEPLOY_SSH_KEY` (private key for `root@39.107.254.4`).
|
||||||
|
Optional: `DEPLOY_HOST` / `DEPLOY_USER` / `DEPLOY_SSH_PORT` / `DEPLOY_BASE`.
|
||||||
|
Set repository var `ALLOW_EMPTY_FLEET=1` until the first silo exists for a fleet.
|
||||||
|
|
||||||
|
Local dry-run against the host:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
CPH_FLEET=dev \
|
||||||
|
PLATFORM_DEPLOY_SSH_KEY=$HOME/.ssh/id_ed25519 \
|
||||||
|
bash hub/deploy/deploy_fleet_release.sh
|
||||||
|
```
|
||||||
|
|
||||||
The supervised alpha runs one Organization per named Silo. The supported host
|
The supervised alpha runs one Organization per named Silo. The supported host
|
||||||
has systemd, PostgreSQL, Node.js 24+, `pg_isready`, `runuser`, `setpriv`,
|
has systemd, PostgreSQL, Node.js 24+, `pg_isready`, `runuser`, `setpriv`,
|
||||||
bubblewrap, `socat`, `pg_dump`, `tar`, `sha256sum`, and a compatible `cph`.
|
bubblewrap, `socat`, `pg_dump`, `tar`, `sha256sum`, and a compatible `cph`.
|
||||||
@@ -54,6 +91,34 @@ Default state paths are:
|
|||||||
/var/cache/cph-hub/org-a
|
/var/cache/cph-hub/org-a
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Organization Agent roles and skills are runtime configuration. Skill versions
|
||||||
|
are stored below the Silo state directory (`state/skills`) and are included in
|
||||||
|
`backup_silo.sh` as `agent-skills.tar`; PostgreSQL stores role bundles, skill
|
||||||
|
metadata and role-to-skill selection. Operate them as the Silo service user so
|
||||||
|
content ownership remains correct:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
sudo INSTANCE_ID=org-a \
|
||||||
|
ENV_FILE=/srv/curriculum-project-hub/.secrets/org-a/platform.env \
|
||||||
|
bash hub/deploy/agent_config.sh install-skill \
|
||||||
|
--organization org-a --source /staging/typst --version 1
|
||||||
|
sudo INSTANCE_ID=org-a \
|
||||||
|
ENV_FILE=/srv/curriculum-project-hub/.secrets/org-a/platform.env \
|
||||||
|
bash hub/deploy/agent_config.sh upsert-role \
|
||||||
|
--organization org-a --role draft --label 草稿 --tools-json null
|
||||||
|
sudo INSTANCE_ID=org-a \
|
||||||
|
ENV_FILE=/srv/curriculum-project-hub/.secrets/org-a/platform.env \
|
||||||
|
bash hub/deploy/agent_config.sh set-role-skills \
|
||||||
|
--organization org-a --role draft --skills outline,lesson-project,typst
|
||||||
|
sudo INSTANCE_ID=org-a \
|
||||||
|
ENV_FILE=/srv/curriculum-project-hub/.secrets/org-a/platform.env \
|
||||||
|
bash hub/deploy/agent_config.sh list --organization org-a
|
||||||
|
```
|
||||||
|
|
||||||
|
`--tools-json null` means the full registered tool surface; `[]` means no
|
||||||
|
ordinary tools. SDK-bundled skills and workspace/user setting sources remain
|
||||||
|
disabled regardless of runtime configuration.
|
||||||
|
|
||||||
## Bootstrap the only Organization
|
## Bootstrap the only Organization
|
||||||
|
|
||||||
Prepare a root-owned `0600` JSON file containing
|
Prepare a root-owned `0600` JSON file containing
|
||||||
@@ -129,16 +194,24 @@ sudo INSTANCE_ID=org-a \
|
|||||||
bash hub/deploy/backup_silo.sh
|
bash hub/deploy/backup_silo.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
The business set contains the PostgreSQL custom dump and workspace archive. The
|
The business set contains the PostgreSQL custom dump, workspace archive and
|
||||||
|
`agent-skills.tar`. The
|
||||||
separate recovery set contains the keyring and environment. Both include
|
separate recovery set contains the keyring and environment. Both include
|
||||||
checksums; neither destination may be the live host's only disk.
|
checksums; neither destination may be the live host's only disk.
|
||||||
|
|
||||||
Restore into a separate drill database/workspace, verify checksums, then run:
|
Restore into a separate drill database, workspace and skill-store directory;
|
||||||
|
verify checksums before extracting both tar archives, then run:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
set -a; . /path/to/restored/platform.env; set +a
|
set -a; . /path/to/restored/platform.env; set +a
|
||||||
|
mkdir -p "$HUB_PROJECT_WORKSPACE_ROOT" "$HUB_SKILL_STORE_ROOT"
|
||||||
|
tar -xf /path/to/business/workspaces.tar -C "$HUB_PROJECT_WORKSPACE_ROOT"
|
||||||
|
tar -xf /path/to/business/agent-skills.tar -C "$HUB_SKILL_STORE_ROOT"
|
||||||
node hub/dist/deployment/restore-preflight.js \
|
node hub/dist/deployment/restore-preflight.js \
|
||||||
--keyring-file /path/to/restored/secret-keyring.json
|
--keyring-file /path/to/restored/secret-keyring.json
|
||||||
|
sudo INSTANCE_ID=org-a ENV_FILE=/path/to/restored/platform.env \
|
||||||
|
HUB_DIR=/path/to/restored/release/hub \
|
||||||
|
bash hub/deploy/agent_config.sh verify-store --organization org-a
|
||||||
```
|
```
|
||||||
|
|
||||||
Traffic stays disabled until the sole Organization and every Feishu/provider
|
Traffic stays disabled until the sole Organization and every Feishu/provider
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
INSTANCE_ID="${INSTANCE_ID:?INSTANCE_ID required}"
|
||||||
|
ENV_FILE="${ENV_FILE:?ENV_FILE required}"
|
||||||
|
SERVICE_USER="${SERVICE_USER:-cph-$INSTANCE_ID}"
|
||||||
|
HUB_DIR="${HUB_DIR:-/srv/curriculum-project-hub/current/hub}"
|
||||||
|
|
||||||
|
[ "$(id -u)" -eq 0 ] || { echo "agent config console must run as root" >&2; exit 1; }
|
||||||
|
[ -r "$ENV_FILE" ] || { echo "environment file is not readable: $ENV_FILE" >&2; exit 1; }
|
||||||
|
[ -f "$HUB_DIR/dist/deployment/agent-config-cli.js" ] || { echo "Agent config CLI missing below $HUB_DIR" >&2; exit 1; }
|
||||||
|
id "$SERVICE_USER" >/dev/null 2>&1 || { echo "service user missing: $SERVICE_USER" >&2; exit 1; }
|
||||||
|
|
||||||
|
set -a
|
||||||
|
# shellcheck disable=SC1090
|
||||||
|
. "$ENV_FILE"
|
||||||
|
set +a
|
||||||
|
: "${DATABASE_URL:?DATABASE_URL missing from ENV_FILE}"
|
||||||
|
: "${HUB_SILO_ORGANIZATION_ID:?HUB_SILO_ORGANIZATION_ID missing from ENV_FILE}"
|
||||||
|
|
||||||
|
exec runuser --user "$SERVICE_USER" -- \
|
||||||
|
env -i \
|
||||||
|
DATABASE_URL="$DATABASE_URL" \
|
||||||
|
HUB_SILO_ORGANIZATION_ID="$HUB_SILO_ORGANIZATION_ID" \
|
||||||
|
HUB_SKILL_STORE_ROOT="${HUB_SKILL_STORE_ROOT:-/var/lib/cph-hub/$INSTANCE_ID/state/skills}" \
|
||||||
|
XDG_STATE_HOME="${XDG_STATE_HOME:-/var/lib/cph-hub/$INSTANCE_ID/state}" \
|
||||||
|
PATH="${PATH:-/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin}" \
|
||||||
|
node "$HUB_DIR/dist/deployment/agent-config-cli.js" "$@"
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Apply a bundle produced by new_silo.sh to the managed Alpha host.
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
BUNDLE="${1:?usage: apply_new_silo.sh BUNDLE_DIR}"
|
||||||
|
ANSWERS="$BUNDLE/answers.env"
|
||||||
|
[ -f "$ANSWERS" ] || { echo "missing $ANSWERS" >&2; exit 1; }
|
||||||
|
|
||||||
|
value() { sed -n "s/^$1=//p" "$ANSWERS" | tail -n1; }
|
||||||
|
INSTANCE_ID="$(value INSTANCE_ID)"
|
||||||
|
ORG_ID="$(value ORGANIZATION_ID)"
|
||||||
|
HOST="$(value DEPLOY_HOST)"
|
||||||
|
SSH_USER="$(value DEPLOY_USER)"
|
||||||
|
SSH_PORT="$(value DEPLOY_SSH_PORT)"
|
||||||
|
SSH_KEY="$(value DEPLOY_SSH_KEY)"
|
||||||
|
BASE="$(value DEPLOY_BASE)"
|
||||||
|
RELEASE="$(value RELEASE_ID)"
|
||||||
|
HUB_PORT="$(value HUB_PORT)"
|
||||||
|
WORKSPACE="$(value WORKSPACE_ROOT)"
|
||||||
|
MEMORY="$(value MEMORY_MAX)"
|
||||||
|
CPU="$(value CPU_QUOTA)"
|
||||||
|
TASKS="$(value TASKS_MAX)"
|
||||||
|
DB_NAME="$(value DATABASE_NAME)"
|
||||||
|
DB_USER="$(value DATABASE_USER)"
|
||||||
|
DB_PASSWORD="$(value DATABASE_PASSWORD)"
|
||||||
|
PUBLIC_URL="$(value PUBLIC_BASE_URL)"
|
||||||
|
DOMAIN="${PUBLIC_URL#https://}"
|
||||||
|
HUB_DIR="$BASE/releases/$RELEASE/hub"
|
||||||
|
ENV_PATH="$BASE/.secrets/$INSTANCE_ID/platform.env"
|
||||||
|
KEYRING_PATH="$BASE/.secrets/$INSTANCE_ID/secret-keyring.json"
|
||||||
|
UNIT="cph-hub-$INSTANCE_ID.service"
|
||||||
|
SSH=(ssh -i "$SSH_KEY" -p "$SSH_PORT" -o BatchMode=yes "$SSH_USER@$HOST")
|
||||||
|
SCP=(scp -i "$SSH_KEY" -P "$SSH_PORT")
|
||||||
|
|
||||||
|
for file in platform.env bootstrap.json default-role-prompt.md; do
|
||||||
|
[ -f "$BUNDLE/$file" ] || { echo "missing bundle file: $file" >&2; exit 1; }
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "[1/8] Verify immutable release"
|
||||||
|
"${SSH[@]}" "test -f '$BASE/releases/$RELEASE/.complete'"
|
||||||
|
|
||||||
|
echo "[2/8] Create dedicated database"
|
||||||
|
if ! "${SSH[@]}" "sudo -u postgres psql -Atqc \"select 1 from pg_database where datname='$DB_NAME'\"" | grep -qx 1; then
|
||||||
|
printf "CREATE ROLE %s LOGIN PASSWORD '%s';\nCREATE DATABASE %s OWNER %s;\n" \
|
||||||
|
"$DB_USER" "$DB_PASSWORD" "$DB_NAME" "$DB_USER" | "${SSH[@]}" sudo -u postgres psql -v ON_ERROR_STOP=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "[3/8] Seed instance keyring and service template"
|
||||||
|
set +e
|
||||||
|
"${SSH[@]}" "BASE='$BASE' HUB_DIR='$HUB_DIR' INSTANCE_ID='$INSTANCE_ID' WORKSPACE_ROOT='$WORKSPACE' PORT='$HUB_PORT' MEMORY_MAX='$MEMORY' CPU_QUOTA='$CPU' TASKS_MAX='$TASKS' bash '$HUB_DIR/deploy/install_service.sh'"
|
||||||
|
status=$?
|
||||||
|
set -e
|
||||||
|
[ "$status" -eq 0 ] || [ "$status" -eq 78 ] || exit "$status"
|
||||||
|
|
||||||
|
echo "[4/8] Upload root-only configuration"
|
||||||
|
remote_stage="/root/.cph-bootstrap-$INSTANCE_ID"
|
||||||
|
"${SSH[@]}" "install -d -o root -g root -m 0700 '$remote_stage'"
|
||||||
|
"${SCP[@]}" "$BUNDLE/platform.env" "$BUNDLE/bootstrap.json" "$BUNDLE/default-role-prompt.md" "$SSH_USER@$HOST:$remote_stage/"
|
||||||
|
"${SSH[@]}" "install -o root -g root -m 0600 '$remote_stage/platform.env' '$ENV_PATH'; chmod 0600 '$remote_stage/bootstrap.json' '$remote_stage/default-role-prompt.md'"
|
||||||
|
|
||||||
|
echo "[5/8] Migrate, install, and bootstrap"
|
||||||
|
"${SSH[@]}" "set -euo pipefail; set -a; . '$ENV_PATH'; set +a; node '$HUB_DIR/node_modules/prisma/build/index.js' migrate deploy --schema '$HUB_DIR/prisma/schema.prisma'; BASE='$BASE' HUB_DIR='$HUB_DIR' INSTANCE_ID='$INSTANCE_ID' WORKSPACE_ROOT='$WORKSPACE' PORT='$HUB_PORT' MEMORY_MAX='$MEMORY' CPU_QUOTA='$CPU' TASKS_MAX='$TASKS' bash '$HUB_DIR/deploy/install_service.sh'; node '$HUB_DIR/dist/deployment/bootstrap-silo-cli.js' --config-file '$remote_stage/bootstrap.json' --keyring-file '$KEYRING_PATH'"
|
||||||
|
|
||||||
|
echo "[6/8] Copy curated skills and configure default role"
|
||||||
|
"${SSH[@]}" "set -euo pipefail; stage='/var/lib/cph-hub/$INSTANCE_ID/state/operator-staging'; install -d -o cph-$INSTANCE_ID -g cph-$INSTANCE_ID -m 0700 \"\$stage/skills\"; install -o cph-$INSTANCE_ID -g cph-$INSTANCE_ID -m 0600 '$remote_stage/default-role-prompt.md' \"\$stage/default-role-prompt.md\"; for source in /var/lib/cph-hub/para-26071100/state/skills/versions/*; do name=\$(sed -n 's/^name: *//p' \"\$source/SKILL.md\" | head -n1); case \"\$name\" in outline|lesson-project|data-processing-spec|typst) cp -a \"\$source\" \"\$stage/skills/\$name\"; chown -R cph-$INSTANCE_ID:cph-$INSTANCE_ID \"\$stage/skills/\$name\";; esac; done; for name in outline lesson-project data-processing-spec typst; do INSTANCE_ID='$INSTANCE_ID' ENV_FILE='$ENV_PATH' HUB_DIR='$HUB_DIR' bash '$HUB_DIR/deploy/agent_config.sh' install-skill --organization '$ORG_ID' --source \"\$stage/skills/\$name\" --version 1; done; INSTANCE_ID='$INSTANCE_ID' ENV_FILE='$ENV_PATH' HUB_DIR='$HUB_DIR' bash '$HUB_DIR/deploy/agent_config.sh' upsert-role --organization '$ORG_ID' --role draft --label '智能助手' --system-prompt-file \"\$stage/default-role-prompt.md\" --tools-json null; INSTANCE_ID='$INSTANCE_ID' ENV_FILE='$ENV_PATH' HUB_DIR='$HUB_DIR' bash '$HUB_DIR/deploy/agent_config.sh' set-role-skills --organization '$ORG_ID' --role draft --skills outline,lesson-project,data-processing-spec,typst; rm -rf \"\$stage\""
|
||||||
|
|
||||||
|
echo "[7/8] Configure Nginx and TLS"
|
||||||
|
printf 'server { listen 80; listen [::]:80; server_name %s; client_max_body_size 2m; location / { proxy_pass http://127.0.0.1:%s; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $connection_upgrade; proxy_read_timeout 3600s; proxy_send_timeout 3600s; proxy_buffering off; } }\n' "$DOMAIN" "$HUB_PORT" | "${SSH[@]}" "install -o root -g root -m 0644 /dev/stdin '/etc/nginx/sites-available/$INSTANCE_ID'; ln -sfn '/etc/nginx/sites-available/$INSTANCE_ID' '/etc/nginx/sites-enabled/$INSTANCE_ID'; nginx -t; systemctl reload nginx; certbot --nginx --non-interactive --agree-tos --redirect --register-unsafely-without-email -d '$DOMAIN'"
|
||||||
|
|
||||||
|
echo "[8/8] Start and verify"
|
||||||
|
"${SSH[@]}" "systemctl enable --now '$UNIT'; systemctl is-active --quiet '$UNIT'; curl --fail --silent 'http://127.0.0.1:$HUB_PORT/api/healthz' >/dev/null; rm -f '$remote_stage/bootstrap.json'"
|
||||||
|
curl --fail --silent --show-error "$PUBLIC_URL/api/healthz" >/dev/null
|
||||||
|
echo "Deployed $INSTANCE_ID at $PUBLIC_URL"
|
||||||
@@ -9,6 +9,7 @@ KEYRING_FILE="${KEYRING_FILE:?KEYRING_FILE required}"
|
|||||||
BUSINESS_BACKUP_DIR="${BUSINESS_BACKUP_DIR:?BUSINESS_BACKUP_DIR required}"
|
BUSINESS_BACKUP_DIR="${BUSINESS_BACKUP_DIR:?BUSINESS_BACKUP_DIR required}"
|
||||||
RECOVERY_BACKUP_DIR="${RECOVERY_BACKUP_DIR:?RECOVERY_BACKUP_DIR required}"
|
RECOVERY_BACKUP_DIR="${RECOVERY_BACKUP_DIR:?RECOVERY_BACKUP_DIR required}"
|
||||||
SERVICE_UNIT="cph-hub-$INSTANCE_ID.service"
|
SERVICE_UNIT="cph-hub-$INSTANCE_ID.service"
|
||||||
|
SKILL_STORE_ROOT="${SKILL_STORE_ROOT:-/var/lib/cph-hub/$INSTANCE_ID/state/skills}"
|
||||||
|
|
||||||
[ "$(id -u)" -eq 0 ] || { echo "backup must run as root" >&2; exit 1; }
|
[ "$(id -u)" -eq 0 ] || { echo "backup must run as root" >&2; exit 1; }
|
||||||
umask 077
|
umask 077
|
||||||
@@ -37,12 +38,14 @@ set +a
|
|||||||
: "${DATABASE_URL:?DATABASE_URL missing from ENV_FILE}"
|
: "${DATABASE_URL:?DATABASE_URL missing from ENV_FILE}"
|
||||||
: "${HUB_PROJECT_WORKSPACE_ROOT:?HUB_PROJECT_WORKSPACE_ROOT missing from ENV_FILE}"
|
: "${HUB_PROJECT_WORKSPACE_ROOT:?HUB_PROJECT_WORKSPACE_ROOT missing from ENV_FILE}"
|
||||||
[ -d "$HUB_PROJECT_WORKSPACE_ROOT" ] || { echo "workspace root missing" >&2; exit 1; }
|
[ -d "$HUB_PROJECT_WORKSPACE_ROOT" ] || { echo "workspace root missing" >&2; exit 1; }
|
||||||
|
[ -d "$SKILL_STORE_ROOT" ] || { echo "skill store root missing" >&2; exit 1; }
|
||||||
|
|
||||||
install -d -o root -g root -m 0700 "$BUSINESS_BACKUP_DIR" "$RECOVERY_BACKUP_DIR"
|
install -d -o root -g root -m 0700 "$BUSINESS_BACKUP_DIR" "$RECOVERY_BACKUP_DIR"
|
||||||
business_root="$(realpath -m "$BUSINESS_BACKUP_DIR")"
|
business_root="$(realpath -m "$BUSINESS_BACKUP_DIR")"
|
||||||
recovery_root="$(realpath -m "$RECOVERY_BACKUP_DIR")"
|
recovery_root="$(realpath -m "$RECOVERY_BACKUP_DIR")"
|
||||||
workspace_root="$(realpath -m "$HUB_PROJECT_WORKSPACE_ROOT")"
|
workspace_root="$(realpath -m "$HUB_PROJECT_WORKSPACE_ROOT")"
|
||||||
secret_root="$(realpath -m "$(dirname "$KEYRING_FILE")")"
|
secret_root="$(realpath -m "$(dirname "$KEYRING_FILE")")"
|
||||||
|
skill_root="$(realpath -m "$SKILL_STORE_ROOT")"
|
||||||
paths_overlap() {
|
paths_overlap() {
|
||||||
local left="$1" right="$2"
|
local left="$1" right="$2"
|
||||||
[ "$left" = "$right" ] || [[ "$left/" == "$right/"* ]] || [[ "$right/" == "$left/"* ]]
|
[ "$left" = "$right" ] || [[ "$left/" == "$right/"* ]] || [[ "$right/" == "$left/"* ]]
|
||||||
@@ -58,6 +61,10 @@ for pair in \
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
if paths_overlap "$business_root" "$skill_root" || paths_overlap "$recovery_root" "$skill_root" || paths_overlap "$workspace_root" "$skill_root"; then
|
||||||
|
echo "backup destinations, workspace and skill store must not overlap: $skill_root" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
stamp="$(date -u +%Y%m%dT%H%M%SZ)"
|
stamp="$(date -u +%Y%m%dT%H%M%SZ)"
|
||||||
business="$business_root/$INSTANCE_ID-$stamp"
|
business="$business_root/$INSTANCE_ID-$stamp"
|
||||||
recovery="$recovery_root/$INSTANCE_ID-$stamp"
|
recovery="$recovery_root/$INSTANCE_ID-$stamp"
|
||||||
@@ -65,13 +72,14 @@ install -d -o root -g root -m 0700 "$business" "$recovery"
|
|||||||
|
|
||||||
pg_dump --format=custom --file="$business/database.dump" "$DATABASE_URL"
|
pg_dump --format=custom --file="$business/database.dump" "$DATABASE_URL"
|
||||||
tar --create --file="$business/workspaces.tar" --directory="$HUB_PROJECT_WORKSPACE_ROOT" .
|
tar --create --file="$business/workspaces.tar" --directory="$HUB_PROJECT_WORKSPACE_ROOT" .
|
||||||
|
tar --create --file="$business/agent-skills.tar" --directory="$SKILL_STORE_ROOT" .
|
||||||
cp --preserve=mode,ownership,timestamps "$KEYRING_FILE" "$recovery/secret-keyring.json"
|
cp --preserve=mode,ownership,timestamps "$KEYRING_FILE" "$recovery/secret-keyring.json"
|
||||||
cp --preserve=mode,ownership,timestamps "$ENV_FILE" "$recovery/platform.env"
|
cp --preserve=mode,ownership,timestamps "$ENV_FILE" "$recovery/platform.env"
|
||||||
chmod 0600 "$recovery/secret-keyring.json" "$recovery/platform.env"
|
chmod 0600 "$recovery/secret-keyring.json" "$recovery/platform.env"
|
||||||
|
|
||||||
(
|
(
|
||||||
cd "$business"
|
cd "$business"
|
||||||
sha256sum database.dump workspaces.tar > SHA256SUMS
|
sha256sum database.dump workspaces.tar agent-skills.tar > SHA256SUMS
|
||||||
)
|
)
|
||||||
(
|
(
|
||||||
cd "$recovery"
|
cd "$recovery"
|
||||||
|
|||||||
@@ -0,0 +1,59 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
|
||||||
|
import { readdir, readFile, realpath } from "node:fs/promises";
|
||||||
|
import { dirname, relative, resolve, sep } from "node:path";
|
||||||
|
|
||||||
|
const rootArgument = process.argv[2];
|
||||||
|
if (!rootArgument) throw new Error("usage: build_legacy_project_manifest.mjs <legacy-workspaces-root>");
|
||||||
|
const root = await realpath(rootArgument);
|
||||||
|
const projectFiles = await findProjectFiles(root);
|
||||||
|
const seenIds = new Set();
|
||||||
|
const manifest = [];
|
||||||
|
for (const projectFile of projectFiles) {
|
||||||
|
const metadata = JSON.parse(await readFile(projectFile, "utf8"));
|
||||||
|
if (typeof metadata.id !== "string" || metadata.id.trim() === "") {
|
||||||
|
throw new Error(`project metadata has no id: ${projectFile}`);
|
||||||
|
}
|
||||||
|
if (seenIds.has(metadata.id)) throw new Error(`duplicate project id: ${metadata.id}`);
|
||||||
|
seenIds.add(metadata.id);
|
||||||
|
if (typeof metadata.name !== "string" || metadata.name.trim() === "") {
|
||||||
|
throw new Error(`project metadata has no name: ${projectFile}`);
|
||||||
|
}
|
||||||
|
const projectRoot = dirname(projectFile);
|
||||||
|
const sourceRelativePath = relative(root, projectRoot).split(sep).join("/");
|
||||||
|
const physicalFolderPath = dirname(sourceRelativePath) === "."
|
||||||
|
? []
|
||||||
|
: dirname(sourceRelativePath).split("/");
|
||||||
|
if (metadata.folderPath !== undefined && (
|
||||||
|
!Array.isArray(metadata.folderPath)
|
||||||
|
|| metadata.folderPath.some((part) => typeof part !== "string")
|
||||||
|
|| JSON.stringify(metadata.folderPath) !== JSON.stringify(physicalFolderPath)
|
||||||
|
)) {
|
||||||
|
process.stderr.write(`[legacy-manifest] stale metadata folderPath; using physical path: ${projectFile}\n`);
|
||||||
|
}
|
||||||
|
manifest.push({
|
||||||
|
legacyId: metadata.id,
|
||||||
|
name: metadata.name,
|
||||||
|
folderPath: physicalFolderPath,
|
||||||
|
sourceRelativePath,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
manifest.sort((left, right) => left.sourceRelativePath.localeCompare(right.sourceRelativePath, "zh-CN"));
|
||||||
|
process.stdout.write(`${JSON.stringify(manifest, null, 2)}\n`);
|
||||||
|
|
||||||
|
async function findProjectFiles(directory) {
|
||||||
|
const entries = await readdir(directory, { withFileTypes: true });
|
||||||
|
const projectMetadata = entries.find((entry) => entry.isFile() && entry.name === "project.json");
|
||||||
|
if (projectMetadata !== undefined) return [resolve(directory, projectMetadata.name)];
|
||||||
|
const found = [];
|
||||||
|
for (const entry of entries) {
|
||||||
|
if (entry.name === ".trash") continue;
|
||||||
|
const path = resolve(directory, entry.name);
|
||||||
|
if (entry.isSymbolicLink()) {
|
||||||
|
process.stderr.write(`[legacy-manifest] skip untracked symbolic link: ${path}\n`);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (entry.isDirectory()) found.push(...await findProjectFiles(path));
|
||||||
|
}
|
||||||
|
return found;
|
||||||
|
}
|
||||||
@@ -18,6 +18,7 @@ EnvironmentFile=__ENV_FILE__
|
|||||||
Environment=HOME=__SERVICE_HOME__
|
Environment=HOME=__SERVICE_HOME__
|
||||||
Environment=XDG_STATE_HOME=__STATE_DIR__
|
Environment=XDG_STATE_HOME=__STATE_DIR__
|
||||||
Environment=XDG_CACHE_HOME=__CACHE_DIR__
|
Environment=XDG_CACHE_HOME=__CACHE_DIR__
|
||||||
|
Environment=HUB_SKILL_STORE_ROOT=__SKILL_STORE_ROOT__
|
||||||
Environment=PATH=__RUNTIME_PATH__
|
Environment=PATH=__RUNTIME_PATH__
|
||||||
# ADR-0024: the root-owned source remains unreadable by the service account;
|
# ADR-0024: the root-owned source remains unreadable by the service account;
|
||||||
# systemd materializes a read-only per-unit credential at runtime.
|
# systemd materializes a read-only per-unit credential at runtime.
|
||||||
|
|||||||
@@ -0,0 +1,222 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Publish one immutable Hub release (tsc + admin-web SPA) to the managed host,
|
||||||
|
# then repoint every Silo in the chosen fleet to that release and restart it.
|
||||||
|
#
|
||||||
|
# Fleet is selected by the middle DNS label of each Silo's HUB_PUBLIC_BASE_URL:
|
||||||
|
#
|
||||||
|
# prod → https://<slug>.educraft.paradigm-edu.net
|
||||||
|
# dev → https://<slug>.educraft-dev.paradigm-edu.net
|
||||||
|
#
|
||||||
|
# Example tenant (prod):
|
||||||
|
# https://para-26071100.educraft.paradigm-edu.net/auth/feishu/para-26071100
|
||||||
|
#
|
||||||
|
# Configure (CI secrets / env):
|
||||||
|
# CPH_FLEET required: dev | prod
|
||||||
|
# PLATFORM_DEPLOY_HOST default 39.107.254.4
|
||||||
|
# PLATFORM_DEPLOY_USER default root
|
||||||
|
# PLATFORM_DEPLOY_SSH_KEY required (path to private key)
|
||||||
|
# PLATFORM_DEPLOY_PORT default 22
|
||||||
|
# PLATFORM_DEPLOY_BASE default /srv/curriculum-project-hub
|
||||||
|
# PLATFORM_DEPLOY_RELEASE default git HEAD (must be safe for paths)
|
||||||
|
# ALLOW_EMPTY_FLEET optional: if 1, succeed when no silo matches
|
||||||
|
#
|
||||||
|
# This is a code-roll for existing silos. It does not create databases, domains,
|
||||||
|
# or Feishu apps — use new_silo.sh / apply_new_silo.sh for that.
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
FLEET="${CPH_FLEET:?CPH_FLEET required (dev|prod)}"
|
||||||
|
case "$FLEET" in
|
||||||
|
dev) FLEET_DOMAIN_SUFFIX="educraft-dev.paradigm-edu.net" ;;
|
||||||
|
prod) FLEET_DOMAIN_SUFFIX="educraft.paradigm-edu.net" ;;
|
||||||
|
*)
|
||||||
|
echo "CPH_FLEET must be dev or prod, got: $FLEET" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
HOST="${PLATFORM_DEPLOY_HOST:-39.107.254.4}"
|
||||||
|
DEPLOY_USER="${PLATFORM_DEPLOY_USER:-root}"
|
||||||
|
PORT="${PLATFORM_DEPLOY_PORT:-22}"
|
||||||
|
SSH_KEY="${PLATFORM_DEPLOY_SSH_KEY:?PLATFORM_DEPLOY_SSH_KEY required}"
|
||||||
|
BASE="${PLATFORM_DEPLOY_BASE:-/srv/curriculum-project-hub}"
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
|
||||||
|
RELEASE_ID="${PLATFORM_DEPLOY_RELEASE:-$(git -C "$REPO_ROOT" rev-parse --verify HEAD)}"
|
||||||
|
[[ "$RELEASE_ID" =~ ^[A-Za-z0-9._-]+$ ]] || {
|
||||||
|
echo "invalid PLATFORM_DEPLOY_RELEASE: $RELEASE_ID" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
ALLOW_EMPTY_FLEET="${ALLOW_EMPTY_FLEET:-0}"
|
||||||
|
|
||||||
|
HUB_DIR="$BASE/releases/$RELEASE_ID/hub"
|
||||||
|
RELEASE_DIR="$BASE/releases/$RELEASE_ID"
|
||||||
|
SSH_OPTS=(-i "$SSH_KEY" -p "$PORT" -o BatchMode=yes -o StrictHostKeyChecking=accept-new)
|
||||||
|
|
||||||
|
echo "[fleet] fleet=$FLEET domain=*.$FLEET_DOMAIN_SUFFIX host=$DEPLOY_USER@$HOST release=$RELEASE_ID"
|
||||||
|
|
||||||
|
# --- 1. Publish immutable release (shared; flock so parallel fleet jobs do not race) ---
|
||||||
|
release_ready=false
|
||||||
|
if ssh "${SSH_OPTS[@]}" "$DEPLOY_USER@$HOST" "test -f '$RELEASE_DIR/.complete'"; then
|
||||||
|
release_ready=true
|
||||||
|
echo "[fleet] release already complete: $RELEASE_DIR"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$release_ready" = false ]; then
|
||||||
|
# Drop a prior incomplete tree for this release id (failed CI leave leftovers).
|
||||||
|
ssh "${SSH_OPTS[@]}" "$DEPLOY_USER@$HOST" bash -s <<REMOTE
|
||||||
|
set -euo pipefail
|
||||||
|
flock /var/lock/cph-hub-release-publish bash -c '
|
||||||
|
set -euo pipefail
|
||||||
|
if [ -f "$RELEASE_DIR/.complete" ]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
if [ -e "$RELEASE_DIR" ]; then
|
||||||
|
echo "[fleet] removing incomplete release: $RELEASE_DIR"
|
||||||
|
rm -rf "$RELEASE_DIR"
|
||||||
|
fi
|
||||||
|
mkdir -p "$HUB_DIR"
|
||||||
|
'
|
||||||
|
REMOTE
|
||||||
|
|
||||||
|
echo "[fleet] rsync hub → $HUB_DIR"
|
||||||
|
rsync -az --delete \
|
||||||
|
--exclude node_modules --exclude dist --exclude .env \
|
||||||
|
--exclude admin-web/node_modules --exclude admin-web/build --exclude admin-web/.svelte-kit \
|
||||||
|
-e "ssh ${SSH_OPTS[*]}" \
|
||||||
|
"$REPO_ROOT/hub/" "$DEPLOY_USER@$HOST:$HUB_DIR/"
|
||||||
|
|
||||||
|
echo "[fleet] npm ci + build (tsc + admin-web SPA)"
|
||||||
|
ssh "${SSH_OPTS[@]}" "$DEPLOY_USER@$HOST" bash -s <<REMOTE
|
||||||
|
set -euo pipefail
|
||||||
|
flock /var/lock/cph-hub-release-publish bash -c '
|
||||||
|
set -euo pipefail
|
||||||
|
if [ -f "$RELEASE_DIR/.complete" ]; then
|
||||||
|
echo "[fleet] release completed by another job"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
cd "$HUB_DIR"
|
||||||
|
PUPPETEER_SKIP_DOWNLOAD=1 npm ci
|
||||||
|
npm ci --prefix admin-web
|
||||||
|
npm run audit:production
|
||||||
|
npm run build
|
||||||
|
test -f admin-web/build/index.html
|
||||||
|
touch "$RELEASE_DIR/.complete"
|
||||||
|
'
|
||||||
|
REMOTE
|
||||||
|
fi
|
||||||
|
|
||||||
|
# --- 2. Discover silos in this fleet and roll them onto the release ---
|
||||||
|
ssh "${SSH_OPTS[@]}" "$DEPLOY_USER@$HOST" \
|
||||||
|
env BASE="$BASE" HUB_DIR="$HUB_DIR" FLEET="$FLEET" \
|
||||||
|
FLEET_DOMAIN_SUFFIX="$FLEET_DOMAIN_SUFFIX" ALLOW_EMPTY_FLEET="$ALLOW_EMPTY_FLEET" \
|
||||||
|
bash -s <<'REMOTE'
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
fleet_match() {
|
||||||
|
local public_url="$1"
|
||||||
|
local host="${public_url#https://}"
|
||||||
|
host="${host#http://}"
|
||||||
|
host="${host%%/*}"
|
||||||
|
host="${host%%:*}"
|
||||||
|
case "$FLEET" in
|
||||||
|
prod)
|
||||||
|
[[ "$host" == *."$FLEET_DOMAIN_SUFFIX" || "$host" == "$FLEET_DOMAIN_SUFFIX" ]] || return 1
|
||||||
|
# Avoid matching educraft-dev when suffix is educraft.…
|
||||||
|
[[ "$host" != *.educraft-dev.paradigm-edu.net && "$host" != educraft-dev.paradigm-edu.net ]] || return 1
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
dev)
|
||||||
|
[[ "$host" == *."$FLEET_DOMAIN_SUFFIX" || "$host" == "$FLEET_DOMAIN_SUFFIX" ]]
|
||||||
|
return
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
return 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
env_value() {
|
||||||
|
local file="$1"
|
||||||
|
local key="$2"
|
||||||
|
# Do not source secrets — only read the KEY=value line.
|
||||||
|
local line
|
||||||
|
line="$(grep -E "^${key}=" "$file" | tail -n1 || true)"
|
||||||
|
printf '%s' "${line#"${key}="}"
|
||||||
|
}
|
||||||
|
|
||||||
|
matched=0
|
||||||
|
shopt -s nullglob
|
||||||
|
for env_file in "$BASE"/.secrets/*/platform.env; do
|
||||||
|
instance_id="$(basename "$(dirname "$env_file")")"
|
||||||
|
public_url="$(env_value "$env_file" HUB_PUBLIC_BASE_URL)"
|
||||||
|
if [ -z "$public_url" ]; then
|
||||||
|
echo "[fleet] skip $instance_id: HUB_PUBLIC_BASE_URL empty"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
if ! fleet_match "$public_url"; then
|
||||||
|
echo "[fleet] skip $instance_id: $public_url (not $FLEET)"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
port="$(env_value "$env_file" PORT)"
|
||||||
|
workspace="$(env_value "$env_file" HUB_PROJECT_WORKSPACE_ROOT)"
|
||||||
|
unit="cph-hub-${instance_id}.service"
|
||||||
|
if [ ! -f "/etc/systemd/system/$unit" ]; then
|
||||||
|
echo "[fleet] skip $instance_id: unit missing ($unit)" >&2
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Prefer unit file ceilings (MemoryMax=16G) over systemctl's byte form.
|
||||||
|
memory_max="$(sed -n 's/^MemoryMax=//p' "/etc/systemd/system/$unit" | tail -n1)"
|
||||||
|
cpu_quota="$(sed -n 's/^CPUQuota=//p' "/etc/systemd/system/$unit" | tail -n1)"
|
||||||
|
tasks_max="$(sed -n 's/^TasksMax=//p' "/etc/systemd/system/$unit" | tail -n1)"
|
||||||
|
|
||||||
|
if [ -z "$port" ] || [ -z "$workspace" ] || [ -z "$memory_max" ] || [ -z "$cpu_quota" ] || [ -z "$tasks_max" ]; then
|
||||||
|
echo "[fleet] error: $instance_id missing PORT/workspace/ceilings (port=$port workspace=$workspace memory=$memory_max cpu=$cpu_quota tasks=$tasks_max)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "[fleet] roll $instance_id → $HUB_DIR ($public_url port=$port)"
|
||||||
|
BASE="$BASE" \
|
||||||
|
HUB_DIR="$HUB_DIR" \
|
||||||
|
INSTANCE_ID="$instance_id" \
|
||||||
|
WORKSPACE_ROOT="$workspace" \
|
||||||
|
PORT="$port" \
|
||||||
|
MEMORY_MAX="$memory_max" \
|
||||||
|
CPU_QUOTA="$cpu_quota" \
|
||||||
|
TASKS_MAX="$tasks_max" \
|
||||||
|
bash "$HUB_DIR/deploy/install_service.sh"
|
||||||
|
|
||||||
|
systemctl restart "$unit"
|
||||||
|
systemctl is-active --quiet "$unit"
|
||||||
|
|
||||||
|
health="http://127.0.0.1:${port}/api/healthz"
|
||||||
|
ok=false
|
||||||
|
for _ in $(seq 1 45); do
|
||||||
|
if curl --fail --silent "$health" >/dev/null 2>&1; then
|
||||||
|
ok=true
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
if [ "$ok" != true ]; then
|
||||||
|
curl --fail --silent --show-error "$health" >/dev/null
|
||||||
|
fi
|
||||||
|
echo "[fleet] healthy $instance_id ($health)"
|
||||||
|
matched=$((matched + 1))
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ "$matched" -eq 0 ]; then
|
||||||
|
msg="[fleet] no silos matched *.$FLEET_DOMAIN_SUFFIX under $BASE/.secrets"
|
||||||
|
if [ "$ALLOW_EMPTY_FLEET" = "1" ]; then
|
||||||
|
echo "$msg (ALLOW_EMPTY_FLEET=1)"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
echo "$msg" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "[fleet] rolled $matched silo(s) on $FLEET"
|
||||||
|
REMOTE
|
||||||
|
|
||||||
|
echo "[fleet] done fleet=$FLEET release=$RELEASE_ID hub=$HUB_DIR"
|
||||||
@@ -60,9 +60,10 @@ if [ "$release_ready" = false ]; then
|
|||||||
-e "ssh ${SSH_OPTS[*]}" \
|
-e "ssh ${SSH_OPTS[*]}" \
|
||||||
"$REPO_ROOT/hub/" "$DEPLOY_USER@$HOST:$HUB_DIR/"
|
"$REPO_ROOT/hub/" "$DEPLOY_USER@$HOST:$HUB_DIR/"
|
||||||
|
|
||||||
# 2. Install deps, audit and build, then atomically mark the release 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.
|
||||||
ssh "${SSH_OPTS[@]}" "$DEPLOY_USER@$HOST" \
|
ssh "${SSH_OPTS[@]}" "$DEPLOY_USER@$HOST" \
|
||||||
"cd '$HUB_DIR' && npm ci && 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.
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ SERVICE_GROUP="${SERVICE_GROUP:-$SERVICE_USER}"
|
|||||||
SERVICE_HOME="${SERVICE_HOME:-/var/lib/cph-hub/$INSTANCE_ID/home}"
|
SERVICE_HOME="${SERVICE_HOME:-/var/lib/cph-hub/$INSTANCE_ID/home}"
|
||||||
STATE_DIR="${STATE_DIR:-/var/lib/cph-hub/$INSTANCE_ID/state}"
|
STATE_DIR="${STATE_DIR:-/var/lib/cph-hub/$INSTANCE_ID/state}"
|
||||||
CACHE_DIR="${CACHE_DIR:-/var/cache/cph-hub/$INSTANCE_ID}"
|
CACHE_DIR="${CACHE_DIR:-/var/cache/cph-hub/$INSTANCE_ID}"
|
||||||
|
SKILL_STORE_ROOT="${SKILL_STORE_ROOT:-$STATE_DIR/skills}"
|
||||||
WORKSPACE_ROOT="${WORKSPACE_ROOT:?WORKSPACE_ROOT required (use a short per-Silo path such as /w/997)}"
|
WORKSPACE_ROOT="${WORKSPACE_ROOT:?WORKSPACE_ROOT required (use a short per-Silo path such as /w/997)}"
|
||||||
HOST="${HOST:-127.0.0.1}"
|
HOST="${HOST:-127.0.0.1}"
|
||||||
PORT="${PORT:?PORT is required and must be unique on the host}"
|
PORT="${PORT:?PORT is required and must be unique on the host}"
|
||||||
@@ -105,6 +106,7 @@ for pair in \
|
|||||||
"SERVICE_HOME:$SERVICE_HOME" \
|
"SERVICE_HOME:$SERVICE_HOME" \
|
||||||
"STATE_DIR:$STATE_DIR" \
|
"STATE_DIR:$STATE_DIR" \
|
||||||
"CACHE_DIR:$CACHE_DIR" \
|
"CACHE_DIR:$CACHE_DIR" \
|
||||||
|
"SKILL_STORE_ROOT:$SKILL_STORE_ROOT" \
|
||||||
"WORKSPACE_ROOT:$WORKSPACE_ROOT" \
|
"WORKSPACE_ROOT:$WORKSPACE_ROOT" \
|
||||||
"ENV_FILE:$ENV_FILE" \
|
"ENV_FILE:$ENV_FILE" \
|
||||||
"KEYRING_FILE:$KEYRING_FILE" \
|
"KEYRING_FILE:$KEYRING_FILE" \
|
||||||
@@ -281,6 +283,7 @@ provision_directory() {
|
|||||||
provision_directory "$SERVICE_HOME"
|
provision_directory "$SERVICE_HOME"
|
||||||
provision_directory "$STATE_DIR"
|
provision_directory "$STATE_DIR"
|
||||||
provision_directory "$CACHE_DIR"
|
provision_directory "$CACHE_DIR"
|
||||||
|
provision_directory "$SKILL_STORE_ROOT"
|
||||||
provision_directory "$WORKSPACE_ROOT"
|
provision_directory "$WORKSPACE_ROOT"
|
||||||
|
|
||||||
# Resolve every provisioned path again and verify uid/gid/mode before writing
|
# Resolve every provisioned path again and verify uid/gid/mode before writing
|
||||||
@@ -297,6 +300,7 @@ sed \
|
|||||||
-e "s|__SERVICE_HOME__|$SERVICE_HOME|g" \
|
-e "s|__SERVICE_HOME__|$SERVICE_HOME|g" \
|
||||||
-e "s|__STATE_DIR__|$STATE_DIR|g" \
|
-e "s|__STATE_DIR__|$STATE_DIR|g" \
|
||||||
-e "s|__CACHE_DIR__|$CACHE_DIR|g" \
|
-e "s|__CACHE_DIR__|$CACHE_DIR|g" \
|
||||||
|
-e "s|__SKILL_STORE_ROOT__|$SKILL_STORE_ROOT|g" \
|
||||||
-e "s|__WORKSPACE_ROOT__|$WORKSPACE_ROOT|g" \
|
-e "s|__WORKSPACE_ROOT__|$WORKSPACE_ROOT|g" \
|
||||||
-e "s|__HUB_DIR__|$HUB_DIR|g" \
|
-e "s|__HUB_DIR__|$HUB_DIR|g" \
|
||||||
-e "s|__ENV_FILE__|$ENV_FILE|g" \
|
-e "s|__ENV_FILE__|$ENV_FILE|g" \
|
||||||
@@ -315,5 +319,5 @@ install -o root -g root -m 0644 "$TMP_UNIT" "$UNIT"
|
|||||||
systemctl daemon-reload
|
systemctl daemon-reload
|
||||||
systemctl enable "$SERVICE_UNIT"
|
systemctl enable "$SERVICE_UNIT"
|
||||||
echo "[install] installed $SERVICE_UNIT for $SERVICE_USER:$SERVICE_GROUP"
|
echo "[install] installed $SERVICE_UNIT for $SERVICE_USER:$SERVICE_GROUP"
|
||||||
echo "[install] home=$SERVICE_HOME state=$STATE_DIR cache=$CACHE_DIR workspaces=$WORKSPACE_ROOT"
|
echo "[install] home=$SERVICE_HOME state=$STATE_DIR cache=$CACHE_DIR skills=$SKILL_STORE_ROOT workspaces=$WORKSPACE_ROOT"
|
||||||
echo "[install] start with: systemctl start $SERVICE_UNIT"
|
echo "[install] start with: systemctl start $SERVICE_UNIT"
|
||||||
|
|||||||
@@ -0,0 +1,412 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
#
|
||||||
|
# A wizard — walks a human through a manual procedure step by step.
|
||||||
|
# Generated by the /wizard skill.
|
||||||
|
#
|
||||||
|
# Everything above the "STAGES" marker is the wizard library: do not hand-edit
|
||||||
|
# it. Author the per-step stages below the marker.
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
# ──────────────────────────────────────────────────────────────────────────
|
||||||
|
# Wizard library — delightful, consistent UX. Identical across every wizard.
|
||||||
|
# ──────────────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
if [[ -t 1 ]] && command -v tput >/dev/null 2>&1 && [[ "$(tput colors 2>/dev/null || echo 0)" -ge 8 ]]; then
|
||||||
|
BOLD=$(tput bold); DIM=$(tput dim); RESET=$(tput sgr0)
|
||||||
|
BLUE=$(tput setaf 4); GREEN=$(tput setaf 2); YELLOW=$(tput setaf 3); RED=$(tput setaf 1)
|
||||||
|
else
|
||||||
|
BOLD=""; DIM=""; RESET=""; BLUE=""; GREEN=""; YELLOW=""; RED=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Author sets these two at the top of the stages section.
|
||||||
|
TOTAL_STAGES=0
|
||||||
|
TOTAL_MINUTES=0
|
||||||
|
|
||||||
|
_STAGE_INDEX=0
|
||||||
|
_MINUTES_ELAPSED=0
|
||||||
|
ENV_FILE="${ENV_FILE:-.env}"
|
||||||
|
WRITTEN_ENV=() # KEYs written to ENV_FILE this run
|
||||||
|
WRITTEN_SECRET=() # secret NAMEs set this run
|
||||||
|
SKIPPED=() # things we couldn't do (e.g. gh missing)
|
||||||
|
|
||||||
|
# _clear — wipe the terminal so only the current step is on screen. No-op when
|
||||||
|
# output isn't a terminal, so piped logs stay readable.
|
||||||
|
_clear() {
|
||||||
|
[[ -t 1 ]] || return 0
|
||||||
|
if command -v tput >/dev/null 2>&1; then tput clear; else printf '\033[2J\033[3J\033[H'; fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# banner "Title" — opening frame: what this wizard does and how long it takes.
|
||||||
|
banner() {
|
||||||
|
_clear
|
||||||
|
printf '\n%s%s %s%s\n' "$BOLD" "$BLUE" "$1" "$RESET"
|
||||||
|
printf '%s %s stages · about %s minutes%s\n\n' \
|
||||||
|
"$DIM" "$TOTAL_STAGES" "$TOTAL_MINUTES" "$RESET"
|
||||||
|
printf '%s You drive the browser; this wizard tells you exactly what to do and\n' "$DIM"
|
||||||
|
printf ' captures the values you copy back. Stop any time with Ctrl-C and re-run\n'
|
||||||
|
printf ' later — it remembers values already saved.%s\n' "$RESET"
|
||||||
|
pause "Ready to start?"
|
||||||
|
}
|
||||||
|
|
||||||
|
# stage "Name" <minutes> — clear the screen, then announce a stage and show
|
||||||
|
# progress + time remaining. Clearing keeps only the current step on screen.
|
||||||
|
stage() {
|
||||||
|
_clear
|
||||||
|
_STAGE_INDEX=$((_STAGE_INDEX + 1))
|
||||||
|
local remaining=$((TOTAL_MINUTES - _MINUTES_ELAPSED))
|
||||||
|
(( remaining < 0 )) && remaining=0
|
||||||
|
_MINUTES_ELAPSED=$((_MINUTES_ELAPSED + ${2:-0}))
|
||||||
|
printf '\n%s%s▸ Stage %s/%s · %s%s %s(~%s min left)%s\n' \
|
||||||
|
"$BOLD" "$BLUE" "$_STAGE_INDEX" "$TOTAL_STAGES" "$1" "$RESET" "$DIM" "$remaining" "$RESET"
|
||||||
|
}
|
||||||
|
|
||||||
|
# say "..." — a plain instruction line.
|
||||||
|
say() { printf ' %s\n' "$1"; }
|
||||||
|
# step "..." — a numbered-feeling action the human takes in the browser.
|
||||||
|
step() { printf ' %s•%s %s\n' "$BLUE" "$RESET" "$1"; }
|
||||||
|
note() { printf ' %s%s%s\n' "$DIM" "$1" "$RESET"; }
|
||||||
|
warn() { printf ' %s⚠ %s%s\n' "$YELLOW" "$1" "$RESET"; }
|
||||||
|
|
||||||
|
# open_url URL — open in the human's browser, cross-platform incl. WSL.
|
||||||
|
open_url() {
|
||||||
|
local url="$1"
|
||||||
|
printf ' %s↗ opening%s %s\n' "$GREEN" "$RESET" "$url"
|
||||||
|
{ if command -v wslview >/dev/null 2>&1; then wslview "$url"
|
||||||
|
elif command -v explorer.exe >/dev/null 2>&1; then explorer.exe "$url"
|
||||||
|
elif command -v xdg-open >/dev/null 2>&1; then xdg-open "$url"
|
||||||
|
elif command -v open >/dev/null 2>&1; then open "$url"
|
||||||
|
else warn "couldn't open a browser — visit it manually: $url"; fi
|
||||||
|
} >/dev/null 2>&1 || warn "couldn't open a browser — visit it manually: $url"
|
||||||
|
}
|
||||||
|
|
||||||
|
# pause "msg" — wait for the human to confirm they've done the manual part.
|
||||||
|
pause() {
|
||||||
|
printf ' %s%s%s ' "$DIM" "${1:-Press Enter to continue}" "$RESET"
|
||||||
|
read -r _ || true
|
||||||
|
}
|
||||||
|
|
||||||
|
# confirm "question" — y/N gate; returns success on yes.
|
||||||
|
confirm() {
|
||||||
|
local reply=""
|
||||||
|
printf ' %s? %s [y/N] ' "$YELLOW" "$1"
|
||||||
|
read -r reply || true
|
||||||
|
[[ "$reply" =~ ^[Yy] ]]
|
||||||
|
}
|
||||||
|
|
||||||
|
# _existing KEY — current value of KEY in ENV_FILE, if any.
|
||||||
|
_existing() {
|
||||||
|
[[ -f "$ENV_FILE" ]] || return 1
|
||||||
|
local line; line=$(grep -E "^${1}=" "$ENV_FILE" | tail -n1) || return 1
|
||||||
|
printf '%s' "${line#*=}"
|
||||||
|
}
|
||||||
|
|
||||||
|
# ask KEY "Prompt" — read a value into $KEY. Offers the existing .env value as
|
||||||
|
# a default on re-runs (Enter keeps it). Visible input (non-secret).
|
||||||
|
ask() {
|
||||||
|
local key="$1" prompt="$2" current input
|
||||||
|
current=$(_existing "$key" || true)
|
||||||
|
if [[ -n "$current" ]]; then
|
||||||
|
printf ' %s%s%s %s[Enter keeps current]%s ' "$BOLD" "$prompt" "$RESET" "$DIM" "$RESET"
|
||||||
|
else
|
||||||
|
printf ' %s%s%s ' "$BOLD" "$prompt" "$RESET"
|
||||||
|
fi
|
||||||
|
read -r input || true
|
||||||
|
[[ -z "$input" && -n "$current" ]] && input="$current"
|
||||||
|
printf -v "$key" '%s' "$input"
|
||||||
|
}
|
||||||
|
|
||||||
|
# ask_secret KEY "Prompt" — like ask, but input is hidden.
|
||||||
|
ask_secret() {
|
||||||
|
local key="$1" prompt="$2" current input
|
||||||
|
current=$(_existing "$key" || true)
|
||||||
|
if [[ -n "$current" ]]; then
|
||||||
|
printf ' %s%s%s %s[Enter keeps current]%s ' "$BOLD" "$prompt" "$RESET" "$DIM" "$RESET"
|
||||||
|
else
|
||||||
|
printf ' %s%s%s ' "$BOLD" "$prompt" "$RESET"
|
||||||
|
fi
|
||||||
|
read -rs input || true
|
||||||
|
printf '\n'
|
||||||
|
[[ -z "$input" && -n "$current" ]] && input="$current"
|
||||||
|
printf -v "$key" '%s' "$input"
|
||||||
|
}
|
||||||
|
|
||||||
|
# write_env KEY VALUE — upsert KEY=VALUE into ENV_FILE (creates it; replaces
|
||||||
|
# any existing line). Idempotent.
|
||||||
|
write_env() {
|
||||||
|
local key="$1" value="$2" tmp
|
||||||
|
touch "$ENV_FILE"
|
||||||
|
tmp=$(mktemp)
|
||||||
|
grep -vE "^${key}=" "$ENV_FILE" > "$tmp" || true
|
||||||
|
printf '%s=%s\n' "$key" "$value" >> "$tmp"
|
||||||
|
mv "$tmp" "$ENV_FILE"
|
||||||
|
WRITTEN_ENV+=("$key")
|
||||||
|
printf ' %s✓ wrote%s %s → %s\n' "$GREEN" "$RESET" "$key" "$ENV_FILE"
|
||||||
|
}
|
||||||
|
|
||||||
|
# set_secret NAME VALUE — set a GitHub Actions repo secret via gh. Falls back
|
||||||
|
# to a warning (and records it) if gh is unavailable or unauthenticated.
|
||||||
|
set_secret() {
|
||||||
|
local name="$1" value="$2"
|
||||||
|
if command -v gh >/dev/null 2>&1 && gh auth status >/dev/null 2>&1; then
|
||||||
|
if printf '%s' "$value" | gh secret set "$name" >/dev/null 2>&1; then
|
||||||
|
WRITTEN_SECRET+=("$name")
|
||||||
|
printf ' %s✓ set%s GitHub secret %s\n' "$GREEN" "$RESET" "$name"
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
SKIPPED+=("GitHub secret $name (set it manually: gh secret set $name)")
|
||||||
|
warn "skipped GitHub secret $name — gh not ready; set it later"
|
||||||
|
}
|
||||||
|
|
||||||
|
# set_var NAME VALUE — set a GitHub Actions repo variable (non-secret).
|
||||||
|
set_var() {
|
||||||
|
local name="$1" value="$2"
|
||||||
|
if command -v gh >/dev/null 2>&1 && gh auth status >/dev/null 2>&1; then
|
||||||
|
if gh variable set "$name" --body "$value" >/dev/null 2>&1; then
|
||||||
|
printf ' %s✓ set%s GitHub variable %s\n' "$GREEN" "$RESET" "$name"
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
SKIPPED+=("GitHub variable $name")
|
||||||
|
warn "skipped GitHub variable $name — gh not ready; set it later"
|
||||||
|
}
|
||||||
|
|
||||||
|
# finish — clear, then a closing summary of everything configured.
|
||||||
|
finish() {
|
||||||
|
_clear
|
||||||
|
printf '\n%s%s ✓ Setup complete%s\n' "$BOLD" "$GREEN" "$RESET"
|
||||||
|
(( ${#WRITTEN_ENV[@]} )) && note "wrote ${#WRITTEN_ENV[@]} value(s) to $ENV_FILE: ${WRITTEN_ENV[*]}"
|
||||||
|
(( ${#WRITTEN_SECRET[@]} )) && note "set ${#WRITTEN_SECRET[@]} GitHub secret(s): ${WRITTEN_SECRET[*]}"
|
||||||
|
if (( ${#SKIPPED[@]} )); then
|
||||||
|
printf '\n'; warn "still to do by hand:"
|
||||||
|
for s in "${SKIPPED[@]}"; do note " - $s"; done
|
||||||
|
fi
|
||||||
|
printf '\n'
|
||||||
|
}
|
||||||
|
|
||||||
|
# ──────────────────────────────────────────────────────────────────────────
|
||||||
|
# STAGES — author this section. One stage() per step the human takes.
|
||||||
|
# Replace the example below. Set the two totals to match the stages you write.
|
||||||
|
# ──────────────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
TOTAL_STAGES=7
|
||||||
|
TOTAL_MINUTES=35
|
||||||
|
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
|
||||||
|
PLAN_ROOT="${CPH_SILO_PLAN_ROOT:-$HOME/.cph-silo-plans}"
|
||||||
|
umask 077
|
||||||
|
|
||||||
|
require_value() {
|
||||||
|
local key="$1" value="$2"
|
||||||
|
[[ -n "$value" ]] || { warn "$key is required"; exit 1; }
|
||||||
|
[[ "$value" != *$'\n'* && "$value" != *$'\r'* ]] || {
|
||||||
|
warn "$key must be a single line"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
seed_default() {
|
||||||
|
local key="$1" value="$2"
|
||||||
|
_existing "$key" >/dev/null 2>&1 || write_env "$key" "$value"
|
||||||
|
}
|
||||||
|
|
||||||
|
capture() {
|
||||||
|
local key="$1" prompt="$2"
|
||||||
|
ask "$key" "$prompt"
|
||||||
|
require_value "$key" "${!key}"
|
||||||
|
write_env "$key" "${!key}"
|
||||||
|
}
|
||||||
|
|
||||||
|
capture_secret() {
|
||||||
|
local key="$1" prompt="$2"
|
||||||
|
ask_secret "$key" "$prompt"
|
||||||
|
require_value "$key" "${!key}"
|
||||||
|
write_env "$key" "${!key}"
|
||||||
|
}
|
||||||
|
|
||||||
|
allocate_host_slot() {
|
||||||
|
local allocation local_reserved="" answers_file reserved_port
|
||||||
|
for answers_file in "$PLAN_ROOT"/*/answers.env; do
|
||||||
|
[ -f "$answers_file" ] || continue
|
||||||
|
reserved_port="$(sed -n 's/^HUB_PORT=//p' "$answers_file" | tail -n1)"
|
||||||
|
[[ "$reserved_port" =~ ^[0-9]+$ ]] || continue
|
||||||
|
local_reserved="${local_reserved:+$local_reserved,}$reserved_port"
|
||||||
|
done
|
||||||
|
allocation="$(ssh \
|
||||||
|
-i "$DEPLOY_SSH_KEY" \
|
||||||
|
-p "$DEPLOY_SSH_PORT" \
|
||||||
|
-o BatchMode=yes \
|
||||||
|
-o StrictHostKeyChecking=accept-new \
|
||||||
|
"$DEPLOY_USER@$DEPLOY_HOST" \
|
||||||
|
bash -s -- "$local_reserved" <<'REMOTE'
|
||||||
|
set -euo pipefail
|
||||||
|
local_reserved=",${1:-},"
|
||||||
|
for candidate in $(seq 8788 8999); do
|
||||||
|
reserved=false
|
||||||
|
if [[ "$local_reserved" == *",$candidate,"* ]]; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
for env_file in /srv/curriculum-project-hub/.secrets/*/platform.env; do
|
||||||
|
[ -f "$env_file" ] || continue
|
||||||
|
if [ "$(sed -n "s/^PORT=//p" "$env_file")" = "$candidate" ]; then
|
||||||
|
reserved=true
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
workspace="/w/$candidate"
|
||||||
|
if [ "$reserved" = false ] && ! ss -H -ltn "sport = :$candidate" | grep -q . && [ ! -e "$workspace" ]; then
|
||||||
|
printf "%s %s\n" "$candidate" "$workspace"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
echo "no free Alpha Silo slot in 8788..8999" >&2
|
||||||
|
exit 1
|
||||||
|
REMOTE
|
||||||
|
)"
|
||||||
|
read -r HUB_PORT WORKSPACE_ROOT <<<"$allocation"
|
||||||
|
require_value HUB_PORT "$HUB_PORT"
|
||||||
|
require_value WORKSPACE_ROOT "$WORKSPACE_ROOT"
|
||||||
|
write_env HUB_PORT "$HUB_PORT"
|
||||||
|
write_env WORKSPACE_ROOT "$WORKSPACE_ROOT"
|
||||||
|
}
|
||||||
|
|
||||||
|
banner "New Alpha Silo"
|
||||||
|
|
||||||
|
stage "Organization identity and private plan" 3
|
||||||
|
say "One run creates one Organization's private deployment bundle."
|
||||||
|
ask ORGANIZATION_SLUG "Organization slug (lowercase, max 24 chars; e.g. school-a):"
|
||||||
|
require_value ORGANIZATION_SLUG "$ORGANIZATION_SLUG"
|
||||||
|
[[ "$ORGANIZATION_SLUG" =~ ^[a-z0-9]([a-z0-9-]{0,22}[a-z0-9])?$ ]] || {
|
||||||
|
warn "invalid Organization slug"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
INSTANCE_ID="$ORGANIZATION_SLUG"
|
||||||
|
ORGANIZATION_ID="$ORGANIZATION_SLUG"
|
||||||
|
OUTPUT_DIR="$PLAN_ROOT/$INSTANCE_ID"
|
||||||
|
mkdir -p "$OUTPUT_DIR"
|
||||||
|
chmod 0700 "$OUTPUT_DIR"
|
||||||
|
ENV_FILE="$OUTPUT_DIR/answers.env"
|
||||||
|
touch "$ENV_FILE"
|
||||||
|
chmod 0600 "$ENV_FILE"
|
||||||
|
write_env INSTANCE_ID "$INSTANCE_ID"
|
||||||
|
write_env ORGANIZATION_ID "$ORGANIZATION_ID"
|
||||||
|
write_env ORGANIZATION_SLUG "$ORGANIZATION_SLUG"
|
||||||
|
capture ORGANIZATION_NAME "Organization display name:"
|
||||||
|
|
||||||
|
stage "Host, release, and isolation" 5
|
||||||
|
say "The Alpha host is platform-managed. Port and short workspace path are allocated from live host state."
|
||||||
|
DEPLOY_HOST="${CPH_ALPHA_HOST:-39.107.254.4}"
|
||||||
|
DEPLOY_USER="${CPH_ALPHA_DEPLOY_USER:-root}"
|
||||||
|
DEPLOY_SSH_PORT="${CPH_ALPHA_SSH_PORT:-22}"
|
||||||
|
write_env DEPLOY_HOST "$DEPLOY_HOST"
|
||||||
|
write_env DEPLOY_USER "$DEPLOY_USER"
|
||||||
|
write_env DEPLOY_SSH_PORT "$DEPLOY_SSH_PORT"
|
||||||
|
seed_default DEPLOY_BASE "/srv/curriculum-project-hub"
|
||||||
|
seed_default DEPLOY_SSH_KEY "$HOME/.ssh/id_ed25519"
|
||||||
|
write_env RELEASE_ID "v$(node -p 'require(process.argv[1]).version' "$REPO_ROOT/hub/package.json")"
|
||||||
|
seed_default MEMORY_MAX "16G"
|
||||||
|
seed_default CPU_QUOTA "400%"
|
||||||
|
seed_default TASKS_MAX "512"
|
||||||
|
seed_default CPH_BIN "/usr/local/bin/cph"
|
||||||
|
note "Managed Alpha host: $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_SSH_PORT"
|
||||||
|
DEPLOY_SSH_KEY="$(_existing DEPLOY_SSH_KEY)"
|
||||||
|
MEMORY_MAX="$(_existing MEMORY_MAX)"
|
||||||
|
CPU_QUOTA="$(_existing CPU_QUOTA)"
|
||||||
|
TASKS_MAX="$(_existing TASKS_MAX)"
|
||||||
|
[ -f "$DEPLOY_SSH_KEY" ] || { warn "managed SSH key is missing: $DEPLOY_SSH_KEY"; exit 1; }
|
||||||
|
if [[ "$(_existing HUB_PORT || true)" =~ ^(878[8-9]|87[9][0-9]|8[89][0-9]{2})$ ]] && \
|
||||||
|
[ "$(_existing WORKSPACE_ROOT || true)" = "/w/$(_existing HUB_PORT)" ]; then
|
||||||
|
HUB_PORT="$(_existing HUB_PORT)"
|
||||||
|
WORKSPACE_ROOT="$(_existing WORKSPACE_ROOT)"
|
||||||
|
note "Keeping allocated host slot: port $HUB_PORT, workspace $WORKSPACE_ROOT"
|
||||||
|
else
|
||||||
|
say "Checking existing Silo environments, listening sockets, and workspace paths..."
|
||||||
|
allocate_host_slot
|
||||||
|
note "Allocated host slot: port $HUB_PORT, workspace $WORKSPACE_ROOT"
|
||||||
|
fi
|
||||||
|
note "Platform ceilings: MemoryMax=$MEMORY_MAX, CPUQuota=$CPU_QUOTA, TasksMax=$TASKS_MAX"
|
||||||
|
|
||||||
|
stage "Dedicated PostgreSQL database" 4
|
||||||
|
say "A PostgreSQL server may be shared, but this Silo gets a distinct login role and database."
|
||||||
|
seed_default DATABASE_HOST "127.0.0.1"
|
||||||
|
seed_default DATABASE_PORT "5432"
|
||||||
|
seed_default DATABASE_NAME "cph_${INSTANCE_ID//-/_}"
|
||||||
|
seed_default DATABASE_USER "cph_${INSTANCE_ID//-/_}"
|
||||||
|
DATABASE_NAME="$(_existing DATABASE_NAME)"
|
||||||
|
if ! _existing DATABASE_PASSWORD >/dev/null 2>&1; then
|
||||||
|
DATABASE_PASSWORD="$(openssl rand -base64 36 | tr -d '\n')"
|
||||||
|
write_env DATABASE_PASSWORD "$DATABASE_PASSWORD"
|
||||||
|
fi
|
||||||
|
note "The generated OPERATE.md uses an interactive/protected SQL path; the password is never put in a command argument."
|
||||||
|
|
||||||
|
stage "Public URL and Feishu app" 9
|
||||||
|
open_url "https://open.feishu.cn/app"
|
||||||
|
say "Create or open the Organization's own app. Copy credentials from Credentials & Basic Info."
|
||||||
|
PUBLIC_BASE_URL="https://${ORGANIZATION_SLUG}.${CPH_ALPHA_BASE_DOMAIN:-educraft.paradigm-edu.net}"
|
||||||
|
write_env PUBLIC_BASE_URL "$PUBLIC_BASE_URL"
|
||||||
|
note "Platform-assigned public URL: $PUBLIC_BASE_URL"
|
||||||
|
capture FEISHU_APP_ID "Feishu App ID:"
|
||||||
|
capture_secret FEISHU_APP_SECRET "Feishu App Secret:"
|
||||||
|
say "Resolving the bot Open ID from Feishu..."
|
||||||
|
FEISHU_BOT_OPEN_ID="$(printf '%s\0%s\0' "$FEISHU_APP_ID" "$FEISHU_APP_SECRET" | node "$SCRIPT_DIR/resolve_feishu_bot.mjs")"
|
||||||
|
write_env FEISHU_BOT_OPEN_ID "$FEISHU_BOT_OPEN_ID"
|
||||||
|
note "Resolved bot identity: $FEISHU_BOT_OPEN_ID"
|
||||||
|
open_url "https://open.feishu.cn/document/server-docs/contact-v3/user/get"
|
||||||
|
step "In the user/get page, click the user_id value picker, select the first OWNER, and copy the returned open_id."
|
||||||
|
capture OWNER_OPEN_ID "OWNER Open ID (ou_...):"
|
||||||
|
capture OWNER_DISPLAY_NAME "OWNER display name:"
|
||||||
|
write_env OWNER_UNION_ID ""
|
||||||
|
say "The exact redirect URL and acceptance steps will be written to OPERATE.md."
|
||||||
|
|
||||||
|
stage "Provider and Alpha limits" 5
|
||||||
|
say "Use a provider credential exclusive to this Organization. Host proxy setup is a separate prerequisite."
|
||||||
|
seed_default PROVIDER_ID "openrouter"
|
||||||
|
seed_default PROVIDER_BASE_URL "https://openrouter.ai/api"
|
||||||
|
seed_default DEFAULT_MODEL "anthropic/claude-sonnet-5"
|
||||||
|
seed_default DEFAULT_ROLE_ID "draft"
|
||||||
|
seed_default DEFAULT_ROLE_LABEL "智能助手"
|
||||||
|
seed_default MAX_TURNS "25"
|
||||||
|
seed_default MAX_CONCURRENT_RUNS "4"
|
||||||
|
seed_default MAX_RUN_SECONDS "900"
|
||||||
|
seed_default HTTP_BODY_LIMIT_BYTES "1048576"
|
||||||
|
seed_default MAX_FILES_PER_MESSAGE "8"
|
||||||
|
seed_default MAX_FILE_BYTES "26214400"
|
||||||
|
seed_default HTTP_REQUESTS_PER_MINUTE "120"
|
||||||
|
seed_default FEISHU_EVENTS_PER_MINUTE "120"
|
||||||
|
capture_secret PROVIDER_AUTH_TOKEN "Provider auth token:"
|
||||||
|
for key in PROVIDER_ID PROVIDER_BASE_URL DEFAULT_MODEL DEFAULT_ROLE_ID DEFAULT_ROLE_LABEL \
|
||||||
|
MAX_TURNS MAX_CONCURRENT_RUNS MAX_RUN_SECONDS HTTP_BODY_LIMIT_BYTES \
|
||||||
|
MAX_FILES_PER_MESSAGE MAX_FILE_BYTES HTTP_REQUESTS_PER_MINUTE FEISHU_EVENTS_PER_MINUTE; do
|
||||||
|
printf -v "$key" '%s' "$(_existing "$key")"
|
||||||
|
done
|
||||||
|
write_env APPROVED_SKILLS "outline,lesson-project,data-processing-spec,typst"
|
||||||
|
note "Platform runtime: OpenRouter, concurrency 4, default education role, curated skills."
|
||||||
|
if ! _existing HUB_SESSION_SECRET >/dev/null 2>&1; then
|
||||||
|
command -v openssl >/dev/null 2>&1 || { warn "openssl is required"; exit 1; }
|
||||||
|
HUB_SESSION_SECRET="$(openssl rand -hex 32)"
|
||||||
|
write_env HUB_SESSION_SECRET "$HUB_SESSION_SECRET"
|
||||||
|
fi
|
||||||
|
|
||||||
|
stage "Render the private deployment bundle" 2
|
||||||
|
say "This renders platform.env, bootstrap.json, deploy.env, nginx.conf and OPERATE.md."
|
||||||
|
command -v node >/dev/null 2>&1 || { warn "Node.js is required to render safely"; exit 1; }
|
||||||
|
node "$SCRIPT_DIR/render_new_silo_bundle.mjs" "$ENV_FILE" "$OUTPUT_DIR"
|
||||||
|
chmod 0700 "$OUTPUT_DIR"
|
||||||
|
chmod 0600 "$OUTPUT_DIR"/*
|
||||||
|
say "Bundle: $OUTPUT_DIR"
|
||||||
|
warn "It contains database, Feishu, provider and session secrets. Never commit or paste it."
|
||||||
|
|
||||||
|
stage "Operator handoff and gates" 7
|
||||||
|
say "The deployment package is an internal retry/audit checkpoint; you do not operate it manually."
|
||||||
|
step "Target: $PUBLIC_BASE_URL → $DEPLOY_HOST:$HUB_PORT"
|
||||||
|
step "Resources: database $DATABASE_NAME, workspace $WORKSPACE_ROOT, service cph-hub-$INSTANCE_ID"
|
||||||
|
warn "Confirmation will create server, database, TLS, and runtime state."
|
||||||
|
if confirm "Deploy this Organization now?"; then
|
||||||
|
bash "$SCRIPT_DIR/apply_new_silo.sh" "$OUTPUT_DIR"
|
||||||
|
else
|
||||||
|
warn "deployment skipped; rerun the wizard later and keep existing answers"
|
||||||
|
fi
|
||||||
|
|
||||||
|
finish
|
||||||
@@ -0,0 +1,217 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
|
||||||
|
import { chmod, mkdir, readFile, writeFile } from "node:fs/promises";
|
||||||
|
import { resolve } from "node:path";
|
||||||
|
|
||||||
|
const [answersPath, outputPath] = process.argv.slice(2);
|
||||||
|
if (!answersPath || !outputPath) {
|
||||||
|
throw new Error("usage: render_new_silo_bundle.mjs ANSWERS_ENV OUTPUT_DIR");
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseAnswers(source) {
|
||||||
|
const values = new Map();
|
||||||
|
for (const [index, line] of source.split("\n").entries()) {
|
||||||
|
if (!line || line.startsWith("#")) continue;
|
||||||
|
const separator = line.indexOf("=");
|
||||||
|
if (separator < 1) throw new Error(`invalid answers line ${index + 1}`);
|
||||||
|
const key = line.slice(0, separator);
|
||||||
|
const value = line.slice(separator + 1);
|
||||||
|
if (!/^[A-Z][A-Z0-9_]*$/.test(key)) {
|
||||||
|
throw new Error(`invalid answers key on line ${index + 1}: ${key}`);
|
||||||
|
}
|
||||||
|
if (value.includes("\r") || value.includes("\n")) {
|
||||||
|
throw new Error(`multiline value is not supported: ${key}`);
|
||||||
|
}
|
||||||
|
values.set(key, value);
|
||||||
|
}
|
||||||
|
return values;
|
||||||
|
}
|
||||||
|
|
||||||
|
function required(values, key) {
|
||||||
|
const value = values.get(key);
|
||||||
|
if (!value) throw new Error(`missing required answer: ${key}`);
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
function optional(values, key, fallback = "") {
|
||||||
|
return values.get(key) || fallback;
|
||||||
|
}
|
||||||
|
|
||||||
|
function assertMatch(label, value, pattern) {
|
||||||
|
if (!pattern.test(value)) throw new Error(`invalid ${label}: ${value}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
function envLine(key, value) {
|
||||||
|
if (/[\r\n]/.test(value)) throw new Error(`unsafe newline in ${key}`);
|
||||||
|
return `${key}=${value}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
const answers = parseAnswers(await readFile(resolve(answersPath), "utf8"));
|
||||||
|
const instanceId = required(answers, "INSTANCE_ID");
|
||||||
|
const orgId = required(answers, "ORGANIZATION_ID");
|
||||||
|
const orgSlug = required(answers, "ORGANIZATION_SLUG");
|
||||||
|
const port = required(answers, "HUB_PORT");
|
||||||
|
const workspaceRoot = required(answers, "WORKSPACE_ROOT");
|
||||||
|
const publicBaseUrl = required(answers, "PUBLIC_BASE_URL").replace(/\/$/, "");
|
||||||
|
const domain = new URL(publicBaseUrl).hostname;
|
||||||
|
const databasePassword = required(answers, "DATABASE_PASSWORD");
|
||||||
|
const databaseUrl = `postgresql://${encodeURIComponent(required(answers, "DATABASE_USER"))}:${encodeURIComponent(databasePassword)}@${required(answers, "DATABASE_HOST")}:${required(answers, "DATABASE_PORT")}/${encodeURIComponent(required(answers, "DATABASE_NAME"))}`;
|
||||||
|
|
||||||
|
assertMatch("INSTANCE_ID", instanceId, /^[a-z0-9](?:[a-z0-9-]{0,22}[a-z0-9])?$/);
|
||||||
|
assertMatch("organization slug", orgSlug, /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/);
|
||||||
|
assertMatch("port", port, /^[1-9][0-9]{1,4}$/);
|
||||||
|
assertMatch("database name", required(answers, "DATABASE_NAME"), /^[a-z_][a-z0-9_]*$/);
|
||||||
|
assertMatch("database user", required(answers, "DATABASE_USER"), /^[a-z_][a-z0-9_]*$/);
|
||||||
|
assertMatch("default role id", required(answers, "DEFAULT_ROLE_ID"), /^[a-z][a-z0-9-]*$/);
|
||||||
|
assertMatch("release id", required(answers, "RELEASE_ID"), /^[A-Za-z0-9._-]+$/);
|
||||||
|
if (!publicBaseUrl.startsWith("https://")) throw new Error("PUBLIC_BASE_URL must use https");
|
||||||
|
for (const [label, value] of [
|
||||||
|
["WORKSPACE_ROOT", workspaceRoot],
|
||||||
|
["DEPLOY_BASE", required(answers, "DEPLOY_BASE")],
|
||||||
|
["DEPLOY_SSH_KEY", required(answers, "DEPLOY_SSH_KEY")],
|
||||||
|
["CPH_BIN", required(answers, "CPH_BIN")],
|
||||||
|
]) {
|
||||||
|
if (!value.startsWith("/") || /\s/.test(value)) {
|
||||||
|
throw new Error(`${label} must be an absolute path without whitespace: ${value}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (Number(port) > 65535) throw new Error(`invalid port: ${port}`);
|
||||||
|
if (Buffer.byteLength(workspaceRoot) > 16) {
|
||||||
|
throw new Error(`WORKSPACE_ROOT exceeds the 16-byte sandbox socket limit: ${workspaceRoot}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const outputDir = resolve(outputPath);
|
||||||
|
await mkdir(outputDir, { recursive: true, mode: 0o700 });
|
||||||
|
await chmod(outputDir, 0o700);
|
||||||
|
|
||||||
|
const base = required(answers, "DEPLOY_BASE");
|
||||||
|
const release = required(answers, "RELEASE_ID");
|
||||||
|
const releaseHub = `${base}/releases/${release}/hub`;
|
||||||
|
const secretDir = `${base}/.secrets/${instanceId}`;
|
||||||
|
const envPath = `${secretDir}/platform.env`;
|
||||||
|
const keyringPath = `${secretDir}/secret-keyring.json`;
|
||||||
|
const unit = `cph-hub-${instanceId}.service`;
|
||||||
|
|
||||||
|
const platformEnv = [
|
||||||
|
"# Generated by hub/deploy/new_silo.sh. Install root:root mode 0600.",
|
||||||
|
envLine("NODE_ENV", "production"),
|
||||||
|
envLine("DATABASE_URL", databaseUrl),
|
||||||
|
envLine("HUB_SILO_ORGANIZATION_ID", orgId),
|
||||||
|
envLine("HUB_SYSTEMD_UNIT", unit),
|
||||||
|
envLine("CPH_BIN", required(answers, "CPH_BIN")),
|
||||||
|
envLine("HOST", "127.0.0.1"),
|
||||||
|
envLine("PORT", port),
|
||||||
|
envLine("HUB_PROJECT_WORKSPACE_ROOT", workspaceRoot),
|
||||||
|
envLine("HUB_PUBLIC_BASE_URL", publicBaseUrl),
|
||||||
|
envLine("HUB_SESSION_SECRET", required(answers, "HUB_SESSION_SECRET")),
|
||||||
|
envLine("HUB_AGENT_MAX_TURNS", required(answers, "MAX_TURNS")),
|
||||||
|
envLine("HUB_AGENT_MAX_CONCURRENT_RUNS", required(answers, "MAX_CONCURRENT_RUNS")),
|
||||||
|
envLine("HUB_AGENT_MAX_RUN_SECONDS", required(answers, "MAX_RUN_SECONDS")),
|
||||||
|
envLine("HUB_HTTP_BODY_LIMIT_BYTES", required(answers, "HTTP_BODY_LIMIT_BYTES")),
|
||||||
|
envLine("HUB_MAX_FILES_PER_MESSAGE", required(answers, "MAX_FILES_PER_MESSAGE")),
|
||||||
|
envLine("HUB_MAX_FILE_BYTES", required(answers, "MAX_FILE_BYTES")),
|
||||||
|
envLine("HUB_HTTP_REQUESTS_PER_MINUTE", required(answers, "HTTP_REQUESTS_PER_MINUTE")),
|
||||||
|
envLine("HUB_FEISHU_EVENTS_PER_MINUTE", required(answers, "FEISHU_EVENTS_PER_MINUTE")),
|
||||||
|
envLine("HUB_FEISHU_LISTENER_ENABLED", "true"),
|
||||||
|
envLine("HTTP_PROXY", "http://127.0.0.1:7890"),
|
||||||
|
envLine("HTTPS_PROXY", "http://127.0.0.1:7890"),
|
||||||
|
envLine("ALL_PROXY", "socks5h://127.0.0.1:7890"),
|
||||||
|
envLine("NO_PROXY", "127.0.0.1,localhost,::1"),
|
||||||
|
envLine("NODE_USE_ENV_PROXY", "1"),
|
||||||
|
envLine("ANTHROPIC_DEFAULT_SONNET_MODEL", "anthropic/claude-sonnet-5"),
|
||||||
|
envLine("CPH_SANDBOX_EXTRA_DENY_READ", `${envPath}:${keyringPath}`),
|
||||||
|
"",
|
||||||
|
].join("\n");
|
||||||
|
|
||||||
|
const bootstrap = {
|
||||||
|
organization: {
|
||||||
|
id: orgId,
|
||||||
|
slug: orgSlug,
|
||||||
|
name: required(answers, "ORGANIZATION_NAME"),
|
||||||
|
},
|
||||||
|
owner: {
|
||||||
|
openId: required(answers, "OWNER_OPEN_ID"),
|
||||||
|
displayName: required(answers, "OWNER_DISPLAY_NAME"),
|
||||||
|
},
|
||||||
|
feishu: {
|
||||||
|
appId: required(answers, "FEISHU_APP_ID"),
|
||||||
|
appSecret: required(answers, "FEISHU_APP_SECRET"),
|
||||||
|
botOpenId: required(answers, "FEISHU_BOT_OPEN_ID"),
|
||||||
|
},
|
||||||
|
provider: {
|
||||||
|
providerId: required(answers, "PROVIDER_ID"),
|
||||||
|
baseUrl: required(answers, "PROVIDER_BASE_URL"),
|
||||||
|
authToken: required(answers, "PROVIDER_AUTH_TOKEN"),
|
||||||
|
},
|
||||||
|
teams: [],
|
||||||
|
};
|
||||||
|
const ownerUnionId = optional(answers, "OWNER_UNION_ID");
|
||||||
|
if (ownerUnionId) bootstrap.owner.unionId = ownerUnionId;
|
||||||
|
|
||||||
|
const deployEnv = [
|
||||||
|
"# Source this file locally before deploy_platform.sh (contains no app/provider secrets).",
|
||||||
|
envLine("PLATFORM_DEPLOY_HOST", required(answers, "DEPLOY_HOST")),
|
||||||
|
envLine("PLATFORM_DEPLOY_SSH_KEY", required(answers, "DEPLOY_SSH_KEY")),
|
||||||
|
envLine("PLATFORM_DEPLOY_USER", required(answers, "DEPLOY_USER")),
|
||||||
|
envLine("PLATFORM_DEPLOY_PORT", required(answers, "DEPLOY_SSH_PORT")),
|
||||||
|
envLine("PLATFORM_DEPLOY_HUB_PORT", port),
|
||||||
|
envLine("PLATFORM_DEPLOY_BASE", base),
|
||||||
|
envLine("PLATFORM_DEPLOY_RELEASE", release),
|
||||||
|
envLine("PLATFORM_DEPLOY_INSTANCE", instanceId),
|
||||||
|
envLine("PLATFORM_DEPLOY_WORKSPACE_ROOT", workspaceRoot),
|
||||||
|
envLine("PLATFORM_DEPLOY_MEMORY_MAX", required(answers, "MEMORY_MAX")),
|
||||||
|
envLine("PLATFORM_DEPLOY_CPU_QUOTA", required(answers, "CPU_QUOTA")),
|
||||||
|
envLine("PLATFORM_DEPLOY_TASKS_MAX", required(answers, "TASKS_MAX")),
|
||||||
|
envLine("PLATFORM_DEPLOY_HEALTH_URL", `http://127.0.0.1:${port}/api/healthz`),
|
||||||
|
"",
|
||||||
|
].join("\n");
|
||||||
|
|
||||||
|
const nginx = `# Install as /etc/nginx/conf.d/${instanceId}.conf after obtaining TLS certificates.\nserver {\n listen 80;\n server_name ${domain};\n return 301 https://$host$request_uri;\n}\n\nserver {\n listen 443 ssl http2;\n server_name ${domain};\n\n ssl_certificate /etc/letsencrypt/live/${domain}/fullchain.pem;\n ssl_certificate_key /etc/letsencrypt/live/${domain}/privkey.pem;\n\n location / {\n proxy_pass http://127.0.0.1:${port};\n proxy_http_version 1.1;\n proxy_set_header Host $host;\n proxy_set_header X-Real-IP $remote_addr;\n proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;\n proxy_set_header X-Forwarded-Proto https;\n }\n}\n`;
|
||||||
|
|
||||||
|
const defaultRolePrompt = `你是一位教育机构智能助手,服务于学校和教培机构的日常管理与协作。
|
||||||
|
## 核心能力
|
||||||
|
**教务管理**:熟悉排课调课、班级管理、课时统计、师资调度等常见管理流程。
|
||||||
|
**教研支持**:理解课程设计、教案编写、例题/变式题、定理证明、随堂练习、阶段性测验、知识点拆解、大纲对标等教学业务概念。
|
||||||
|
**数字化操作**:熟练使用shell命令行进行文件管理、批量处理、脚本编写、文本处理(grep/sed/awk等)、自动化任务;能协助处理Markdown、Typst等文档、表格数据、格式转换等。
|
||||||
|
## 行为准则
|
||||||
|
- **实事求是**:不确定时明确说明,能力边界外的任务如实告知,不为完成目标而编造信息或勉强输出
|
||||||
|
- **简洁优先**:直接给出答案或方案,省略铺垫和客套
|
||||||
|
- **按需展开**:仅在问题复杂或用户明确要求时提供详细说明
|
||||||
|
- **结构清晰**:多步骤内容使用编号,便于飞书阅读
|
||||||
|
- **可操作性**:涉及操作时给出具体命令或步骤
|
||||||
|
保持专业、高效,像一位熟悉业务的同事。
|
||||||
|
`;
|
||||||
|
|
||||||
|
const operate = `# ${instanceId} deployment commands\n\nThis file contains no application/provider secrets. Run commands deliberately; do not source answers.env.\n\n## 1. DNS and Feishu\n\n- Point \`${domain}\` to \`${required(answers, "DEPLOY_HOST")}\`.\n- In the Feishu app, configure redirect URL: \`${publicBaseUrl}/auth/feishu/callback\`.\n- Enable the required bot/message/contact permissions and event subscription described in the customer setup document.\n\n## 2. Database (run as the PostgreSQL administrator)\n\nCreate one role and one database for this Silo. The password is in \`answers.env\`; use an interactive client or a protected SQL file, never a command-line argument.\n\n\`\`\`sql\nCREATE ROLE ${required(answers, "DATABASE_USER")} LOGIN PASSWORD '<copy DATABASE_PASSWORD from answers.env>';\nCREATE DATABASE ${required(answers, "DATABASE_NAME")} OWNER ${required(answers, "DATABASE_USER")};\n\`\`\`\n\n## 3. Publish the immutable release\n\nThe normal deploy script seeds the first-instance secrets and exits 78. That exit is expected only on this first pass.\n\n\`\`\`sh\nset -a; . ./deploy.env; set +a\nbash hub/deploy/deploy_platform.sh\n\`\`\`\n\n## 4. Install the generated secrets\n\nCopy \`platform.env\` and \`bootstrap.json\` to the server through a protected channel. On the server:\n\n\`\`\`sh\ninstall -d -o root -g root -m 0700 '${secretDir}'\ninstall -o root -g root -m 0600 platform.env '${envPath}'\ninstall -o root -g root -m 0600 bootstrap.json '/root/${instanceId}-bootstrap.json'\n# Copy ${keyringPath} to separate off-host recovery storage before continuing.\n\`\`\`\n\n## 5. Migrate, install the stopped service, and bootstrap\n\n\`\`\`sh\nset -a; . '${envPath}'; set +a\nnode '${releaseHub}/node_modules/prisma/build/index.js' migrate deploy --schema '${releaseHub}/prisma/schema.prisma'\nBASE='${base}' HUB_DIR='${releaseHub}' INSTANCE_ID='${instanceId}' WORKSPACE_ROOT='${workspaceRoot}' PORT='${port}' MEMORY_MAX='${required(answers, "MEMORY_MAX")}' CPU_QUOTA='${required(answers, "CPU_QUOTA")}' TASKS_MAX='${required(answers, "TASKS_MAX")}' bash '${releaseHub}/deploy/install_service.sh'\nnode '${releaseHub}/dist/deployment/bootstrap-silo-cli.js' --config-file '/root/${instanceId}-bootstrap.json' --keyring-file '${keyringPath}'\nrm -f '/root/${instanceId}-bootstrap.json'\n\`\`\`\n\n## 6. Runtime role and skills\n\nRuntime role/skill configuration is intentionally separate from the release. Follow NEW_SILO_RUNBOOK.md, staging each approved skill directory outside the immutable release, then use \`agent_config.sh\`. Do not silently copy a local personal skill collection.\n\n## 7. Nginx, start, and acceptance\n\nInstall \`nginx.conf\`, run \`nginx -t\`, reload Nginx, then:\n\n\`\`\`sh\nsystemctl start '${unit}'\nsystemctl is-active '${unit}'\ncurl --fail --silent --show-error 'http://127.0.0.1:${port}/api/healthz'\ncurl --fail --silent --show-error '${publicBaseUrl}/api/healthz'\njournalctl -u '${unit}' --since '-10 min' --no-pager\n\`\`\`\n\nAcceptance requires: Feishu OAuth completes, OWNER and a non-OWNER can @bot, a second group creates a separate project/session, Typst works when that skill is enabled, and restart preserves session cursor. Then take the first off-host backup.\n\n## 8. Later releases\n\nAfter the instance exists, source \`deploy.env\` with the new release id and run \`deploy_platform.sh\`. Never reuse another org's database, secret directory, workspace root, port, service identity, domain, Feishu app, or provider credential.\n`;
|
||||||
|
|
||||||
|
const selectedSkills = optional(answers, "APPROVED_SKILLS");
|
||||||
|
const roleInstructions = `
|
||||||
|
## Appendix: default runtime role
|
||||||
|
|
||||||
|
Copy \`default-role-prompt.md\` to \`/root/${instanceId}-default-role-prompt.md\`.
|
||||||
|
After installing each reviewed skill with \`agent_config.sh install-skill\`, run:
|
||||||
|
|
||||||
|
\`\`\`sh
|
||||||
|
INSTANCE_ID=${JSON.stringify(instanceId)} ENV_FILE=${JSON.stringify(envPath)} HUB_DIR=${JSON.stringify(releaseHub)} bash ${JSON.stringify(`${releaseHub}/deploy/agent_config.sh`)} upsert-role --organization ${JSON.stringify(orgId)} --role ${JSON.stringify(required(answers, "DEFAULT_ROLE_ID"))} --label ${JSON.stringify(required(answers, "DEFAULT_ROLE_LABEL"))} --model ${JSON.stringify(required(answers, "DEFAULT_MODEL"))} --system-prompt-file ${JSON.stringify(`/root/${instanceId}-default-role-prompt.md`)} --tools-json null
|
||||||
|
${selectedSkills ? `INSTANCE_ID=${JSON.stringify(instanceId)} ENV_FILE=${JSON.stringify(envPath)} HUB_DIR=${JSON.stringify(releaseHub)} bash ${JSON.stringify(`${releaseHub}/deploy/agent_config.sh`)} set-role-skills --organization ${JSON.stringify(orgId)} --role ${JSON.stringify(required(answers, "DEFAULT_ROLE_ID"))} --skills ${JSON.stringify(selectedSkills)}
|
||||||
|
` : "# No skills selected in the wizard; set-role-skills remains an explicit operator step.\n"}INSTANCE_ID=${JSON.stringify(instanceId)} ENV_FILE=${JSON.stringify(envPath)} HUB_DIR=${JSON.stringify(releaseHub)} bash ${JSON.stringify(`${releaseHub}/deploy/agent_config.sh`)} list --organization ${JSON.stringify(orgId)}
|
||||||
|
\`\`\`
|
||||||
|
|
||||||
|
Changing a role's model, system prompt, tools or skill selection archives that
|
||||||
|
role's existing sessions by design. Finish this setup before inviting Alpha users.
|
||||||
|
`;
|
||||||
|
|
||||||
|
async function privateWrite(name, contents) {
|
||||||
|
const path = resolve(outputDir, name);
|
||||||
|
await writeFile(path, contents, { encoding: "utf8", mode: 0o600 });
|
||||||
|
await chmod(path, 0o600);
|
||||||
|
}
|
||||||
|
|
||||||
|
await privateWrite("platform.env", platformEnv);
|
||||||
|
await privateWrite("bootstrap.json", `${JSON.stringify(bootstrap, null, 2)}\n`);
|
||||||
|
await privateWrite("deploy.env", deployEnv);
|
||||||
|
await privateWrite("nginx.conf", nginx);
|
||||||
|
await privateWrite("default-role-prompt.md", defaultRolePrompt);
|
||||||
|
await privateWrite("OPERATE.md", `${operate}${roleInstructions}`);
|
||||||
|
|
||||||
|
console.log(`Rendered private Silo bundle: ${outputDir}`);
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
|
||||||
|
const chunks = [];
|
||||||
|
for await (const chunk of process.stdin) chunks.push(chunk);
|
||||||
|
const [appId, appSecret] = Buffer.concat(chunks).toString("utf8").split("\0");
|
||||||
|
if (!appId || !appSecret) throw new Error("Feishu App ID and App Secret are required on stdin");
|
||||||
|
|
||||||
|
const tokenResponse = await fetch("https://open.feishu.cn/open-apis/auth/v3/tenant_access_token/internal", {
|
||||||
|
method: "POST",
|
||||||
|
headers: { "content-type": "application/json; charset=utf-8" },
|
||||||
|
body: JSON.stringify({ app_id: appId, app_secret: appSecret }),
|
||||||
|
});
|
||||||
|
if (!tokenResponse.ok) throw new Error(`Feishu token request failed: HTTP ${tokenResponse.status}`);
|
||||||
|
const tokenPayload = await tokenResponse.json();
|
||||||
|
if (tokenPayload.code !== 0 || typeof tokenPayload.tenant_access_token !== "string") {
|
||||||
|
throw new Error(`Feishu token request failed: ${JSON.stringify(tokenPayload)}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const botResponse = await fetch("https://open.feishu.cn/open-apis/bot/v3/info", {
|
||||||
|
headers: { authorization: `Bearer ${tokenPayload.tenant_access_token}` },
|
||||||
|
});
|
||||||
|
if (!botResponse.ok) throw new Error(`Feishu bot info request failed: HTTP ${botResponse.status}`);
|
||||||
|
const botPayload = await botResponse.json();
|
||||||
|
if (botPayload.code !== 0 || typeof botPayload.bot?.open_id !== "string" || !botPayload.bot.open_id) {
|
||||||
|
throw new Error(`Feishu bot info request failed: ${JSON.stringify(botPayload)}`);
|
||||||
|
}
|
||||||
|
process.stdout.write(botPayload.bot.open_id);
|
||||||
@@ -1,13 +1,16 @@
|
|||||||
{
|
{
|
||||||
"name": "@paradigm/hub",
|
"name": "@paradigm/hub",
|
||||||
"version": "0.0.8",
|
"version": "0.0.31",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "@paradigm/hub",
|
"name": "@paradigm/hub",
|
||||||
"version": "0.0.8",
|
"version": "0.0.31",
|
||||||
"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",
|
||||||
"@larksuiteoapi/node-sdk": "^1.70.0",
|
"@larksuiteoapi/node-sdk": "^1.70.0",
|
||||||
@@ -74,6 +77,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",
|
||||||
@@ -131,9 +303,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "SEE LICENSE IN LICENSE.md",
|
"license": "SEE LICENSE IN LICENSE.md",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -147,9 +316,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"musl"
|
|
||||||
],
|
|
||||||
"license": "SEE LICENSE IN LICENSE.md",
|
"license": "SEE LICENSE IN LICENSE.md",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -163,9 +329,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "SEE LICENSE IN LICENSE.md",
|
"license": "SEE LICENSE IN LICENSE.md",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -179,9 +342,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"musl"
|
|
||||||
],
|
|
||||||
"license": "SEE LICENSE IN LICENSE.md",
|
"license": "SEE LICENSE IN LICENSE.md",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -246,25 +406,45 @@
|
|||||||
"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.1",
|
"version": "1.11.2",
|
||||||
"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.1.tgz",
|
"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.2.tgz",
|
||||||
"integrity": "sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==",
|
"integrity": "sha512-TC8MkTuZUtcTSiFeuC0ksCh9QIJ5+F21MvZ4Wn4ORfYaFJ/0dsiudv5tVkejgwZlwQ39jL9WWDe2lz8x0WglOA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emnapi/wasi-threads": "1.2.2",
|
"@emnapi/wasi-threads": "1.2.2",
|
||||||
"tslib": "^2.4.0"
|
"tslib": "^2.4.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@emnapi/runtime": {
|
"node_modules/@emnapi/runtime": {
|
||||||
"version": "1.11.1",
|
"version": "1.11.2",
|
||||||
"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.1.tgz",
|
"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.2.tgz",
|
||||||
"integrity": "sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==",
|
"integrity": "sha512-kyOl3X0DuTiT1h2ft8r2fYO8JYtU9a9Xis/zBSiGArNaagCOWx90N1k2wxp18czFDH+OgcWGb5ZP/XMt3dcyPA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"tslib": "^2.4.0"
|
"tslib": "^2.4.0"
|
||||||
}
|
}
|
||||||
@@ -1199,9 +1379,6 @@
|
|||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1219,9 +1396,6 @@
|
|||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"libc": [
|
|
||||||
"musl"
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1239,9 +1413,6 @@
|
|||||||
"ppc64"
|
"ppc64"
|
||||||
],
|
],
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1259,9 +1430,6 @@
|
|||||||
"s390x"
|
"s390x"
|
||||||
],
|
],
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1279,9 +1447,6 @@
|
|||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1299,9 +1464,6 @@
|
|||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"libc": [
|
|
||||||
"musl"
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1347,6 +1509,29 @@
|
|||||||
"node": "^20.19.0 || >=22.12.0"
|
"node": "^20.19.0 || >=22.12.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/core": {
|
||||||
|
"version": "1.11.1",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@emnapi/core/-/core-1.11.1.tgz",
|
||||||
|
"integrity": "sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"optional": true,
|
||||||
|
"dependencies": {
|
||||||
|
"@emnapi/wasi-threads": "1.2.2",
|
||||||
|
"tslib": "^2.4.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/runtime": {
|
||||||
|
"version": "1.11.1",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@emnapi/runtime/-/runtime-1.11.1.tgz",
|
||||||
|
"integrity": "sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"optional": true,
|
||||||
|
"dependencies": {
|
||||||
|
"tslib": "^2.4.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@rolldown/binding-win32-arm64-msvc": {
|
"node_modules/@rolldown/binding-win32-arm64-msvc": {
|
||||||
"version": "1.1.4",
|
"version": "1.1.4",
|
||||||
"resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.4.tgz",
|
||||||
@@ -1401,6 +1586,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",
|
||||||
@@ -2835,6 +3029,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",
|
||||||
@@ -2848,6 +3056,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",
|
||||||
@@ -2872,12 +3099,17 @@
|
|||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"peer": true
|
"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"
|
||||||
}
|
}
|
||||||
@@ -2977,6 +3209,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",
|
||||||
@@ -3157,9 +3398,6 @@
|
|||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "MPL-2.0",
|
"license": "MPL-2.0",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -3181,9 +3419,6 @@
|
|||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"libc": [
|
|
||||||
"musl"
|
|
||||||
],
|
|
||||||
"license": "MPL-2.0",
|
"license": "MPL-2.0",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -3205,9 +3440,6 @@
|
|||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "MPL-2.0",
|
"license": "MPL-2.0",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -3229,9 +3461,6 @@
|
|||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"libc": [
|
|
||||||
"musl"
|
|
||||||
],
|
|
||||||
"license": "MPL-2.0",
|
"license": "MPL-2.0",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -3287,6 +3516,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",
|
||||||
@@ -3374,6 +3609,27 @@
|
|||||||
"node": ">= 0.6"
|
"node": ">= 0.6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"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",
|
||||||
@@ -3993,6 +4249,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",
|
||||||
@@ -4210,6 +4475,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",
|
||||||
@@ -4717,6 +5026,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",
|
||||||
|
|||||||
@@ -1,12 +1,15 @@
|
|||||||
{
|
{
|
||||||
"name": "@paradigm/hub",
|
"name": "@paradigm/hub",
|
||||||
"version": "0.0.8",
|
"version": "0.0.32",
|
||||||
"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",
|
||||||
"@larksuiteoapi/node-sdk": "^1.70.0",
|
"@larksuiteoapi/node-sdk": "^1.70.0",
|
||||||
@@ -30,18 +33,21 @@
|
|||||||
"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. Aligns to spec/System through ADR-0024.",
|
||||||
"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",
|
"build": "tsc -p tsconfig.json && npm run admin: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",
|
||||||
"prisma:generate": "prisma generate --schema prisma/schema.prisma",
|
"prisma:generate": "prisma generate --schema prisma/schema.prisma",
|
||||||
"prisma:validate": "DATABASE_URL=${DATABASE_URL:-postgresql://stub:stub@127.0.0.1:5432/stub} prisma validate --schema prisma/schema.prisma",
|
"prisma:validate": "prisma validate --schema prisma/schema.prisma",
|
||||||
"prisma:migrate": "DATABASE_URL=${DATABASE_URL:-postgresql://paradigm:paradigm@127.0.0.1:5432/paradigm} prisma migrate deploy --schema prisma/schema.prisma",
|
"prisma:migrate": "prisma migrate deploy --schema prisma/schema.prisma",
|
||||||
"secrets:rotate-kek": "node dist/deployment/rotate-secret-kek.js",
|
"secrets:rotate-kek": "node dist/deployment/rotate-secret-kek.js",
|
||||||
|
"agent-config": "node dist/deployment/agent-config-cli.js",
|
||||||
"silo:bootstrap": "node dist/deployment/bootstrap-silo-cli.js",
|
"silo:bootstrap": "node dist/deployment/bootstrap-silo-cli.js",
|
||||||
"silo:restore-preflight": "node dist/deployment/restore-preflight.js",
|
"silo:restore-preflight": "node dist/deployment/restore-preflight.js",
|
||||||
"deploy": "bash deploy/deploy_platform.sh",
|
"deploy": "bash deploy/deploy_platform.sh",
|
||||||
"test": "vitest run",
|
"test": "vitest run",
|
||||||
"test:watch": "vitest"
|
"test:watch": "vitest",
|
||||||
|
"admin:dev": "npm run dev --prefix admin-web",
|
||||||
|
"admin:build": "npm run build --prefix admin-web"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,71 @@
|
|||||||
|
-- ADR-0017: Organization-scoped runtime role bundles and content-addressed
|
||||||
|
-- skills. Composite foreign keys make cross-Organization role/skill bindings
|
||||||
|
-- structurally impossible.
|
||||||
|
CREATE TABLE "OrganizationAgentSkill" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"organizationId" TEXT NOT NULL,
|
||||||
|
"name" TEXT NOT NULL,
|
||||||
|
"version" TEXT NOT NULL,
|
||||||
|
"description" TEXT,
|
||||||
|
"contentDigest" TEXT NOT NULL,
|
||||||
|
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"updatedAt" TIMESTAMP(3) NOT NULL,
|
||||||
|
"disabledAt" TIMESTAMP(3),
|
||||||
|
CONSTRAINT "OrganizationAgentSkill_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE "OrganizationAgentRole" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"organizationId" TEXT NOT NULL,
|
||||||
|
"roleId" TEXT NOT NULL,
|
||||||
|
"label" TEXT NOT NULL,
|
||||||
|
"defaultModel" TEXT,
|
||||||
|
"systemPrompt" TEXT,
|
||||||
|
"tools" JSONB,
|
||||||
|
"sortOrder" INTEGER NOT NULL DEFAULT 0,
|
||||||
|
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"updatedAt" TIMESTAMP(3) NOT NULL,
|
||||||
|
"disabledAt" TIMESTAMP(3),
|
||||||
|
CONSTRAINT "OrganizationAgentRole_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE "OrganizationAgentRoleSkill" (
|
||||||
|
"organizationId" TEXT NOT NULL,
|
||||||
|
"agentRoleId" TEXT NOT NULL,
|
||||||
|
"agentSkillId" TEXT NOT NULL,
|
||||||
|
"sortOrder" INTEGER NOT NULL DEFAULT 0,
|
||||||
|
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
CONSTRAINT "OrganizationAgentRoleSkill_pkey" PRIMARY KEY ("organizationId", "agentRoleId", "agentSkillId")
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE UNIQUE INDEX "OrganizationAgentSkill_organizationId_name_key" ON "OrganizationAgentSkill"("organizationId", "name");
|
||||||
|
CREATE UNIQUE INDEX "OrganizationAgentSkill_organizationId_id_key" ON "OrganizationAgentSkill"("organizationId", "id");
|
||||||
|
CREATE INDEX "OrganizationAgentSkill_organizationId_disabledAt_idx" ON "OrganizationAgentSkill"("organizationId", "disabledAt");
|
||||||
|
CREATE INDEX "OrganizationAgentSkill_contentDigest_idx" ON "OrganizationAgentSkill"("contentDigest");
|
||||||
|
CREATE UNIQUE INDEX "OrganizationAgentRole_organizationId_roleId_key" ON "OrganizationAgentRole"("organizationId", "roleId");
|
||||||
|
CREATE UNIQUE INDEX "OrganizationAgentRole_organizationId_id_key" ON "OrganizationAgentRole"("organizationId", "id");
|
||||||
|
CREATE INDEX "OrganizationAgentRole_organizationId_disabledAt_sortOrder_idx" ON "OrganizationAgentRole"("organizationId", "disabledAt", "sortOrder");
|
||||||
|
CREATE INDEX "OrganizationAgentRoleSkill_organizationId_agentRoleId_sortOrder_idx" ON "OrganizationAgentRoleSkill"("organizationId", "agentRoleId", "sortOrder");
|
||||||
|
CREATE INDEX "OrganizationAgentRoleSkill_organizationId_agentSkillId_idx" ON "OrganizationAgentRoleSkill"("organizationId", "agentSkillId");
|
||||||
|
|
||||||
|
ALTER TABLE "OrganizationAgentSkill" ADD CONSTRAINT "OrganizationAgentSkill_organizationId_fkey"
|
||||||
|
FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
ALTER TABLE "OrganizationAgentRole" ADD CONSTRAINT "OrganizationAgentRole_organizationId_fkey"
|
||||||
|
FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
ALTER TABLE "OrganizationAgentRoleSkill" ADD CONSTRAINT "OrganizationAgentRoleSkill_organizationId_agentRoleId_fkey"
|
||||||
|
FOREIGN KEY ("organizationId", "agentRoleId") REFERENCES "OrganizationAgentRole"("organizationId", "id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
ALTER TABLE "OrganizationAgentRoleSkill" ADD CONSTRAINT "OrganizationAgentRoleSkill_organizationId_agentSkillId_fkey"
|
||||||
|
FOREIGN KEY ("organizationId", "agentSkillId") REFERENCES "OrganizationAgentSkill"("organizationId", "id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- Preserve current alpha behavior while moving role definitions into data.
|
||||||
|
INSERT INTO "OrganizationAgentRole" (
|
||||||
|
"id", "organizationId", "roleId", "label", "sortOrder", "updatedAt"
|
||||||
|
)
|
||||||
|
SELECT "id" || ':agent-role:draft', "id", 'draft', '草稿', 10, CURRENT_TIMESTAMP
|
||||||
|
FROM "Organization";
|
||||||
|
|
||||||
|
INSERT INTO "OrganizationAgentRole" (
|
||||||
|
"id", "organizationId", "roleId", "label", "sortOrder", "updatedAt"
|
||||||
|
)
|
||||||
|
SELECT "id" || ':agent-role:review', "id", 'review', '审校', 20, CURRENT_TIMESTAMP
|
||||||
|
FROM "Organization";
|
||||||
@@ -0,0 +1,191 @@
|
|||||||
|
-- Derived project discovery projection. Project/Folder remain authoritative;
|
||||||
|
-- triggers prevent index drift through ordinary database mutations.
|
||||||
|
CREATE EXTENSION IF NOT EXISTS pg_trgm;
|
||||||
|
|
||||||
|
CREATE TYPE "FolderKind" AS ENUM ('REGULAR', 'SYSTEM_INBOX');
|
||||||
|
ALTER TABLE "Folder" ADD COLUMN "kind" "FolderKind" NOT NULL DEFAULT 'REGULAR';
|
||||||
|
|
||||||
|
DO $$
|
||||||
|
BEGIN
|
||||||
|
IF EXISTS (
|
||||||
|
SELECT 1 FROM "Folder"
|
||||||
|
WHERE "parentId" IS NULL AND "name" = 'Inbox' AND "archivedAt" IS NULL
|
||||||
|
GROUP BY "organizationId" HAVING count(*) > 1
|
||||||
|
) THEN
|
||||||
|
RAISE EXCEPTION 'cannot identify system Inbox: organization has multiple active root Inbox folders';
|
||||||
|
END IF;
|
||||||
|
END $$;
|
||||||
|
|
||||||
|
UPDATE "Folder" f SET "kind" = 'SYSTEM_INBOX'
|
||||||
|
WHERE f."parentId" IS NULL AND f."name" = 'Inbox' AND f."archivedAt" IS NULL;
|
||||||
|
|
||||||
|
INSERT INTO "Folder" ("id", "organizationId", "parentId", "name", "kind", "sortKey", "createdAt", "updatedAt")
|
||||||
|
SELECT o."id" || ':system-inbox', o."id", NULL, 'Inbox', 'SYSTEM_INBOX', '000000', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP
|
||||||
|
FROM "Organization" o
|
||||||
|
WHERE NOT EXISTS (
|
||||||
|
SELECT 1 FROM "Folder" f
|
||||||
|
WHERE f."organizationId" = o."id" AND f."kind" = 'SYSTEM_INBOX' AND f."archivedAt" IS NULL
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE UNIQUE INDEX "Folder_one_active_system_inbox_per_org"
|
||||||
|
ON "Folder"("organizationId") WHERE "kind" = 'SYSTEM_INBOX' AND "archivedAt" IS NULL;
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION cph_protect_system_inbox() RETURNS trigger
|
||||||
|
LANGUAGE plpgsql AS $$
|
||||||
|
BEGIN
|
||||||
|
IF TG_OP = 'UPDATE' AND OLD."kind" = 'SYSTEM_INBOX' AND (
|
||||||
|
NEW."id" IS DISTINCT FROM OLD."id" OR
|
||||||
|
NEW."organizationId" IS DISTINCT FROM OLD."organizationId" OR
|
||||||
|
NEW."kind" IS DISTINCT FROM OLD."kind" OR
|
||||||
|
NEW."name" IS DISTINCT FROM OLD."name" OR
|
||||||
|
NEW."parentId" IS DISTINCT FROM OLD."parentId" OR
|
||||||
|
NEW."archivedAt" IS DISTINCT FROM OLD."archivedAt"
|
||||||
|
) THEN
|
||||||
|
RAISE EXCEPTION 'system Inbox identity cannot be changed';
|
||||||
|
END IF;
|
||||||
|
IF TG_OP IN ('INSERT', 'UPDATE') AND NEW."kind" = 'SYSTEM_INBOX' AND (
|
||||||
|
NEW."name" <> 'Inbox' OR NEW."parentId" IS NOT NULL OR NEW."archivedAt" IS NOT NULL
|
||||||
|
) THEN
|
||||||
|
RAISE EXCEPTION 'system Inbox must be an active root folder named Inbox';
|
||||||
|
END IF;
|
||||||
|
IF TG_OP = 'DELETE' AND OLD."kind" = 'SYSTEM_INBOX' AND EXISTS (
|
||||||
|
SELECT 1 FROM "Organization" WHERE "id" = OLD."organizationId"
|
||||||
|
) THEN
|
||||||
|
RAISE EXCEPTION 'system Inbox cannot be deleted while its organization exists';
|
||||||
|
END IF;
|
||||||
|
RETURN CASE WHEN TG_OP = 'DELETE' THEN OLD ELSE NEW END;
|
||||||
|
END;
|
||||||
|
$$;
|
||||||
|
|
||||||
|
CREATE TRIGGER cph_protect_system_inbox
|
||||||
|
BEFORE INSERT OR UPDATE OR DELETE ON "Folder"
|
||||||
|
FOR EACH ROW EXECUTE FUNCTION cph_protect_system_inbox();
|
||||||
|
|
||||||
|
ALTER TABLE "Project" ADD COLUMN "code" TEXT;
|
||||||
|
|
||||||
|
CREATE TABLE "ProjectSearchDocument" (
|
||||||
|
"projectId" TEXT NOT NULL,
|
||||||
|
"organizationId" TEXT NOT NULL,
|
||||||
|
"name" TEXT NOT NULL,
|
||||||
|
"code" TEXT,
|
||||||
|
"normalizedCode" TEXT NOT NULL,
|
||||||
|
"normalizedName" TEXT NOT NULL,
|
||||||
|
"breadcrumb" TEXT NOT NULL,
|
||||||
|
"normalizedBreadcrumb" TEXT NOT NULL,
|
||||||
|
"normalizedSearchText" TEXT NOT NULL,
|
||||||
|
"updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
CONSTRAINT "ProjectSearchDocument_pkey" PRIMARY KEY ("projectId")
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX "ProjectSearchDocument_organizationId_idx" ON "ProjectSearchDocument"("organizationId");
|
||||||
|
CREATE INDEX "ProjectSearchDocument_normalizedName_trgm_idx"
|
||||||
|
ON "ProjectSearchDocument" USING GIN ("normalizedName" gin_trgm_ops);
|
||||||
|
CREATE INDEX "ProjectSearchDocument_normalizedCode_trgm_idx"
|
||||||
|
ON "ProjectSearchDocument" USING GIN ("normalizedCode" gin_trgm_ops);
|
||||||
|
CREATE INDEX "ProjectSearchDocument_normalizedBreadcrumb_trgm_idx"
|
||||||
|
ON "ProjectSearchDocument" USING GIN ("normalizedBreadcrumb" gin_trgm_ops);
|
||||||
|
CREATE INDEX "ProjectSearchDocument_normalizedSearchText_trgm_idx"
|
||||||
|
ON "ProjectSearchDocument" USING GIN ("normalizedSearchText" gin_trgm_ops);
|
||||||
|
|
||||||
|
ALTER TABLE "ProjectSearchDocument" ADD CONSTRAINT "ProjectSearchDocument_projectId_fkey"
|
||||||
|
FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
ALTER TABLE "ProjectSearchDocument" ADD CONSTRAINT "ProjectSearchDocument_organizationId_fkey"
|
||||||
|
FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION cph_project_search_normalize(value TEXT) RETURNS TEXT
|
||||||
|
LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE AS $$
|
||||||
|
SELECT lower(regexp_replace(normalize(value, NFKC), '[[:space:]_.:/\\-]+', '', 'g'))
|
||||||
|
$$;
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION cph_folder_breadcrumb(folder_id TEXT) RETURNS TEXT
|
||||||
|
LANGUAGE sql STABLE PARALLEL SAFE AS $$
|
||||||
|
WITH RECURSIVE ancestors AS (
|
||||||
|
SELECT f."id", f."parentId", f."name", f."kind", 0 AS depth
|
||||||
|
FROM "Folder" f
|
||||||
|
WHERE f."id" = folder_id
|
||||||
|
UNION ALL
|
||||||
|
SELECT parent."id", parent."parentId", parent."name", parent."kind", child.depth + 1
|
||||||
|
FROM "Folder" parent
|
||||||
|
JOIN ancestors child ON parent."id" = child."parentId"
|
||||||
|
)
|
||||||
|
SELECT CASE
|
||||||
|
WHEN count(*) = 1 AND bool_and("kind" = 'SYSTEM_INBOX') THEN '未分类'
|
||||||
|
ELSE coalesce(string_agg("name", ' / ' ORDER BY depth DESC), '')
|
||||||
|
END
|
||||||
|
FROM ancestors
|
||||||
|
$$;
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION cph_project_search_code(explicit_code TEXT, project_name TEXT) RETURNS TEXT
|
||||||
|
LANGUAGE sql IMMUTABLE PARALLEL SAFE AS $$
|
||||||
|
SELECT CASE
|
||||||
|
WHEN explicit_code IS NOT NULL AND btrim(explicit_code) <> ''
|
||||||
|
THEN cph_project_search_normalize(explicit_code)
|
||||||
|
ELSE coalesce(substring(cph_project_search_normalize(project_name) FROM '^[a-z]+[0-9]+'), '')
|
||||||
|
END
|
||||||
|
$$;
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION cph_refresh_project_search_document(target_project_id TEXT) RETURNS void
|
||||||
|
LANGUAGE plpgsql AS $$
|
||||||
|
BEGIN
|
||||||
|
INSERT INTO "ProjectSearchDocument" (
|
||||||
|
"projectId", "organizationId", "name", "code", "normalizedCode", "normalizedName",
|
||||||
|
"breadcrumb", "normalizedBreadcrumb", "normalizedSearchText", "updatedAt"
|
||||||
|
)
|
||||||
|
SELECT p."id", p."organizationId", p."name", p."code",
|
||||||
|
cph_project_search_code(p."code", p."name"),
|
||||||
|
cph_project_search_normalize(p."name"),
|
||||||
|
cph_folder_breadcrumb(p."folderId"),
|
||||||
|
cph_project_search_normalize(cph_folder_breadcrumb(p."folderId")),
|
||||||
|
cph_project_search_normalize(cph_folder_breadcrumb(p."folderId") || ' ' || p."name"),
|
||||||
|
CURRENT_TIMESTAMP
|
||||||
|
FROM "Project" p WHERE p."id" = target_project_id
|
||||||
|
ON CONFLICT ("projectId") DO UPDATE SET
|
||||||
|
"organizationId" = EXCLUDED."organizationId",
|
||||||
|
"name" = EXCLUDED."name",
|
||||||
|
"code" = EXCLUDED."code",
|
||||||
|
"normalizedCode" = EXCLUDED."normalizedCode",
|
||||||
|
"normalizedName" = EXCLUDED."normalizedName",
|
||||||
|
"breadcrumb" = EXCLUDED."breadcrumb",
|
||||||
|
"normalizedBreadcrumb" = EXCLUDED."normalizedBreadcrumb",
|
||||||
|
"normalizedSearchText" = EXCLUDED."normalizedSearchText",
|
||||||
|
"updatedAt" = CURRENT_TIMESTAMP;
|
||||||
|
END;
|
||||||
|
$$;
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION cph_project_search_project_trigger() RETURNS trigger
|
||||||
|
LANGUAGE plpgsql AS $$
|
||||||
|
BEGIN
|
||||||
|
PERFORM cph_refresh_project_search_document(NEW."id");
|
||||||
|
RETURN NEW;
|
||||||
|
END;
|
||||||
|
$$;
|
||||||
|
|
||||||
|
CREATE TRIGGER cph_project_search_project_changed
|
||||||
|
AFTER INSERT OR UPDATE OF "name", "code", "folderId", "organizationId", "archivedAt" ON "Project"
|
||||||
|
FOR EACH ROW EXECUTE FUNCTION cph_project_search_project_trigger();
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION cph_project_search_folder_trigger() RETURNS trigger
|
||||||
|
LANGUAGE plpgsql AS $$
|
||||||
|
DECLARE project_id TEXT;
|
||||||
|
BEGIN
|
||||||
|
FOR project_id IN
|
||||||
|
WITH RECURSIVE descendants AS (
|
||||||
|
SELECT NEW."id"
|
||||||
|
UNION ALL
|
||||||
|
SELECT child."id" FROM "Folder" child
|
||||||
|
JOIN descendants parent ON child."parentId" = parent."id"
|
||||||
|
)
|
||||||
|
SELECT p."id" FROM "Project" p
|
||||||
|
WHERE p."folderId" IN (SELECT "id" FROM descendants)
|
||||||
|
LOOP
|
||||||
|
PERFORM cph_refresh_project_search_document(project_id);
|
||||||
|
END LOOP;
|
||||||
|
RETURN NEW;
|
||||||
|
END;
|
||||||
|
$$;
|
||||||
|
|
||||||
|
CREATE TRIGGER cph_project_search_folder_changed
|
||||||
|
AFTER UPDATE OF "name", "kind", "parentId", "archivedAt" ON "Folder"
|
||||||
|
FOR EACH ROW EXECUTE FUNCTION cph_project_search_folder_trigger();
|
||||||
|
|
||||||
|
SELECT cph_refresh_project_search_document("id") FROM "Project";
|
||||||