Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ name: Docker Publish
#
# 架构:ubuntu-latest 打 linux/amd64,ubuntu-24.04-arm 打 linux/arm64。
# 每个架构先在本机启动镜像并跑 live 启动测试,通过后才推送该架构 tag,
# 再合并为 :{version} / :latest 多架构清单。精简版同样打 :{version}-lite / :lite,
# 不含桌面、本地向量和 OCR。飞牛 Docker 版 FPK 各用一个标签,
# 再合并为 :{version} / :latest(精简版,不含桌面、本地向量和 OCR)。
# 完整版打 :{version}-full / :full。飞牛 Docker 版 FPK 各用一个标签,
# NAS 按本机架构拉取对应镜像层。某一架构启动失败(例如 ARM 上 Illegal
# instruction / 退出码 132)只丢掉该架构,不挡住另一架构和后续 FPK。
#
# 触发路径:
# 1. 人工推送 v* tag → on.push.tags
# 2. Auto Tag 用 GITHUB_TOKEN 推 tag 后显式 workflow_dispatch(token push 不会触发 push 工作流)
# 3. 在任意分支 Run workflow,填 tag=vX.Y.Z(用该分支的 workflow 文件,checkout 指定 tag)
# 3. 在修复分支 Run workflow,填 tag=vX.Y.Z。workflow_dispatch 检出所选 ref,
# 补构建能带上 Dockerfile 修复;tag 只决定镜像版本。tag push 仍检出该 tag。
#
# 注意:workflow_dispatch 下 metadata-action 的 type=semver 不可靠,
# 必须从 tag / 输入显式解析版本号。
Expand All @@ -26,7 +27,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
# docker pull ghcr.io/tencentcloud/octop:0.9.28-full
on:
push:
tags:
Expand Down Expand Up @@ -112,7 +113,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ needs.prepare.outputs.tag }}
ref: ${{ github.event_name == 'workflow_dispatch' && github.sha || needs.prepare.outputs.tag }}
fetch-depth: 0

- name: Set up Docker Buildx
Expand All @@ -139,9 +140,9 @@ jobs:
images: |
${{ env.DOCKERHUB_USER != '' && format('{0}/octop', env.DOCKERHUB_USER) || '' }}
${{ needs.prepare.outputs.ghcr }}
# 单架构中间 tag。full → :{version}-{arch};lite → :{version}-lite-{arch}。
# 单架构中间 tag。lite → :{version}-{arch};full → :{version}-full-{arch}。
tags: |
type=raw,value=${{ needs.prepare.outputs.version }}${{ matrix.variant == 'lite' && '-lite' || '' }}-${{ matrix.arch }}
type=raw,value=${{ needs.prepare.outputs.version }}${{ matrix.variant == 'full' && '-full' || '' }}-${{ matrix.arch }}

# load 与 registry 导出不能同时开。先载入本机做启动测试,通过后再 docker push。
# docker 导出不支持 provenance,这里关掉,避免 --load 失败。
Expand Down Expand Up @@ -181,9 +182,10 @@ jobs:
set -euo pipefail
uv venv /tmp/octop-docker-test
uv pip install --python /tmp/octop-docker-test/bin/python pytest pytest-asyncio
# 启动测试只调 docker。--noconftest 避免加载 integration conftest(需要 httpx / octop)。
/tmp/octop-docker-test/bin/pytest \
tests/integration/test_docker_image_boot.py::test_docker_image_runs_on_this_cpu_and_stays_disabled \
-q --tb=short
-q --tb=short --noconftest

- name: Push image
env:
Expand Down Expand Up @@ -254,7 +256,7 @@ jobs:
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 通用标签。缺任一架构就不要发,避免装上后拉取失败。
# 完整版对外是一份 x86/ARM 通用标签。缺任一架构就不要发,避免装上后拉取失败。
if [ "$required" != "yes" ]; then
echo "::warning::skip ${reg}:${tag_a} until both amd64 and arm64 exist"
continue
Expand All @@ -268,5 +270,6 @@ jobs:
docker buildx imagetools inspect "${reg}:${tag_a}"
done
}
# 默认标签是精简版。完整版必须显式带 -full,且两个架构都在才发布。
publish_variant "" "$VER" latest yes
publish_variant "-lite" "${VER}-lite" lite no
publish_variant "-full" "${VER}-full" full no
54 changes: 27 additions & 27 deletions .github/workflows/fnos-build-fpk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
needs: version
runs-on: ubuntu-latest
outputs:
lite: ${{ steps.wait.outputs.lite }}
full: ${{ steps.wait.outputs.full }}
steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand All @@ -97,40 +97,40 @@ jobs:
VER: ${{ needs.version.outputs.version }}
run: |
set -euo pipefail
full="${IMAGE}:${VER}"
lite="${IMAGE}:${VER}-lite"
echo "Waiting for ${full}. ${lite} is optional and must already be multi-arch."
# 完整版清单要等两个架构 merge。精简版在完整版出现后再等几轮;缺了就只打完整包。
lite_wait=0
lite="${IMAGE}:${VER}"
full="${IMAGE}:${VER}-full"
echo "Waiting for ${lite}. ${full} is optional and must already be multi-arch."
# 默认标签是精简版。完整版在精简版出现后再等几轮;缺了就只打精简包。
full_wait=0
for i in $(seq 1 120); do
full_ok=0
lite_ok=0
if docker buildx imagetools inspect "$full" >/dev/null 2>&1; then
full_ok=1
fi
full_ok=0
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
if docker buildx imagetools inspect "$full" >/dev/null 2>&1; then
full_ok=1
fi
if [ "$lite_ok" -eq 1 ] && [ "$full_ok" -eq 1 ]; then
echo "full=true" >> "$GITHUB_OUTPUT"
echo "Images ready: ${lite} and ${full}"
docker buildx imagetools inspect "$lite" | head -20
docker buildx imagetools inspect "$full" | head -20
exit 0
fi
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
if [ "$lite_ok" -eq 1 ]; then
full_wait=$((full_wait + 1))
if [ "$full_wait" -ge 6 ]; then
echo "full=false" >> "$GITHUB_OUTPUT"
echo "::warning::${full} was not published. The lite FnOS package will still be built."
docker buildx imagetools inspect "$lite" | head -20
exit 0
fi
fi
echo "[$i/120] full=${full_ok} lite=${lite_ok}"
echo "[$i/120] lite=${lite_ok} full=${full_ok}"
sleep 20
done
echo "::error::Timed out waiting for ${full}. Ensure Docker Publish finished for v${VER}."
echo "::error::Timed out waiting for ${lite}. Ensure Docker Publish finished for v${VER}."
exit 1

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

- name: Upload docker fpk artifact
Expand Down
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,25 @@

## [Unreleased]

## [1.0.3b4] - 2026-11-06

### 新增
- 工作台增加云主机页:授权后查看腾讯云 CVM,并由常驻运维专家巡检和变更
- 后台标签页的定时提醒改为系统通知
- 启动时同步新的预置模型,腾讯云通道支持 HY4

### 修复
- 共享专家能用查看者的自定义 MCP 名称
- 编辑团队会保存示例头像
- Docker 精简镜像在编译器已移除后仍能发布

### 变更
- 多实例部署时,腾讯云授权改存在控制面;单机仍用本地文件
- 云服务器页移到工作台末尾,并注明目前只支持腾讯云 CVM
- 默认 Docker 标签改为精简版,完整版使用 `:<version>-full` 和 `:full`
- 连接器可按类别筛选,大额 token 用量会缩写
- 升级 octop-harness 至 1.0.8

## [1.0.3b3] - 2026-11-04

### 新增
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<p align="center">
<a href="https://www.python.org/downloads/"><img alt="Python 3.12+" src="https://img.shields.io/badge/python-3.12%2B-blue?logo=python&logoColor=white" /></a>
<a href="https://github.com/TencentCloud/Octop/blob/main/LICENSE"><img alt="License: MIT" src="https://img.shields.io/badge/license-MIT-green" /></a>
<a href="https://github.com/TencentCloud/Octop/releases"><img alt="Version" src="https://img.shields.io/badge/version-1.0.3b3-orange" /></a>
<a href="https://github.com/TencentCloud/Octop/releases"><img alt="Version" src="https://img.shields.io/badge/version-1.0.3b4-orange" /></a>
<a href="https://pypi.org/project/octop/"><img src="https://img.shields.io/pypi/v/octop" alt="PyPI" /></a>
<a href="https://github.com/astral-sh/ruff"><img alt="Code Style: Ruff" src="https://img.shields.io/badge/code%20style-ruff-000000?logo=ruff&logoColor=white" /></a>
<a href="https://github.com/TencentCloud/Octop"><img alt="GitHub stars" src="https://img.shields.io/github/stars/TencentCloud/Octop?style=social" /></a>
Expand Down Expand Up @@ -451,6 +451,7 @@ After `octop run`, open **http://127.0.0.1:8088**.
</p>

- **Chat** — real-time conversation with experts and teams
- **Cloud** — Tencent CVM fleet overview, instance metrics, and a resident ops expert
- **Experts** — create experts, pick templates / MBTI personas, share or publish experts, configure providers
- **AgentTeams** *(Beta)* — coordinator + member experts for multi-step work
- **Connectors** — OAuth apps and MCP gateways
Expand Down
2 changes: 1 addition & 1 deletion README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<p align="center">
<a href="https://www.python.org/downloads/"><img alt="Python 3.12+" src="https://img.shields.io/badge/python-3.12%2B-blue?logo=python&logoColor=white" /></a>
<a href="https://github.com/TencentCloud/Octop/blob/main/LICENSE"><img alt="License: MIT" src="https://img.shields.io/badge/license-MIT-green" /></a>
<a href="https://github.com/TencentCloud/Octop/releases"><img alt="Version" src="https://img.shields.io/badge/version-1.0.3b3-orange" /></a>
<a href="https://github.com/TencentCloud/Octop/releases"><img alt="Version" src="https://img.shields.io/badge/version-1.0.3b4-orange" /></a>
<a href="https://pypi.org/project/octop/"><img src="https://img.shields.io/pypi/v/octop" alt="PyPI" /></a>
<a href="https://github.com/astral-sh/ruff"><img alt="Code Style: Ruff" src="https://img.shields.io/badge/code%20style-ruff-000000?logo=ruff&logoColor=white" /></a>
<a href="https://github.com/TencentCloud/Octop"><img alt="GitHub stars" src="https://img.shields.io/github/stars/TencentCloud/Octop?style=social" /></a>
Expand Down
1 change: 1 addition & 0 deletions dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"scripts": {
"dev": "vite --host",
"build": "tsc -b && vite build",
"build:fast": "BUILD_FAST=1 vite build",
"build:docker": "vite build",
"build:prod": "tsc -b && vite build --mode production",
"build:test": "tsc -b && vite build --mode test",
Expand Down
41 changes: 41 additions & 0 deletions dashboard/public/notify-sw.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/* Dashboard system notifications.
Chrome does not display `new Notification()` from a background tab.
`registration.showNotification()` does, including while this tab is hidden.

Dev registers this file directly. Production importScripts it into sw.js.
skipWaiting here would override the production worker's update prompt,
so it only runs when this file is the worker itself.
*/

self.addEventListener("notificationclick", (event) => {
event.notification.close();
const path =
event.notification.data && typeof event.notification.data.path === "string"
? event.notification.data.path
: "/";
const target = new URL(path, self.location.origin).href;
event.waitUntil(
self.clients
.matchAll({ type: "window", includeUncontrolled: true })
.then(async (windowClients) => {
const client = windowClients.find((item) =>
item.url.startsWith(self.location.origin),
);
if (client) {
await client.focus();
client.postMessage({ type: "octop-notify-open", path });
return;
}
if (self.clients.openWindow) await self.clients.openWindow(target);
}),
);
});

if ((self.location.pathname || "").endsWith("/notify-sw.js")) {
self.addEventListener("install", () => {
self.skipWaiting();
});
self.addEventListener("activate", (event) => {
event.waitUntil(self.clients.claim());
});
}
6 changes: 4 additions & 2 deletions dashboard/src/api/modules/octopThreads.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,11 @@ export const octopThreadsApi = {
`/agents/${encodeURIComponent(agentId)}/threads?limit=${limit}`,
),

create: (agentId: string) =>
create: (agentId: string, options?: { rebind?: boolean }) =>
request<{ thread_id: string; session_key: string }>(
`/agents/${encodeURIComponent(agentId)}/threads`,
`/agents/${encodeURIComponent(agentId)}/threads${
options?.rebind === false ? "?rebind=false" : ""
}`,
{ method: "POST" },
),

Expand Down
30 changes: 19 additions & 11 deletions dashboard/src/api/modules/terminalAi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,28 @@ export interface TerminalContext {
agent_name: string;
}

/** Bundled terminal expert. Distinct from the Tencent CVM ops expert. */
export const OPS_ENGINEER_EXPERT_ID = "ops-engineer";

export interface CreatedOpsEngineer {
id: number;
agent_id: string;
name: string;
description: string;
state: string;
expert_id: string;
}

export const terminalAiApi = {
getContext: (agentId: string) =>
request<TerminalContext>(`/agents/${agentId}/terminal/context`),

createOpsEngineer: () =>
request<{
id: number;
agent_id: string;
name: string;
description: string;
state: string;
expert_id: string;
}>("/agents/from-expert/ops-engineer", {
method: "POST",
body: JSON.stringify({}),
}),
request<CreatedOpsEngineer>(
`/agents/from-expert/${OPS_ENGINEER_EXPERT_ID}`,
{
method: "POST",
body: JSON.stringify({}),
},
),
};
12 changes: 8 additions & 4 deletions dashboard/src/assets/storage/tos.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading