diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3826b1090..176a8268b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,6 +41,33 @@ jobs: - name: Test run: make test + helm: + name: Helm chart + runs-on: ubuntu-latest + if: ${{ !startsWith(github.head_ref, 'chore/sync-develop-after-') }} + steps: + - uses: actions/checkout@v4 + + - name: Set up Helm + uses: azure/setup-helm@v4 + with: + version: v3.17.3 + + - name: Lint and render + run: | + set -euo pipefail + helm lint deploy/helm/octop + helm template octop deploy/helm/octop -n octop >/dev/null + helm template octop deploy/helm/octop -n octop \ + -f deploy/helm/octop/values.example.yaml >/dev/null + helm template octop deploy/helm/octop -n octop \ + --set postgresql.enabled=false \ + --set database.host=pg.example.com >/dev/null + if helm template octop deploy/helm/octop -n octop --set postgresql.enabled=false >/dev/null 2>/tmp/helm-err; then + echo "expected a missing database.host to fail" + exit 1 + fi + test-windows: name: Windows / Python 3.12 runs-on: windows-latest diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 2c4a6b3e5c..ea6aaa1407 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -150,14 +150,16 @@ jobs: uses: docker/build-push-action@v6 with: context: . - file: ./docker/Dockerfile + file: ./deploy/docker/Dockerfile push: false load: true provenance: false sbom: false platforms: ${{ matrix.platform }} + # NODE_MAX_OLD_SPACE_SIZE:Vite chunk 渲染峰值约 2GB,2048 会偶发退出码 134。 build-args: | OCTOP_IMAGE_VARIANT=${{ matrix.variant }} + NODE_MAX_OLD_SPACE_SIZE=4096 tags: | octop:ci-${{ matrix.variant }} ${{ steps.meta.outputs.tags }} diff --git a/.github/workflows/helm-publish.yml b/.github/workflows/helm-publish.yml new file mode 100644 index 0000000000..67a56d1c75 --- /dev/null +++ b/.github/workflows/helm-publish.yml @@ -0,0 +1,128 @@ +name: Helm Publish + +# 版本标签 v* 上把 deploy/helm/octop 打成包,推到与镜像相同的 GHCR。 +# 不另建 HTTP Helm 仓库。安装地址: +# oci://ghcr.io/tencentcloud/octop/charts/octop +# +# Chart 源码仍在仓库里。克隆后用目录安装;没有仓库的机器用上面的 OCI 地址。 +# 推送时改写版本,不把改写提交回 git: +# appVersion = 镜像 tag(v1.0.3b5 → 1.0.3b5) +# version = Helm SemVer(1.0.3b5 → 1.0.3-b5,1.0.3 保持 1.0.3) +# +# 触发与 docker-publish.yml 相同:推送 v*,或 workflow_dispatch 填 tag。 +on: + push: + tags: + - "v*" + workflow_dispatch: + inputs: + tag: + description: "v* tag to publish (e.g. v1.0.3b5). Required when not running on a tag." + required: false + type: string + +permissions: + contents: read + packages: write + +jobs: + publish: + name: Push chart to GHCR + runs-on: ubuntu-latest + if: >- + startsWith(github.ref, 'refs/tags/v') + || (github.event_name == 'workflow_dispatch' && startsWith(inputs.tag, 'v')) + steps: + - name: Resolve version from tag ref + id: ver + env: + DISPATCH_TAG: ${{ inputs.tag }} + run: | + set -euo pipefail + if [ -n "${DISPATCH_TAG:-}" ]; then + ref="$DISPATCH_TAG" + else + ref="${GITHUB_REF_NAME}" + fi + case "$ref" in + v*) + version="${ref#v}" + ;; + *) + echo "::error::Expected v* tag, got ref=$ref" + exit 1 + ;; + esac + echo "version=$version" >> "$GITHUB_OUTPUT" + echo "tag=$ref" >> "$GITHUB_OUTPUT" + + - name: Checkout + uses: actions/checkout@v4 + with: + ref: ${{ steps.ver.outputs.tag }} + + - name: Set up Helm + uses: azure/setup-helm@v4 + with: + version: v3.17.3 + + - name: Set chart version from the release tag + env: + OCTOP_VERSION: ${{ steps.ver.outputs.version }} + run: | + set -euo pipefail + python3 - << 'PY' + import os + import re + from pathlib import Path + image_tag = os.environ["OCTOP_VERSION"] + match = re.fullmatch(r"(\d+\.\d+\.\d+)([A-Za-z].*)?", image_tag) + if match is None: + raise SystemExit(f"unsupported version {image_tag}") + base, pre = match.group(1), match.group(2) + chart_version = f"{base}-{pre}" if pre else base + path = Path("deploy/helm/octop/Chart.yaml") + text = path.read_text() + text = re.sub(r"(?m)^version:.*$", f"version: {chart_version}", text, count=1) + text = re.sub(r'(?m)^appVersion:.*$', f'appVersion: "{image_tag}"', text, count=1) + path.write_text(text) + print(f"chart {chart_version}, image tag {image_tag}") + PY + + - name: Lint and package + run: | + set -euo pipefail + helm lint deploy/helm/octop + helm package deploy/helm/octop --destination /tmp/octop-chart + + - name: Log in to GHCR + run: | + echo "${{ secrets.GITHUB_TOKEN }}" | helm registry login ghcr.io \ + --username "${{ github.actor }}" --password-stdin + + - name: Push chart + env: + GHCR: ghcr.io/${{ github.repository }} + run: | + set -euo pipefail + registry="$(echo "$GHCR" | tr '[:upper:]' '[:lower:]')" + helm push /tmp/octop-chart/octop-*.tgz "oci://${registry}/charts" + + # gh api percent-encodes the path again, so a pre-encoded slash becomes %252F. + # Call the API directly. The chart lives at octop/charts/octop so it does + # not replace the container image package named octop. + - name: Mark the GHCR chart package public + continue-on-error: true + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + OWNER: ${{ github.repository_owner }} + run: | + set -euo pipefail + owner="$(echo "$OWNER" | tr '[:upper:]' '[:lower:]')" + package="$(python3 -c 'import urllib.parse; print(urllib.parse.quote("octop/charts/octop", safe=""))')" + curl -fsS -X PUT \ + -H "Authorization: Bearer ${GH_TOKEN}" \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "https://api.github.com/orgs/${owner}/packages/container/${package}/visibility" \ + -d '{"visibility":"public"}' diff --git a/.github/workflows/octop-desktop.yml b/.github/workflows/octop-desktop.yml index d325a36732..c0536cbd79 100644 --- a/.github/workflows/octop-desktop.yml +++ b/.github/workflows/octop-desktop.yml @@ -74,7 +74,7 @@ jobs: - uses: actions/setup-node@v5 with: - # Dashboard stays on Node 20 (same as docker/Dockerfile + release.yml). + # Dashboard stays on Node 20 (same as deploy/docker/Dockerfile + release.yml). # Node 24 is a desktop/electron-only pin and nothing here builds it. node-version: "20" cache: npm diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a0e83dbd8..93a19fc243 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,52 @@ ## [Unreleased] +## [1.0.3b6] - 2026-11-15 + +### 新增 +- 支持 Helm 集群部署。多实例共用一个 PostgreSQL +- 管理员可以限制创建专家时能选的存储后端 +- 新增托管专家,对话可以交给后端 Agent,如 OpenCode +- 知识库支持知识图谱和重排序 +- 新增本地模型供应商 Magpie +- 定时任务可以跟最新对话,也可以固定到某一场历史对话 +- 对话里列出本轮改过的文件、所在目录和增删行数 + +### 修复 +- 编辑托管专家时,不显示存储后端也能保存 + +### 安全 +- 不能再把宿主机目录挂进 Docker 专家 +- 腾讯云登录按用户隔离 + ## [1.0.3b5] - 2026-11-11 ### 新增 +- 自定义 MCP 可以填写 OAuth 应用凭证(Client ID / Secret、Scope、授权与令牌端点):授权服务器不支持自动注册客户端,或不提供发现信息时,也能在页面上完成授权并自动刷新令牌 +- 自定义 MCP 服务器的 OAuth 授权失效或尚未授权时,对话会提示"授权并重试",在弹窗中授权后自动重发原消息;授权被取消或失败时会提示原因 +- 新增 `octop migrate openclaw` / `octop migrate hermes`:把原有助手的模型供应商、人格与记忆文件、技能、MCP 服务器和通道迁移到一个专家,支持 `--dry-run` 预演;已存在的内容不会被覆盖,通道默认不启用 +- 知识库的文档和文件夹可以移动到同一知识库的其他文件夹或根目录:卡片与表格的操作栏新增「移动到…」,文件夹会连同其中的内容一起移动,无需重新上传和索引 +- 知识库的文档和文件夹也可以移动到其他知识库:移动弹窗按知识库列出目标文件夹,原文件和索引一起迁移,无需重新上传 +- 知识库检索支持重排序(Rerank):在「知识库设置」里选择提供重排序模型的供应商后,向量检索会先多取一批候选片段,再按与问题的相关度重排,只保留最相关的几条;重排序请求失败时自动沿用向量顺序 +- 专家市场默认打开「精选」,用书签标出接入市场前随安装包提供的 22 个专家模板 +- 通道卡片与 `/api/health` 展示每个通道的入站、出站、重连和丢弃计数;记忆存储页显示 checkpoint 保留窗口与 VACUUM 提示 +- 知识库可以构建知识图谱:用所选对话模型从文档片段中抽取实体和关系,在控制台查看关系图和出处,检索时沿图谱补充相关片段和关系 + +### 修复 +- 云端协同不再因 20 秒协议 ping 超时反复断开。保活改由应用层心跳负责,对端忙时不会被拆线后立刻重连 +- 服务端不再因协议 pong 迟到拆掉 WebSocket。演示站事件循环忙碌时,原先会因此挂断云端协同并立刻被重连 +- 回合进行中,「整理结果中」只出现在当前这条回复上。最终回答不再排到提问前面。手机上提问卡的提交按钮不再被输入框挡住 +- 关机时会等正在进行的数据库查询结束再关闭连接,避免 Windows 上测试进程被访问冲突打断 +- 模型池里的优先模型可以取消,并且不再显示为聊天框里的选中模型。聊天框只显示专家默认模型或这场对话的手选模型 +- 添加云端协同时,权限不足、连接被占用、连到本机或达到条数上限会立刻显示可读错误,不再重试原始关闭帧 +- 同一专家的不同会话不再互相取消正在等待的提问。侧栏展开时可以拖右缘改宽度 +- 重名的模型供应商返回冲突,不再报服务器错误。知识库引用只包含实际写进上下文的文档 +- 备份落到另一块磁盘时不再丢文件。两个账号在同一浏览器里不再共用主题 +- 未读数字可以打开对应会话。自定义 ACP 显示自己的名称,HTML 预览里的页内链接留在预览框内 +- 供应商的默认模型可以清空并保持为空。对话里的模型名与选择时一致,能区分不同厂家的同名模型 +- 服务端升级后,登录页和已登录页面都会提示刷新前端。PostgreSQL 备份缺少客户端工具时会说明原因,Docker 镜像带上该工具 +- 专家配置文件改为文本框编辑,打开时不再停在编辑器加载中 +- 飞书通道注册时改用持久化去重库,通道重建或服务重启后仍能识别重投事件 - 桌面客户端改为 Electron 壳,登录过期后自动续上 - 自定义 MCP 可填写 OAuth 应用凭证并完成授权 - 新增 `octop migrate openclaw` / `octop migrate hermes`,把原有助手迁到一个专家 diff --git a/README.md b/README.md index ba771bd325..a00f12febb 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@
-
+
@@ -278,13 +278,13 @@ Open **http://127.0.0.1:8088**. With Docker, a valid `OCTOP_DEFAULT_PASSWORD` cr
```bash
# Build and start
-docker compose -f docker/docker-compose.yml up -d
+docker compose -f deploy/docker/docker-compose.yml up -d
# China mirror when ghcr.io is unreachable (no local build)
-docker compose -f docker/docker-compose.cn.yml up -d
+docker compose -f deploy/docker/docker-compose.cn.yml up -d
# Or build manually
-bash docker/docker_build.sh
+bash deploy/docker/docker_build.sh
docker run -d \
-p 8088:8088 \
-v octop-data:/data/.octop \
@@ -295,6 +295,8 @@ docker run -d \
Open `http://localhost:8088`. A valid `OCTOP_DEFAULT_PASSWORD` creates the admin on first boot and writes credentials to `/data/.octop/credential.txt`. If it is unset or rejected by the password policy, no admin is created — complete the setup wizard (unlock password in `/data/.octop/octop-login.txt`). Override the username via `OCTOP_ADMIN_USERNAME`.
+The Helm chart for a shared PostgreSQL and multiple replicas is documented in [deploy/helm/octop/README.md](deploy/helm/octop/README.md). Install it from `oci://ghcr.io/tencentcloud/octop/charts/octop`.
+
> **Password policy:** at least 8 characters with letters and digits.
| Variable | Default | Description |
@@ -351,7 +353,7 @@ To serve the dashboard under a reverse-proxy subpath (for example `https://examp
| Local script | macOS / Linux | `bash scripts/install.sh` |
| Local script | Windows | `scripts\install.bat` or `install.ps1` |
| PyPI | Any | `pip install octop` (optional extras such as `local-embedding`) |
-| Docker | Any | `docker/docker-compose.yml`; China mirror: `docker/docker-compose.cn.yml` |
+| Docker | Any | `deploy/docker/docker-compose.yml`; China mirror: `deploy/docker/docker-compose.cn.yml` |
All install scripts provision an isolated environment at `~/.octop/venv` and a `~/.octop/bin/octop` wrapper — they do not touch system Python.
@@ -520,7 +522,7 @@ src/octop/
dashboard/ frontend source (Vite) — edit here, run make build-frontend
-docker/ Docker Compose, entrypoint, build & deploy scripts
+deploy/ Docker (deploy/docker) and the Kubernetes Helm chart (deploy/helm/octop)
tests/ unit/ + integration/
```
diff --git a/README_CN.md b/README_CN.md
index 61b2c1c0ca..3dc81548c3 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -15,7 +15,7 @@
-
+
@@ -280,13 +280,13 @@ octop service start
```bash
# 构建并启动
-docker compose -f docker/docker-compose.yml up -d
+docker compose -f deploy/docker/docker-compose.yml up -d
# 官方 GHCR 拉取失败时用国内源(不本地构建)
-docker compose -f docker/docker-compose.cn.yml up -d
+docker compose -f deploy/docker/docker-compose.cn.yml up -d
# 或手动构建
-bash docker/docker_build.sh
+bash deploy/docker/docker_build.sh
docker run -d \
-p 8088:8088 \
-v octop-data:/data/.octop \
@@ -297,6 +297,8 @@ docker run -d \
打开 `http://localhost:8088`。`OCTOP_DEFAULT_PASSWORD` 合格时首次启动会创建管理员,并把凭据写入 `/data/.octop/credential.txt`。未设置或密码被策略拒绝时不自动建账号,打开页面走设置向导(向导口令在 `/data/.octop/octop-login.txt`)。可通过 `OCTOP_ADMIN_USERNAME` 覆盖用户名。
+共用 PostgreSQL、多副本的 Kubernetes 安装说明在 [deploy/helm/octop/README_CN.md](deploy/helm/octop/README_CN.md)。安装地址是 `oci://ghcr.io/tencentcloud/octop/charts/octop`。
+
> **密码策略:** 至少 8 位,且同时包含字母和数字。
| 变量 | 默认值 | 说明 |
@@ -350,7 +352,7 @@ docker run -d \
| 本地脚本 | macOS / Linux | `bash scripts/install.sh` |
| 本地脚本 | Windows | `scripts\install.bat` 或 `install.ps1` |
| PyPI | 全平台 | `pip install octop`(可选 extras 如 `local-embedding`) |
-| Docker | 全平台 | `docker/docker-compose.yml`;国内镜像 `docker/docker-compose.cn.yml` |
+| Docker | 全平台 | `deploy/docker/docker-compose.yml`;国内镜像 `deploy/docker/docker-compose.cn.yml` |
所有安装脚本均在 `~/.octop/venv` 创建隔离环境,并通过 `~/.octop/bin/octop` 包装 CLI,不会影响系统 Python。
@@ -516,7 +518,7 @@ src/octop/
dashboard/ 前端源码(Vite)— 在此编辑,运行 make build-frontend
-docker/ Docker Compose、入口脚本、构建与部署脚本
+deploy/ Docker(deploy/docker)与 Kubernetes Helm chart(deploy/helm/octop)
tests/ unit/ + integration/
```
diff --git a/dashboard/index.html b/dashboard/index.html
index 359ab10edd..754398dfef 100644
--- a/dashboard/index.html
+++ b/dashboard/index.html
@@ -364,32 +364,32 @@
-
- - - Opening… -
+
+
+ + + Opening… +
+{escape(message)}
+