@theia/ai-ide 1.77.0-next.7 → 1.77.0-next.71
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/{project-info-agent.d.ts → agents-md-agent.d.ts} +2 -2
- package/lib/browser/agents-md-agent.d.ts.map +1 -0
- package/lib/browser/{project-info-agent.js → agents-md-agent.js} +16 -15
- package/lib/browser/agents-md-agent.js.map +1 -0
- package/lib/browser/ai-configuration/ai-configuration-label-provider-contribution.js +1 -1
- package/lib/browser/ai-configuration/ai-configuration-label-provider-contribution.js.map +1 -1
- package/lib/browser/ai-configuration/ai-configuration-resource.js +2 -1
- package/lib/browser/ai-configuration/ai-configuration-resource.js.map +1 -1
- package/lib/browser/ai-configuration/ai-configuration-search-widget.js +1 -1
- package/lib/browser/ai-configuration/ai-configuration-search-widget.js.map +1 -1
- package/lib/browser/ai-configuration/categories/agent-capabilities-settings.d.ts +11 -3
- package/lib/browser/ai-configuration/categories/agent-capabilities-settings.d.ts.map +1 -1
- package/lib/browser/ai-configuration/categories/agent-capabilities-settings.js +64 -29
- package/lib/browser/ai-configuration/categories/agent-capabilities-settings.js.map +1 -1
- package/lib/browser/ai-configuration/categories/agent-capabilities-settings.spec.js +480 -1
- package/lib/browser/ai-configuration/categories/agent-capabilities-settings.spec.js.map +1 -1
- package/lib/browser/ai-configuration/categories/agent-detail-model.d.ts +10 -0
- package/lib/browser/ai-configuration/categories/agent-detail-model.d.ts.map +1 -1
- package/lib/browser/ai-configuration/categories/agent-detail-model.js +8 -0
- package/lib/browser/ai-configuration/categories/agent-detail-model.js.map +1 -1
- package/lib/browser/ai-configuration/categories/agent-detail-model.spec.d.ts +2 -0
- package/lib/browser/ai-configuration/categories/agent-detail-model.spec.d.ts.map +1 -0
- package/lib/browser/ai-configuration/categories/agent-detail-model.spec.js +74 -0
- package/lib/browser/ai-configuration/categories/agent-detail-model.spec.js.map +1 -0
- package/lib/browser/ai-configuration/categories/agent-detail-view.d.ts.map +1 -1
- package/lib/browser/ai-configuration/categories/agent-detail-view.js +3 -2
- package/lib/browser/ai-configuration/categories/agent-detail-view.js.map +1 -1
- package/lib/browser/ai-configuration/categories/agents-configuration-category.d.ts +6 -1
- package/lib/browser/ai-configuration/categories/agents-configuration-category.d.ts.map +1 -1
- package/lib/browser/ai-configuration/categories/agents-configuration-category.js +20 -2
- package/lib/browser/ai-configuration/categories/agents-configuration-category.js.map +1 -1
- package/lib/browser/ai-configuration/categories/provider-model-discovery-section.js +5 -4
- package/lib/browser/ai-configuration/categories/provider-model-discovery-section.js.map +1 -1
- package/lib/browser/ai-configuration/categories/provider-model-discovery-section.spec.js +2 -1
- package/lib/browser/ai-configuration/categories/provider-model-discovery-section.spec.js.map +1 -1
- package/lib/browser/ai-configuration/categories/token-usage-configuration-category.js +2 -2
- package/lib/browser/ai-configuration/categories/token-usage-configuration-category.js.map +1 -1
- package/lib/browser/ai-configuration/categories/tools-configuration-category.js +1 -1
- package/lib/browser/ai-configuration/categories/tools-configuration-category.js.map +1 -1
- package/lib/browser/ai-configuration/categories/variables-configuration-category.js +1 -1
- package/lib/browser/ai-configuration/categories/variables-configuration-category.js.map +1 -1
- package/lib/browser/ai-configuration/language-model-renderer.d.ts.map +1 -1
- package/lib/browser/ai-configuration/language-model-renderer.js +8 -15
- package/lib/browser/ai-configuration/language-model-renderer.js.map +1 -1
- package/lib/browser/ai-configuration/language-model-renderer.spec.js +40 -1
- package/lib/browser/ai-configuration/language-model-renderer.spec.js.map +1 -1
- package/lib/browser/ai-sessions-widget.js +1 -1
- package/lib/browser/ai-sessions-widget.js.map +1 -1
- package/lib/browser/app-tester-prompt-template.d.ts.map +1 -1
- package/lib/browser/app-tester-prompt-template.js +4 -6
- package/lib/browser/app-tester-prompt-template.js.map +1 -1
- package/lib/browser/architect-prompt-template.d.ts.map +1 -1
- package/lib/browser/architect-prompt-template.js +20 -3
- package/lib/browser/architect-prompt-template.js.map +1 -1
- package/lib/browser/chat-session-item.js +2 -1
- package/lib/browser/chat-session-item.js.map +1 -1
- package/lib/browser/chat-sessions-welcome-message-provider.js +1 -1
- package/lib/browser/chat-sessions-welcome-message-provider.js.map +1 -1
- package/lib/browser/code-reviewer-prompt-template.d.ts.map +1 -1
- package/lib/browser/code-reviewer-prompt-template.js +2 -1
- package/lib/browser/code-reviewer-prompt-template.js.map +1 -1
- package/lib/browser/commit-message-agent.spec.js +2 -1
- package/lib/browser/commit-message-agent.spec.js.map +1 -1
- package/lib/browser/commit-message-runner.spec.js +2 -1
- package/lib/browser/commit-message-runner.spec.js.map +1 -1
- package/lib/browser/context-file-validation-service-impl.spec.js +2 -1
- package/lib/browser/context-file-validation-service-impl.spec.js.map +1 -1
- package/lib/browser/explore-prompt-template.d.ts.map +1 -1
- package/lib/browser/explore-prompt-template.js +2 -1
- package/lib/browser/explore-prompt-template.js.map +1 -1
- package/lib/browser/file-changeset-functions.d.ts +3 -1
- package/lib/browser/file-changeset-functions.d.ts.map +1 -1
- package/lib/browser/file-changeset-functions.js +60 -6
- package/lib/browser/file-changeset-functions.js.map +1 -1
- package/lib/browser/file-changeset-functions.spec.js +73 -9
- package/lib/browser/file-changeset-functions.spec.js.map +1 -1
- package/lib/browser/frontend-module.js +4 -4
- package/lib/browser/frontend-module.js.map +1 -1
- package/lib/browser/git-changes-tool.d.ts +3 -3
- package/lib/browser/git-changes-tool.d.ts.map +1 -1
- package/lib/browser/git-changes-tool.js +7 -11
- package/lib/browser/git-changes-tool.js.map +1 -1
- package/lib/browser/git-changes-tool.spec.js +16 -3
- package/lib/browser/git-changes-tool.spec.js.map +1 -1
- package/lib/browser/multi-root-paths.spec.d.ts +2 -0
- package/lib/browser/multi-root-paths.spec.d.ts.map +1 -0
- package/lib/browser/multi-root-paths.spec.js +293 -0
- package/lib/browser/multi-root-paths.spec.js.map +1 -0
- package/lib/browser/remember-command-contribution.d.ts +2 -2
- package/lib/browser/remember-command-contribution.js +6 -6
- package/lib/browser/remember-command-contribution.js.map +1 -1
- package/lib/browser/review/pr-review-prompt-template.d.ts.map +1 -1
- package/lib/browser/review/pr-review-prompt-template.js +3 -2
- package/lib/browser/review/pr-review-prompt-template.js.map +1 -1
- package/lib/browser/task-context-file-storage-service.d.ts.map +1 -1
- package/lib/browser/task-context-file-storage-service.js +1 -2
- package/lib/browser/task-context-file-storage-service.js.map +1 -1
- package/lib/browser/task-context-file-storage-service.spec.d.ts +2 -0
- package/lib/browser/task-context-file-storage-service.spec.d.ts.map +1 -0
- package/lib/browser/task-context-file-storage-service.spec.js +111 -0
- package/lib/browser/task-context-file-storage-service.spec.js.map +1 -0
- package/lib/browser/user-interaction-tool-renderer.js +1 -1
- package/lib/browser/user-interaction-tool-renderer.js.map +1 -1
- package/lib/browser/user-interaction-tool.d.ts +12 -1
- package/lib/browser/user-interaction-tool.d.ts.map +1 -1
- package/lib/browser/user-interaction-tool.js +35 -9
- package/lib/browser/user-interaction-tool.js.map +1 -1
- package/lib/browser/user-interaction-tool.spec.js +15 -2
- package/lib/browser/user-interaction-tool.spec.js.map +1 -1
- package/lib/browser/workspace-functions.d.ts +20 -17
- package/lib/browser/workspace-functions.d.ts.map +1 -1
- package/lib/browser/workspace-functions.js +77 -115
- package/lib/browser/workspace-functions.js.map +1 -1
- package/lib/browser/workspace-functions.spec.js +54 -60
- package/lib/browser/workspace-functions.spec.js.map +1 -1
- package/lib/browser/workspace-launch-provider.js +1 -1
- package/lib/browser/workspace-launch-provider.js.map +1 -1
- package/lib/browser/workspace-launch-provider.spec.js +5 -3
- package/lib/browser/workspace-launch-provider.spec.js.map +1 -1
- package/lib/browser/workspace-search-provider.spec.js +2 -1
- package/lib/browser/workspace-search-provider.spec.js.map +1 -1
- package/lib/browser/workspace-task-provider.js +1 -1
- package/lib/browser/workspace-task-provider.js.map +1 -1
- package/lib/browser/workspace-task-provider.spec.js +6 -4
- package/lib/browser/workspace-task-provider.spec.js.map +1 -1
- package/lib/common/agents-md-prompt-template.d.ts +6 -0
- package/lib/common/agents-md-prompt-template.d.ts.map +1 -0
- package/lib/common/agents-md-prompt-template.js +165 -0
- package/lib/common/agents-md-prompt-template.js.map +1 -0
- package/lib/common/coder-replace-prompt-template.d.ts.map +1 -1
- package/lib/common/coder-replace-prompt-template.js +4 -6
- package/lib/common/coder-replace-prompt-template.js.map +1 -1
- package/lib/common/command-prompt-template.js +1 -1
- package/lib/common/command-prompt-template.js.map +1 -1
- package/lib/common/orchestrator-prompt-template.js +1 -1
- package/lib/common/orchestrator-prompt-template.js.map +1 -1
- package/lib/common/universal-prompt-template.js +1 -1
- package/lib/common/universal-prompt-template.js.map +1 -1
- package/lib/common/workspace-preferences.d.ts +1 -0
- package/lib/common/workspace-preferences.d.ts.map +1 -1
- package/lib/common/workspace-preferences.js +10 -1
- package/lib/common/workspace-preferences.js.map +1 -1
- package/lib/package.spec.js +1 -0
- package/lib/package.spec.js.map +1 -1
- package/package.json +27 -28
- package/src/browser/{project-info-agent.ts → agents-md-agent.ts} +11 -10
- package/src/browser/ai-configuration/categories/agent-capabilities-settings.spec.ts +508 -2
- package/src/browser/ai-configuration/categories/agent-capabilities-settings.tsx +92 -33
- package/src/browser/ai-configuration/categories/agent-detail-model.spec.ts +78 -0
- package/src/browser/ai-configuration/categories/agent-detail-model.ts +18 -0
- package/src/browser/ai-configuration/categories/agent-detail-view.tsx +15 -12
- package/src/browser/ai-configuration/categories/agents-configuration-category.tsx +18 -3
- package/src/browser/ai-configuration/categories/provider-model-discovery-section.tsx +3 -3
- package/src/browser/ai-configuration/categories/token-usage-configuration-category.tsx +2 -2
- package/src/browser/ai-configuration/language-model-renderer.spec.ts +38 -0
- package/src/browser/ai-configuration/language-model-renderer.tsx +6 -15
- package/src/browser/app-tester-prompt-template.ts +4 -7
- package/src/browser/architect-prompt-template.ts +4 -4
- package/src/browser/code-reviewer-prompt-template.ts +2 -2
- package/src/browser/context-file-validation-service-impl.spec.ts +2 -1
- package/src/browser/explore-prompt-template.ts +2 -2
- package/src/browser/file-changeset-functions.spec.ts +91 -9
- package/src/browser/file-changeset-functions.ts +62 -7
- package/src/browser/frontend-module.ts +4 -4
- package/src/browser/git-changes-tool.spec.ts +16 -1
- package/src/browser/git-changes-tool.ts +6 -10
- package/src/browser/multi-root-paths.spec.ts +340 -0
- package/src/browser/remember-command-contribution.ts +7 -7
- package/src/browser/review/pr-review-prompt-template.ts +3 -3
- package/src/browser/style/index.css +15 -0
- package/src/browser/task-context-file-storage-service.spec.ts +125 -0
- package/src/browser/task-context-file-storage-service.ts +3 -4
- package/src/browser/user-interaction-tool.spec.ts +18 -1
- package/src/browser/user-interaction-tool.ts +34 -9
- package/src/browser/workspace-functions.spec.ts +54 -60
- package/src/browser/workspace-functions.ts +80 -125
- package/src/browser/workspace-launch-provider.spec.ts +3 -2
- package/src/browser/workspace-task-provider.spec.ts +4 -3
- package/src/common/{project-info-prompt-template.ts → agents-md-prompt-template.ts} +54 -46
- package/src/common/coder-replace-prompt-template.ts +5 -7
- package/src/common/command-prompt-template.ts +1 -1
- package/src/common/orchestrator-prompt-template.ts +1 -1
- package/src/common/universal-prompt-template.ts +1 -1
- package/src/common/workspace-preferences.ts +10 -0
- package/lib/browser/project-info-agent.d.ts.map +0 -1
- package/lib/browser/project-info-agent.js.map +0 -1
- package/lib/common/project-info-prompt-template.d.ts +0 -6
- package/lib/common/project-info-prompt-template.d.ts.map +0 -1
- package/lib/common/project-info-prompt-template.js +0 -146
- package/lib/common/project-info-prompt-template.js.map +0 -1
|
@@ -70,7 +70,8 @@ const CONTENT_REF_SCHEMA: ToolRequestParameterProperty = {
|
|
|
70
70
|
properties: {
|
|
71
71
|
path: {
|
|
72
72
|
type: 'string',
|
|
73
|
-
description: '
|
|
73
|
+
description: 'File path, in the format of the workspace tools: workspace-relative (\'rootName/path\') or absolute. ' +
|
|
74
|
+
'Required unless "empty" is true.'
|
|
74
75
|
},
|
|
75
76
|
gitRef: {
|
|
76
77
|
type: 'string',
|
|
@@ -308,9 +309,11 @@ export class UserInteractionTool implements ToolProvider {
|
|
|
308
309
|
}
|
|
309
310
|
const left = resolveContentRef(link.ref) as PathContentRef;
|
|
310
311
|
if (left.gitRef) {
|
|
311
|
-
const uri = this.
|
|
312
|
+
const uri = await this.resolveUriOrNotFound(left);
|
|
312
313
|
let targetUri: URI;
|
|
313
|
-
if (uri ===
|
|
314
|
+
if (uri === 'notFound') {
|
|
315
|
+
targetUri = this.fileNotFoundUri(left.path);
|
|
316
|
+
} else if (uri === undefined) {
|
|
314
317
|
targetUri = this.errorContentUri(left.path, left.gitRef);
|
|
315
318
|
} else if (await this.canResolveUri(uri)) {
|
|
316
319
|
targetUri = uri;
|
|
@@ -321,8 +324,8 @@ export class UserInteractionTool implements ToolProvider {
|
|
|
321
324
|
}
|
|
322
325
|
await open(this.openerService, targetUri);
|
|
323
326
|
} else {
|
|
324
|
-
const fileUri = this.
|
|
325
|
-
if (!(await this.canResolveUri(fileUri))) {
|
|
327
|
+
const fileUri = await this.resolveUriOrNotFound(left);
|
|
328
|
+
if (fileUri === 'notFound' || fileUri === undefined || !(await this.canResolveUri(fileUri))) {
|
|
326
329
|
await open(this.openerService, this.fileNotFoundUri(left.path));
|
|
327
330
|
return;
|
|
328
331
|
}
|
|
@@ -334,10 +337,29 @@ export class UserInteractionTool implements ToolProvider {
|
|
|
334
337
|
}
|
|
335
338
|
}
|
|
336
339
|
|
|
337
|
-
|
|
340
|
+
/**
|
|
341
|
+
* Resolves a content reference like {@link resolveUri}, or returns `'notFound'` if its path cannot
|
|
342
|
+
* be resolved, e.g. because it lacks the root name in a multi-root workspace.
|
|
343
|
+
*/
|
|
344
|
+
protected async resolveUriOrNotFound(ref: PathContentRef): Promise<URI | undefined | 'notFound'> {
|
|
345
|
+
try {
|
|
346
|
+
return await this.resolveUri(ref);
|
|
347
|
+
} catch (error) {
|
|
348
|
+
this.logger.warn(`Could not resolve '${ref.path}': ${error.message}`);
|
|
349
|
+
return 'notFound';
|
|
350
|
+
}
|
|
351
|
+
}
|
|
352
|
+
|
|
353
|
+
/**
|
|
354
|
+
* Resolves a content reference with the same parsing and access checks as the workspace tools.
|
|
355
|
+
*
|
|
356
|
+
* @returns `undefined` if the reference has a git ref that no SCM repository can resolve.
|
|
357
|
+
* @throws if the path cannot be resolved or may not be accessed.
|
|
358
|
+
*/
|
|
359
|
+
protected async resolveUri(
|
|
338
360
|
ref: PathContentRef
|
|
339
|
-
): URI | undefined {
|
|
340
|
-
const fileUri = this.workspaceScope.
|
|
361
|
+
): Promise<URI | undefined> {
|
|
362
|
+
const fileUri = await this.workspaceScope.resolveAccessiblePath(ref.path);
|
|
341
363
|
if (ref.gitRef) {
|
|
342
364
|
const repo = this.scmService.findRepository(fileUri);
|
|
343
365
|
if (repo) {
|
|
@@ -421,7 +443,10 @@ export class UserInteractionTool implements ToolProvider {
|
|
|
421
443
|
return this.emptyContentUri(ref.label || '');
|
|
422
444
|
}
|
|
423
445
|
const resolved = resolveContentRef(ref) as PathContentRef;
|
|
424
|
-
const uri = this.
|
|
446
|
+
const uri = await this.resolveUriOrNotFound(resolved);
|
|
447
|
+
if (uri === 'notFound') {
|
|
448
|
+
return this.fileNotFoundUri(resolved.path);
|
|
449
|
+
}
|
|
425
450
|
if (uri === undefined) {
|
|
426
451
|
// No SCM provider could resolve the gitRef — surface as an actionable error.
|
|
427
452
|
return this.errorContentUri(resolved.path, resolved.gitRef!);
|
|
@@ -44,6 +44,7 @@ import { MonacoWorkspace } from '@theia/monaco/lib/browser/monaco-workspace';
|
|
|
44
44
|
import { FileSearchService } from '@theia/file-search/lib/common/file-search-service';
|
|
45
45
|
import { Minimatch } from 'minimatch';
|
|
46
46
|
import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
|
|
47
|
+
import { withWorkspaceServiceDefaults } from '@theia/workspace/lib/browser/test/with-workspace-service-defaults';
|
|
47
48
|
|
|
48
49
|
const makeFileSearchService = (
|
|
49
50
|
impl?: (searchPattern: string, options: FileSearchService.Options) => Promise<string[]>
|
|
@@ -168,7 +169,7 @@ describe('Workspace Functions Cancellation Tests', () => {
|
|
|
168
169
|
|
|
169
170
|
// Register mocks in the container
|
|
170
171
|
container.bind(ILogger).to(MockLogger);
|
|
171
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
172
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
172
173
|
container.bind(FileService).toConstantValue(mockFileService);
|
|
173
174
|
container.bind(PreferenceService).toConstantValue(mockPreferenceService);
|
|
174
175
|
container.bind(MonacoWorkspace).toConstantValue(mockMonacoWorkspace);
|
|
@@ -294,7 +295,7 @@ describe('FileContentFunction.getArgumentsShortLabel', () => {
|
|
|
294
295
|
} as unknown as MonacoWorkspace;
|
|
295
296
|
|
|
296
297
|
container.bind(ILogger).to(MockLogger);
|
|
297
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
298
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
298
299
|
container.bind(FileService).toConstantValue(mockFileService);
|
|
299
300
|
container.bind(PreferenceService).toConstantValue(mockPreferenceService);
|
|
300
301
|
container.bind(MonacoWorkspace).toConstantValue(mockMonacoWorkspace);
|
|
@@ -413,7 +414,7 @@ describe('FileContentFunction handler', () => {
|
|
|
413
414
|
} as unknown as MonacoWorkspace;
|
|
414
415
|
|
|
415
416
|
container.bind(ILogger).to(MockLogger);
|
|
416
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
417
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
417
418
|
container.bind(FileService).toConstantValue(mockFileService);
|
|
418
419
|
container.bind(PreferenceService).toConstantValue(mockPreferenceService);
|
|
419
420
|
container.bind(MonacoWorkspace).toConstantValue(mockMonacoWorkspace);
|
|
@@ -779,7 +780,7 @@ describe('FindFilesByPattern.getArgumentsShortLabel', () => {
|
|
|
779
780
|
};
|
|
780
781
|
|
|
781
782
|
container.bind(ILogger).to(MockLogger);
|
|
782
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
783
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
783
784
|
container.bind(FileService).toConstantValue(mockFileService);
|
|
784
785
|
container.bind(PreferenceService).toConstantValue(mockPreferenceService);
|
|
785
786
|
container.bind(AiConfigurationService).toConstantValue(makeTrustAwareReader());
|
|
@@ -872,7 +873,7 @@ describe('FindFilesByPattern.findFiles', () => {
|
|
|
872
873
|
fileSearchService = makeFileSearchService(async () => searchResults);
|
|
873
874
|
|
|
874
875
|
container.bind(ILogger).to(MockLogger);
|
|
875
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
876
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
876
877
|
container.bind(FileService).toConstantValue(mockFileService);
|
|
877
878
|
container.bind(PreferenceService).toConstantValue(mockPreferenceService);
|
|
878
879
|
container.bind(AiConfigurationService).toConstantValue(trustAwareReader);
|
|
@@ -1023,7 +1024,7 @@ describe('WorkspaceFunctionScope gitignore caching', () => {
|
|
|
1023
1024
|
};
|
|
1024
1025
|
|
|
1025
1026
|
container.bind(ILogger).to(MockLogger);
|
|
1026
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
1027
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
1027
1028
|
container.bind(FileService).toConstantValue(mockFileService);
|
|
1028
1029
|
container.bind(PreferenceService).toConstantValue(mockPreferenceService);
|
|
1029
1030
|
container.bind(AiConfigurationService).toConstantValue(makeTrustAwareReader());
|
|
@@ -1093,7 +1094,7 @@ describe('GetWorkspaceFileList resolves the target directory once', () => {
|
|
|
1093
1094
|
const mockPreferenceService = { get: <T>(_path: string, def: T) => def };
|
|
1094
1095
|
|
|
1095
1096
|
container.bind(ILogger).to(MockLogger);
|
|
1096
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
1097
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
1097
1098
|
container.bind(FileService).toConstantValue(mockFileService);
|
|
1098
1099
|
container.bind(PreferenceService).toConstantValue(mockPreferenceService);
|
|
1099
1100
|
container.bind(AiConfigurationService).toConstantValue(makeTrustAwareReader());
|
|
@@ -1157,7 +1158,7 @@ describe('GetWorkspaceDirectoryStructure preserves empty folders', () => {
|
|
|
1157
1158
|
};
|
|
1158
1159
|
|
|
1159
1160
|
container.bind(ILogger).to(MockLogger);
|
|
1160
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
1161
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
1161
1162
|
container.bind(FileService).toConstantValue(mockFileService);
|
|
1162
1163
|
container.bind(PreferenceService).toConstantValue(mockPreferenceService);
|
|
1163
1164
|
container.bind(AiConfigurationService).toConstantValue(makeTrustAwareReader());
|
|
@@ -1229,7 +1230,7 @@ describe('FileContentFunction external paths', () => {
|
|
|
1229
1230
|
} as unknown as AiConfigurationService;
|
|
1230
1231
|
|
|
1231
1232
|
container.bind(ILogger).to(MockLogger);
|
|
1232
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
1233
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
1233
1234
|
container.bind(FileService).toConstantValue(mockFileService);
|
|
1234
1235
|
container.bind(PreferenceService).toConstantValue(mockPreferenceService);
|
|
1235
1236
|
container.bind(MonacoWorkspace).toConstantValue(mockMonacoWorkspace);
|
|
@@ -1375,7 +1376,7 @@ describe('WorkspaceFunctionScope accessible root contributions', () => {
|
|
|
1375
1376
|
}
|
|
1376
1377
|
};
|
|
1377
1378
|
|
|
1378
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
1379
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
1379
1380
|
container.bind(FileService).toConstantValue(mockFileService);
|
|
1380
1381
|
container.bind(PreferenceService).toConstantValue({ get: <T>(_path: string, defaultValue: T) => defaultValue });
|
|
1381
1382
|
container.bind(MonacoWorkspace).toConstantValue({ getTextDocument: () => undefined } as unknown as MonacoWorkspace);
|
|
@@ -1497,7 +1498,7 @@ describe('GetWorkspaceFileList / GetWorkspaceDirectoryStructure with external pa
|
|
|
1497
1498
|
} as unknown as AiConfigurationService;
|
|
1498
1499
|
|
|
1499
1500
|
container.bind(ILogger).to(MockLogger);
|
|
1500
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
1501
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
1501
1502
|
container.bind(FileService).toConstantValue(mockFileService);
|
|
1502
1503
|
container.bind(PreferenceService).toConstantValue(mockPreferenceService);
|
|
1503
1504
|
container.bind(AiConfigurationService).toConstantValue(trustAwareReader);
|
|
@@ -1597,7 +1598,7 @@ describe('FindFilesByPattern with searchRoot', () => {
|
|
|
1597
1598
|
} as unknown as AiConfigurationService;
|
|
1598
1599
|
|
|
1599
1600
|
container.bind(ILogger).to(MockLogger);
|
|
1600
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
1601
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
1601
1602
|
container.bind(FileService).toConstantValue(mockFileService);
|
|
1602
1603
|
container.bind(PreferenceService).toConstantValue(mockPreferenceService);
|
|
1603
1604
|
container.bind(AiConfigurationService).toConstantValue(trustAwareReader);
|
|
@@ -1693,7 +1694,7 @@ describe('WorkspaceFunctionScope path-traversal hardening', () => {
|
|
|
1693
1694
|
} as unknown as AiConfigurationService;
|
|
1694
1695
|
|
|
1695
1696
|
container.bind(ILogger).to(MockLogger);
|
|
1696
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
1697
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
1697
1698
|
container.bind(FileService).toConstantValue(mockFileService);
|
|
1698
1699
|
container.bind(PreferenceService).toConstantValue(mockPreferenceService);
|
|
1699
1700
|
container.bind(MonacoWorkspace).toConstantValue(mockMonacoWorkspace);
|
|
@@ -1867,7 +1868,7 @@ describe('WorkspaceFunctionScope Multi-Root Tests', () => {
|
|
|
1867
1868
|
onWorkspaceChanged: () => ({ dispose: () => { } })
|
|
1868
1869
|
} as unknown as WorkspaceService;
|
|
1869
1870
|
|
|
1870
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
1871
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
1871
1872
|
container.bind(FileService).toConstantValue({} as FileService);
|
|
1872
1873
|
container.bind(PreferenceService).toConstantValue({ get: () => false });
|
|
1873
1874
|
container.bind(AiConfigurationService).toConstantValue(makeTrustAwareReader());
|
|
@@ -1890,7 +1891,7 @@ describe('WorkspaceFunctionScope Multi-Root Tests', () => {
|
|
|
1890
1891
|
onWorkspaceChanged: () => ({ dispose: () => { } })
|
|
1891
1892
|
} as unknown as WorkspaceService;
|
|
1892
1893
|
|
|
1893
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
1894
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
1894
1895
|
container.bind(FileService).toConstantValue({} as FileService);
|
|
1895
1896
|
container.bind(PreferenceService).toConstantValue({ get: () => false });
|
|
1896
1897
|
container.bind(AiConfigurationService).toConstantValue(makeTrustAwareReader());
|
|
@@ -1905,7 +1906,7 @@ describe('WorkspaceFunctionScope Multi-Root Tests', () => {
|
|
|
1905
1906
|
expect(mapping.get('shared')?.toString()).to.equal('file:///home/user/shared');
|
|
1906
1907
|
});
|
|
1907
1908
|
|
|
1908
|
-
it('
|
|
1909
|
+
it('names roots sharing a basename as peers', () => {
|
|
1909
1910
|
const mockWorkspaceService = {
|
|
1910
1911
|
tryGetRoots: () => [
|
|
1911
1912
|
{ resource: new URI('file:///alice/app') },
|
|
@@ -1914,7 +1915,7 @@ describe('WorkspaceFunctionScope Multi-Root Tests', () => {
|
|
|
1914
1915
|
onWorkspaceChanged: () => ({ dispose: () => { } })
|
|
1915
1916
|
} as unknown as WorkspaceService;
|
|
1916
1917
|
|
|
1917
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
1918
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
1918
1919
|
container.bind(FileService).toConstantValue({} as FileService);
|
|
1919
1920
|
container.bind(PreferenceService).toConstantValue({ get: () => false });
|
|
1920
1921
|
container.bind(AiConfigurationService).toConstantValue(makeTrustAwareReader());
|
|
@@ -1923,10 +1924,9 @@ describe('WorkspaceFunctionScope Multi-Root Tests', () => {
|
|
|
1923
1924
|
workspaceScope = container.get(WorkspaceFunctionScope);
|
|
1924
1925
|
|
|
1925
1926
|
const mapping = workspaceScope.getRootMapping();
|
|
1926
|
-
|
|
1927
|
-
|
|
1928
|
-
expect(mapping.
|
|
1929
|
-
expect(mapping.get('app')?.toString()).to.equal('file:///alice/app');
|
|
1927
|
+
expect(mapping.size).to.equal(2);
|
|
1928
|
+
expect(mapping.get('alice/app')?.toString()).to.equal('file:///alice/app');
|
|
1929
|
+
expect(mapping.get('bob/app')?.toString()).to.equal('file:///bob/app');
|
|
1930
1930
|
});
|
|
1931
1931
|
});
|
|
1932
1932
|
|
|
@@ -1937,7 +1937,7 @@ describe('WorkspaceFunctionScope Multi-Root Tests', () => {
|
|
|
1937
1937
|
onWorkspaceChanged: () => ({ dispose: () => { } })
|
|
1938
1938
|
} as unknown as WorkspaceService;
|
|
1939
1939
|
|
|
1940
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
1940
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
1941
1941
|
container.bind(FileService).toConstantValue({} as FileService);
|
|
1942
1942
|
container.bind(PreferenceService).toConstantValue({ get: () => false });
|
|
1943
1943
|
container.bind(AiConfigurationService).toConstantValue(makeTrustAwareReader());
|
|
@@ -1959,7 +1959,7 @@ describe('WorkspaceFunctionScope Multi-Root Tests', () => {
|
|
|
1959
1959
|
onWorkspaceChanged: () => ({ dispose: () => { } })
|
|
1960
1960
|
} as unknown as WorkspaceService;
|
|
1961
1961
|
|
|
1962
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
1962
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
1963
1963
|
container.bind(FileService).toConstantValue({} as FileService);
|
|
1964
1964
|
container.bind(PreferenceService).toConstantValue({ get: () => false });
|
|
1965
1965
|
container.bind(AiConfigurationService).toConstantValue(makeTrustAwareReader());
|
|
@@ -1980,7 +1980,7 @@ describe('WorkspaceFunctionScope Multi-Root Tests', () => {
|
|
|
1980
1980
|
onWorkspaceChanged: () => ({ dispose: () => { } })
|
|
1981
1981
|
} as unknown as WorkspaceService;
|
|
1982
1982
|
|
|
1983
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
1983
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
1984
1984
|
container.bind(FileService).toConstantValue({} as FileService);
|
|
1985
1985
|
container.bind(PreferenceService).toConstantValue({ get: () => false });
|
|
1986
1986
|
container.bind(AiConfigurationService).toConstantValue(makeTrustAwareReader());
|
|
@@ -1999,7 +1999,7 @@ describe('WorkspaceFunctionScope Multi-Root Tests', () => {
|
|
|
1999
1999
|
onWorkspaceChanged: () => ({ dispose: () => { } })
|
|
2000
2000
|
} as unknown as WorkspaceService;
|
|
2001
2001
|
|
|
2002
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
2002
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
2003
2003
|
container.bind(FileService).toConstantValue({} as FileService);
|
|
2004
2004
|
container.bind(PreferenceService).toConstantValue({ get: () => false });
|
|
2005
2005
|
container.bind(AiConfigurationService).toConstantValue(makeTrustAwareReader());
|
|
@@ -2021,7 +2021,7 @@ describe('WorkspaceFunctionScope Multi-Root Tests', () => {
|
|
|
2021
2021
|
tryGetRoots: () => rootObjects,
|
|
2022
2022
|
onWorkspaceChanged: () => ({ dispose: () => { } })
|
|
2023
2023
|
} as unknown as WorkspaceService;
|
|
2024
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
2024
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
2025
2025
|
container.bind(FileService).toConstantValue({} as FileService);
|
|
2026
2026
|
container.bind(PreferenceService).toConstantValue({ get: () => false });
|
|
2027
2027
|
container.bind(AiConfigurationService).toConstantValue(makeTrustAwareReader());
|
|
@@ -2152,45 +2152,41 @@ describe('WorkspaceFunctionScope Multi-Root Tests', () => {
|
|
|
2152
2152
|
});
|
|
2153
2153
|
|
|
2154
2154
|
describe('duplicate root basenames', () => {
|
|
2155
|
-
it('round-trips
|
|
2155
|
+
it('names all roots sharing a basename as peers and round-trips each of them', () => {
|
|
2156
2156
|
workspaceScope = createScope(['file:///workspace/a/app', 'file:///workspace/b/app']);
|
|
2157
2157
|
const mapping = workspaceScope.getRootMapping();
|
|
2158
|
-
expect(mapping.
|
|
2159
|
-
expect(mapping.get('app')?.toString()).to.equal('file:///workspace/a/app');
|
|
2158
|
+
expect(Array.from(mapping.keys())).to.deep.equal(['a/app', 'b/app']);
|
|
2160
2159
|
|
|
2161
|
-
|
|
2162
|
-
|
|
2163
|
-
|
|
2164
|
-
|
|
2165
|
-
|
|
2166
|
-
|
|
2160
|
+
for (const [name, rootUri] of mapping) {
|
|
2161
|
+
const uri = rootUri.resolve('src/index.ts');
|
|
2162
|
+
const relPath = workspaceScope.toWorkspaceRelativePath(uri)!;
|
|
2163
|
+
expect(relPath).to.equal(`${name}/src/index.ts`);
|
|
2164
|
+
expect(workspaceScope.resolveRelativePath(relPath).toString()).to.equal(uri.toString());
|
|
2165
|
+
}
|
|
2167
2166
|
});
|
|
2168
2167
|
|
|
2169
|
-
it('
|
|
2168
|
+
it('rejects the shared basename as ambiguous', () => {
|
|
2170
2169
|
workspaceScope = createScope(['file:///workspace/a/app', 'file:///workspace/b/app']);
|
|
2171
|
-
|
|
2172
|
-
const relPath = workspaceScope.toWorkspaceRelativePath(uri);
|
|
2173
|
-
expect(relPath).to.be.undefined;
|
|
2170
|
+
expect(() => workspaceScope.resolveRelativePath('app/src/index.ts')).to.throw(/ambiguous.*a\/app.*b\/app/);
|
|
2174
2171
|
});
|
|
2175
2172
|
|
|
2176
|
-
it('resolves
|
|
2173
|
+
it('resolves a longer parent-qualified path (Phase 2)', () => {
|
|
2177
2174
|
workspaceScope = createScope(['file:///workspace/a/app', 'file:///workspace/b/app']);
|
|
2178
|
-
|
|
2179
|
-
|
|
2180
|
-
expect(result.toString()).to.equal('file:///workspace/a/app/src/index.ts');
|
|
2175
|
+
const result = workspaceScope.resolveRelativePath('workspace/b/app/src/index.ts');
|
|
2176
|
+
expect(result.toString()).to.equal('file:///workspace/b/app/src/index.ts');
|
|
2181
2177
|
});
|
|
2182
2178
|
|
|
2183
|
-
// The
|
|
2184
|
-
it('resolves a uri for
|
|
2179
|
+
// The external file change notice names files by a uri when roots share a basename.
|
|
2180
|
+
it('resolves a uri for a root sharing its basename', async () => {
|
|
2185
2181
|
workspaceScope = createScope(['file:///workspace/a/app', 'file:///workspace/b/app']);
|
|
2186
|
-
const
|
|
2187
|
-
expect((await workspaceScope.resolveAccessiblePath(
|
|
2182
|
+
const uri = 'file:///workspace/b/app/src/index.ts';
|
|
2183
|
+
expect((await workspaceScope.resolveAccessiblePath(uri)).toString()).to.equal(uri);
|
|
2188
2184
|
});
|
|
2189
2185
|
});
|
|
2190
2186
|
});
|
|
2191
2187
|
|
|
2192
2188
|
describe('getRootMapping duplicate basename stability', () => {
|
|
2193
|
-
it('assigns the same
|
|
2189
|
+
it('assigns the same name to a root regardless of tryGetRoots order', () => {
|
|
2194
2190
|
// First ordering
|
|
2195
2191
|
const mockWorkspaceServiceA = {
|
|
2196
2192
|
tryGetRoots: () => [
|
|
@@ -2200,7 +2196,7 @@ describe('WorkspaceFunctionScope Multi-Root Tests', () => {
|
|
|
2200
2196
|
onWorkspaceChanged: () => ({ dispose: () => { } })
|
|
2201
2197
|
} as unknown as WorkspaceService;
|
|
2202
2198
|
|
|
2203
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceServiceA);
|
|
2199
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceServiceA));
|
|
2204
2200
|
container.bind(FileService).toConstantValue({} as FileService);
|
|
2205
2201
|
container.bind(PreferenceService).toConstantValue({ get: () => false });
|
|
2206
2202
|
container.bind(AiConfigurationService).toConstantValue(makeTrustAwareReader());
|
|
@@ -2220,7 +2216,7 @@ describe('WorkspaceFunctionScope Multi-Root Tests', () => {
|
|
|
2220
2216
|
} as unknown as WorkspaceService;
|
|
2221
2217
|
|
|
2222
2218
|
container2.bind(ILogger).to(MockLogger);
|
|
2223
|
-
container2.bind(WorkspaceService).toConstantValue(mockWorkspaceServiceB);
|
|
2219
|
+
container2.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceServiceB));
|
|
2224
2220
|
container2.bind(FileService).toConstantValue({} as FileService);
|
|
2225
2221
|
container2.bind(PreferenceService).toConstantValue({ get: () => false });
|
|
2226
2222
|
container2.bind(AiConfigurationService).toConstantValue(makeTrustAwareReader());
|
|
@@ -2229,12 +2225,10 @@ describe('WorkspaceFunctionScope Multi-Root Tests', () => {
|
|
|
2229
2225
|
const scopeB = container2.get(WorkspaceFunctionScope);
|
|
2230
2226
|
const mappingB = scopeB.getRootMapping();
|
|
2231
2227
|
|
|
2232
|
-
|
|
2233
|
-
|
|
2234
|
-
|
|
2235
|
-
expect(
|
|
2236
|
-
expect(mappingA.get('app')?.toString()).to.equal(mappingB.get('app')?.toString());
|
|
2237
|
-
expect(mappingA.get('app')?.toString()).to.equal('file:///workspace/a/app');
|
|
2228
|
+
for (const name of ['a/app', 'b/app']) {
|
|
2229
|
+
expect(mappingA.get(name)?.toString()).to.equal(mappingB.get(name)?.toString());
|
|
2230
|
+
}
|
|
2231
|
+
expect(mappingA.get('a/app')?.toString()).to.equal('file:///workspace/a/app');
|
|
2238
2232
|
});
|
|
2239
2233
|
});
|
|
2240
2234
|
|
|
@@ -2248,7 +2242,7 @@ describe('WorkspaceFunctionScope Multi-Root Tests', () => {
|
|
|
2248
2242
|
onWorkspaceChanged: () => ({ dispose: () => { } })
|
|
2249
2243
|
} as unknown as WorkspaceService;
|
|
2250
2244
|
|
|
2251
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
2245
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
2252
2246
|
container.bind(FileService).toConstantValue({} as FileService);
|
|
2253
2247
|
container.bind(PreferenceService).toConstantValue({ get: () => false });
|
|
2254
2248
|
container.bind(AiConfigurationService).toConstantValue(makeTrustAwareReader());
|
|
@@ -2275,7 +2269,7 @@ describe('WorkspaceFunctionScope Multi-Root Tests', () => {
|
|
|
2275
2269
|
onWorkspaceChanged: () => ({ dispose: () => { } })
|
|
2276
2270
|
} as unknown as WorkspaceService;
|
|
2277
2271
|
|
|
2278
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
2272
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
2279
2273
|
container.bind(FileService).toConstantValue({} as FileService);
|
|
2280
2274
|
container.bind(PreferenceService).toConstantValue({ get: () => false });
|
|
2281
2275
|
container.bind(AiConfigurationService).toConstantValue(makeTrustAwareReader());
|
|
@@ -2299,7 +2293,7 @@ describe('WorkspaceFunctionScope Multi-Root Tests', () => {
|
|
|
2299
2293
|
onWorkspaceChanged: () => ({ dispose: () => { } })
|
|
2300
2294
|
} as unknown as WorkspaceService;
|
|
2301
2295
|
|
|
2302
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
2296
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
2303
2297
|
container.bind(FileService).toConstantValue({} as FileService);
|
|
2304
2298
|
container.bind(PreferenceService).toConstantValue({ get: () => false });
|
|
2305
2299
|
container.bind(AiConfigurationService).toConstantValue(makeTrustAwareReader());
|
|
@@ -2323,7 +2317,7 @@ describe('WorkspaceFunctionScope Multi-Root Tests', () => {
|
|
|
2323
2317
|
onWorkspaceChanged: () => ({ dispose: () => { } })
|
|
2324
2318
|
} as unknown as WorkspaceService;
|
|
2325
2319
|
|
|
2326
|
-
container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
|
|
2320
|
+
container.bind(WorkspaceService).toConstantValue(withWorkspaceServiceDefaults(mockWorkspaceService));
|
|
2327
2321
|
container.bind(FileService).toConstantValue({} as FileService);
|
|
2328
2322
|
container.bind(PreferenceService).toConstantValue({ get: () => false });
|
|
2329
2323
|
container.bind(AiConfigurationService).toConstantValue(makeTrustAwareReader());
|