Skip to content

Commit 7be99a8

Browse files
committed
Refactor API manager to support multiple concurrent requests with individual progress tracking and cancellation
1 parent 7de4c81 commit 7be99a8

18 files changed

Lines changed: 591 additions & 202 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Context-first AI coding for VS Code, Cursor, and others. Free, open-source, and
99
- Chatbots—_ChatGPT, Claude, Gemini, Grok, DeepSeek, etc._
1010
- Model providers—_Gemini API, OpenRouter, local Ollama, etc._
1111

12-
✅ **Apply responses**—changes integration in whole, truncated, compared and diff edit formats \
12+
✅ **Apply responses**—changes integration in _whole_, _truncated_, _before/after_ and _diff_ edit formats \
1313
✅ **Fully featured**—code completions, commit messages, checkpoints, and more \
1414
🏠️ **Local friendly**—easy on small models thanks to zero tool calling
1515

‎packages/ui/.storybook/preview.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import '@vscode/codicons/dist/codicon.css'
2+
import 'simplebar-react/dist/simplebar.min.css'
23
import '../src/styles/global.scss'
34
import './variables.css'
45

‎packages/ui/src/components/editor/panel/PromptField/PromptField.module.scss‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,7 @@
237237

238238
.footer {
239239
display: flex;
240-
bottom: 0;
241-
right: 0;
240+
gap: 4px;
242241
padding: 6px 10px 6px 6px;
243242
justify-content: space-between;
244243
position: relative;
@@ -272,15 +271,17 @@
272271
}
273272

274273
&__right {
275-
flex-shrink: 0;
274+
flex: 1;
276275
display: flex;
277276
align-items: center;
278277
gap: 10px;
279278
pointer-events: none;
280279

281280
&__edit-format {
281+
flex: 1;
282282
display: flex;
283283
align-items: center;
284+
justify-content: flex-end;
284285
gap: 4px;
285286

286287
&__button {

‎packages/ui/src/components/editor/panel/PromptField/PromptField.tsx‎

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { use_dropdown } from './hooks/use-dropdown'
88
import { use_ghost_text } from './hooks/use-ghost-text'
99
import { use_drag_drop } from './hooks/use-drag-drop'
1010
import { use_keyboard_shortcuts } from './hooks/use-keyboard-shortcuts'
11+
import { use_edit_format_compacting } from './hooks/use-edit-format-compacting'
1112
import { DropdownMenu } from '../../common/DropdownMenu'
1213
import { use_is_narrow_viewport, use_is_mac } from '@shared/hooks'
1314
import {
@@ -252,6 +253,15 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
252253
}
253254
}, [is_mac])
254255

256+
const {
257+
container_ref,
258+
compact_step,
259+
format_whole_ref,
260+
format_truncated_ref,
261+
format_before_after_ref,
262+
format_diff_ref
263+
} = use_edit_format_compacting()
264+
255265
return (
256266
<div className={styles.container}>
257267
{props.has_active_selection && props.is_in_code_completions_mode && (
@@ -386,21 +396,37 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
386396
}}
387397
>
388398
{props.show_edit_format_selector && (
389-
<div className={styles['footer__right__edit-format']}>
399+
<div
400+
className={styles['footer__right__edit-format']}
401+
ref={container_ref}
402+
>
390403
{(['whole', 'truncated', 'before-after', 'diff'] as const).map(
391-
(format) => {
392-
const button_text = is_narrow_viewport
404+
(format, index) => {
405+
const is_compact =
406+
(format === 'before-after' && compact_step >= 1) ||
407+
(format === 'truncated' && compact_step >= 2) ||
408+
(format === 'whole' && compact_step >= 3) ||
409+
(format === 'diff' && compact_step >= 4)
410+
411+
const button_text = is_compact
393412
? format == 'before-after'
394-
? 'B/A'
395-
: format.charAt(0).toUpperCase()
413+
? 'b/a'
414+
: format.charAt(0)
396415
: format == 'before-after'
397416
? 'before/after'
398417
: format
399418
const is_selected = props.edit_format == format
400419
const should_underline = is_alt_pressed && !is_selected
401420

421+
let ref = null
422+
if (format === 'whole') ref = format_whole_ref
423+
if (format === 'truncated') ref = format_truncated_ref
424+
if (format === 'before-after') ref = format_before_after_ref
425+
if (format === 'diff') ref = format_diff_ref
426+
402427
return (
403428
<button
429+
ref={ref}
404430
key={format}
405431
className={cn(
406432
styles['footer__right__edit-format__button'],
@@ -417,18 +443,17 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
417443
onMouseEnter={() => set_hovered_edit_format(format)}
418444
onMouseLeave={() => set_hovered_edit_format(null)}
419445
>
420-
{is_narrow_viewport &&
421-
hovered_edit_format == format && (
422-
<Tooltip
423-
message={
424-
format == 'before-after'
425-
? 'Before and After'
426-
: format.charAt(0).toUpperCase() +
427-
format.slice(1)
428-
}
429-
align="center"
430-
/>
431-
)}
446+
{is_compact && hovered_edit_format == format && (
447+
<Tooltip
448+
message={
449+
format == 'before-after'
450+
? 'Before and After'
451+
: format.charAt(0).toUpperCase() +
452+
format.slice(1)
453+
}
454+
align="center"
455+
/>
456+
)}
432457
<span
433458
className={
434459
styles['footer__right__edit-format__button__spacer']
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import { useRef, useLayoutEffect } from 'react'
2+
import { use_compacting } from '@shared/hooks'
3+
4+
export const use_edit_format_compacting = () => {
5+
const { container_ref, compact_step, report_width } = use_compacting(4)
6+
const format_whole_ref = useRef<HTMLButtonElement>(null)
7+
const format_truncated_ref = useRef<HTMLButtonElement>(null)
8+
const format_before_after_ref = useRef<HTMLButtonElement>(null)
9+
const format_diff_ref = useRef<HTMLButtonElement>(null)
10+
11+
useLayoutEffect(() => {
12+
const refs = [
13+
format_whole_ref,
14+
format_truncated_ref,
15+
format_before_after_ref,
16+
format_diff_ref
17+
]
18+
19+
if (refs.every((ref) => ref.current)) {
20+
// Calculate total width of all elements
21+
const total_width = refs.reduce(
22+
(acc, ref) => acc + (ref.current?.offsetWidth || 0),
23+
0
24+
)
25+
// Add gap (4px * 3 gaps)
26+
const width = total_width + 12
27+
28+
report_width(width, compact_step)
29+
}
30+
}, [compact_step, report_width])
31+
32+
return {
33+
container_ref,
34+
compact_step,
35+
format_whole_ref,
36+
format_truncated_ref,
37+
format_before_after_ref,
38+
format_diff_ref
39+
}
40+
}

‎packages/ui/src/components/editor/panel/ResponsePreviewFooter/ResponsePreviewFooter.module.scss‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@
77
}
88
}
99

10-
.button-content {
11-
display: flex;
12-
align-items: center;
13-
justify-content: center;
14-
gap: 4px;
15-
}
16-
1710
.text {
1811
&--hidden {
1912
display: none;

‎packages/ui/src/components/editor/panel/ResponsePreviewFooter/ResponsePreviewFooter.tsx‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { useRef, useLayoutEffect } from 'react'
2-
import cn from 'classnames'
32
import { use_compacting } from '@shared/hooks'
43
import { Button } from '../../common/Button'
54
import styles from './ResponsePreviewFooter.module.scss'
@@ -24,8 +23,8 @@ export const ResponsePreviewFooter: React.FC<Props> = ({
2423

2524
useLayoutEffect(() => {
2625
if (back_ref.current && reject_ref.current && accept_ref.current) {
27-
// Padding (approx 24px per button) + gap (8px * 2)
28-
const padding_and_gap = 3 * 24 + 2 * 8
26+
// Padding & icon (approx 44px per button) + gap (8px * 2)
27+
const padding_and_gap = 3 * 40 + 2 * 8
2928
const width =
3029
back_ref.current.offsetWidth +
3130
reject_ref.current.offsetWidth +
@@ -37,28 +36,29 @@ export const ResponsePreviewFooter: React.FC<Props> = ({
3736

3837
return (
3938
<div className={styles.container} ref={container_ref}>
40-
<Button on_click={on_back} is_secondary title="Back">
41-
<span className={styles['button-content']} ref={back_ref}>
39+
<Button
40+
on_click={on_back}
41+
is_secondary
42+
title="Back"
43+
codicon="chevron-left"
44+
>
45+
<span ref={back_ref}>
4246
{compact_step < 1 && <span className={styles.text}>Back</span>}
43-
{compact_step >= 1 && (
44-
<span className={cn('codicon', 'codicon-chevron-left')} />
45-
)}
4647
</span>
4748
</Button>
48-
<Button on_click={on_reject} is_danger title="Reject">
49-
<span className={styles['button-content']} ref={reject_ref}>
49+
<Button on_click={on_reject} is_danger title="Reject" codicon="close">
50+
<span ref={reject_ref}>
5051
{compact_step < 2 && <span className={styles.text}>Reject</span>}
51-
{compact_step >= 2 && (
52-
<span className={cn('codicon', 'codicon-close')} />
53-
)}
5452
</span>
5553
</Button>
56-
<Button on_click={on_accept} disabled={is_accept_disabled} title="Accept">
57-
<span className={styles['button-content']} ref={accept_ref}>
54+
<Button
55+
on_click={on_accept}
56+
disabled={is_accept_disabled}
57+
title="Accept"
58+
codicon="check"
59+
>
60+
<span ref={accept_ref}>
5861
{compact_step < 3 && <span className={styles.text}>Accept</span>}
59-
{compact_step >= 3 && (
60-
<span className={cn('codicon', 'codicon-check')} />
61-
)}
6262
</span>
6363
</Button>
6464
</div>

‎packages/ui/src/components/editor/panel/Scrollable/Scrollable.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ type Props = {
1616
max_height?: string
1717
initial_scroll_top?: number
1818
on_scroll?: (top: number) => void
19+
on_scrolled_change?: (is_scrolled: boolean) => void
1920
scroll_trigger?: number
2021
}
2122

@@ -46,8 +47,10 @@ export const Scrollable = forwardRef<any, Props>((props, ref) => {
4647
const update = () => {
4748
const { scrollTop, scrollHeight, clientHeight } = scroll_element
4849
const is_scrollable = scrollHeight > clientHeight
49-
set_has_top_shadow(is_scrollable && scrollTop > 0)
50+
const is_scrolled = is_scrollable && scrollTop > 0
51+
set_has_top_shadow(is_scrolled)
5052
if (props.on_scroll) props.on_scroll(scrollTop)
53+
if (props.on_scrolled_change) props.on_scrolled_change(is_scrolled)
5154
}
5255

5356
update()
@@ -64,7 +67,7 @@ export const Scrollable = forwardRef<any, Props>((props, ref) => {
6467
scroll_element.removeEventListener('scroll', update)
6568
resize_observer.disconnect()
6669
}
67-
}, [props.on_scroll])
70+
}, [props.on_scroll, props.on_scrolled_change])
6871

6972
useEffect(() => {
7073
const simplebar_instance = simplebar_ref.current

0 commit comments

Comments
 (0)