Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
93d882d
fix(desktop): use native tray context menu
Sep 19, 2026
afd72c6
Merge pull request #2735 from TencentCloud/chore/sync-develop-after-1…
github-actions[bot] Nov 2, 2026
43c1b8b
fix(db): adapt executemany on the PostgreSQL connection proxy (#2736)
wxhking Nov 2, 2026
362769d
Merge pull request #2746 from TencentCloud/fix/docker-lite-image
jubaoliang Nov 2, 2026
342487d
fix(agents): refresh AUTO agents with stale provider fallback refs (#…
jayfeng7 Nov 2, 2026
462dd39
fix(knowledge): preserve remote embedding order (#1454)
AbelTomato Nov 2, 2026
3359f5b
fix(dashboard): restyle the local-shell badge and align account secur…
jubaoliang Nov 2, 2026
dde733b
test: match the Docker publish warning after lite image tags (#2755)
liukewia Nov 2, 2026
2f56636
feat: keep skill packages and knowledge on the control-plane database…
jubaoliang Nov 3, 2026
b00b7b2
fix(db): stop fsyncing every SQLite write on Windows (#2716)
liukewia Nov 3, 2026
c4db7a9
fix(fnos): name the x86 native package amd64 and stamp store versions…
liukewia Nov 3, 2026
1036d78
fix(dashboard): serve Monaco from the page origin (#2730)
liukewia Nov 3, 2026
09de208
feat(market): load plugins and experts from the remote market (#2418)
liukewia Nov 3, 2026
63d3464
feat(dashboard): hide any expert from the chat list (#2771)
jubaoliang Nov 3, 2026
f59cb6f
feat: lease cron runs and channel connections across instances (#2774)
jubaoliang Nov 3, 2026
24fc065
chore: remove the in-repo marketplace catalog (#2777)
liukewia Nov 3, 2026
f278cf3
fix(gateway): keep ask_user_question answers on the paused thread (#2…
huangcheng Nov 3, 2026
c06413c
feat(auth): reserve LDAP users and keep hidden directory settings (#2…
jubaoliang Nov 3, 2026
cbd792f
refactor(dashboard): join element class names with cx (#2780)
liukewia Nov 3, 2026
011b0f9
fix(gateway): scale long vision images before the provider call
seed30 Nov 3, 2026
6813261
Merge pull request #2783 from TencentCloud/fix/vision-long-image-side
seed30 Nov 4, 2026
d993721
fix: keep the install runtime, bridge OpenSandbox file ops, and add T…
jubaoliang Nov 4, 2026
ac6f323
feat: share avatars, plugins, and published experts across instances …
jubaoliang Nov 4, 2026
8ff9a9b
chore: update installation script URLs in documentation and code (#2798)
liukewia Nov 4, 2026
c5ddb16
fix(memory): upgrade octop-memory to 1.0.3 (#2799)
Bosheng0422 Nov 4, 2026
99d1e6e
fix(chat): prevent stale cached turns from reordering history (#2796)
Bosheng0422 Nov 4, 2026
d2321c8
docs: add the WeChat search card to Community (#2810)
jubaoliang Nov 4, 2026
31dc01b
Merge upstream develop into tray context menu fix
JY-M666 Nov 4, 2026
cc675fd
fix: let only the connector owner edit a shared instance (#2809)
jubaoliang Nov 4, 2026
01cfc50
Merge pull request #827 from JY-M666/fix/issue-698-tray-context-menu
seed30 Nov 4, 2026
7bd3819
chore(deps): upgrade octop-harness to 1.0.7 (#2812)
Bosheng0422 Nov 4, 2026
deec4f6
fix: apply the allowed storage root when creating an expert (#2813)
jubaoliang Nov 4, 2026
2a983c0
chore: release 1.0.3b3
jubaoliang-tencent Nov 4, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
19 changes: 4 additions & 15 deletions .cursor/skills/publish/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,18 +199,7 @@ git checkout -B {RELEASE_BRANCH_PREFIX}{version} {REMOTE}/{INTEGRATION_BRANCH}
grep -n '__version__' src/octop/__init__.py
# `__version__ = "X.Y.Z"` → `"A.B.C"`
```
4. 飞牛 FnOS 两个 manifest 的 `version=`(仓库源文件与 pyproject 保持同一 PEP 440 字符串。`scripts/build-fpk.sh` 打包时会改写成商店可比版本,例如 `1.0.2b8` → `1.0.208`,不要把源文件改成这个编码):
```bash
grep -n '^version=' fnos/docker/manifest fnos/native/manifest
# `version=X.Y.Z` → `version=A.B.C`(两个文件都要改,仍是 PEP 440)
```
5. 飞牛 Docker compose 镜像标签(与本包版本相同,供 FPK 拉取 GHCR):
```bash
grep -n 'ghcr.io/tencentcloud/octop:' fnos/docker/app/docker/docker-compose.yaml
# `ghcr.io/tencentcloud/octop:X.Y.Z` → `:A.B.C`
# 不得改成 `:latest`(测试禁止 latest)
```
6. `uv.lock` 里可编辑包 `octop` 的版本(漏改会导致 lock 与 pyproject 不一致):
4. `uv.lock` 里可编辑包 `octop` 的版本(漏改会导致 lock 与 pyproject 不一致):
```bash
grep -n -A2 'name = "octop"' uv.lock | head -5
# 将该包的 `version = "X.Y.Z"` 改为 `"A.B.C"`
Expand All @@ -232,15 +221,15 @@ git grep -n --fixed-strings "X.Y.Z"
| `CHANGELOG.md` 已发布章节(`## [X.Y.Z]` 及正文) | **保留**,不要改历史 |
| 测试夹具里拿旧号做比较(如 `1.0.2b4` vs `1.0.2b5`、解析示例) | **保留** |
| workflow / 注释里的示例旧号(如 `0.9.28`) | **保留**(不是当前钉死) |
| `fnos/README.md` 版本号映射里的示例 | **保留** |
| `fnos/docker/manifest`、`fnos/native/manifest` 的 `version`,以及 `fnos/docker/app/docker/docker-compose.yaml` 的 `image` | **保留**占位 `0.0.0`。`scripts/build-fpk.sh` 从 `pyproject.toml` 写入商店版本和镜像标签 |

提交前再扫必改清单,必须已经没有旧号:

```bash
git grep -n --fixed-strings "X.Y.Z" -- \
pyproject.toml src/octop/__init__.py \
README.md README_CN.md \
fnos/docker/manifest fnos/native/manifest \
fnos/docker/app/docker/docker-compose.yaml \
uv.lock
```

Expand Down Expand Up @@ -366,6 +355,6 @@ git checkout {original_branch}
- 发版后删除 `release/*`;`main → develop` 由 `sync-main-to-develop.yml` 自动同步(失败时再手动补)
- 中止前展示完整错误输出
- 插入新版本条目后保持 `[Unreleased]` 为空
- 把旧版本号 `X.Y.Z` 换成 `A.B.C`:`pyproject.toml`、`__version__`、多语言 README 徽标、`fnos/*/manifest`、`fnos/docker/app/docker/docker-compose.yaml` 镜像标签、`uv.lock` 的 octop 包版本;提交前 `git grep` 必改清单确认无旧号
- 把旧版本号 `X.Y.Z` 换成 `A.B.C`:`pyproject.toml`、`__version__`、多语言 README 徽标、`uv.lock` 的 octop 包版本;提交前 `git grep` 必改清单确认无旧号。`fnos/docker/manifest`、`fnos/native/manifest` 的 `version` 和 `fnos/docker/app/docker/docker-compose.yaml` 的 `image` 保持占位 `0.0.0`,不要改
- 勿改 CHANGELOG 历史章节、测试夹具里的旧版本比较、workflow 示例号
- 推送 tag 后提示用户关注 GitHub Actions 的发布结果
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ node_modules
.env.*
!.env.example

# Marketplace catalog is not part of the runtime image.
marketplace

# Misc
.DS_Store
*.log
Expand Down
100 changes: 66 additions & 34 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ name: Docker Publish
#
# 架构:ubuntu-latest 打 linux/amd64,ubuntu-24.04-arm 打 linux/arm64。
# 每个架构先在本机启动镜像并跑 live 启动测试,通过后才推送该架构 tag,
# 再合并为 :{version} / :latest 多架构清单。飞牛 Docker 版 FPK 共用一份,
# 再合并为 :{version} / :latest 多架构清单。精简版同样打 :{version}-lite / :lite,
# 不含桌面、本地向量和 OCR。飞牛 Docker 版 FPK 各用一个标签,
# NAS 按本机架构拉取对应镜像层。某一架构启动失败(例如 ARM 上 Illegal
# instruction / 退出码 132)只丢掉该架构,不挡住另一架构和后续 FPK。
#
Expand All @@ -25,6 +26,7 @@ name: Docker Publish
# 拉取示例:
# docker pull ghcr.io/tencentcloud/octop:latest
# docker pull ghcr.io/tencentcloud/octop:0.9.28
# docker pull ghcr.io/tencentcloud/octop:0.9.28-lite
on:
push:
tags:
Expand Down Expand Up @@ -81,7 +83,7 @@ jobs:
echo "ghcr=ghcr.io/$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_OUTPUT"

build:
name: Build ${{ matrix.arch }}
name: Build ${{ matrix.arch }} ${{ matrix.variant }}
needs: prepare
runs-on: ${{ matrix.runner }}
env:
Expand All @@ -93,9 +95,19 @@ jobs:
- runner: ubuntu-latest
platform: linux/amd64
arch: amd64
variant: full
- runner: ubuntu-latest
platform: linux/amd64
arch: amd64
variant: lite
- runner: ubuntu-24.04-arm
platform: linux/arm64
arch: arm64
variant: full
- runner: ubuntu-24.04-arm
platform: linux/arm64
arch: arm64
variant: lite
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -127,9 +139,9 @@ jobs:
images: |
${{ env.DOCKERHUB_USER != '' && format('{0}/octop', env.DOCKERHUB_USER) || '' }}
${{ needs.prepare.outputs.ghcr }}
# 单架构中间 tag;:{version} / :latest 由 merge 合成多架构清单
# 单架构中间 tag。full → :{version}-{arch};lite → :{version}-lite-{arch}。
tags: |
type=raw,value=${{ needs.prepare.outputs.version }}-${{ matrix.arch }}
type=raw,value=${{ needs.prepare.outputs.version }}${{ matrix.variant == 'lite' && '-lite' || '' }}-${{ matrix.arch }}

# load 与 registry 导出不能同时开。先载入本机做启动测试,通过后再 docker push。
# docker 导出不支持 provenance,这里关掉,避免 --load 失败。
Expand All @@ -143,20 +155,28 @@ jobs:
provenance: false
sbom: false
platforms: ${{ matrix.platform }}
build-args: |
OCTOP_IMAGE_VARIANT=${{ matrix.variant }}
tags: |
octop:ci
octop:ci-${{ matrix.variant }}
${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha,scope=docker-${{ matrix.arch }}
cache-to: type=gha,mode=max,scope=docker-${{ matrix.arch }}
cache-from: type=gha,scope=docker-${{ matrix.variant }}-${{ matrix.arch }}
cache-to: type=gha,mode=max,scope=docker-${{ matrix.variant }}-${{ matrix.arch }}

- uses: astral-sh/setup-uv@v4
with:
python-version: "3.12"

- name: Report image size
run: |
docker image inspect "octop:ci-${{ matrix.variant }}" \
--format '::notice::${{ matrix.variant }} ${{ matrix.arch }} {{.Size}} bytes'

- name: Boot-test image before publish
env:
OCTOP_TEST_IMAGE: octop:ci
OCTOP_TEST_IMAGE: octop:ci-${{ matrix.variant }}
OCTOP_IMAGE_VARIANT: ${{ matrix.variant }}
run: |
set -euo pipefail
uv venv /tmp/octop-docker-test
Expand Down Expand Up @@ -210,31 +230,43 @@ jobs:
HUB: ${{ env.DOCKERHUB_USER != '' && format('{0}/octop', env.DOCKERHUB_USER) || '' }}
run: |
set -euo pipefail
any_multi=0
for REG in "$GHCR" "$HUB"; do
[ -n "$REG" ] || continue
sources=()
for arch in amd64 arm64; do
if docker buildx imagetools inspect "${REG}:${VER}-${arch}" >/dev/null 2>&1; then
sources+=("${REG}:${VER}-${arch}")
else
echo "::warning::missing ${REG}:${VER}-${arch}"
publish_variant() {
local mid="$1" tag_a="$2" tag_b="$3" required="$4"
local reg arch ref
for reg in "$GHCR" "$HUB"; do
[ -n "$reg" ] || continue
local -a sources=()
for arch in amd64 arm64; do
ref="${reg}:${VER}${mid}-${arch}"
if docker buildx imagetools inspect "$ref" >/dev/null 2>&1; then
sources+=("$ref")
else
echo "::warning::missing ${ref}"
fi
done
if [ "${#sources[@]}" -eq 0 ]; then
if [ "$required" = "yes" ]; then
echo "::error::No platform images published for ${reg}:${tag_a}"
exit 1
fi
echo "::warning::skip ${reg}:${tag_a} (no platform images)"
continue
fi
if [ "${#sources[@]}" -lt 2 ]; then
echo "::warning:::${tag_a} is not multi-arch. A package on the missing CPU will not run."
# 精简版对外是一份 x86/ARM 通用标签。缺任一架构就不要发,避免装上后拉取失败。
if [ "$required" != "yes" ]; then
echo "::warning::skip ${reg}:${tag_a} until both amd64 and arm64 exist"
continue
fi
fi
docker buildx imagetools create \
-t "${reg}:${tag_a}" \
-t "${reg}:${tag_b}" \
"${sources[@]}"
echo "=== ${reg}:${tag_a} ==="
docker buildx imagetools inspect "${reg}:${tag_a}"
done
if [ "${#sources[@]}" -eq 0 ]; then
echo "::error::No platform images published for ${REG}:${VER}"
exit 1
fi
if [ "${#sources[@]}" -ge 2 ]; then
any_multi=1
fi
docker buildx imagetools create \
-t "${REG}:${VER}" \
-t "${REG}:latest" \
"${sources[@]}"
echo "=== ${REG}:${VER} ==="
docker buildx imagetools inspect "${REG}:${VER}"
done
if [ "$any_multi" -eq 0 ]; then
echo "::warning:::${VER} is not multi-arch (ARM image missing). Docker FPK on ARM NAS will not run."
fi
}
publish_variant "" "$VER" latest yes
publish_variant "-lite" "${VER}-lite" lite no
77 changes: 60 additions & 17 deletions .github/workflows/fnos-build-fpk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ name: Build Octop FPK
# - Native wheel:优先从同版本 GitHub Release(v*)下载;
# 缺失时再回退到本仓源码构建
# - fnpack:fpk / native 用 Actions cache 复用 .verify/fnpack(key 含 FNPACK_VERSION)
# - 产物挂到同一个 v* GitHub Release(与 wheel / 桌面包并列),不再单独打 fnos-* tag
# - 产物挂到同一个 v* GitHub Release(与 wheel / 桌面包并列),再上传到 COS
#
# Jobs:
# version → ensure-image → fpk(Docker 版 .fpk,仅打包 compose;镜像已是 amd64+arm64)
# ↘ native(x86_64 本地版 .fpk)
# ↘ native(amd64 本地版 Octop-fnos-native-amd64-*.fpk)
# ↘ native-arm64(ubuntu-24.04-arm 装 aarch64 site-packages)
# → native-arm64-pack(amd64 上用 fnpack 打 Octop-fnos-native-arm64-*.fpk)
# → release(把 .fpk 挂到已有的 v* GitHub Release)
Expand Down Expand Up @@ -77,6 +77,8 @@ jobs:
ensure-image:
needs: version
runs-on: ubuntu-latest
outputs:
lite: ${{ steps.wait.outputs.lite }}
steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand All @@ -89,24 +91,46 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Wait for GHCR image from docker-publish
id: wait
env:
IMAGE: ${{ needs.version.outputs.image }}
VER: ${{ needs.version.outputs.version }}
run: |
set -euo pipefail
TAG="${IMAGE}:${VER}"
echo "Waiting for ${TAG} (published by docker-publish)..."
# 多架构清单要等 amd64 + arm64 都推完再 merge,比单架构更久。
full="${IMAGE}:${VER}"
lite="${IMAGE}:${VER}-lite"
echo "Waiting for ${full}. ${lite} is optional and must already be multi-arch."
# 完整版清单要等两个架构 merge。精简版在完整版出现后再等几轮;缺了就只打完整包。
lite_wait=0
for i in $(seq 1 120); do
if docker buildx imagetools inspect "$TAG" >/dev/null 2>&1; then
echo "Image ready: $TAG"
docker buildx imagetools inspect "$TAG" | head -40
full_ok=0
lite_ok=0
if docker buildx imagetools inspect "$full" >/dev/null 2>&1; then
full_ok=1
fi
if docker buildx imagetools inspect "$lite" >/dev/null 2>&1; then
lite_ok=1
fi
if [ "$full_ok" -eq 1 ] && [ "$lite_ok" -eq 1 ]; then
echo "lite=true" >> "$GITHUB_OUTPUT"
echo "Images ready: ${full} and ${lite}"
docker buildx imagetools inspect "$full" | head -20
docker buildx imagetools inspect "$lite" | head -20
exit 0
fi
echo "[$i/120] not ready yet..."
if [ "$full_ok" -eq 1 ]; then
lite_wait=$((lite_wait + 1))
if [ "$lite_wait" -ge 6 ]; then
echo "lite=false" >> "$GITHUB_OUTPUT"
echo "::warning::${lite} was not published. The full FnOS package will still be built."
docker buildx imagetools inspect "$full" | head -20
exit 0
fi
fi
echo "[$i/120] full=${full_ok} lite=${lite_ok}"
sleep 20
done
echo "::error::Timed out waiting for ${TAG}. Ensure Docker Publish finished for v${VER}."
echo "::error::Timed out waiting for ${full}. Ensure Docker Publish finished for v${VER}."
exit 1

fpk:
Expand All @@ -124,10 +148,17 @@ jobs:
path: .verify/fnpack
key: fnpack-${{ env.FNPACK_VERSION }}-linux-amd64

- name: Build Docker FPK
- name: Build Docker FPKs
env:
FPK_NAME_PREFIX: Octop-fnos
run: bash scripts/build-fpk.sh docker
LITE: ${{ needs.ensure-image.outputs.lite }}
run: |
bash scripts/build-fpk.sh docker
if [ "$LITE" = "true" ]; then
bash scripts/build-fpk.sh docker-lite
else
echo "::warning::Skipping the lite FnOS package because its image tag was not published."
fi

- name: Upload docker fpk artifact
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -241,17 +272,18 @@ jobs:
id: build_native
env:
FPK_NAME_PREFIX: Octop-fnos
FPK_ARCH: amd64
run: bash scripts/build-fpk.sh native

- name: Show native fpk size
run: ls -lh dist/Octop-fnos-native-[0-9]*.fpk
run: ls -lh dist/Octop-fnos-native-amd64-*.fpk

- name: Upload native fpk artifact
id: upload_native
uses: actions/upload-artifact@v4
with:
name: native-fpk
path: dist/Octop-fnos-native-[0-9]*.fpk
path: dist/Octop-fnos-native-amd64-*.fpk
if-no-files-found: error

- name: Upload native install log (for debugging)
Expand Down Expand Up @@ -420,7 +452,7 @@ jobs:
if-no-files-found: error

release:
# native / native-arm64 失败时仍运行,把已经打好的 .fpk 挂到 Release。
# 任一架构没打出来时仍运行,把已经打好的 .fpk 挂到 Release。
if: always()
needs: [fpk, native, native-arm64-pack, version]
runs-on: ubuntu-latest
Expand All @@ -430,12 +462,12 @@ jobs:
fetch-depth: 0
fetch-tags: true

- name: Download docker fpk artifact (required)
- name: Download docker fpk artifact (best-effort)
continue-on-error: true
uses: actions/download-artifact@v4
with:
name: docker-fpk
path: artifacts/docker-fpk
if-no-files-found: error

- name: Download native fpk artifact (best-effort)
continue-on-error: true
Expand Down Expand Up @@ -486,6 +518,17 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Drop download links for packages that were not published
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAG: ${{ needs.version.outputs.tag }}
VER: ${{ needs.version.outputs.version }}
run: |
set -euo pipefail
gh release view "$TAG" --repo "${{ github.repository }}" --json body,assets > /tmp/rel.json
python3 scripts/release_download_links.py "$VER" --sync-notes /tmp/rel.json > /tmp/notes.md
gh release edit "$TAG" --repo "${{ github.repository }}" --notes-file /tmp/notes.md

upload-cos:
name: Upload FPK to COS
needs: [release, version]
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ src/octop/dashboard/assets/*
!src/octop/dashboard/.gitkeep

# Ship Meituan pt-passport runtime; override global node_modules/ ignore.
!src/octop/infra/agents/experts/library/meituan-living-assistant/skills/meituan-deals/scripts/node_modules/
!src/octop/infra/agents/experts/library/meituan-living-assistant/skills/meituan-deals/scripts/node_modules/**
!marketplace/experts/meituan-living-assistant/skills/meituan-deals/scripts/node_modules/
!marketplace/experts/meituan-living-assistant/skills/meituan-deals/scripts/node_modules/**

# Local databases
*.sqlite
Expand Down
Loading
Loading