fix(feishu): conform card form submission and model select to upstream

- read form data from action.form_value (Card 2.0) instead of formValue

- wrap custom steer input and submit in a form container with submit button

- reuse runModelCommand for dropdown model picks so IDs with multiple / keep working

- pass key when sending the help card so back-to-menu stays valid

- compute initial_index from {value} option arrays

- add in-flight tests for menu stop, steer dropdown, and steer form
This commit is contained in:
C3H3-AI 2026-08-23 07:11:17 +08:00
parent 7d2c93da86
commit 0241a32ec5
4 changed files with 297 additions and 59 deletions

View file

@ -1147,7 +1147,7 @@ export class FeishuHarnessBridge {
});
}
if (source === 'form') {
const text = nonEmptyString(event?.action?.formValue?.steer_text);
const text = nonEmptyString(event?.action?.form_value?.steer_text);
if (text) {
return this.#sendSteer(entry, text).catch((error) => {
this.#logger.warn?.('[dsh-feishu] steer (form) failed:', error.message);
@ -1271,7 +1271,7 @@ export class FeishuHarnessBridge {
return;
}
if (action === 'help') {
await this.#showHelpCard(chatId);
await this.#showHelpCard(key, chatId);
return;
}
if (action === 'back_to_menu') {
@ -1739,8 +1739,8 @@ export class FeishuHarnessBridge {
/**
* Show the help card with all command descriptions.
*/
async #showHelpCard(chatId) {
await this.#sendCard(chatId, helpCard(WORKSPACE_HELP_LINES), {});
async #showHelpCard(key, chatId) {
await this.#sendCard(chatId, helpCard(WORKSPACE_HELP_LINES), { key });
}
/**
@ -1839,45 +1839,23 @@ export class FeishuHarnessBridge {
/**
* Handle model selection from the model dropdown.
*
* Reuses `runModelCommand` (the same path as the `/model <id>` text
* command) so model IDs containing `/` (e.g.
* `openrouter/anthropic/claude-sonnet-4`) keep working, and all the
* catalog validation, busy checks, pending-interaction checks and the
* session binding lock stay in one place.
*/
async #handleModelSelect(key, chatId, modelId) {
try {
const parts = modelId.split('/');
if (parts.length !== 2) {
await this.#send(chatId, `模型 ID 格式无效:${modelId}`);
return;
}
const [provider, model] = parts;
const sessionId = this.#state?.sessionFor?.(key);
if (typeof sessionId === 'string' && sessionId) {
// Select model on the bound session
const session = this.#harness.workspaceSession(sessionId);
if (!session?.selectModel) {
await this.#send(chatId, '当前会话不支持切换模型。');
return;
}
await session.selectModel({ provider, model }, { signal: this.#signal });
} else {
// No session yet; select default model for future sessions
if (typeof this.#harness?.createSession !== 'function') {
throw new TypeError('Harness cannot create a session');
}
const newSessionId = await this.#harness.createSession({ signal: this.#signal });
if (typeof newSessionId !== 'string' || !newSessionId) {
await this.#send(chatId, '无法创建新会话来选择模型。');
return;
}
const session = this.#harness.workspaceSession(newSessionId);
if (!session?.selectModel) {
await this.#send(chatId, '新会话不支持切换模型。');
return;
}
await session.selectModel({ provider, model }, { signal: this.#signal });
await this.#state.setSession(key, newSessionId);
}
await this.#send(chatId, `模型已切换为:${modelId}`);
const result = await runModelCommand(
`/model ${modelId}`, this.#harness, this.#state, key, {
signal: this.#signal,
control: { owner: this, key },
},
);
const message = result?.message || '模型切换失败,请稍后重试。';
await this.#send(chatId, message);
await this.#showSettingsCard(key, chatId);
} catch (error) {
this.#logger.warn?.('[dsh-feishu] model select failed:', error.message);

View file

@ -150,15 +150,16 @@ export function menuCard(ctx) {
// 会话下拉:列出最近会话,选择即切换(当前绑定会话带 ✓)
const sessionOptions = (Array.isArray(sessions) ? sessions : []).slice(0, 20);
if (sessionOptions.length > 0) {
const sessionPickOptions = sessionOptions.map((s) => ({
text: { tag: 'plain_text', content: `${s.id === currentSessionId ? '✓ ' : ''}${safeTitle(s.title)}` },
value: s.id,
}));
elements.push({
tag: 'select_static',
name: 'session_pick',
placeholder: { tag: 'plain_text', content: '切换/续写会话' },
initial_index: initialIndex(sessionOptions, currentSessionId),
options: sessionOptions.map((s) => ({
text: { tag: 'plain_text', content: `${s.id === currentSessionId ? '✓ ' : ''}${safeTitle(s.title)}` },
value: s.id,
})),
initial_index: initialIndex(sessionPickOptions, currentSessionId),
options: sessionPickOptions,
behaviors: [{ type: 'callback', value: { action: 'session_pick' } }],
});
elements.push(buttonPair('🆕 新会话', 'new', '📋 全部会话', 'sessions'));
@ -427,8 +428,8 @@ export function modelCard(catalog) {
for (const group of groups) {
for (const model of group.models) {
allOptions.push({
id: `${group.id}/${model.id}`,
name: `${group.name} - ${model.name}`,
value: `${group.id}/${model.id}`,
text: { tag: 'plain_text', content: `${group.name} - ${model.name}` },
});
}
}
@ -441,8 +442,8 @@ export function modelCard(catalog) {
placeholder: { tag: 'plain_text', content: '选择模型' },
initial_index: currentId === null ? 0 : initialIndex(allOptions, currentId),
options: allOptions.map((opt) => ({
text: { tag: 'plain_text', content: `${opt.name}${opt.id === currentId ? ' ✓' : ''}` },
value: opt.id,
text: { tag: 'plain_text', content: `${opt.text.content}${opt.value === currentId ? ' ✓' : ''}` },
value: opt.value,
})),
behaviors: [{ type: 'callback', value: { action: 'model_pick' } }],
},
@ -782,16 +783,23 @@ export function customSteerCard() {
{ tag: 'div', text: markdown('输入补充指令后点「提交」,发送给当前运行的任务。') },
{ tag: 'hr' },
{
tag: 'input',
name: 'steer_text',
placeholder: { tag: 'plain_text', content: '输入你的补充指令' },
},
{
tag: 'button',
text: { tag: 'plain_text', content: '提交' },
type: 'primary',
width: 'fill',
behaviors: [{ type: 'callback', value: { action: 'steer', source: 'form' } }],
tag: 'form',
name: 'steer_form',
elements: [
{
tag: 'input',
name: 'steer_text',
placeholder: { tag: 'plain_text', content: '输入你的补充指令' },
},
{
tag: 'button',
text: { tag: 'plain_text', content: '提交' },
type: 'primary',
width: 'fill',
form_action_type: 'submit',
behaviors: [{ type: 'callback', value: { action: 'steer', source: 'form' } }],
},
],
},
{ tag: 'hr' },
button('🔙 返回菜单', 'back_to_menu'),