Skip to content

Commit 01b9936

Browse files
MarcMcIntoshalashchev17reymondzzzzoxyplayolegklimov
authored
Dev (#182)
* chore(hidden features): add defaults to initail state. * feat(knowledge): add workspace to initial state and event handler for changing workspace. * chore(hcat-js): bump to `v2.0.6-alpha.0` for knowledge. * chore(chat): version "~v2.0.6-alpha.1, type export fixes * chore(new patches): remove code no longer used by chat * feat: handle tool edit results from chat. * refactor(patch actions): remove `ideCreateNewFile.match(e)`. * fix(chat): thread type update. * chore: bump chat to `v2.0.8-alpha.2` for new patch actions. * Version bump 190225 (#189) * 6.1.1 * 6.1.2 * 6.1.3 * fix workflow for refact repo * readme update * sublist * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update package.json * Update README.md * Update README.md * Update package.json * version bump 6.1.4 & [email protected] --------- Co-authored-by: Kirill Starkov <[email protected]> Co-authored-by: oxyplay <[email protected]> * chore: version bump 6.1.5 * Apply accept reject (#191) * feat(chat): send events back to chat when accepting changes in the ide. * fix(chat ide tool call): pass chatId ide back to chat when done. * refactor(tool edit): remove chat id from the payload. * Revert "refactor(tool edit): remove chat id from the payload." This reverts commit 8defbcf. Changes to be committed: modified: src/sidebar.ts * diff: save on accept. * [email protected] version bump --------- Co-authored-by: alashchev17 <[email protected]> Co-authored-by: Andrii Lashchov <[email protected]> * 6.1.6 * 6.1.7 * 6.1.8 * 6.1.9 * fix gh release flow * cicd: use refact repo chat artifacts instead npm * 6.1.10 * 6.1.11 * 6.1.12 * 6.1.13 * 6.1.14 * 6.1.15 * Version bump/6.1.16 (#197) * version bump 6.1.16 * 6.1.17 * 6.1.18 * 6.1.19 * 6.1.20 * feat: keep indent for selected snippet. * chore: remove console.log. * remove knowledge flag. * 6.2.1 * 6.2.2 * 6.2.3 version bump * feat: knowledge option * chore: version bump 6.2.4 * chore: version bump 6.2.5 * 6.2.6 * chore: version bump 6.2.7 * chore: version bump 6.2.8 * chore: version bump 6.3.0 --------- Co-authored-by: Andrii Lashchov <[email protected]> Co-authored-by: Kirill Starkov <[email protected]> Co-authored-by: oxyplay <[email protected]> Co-authored-by: alashchev17 <[email protected]> Co-authored-by: Oleg Klimov <[email protected]>
1 parent 3a0ea2d commit 01b9936

File tree

6 files changed

+155
-125
lines changed

6 files changed

+155
-125
lines changed

.github/workflows/build.yml

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ on:
1111
lsp_branch:
1212
description: "Branch name of lsp"
1313
default: "main"
14+
chat_js_branch:
15+
description: "Branch name of chat-js"
16+
default: "main"
1417

1518
jobs:
1619
dist:
@@ -57,8 +60,8 @@ jobs:
5760
with:
5861
fetch-depth: ${{ env.FETCH_DEPTH }}
5962

60-
- name: Download artifact
61-
id: download-artifact
63+
- name: Download lsp artifacts
64+
id: download-artifact-lsp
6265
uses: dawidd6/action-download-artifact@v3
6366
with:
6467
github_token: ${{secrets.GITHUB_TOKEN}}
@@ -67,13 +70,34 @@ jobs:
6770
branch: ${{ inputs.lsp_branch }}
6871
path: ./assets
6972
name: dist-${{ matrix.target }}
73+
74+
- name: Download chat artifacts
75+
id: download-artifact-chat
76+
uses: dawidd6/action-download-artifact@v9
77+
with:
78+
github_token: ${{secrets.GITHUB_TOKEN}}
79+
workflow: agent_gui_build.yml
80+
repo: smallcloudai/refact
81+
branch: ${{ inputs.chat_js_branch }}
82+
path: ./chat_package
83+
name: lts-refact-chat-js-.*\.tgz
84+
name_is_regexp: true
85+
86+
- name: Prepare chat package
87+
shell: bash
88+
run: |
89+
mkdir -p ./chat_package_fixed
90+
find ./chat_package -name "*.tgz" -type f -exec cp {} ./chat_package_fixed/ \;
91+
ls -la ./chat_package_fixed
7092
7193
- name: Install VSCE
94+
shell: bash
7295
run: |
73-
npm install
96+
npm install ./chat_package_fixed/*.tgz
7497
npm install -g @vscode/vsce
98+
rm -rf ./chat_package ./chat_package_fixed
7599
76-
- name: Pakckage VSCE extension
100+
- name: Package VSCE extension
77101
run: |
78102
chmod +x ./assets/refact-lsp*
79103
vsce package --target ${{ matrix.code-target }}

.github/workflows/publish.yml

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
lsp_branch:
77
description: "Branch name of lsp"
88
default: "main"
9+
chat_js_branch:
10+
description: "Branch name of chat-js"
11+
default: "main"
912
stable_release:
1013
description: "Publish stable release version"
1114
default: false
@@ -56,13 +59,8 @@ jobs:
5659
with:
5760
fetch-depth: ${{ env.FETCH_DEPTH }}
5861

59-
- name: Install VSCE
60-
run: |
61-
npm install
62-
npm install -g @vscode/vsce
63-
64-
- name: Download artifact
65-
id: download-artifact
62+
- name: Download lsp artifacts
63+
id: download-artifact-lsp
6664
uses: dawidd6/action-download-artifact@v3
6765
with:
6866
github_token: ${{secrets.GITHUB_TOKEN}}
@@ -71,6 +69,32 @@ jobs:
7169
branch: ${{ inputs.lsp_branch }}
7270
path: ./assets
7371
name: dist-${{ matrix.target }}
72+
73+
- name: Download chat artifacts
74+
id: download-artifact-chat
75+
uses: dawidd6/action-download-artifact@v9
76+
with:
77+
github_token: ${{secrets.GITHUB_TOKEN}}
78+
workflow: agent_gui_build.yml
79+
repo: smallcloudai/refact
80+
branch: ${{ inputs.chat_js_branch }}
81+
path: ./chat_package
82+
name: lts-refact-chat-js-.*\.tgz
83+
name_is_regexp: true
84+
85+
- name: Prepare chat package
86+
shell: bash
87+
run: |
88+
mkdir -p ./chat_package_fixed
89+
find ./chat_package -name "*.tgz" -type f -exec cp {} ./chat_package_fixed/ \;
90+
ls -la ./chat_package_fixed
91+
92+
- name: Install VSCE
93+
shell: bash
94+
run: |
95+
npm install ./chat_package_fixed/*.tgz
96+
npm install -g @vscode/vsce
97+
rm -rf ./chat_package ./chat_package_fixed
7498
7599
- name: Package VSCE extension
76100
shell: bash
@@ -97,6 +121,7 @@ jobs:
97121
prerelease: ${{ !inputs.stable_release }}
98122
tag: v${{ steps.get_version.outputs.version }} # Use the version from previous step with 'v' prefix
99123
overwrite: true
124+
target_commit: ${{ github.sha }}
100125
file_glob: true
101126

102127
- name: Publish VSCE extension

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"url": "https://github.com/smallcloudai/refact-vscode/issues",
1919
"email": "[email protected]"
2020
},
21-
"version": "6.1.3",
21+
"version": "6.3.0",
2222
"dependencies": {
2323
"@types/marked": "^4.0.8",
2424
"@types/vscode": "^1.69.0",
@@ -27,7 +27,7 @@
2727
"fetch-h2": "^3.0.2",
2828
"json5": "^2.2.3",
2929
"marked": "^4.0.8",
30-
"refact-chat-js": "~v2.0.7",
30+
"refact-chat-js": "^2.0.10-alpha.2",
3131
"uuid": "^9.0.1",
3232
"vscode-languageclient": "^7.0.0"
3333
},

src/extension.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ async function pressed_escape()
8989
}
9090
if (editor) {
9191
let state = estate.state_of_editor(editor, "pressed_escape");
92+
global.side_panel?.toolEditChange(editor.document.uri.fsPath, false);
9293
if (state) {
9394
state.diff_lens_pos = Number.MAX_SAFE_INTEGER;
9495
state.completion_lens_pos = Number.MAX_SAFE_INTEGER;

src/interactiveDiff.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,8 @@ export async function like_and_accept(editor: vscode.TextEditor)
589589
// dataCollection.data_feedback_candidate_reset(state);
590590
});
591591
await thenable;
592+
global.side_panel?.toolEditChange(editor.document.uri.fsPath, true);
593+
await editor.document.save();
592594
}
593595

594596

0 commit comments

Comments
 (0)