Skip to content

Commit 540ac78

Browse files
committed
Merge branch 'main' of https://github.com/continuedev/continue into dallin/fix-yolo-mode-apply
2 parents fcd1ec7 + db3b757 commit 540ac78

Some content is hidden

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

60 files changed

+1566
-611
lines changed

.github/workflows/cli-pr-checks.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ jobs:
2525
cache: "npm"
2626
cache-dependency-path: extensions/cli/package-lock.json
2727

28+
- name: Setup packages
29+
uses: ./.github/actions/setup-packages
30+
- name: Setup core component
31+
uses: ./.github/actions/setup-component
32+
with:
33+
component: core
34+
include-root: true
35+
2836
- name: Install dependencies
2937
run: |
3038
cd extensions/cli
@@ -53,6 +61,14 @@ jobs:
5361
cache: "npm"
5462
cache-dependency-path: extensions/cli/package-lock.json
5563

64+
- name: Setup packages
65+
uses: ./.github/actions/setup-packages
66+
- name: Setup core component
67+
uses: ./.github/actions/setup-component
68+
with:
69+
component: core
70+
include-root: true
71+
5672
- name: Install dependencies
5773
run: |
5874
cd extensions/cli

.github/workflows/jetbrains-release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120

121121
# # Set up Java environment for the next steps
122122
- name: Setup Java
123-
uses: actions/setup-java@v4
123+
uses: actions/setup-java@v5
124124
with:
125125
distribution: zulu
126126
java-version: 17
@@ -433,7 +433,7 @@ jobs:
433433

434434
# Set up Java environment for the next steps
435435
- name: Setup Java
436-
uses: actions/setup-java@v4
436+
uses: actions/setup-java@v5
437437
with:
438438
distribution: zulu
439439
java-version: 17
@@ -486,7 +486,7 @@ jobs:
486486

487487
# Set up Java environment for the next steps
488488
- name: Setup Java
489-
uses: actions/setup-java@v4
489+
uses: actions/setup-java@v5
490490
with:
491491
distribution: zulu
492492
java-version: 17
@@ -517,7 +517,7 @@ jobs:
517517

518518
# Set up Java environment for the next steps
519519
- name: Setup Java
520-
uses: actions/setup-java@v4
520+
uses: actions/setup-java@v5
521521
with:
522522
distribution: zulu
523523
java-version: 17

.github/workflows/stable-release.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ jobs:
6767
- name: Find beta version to promote
6868
if: ${{ (inputs.release_type || 'promote-beta') == 'promote-beta' }}
6969
id: find_beta
70+
working-directory: extensions/cli
7071
env:
7172
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
7273
run: |
@@ -116,6 +117,7 @@ jobs:
116117
117118
- name: Download and verify beta package
118119
if: ${{ (inputs.release_type || 'promote-beta') == 'promote-beta' }}
120+
working-directory: extensions/cli
119121
env:
120122
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
121123
run: |
@@ -131,6 +133,7 @@ jobs:
131133
132134
- name: Prepare package for beta promotion
133135
if: ${{ (inputs.release_type || 'promote-beta') == 'promote-beta' }}
136+
working-directory: extensions/cli
134137
run: |
135138
# Copy the beta package contents
136139
cp -r package/* .
@@ -140,6 +143,7 @@ jobs:
140143
141144
- name: Prepare package for direct stable release
142145
if: ${{ inputs.release_type == 'direct-stable' }}
146+
working-directory: extensions/cli
143147
run: |
144148
# Install dependencies for direct build
145149
npm ci
@@ -148,9 +152,11 @@ jobs:
148152
npm version ${{ inputs.stable_version }} --no-git-tag-version
149153
150154
- name: Build (verification step)
155+
working-directory: extensions/cli
151156
run: npm run build
152157

153158
- name: Run tests (verification step)
159+
working-directory: extensions/cli
154160
run: npm test
155161

156162
- name: Set final version
@@ -167,6 +173,7 @@ jobs:
167173
echo "release_notes=$RELEASE_NOTES" >> $GITHUB_OUTPUT
168174
169175
- name: Publish stable to npm
176+
working-directory: extensions/cli
170177
env:
171178
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
172179
run: |
@@ -196,4 +203,4 @@ jobs:
196203
run: |
197204
# Mark the original beta release as superseded
198205
gh release edit "v${{ steps.find_beta.outputs.beta_version }}" \
199-
--notes "This beta version has been promoted to stable as v${{ steps.final_version.outputs.stable_version }}."
206+
--notes "This beta version has been promoted to stable as v${{ steps.final_version.outputs.stable_version }}."

.github/workflows/submit-github-dependency-graph.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Checkout sources
1515
uses: actions/checkout@v5
1616
- name: Setup Java
17-
uses: actions/setup-java@v4
17+
uses: actions/setup-java@v5
1818
with:
1919
distribution: "temurin"
2020
java-version: 17

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
"extensions/vscode/e2e/_output": true,
4343
"extensions/vscode/e2e/storage": true,
4444
"extensions/vscode/e2e/vsix": true,
45-
"extensions/.continue-debug": true
45+
"extensions/.continue-debug": true,
46+
"extensions/cli/dist/**": true
4647
// "sync/**": true
4748
},
4849
"editor.formatOnSave": true,

binary/package-lock.json

Lines changed: 12 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/autocomplete/CompletionProvider.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ import { DEFAULT_AUTOCOMPLETE_OPTS } from "../util/parameters.js";
66
import { shouldCompleteMultiline } from "./classification/shouldCompleteMultiline.js";
77
import { ContextRetrievalService } from "./context/ContextRetrievalService.js";
88

9+
import { isSecurityConcern } from "../indexing/ignore.js";
910
import { BracketMatchingService } from "./filtering/BracketMatchingService.js";
1011
import { CompletionStreamer } from "./generation/CompletionStreamer.js";
1112
import { postprocessCompletion } from "./postprocessing/index.js";
1213
import { shouldPrefilter } from "./prefiltering/index.js";
13-
import { renderPromptWithTokenLimit } from "./templating/index.js";
1414
import { getAllSnippetsWithoutRace } from "./snippets/index.js";
15+
import { renderPromptWithTokenLimit } from "./templating/index.js";
1516
import { GetLspDefinitionsFunction } from "./types.js";
1617
import { AutocompleteDebouncer } from "./util/AutocompleteDebouncer.js";
1718
import { AutocompleteLoggingService } from "./util/AutocompleteLoggingService.js";
@@ -150,6 +151,10 @@ export class CompletionProvider {
150151
return undefined;
151152
}
152153

154+
if (isSecurityConcern(input.filepath)) {
155+
return undefined;
156+
}
157+
153158
const options = await this._getAutocompleteOptions(llm);
154159

155160
// Debounce

core/autocomplete/prefiltering/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { IDE } from "../..";
44
import {
55
getGlobalContinueIgArray,
66
getWorkspaceContinueIgArray,
7-
} from "../../indexing/ignore";
7+
} from "../../indexing/continueignore";
88
import { getConfigJsonPath } from "../../util/paths";
99
import { findUriInDirs } from "../../util/uri";
1010
import { HelperVars } from "../util/HelperVars";

core/commands/slash/built-in-legacy/onboard.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
import ignore from "ignore";
22

33
import type { FileType, IDE, SlashCommand } from "../../..";
4-
import {
5-
DEFAULT_IGNORE,
6-
getGlobalContinueIgArray,
7-
gitIgArrayFromFile,
8-
} from "../../../indexing/ignore";
4+
import { getGlobalContinueIgArray } from "../../../indexing/continueignore";
5+
import { DEFAULT_IGNORE, gitIgArrayFromFile } from "../../../indexing/ignore";
96
import { renderChatMessage } from "../../../util/messageContent";
107
import {
118
findUriInDirs,

core/context/providers/FileContextProvider.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
ContextSubmenuItem,
77
LoadSubmenuItemsArgs,
88
} from "../../";
9+
import { isSecurityConcern } from "../../indexing/ignore";
910
import { walkDirs } from "../../indexing/walkDir";
1011
import {
1112
getShortestUniqueRelativeUriPaths,
@@ -36,6 +37,21 @@ class FileContextProvider extends BaseContextProvider {
3637
await extras.ide.getWorkspaceDirs(),
3738
);
3839

40+
if (isSecurityConcern(relativePathOrBasename)) {
41+
return [
42+
{
43+
description: last2Parts,
44+
content:
45+
"Content redacted, this file cannot be viewed for security reasons",
46+
name: baseName,
47+
uri: {
48+
type: "file",
49+
value: fileUri,
50+
},
51+
},
52+
];
53+
}
54+
3955
return [
4056
{
4157
name: baseName,

0 commit comments

Comments
 (0)