feat(hermes): add kanban concurrency controls

This commit is contained in:
晴天
2026-05-27 00:40:37 +08:00
parent 80ed2d0e8c
commit 1630462ccc
6 changed files with 182 additions and 2 deletions

View File

@@ -3767,6 +3767,22 @@ export function buildHermesKanbanConfigValues(config = {}) {
86400,
false,
),
maxSpawn: parseHermesInteger(
kanban.max_spawn,
'kanban.max_spawn',
0,
0,
1000,
false,
),
maxInProgress: parseHermesInteger(
kanban.max_in_progress,
'kanban.max_in_progress',
0,
0,
1000,
false,
),
failureLimit: parseHermesInteger(
kanban.failure_limit,
'kanban.failure_limit',
@@ -3811,6 +3827,26 @@ export function mergeHermesKanbanConfig(config = {}, form = {}) {
86400,
true,
)
const maxSpawn = parseHermesInteger(
Object.hasOwn(form, 'maxSpawn') ? form.maxSpawn : currentValues.maxSpawn,
'kanban.max_spawn',
0,
0,
1000,
true,
)
if (maxSpawn > 0) kanban.max_spawn = maxSpawn
else delete kanban.max_spawn
const maxInProgress = parseHermesInteger(
Object.hasOwn(form, 'maxInProgress') ? form.maxInProgress : currentValues.maxInProgress,
'kanban.max_in_progress',
0,
0,
1000,
true,
)
if (maxInProgress > 0) kanban.max_in_progress = maxInProgress
else delete kanban.max_in_progress
kanban.failure_limit = parseHermesInteger(
Object.hasOwn(form, 'failureLimit') ? form.failureLimit : currentValues.failureLimit,
'kanban.failure_limit',

View File

@@ -6554,6 +6554,22 @@ fn build_hermes_kanban_config_values(config: &serde_yaml::Value) -> Value {
86400,
))
.unwrap_or(60),
"maxSpawn": kanban
.map(|map| bounded_hermes_i64(
yaml_i64_field(map, "max_spawn"),
0,
0,
1000,
))
.unwrap_or(0),
"maxInProgress": kanban
.map(|map| bounded_hermes_i64(
yaml_i64_field(map, "max_in_progress"),
0,
0,
1000,
))
.unwrap_or(0),
"failureLimit": kanban
.map(|map| bounded_hermes_i64(
yaml_i64_field(map, "failure_limit"),
@@ -6597,6 +6613,20 @@ fn merge_hermes_kanban_config(config: &mut serde_yaml::Value, form: &Value) -> R
1,
86400,
)?;
let max_spawn = validate_hermes_i64(
form_i64(form, "maxSpawn").or_else(|| current["maxSpawn"].as_i64()),
"kanban.max_spawn",
0,
0,
1000,
)?;
let max_in_progress = validate_hermes_i64(
form_i64(form, "maxInProgress").or_else(|| current["maxInProgress"].as_i64()),
"kanban.max_in_progress",
0,
0,
1000,
)?;
let failure_limit = validate_hermes_i64(
form_i64(form, "failureLimit").or_else(|| current["failureLimit"].as_i64()),
"kanban.failure_limit",
@@ -6632,6 +6662,22 @@ fn merge_hermes_kanban_config(config: &mut serde_yaml::Value, form: &Value) -> R
yaml_key("dispatch_interval_seconds"),
serde_yaml::Value::Number(serde_yaml::Number::from(dispatch_interval_seconds)),
);
if max_spawn > 0 {
kanban.insert(
yaml_key("max_spawn"),
serde_yaml::Value::Number(serde_yaml::Number::from(max_spawn)),
);
} else {
kanban.remove(yaml_key("max_spawn"));
}
if max_in_progress > 0 {
kanban.insert(
yaml_key("max_in_progress"),
serde_yaml::Value::Number(serde_yaml::Number::from(max_in_progress)),
);
} else {
kanban.remove(yaml_key("max_in_progress"));
}
kanban.insert(
yaml_key("failure_limit"),
serde_yaml::Value::Number(serde_yaml::Number::from(failure_limit)),
@@ -19409,6 +19455,8 @@ mod hermes_kanban_config_tests {
let values = build_hermes_kanban_config_values(&config);
assert_eq!(values["dispatchInGateway"], true);
assert_eq!(values["dispatchIntervalSeconds"], 60);
assert_eq!(values["maxSpawn"], 0);
assert_eq!(values["maxInProgress"], 0);
assert_eq!(values["failureLimit"], 2);
assert_eq!(values["autoDecompose"], true);
assert_eq!(values["autoDecomposePerTick"], 3);
@@ -19422,6 +19470,8 @@ mod hermes_kanban_config_tests {
kanban:
dispatch_in_gateway: false
dispatch_interval_seconds: "120"
max_spawn: "4"
max_in_progress: "6"
failure_limit: "5"
auto_decompose: false
auto_decompose_per_tick: "7"
@@ -19432,6 +19482,8 @@ kanban:
let values = build_hermes_kanban_config_values(&config);
assert_eq!(values["dispatchInGateway"], false);
assert_eq!(values["dispatchIntervalSeconds"], 120);
assert_eq!(values["maxSpawn"], 4);
assert_eq!(values["maxInProgress"], 6);
assert_eq!(values["failureLimit"], 5);
assert_eq!(values["autoDecompose"], false);
assert_eq!(values["autoDecomposePerTick"], 7);
@@ -19446,6 +19498,8 @@ model:
provider: anthropic
kanban:
dispatch_interval_seconds: 30
max_spawn: 9
max_in_progress: 11
custom_flag: keep-me
memory:
memory_enabled: true
@@ -19458,6 +19512,8 @@ memory:
&json!({
"dispatchInGateway": false,
"dispatchIntervalSeconds": 15,
"maxSpawn": 4,
"maxInProgress": 6,
"failureLimit": 4,
"autoDecompose": false,
"autoDecomposePerTick": 2,
@@ -19477,6 +19533,8 @@ memory:
config["kanban"]["dispatch_interval_seconds"].as_i64(),
Some(15)
);
assert_eq!(config["kanban"]["max_spawn"].as_i64(), Some(4));
assert_eq!(config["kanban"]["max_in_progress"].as_i64(), Some(6));
assert_eq!(config["kanban"]["failure_limit"].as_i64(), Some(4));
assert_eq!(config["kanban"]["auto_decompose"].as_bool(), Some(false));
assert_eq!(
@@ -19489,6 +19547,32 @@ memory:
);
}
#[test]
fn merge_kanban_config_removes_optional_concurrency_limits() {
let mut config: serde_yaml::Value = serde_yaml::from_str(
r#"
kanban:
max_spawn: 4
max_in_progress: 6
custom_flag: keep-me
"#,
)
.unwrap();
merge_hermes_kanban_config(
&mut config,
&json!({
"maxSpawn": 0,
"maxInProgress": 0,
}),
)
.unwrap();
assert_eq!(config["kanban"]["custom_flag"].as_str(), Some("keep-me"));
assert!(config["kanban"].get("max_spawn").is_none());
assert!(config["kanban"].get("max_in_progress").is_none());
}
#[test]
fn merge_kanban_config_rejects_invalid_timeout() {
let mut config = serde_yaml::Value::Mapping(serde_yaml::Mapping::new());
@@ -19496,6 +19580,13 @@ memory:
.unwrap_err();
assert!(err.contains("kanban.dispatch_interval_seconds"));
let err = merge_hermes_kanban_config(&mut config, &json!({ "maxSpawn": -1 })).unwrap_err();
assert!(err.contains("kanban.max_spawn"));
let err =
merge_hermes_kanban_config(&mut config, &json!({ "maxInProgress": -1 })).unwrap_err();
assert!(err.contains("kanban.max_in_progress"));
let err =
merge_hermes_kanban_config(&mut config, &json!({ "failureLimit": 0 })).unwrap_err();
assert!(err.contains("kanban.failure_limit"));

View File

@@ -176,6 +176,8 @@ const HUMAN_DELAY_DEFAULTS = {
const KANBAN_DEFAULTS = {
dispatchInGateway: true,
dispatchIntervalSeconds: 60,
maxSpawn: 0,
maxInProgress: 0,
failureLimit: 2,
autoDecompose: true,
autoDecomposePerTick: 3,
@@ -1501,6 +1503,14 @@ export function render() {
<span class="hm-field-label">${t('engine.hermesKanbanConfigDispatchIntervalSeconds')}</span>
<input id="hm-kanban-dispatch-interval-seconds" class="hm-input" type="number" inputmode="numeric" min="1" max="86400" step="1" value="${esc(kanbanValues.dispatchIntervalSeconds)}" ${disabled ? 'disabled' : ''}>
</label>
<label class="hm-field">
<span class="hm-field-label">${t('engine.hermesKanbanConfigMaxSpawn')}</span>
<input id="hm-kanban-max-spawn" class="hm-input" type="number" inputmode="numeric" min="0" max="1000" step="1" value="${esc(kanbanValues.maxSpawn)}" ${disabled ? 'disabled' : ''}>
</label>
<label class="hm-field">
<span class="hm-field-label">${t('engine.hermesKanbanConfigMaxInProgress')}</span>
<input id="hm-kanban-max-in-progress" class="hm-input" type="number" inputmode="numeric" min="0" max="1000" step="1" value="${esc(kanbanValues.maxInProgress)}" ${disabled ? 'disabled' : ''}>
</label>
<label class="hm-field">
<span class="hm-field-label">${t('engine.hermesKanbanConfigFailureLimit')}</span>
<input id="hm-kanban-failure-limit" class="hm-input" type="number" inputmode="numeric" min="1" max="100" step="1" value="${esc(kanbanValues.failureLimit)}" ${disabled ? 'disabled' : ''}>
@@ -3515,6 +3525,8 @@ export function render() {
const form = {
dispatchInGateway: el.querySelector('#hm-kanban-dispatch-in-gateway')?.checked ?? true,
dispatchIntervalSeconds: el.querySelector('#hm-kanban-dispatch-interval-seconds')?.value || '60',
maxSpawn: el.querySelector('#hm-kanban-max-spawn')?.value || '0',
maxInProgress: el.querySelector('#hm-kanban-max-in-progress')?.value || '0',
failureLimit: el.querySelector('#hm-kanban-failure-limit')?.value || '2',
autoDecompose: el.querySelector('#hm-kanban-auto-decompose')?.checked ?? true,
autoDecomposePerTick: el.querySelector('#hm-kanban-auto-decompose-per-tick')?.value || '3',

View File

@@ -1029,7 +1029,7 @@ export default {
hermesHumanDelayConfigMaxMs: _('最大延迟 ms', 'Maximum delay ms', '最大延遲 ms'),
hermesHumanDelayConfigFootnote: _('natural 使用 800-2500mscustom 使用下方范围。Signal 等平台可能忽略或仅部分支持该设置。', 'natural uses 800-2500ms; custom uses the range below. Platforms such as Signal may ignore or only partially support this setting.', 'natural 使用 800-2500mscustom 使用下方範圍。Signal 等平台可能忽略或僅部分支援此設定。'),
hermesKanbanConfigTitle: _('Kanban 调度稳定性', 'Kanban dispatch reliability', 'Kanban 調度穩定性'),
hermesKanbanConfigDesc: _('控制 Gateway 是否自动派发 Kanban 任务、派发频率、失败上限和无心跳回收策略。', 'Control whether Gateway dispatches Kanban work, its interval, failure limit, and heartbeat reclaim policy.', '控制 Gateway 是否自動派發 Kanban 任務、派發頻率、失敗上限和無心跳回收策略。'),
hermesKanbanConfigDesc: _('控制 Gateway 是否自动派发 Kanban 任务、派发频率、并发上限、失败上限和无心跳回收策略。', 'Control whether Gateway dispatches Kanban work, its interval, concurrency caps, failure limit, and heartbeat reclaim policy.', '控制 Gateway 是否自動派發 Kanban 任務、派發頻率、並發上限、失敗上限和無心跳回收策略。'),
hermesKanbanConfigStatusReady: _('结构化配置', 'structured settings', '結構化設定'),
hermesKanbanConfigSave: _('保存 Kanban 设置', 'Save Kanban settings', '儲存 Kanban 設定'),
hermesKanbanConfigSaveSuccess: _('Kanban 调度配置已保存,建议重启 Hermes Gateway 生效', 'Kanban dispatch settings saved. Restart Hermes Gateway to take effect.', 'Kanban 調度設定已儲存,建議重啟 Hermes Gateway 生效'),
@@ -1037,11 +1037,13 @@ export default {
hermesKanbanConfigSaveFailed: _('保存 Kanban 调度配置失败', 'Save Kanban dispatch settings failed', '儲存 Kanban 調度設定失敗'),
hermesKanbanConfigDispatchInGateway: _('由 Gateway 自动派发任务', 'Dispatch tasks in Gateway', '由 Gateway 自動派發任務'),
hermesKanbanConfigDispatchIntervalSeconds: _('派发检查间隔(秒)', 'Dispatch interval (s)', '派發檢查間隔(秒)'),
hermesKanbanConfigMaxSpawn: _('每轮最多启动任务数', 'Max spawned per tick', '每輪最多啟動任務數'),
hermesKanbanConfigMaxInProgress: _('同时运行任务上限', 'Max running tasks', '同時執行任務上限'),
hermesKanbanConfigFailureLimit: _('失败重试上限', 'Failure retry limit', '失敗重試上限'),
hermesKanbanConfigAutoDecompose: _('自动拆解待办任务', 'Auto decompose tasks', '自動拆解待辦任務'),
hermesKanbanConfigAutoDecomposePerTick: _('每轮自动拆解数量', 'Auto decompose per tick', '每輪自動拆解數量'),
hermesKanbanConfigDispatchStaleTimeoutSeconds: _('无心跳回收时间(秒)', 'Heartbeat reclaim timeout (s)', '無心跳回收時間(秒)'),
hermesKanbanConfigFootnote: _('写入 kanban.dispatch_in_gateway、dispatch_interval_seconds、failure_limit、auto_decompose、auto_decompose_per_tick、dispatch_stale_timeout_seconds。无心跳回收默认 14400 秒;设为 0 关闭自动回收。', 'Writes kanban.dispatch_in_gateway, dispatch_interval_seconds, failure_limit, auto_decompose, auto_decompose_per_tick, and dispatch_stale_timeout_seconds. Heartbeat reclaim defaults to 14400 seconds; set 0 to disable automatic reclaim.', '寫入 kanban.dispatch_in_gateway、dispatch_interval_seconds、failure_limit、auto_decompose、auto_decompose_per_tick、dispatch_stale_timeout_seconds。無心跳回收預設 14400 秒;設為 0 會關閉自動回收。'),
hermesKanbanConfigFootnote: _('写入 kanban.dispatch_in_gateway、dispatch_interval_seconds、max_spawn、max_in_progress、failure_limit、auto_decompose、auto_decompose_per_tick、dispatch_stale_timeout_seconds。两个并发上限填 0 表示不写入限制;无心跳回收填 0 表示关闭自动回收。', 'Writes kanban.dispatch_in_gateway, dispatch_interval_seconds, max_spawn, max_in_progress, failure_limit, auto_decompose, auto_decompose_per_tick, and dispatch_stale_timeout_seconds. Set concurrency caps to 0 to omit limits; set heartbeat reclaim to 0 to disable automatic reclaim.', '寫入 kanban.dispatch_in_gateway、dispatch_interval_seconds、max_spawn、max_in_progress、failure_limit、auto_decompose、auto_decompose_per_tick、dispatch_stale_timeout_seconds。兩個並發上限填 0 表示不寫入限制;無心跳回收填 0 表示關閉自動回收。'),
hermesSecurityConfigTitle: _('Tirith 安全扫描', 'Tirith security scanning', 'Tirith 安全掃描'),
hermesSecurityConfigDesc: _('控制终端命令执行前的 Tirith 内容扫描,拦截明显的 URL 伪装、管道执行和注入风险。', 'Control Tirith content scanning before terminal commands run to catch obvious URL spoofing, pipe-to-shell, and injection risks.', '控制終端命令執行前的 Tirith 內容掃描,攔截明顯的 URL 偽裝、管道執行和注入風險。'),
hermesSecurityConfigStatusReady: _('结构化配置', 'structured settings', '結構化設定'),

View File

@@ -430,6 +430,8 @@ test('Hermes 配置页会暴露 Kanban 调度稳定性结构化配置字段', ()
'hm-kanban-config-save',
'hm-kanban-dispatch-in-gateway',
'hm-kanban-dispatch-interval-seconds',
'hm-kanban-max-spawn',
'hm-kanban-max-in-progress',
'hm-kanban-failure-limit',
'hm-kanban-auto-decompose',
'hm-kanban-auto-decompose-per-tick',

View File

@@ -12,6 +12,8 @@ test('Hermes Kanban 配置读取会提供上游默认值', () => {
assert.deepEqual(values, {
dispatchInGateway: true,
dispatchIntervalSeconds: 60,
maxSpawn: 0,
maxInProgress: 0,
failureLimit: 2,
autoDecompose: true,
autoDecomposePerTick: 3,
@@ -24,6 +26,8 @@ test('Hermes Kanban 配置读取会规范化已有字段', () => {
kanban: {
dispatch_in_gateway: false,
dispatch_interval_seconds: '120',
max_spawn: '4',
max_in_progress: '6',
failure_limit: '5',
auto_decompose: false,
auto_decompose_per_tick: '7',
@@ -33,6 +37,8 @@ test('Hermes Kanban 配置读取会规范化已有字段', () => {
assert.equal(values.dispatchInGateway, false)
assert.equal(values.dispatchIntervalSeconds, 120)
assert.equal(values.maxSpawn, 4)
assert.equal(values.maxInProgress, 6)
assert.equal(values.failureLimit, 5)
assert.equal(values.autoDecompose, false)
assert.equal(values.autoDecomposePerTick, 7)
@@ -44,12 +50,16 @@ test('Hermes Kanban 配置保存会保留未知 YAML 并写入 kanban', () => {
model: { provider: 'anthropic' },
kanban: {
dispatch_interval_seconds: 30,
max_spawn: 9,
max_in_progress: 11,
custom_flag: 'keep-me',
},
memory: { memory_enabled: true },
}, {
dispatchInGateway: false,
dispatchIntervalSeconds: '15',
maxSpawn: '4',
maxInProgress: '6',
failureLimit: '4',
autoDecompose: false,
autoDecomposePerTick: '2',
@@ -61,12 +71,31 @@ test('Hermes Kanban 配置保存会保留未知 YAML 并写入 kanban', () => {
assert.equal(next.kanban.custom_flag, 'keep-me')
assert.equal(next.kanban.dispatch_in_gateway, false)
assert.equal(next.kanban.dispatch_interval_seconds, 15)
assert.equal(next.kanban.max_spawn, 4)
assert.equal(next.kanban.max_in_progress, 6)
assert.equal(next.kanban.failure_limit, 4)
assert.equal(next.kanban.auto_decompose, false)
assert.equal(next.kanban.auto_decompose_per_tick, 2)
assert.equal(next.kanban.dispatch_stale_timeout_seconds, 0)
})
test('Hermes Kanban 并发上限保存为 0 会移除可选限制字段', () => {
const next = mergeHermesKanbanConfig({
kanban: {
max_spawn: 4,
max_in_progress: 6,
custom_flag: 'keep-me',
},
}, {
maxSpawn: '0',
maxInProgress: '0',
})
assert.equal(next.kanban.custom_flag, 'keep-me')
assert.equal(Object.hasOwn(next.kanban, 'max_spawn'), false)
assert.equal(Object.hasOwn(next.kanban, 'max_in_progress'), false)
})
test('Hermes Kanban 配置保存会拒绝非法调度参数', () => {
assert.throws(
() => mergeHermesKanbanConfig({}, { dispatchIntervalSeconds: '0' }),
@@ -76,6 +105,14 @@ test('Hermes Kanban 配置保存会拒绝非法调度参数', () => {
() => mergeHermesKanbanConfig({}, { failureLimit: '0' }),
/kanban\.failure_limit/,
)
assert.throws(
() => mergeHermesKanbanConfig({}, { maxSpawn: '-1' }),
/kanban\.max_spawn/,
)
assert.throws(
() => mergeHermesKanbanConfig({}, { maxInProgress: '-1' }),
/kanban\.max_in_progress/,
)
assert.throws(
() => mergeHermesKanbanConfig({}, { autoDecomposePerTick: '0' }),
/kanban\.auto_decompose_per_tick/,