Skip to content

Commit ebeb661

Browse files
committed
Merge branch 'main' into fix-context-retrieval-issue
2 parents 377e515 + b002317 commit ebeb661

File tree

114 files changed

+2428
-551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+2428
-551
lines changed

.continue/rules/css-units.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
globs: "gui/**/*.tsx"
3+
---
4+
5+
You should try to use the `rem` CSS unit whenever possible for scalability instead of `px`.

.continue/rules/use-effect.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

.github/workflows/cla.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@ jobs:
2626
path-to-signatures: "signatures/version1/cla.json"
2727
path-to-document: "https://github.com/continuedev/continue/blob/main/docs/docs/CLA.md"
2828
branch: cla-signatures
29-
allowlist: dependabot[bot]
29+
# Bots and CLAs signed outside of GitHub
30+
allowlist: dependabot[bot],fbricon,panyamkeerthana,Jazzcort,owtaylor,halfline
3031
signed-commit-message: "CLA signed in $pullRequestNo"

.github/workflows/jetbrains-release.yaml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -167,20 +167,8 @@ jobs:
167167
path: gui/node_modules
168168
key: ${{ runner.os }}-node-${{ hashFiles('gui/package-lock.json') }}
169169

170-
- uses: actions/cache@v4
171-
id: config-yaml-cache
172-
with:
173-
path: packages/config-yaml/node_modules
174-
key: ${{ runner.os }}-config-yaml-node-modules-${{ hashFiles('packages/config-yaml/package-lock.json') }}
175-
176-
- name: Build and check config-yaml
177-
run: |
178-
cd ../../packages/config-yaml
179-
npm i
180-
npx tsc --noEmit
181-
# Tests are currently failing, commenting out for now
182-
# npm test
183-
npm run build
170+
- name: Build packages (Unix)
171+
run: ./scripts/build-packages.sh
184172

185173
# npm install core
186174
- name: Install core node_modules

.vscode/launch.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"pauseForSourceMap": false,
2020
"outFiles": ["${workspaceFolder}/extensions/vscode/out/extension.js"],
2121
"preLaunchTask": "vscode-extension:build",
22+
"postDebugTask": "Terminate All Tasks",
2223
"env": {
2324
// "CONTROL_PLANE_ENV": "local",
2425
"CONTINUE_GLOBAL_DIR": "${workspaceFolder}/extensions/.continue-debug"

.vscode/tasks.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,19 @@
223223
],
224224
"type": "shell",
225225
"problemMatcher": []
226+
},
227+
{
228+
"label": "Terminate All Tasks",
229+
"command": "${input:terminate}",
230+
"type": "shell"
231+
}
232+
],
233+
"inputs": [
234+
{
235+
"id": "terminate",
236+
"type": "command",
237+
"command": "workbench.action.tasks.terminate",
238+
"args": "terminateAll"
226239
}
227240
]
228241
}

binary/package-lock.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/autocomplete/postprocessing/index.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,14 @@ export function postprocessCompletion({
132132
completion = "\n" + completion;
133133
}
134134

135+
if (
136+
(llm.model.includes("gemini") || llm.model.includes("gemma")) &&
137+
completion.endsWith("<|file_separator|>")
138+
) {
139+
// "<|file_separator|>" is 18 characters long
140+
completion = completion.slice(0, -18);
141+
}
142+
135143
// If prefix ends with space and so does completion, then remove the space from completion
136144

137145
if (prefix.endsWith(" ") && completion.startsWith(" ")) {

core/config/load.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ import {
6262
} from "../util/paths";
6363
import { localPathToUri } from "../util/pathToUri";
6464

65-
import { baseToolDefinitions } from "../tools";
65+
import { getToolsForIde } from "../tools";
6666
import { resolveRelativePathInDir } from "../util/ideUtils";
6767
import { modifyAnyConfigWithSharedConfig } from "./sharedConfig";
6868
import {
@@ -525,7 +525,7 @@ async function intermediateToFinalConfig({
525525
const continueConfig: ContinueConfig = {
526526
...config,
527527
contextProviders,
528-
tools: [...baseToolDefinitions],
528+
tools: await getToolsForIde(ide),
529529
mcpServerStatuses: [],
530530
slashCommands: [],
531531
modelsByRole: {

core/config/markdown/loadCodebaseRules.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export async function loadCodebaseRules(ide: IDE): Promise<{
3333
const content = await ide.readFile(filePath);
3434
const rule = markdownToRule(content, { uriType: "file", filePath });
3535

36-
rules.push({ ...rule, source: "rules-block" });
36+
rules.push({ ...rule, source: "rules-block", ruleFile: filePath });
3737
} catch (e) {
3838
errors.push({
3939
fatal: false,

0 commit comments

Comments
 (0)