From 30336dcaa238889135108805e7d9bcaa07baf98f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E7=B3=AF=20=28Xiaonuo=29?= Date: Wed, 22 Apr 2026 22:59:51 +0800 Subject: [PATCH] =?UTF-8?q?reorder=20onboard=20checklist:=20cfg=20before?= =?UTF-8?q?=20email=20before=20git=20identity,=20add=2003-email-account=20?= =?UTF-8?q?step=20--=20=E5=B0=8F=E7=B3=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hermes/shazhou-family-onboard/SKILL.md | 15 +++-- .../{03-cfg-cli.md => 02-cfg-cli.md} | 0 .../references/03-email-account.md | 61 +++++++++++++++++ .../references/03-gitea-tea.md | 66 ------------------- .../references/04-cfg-cli.md | 50 -------------- ...{02-git-identity.md => 04-git-identity.md} | 2 +- .../{04-gitea-tea.md => 05-gitea-tea.md} | 2 +- .../{05-tailscale.md => 06-tailscale.md} | 2 +- ...family-members.md => 07-family-members.md} | 2 +- ...7-hermes-config.md => 08-hermes-config.md} | 2 +- .../{08-skills-sync.md => 09-skills-sync.md} | 2 +- 11 files changed, 75 insertions(+), 129 deletions(-) rename hermes/shazhou-family-onboard/references/{03-cfg-cli.md => 02-cfg-cli.md} (100%) create mode 100644 hermes/shazhou-family-onboard/references/03-email-account.md delete mode 100644 hermes/shazhou-family-onboard/references/03-gitea-tea.md delete mode 100644 hermes/shazhou-family-onboard/references/04-cfg-cli.md rename hermes/shazhou-family-onboard/references/{02-git-identity.md => 04-git-identity.md} (96%) rename hermes/shazhou-family-onboard/references/{04-gitea-tea.md => 05-gitea-tea.md} (98%) rename hermes/shazhou-family-onboard/references/{05-tailscale.md => 06-tailscale.md} (97%) rename hermes/shazhou-family-onboard/references/{06-family-members.md => 07-family-members.md} (97%) rename hermes/shazhou-family-onboard/references/{07-hermes-config.md => 08-hermes-config.md} (96%) rename hermes/shazhou-family-onboard/references/{08-skills-sync.md => 09-skills-sync.md} (97%) diff --git a/hermes/shazhou-family-onboard/SKILL.md b/hermes/shazhou-family-onboard/SKILL.md index 0edf0e8..070dede 100644 --- a/hermes/shazhou-family-onboard/SKILL.md +++ b/hermes/shazhou-family-onboard/SKILL.md @@ -33,13 +33,14 @@ skill_view("shazhou-family-onboard", "references/01-ssh-keypair.md") |---|--------|------|------| | 00 | ⚡ 自主权解绑 | `references/00-self-unbind.md` | **最先执行！** approvals/redact/tirith/allowlist/guard | | 01 | SSH 密钥对 | `references/01-ssh-keypair.md` | 生成 ed25519 密钥，注册到 Gitea | -| 02 | Git 身份配置 | `references/02-git-identity.md` | user.name / user.email | -| 03 | cfg CLI (配置管理) | `references/03-cfg-cli.md` | 安装 cfg，获取 GITEA_TOKEN | -| 04 | Gitea 账号 & tea CLI | `references/04-gitea-tea.md` | tea 登录、注册 SSH 公钥 | -| 05 | Tailscale 组网 | `references/05-tailscale.md` | 加入 tailnet，验证互通 | -| 06 | 家族成员互相认识 | `references/06-family-members.md` | 了解各设备和伙伴的联系方式 | -| 07 | Hermes 基础配置 | `references/07-hermes-config.md` | config.yaml 必要字段检查 | -| 08 | Skills 同步 | `references/08-skills-sync.md` | 克隆 skills repo，运行 sync.sh | +| 02 | cfg CLI (配置管理) | `references/02-cfg-cli.md` | 安装 cfg，获取公共配置 | +| 03 | shazhou.work 邮箱 | `references/03-email-account.md` | 用 mcmail 创建邮箱（如果没有） | +| 04 | Git 身份配置 | `references/04-git-identity.md` | user.name / user.email | +| 05 | Gitea 账号 & tea CLI | `references/05-gitea-tea.md` | tea 登录、注册 SSH 公钥 | +| 06 | Tailscale 组网 | `references/06-tailscale.md` | 加入 tailnet，验证互通 | +| 07 | 家族成员互相认识 | `references/07-family-members.md` | 了解各设备和伙伴的联系方式 | +| 08 | Hermes 基础配置 | `references/08-hermes-config.md` | config.yaml 必要字段检查 | +| 09 | Skills 同步 | `references/09-skills-sync.md` | 克隆 skills repo，运行 sync.sh | ## 自检模式 diff --git a/hermes/shazhou-family-onboard/references/03-cfg-cli.md b/hermes/shazhou-family-onboard/references/02-cfg-cli.md similarity index 100% rename from hermes/shazhou-family-onboard/references/03-cfg-cli.md rename to hermes/shazhou-family-onboard/references/02-cfg-cli.md diff --git a/hermes/shazhou-family-onboard/references/03-email-account.md b/hermes/shazhou-family-onboard/references/03-email-account.md new file mode 100644 index 0000000..796290e --- /dev/null +++ b/hermes/shazhou-family-onboard/references/03-email-account.md @@ -0,0 +1,61 @@ +# 02. shazhou.work 邮箱 + +## 检查 + +```bash +mcmail accounts list | grep "$(whoami)@shazhou.work" +``` + +✅ 达标：列表中出现 `你的名字@shazhou.work`，状态为 `yes` + +## 前置 + +- 已完成 01 (SSH 密钥对) +- 已安装 cfg CLI 并能 `eval "$(cfg env)"` 获取公共配置 + +## 安装 + +### 1. 安装 mcmail + +```bash +npm install -g @shazhou/mcmail +``` + +### 2. 登录 Mailcheap + +mcmail 使用管理员凭据登录，凭据通过 cfg 获取： + +```bash +eval "$(cfg env)" +printf '%s\n%s\n' "$MAILCHEAP_USERNAME" "$MAILCHEAP_PASSWORD" | mcmail login +``` + +验证登录成功： + +```bash +mcmail whoami +``` + +### 3. 检查邮箱是否已存在 + +```bash +mcmail accounts list +``` + +如果列表中已有你的 `xxx@shazhou.work` 账号，跳过创建步骤。 + +### 4. 创建邮箱（如果不存在） + +```bash +mcmail accounts create YOUR_NAME@shazhou.work --password "你的邮箱密码" +``` + +命名规则：用你的 Gitea 用户名，如 `xiaonuo@shazhou.work`。 + +## 验证 + +```bash +mcmail accounts info YOUR_NAME@shazhou.work +``` + +确认 Enabled 为 yes。 diff --git a/hermes/shazhou-family-onboard/references/03-gitea-tea.md b/hermes/shazhou-family-onboard/references/03-gitea-tea.md deleted file mode 100644 index 95a1735..0000000 --- a/hermes/shazhou-family-onboard/references/03-gitea-tea.md +++ /dev/null @@ -1,66 +0,0 @@ -# 03. Gitea 账号 & tea CLI - -## 检查 - -```bash -# tea 是否安装 -which tea - -# 是否已登录 -tea login list -``` - -✅ 达标：`tea` 可用，login list 显示 `shazhou` 登录条目，URL 为 `https://git.shazhou.work` - -## 安装 - -### 安装 tea - -```bash -# macOS -brew install tea - -# Linux (amd64) -curl -sL https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-amd64 -o /usr/local/bin/tea -chmod +x /usr/local/bin/tea - -# Linux (arm64) -curl -sL https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-arm64 -o /usr/local/bin/tea -chmod +x /usr/local/bin/tea -``` - -### 登录 Gitea - -需要先在 Gitea Web UI 创建一个 API Token： -`https://git.shazhou.work/user/settings/applications` - -```bash -tea login add \ - --name shazhou \ - --url https://git.shazhou.work \ - --token YOUR_GITEA_TOKEN \ - --user YOUR_USERNAME -``` - -### Gitea 账号对照表 - -| Gitea 用户 | 家族成员 | -|------------|----------| -| scottwei | 主人沙洲 | -| xiaoju | 小橘 🍊 | -| xingyue | 星月 🌙 | -| xiaomo | 小墨 🖤 | -| xiaonuo | 小糯 🍡 | -| tuanzi | 团子 🐰 | -| luming | 鹿鸣 🦌 | -| aobing | 敖丙 🐉 | - -## 验证 - -```bash -# 列出仓库 -tea repos - -# 列出某个仓库的 issues -tea issues --repo xiaoju/uncaged -``` diff --git a/hermes/shazhou-family-onboard/references/04-cfg-cli.md b/hermes/shazhou-family-onboard/references/04-cfg-cli.md deleted file mode 100644 index 4a19108..0000000 --- a/hermes/shazhou-family-onboard/references/04-cfg-cli.md +++ /dev/null @@ -1,50 +0,0 @@ -# 04. cfg CLI (配置管理) - -## 检查 - -```bash -# cfg 是否安装 -which cfg - -# 能否读取配置 -cfg list 2>/dev/null | head -5 - -# 是否有 GITEA_TOKEN -cfg get GITEA_TOKEN -``` - -✅ 达标：`cfg` 可用，能列出配置项，`GITEA_TOKEN` 有值 - -## 安装 - -### 安装 cfg - -```bash -# cfg 是家族自建工具，从 Gitea 获取 -# macOS -curl -sL "https://git.shazhou.work/shazhou/cfg/releases/download/latest/cfg-darwin-arm64" -o /usr/local/bin/cfg -chmod +x /usr/local/bin/cfg - -# Linux (amd64) -curl -sL "https://git.shazhou.work/shazhou/cfg/releases/download/latest/cfg-linux-amd64" -o /usr/local/bin/cfg -chmod +x /usr/local/bin/cfg -``` - -> ⚠️ 如果上面的下载链接失效，问主人要最新的安装方式。 - -### 配置 - -cfg 的配置和 token 由主人提供。安装好后联系主人获取初始配置。 - -### 重要规则 - -- Gitea API 用 `cfg env` 的 `GITEA_TOKEN`（每个 agent 自己的） -- **不要**用 osxkeychain 里可能残留的其他人的 token - -## 验证 - -```bash -cfg list -cfg get GITEA_TOKEN -# 应该返回你自己的 token，不是空的 -``` diff --git a/hermes/shazhou-family-onboard/references/02-git-identity.md b/hermes/shazhou-family-onboard/references/04-git-identity.md similarity index 96% rename from hermes/shazhou-family-onboard/references/02-git-identity.md rename to hermes/shazhou-family-onboard/references/04-git-identity.md index 1dd76e7..97ba660 100644 --- a/hermes/shazhou-family-onboard/references/02-git-identity.md +++ b/hermes/shazhou-family-onboard/references/04-git-identity.md @@ -1,4 +1,4 @@ -# 02. Git 身份配置 +# 04. Git 身份配置 ## 检查 diff --git a/hermes/shazhou-family-onboard/references/04-gitea-tea.md b/hermes/shazhou-family-onboard/references/05-gitea-tea.md similarity index 98% rename from hermes/shazhou-family-onboard/references/04-gitea-tea.md rename to hermes/shazhou-family-onboard/references/05-gitea-tea.md index 68bff4a..c961b97 100644 --- a/hermes/shazhou-family-onboard/references/04-gitea-tea.md +++ b/hermes/shazhou-family-onboard/references/05-gitea-tea.md @@ -1,4 +1,4 @@ -# 04. Gitea 账号 & tea CLI +# 05. Gitea 账号 & tea CLI ## 检查 diff --git a/hermes/shazhou-family-onboard/references/05-tailscale.md b/hermes/shazhou-family-onboard/references/06-tailscale.md similarity index 97% rename from hermes/shazhou-family-onboard/references/05-tailscale.md rename to hermes/shazhou-family-onboard/references/06-tailscale.md index 73496d1..9113dd6 100644 --- a/hermes/shazhou-family-onboard/references/05-tailscale.md +++ b/hermes/shazhou-family-onboard/references/06-tailscale.md @@ -1,4 +1,4 @@ -# 05. Tailscale 组网 +# 06. Tailscale 组网 ## 检查 diff --git a/hermes/shazhou-family-onboard/references/06-family-members.md b/hermes/shazhou-family-onboard/references/07-family-members.md similarity index 97% rename from hermes/shazhou-family-onboard/references/06-family-members.md rename to hermes/shazhou-family-onboard/references/07-family-members.md index 6b56bbe..8fd8ed5 100644 --- a/hermes/shazhou-family-onboard/references/06-family-members.md +++ b/hermes/shazhou-family-onboard/references/07-family-members.md @@ -1,4 +1,4 @@ -# 06. 家族成员互相认识 +# 07. 家族成员互相认识 ## 检查 diff --git a/hermes/shazhou-family-onboard/references/07-hermes-config.md b/hermes/shazhou-family-onboard/references/08-hermes-config.md similarity index 96% rename from hermes/shazhou-family-onboard/references/07-hermes-config.md rename to hermes/shazhou-family-onboard/references/08-hermes-config.md index 12c1b2a..506c9cf 100644 --- a/hermes/shazhou-family-onboard/references/07-hermes-config.md +++ b/hermes/shazhou-family-onboard/references/08-hermes-config.md @@ -1,4 +1,4 @@ -# 07. Hermes 基础配置 +# 08. Hermes 基础配置 ## 检查 diff --git a/hermes/shazhou-family-onboard/references/08-skills-sync.md b/hermes/shazhou-family-onboard/references/09-skills-sync.md similarity index 97% rename from hermes/shazhou-family-onboard/references/08-skills-sync.md rename to hermes/shazhou-family-onboard/references/09-skills-sync.md index 60a9abc..3e9dc16 100644 --- a/hermes/shazhou-family-onboard/references/08-skills-sync.md +++ b/hermes/shazhou-family-onboard/references/09-skills-sync.md @@ -1,4 +1,4 @@ -# 08. Skills 同步 +# 09. Skills 同步 ## 检查