Skip to content

Commit b998edc

Browse files
committed
Process completed tasks through symbol replacement and update clear session translations
- add missing translations - symbols in 'completed tasks' are not replaced like they do in tasks ├── .nvmrc ├── apps │ └── editor │ └── src │ ├── i18n │ │ └── translations │ │ └── views │ │ └── prompt │ │ └── handlers │ │ ├── handle-clear-completed-tasks.ts │ │ └── handle-invoke-agentic-cli.ts │ ├── utils │ │ └── prompt-builder.ts │ └── views │ └── prompt │ ├── backend │ │ ├── message-handlers │ │ │ ├── handle-autofill.ts │ │ │ ├── handle-copy-prompt.ts │ │ │ ├── handle-make-api-call.ts │ │ │ ├── handle-preview-prompt.ts │ │ │ ├── handle-preview-web-configuration.ts │ │ │ ├── handle-save-completed-tasks.ts │ │ │ └── utils │ │ │ ├── build-cli-prompt.ts │ │ │ └── build-prompt-payload.ts │ │ ├── prompt-view-provider.ts │ │ └── utils │ │ └── symbols │ │ ├── fragment │ │ │ └── replace-fragment-symbol.ts │ │ ├── git │ │ │ └── replace-git-symbols.ts │ │ ├── image │ │ │ └── replace-image-symbol.ts │ │ ├── pasted-text │ │ │ └── replace-pasted-text-symbol.ts │ │ ├── replace-symbols.ts │ │ ├── saved-context │ │ │ └── replace-saved-context-symbol.ts │ │ ├── skill │ │ │ └── replace-skill-symbol.ts │ │ └── website │ │ └── replace-website-symbol.ts │ └── types │ └── messages.ts └── packages └── ui └── src └── components └── editor └── common └── prompts ├── PromptField │ └── components │ └── CompletedTasks │ └── CompletedTasks.tsx └── shared └── symbols └── get-highlighted-text.tsx
1 parent a830b7c commit b998edc

8 files changed

Lines changed: 57 additions & 28 deletions

File tree

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
export const translations = {
22
'views.prompt.handlers.handle-clear-completed-tasks.cleared': {
3-
en: 'Completed tasks cleared.',
4-
pl: 'Zakończone zadania wyczyszczone.',
5-
'zh-cn': '已完成任务已清除。',
6-
ja: '完了したタスクをクリアしました。',
7-
'zh-tw': '已完成任務已清除。',
8-
de: 'Abgeschlossene Aufgaben gelöscht.',
9-
es: 'Tareas completadas borradas.',
10-
fr: 'Tâches terminées effacées.',
11-
'pt-br': 'Tarefas concluídas limpas.',
12-
ru: 'Завершенные задачи очищены.',
13-
ko: '완료된 작업이 지워졌습니다.',
14-
it: 'Attività completate cancellate.',
15-
tr: 'Tamamlanan görevler temizlendi.',
16-
cs: 'Dokončené úkoly vymazány.',
17-
hu: 'Befejezett feladatok törölve.',
18-
bg: 'Завършените задачи са изчистени.'
3+
en: 'Session cleared.',
4+
pl: 'Sesja wyczyszczona.',
5+
'zh-cn': '会话已清除。',
6+
ja: 'セッションがクリアされました。',
7+
'zh-tw': '會話已清除。',
8+
de: 'Sitzung gelöscht.',
9+
es: 'Sesión borrada.',
10+
fr: 'Session effacée.',
11+
'pt-br': 'Sessão limpa.',
12+
ru: 'Сессия очищена.',
13+
ko: '세션이 지워졌습니다.',
14+
it: 'Sessione cancellata.',
15+
tr: 'Oturum temizlendi.',
16+
cs: 'Relace vymazána.',
17+
hu: 'Munkamenet törölve.',
18+
bg: 'Сесията е изчистена.'
1919
}
2020
} as const

‎apps/editor/src/views/prompt/backend/message-handlers/handle-autofill.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ export const handle_autofill = async (params: {
6262
recent_files,
6363
collected_files,
6464
processed_instructions,
65+
processed_completed_tasks,
6566
skill_definitions
6667
} = await build_prompt_payload({
6768
prompt_view_provider: params.prompt_view_provider,
@@ -82,7 +83,7 @@ export const handle_autofill = async (params: {
8283
let completed_tasks: string[] | undefined = undefined
8384
const user_instructions = processed_instructions
8485
if (params.prompt_view_provider.web_prompt_type == 'edit') {
85-
completed_tasks = params.prompt_view_provider.completed_tasks
86+
completed_tasks = processed_completed_tasks
8687
output_formatting = {
8788
whole: EDIT_FORMAT_INSTRUCTIONS_WHOLE,
8889
truncated: EDIT_FORMAT_INSTRUCTIONS_TRUNCATED,

‎apps/editor/src/views/prompt/backend/message-handlers/handle-copy-prompt.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export const handle_copy_prompt = async (params: {
1818
recent_files,
1919
collected_files,
2020
processed_instructions,
21+
processed_completed_tasks,
2122
skill_definitions
2223
} = await build_prompt_payload({
2324
prompt_view_provider: params.prompt_view_provider,
@@ -36,7 +37,7 @@ export const handle_copy_prompt = async (params: {
3637
const user_instructions = processed_instructions
3738

3839
if (params.prompt_view_provider.prompt_type == 'edit') {
39-
completed_tasks = params.prompt_view_provider.completed_tasks
40+
completed_tasks = processed_completed_tasks
4041
const edit_format = params.prompt_view_provider.edit_format
4142
output_formatting = {
4243
whole: EDIT_FORMAT_INSTRUCTIONS_WHOLE,

‎apps/editor/src/views/prompt/backend/message-handlers/handle-make-api-call.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ export const handle_make_api_call = async (
5454
recent_files,
5555
collected_files,
5656
processed_instructions,
57+
processed_completed_tasks,
5758
skill_definitions
5859
} = await build_prompt_payload({
5960
prompt_view_provider
@@ -96,7 +97,7 @@ export const handle_make_api_call = async (
9697

9798
if (prompt_type == 'edit') {
9899
edit_format = prompt_view_provider.edit_format
99-
completed_tasks = prompt_view_provider.completed_tasks
100+
completed_tasks = processed_completed_tasks
100101
const output_formatting = {
101102
whole: EDIT_FORMAT_INSTRUCTIONS_WHOLE,
102103
truncated: EDIT_FORMAT_INSTRUCTIONS_TRUNCATED,

‎apps/editor/src/views/prompt/backend/message-handlers/handle-preview-prompt.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ export const handle_preview_prompt = async (params: {
3737
recent_files,
3838
collected_files,
3939
processed_instructions,
40+
processed_completed_tasks,
4041
skill_definitions
4142
} = await build_prompt_payload({
4243
prompt_view_provider: params.prompt_view_provider,
@@ -55,7 +56,7 @@ export const handle_preview_prompt = async (params: {
5556
const user_instructions = processed_instructions
5657

5758
if (params.prompt_view_provider.prompt_type == 'edit') {
58-
completed_tasks = params.prompt_view_provider.completed_tasks
59+
completed_tasks = processed_completed_tasks
5960
const edit_format = params.prompt_view_provider.edit_format
6061
output_formatting = {
6162
whole: EDIT_FORMAT_INSTRUCTIONS_WHOLE,

‎apps/editor/src/views/prompt/backend/message-handlers/handle-preview-web-configuration.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export const handle_preview_web_configuration = async (
2424
other_files,
2525
recent_files,
2626
processed_instructions,
27+
processed_completed_tasks,
2728
skill_definitions
2829
} = await build_prompt_payload({
2930
prompt_view_provider,
@@ -34,7 +35,7 @@ export const handle_preview_web_configuration = async (
3435
let completed_tasks: string[] | undefined = undefined
3536
const user_instructions = processed_instructions
3637
if (prompt_view_provider.web_prompt_type == 'edit') {
37-
completed_tasks = prompt_view_provider.completed_tasks
38+
completed_tasks = processed_completed_tasks
3839
output_formatting = {
3940
whole: EDIT_FORMAT_INSTRUCTIONS_WHOLE,
4041
truncated: EDIT_FORMAT_INSTRUCTIONS_TRUNCATED,

‎apps/editor/src/views/prompt/backend/message-handlers/utils/build-cli-prompt.ts‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,25 @@ export const build_cli_prompt = async (params: {
1515

1616
const current_instructions = prompt_view_provider.current_instructions.trim()
1717

18-
const { instructions: processed_query, skill_definitions } =
18+
const delimiter = `__CWC_TASK_DELIMITER_${Math.random().toString(36).substring(2)}_${Date.now()}__`
19+
const combined_instructions = [
20+
current_instructions,
21+
...prompt_view_provider.completed_tasks
22+
].join(delimiter)
23+
24+
const { instructions: processed_combined, skill_definitions } =
1925
await replace_symbols({
20-
instructions: current_instructions,
26+
instructions: combined_instructions,
2127
extension_context: prompt_view_provider.extension_context,
2228
workspace_provider: prompt_view_provider.workspace_provider,
23-
image_as_paths: true
29+
image_as_paths: true,
30+
symbols_cache: prompt_view_provider.symbols_cache
2431
})
2532

33+
const split_processed = processed_combined.split(delimiter)
34+
const processed_query = split_processed[0]
35+
const processed_completed_tasks = split_processed.slice(1)
36+
2637
const roots = prompt_view_provider.workspace_provider.get_workspace_roots()
2738

2839
if (!selected_root) {
@@ -80,7 +91,7 @@ export const build_cli_prompt = async (params: {
8091
let completed_tasks: string[] | undefined = undefined
8192

8293
if (prompt_view_provider.cli_prompt_type == 'edit') {
83-
completed_tasks = prompt_view_provider.completed_tasks
94+
completed_tasks = processed_completed_tasks
8495
requirements_list.push(cli_edit_ask_requirements.exception_read_images)
8596
requirements_list.push(
8697
cli_edit_ask_requirements.exception_allow_file_system_operations

‎apps/editor/src/views/prompt/backend/message-handlers/utils/build-prompt-payload.ts‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export const build_prompt_payload = async (params: {
1010
recent_files: string
1111
collected_files: string
1212
processed_instructions: string
13+
processed_completed_tasks: string[]
1314
skill_definitions: string
1415
}> => {
1516
const { prompt_view_provider, remove_images } = params
@@ -25,19 +26,31 @@ export const build_prompt_payload = async (params: {
2526
recent_files = collected.recent_files
2627
collected_files = other_files + recent_files
2728

28-
const { instructions: processed_instructions, skill_definitions } =
29+
const delimiter = `__CWC_TASK_DELIMITER_${Math.random().toString(36).substring(2)}_${Date.now()}__`
30+
const combined_instructions = [
31+
prompt_view_provider.current_instructions.trim() || '',
32+
...prompt_view_provider.completed_tasks
33+
].join(delimiter)
34+
35+
const { instructions: processed_combined, skill_definitions } =
2936
await replace_symbols({
30-
instructions: prompt_view_provider.current_instructions.trim() || '',
37+
instructions: combined_instructions,
3138
extension_context: prompt_view_provider.extension_context,
3239
workspace_provider: prompt_view_provider.workspace_provider,
33-
remove_images
40+
remove_images,
41+
symbols_cache: prompt_view_provider.symbols_cache
3442
})
3543

44+
const split_processed = processed_combined.split(delimiter)
45+
const processed_instructions = split_processed[0]
46+
const processed_completed_tasks = split_processed.slice(1)
47+
3648
return {
3749
other_files,
3850
recent_files,
3951
collected_files,
4052
processed_instructions,
53+
processed_completed_tasks,
4154
skill_definitions
4255
}
4356
}

0 commit comments

Comments
 (0)