Skip to content

Self-hosted workflows for coding-agent delivery. Orchestrate CodeBuddy, Codex and Claude Code with scripts and human approval gates. Includes Local workflows for coding assistants.

fix(runners): apply one rule to choosing the default machine (#224)

fx-kurumid664330683a5
diff --git a/internal/domain/runner.go b/internal/domain/runner.go
index b80b1ff5..5584da40 100644
--- a/internal/domain/runner.go
+++ b/internal/domain/runner.go
@@ -1,6 +1,7 @@
package domain
import (
+ "fmt"
"path"
"strconv"
"strings"
@@ -79,6 +80,28 @@ func (r Runner) SupportsConversationWorkspace() bool {
return versionAtLeast(r.RunnerVersion, RunnerVersionConversationWorkspace)
}
+// RunnerVersionDefaultSelection is the oldest runner a user may pick as the
+// default execution machine. Older daemons cannot open conversation
+// workspaces, so new tasks routed to them would fail.
+const RunnerVersionDefaultSelection = RunnerVersionConversationWorkspace
+
+// DefaultSelectionBlocker explains why the runner cannot become a user's
+// default execution machine, or returns "" when it can. The runners page
+// disables「设为默认」with the same rules.
+func (r Runner) DefaultSelectionBlocker() string {
+ if r.Status != RunnerStatusOnline {
+ return "机器离线,不能设为默认执行机器,请先在该机器上启动执行机器服务"
+ }
+ if !versionAtLeast(r.RunnerVersion, RunnerVersionDefaultSelection) {
+ version := strings.TrimSpace(r.RunnerVersion)
+ if version == "" {
+ version = "未知"
+ }
+ return fmt.Sprintf("执行机器版本 %s 过低,需升级至 %s 及以上才能设为默认", version, RunnerVersionDefaultSelection)
+ }
+ return ""
+}
+
// RunnerVersionSharedPush is the first runner that merges the work branch into
// an existing shared branch (preview/test) in a throwaway worktree and pushes
// it directly, without a Gongfeng MR.
diff --git a/internal/domain/runner_default_selection_test.go b/internal/domain/runner_default_selection_test.go
new file mode 100644
index 00000000..abae80e9
--- /dev/null
+++ b/internal/domain/runner_default_selection_test.go
@@ -0,0 +1,21 @@
+package domain
+
+import "testing"
+
+func TestRunnerDefaultSelectionBlocker(t *testing.T) {
+ for _, tc := range []struct {
+ status, version string
+ ok bool
+ }{
+ {RunnerStatusOnline, "0.8.0", true},
+ {RunnerStatusOnline, "v0.9.2", true},
+ {RunnerStatusOnline, "0.7.9", false},
+ {RunnerStatusOnline, "dev", false},
+ {RunnerStatusOffline, "0.9.2", false},
+ } {
+ got := Runner{Status: tc.status, RunnerVersion: tc.version}.DefaultSelectionBlocker()
+ if (got == "") != tc.ok {
+ t.Errorf("%s/%s: blocker %q, want ok=%v", tc.status, tc.version, got, tc.ok)
+ }
+ }
+}
diff --git a/internal/httpapi/runner_default_selection_test.go b/internal/httpapi/runner_default_selection_test.go
new file mode 100644
index 00000000..cfa83b88
--- /dev/null
+++ b/internal/httpapi/runner_default_selection_test.go
@@ -0,0 +1,66 @@
+package httpapi
+
+import (
+ "encoding/json"
+ "net/http"
+ "strings"
+ "testing"
+
+ "agentflow/internal/domain"
+)
+
+// PUT /api/runners/default must apply the same rules as the runners page:
+// an offline or outdated machine cannot become the default.
+func TestRunnerDefaultRejectsOfflineAndOutdatedMachines(t *testing.T) {
+ f := cvBNewHTTPFixture(t)
+ runnerID, _ := registerTestRunner(t, f.h)
+ runner, _ := f.s.Runner(runnerID)
+ runner.OwnerUserID = f.user.ID
+
+ put := func(id string) (int, map[string]any) {
+ t.Helper()
+ rec := cvBRequest(t, f, http.MethodPut, "/api/runners/default", map[string]any{"runnerId": id}, true)
+ var out map[string]any
+ _ = json.Unmarshal(rec.Body.Bytes(), &out)
+ return rec.Code, out
+ }
+ save := func(status, version string) {
+ t.Helper()
+ runner.Status, runner.RunnerVersion = status, version
+ if err := f.s.PutRunner(runner); err != nil {
+ t.Fatal(err)
+ }
+ }
+
+ for _, tc := range []struct {
+ name, status, version, want string
+ }{
+ {"offline", domain.RunnerStatusOffline, domain.RunnerVersionDefaultSelection, "机器离线"},
+ {"outdated", domain.RunnerStatusOnline, "0.1.0", "0.1.0 过低"},
+ {"unknown version", domain.RunnerStatusOnline, "", "未知 过低"},
+ } {
+ save(tc.status, tc.version)
+ code, out := put(runnerID)
+ msg, _ := out["error"].(string)
+ if code != http.StatusConflict || !strings.Contains(msg, tc.want) {
+ t.Errorf("%s: PUT default = %d %v, want 409 containing %q", tc.name, code, out, tc.want)
+ }
+ if got := f.s.DefaultRunner(f.user.ID); got != "" {
+ t.Fatalf("%s: rejected machine became default: %q", tc.name, got)
+ }
+ }
+
+ save(domain.RunnerStatusOnline, domain.RunnerVersionDefaultSelection)
+ if code, out := put(runnerID); code != http.StatusOK || out["runnerId"] != runnerID {
+ t.Fatalf("eligible machine: PUT default = %d %v", code, out)
+ }
+ if code, out := put(""); code != http.StatusOK || out["message"] != "已切回云端执行" {
+ t.Fatalf("clear default = %d %v, want 已切回云端执行", code, out)
+ }
+
+ rec := cvBRequest(t, f, http.MethodGet, "/api/runners/default", nil, true)
+ var def map[string]any
+ if err := json.Unmarshal(rec.Body.Bytes(), &def); err != nil || def["minRunnerVersion"] != domain.RunnerVersionDefaultSelection {
+ t.Fatalf("GET default should expose minRunnerVersion: %d %s", rec.Code, rec.Body.String())
+ }
+}
diff --git a/internal/httpapi/runners.go b/internal/httpapi/runners.go
index 7162a5e3..6be12d42 100644
--- a/internal/httpapi/runners.go
+++ b/internal/httpapi/runners.go
@@ -259,6 +259,9 @@ func (h *runnersHandlers) runnerDefault(c *gin.Context) {
"runner": runner,
"online": found && runner.Status == domain.RunnerStatusOnline,
"cloudPool": map[string]any{"configured": poolConfigured, "online": poolOnline},
+ // minRunnerVersion lets the runners page disable「设为默认」with the
+ // same rule PUT /api/runners/default enforces.
+ "minRunnerVersion": domain.RunnerVersionDefaultSelection,
})
}
@@ -332,7 +335,8 @@ func (h *runnersHandlers) runnerRunLimitSet(c *gin.Context) {
}
// runnerDefaultSet selects or clears the user's default execution machine.
-// Only machines bound to the requesting user can be selected.
+// Only online machines bound to the requesting user, at or above
+// RunnerVersionDefaultSelection, can be selected.
// 路由: g.PUT("/api/runners/default", h.runnerDefaultSet)
func (h *runnersHandlers) runnerDefaultSet(c *gin.Context) {
user, ok := h.requestUser(c.Request, true)
@@ -357,6 +361,10 @@ func (h *runnersHandlers) runnerDefaultSet(c *gin.Context) {
c.JSON(http.StatusForbidden, map[string]string{"error": "只能选择自己绑定的执行机器"})
return
}
+ if reason := runner.DefaultSelectionBlocker(); reason != "" {
+ c.JSON(http.StatusConflict, map[string]string{"error": reason})
+ return
+ }
}
if err := h.repo.SetDefaultRunner(user.ID, runnerID, time.Now().UTC()); err != nil {
if err == repo.ErrRunnerNotFound {
@@ -367,7 +375,7 @@ func (h *runnersHandlers) runnerDefaultSet(c *gin.Context) {
return
}
if runnerID == "" {
- c.JSON(http.StatusOK, map[string]any{"runnerId": "", "message": "已恢复云端 API Key 模式"})
+ c.JSON(http.StatusOK, map[string]any{"runnerId": "", "message": "已切回云端执行"})
} else {
c.JSON(http.StatusOK, map[string]any{"runnerId": runnerID, "message": "已设为默认执行机器,你的任务和沙箱将在这台机器上执行"})
}
diff --git a/internal/httpapi/runners_cases_test.go b/internal/httpapi/runners_cases_test.go
index fa254291..a7b435e5 100644
--- a/internal/httpapi/runners_cases_test.go
+++ b/internal/httpapi/runners_cases_test.go
@@ -19,6 +19,7 @@ func TestRunnerManagementAndMachineLifecycle(t *testing.T) {
runnerID, session := registerTestRunner(t, f.h)
runner, _ := f.s.Runner(runnerID)
runner.OwnerUserID = f.user.ID
+ runner.RunnerVersion = domain.RunnerVersionDefaultSelection
if err := f.s.PutRunner(runner); err != nil {
t.Fatal(err)
}
diff --git a/internal/httpapi/runners_test.go b/internal/httpapi/runners_test.go
index 6c364ce5..2560dc43 100644
--- a/internal/httpapi/runners_test.go
+++ b/internal/httpapi/runners_test.go
@@ -186,7 +186,7 @@ func TestRunnerDeregisterRemovesMachineAndSelections(t *testing.T) {
t.Fatalf("bind code response: %s", rec.Body.String())
}
rec = requestWithHeaders(t, h, http.MethodPost, "/api/runners/register", map[string]any{
- "name": "dereg-mac", "os": "darwin", "arch": "arm64", "maxConcurrency": 1,
+ "name": "dereg-mac", "os": "darwin", "arch": "arm64", "version": domain.RunnerVersionDefaultSelection, "maxConcurrency": 1,
}, map[string]string{"X-Bootstrap-Token": issued.Code})
if rec.Code != http.StatusOK {
t.Fatalf("register: %d %s", rec.Code, rec.Body.String())
diff --git a/web/app/runners.js b/web/app/runners.js
index 6288cca8..ea6ac59d 100644
--- a/web/app/runners.js
+++ b/web/app/runners.js
@@ -12,6 +12,7 @@ async function refreshRunners(silent){
state.runners=runners||[];
state.defaultRunnerId=def?.runnerId||'';
state.cloudPool=def?.cloudPool||null;
+ state.minRunnerVersion=def?.minRunnerVersion||'';
renderRunnersView();
}catch(e){if(!silent)toast(e.message)}
}
@@ -147,9 +148,10 @@ function renderRunnersView(){
const cliSection=cliRows||'<div class="runner-runtime-empty">未发现支持的 Agent CLI</div>';
const shared=!(Number(r.ownerUserId)>0);
const osLabel=runnerOSLabels[r.os]||r.os||'?';
+ const defaultBlocker=isDefault?'':runnerDefaultBlocker(r);
return `<article class="runner-card panel ${isDefault?'is-default':''}">
<div class="runner-card-head">
- <div class="runner-card-title"><div class="runner-card-name"><b title="${escapeHTML(r.id)}">${escapeHTML(r.name||r.id)}</b>${isDefault?'<span class="runner-tag default">默认</span>':''}${shared?'<span class="runner-tag">共享</span>':''}</div><small>${escapeHTML(osLabel)} · ${escapeHTML(r.arch||'?')} · ${runnerLastSeenHTML(r.lastSeenAt)}</small></div>
+ <div class="runner-card-title"><div class="runner-card-name"><b title="${escapeHTML(r.id)}">${escapeHTML(r.name||r.id)}</b>${isDefault?'<span class="runner-tag default">默认</span>':''}${shared?'<span class="runner-tag">共享</span>':''}</div><small>${escapeHTML(osLabel)} · ${escapeHTML(r.arch||'?')} · Runner ${escapeHTML(r.runnerVersion||'未知')} · ${runnerLastSeenHTML(r.lastSeenAt)}</small></div>
${runnerStatusLabel(r.status)}
</div>
<div class="runner-runtime-list">${cliSection}</div>
@@ -158,7 +160,7 @@ function renderRunnersView(){
<span class="runner-card-spacer"></span>
${isDefault?'<button class="button ghost small runner-text-button" type="button" data-set-default="">切回云端</button>':''}
${r.status==='online'?'':`<button class="button ghost small runner-text-button" type="button" data-remove-runner="${escapeHTML(r.id)}" title="机器已不再使用时移除绑定">移除</button>`}
- ${isDefault?'':`<button class="button hui-btn-soft small" type="button" ${r.status==='online'?'':'disabled title="机器离线"'} data-set-default="${escapeHTML(r.id)}">设为默认</button>`}
+ ${isDefault?'':`<button class="button hui-btn-soft small" type="button" ${defaultBlocker?`disabled title="${escapeHTML(defaultBlocker)}"`:''} data-set-default="${escapeHTML(r.id)}">设为默认</button>`}
</div>
</article>`;
}).join('')||'<div class="runner-empty"><b>还没有机器</b><span>执行上方命令后自动出现</span></div>';
@@ -190,6 +192,22 @@ async function removeRunner(runnerId){
toast('已移除','ok');refreshRunners(true);
}catch(err){toast(err.message)}
}
+// Mirrors domain.Runner.DefaultSelectionBlocker so the page and
+// PUT /api/runners/default refuse the same machines with the same reason.
+function runnerVersionAtLeast(have,want){
+ const parse=v=>{const parts=String(v||'').trim().replace(/^v/,'').split('.');return parts.every(p=>/^\d+$/.test(p))?parts.map(Number):null};
+ const h=parse(have),w=parse(want);
+ if(!w)return true;
+ if(!h)return false;
+ for(let i=0;i<w.length;i++){const hv=h[i]||0;if(hv!==w[i])return hv>w[i]}
+ return true;
+}
+function runnerDefaultBlocker(r){
+ if(r.status!=='online')return '机器离线';
+ const min=state.minRunnerVersion||'';
+ if(min&&!runnerVersionAtLeast(r.runnerVersion,min))return `执行机器版本 ${r.runnerVersion||'未知'} 过低,需升级至 ${min} 及以上`;
+ return '';
+}
async function setDefaultRunner(runnerId){
try{
const out=await api('/api/runners/default',{method:'PUT',body:JSON.stringify({runnerId})});
diff --git a/web/runner_default_rule_test.go b/web/runner_default_rule_test.go
new file mode 100644
index 00000000..997bca45
--- /dev/null
+++ b/web/runner_default_rule_test.go
@@ -0,0 +1,16 @@
+package web
+
+import (
+ "os/exec"
+ "testing"
+)
+
+func TestRunnerDefaultRuleMatchesAPI(t *testing.T) {
+ node, err := exec.LookPath("node")
+ if err != nil {
+ t.Skip("node not installed")
+ }
+ if out, err := exec.Command(node, "runner_default_rule_test.js").CombinedOutput(); err != nil {
+ t.Fatalf("runner default rule: %v\n%s", err, out)
+ }
+}
diff --git a/web/runner_default_rule_test.js b/web/runner_default_rule_test.js
new file mode 100644
index 00000000..7290a652
--- /dev/null
+++ b/web/runner_default_rule_test.js
@@ -0,0 +1,28 @@
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const vm = require('node:vm');
+const code = fs.readFileSync(require('node:path').join(__dirname, 'app/runners.js'), 'utf8');
+function extract(name) {
+ const start = code.indexOf(`function ${name}(`);
+ assert.ok(start >= 0, name);
+ return code.slice(start, code.indexOf('\n}', start) + 2);
+}
+
+const context = {state: {minRunnerVersion: '0.8.0'}};
+vm.createContext(context);
+vm.runInContext(extract('runnerVersionAtLeast') + extract('runnerDefaultBlocker'), context);
+const blocker = r => context.runnerDefaultBlocker(r);
+
+assert.equal(blocker({status: 'online', runnerVersion: '0.8.0'}), '');
+assert.equal(blocker({status: 'online', runnerVersion: 'v0.9.2'}), '');
+assert.equal(blocker({status: 'offline', runnerVersion: '0.9.2'}), '机器离线');
+assert.match(blocker({status: 'online', runnerVersion: '0.1.0'}), /0\.1\.0 过低,需升级至 0\.8\.0/);
+assert.match(blocker({status: 'online', runnerVersion: ''}), /未知 过低/);
+assert.match(blocker({status: 'online', runnerVersion: 'dev'}), /过低/);
+// Before GET /api/runners/default answers, only the offline rule applies.
+context.state.minRunnerVersion = '';
+assert.equal(blocker({status: 'online', runnerVersion: '0.1.0'}), '');
+
+assert.ok(code.includes('${defaultBlocker?`disabled title='), 'set-default button must use runnerDefaultBlocker');
+assert.ok(code.includes("Runner ${escapeHTML(r.runnerVersion||'未知')}"), 'card shows the runner version');
+console.log('runner default rule ok');