Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Model selection #172

Merged
merged 80 commits into from
Dec 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
4ea1bfa
add structure for re-adding autocomplete
mathewpareles Nov 22, 2024
4842640
Re-added autocomplete
mathewpareles Nov 26, 2024
ef9ac7a
Merge branch 'main' into re-add-autocomplete
mathewpareles Nov 27, 2024
a6cf723
Fix space issue
mathewpareles Nov 27, 2024
f9198d4
Remove accepted autocomplete characters
mathewpareles Dec 5, 2024
48f9ac2
Minor changes
mathewpareles Dec 5, 2024
389efb4
fix scroll
andrewpareles Dec 5, 2024
411167e
Merge remote-tracking branch 'origin/main' into ui-improvements
andrewpareles Dec 5, 2024
e169275
ui improvements - abort fix
andrewpareles Dec 5, 2024
0855376
update message display
andrewpareles Dec 5, 2024
d29eca4
fix 0
andrewpareles Dec 5, 2024
7cfd9e5
better msg display
andrewpareles Dec 5, 2024
86294c6
fix copy
andrewpareles Dec 5, 2024
18e3f19
inputbox ref is now an internal widget (and works better!)
andrewpareles Dec 5, 2024
a647530
add native input selection in settings
andrewpareles Dec 5, 2024
695d6a1
Disable autocomplete
mathewpareles Dec 6, 2024
a52eba9
react updates
andrewpareles Dec 6, 2024
8e4f943
move node to electron-main, leaving react stuff in contrib/
andrewpareles Dec 6, 2024
1f692ff
update contributing
andrewpareles Dec 6, 2024
2148fe7
forgot to remove these
andrewpareles Dec 6, 2024
4ba00f6
scope-tailwind doc
andrewpareles Dec 6, 2024
0524164
comment grep + _uiConfig change
mathewpareles Dec 7, 2024
02112fb
allow selection by feature + provider (incomplete)
mathewpareles Dec 7, 2024
0f920fb
remove void Widget inputs for now
andrewpareles Dec 8, 2024
298adac
fix input box
andrewpareles Dec 9, 2024
77fc2d2
temp
andrewpareles Dec 9, 2024
e5ac36f
add new config type for each feature, UI dump
andrewpareles Dec 9, 2024
252af4c
build script
mathewpareles Dec 10, 2024
582b25d
build works
andrewpareles Dec 10, 2024
55884ed
checkbox
andrewpareles Dec 10, 2024
8a95b13
minor changes
andrewpareles Dec 10, 2024
f7c9d73
update type info
andrewpareles Dec 10, 2024
d8b6b3c
Merge branch 're-add-autocomplete' into model-seln-2
andrewpareles Dec 10, 2024
0db0513
finish merge errors
andrewpareles Dec 10, 2024
7f776ee
minor key
andrewpareles Dec 10, 2024
62e1657
change config key + merge
mathewpareles Dec 10, 2024
8b90d78
un-delete void channels
andrewpareles Dec 10, 2024
adb504f
reactify Widget
andrewpareles Dec 10, 2024
66037e2
update init state properly
andrewpareles Dec 10, 2024
f20f41c
minor 'true' update
andrewpareles Dec 10, 2024
24fdb1c
minor changes
mathewpareles Dec 11, 2024
72deba4
consistent error messages
andrewpareles Dec 11, 2024
fb263f9
update contrib for bundling
andrewpareles Dec 11, 2024
a1ff458
add deps and remove devDeps
andrewpareles Dec 11, 2024
b22bbf9
add not recommended line
andrewpareles Dec 11, 2024
49b4382
state - pick a provider/model
andrewpareles Dec 11, 2024
bb4f99f
error state, sendLLMMessage fix, continue adding state for provider/m…
andrewpareles Dec 11, 2024
f84c964
finished model selection
andrewpareles Dec 11, 2024
cb2de55
fix
andrewpareles Dec 11, 2024
a28194c
add sync state for dropdown
andrewpareles Dec 11, 2024
522f136
license comment
andrewpareles Dec 11, 2024
6ddf977
select box style
andrewpareles Dec 11, 2024
dbef72c
update scope-tailwind to support -pr-5
andrewpareles Dec 11, 2024
42a2dec
minor welcome changes
andrewpareles Dec 11, 2024
d175ac2
try dropdownmenu; didn't work
andrewpareles Dec 11, 2024
62cdaba
npm run react
andrewpareles Dec 11, 2024
07fcb3a
better model seln UI + error handling works much better!
andrewpareles Dec 12, 2024
051f8f3
Sidebar restructure
mathewpareles Dec 12, 2024
901579a
Merge remote-tracking branch 'origin/model-selection' into model-seln-2
mathewpareles Dec 12, 2024
19737d4
minor display change
andrewpareles Dec 12, 2024
9e58396
visual improvements
andrewpareles Dec 12, 2024
d809839
add dummy models
andrewpareles Dec 12, 2024
aaab289
native tailwind colors
mathewpareles Dec 12, 2024
6703aa1
get ready to sync ollama models
andrewpareles Dec 12, 2024
df23314
add css to useful links
andrewpareles Dec 12, 2024
5807c94
tailwind
andrewpareles Dec 12, 2024
2f26b34
remove connect-src * that was introduced in testing
andrewpareles Dec 13, 2024
9d6eb62
revert accidental change
andrewpareles Dec 13, 2024
c86f477
update links
andrewpareles Dec 13, 2024
abc7151
Merge branch 'model-seln-2' into model-selection
mathewpareles Dec 13, 2024
696abc3
add ollama model fetcher, but proxy ignores its functions
andrewpareles Dec 13, 2024
94f4d2c
add ollamaList to llmMessageService
andrewpareles Dec 13, 2024
1365400
llmMessageService now multiplexes between sendLLMMessage, ollama, etc
andrewpareles Dec 13, 2024
e2d39fe
ollama refreshes!
andrewpareles Dec 13, 2024
5dad4c8
relevant ollama update vals
andrewpareles Dec 13, 2024
9b427c7
fix react state sync bug
andrewpareles Dec 13, 2024
3991372
misc improvements
andrewpareles Dec 15, 2024
829d828
rename Secondary Side Bar to Void Side Bar
andrewpareles Dec 15, 2024
bda6ad0
Merge branch 'main' into model-selection
andrewpareles Dec 15, 2024
63b086b
dummy commit
andrewpareles Dec 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ There are a few ways to contribute:

Please follow the steps below to build the IDE. If you have any questions, feel free to [submit an issue](https://github.com/voideditor/void/issues/new) with any build errors, or refer to VSCode's full [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute) page.

Most of Void's code lives in `src/vs/workbench/contrib/void/browser/` and `src/vs/platform/void/`.

### a. Build Prerequisites - Mac

Expand Down Expand Up @@ -69,7 +70,7 @@ If you ran `npm run watch`, the build is done when you see something like this:

<!-- 3. Press <kbd>Ctrl+Shift+B</kbd> to start the build process. -->

4. In a new terminal, run `./scripts/code.sh` (Mac/Linux) or `./scripts/code.bat` (Windows). This should open up the built IDE!
4. In a new terminal, run `./scripts/code.sh` (Mac/Linux) or `./scripts/code.bat` (Windows). This should open up the built IDE.
You can always press <kbd>Ctrl+Shift+P</kbd> and run "Reload Window" inside the new window to see changes without re-building.

Now that you're set up, feel free to check out our [Issues](https://github.com/voideditor/void/issues) page.
Expand All @@ -83,33 +84,32 @@ Now that you're set up, feel free to check out our [Issues](https://github.com/v

## Bundling

To bundle the IDE into an executable, run `npm run gulp vscode-darwin-arm64`.
We don't usually recommend bundling. Instead, you should probably just build (above). If you're sure you want to bundle Void into an executable app, run one of the following commands. This will create a folder named `VSCode-darwin-arm64` (or similar) in the repo's parent's directory. Be patient - compiling can take ~25 minutes.

Here are the full options: `vscode-{win32-ia32 | win32-x64 | darwin-x64 | darwin-arm64 | linux-ia32 | linux-x64 | linux-arm}(-min)`
### Mac
- `npm run gulp vscode-darwin-arm64` - most common (Apple Silicon)
- `npm run gulp vscode-darwin-x64` (Intel)

### Windows
- `npm run gulp vscode-win32-x64` - most common
- `npm run gulp vscode-win32-ia32`

## Roadmap

Here are the most important topics on our Roadmap. More ⭐'s = more important. Please refer to our [Issues](https://github.com/voideditor/void/issues) page for the latest issues.

## ⭐⭐⭐ Make History work well.
### Linux
- `npm run gulp vscode-linux-x64` - most common
- `npm run gulp vscode-linux-arm`
- `npm run gulp vscode-linux-ia32`

When the user submits a response or presses the apply/accept/reject button, we should add these events to the history, allowing the user to undo/redo them. Right now there is unexpected behavior if the user tries to undo or redo their changes.
## Roadmap

## ⭐⭐⭐ Build Cursor-style quick edits (Ctrl+K).
Please refer to our [Issues](https://github.com/voideditor/void/issues) page for the latest issues.

When the user presses Ctrl+K, an input box should appear inline with the code that they were selecting. This is somewhat difficult to do because an extension alone cannot do this, and it requires creating a new component in the IDE. We think you can modify vscode's built-in "codelens" or "zone widget" components, but we are open to alternatives.

## ⭐⭐⭐ Creative.

Examples: creating better code search, or supporting AI agents that can edit across files and make multiple LLM calls.

Eventually, we want to build a convenient API for creating AI tools. The API will provide methods for creating the UI (showing an autocomplete suggestion, or creating a new diff), detecting event changes (like `onKeystroke` or `onFileOpen`), and modifying the user's file-system (storing indexes associated with each file), making it much easier to make your own AI plugin. We plan on building these features further along in timeline, but we wanted to list them for completeness.

## ⭐ One-stars.

⭐ Let the user Accept / Reject all Diffs in an entire file via the sidebar.

# Guidelines

We're always glad to talk about new ideas, help you get set up, and make sure your changes align with our vision for the project. Feel free to shoot us a message in the #general channel of the [Discord](https://discord.gg/RSNjgaugJs) for any reason. Please check in especially if you want to make a lot of changes or build a large new feature.
Expand Down
12 changes: 8 additions & 4 deletions VOID_USEFUL_LINKS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,22 @@

The Void team put together this list of links to get up and running with VSCode's sourcecode. We hope it's helpful!

## Contributing

- [How VSCode's sourcecode is organized](https://github.com/microsoft/vscode/wiki/Source-Code-Organization) - this explains where the entry point files are, what `browser/` and `common/` mean, etc. This is the most important read on this whole list! We recommend reading the whole thing.

- [Built-in VSCode styles](https://code.visualstudio.com/api/references/theme-color) - CSS variables that are built into VSCode. Use `var(--vscode-{theme but replacing . with -})`. You can also see their [Webview theming guide](https://code.visualstudio.com/api/extension-guides/webview#theming-webview-content).

## Beginners / Getting started

- [VSCode UI guide](https://code.visualstudio.com/docs/getstarted/userinterface) - covers auxbar, panels, etc.

- [UX guide](https://code.visualstudio.com/api/ux-guidelines/overview) - covers Containers, Views, Items, etc.

## Contributing

- [How VSCode's sourcecode is organized](https://github.com/microsoft/vscode/wiki/Source-Code-Organization) - this explains where the entry point files are, what `browser/` and `common/` mean, etc. This is the most important read on this whole list! We recommend reading the whole thing.

## Misc

- [Every command](https://code.visualstudio.com/api/references/commands) built-in to VSCode - sometimes useful to reference.
- [Every command](https://code.visualstudio.com/api/references/commands) built-in to VSCode - not used often, but here for reference.


## VSCode's Extension API
Expand Down
Loading