Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(scheduler): 模板必填参数为空时改为本地化提示 (#5010)

yui84bfde3db01d
diff --git a/apps/desktop/src/renderer/features/scheduler/components/ScheduleFormDialog.tsx b/apps/desktop/src/renderer/features/scheduler/components/ScheduleFormDialog.tsx
index 6a734fc73c..3c23964223 100644
--- a/apps/desktop/src/renderer/features/scheduler/components/ScheduleFormDialog.tsx
+++ b/apps/desktop/src/renderer/features/scheduler/components/ScheduleFormDialog.tsx
@@ -36,6 +36,7 @@ import {
buildHookCommandForScriptFile,
canSubmitSessionBinding,
isExplicitScheduleModelUnavailable,
+ missingRequiredTemplateParamLabel,
needsBoundSessionGenerationRouteResolution,
parsePreRunHookTimeoutMs,
resolveScheduleGenerationProviderId,
@@ -523,13 +524,18 @@ export function ScheduleFormDialog({
}
let input = toInput();
if (selectedTemplate && !promptDirty) {
+ const missingLabel = missingRequiredTemplateParamLabel(selectedTemplate, paramValues);
+ if (missingLabel) {
+ toast.warning(t('scheduler.editor.validation.templateParamRequired', { label: missingLabel }));
+ return;
+ }
try {
input = {
...input,
prompt: applyTemplateParams(selectedTemplate.prompt ?? '', paramValues, selectedTemplate.parameters),
};
- } catch (e) {
- toast.warning(e instanceof Error ? e.message : String(e));
+ } catch {
+ toast.warning(t('scheduler.editor.validation.templateApplyFailed'));
return;
}
}
diff --git a/apps/desktop/src/renderer/features/scheduler/lib/__tests__/scheduleFormLogic.test.ts b/apps/desktop/src/renderer/features/scheduler/lib/__tests__/scheduleFormLogic.test.ts
index 3b466186d4..e4e2b53808 100644
--- a/apps/desktop/src/renderer/features/scheduler/lib/__tests__/scheduleFormLogic.test.ts
+++ b/apps/desktop/src/renderer/features/scheduler/lib/__tests__/scheduleFormLogic.test.ts
@@ -31,6 +31,7 @@ import {
deriveRunMode,
hasRealBinding,
isExplicitScheduleModelUnavailable,
+ missingRequiredTemplateParamLabel,
isFollowingSessionSelection,
needsBoundSessionGenerationRouteResolution,
resolveScheduleGenerationProviderId,
@@ -935,3 +936,35 @@ describe('script lifecycle serialization', () => {
expect(buildScheduleInput(makeForm({ executionMode: 'script', targetSessionId: '__pending__' })).targetSessionId).toBeUndefined();
});
});
+
+describe('missingRequiredTemplateParamLabel', () => {
+ const radar = {
+ parameters: [
+ { key: 'topic', label: '关注主题', type: 'string', required: true },
+ ],
+ } as ScheduleTemplate;
+ const competitors = {
+ parameters: [
+ { key: 'competitors', label: '竞品名单', type: 'string', required: true },
+ ],
+ } as ScheduleTemplate;
+
+ it('returns the visible label when a required parameter is empty', () => {
+ expect(missingRequiredTemplateParamLabel(radar, {})).toBe('关注主题');
+ expect(missingRequiredTemplateParamLabel(competitors, { competitors: ' ' })).toBeNull();
+ });
+
+ it('accepts a filled value or a non-empty default', () => {
+ expect(missingRequiredTemplateParamLabel(radar, { topic: 'AI Agent' })).toBeNull();
+ expect(missingRequiredTemplateParamLabel({
+ parameters: [
+ { key: 'topic', label: '关注主题', type: 'string', required: true, default: 'AI' },
+ ],
+ } as ScheduleTemplate, {})).toBeNull();
+ expect(missingRequiredTemplateParamLabel({
+ parameters: [
+ { key: 'suite', label: 'Suite', type: 'string', required: true, default: 'full' },
+ ],
+ } as ScheduleTemplate, { suite: '' })).toBeNull();
+ });
+});
diff --git a/apps/desktop/src/renderer/features/scheduler/lib/scheduleFormLogic.ts b/apps/desktop/src/renderer/features/scheduler/lib/scheduleFormLogic.ts
index fe9b53c741..84a7c50270 100644
--- a/apps/desktop/src/renderer/features/scheduler/lib/scheduleFormLogic.ts
+++ b/apps/desktop/src/renderer/features/scheduler/lib/scheduleFormLogic.ts
@@ -45,6 +45,25 @@ export function isExplicitScheduleModelUnavailable(
&& !availableModels.some((candidate) => candidate.id === explicitModel);
}
+/**
+ * First required template parameter the scheduler engine would reject.
+ * Empty string is not "provided" and falls back to a non-empty default, matching
+ * applyTemplateParams. Whitespace is provided: the engine inserts it as-is.
+ */
+export function missingRequiredTemplateParamLabel(
+ template: Pick<ScheduleTemplate, 'parameters'>,
+ values: Record<string, string>,
+): string | null {
+ for (const parameter of template.parameters ?? []) {
+ if (!parameter.required) continue;
+ const raw = values[parameter.key];
+ const provided = Object.prototype.hasOwnProperty.call(values, parameter.key) && raw !== '';
+ const hasDefault = parameter.default !== undefined && parameter.default !== '';
+ if (!provided && !hasDefault) return parameter.label || parameter.key;
+ }
+ return null;
+}
+
/**
* Resolve the provider represented by the schedule picker. An empty stored
* providerId means "use the effective source", not "use the utility fallback
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index 8cc4376edf..e549a37ac3 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -10990,7 +10990,9 @@
"selectProject": "Select a project directory",
"modelUnavailable": "Model {{model}} is no longer available. Select another model.",
"reasoningInvalid": "Reasoning must be one of {{values}}",
- "preRunHookCommandRequired": "Enter the pre-run check command"
+ "preRunHookCommandRequired": "Enter the pre-run check command",
+ "templateParamRequired": "Enter {{label}}",
+ "templateApplyFailed": "Could not apply the template. Check the parameters and try again."
}
},
"chips": {
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index 18b3e94802..a3e751d26a 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -10975,7 +10975,9 @@
"selectProject": "プロジェクトディレクトリを選択してください",
"modelUnavailable": "モデル {{model}} は利用できません。別のモデルを選択してください",
"reasoningInvalid": "Reasoning は {{values}} のいずれかである必要があります",
- "preRunHookCommandRequired": "事前チェックスクリプトのコマンドを入力してください"
+ "preRunHookCommandRequired": "事前チェックスクリプトのコマンドを入力してください",
+ "templateParamRequired": "{{label}}を入力してください",
+ "templateApplyFailed": "テンプレートを適用できませんでした。パラメータを確認して再試行してください。"
}
},
"chips": {
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index 16dff5b61b..c0850234af 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -10975,7 +10975,9 @@
"selectProject": "프로젝트 디렉토리를 선택하세요",
"modelUnavailable": "모델 {{model}}을 더 이상 사용할 수 없습니다. 다른 모델을 선택하세요.",
"reasoningInvalid": "Reasoning은 {{values}} 중 하나여야 합니다",
- "preRunHookCommandRequired": "사전 검사 스크립트 명령을 입력하세요"
+ "preRunHookCommandRequired": "사전 검사 스크립트 명령을 입력하세요",
+ "templateParamRequired": "{{label}}을(를) 입력하세요",
+ "templateApplyFailed": "템플릿을 적용할 수 없습니다. 매개변수를 확인한 후 다시 시도하세요."
}
},
"chips": {
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index 75182e2371..75566298fd 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -10975,7 +10975,9 @@
"selectProject": "请选择项目目录",
"modelUnavailable": "模型 {{model}} 已不可用,请重新选择",
"reasoningInvalid": "Reasoning 必须是 {{values}} 之一",
- "preRunHookCommandRequired": "请填写前置检查脚本命令"
+ "preRunHookCommandRequired": "请填写前置检查脚本命令",
+ "templateParamRequired": "请填写{{label}}",
+ "templateApplyFailed": "无法应用模板,请检查参数后重试"
}
},
"chips": {
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index c84fc92c26..bf245208e7 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -10975,7 +10975,9 @@
"selectProject": "請選擇專案目錄",
"modelUnavailable": "模型 {{model}} 已不可用,請重新選擇",
"reasoningInvalid": "Reasoning 必須是 {{values}} 之一",
- "preRunHookCommandRequired": "請填寫前置檢查指令碼命令"
+ "preRunHookCommandRequired": "請填寫前置檢查指令碼命令",
+ "templateParamRequired": "請填寫{{label}}",
+ "templateApplyFailed": "無法套用模板,請檢查參數後重試"
}
},
"chips": {