Skip to content

Commit 91ef886

Browse files
committed
Enable reordering of target buttons in the prompt view
- in settings.json, let users store setting: targetsOrder, which is a set of items by default: ['WEB', 'API', 'CLI']. It should be adjustable by drag&drop of target buttons in the prompt view. For drag&drop use react-sortable. - assume the targetsOrder is always right and don't normalize - numeric values of targets should be ordered, not assigned to actual targets: first item gets 1, second 2, third 3 - in prompt field, targets should follow the user-defined order as well - in prompt field, numeric values of targets should be ordered, not assigned to actual targets: first item gets 1, second 2, third 3 - numeric 1-2-3 shortcuts on Home can be used only once, after that they don't appear on alt/option press - hovering over targets should show gripper codicon here: [Image] ├── apps │ └── editor │ ├── package.json │ └── src │ └── views │ └── prompt │ ├── backend │ │ ├── message-handlers │ │ │ ├── handle-save-targets-order.ts │ │ │ └── index.ts │ │ └── prompt-view-provider.ts │ ├── frontend │ │ ├── Home │ │ │ ├── Home.module.scss │ │ │ ├── Home.tsx │ │ │ └── hooks │ │ │ └── use-keyboard-shortcuts.ts │ │ ├── Main │ │ │ ├── Main.tsx │ │ │ └── MainView │ │ │ └── MainView.tsx │ │ ├── Prompt.tsx │ │ └── hooks │ │ └── use-prompt │ │ └── use-prompt.ts │ └── types │ └── messages.ts └── packages ├── shared │ └── src │ └── types │ └── target.ts └── ui ├── package.json └── src └── components └── editor ├── common │ └── prompts │ └── PromptField │ ├── PromptField.tsx │ ├── components │ │ └── Footer │ │ └── Footer.tsx │ └── hooks │ └── use-keyboard-shortcuts.ts └── prompt-view ├── Configurations │ └── Configurations.tsx ├── TargetButton │ ├── TargetButton.module.scss │ ├── TargetButton.stories.tsx │ ├── TargetButton.tsx │ └── index.ts ├── TargetButtons │ ├── TargetButtons.module.scss │ ├── TargetButtons.tsx │ └── index.ts └── Tasks └── components └── TaskGroup.tsx
1 parent a29b514 commit 91ef886

18 files changed

Lines changed: 290 additions & 64 deletions

File tree

‎apps/editor/package.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,6 +1129,26 @@
11291129
]
11301130
}
11311131
},
1132+
"codeWebChat.targetsOrder": {
1133+
"type": "array",
1134+
"scope": "application",
1135+
"items": {
1136+
"type": "string",
1137+
"enum": [
1138+
"WEB",
1139+
"API",
1140+
"CLI"
1141+
]
1142+
},
1143+
"uniqueItems": true,
1144+
"minItems": 3,
1145+
"maxItems": 3,
1146+
"default": [
1147+
"WEB",
1148+
"API",
1149+
"CLI"
1150+
]
1151+
},
11321152
"codeWebChat.forwardedPorts": {
11331153
"type": "array",
11341154
"scope": "application",
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import * as vscode from 'vscode'
2+
import { SaveTargetsOrderMessage } from '../../types/messages'
3+
4+
export const handle_save_targets_order = async (
5+
message: SaveTargetsOrderMessage
6+
) => {
7+
const config = vscode.workspace.getConfiguration('codeWebChat')
8+
await config.update(
9+
'targetsOrder',
10+
message.targets_order,
11+
vscode.ConfigurationTarget.Global
12+
)
13+
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,4 @@ export * from './handle-save-completed-tasks'
6666
export * from './handle-clear-completed-tasks'
6767
export * from './handle-show-accuracy-boost-info'
6868
export * from './handle-update-extension'
69+
export * from './handle-save-targets-order'

‎apps/editor/src/views/prompt/backend/prompt-view-provider.ts‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
config_cli_configuration_to_ui_format,
2222
ConfigAgentConfigurationFormat
2323
} from '@/utils/cli-configuration-format-converters'
24-
import { Target } from '@shared/types/target'
24+
import { Target, TARGET } from '@shared/types/target'
2525
import {
2626
ApiPromptType,
2727
WebPromptType,
@@ -196,6 +196,14 @@ export class PromptViewProvider implements vscode.WebviewViewProvider {
196196
})
197197
}
198198

199+
send_targets_order() {
200+
const config = vscode.workspace.getConfiguration('codeWebChat')
201+
this.send_message({
202+
command: 'TARGETS_ORDER',
203+
targets_order: config.get<Target[]>('targetsOrder', [...TARGET])
204+
})
205+
}
206+
199207
constructor(params: {
200208
extension_uri: vscode.Uri
201209
workspace_provider: WorkspaceProvider
@@ -341,6 +349,10 @@ export class PromptViewProvider implements vscode.WebviewViewProvider {
341349
this._send_is_modern_ui()
342350
}
343351

352+
if (event.affectsConfiguration('codeWebChat.targetsOrder')) {
353+
this.send_targets_order()
354+
}
355+
344356
if (event.affectsConfiguration('codeWebChat.agents')) {
345357
if (this.webview_view) {
346358
this.send_cli_configurations_to_webview(this.webview_view.webview)
@@ -846,6 +858,10 @@ export class PromptViewProvider implements vscode.WebviewViewProvider {
846858
await handlers.handle_clear_completed_tasks(this)
847859
} else if (message.command === 'UPDATE_EXTENSION') {
848860
handlers.handle_update_extension(this)
861+
} else if (message.command === 'GET_TARGETS_ORDER') {
862+
this.send_targets_order()
863+
} else if (message.command === 'SAVE_TARGETS_ORDER') {
864+
await handlers.handle_save_targets_order(message)
849865
} else if (message.command === 'GET_UPDATE_INFO') {
850866
this.send_message({
851867
command: 'UPDATE_INFO',

‎apps/editor/src/views/prompt/frontend/Home/Home.module.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,13 @@
125125
display: flex;
126126
flex-direction: column;
127127
gap: 6px;
128-
margin: 0 12px;
128+
margin-right: 12px;
129129
overflow: hidden;
130130
border-radius: 10px;
131131
position: relative;
132132

133133
@include modern-ui {
134-
margin: 0 10px;
134+
margin-right: 10px;
135135
}
136136

137137
> button {

‎apps/editor/src/views/prompt/frontend/Home/Home.tsx‎

Lines changed: 62 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import styles from './Home.module.scss'
33
import { Scrollable as UiScrollable } from '@ui/components/editor/common/Scrollable'
44
import { Tabs as UiTabs } from '@ui/components/editor/prompt-view/Tabs'
55
import { TargetButton as UiTargetButton } from '@ui/components/editor/prompt-view/TargetButton'
6+
import { TargetButtons as UiTargetButtons } from '@ui/components/editor/prompt-view/TargetButtons'
7+
import { Target } from '@shared/types/target'
68
import cn from 'classnames'
79
import { post_message } from '../utils/post-message'
810
import { BackendMessage } from '@/views/prompt/types/messages'
@@ -37,6 +39,8 @@ type Props = {
3739
api_prompt_type: ApiPromptType
3840
cli_prompt_type: CliPromptType
3941
update_info: UpdateInfo
42+
targets_order: Target[]
43+
on_targets_reorder: (new_order: Target[]) => void
4044
}
4145

4246
export const Home: React.FC<Props> = (props) => {
@@ -46,8 +50,9 @@ export const Home: React.FC<Props> = (props) => {
4650
const { has_scrolled_past_target_button, target_ref, handle_scroll } =
4751
use_has_scrolled_past_target_button(props.is_active)
4852

49-
const { is_alt_pressed } = use_keyboard_shortcuts({
53+
const { is_alt_pressed, clear_keys } = use_keyboard_shortcuts({
5054
is_active: props.is_active,
55+
targets_order: props.targets_order,
5156
on_chatbots_click: props.on_chatbots_click,
5257
on_api_calls_click: props.on_api_calls_click,
5358
on_cli_calls_click: props.on_cli_calls_click
@@ -88,6 +93,49 @@ export const Home: React.FC<Props> = (props) => {
8893
return () => window.removeEventListener('message', handle_message)
8994
}, [])
9095

96+
const target_items: Record<
97+
Target,
98+
Omit<UiTargetButtons.Item<Target>, 'keycap_char'>
99+
> = {
100+
WEB: {
101+
id: 'WEB',
102+
label: 'WEB',
103+
description: props.is_connected
104+
? t('home.target.web.description-connected')
105+
: t('home.target.web.description'),
106+
on_click: () => {
107+
clear_keys()
108+
props.on_chatbots_click()
109+
},
110+
hover_color: props.web_prompt_type === 'edit' ? 'blue' : 'purple'
111+
},
112+
API: {
113+
id: 'API',
114+
label: 'API',
115+
description: t('home.target.api.description'),
116+
on_click: () => {
117+
clear_keys()
118+
props.on_api_calls_click()
119+
},
120+
hover_color: props.api_prompt_type === 'edit' ? 'blue' : 'purple'
121+
},
122+
CLI: {
123+
id: 'CLI',
124+
label: 'CLI',
125+
description: t('home.target.cli.description'),
126+
on_click: () => {
127+
clear_keys()
128+
props.on_cli_calls_click()
129+
},
130+
hover_color: props.cli_prompt_type === 'edit' ? 'blue' : 'purple'
131+
}
132+
}
133+
134+
const ordered_target_items = props.targets_order.map((target, index) => ({
135+
...target_items[target],
136+
keycap_char: is_alt_pressed ? (index + 1).toString() : undefined
137+
}))
138+
91139
const header = (
92140
<div className={styles.header}>
93141
<div
@@ -133,27 +181,16 @@ export const Home: React.FC<Props> = (props) => {
133181
[styles['header__targets--visible']]: has_scrolled_past_target_button
134182
})}
135183
>
136-
<UiTargetButton
137-
label="WEB"
138-
on_click={props.on_chatbots_click}
139-
is_compact
140-
hover_color={props.web_prompt_type === 'edit' ? 'blue' : 'purple'}
141-
keycap_char={is_alt_pressed ? '1' : undefined}
142-
/>
143-
<UiTargetButton
144-
label="API"
145-
on_click={props.on_api_calls_click}
146-
is_compact
147-
hover_color={props.api_prompt_type === 'edit' ? 'blue' : 'purple'}
148-
keycap_char={is_alt_pressed ? '2' : undefined}
149-
/>
150-
<UiTargetButton
151-
label="CLI"
152-
on_click={props.on_cli_calls_click}
153-
is_compact
154-
hover_color={props.cli_prompt_type === 'edit' ? 'blue' : 'purple'}
155-
keycap_char={is_alt_pressed ? '3' : undefined}
156-
/>
184+
{ordered_target_items.map((item) => (
185+
<UiTargetButton
186+
key={item.id}
187+
label={item.label}
188+
on_click={item.on_click}
189+
is_compact
190+
hover_color={item.hover_color}
191+
keycap_char={item.keycap_char}
192+
/>
193+
))}
157194
</div>
158195
</div>
159196
)
@@ -208,30 +245,9 @@ export const Home: React.FC<Props> = (props) => {
208245

209246
const targets_section = (
210247
<div className={styles.inner__target} ref={target_ref}>
211-
<UiTargetButton
212-
label="WEB"
213-
description={
214-
props.is_connected
215-
? t('home.target.web.description-connected')
216-
: t('home.target.web.description')
217-
}
218-
on_click={props.on_chatbots_click}
219-
hover_color={props.web_prompt_type === 'edit' ? 'blue' : 'purple'}
220-
keycap_char={is_alt_pressed ? '1' : undefined}
221-
/>
222-
<UiTargetButton
223-
label="API"
224-
description={t('home.target.api.description')}
225-
on_click={props.on_api_calls_click}
226-
hover_color={props.api_prompt_type === 'edit' ? 'blue' : 'purple'}
227-
keycap_char={is_alt_pressed ? '2' : undefined}
228-
/>
229-
<UiTargetButton
230-
label="CLI"
231-
description={t('home.target.cli.description')}
232-
on_click={props.on_cli_calls_click}
233-
hover_color={props.cli_prompt_type === 'edit' ? 'blue' : 'purple'}
234-
keycap_char={is_alt_pressed ? '3' : undefined}
248+
<UiTargetButtons
249+
items={ordered_target_items}
250+
on_reorder={props.on_targets_reorder}
235251
/>
236252
</div>
237253
)

‎apps/editor/src/views/prompt/frontend/Home/hooks/use-keyboard-shortcuts.ts‎

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import { useEffect } from 'react'
22
import { use_alt_pressed } from '@/views/prompt/frontend/hooks/use-alt-pressed'
3+
import { Target } from '@shared/types/target'
34

45
export const use_keyboard_shortcuts = (params: {
56
is_active: boolean
7+
targets_order: Target[]
68
on_chatbots_click: () => void
79
on_api_calls_click: () => void
810
on_cli_calls_click: () => void
@@ -22,15 +24,28 @@ export const use_keyboard_shortcuts = (params: {
2224
!event.metaKey &&
2325
!event.ctrlKey
2426
) {
25-
if (event.code === 'Digit1' || event.code === 'Numpad1') {
27+
const get_click_handler = (index: number) => {
28+
const target = params.targets_order[index]
29+
if (target === 'WEB') return params.on_chatbots_click
30+
if (target === 'API') return params.on_api_calls_click
31+
if (target === 'CLI') return params.on_cli_calls_click
32+
}
33+
34+
const handle_shortcut = (index: number) => {
2635
event.preventDefault()
27-
params.on_chatbots_click()
36+
pressed_keys_ref.current.forEach((code) => {
37+
window.dispatchEvent(new KeyboardEvent('keyup', { code }))
38+
})
39+
pressed_keys_ref.current.clear()
40+
get_click_handler(index)?.()
41+
}
42+
43+
if (event.code === 'Digit1' || event.code === 'Numpad1') {
44+
handle_shortcut(0)
2845
} else if (event.code === 'Digit2' || event.code === 'Numpad2') {
29-
event.preventDefault()
30-
params.on_api_calls_click()
46+
handle_shortcut(1)
3147
} else if (event.code === 'Digit3' || event.code === 'Numpad3') {
32-
event.preventDefault()
33-
params.on_cli_calls_click()
48+
handle_shortcut(2)
3449
}
3550
}
3651
}
@@ -40,10 +55,18 @@ export const use_keyboard_shortcuts = (params: {
4055
return () => window.removeEventListener('keydown', handle_key_down)
4156
}, [
4257
params.is_active,
58+
params.targets_order,
4359
params.on_chatbots_click,
4460
params.on_api_calls_click,
4561
params.on_cli_calls_click
4662
])
4763

48-
return { is_alt_pressed }
64+
const clear_keys = () => {
65+
pressed_keys_ref.current.forEach((code) => {
66+
window.dispatchEvent(new KeyboardEvent('keyup', { code }))
67+
})
68+
pressed_keys_ref.current.clear()
69+
}
70+
71+
return { is_alt_pressed, clear_keys }
4972
}

‎apps/editor/src/views/prompt/frontend/Main/Main.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ type Props = {
9191
on_skill_click?: (agent: string, repo: string, skill_name: string) => void
9292
on_agentic_search: () => void
9393
has_update?: boolean
94+
targets_order: Target[]
9495
}
9596

9697
export const Main: React.FC<Props> = (props) => {
@@ -760,6 +761,7 @@ export const Main: React.FC<Props> = (props) => {
760761
on_task_completed={handle_task_completed}
761762
on_clear_completed_tasks={handle_clear_completed_tasks}
762763
has_update={props.has_update}
764+
targets_order={props.targets_order}
763765
/>
764766
)
765767
}

‎apps/editor/src/views/prompt/frontend/Main/MainView/MainView.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ type Props = {
155155
on_task_completed: () => void
156156
on_clear_completed_tasks: () => void
157157
has_update?: boolean
158+
targets_order: Target[]
158159
}
159160

160161
const chatbot_to_icon: Record<keyof typeof CHATBOTS, Icon.Variant> = {
@@ -529,6 +530,7 @@ export const MainView: React.FC<Props> = (props) => {
529530
are_keyboard_shortcuts_disabled={
530531
props.are_keyboard_shortcuts_disabled
531532
}
533+
targets_order={props.targets_order}
532534
completed_tasks={is_edit_prompt_type ? props.completed_tasks : []}
533535
on_task_completed={
534536
is_edit_prompt_type ? props.on_task_completed : undefined

‎apps/editor/src/views/prompt/frontend/Prompt.tsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ export const Prompt = () => {
8787
handle_commit_click,
8888
handle_skill_click,
8989
handle_agentic_search,
90-
update_info
90+
update_info,
91+
targets_order,
92+
handle_targets_reorder
9193
} = use_panel(vscode)
9294

9395
const {
@@ -399,6 +401,7 @@ export const Prompt = () => {
399401
on_commit_click={handle_commit_click}
400402
on_skill_click={handle_skill_click}
401403
on_agentic_search={handle_agentic_search}
404+
targets_order={targets_order}
402405
/>
403406
</div>
404407
<div
@@ -410,6 +413,8 @@ export const Prompt = () => {
410413
vscode={vscode}
411414
is_active={active_view === 'home'}
412415
is_connected={is_connected}
416+
targets_order={targets_order}
417+
on_targets_reorder={handle_targets_reorder}
413418
web_prompt_type={web_prompt_type}
414419
api_prompt_type={api_prompt_type}
415420
cli_prompt_type={cli_prompt_type}

0 commit comments

Comments
 (0)