Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6cc7448
fix(gateway): resolve reasoning overrides on IM turns like the dashbo…
wxhking Nov 5, 2026
f8ee1d9
Merge branch 'develop' into fix/im-reasoning-overrides
wxhking Nov 6, 2026
5dad80c
fix(gateway): remove duplicate MCP resolver after merge
wxhking Nov 6, 2026
1ee82ea
fix(memory): preserve capture and recall runtime switches (#2296)
mmhh256 Nov 6, 2026
98768c3
chore: sync main into develop after 1.0.3b4
github-actions[bot] Nov 6, 2026
037ff9e
Merge pull request #2858 from TencentCloud/chore/sync-develop-after-1…
github-actions[bot] Nov 6, 2026
fa02edc
fix(ci): build darwin-arm64 desktop packages on macos-15 (#2865)
liukewia Nov 6, 2026
b9ee987
fix(models,bridge): keep pool preference out of chat and explain coll…
jubaoliang Nov 7, 2026
e1962d4
fix: close the open bug batch and mark pre-market experts as featured…
jubaoliang Nov 7, 2026
70f2bb7
feat(chat): share conversations on a shared expert (#2877)
jubaoliang Nov 7, 2026
1c07a27
fix: keep provider defaults, model names, and upgrade prompts honest …
jubaoliang Nov 7, 2026
29b1878
fix(packaging): add python-socks for SOCKS proxy browser attach (#2852)
huangcheng Nov 9, 2026
22057cc
fix: surface checkpoint retention and channel health
seed30 Nov 5, 2026
3cdd3c5
Merge pull request #2787 from wxhking/fix/im-reasoning-overrides
seed30 Nov 9, 2026
8cbbb32
Merge pull request #2832 from TencentCloud/fix/2302-channel-health-an…
seed30 Nov 9, 2026
8ba51d3
fix(dashboard): drop the service worker cache before reloading after …
liukewia Nov 10, 2026
b524667
fix: keep live chat status honest and stop websocket keepalive flaps …
jubaoliang Nov 10, 2026
8a49562
feat(knowledge): move documents and folders between folders (#2917)
alison-xx Nov 10, 2026
495dcdb
feat(cli): migrate an OpenClaw or Hermes Agent setup into an expert (…
alison-xx Nov 10, 2026
8585fd4
feat(connectors): OAuth app credentials for custom MCP servers withou…
alison-xx Nov 10, 2026
59e6824
chore: retire versioned history after startup migration (#2924)
Bosheng0422 Nov 10, 2026
eeecf87
chore(deps): upgrade octop-harness to 1.0.9 (#2933)
Bosheng0422 Nov 10, 2026
630c785
fix: stop shared replies from overlapping and allow a chosen workspac…
jubaoliang Nov 11, 2026
9931a27
feat(desktop): replace the Wails shell with an Electron shell (#2445)
liukewia Nov 11, 2026
2f66ece
chore: release 1.0.3b5
jubaoliang-tencent Nov 11, 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
  •  
  •  
  •  
242 changes: 152 additions & 90 deletions .github/workflows/octop-desktop.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
name: Octop Desktop Package

# 正式发版:Auto Tag 在打 v* 后与 Release / Docker Publish 一并 dispatch。
# 产物 upsert 到同一 GitHub Release,再上传到 COS octop/release/<version>/。
# 每个原生 runner 打便携 zip + Electron 安装包,upsert 到同一 GitHub Release,
# 再上传到 COS octop/release/<version>/。
# 手工补包:workflow_dispatch + release_tag(不必跑在 v* ref 上)。
# attach_from_run 只挂已有 artifact、不重打。
#
# 镜像固定到 ubuntu-24.04 而不是 ubuntu-latest:`latest` 已经公告要迁到
# 26.04,发版机器的底层镜像不该由 GitHub 的时间表决定。
#
# action 一律挑 `runs.using: node24` 的主版本(setup-uv@v7、
# pnpm/action-setup@v6、action-gh-release@v3)。跑在 node20 上的版本会在
# 每次运行里刷 "Node.js 20 is deprecated" 而不报错,属于会一直烂在那里的
# 警告——升级时以 action.yml 里的 `runs.using` 为准,别看版本号大小猜。

on:
push:
Expand Down Expand Up @@ -59,13 +68,15 @@ jobs:
frontend:
name: Build dashboard
if: github.event_name != 'workflow_dispatch' || github.event.inputs.attach_from_run == ''
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v5

- uses: actions/setup-node@v5
with:
node-version: "24"
# Dashboard stays on Node 20 (same as docker/Dockerfile + release.yml).
# Node 24 is a desktop/electron-only pin and nothing here builds it.
node-version: "20"
cache: npm
cache-dependency-path: dashboard/package-lock.json

Expand All @@ -84,7 +95,7 @@ jobs:
select-platforms:
name: Select platforms
if: github.event_name != 'workflow_dispatch' || github.event.inputs.attach_from_run == ''
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
matrix: ${{ steps.set.outputs.matrix }}
steps:
Expand All @@ -99,9 +110,9 @@ jobs:
import os

all_plats = [
{"plat": "linux-amd64", "arch": "amd64", "os": "ubuntu-latest"},
{"plat": "linux-amd64", "arch": "amd64", "os": "ubuntu-24.04"},
{"plat": "linux-arm64", "arch": "arm64", "os": "ubuntu-24.04-arm"},
{"plat": "darwin-arm64", "arch": "arm64", "os": "macos-14"},
{"plat": "darwin-arm64", "arch": "arm64", "os": "macos-15"},
{"plat": "darwin-amd64", "arch": "amd64", "os": "macos-15-intel"},
{"plat": "windows-amd64", "arch": "amd64", "os": "windows-latest"},
{"plat": "windows-arm64", "arch": "arm64", "os": "windows-11-arm"},
Expand All @@ -112,16 +123,16 @@ jobs:
sel = os.environ.get("PLATFORMS", "all").lower().replace(" ", "")
known = {row["plat"] for row in all_plats}
if sel == "all":
include = all_plats
selected = all_plats
else:
wanted = {part for part in sel.split(",") if part}
unknown = wanted - known
if unknown:
raise SystemExit(f"unknown platform(s): {', '.join(sorted(unknown))}")
include = [row for row in all_plats if row["plat"] in wanted]
if not include:
selected = [row for row in all_plats if row["plat"] in wanted]
if not selected:
raise SystemExit(f"no platforms selected: {sel}")
matrix = json.dumps({"include": include}, separators=(",", ":"))
matrix = json.dumps({"include": selected}, separators=(",", ":"))
with open(os.environ["GITHUB_OUTPUT"], "a", encoding="utf-8") as fh:
fh.write(f"matrix={matrix}\n")
print(matrix)
Expand All @@ -133,6 +144,7 @@ jobs:
runs-on: ${{ matrix.os }}
# Matrix runners are native for each plat; pin host detection so x64 Git Bash
# on windows-11-arm does not mis-classify the job as windows-amd64 cross-build.
# Installers are unsigned and not notarized.
env:
GREEN_HOST_PLAT: ${{ matrix.plat }}
strategy:
Expand All @@ -156,7 +168,7 @@ jobs:
name: dashboard-dist
path: src/octop/dashboard

- uses: astral-sh/setup-uv@v6
- uses: astral-sh/setup-uv@v7
with:
enable-cache: true
python-version: "3.12"
Expand Down Expand Up @@ -217,100 +229,150 @@ jobs:
verify_no_homebrew_dylibs "${staging}/packages" "${{ matrix.plat }}"
fi

- uses: actions/setup-go@v6
# archive: false — upload the prebuilt zip as-is. Default archive=true would
# wrap it again, so Actions UI / "Download artifact" becomes zip-in-zip.
# With archive:false, artifact name is the filename (name: is ignored).
- uses: actions/upload-artifact@v7
with:
go-version: "1.25.x"
cache-dependency-path: desktop/src/go.sum
path: desktop/portable/release/Octop-portable-${{ matrix.plat }}-${{ env.OCTOP_VERSION }}.zip
archive: false
if-no-files-found: error
retention-days: 14

- name: Install Linux desktop build dependencies
if: runner.os == 'Linux'
- name: Stage Electron runtime
run: |
sudo apt-get update
sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev
set -euo pipefail
plat="${{ matrix.plat }}"
zip="desktop/portable/release/Octop-portable-${plat}-${OCTOP_VERSION}.zip"
rm -rf desktop/src/resources/portable
mkdir -p desktop/src/resources/portable
# The shell serves packages/octop/dashboard from this tree. There is
# no second copy under resources/dashboard.
test -f "desktop/portable/release/Octop-${plat}/packages/octop/dashboard/index.html"
# Windows keeps one zip; NSIS extracts it with tar.exe. Packing the
# ~40k files into NSIS is slower. macOS (DMG) and Linux (deb/rpm)
# copy the tree package.sh already assembled. No zip in those apps.
if [[ "$plat" == windows-* ]]; then
cp "$zip" desktop/src/resources/portable/
else
inner="desktop/portable/release/Octop-${plat}"
if [[ ! -f "$inner/launch.py" ]]; then
echo "expanded portable tree has no launch.py under ${inner}" >&2
exit 1
fi
shopt -s dotglob
cp -a "$inner"/. desktop/src/resources/portable/
shopt -u dotglob
test -x desktop/src/resources/portable/runtime/bin/python3
test ! -e desktop/src/resources/portable/*.zip
fi
if [[ "$plat" == windows-* ]]; then py=python; else py=python3; fi
"$py" - "$zip" "$OCTOP_VERSION" <<'PY'
import hashlib
import json
import pathlib
import sys
import zipfile

path = pathlib.Path(sys.argv[1])
if not zipfile.is_zipfile(path):
raise SystemExit(f"not a portable zip: {path}")
manifest = {"version": sys.argv[2], "sha256": hashlib.sha256(path.read_bytes()).hexdigest()}
dest = pathlib.Path("desktop/src/resources/portable/portable-version.json")
dest.write_text(json.dumps(manifest) + "\n", encoding="utf-8")
print(f"Bundled {path.name} with SHA-256 {manifest['sha256']}")
PY
if [[ "$plat" != windows-* ]]; then
test -f desktop/src/resources/portable/packages/octop/dashboard/index.html
fi

- uses: actions/setup-node@v5
with:
node-version: "24"

- name: Install Wails v3 CLI
run: go install github.com/wailsapp/wails/v3/cmd/wails3@v3.0.0-beta.13
# v6 起改用 node24 运行时;`run_install` 仍存在,留着 false 是为了让
# 下一步那个显式的 `pnpm install --frozen-lockfile` 是唯一一次安装。
- uses: pnpm/action-setup@v6
with:
version: 12.15.0
run_install: false

- name: Install NSIS
if: runner.os == 'Windows'
shell: pwsh
- name: Install and check Electron shell
working-directory: desktop/src
run: |
$nsisDir = "${env:ProgramFiles(x86)}\NSIS"
$makensis = Join-Path $nsisDir "makensis.exe"
function Test-Makensis { Test-Path -LiteralPath $makensis }

if (-not (Test-Makensis)) {
$installed = $false
for ($i = 1; $i -le 5; $i++) {
Write-Host "choco install nsis (attempt $i/5)"
try {
choco install nsis --yes --no-progress --execution-timeout=600
} catch {
Write-Warning "choco attempt $i failed: $_"
}
if (Test-Makensis) { $installed = $true; break }
Start-Sleep -Seconds ([Math]::Min(60, 10 * $i))
}

if (-not $installed) {
Write-Host "Chocolatey unavailable; downloading NSIS setup from SourceForge"
$setup = Join-Path $env:RUNNER_TEMP "nsis-setup.exe"
$urls = @(
"https://downloads.sourceforge.net/project/nsis/NSIS%203/3.11/nsis-3.11-setup.exe",
"https://sourceforge.net/projects/nsis/files/NSIS%203/3.11/nsis-3.11-setup.exe/download"
)
$downloaded = $false
foreach ($url in $urls) {
try {
Invoke-WebRequest -Uri $url -OutFile $setup -UseBasicParsing -TimeoutSec 180
if ((Test-Path -LiteralPath $setup) -and ((Get-Item $setup).Length -gt 1MB)) {
$downloaded = $true
break
}
} catch {
Write-Warning "NSIS download failed from $url : $_"
}
}
if (-not $downloaded) {
throw "NSIS install failed (Chocolatey and direct download)"
}
Start-Process -FilePath $setup -ArgumentList "/S" -Wait
}
}

if (-not (Test-Makensis)) {
throw "makensis.exe missing after NSIS install"
}
Add-Content -Path $env:GITHUB_PATH -Value $nsisDir

- name: Package desktop app with bundled portable runtime
pnpm install --frozen-lockfile
pnpm run typecheck
pnpm run test

- name: Build native Electron installers
working-directory: desktop/src
run: >-
wails3 task package
ARCH=${{ matrix.arch }}
VERSION=${{ env.OCTOP_VERSION }}
PORTABLE_ZIP=../portable/release/Octop-portable-${{ matrix.plat }}-${{ env.OCTOP_VERSION }}.zip
env:
OCTOP_PLATFORM: ${{ matrix.plat }}
# Empty, not omitted: a CSC_LINK in the runner environment overrides
# mac.identity: null and electron-builder tries to sign.
CSC_LINK: ""
CSC_KEY_PASSWORD: ""
WIN_CSC_LINK: ""
WIN_CSC_KEY_PASSWORD: ""
APPLE_ID: ""
APPLE_APP_SPECIFIC_PASSWORD: ""
APPLE_TEAM_ID: ""
run: |
set -euo pipefail
pnpm run build
case "${{ matrix.plat }}" in
darwin-*) target=--mac ;;
windows-*) target=--win ;;
linux-*) target=--linux ;;
*) echo "Unsupported Electron target: ${{ matrix.plat }}" >&2; exit 1 ;;
esac
if [[ "${{ matrix.arch }}" == amd64 ]]; then arch=--x64; else arch=--arm64; fi
pnpm exec electron-builder --config electron-builder.config.ts "$target" "$arch" --publish never

# archive:false preserves each installer; different formats must be uploaded
# separately (one file per artifact), not wrapped in an extra Actions zip.
- uses: actions/upload-artifact@v7
if: startsWith(matrix.plat, 'darwin-')
with:
path: desktop/src/release/Octop-desktop-${{ matrix.plat }}-${{ env.OCTOP_VERSION }}.dmg
archive: false
if-no-files-found: error
retention-days: 14

# archive: false — upload the prebuilt zip as-is. Default archive=true would
# wrap it again, so Actions UI / "Download artifact" becomes zip-in-zip.
# With archive:false, artifact name is the filename (name: is ignored).
- uses: actions/upload-artifact@v7
if: startsWith(matrix.plat, 'darwin-')
with:
path: desktop/portable/release/Octop-portable-${{ matrix.plat }}-${{ env.OCTOP_VERSION }}.zip
path: desktop/src/release/Octop-desktop-${{ matrix.plat }}-${{ env.OCTOP_VERSION }}.zip
archive: false
if-no-files-found: error
retention-days: 14

- name: Upload bundled desktop package
uses: actions/upload-artifact@v7
- uses: actions/upload-artifact@v7
if: startsWith(matrix.plat, 'windows-')
with:
path: desktop/src/release/Octop-desktop-${{ matrix.plat }}-${{ env.OCTOP_VERSION }}.exe
archive: false
if-no-files-found: error
retention-days: 14

- uses: actions/upload-artifact@v7
if: startsWith(matrix.plat, 'linux-')
with:
path: desktop/src/release/Octop-desktop-${{ matrix.plat }}-${{ env.OCTOP_VERSION }}.deb
archive: false
if-no-files-found: error
retention-days: 14

- uses: actions/upload-artifact@v7
if: startsWith(matrix.plat, 'linux-')
with:
path: desktop/src/bin/Octop-desktop-${{ matrix.plat }}-${{ env.OCTOP_VERSION }}.*
path: desktop/src/release/Octop-desktop-${{ matrix.plat }}-${{ env.OCTOP_VERSION }}.rpm
archive: false
if-no-files-found: error
retention-days: 14

release:
name: Attach zips to GitHub Release
name: Attach packages to GitHub Release
needs: package
outputs:
tag: ${{ steps.rel.outputs.tag }}
Expand All @@ -330,7 +392,7 @@ jobs:
(github.event_name == 'workflow_dispatch' &&
github.event.inputs.attach_release == 'true')))
)
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
contents: write
actions: read
Expand All @@ -350,8 +412,8 @@ jobs:
echo "tag=${tag}" >> "$GITHUB_OUTPUT"

# v8 required for archive:false artifacts. skip-decompress keeps the
# uploaded .zip / .tar.gz / .dmg / .exe intact — default unzip turns portable
# zips into directories, so files: release-assets/* would skip them.
# uploaded .zip / .dmg / .exe intact — default unzip turns portable zips
# into directories, so files: release-assets/* would skip them.
- uses: actions/download-artifact@v8
with:
pattern: Octop-*
Expand All @@ -373,7 +435,7 @@ jobs:
fi

- name: Upload to GitHub Release
uses: softprops/action-gh-release@v2
uses: softprops/action-gh-release@v3
with:
tag_name: ${{ steps.rel.outputs.tag }}
files: release-assets/*
Expand All @@ -390,7 +452,7 @@ jobs:
uses: ./.github/workflows/upload-release-cos.yml
with:
tag: ${{ needs.release.outputs.tag }}
patterns: "Octop-desktop-*,Octop-portable-*"
patterns: "Octop-portable-*,Octop-desktop-*"
secrets:
RELEASE_COS_SECRET_ID: ${{ secrets.RELEASE_COS_SECRET_ID }}
RELEASE_COS_SECRET_KEY: ${{ secrets.RELEASE_COS_SECRET_KEY }}
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Build
build/
# NSIS include lives here; the blanket build/ rule would hide it.
!desktop/src/build/
!desktop/src/build/**
dist/
Expand Down Expand Up @@ -53,7 +54,9 @@ coverage.xml
.hypothesis/

# IDE / editors
.vscode/
.vscode/*
!.vscode/settings.json
!.vscode/css-custom-data.json
.idea/
.codebuddy
*.swp
Expand Down
19 changes: 19 additions & 0 deletions .vscode/css-custom-data.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": 1.1,
"properties": [
{
"name": "app-region",
"status": "nonstandard",
"description": "Electron/Chromium window drag region. `drag` makes the element a window drag handle; `no-drag` keeps a control clickable inside a drag region.",
"syntax": "drag | no-drag",
"values": [{ "name": "drag" }, { "name": "no-drag" }]
},
{
"name": "-webkit-app-region",
"status": "nonstandard",
"description": "Vendor-prefixed form of `app-region`. Chromium uses this name for frameless-window dragging.",
"syntax": "drag | no-drag",
"values": [{ "name": "drag" }, { "name": "no-drag" }]
}
]
}
Loading
Loading