Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .ncurc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"reject": [
"@microsoft/1ds-core-js",
"@microsoft/1ds-post-js",
"@parcel/watcher",
"@types/node",
"@types/vscode-semver",
"@vscode/iconv-lite-umd",
Expand Down
643 changes: 332 additions & 311 deletions demo/package-lock.json

Large diffs are not rendered by default.

10 changes: 3 additions & 7 deletions demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
"check-build": "npm run lint && npm run typecheck",
"build": "npm run check-build && vite --config vite.config.ts build",
"build:netlify": "npm run check-build && vite --config vite.netlify.config.ts build",
"start:debugServer": "tsx src/debugServer.ts",
"preprepare": "patch-package"
"start:debugServer": "tsx src/debugServer.ts"
},
"devDependencies": {
"@codingame/esbuild-import-meta-url-plugin": "^1.0.3",
Expand All @@ -24,15 +23,15 @@
"@types/wicg-file-system-access": "^2023.10.7",
"@types/ws": "^8.18.1",
"typescript": "~5.9.3",
"vite": "~7.3.0",
"vite": "~7.3.1",
"@codingame/monaco-vscode-rollup-extension-directory-plugin": "file:../dist/packages/monaco-vscode-rollup-extension-directory-plugin",
"@codingame/monaco-vscode-rollup-vsix-plugin": "file:../dist/packages/monaco-vscode-rollup-vsix-plugin"
},
"dependencies": {
"ansi-colors": "^4.1.3",
"dockerode": "^4.0.9",
"express": "^5.2.1",
"ws": "^8.18.3",
"ws": "^8.19.0",
"@codingame/monaco-vscode-accessibility-service-override": "file:../dist/packages/monaco-vscode-accessibility-service-override",
"@codingame/monaco-vscode-ai-service-override": "file:../dist/packages/monaco-vscode-ai-service-override",
"@codingame/monaco-vscode-all-default-extensions": "file:../dist/packages/monaco-vscode-all-default-extensions",
Expand Down Expand Up @@ -216,9 +215,6 @@
"@codingame/monaco-vscode-xterm-common": "file:../dist/packages/monaco-vscode-xterm-common",
"@codingame/monaco-vscode-yaml-default-extension": "file:../dist/packages/monaco-vscode-yaml-default-extension"
},
"overrides": {
"esbuild": "^0.24.0"
},
"volta": {
"extends": "../package.json"
}
Expand Down
58 changes: 0 additions & 58 deletions demo/patches/@xterm+xterm+5.6.0-beta.140.patch

This file was deleted.

7,102 changes: 2,067 additions & 5,035 deletions package-lock.json

Large diffs are not rendered by default.

43 changes: 21 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
},
"config": {
"vscode": {
"version": "1.107.1",
"ref": "1.107.1",
"commit": "994fd12f8d3a5aa16f17d42c041e5809167e845a"
"version": "1.108.0",
"ref": "1.108.0",
"commit": "94e8ae2b28cb5cc932b86e1070569c4463565c37"
},
"monaco": {
"ref": "v0.55.1",
Expand All @@ -46,9 +46,9 @@
"@babel/preset-env": "^7.28.5",
"@babel/preset-typescript": "^7.28.5",
"@codingame/commitlint-config-codingame": "^1.1.1",
"@codingame/semantic-release-config-github": "^2.1.0",
"@codingame/semantic-release-config-github": "^2.1.1",
"@codingame/tsconfig": "^1.1.1",
"@commitlint/cli": "^20.2.0",
"@commitlint/cli": "^20.3.1",
"@rollup/plugin-commonjs": "^29.0.0",
"@rollup/plugin-dynamic-import-vars": "^2.1.5",
"@rollup/plugin-json": "^6.1.0",
Expand All @@ -74,22 +74,21 @@
"postcss-url": "^10.1.3",
"prettier": "^3.7.4",
"recast": "^0.23.11",
"rollup": "^4.53.4",
"rollup": "^4.55.1",
"rollup-plugin-copy": "^3.5.0",
"rollup-plugin-dts": "^6.3.0",
"semantic-release": "25.0.2",
"tsx": "^4.21.0",
"type-fest": "^5.3.1",
"typescript": "^5.9.3",
"typescript-eslint": "^8.49.0",
"typescript-eslint": "^8.52.0",
"vscode-semver": "npm:semver@=5.5.0",
"yargs": "^18.0.0",
"zx": "^8.8.5"
},
"dependencies": {
"@microsoft/1ds-core-js": "^3.2.13",
"@microsoft/1ds-post-js": "^3.2.13",
"@parcel/watcher": "parcel-bundler/watcher#1ca032aa8339260a8a3bcf825c3a1a71e3e43542",
"@rollup/pluginutils": "^5.3.0",
"@vscode/iconv-lite-umd": "0.7.1",
"@vscode/proxy-agent": "^0.36.0",
Expand All @@ -99,16 +98,16 @@
"@vscode/vscode-languagedetection": "npm:@codingame/vscode-languagedetection@1.0.23",
"@vscode/windows-process-tree": "^0.6.0",
"@vscode/windows-registry": "^1.1.0",
"@xterm/addon-clipboard": "^0.2.0-beta.119",
"@xterm/addon-image": "^0.9.0-beta.136",
"@xterm/addon-ligatures": "^0.10.0-beta.136",
"@xterm/addon-progress": "^0.2.0-beta.42",
"@xterm/addon-search": "^0.16.0-beta.136",
"@xterm/addon-serialize": "^0.14.0-beta.136",
"@xterm/addon-unicode11": "^0.9.0-beta.136",
"@xterm/addon-webgl": "^0.19.0-beta.136",
"@xterm/headless": "^5.6.0-beta.136",
"@xterm/xterm": "^5.6.0-beta.136",
"@xterm/addon-clipboard": "^0.3.0-beta.91",
"@xterm/addon-image": "^0.10.0-beta.91",
"@xterm/addon-ligatures": "^0.11.0-beta.91",
"@xterm/addon-progress": "^0.3.0-beta.91",
"@xterm/addon-search": "^0.17.0-beta.91",
"@xterm/addon-serialize": "^0.15.0-beta.91",
"@xterm/addon-unicode11": "^0.10.0-beta.91",
"@xterm/addon-webgl": "^0.20.0-beta.90",
"@xterm/headless": "^6.1.0-beta.91",
"@xterm/xterm": "^6.1.0-beta.91",
"cookie": "^0.7.2",
"css-url-parser": "^1.1.4",
"dompurify": "^3.3.1",
Expand All @@ -120,15 +119,15 @@
"marked": "~14.0.0",
"memfs": "^4.51.1",
"mime-types": "^3.0.2",
"node-pty": "1.1.0-beta35",
"node-pty": "^1.1.0-beta43",
"tas-client": "0.3.1",
"thenby": "^1.3.4",
"vscode-css-languageservice": "6.2.14",
"vscode-html-languageservice": "5.2.0",
"vscode-json-languageservice": "5.3.11",
"vscode-oniguruma": "1.7.0",
"vscode-regexpp": "^3.1.0",
"vscode-textmate": "^9.2.1",
"vscode-textmate": "^9.3.0",
"vscode-uri": "3.0.8",
"yauzl": "^3.0.0",
"yazl": "^2.4.3"
Expand All @@ -137,11 +136,11 @@
"typescript": "$typescript",
"rollup": "$rollup",
"recast": "$recast",
"@xterm/xterm": "^5.6.0-beta.136",
"@xterm/xterm": "^6.1.0-beta.91",
"cross-spawn": "7.0.6"
},
"volta": {
"node": "22.20.0",
"node": "22.21.1",
"npm": "11.6.2"
}
}
6 changes: 4 additions & 2 deletions src/localExtensionHost.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ import {
ExtHostAuthentication,
IExtHostAuthentication
} from 'vs/workbench/api/common/extHostAuthentication'
import { IDefaultLogLevelsService } from 'vs/workbench/services/log/common/defaultLogLevels.service'

const apiFactoryDeferred = new DeferredPromise<ApiFactory>()

Expand Down Expand Up @@ -155,7 +156,8 @@ class LocalExtensionHost implements IExtensionHost {
@IBrowserWorkbenchEnvironmentService
private readonly _environmentService: IBrowserWorkbenchEnvironmentService,
@IProductService private readonly _productService: IProductService,
@IUserDataProfilesService private readonly _userDataProfilesService: IUserDataProfilesService
@IUserDataProfilesService private readonly _userDataProfilesService: IUserDataProfilesService,
@IDefaultLogLevelsService private readonly _defaultLogLevelsService: IDefaultLogLevelsService
) {
this._protocolPromise = null
this._extensionHostLogsLocation = joinPath(this._environmentService.extHostLogsPath, 'local')
Expand Down Expand Up @@ -224,7 +226,7 @@ class LocalExtensionHost implements IExtensionHost {
extensionTestsLocationURI: this._environmentService.extensionTestsLocationURI,
globalStorageHome: this._userDataProfilesService.defaultProfile.globalStorageHome,
workspaceStorageHome: this._environmentService.workspaceStorageHome,
extensionLogLevel: this._environmentService.extensionLogLevel
extensionLogLevel: this._defaultLogLevelsService.defaultLogLevels.extensions
},
workspace:
this._contextService.getWorkbenchState() === WorkbenchState.EMPTY
Expand Down
61 changes: 30 additions & 31 deletions src/missing-services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,26 +167,26 @@ import {
IChatWidgetService,
IQuickChatService
} from 'vs/workbench/contrib/chat/browser/chat.service'
import { IChatAttachmentResolveService } from 'vs/workbench/contrib/chat/browser/chatAttachmentResolveService.service'
import { IChatMarkdownAnchorService } from 'vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.service'
import { IChatContextPickService } from 'vs/workbench/contrib/chat/browser/chatContextPickService.service'
import { IChatAttachmentResolveService } from 'vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService.service'
import { IChatMarkdownAnchorService } from 'vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service'
import { IChatContextPickService } from 'vs/workbench/contrib/chat/browser/attachments/chatContextPickService.service'
import { IChatOutputRendererService } from 'vs/workbench/contrib/chat/browser/chatOutputItemRenderer.service'
import {
IChatAgentNameService,
IChatAgentService
} from 'vs/workbench/contrib/chat/common/chatAgents.service'
import { ICodeMapperService } from 'vs/workbench/contrib/chat/common/chatCodeMapperService.service'
import { IChatEditingService } from 'vs/workbench/contrib/chat/common/chatEditingService.service'
import { IChatService } from 'vs/workbench/contrib/chat/common/chatService.service'
} from 'vs/workbench/contrib/chat/common/participants/chatAgents.service'
import { ICodeMapperService } from 'vs/workbench/contrib/chat/common/editing/chatCodeMapperService.service'
import { IChatEditingService } from 'vs/workbench/contrib/chat/common/editing/chatEditingService.service'
import { IChatService } from 'vs/workbench/contrib/chat/common/chatService/chatService.service'
import { IChatSessionsService } from 'vs/workbench/contrib/chat/common/chatSessionsService.service'
import { IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands.service'
import { IChatTodoListService } from 'vs/workbench/contrib/chat/common/chatTodoListService.service'
import { IChatTransferService } from 'vs/workbench/contrib/chat/common/chatTransferService.service'
import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables.service'
import { IChatWidgetHistoryService } from 'vs/workbench/contrib/chat/common/chatWidgetHistoryService.service'
import { IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/participants/chatSlashCommands.service'
import { IChatTodoListService } from 'vs/workbench/contrib/chat/common/tools/chatTodoListService.service'
import { IChatTransferService } from 'vs/workbench/contrib/chat/common/model/chatTransferService.service'
import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/attachments/chatVariables.service'
import { IChatWidgetHistoryService } from 'vs/workbench/contrib/chat/common/widget/chatWidgetHistoryService.service'
import { ILanguageModelIgnoredFilesService } from 'vs/workbench/contrib/chat/common/ignoredFiles.service'
import { ILanguageModelStatsService } from 'vs/workbench/contrib/chat/common/languageModelStats.service'
import { ILanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService.service'
import { ILanguageModelToolsService } from 'vs/workbench/contrib/chat/common/tools/languageModelToolsService.service'
import { ILanguageModelsService } from 'vs/workbench/contrib/chat/common/languageModels.service'
import { IPromptsService } from 'vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service'
import { ICommentService } from 'vs/workbench/contrib/comments/browser/commentService.service'
Expand Down Expand Up @@ -214,7 +214,7 @@ import {
IIssueFormService,
IWorkbenchIssueService
} from 'vs/workbench/contrib/issue/common/issue.service'
import { IDefaultLogLevelsService } from 'vs/workbench/contrib/logs/common/defaultLogLevels.service'
import { IDefaultLogLevelsService } from 'vs/workbench/services/log/common/defaultLogLevels.service'
import { IMcpRegistry } from 'vs/workbench/contrib/mcp/common/mcpRegistryTypes.service'
import {
IMcpElicitationService,
Expand Down Expand Up @@ -420,16 +420,16 @@ import { IImageResizeService } from 'vs/platform/imageResize/common/imageResizeS
import { IMarkdownRendererService } from 'vs/platform/markdown/browser/markdownRenderer.service'
import { McpGalleryManifestStatus } from 'vs/platform/mcp/common/mcpGalleryManifest'
import { IMcpGalleryManifestService } from 'vs/platform/mcp/common/mcpGalleryManifest.service'
import { IChatContextService } from 'vs/workbench/contrib/chat/browser/chatContextService.service'
import { IChatContextService } from 'vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service'
import { IChatStatusItemService } from 'vs/workbench/contrib/chat/browser/chatStatus/chatStatusItemService.service'
import { IChatLayoutService } from 'vs/workbench/contrib/chat/common/chatLayoutService.service'
import { IChatLayoutService } from 'vs/workbench/contrib/chat/common/widget/chatLayoutService.service'
import { IChatModeService } from 'vs/workbench/contrib/chat/common/chatModes.service'
import { ILanguageModelToolsConfirmationService } from 'vs/workbench/contrib/chat/common/languageModelToolsConfirmationService.service'
import { ILanguageModelToolsConfirmationService } from 'vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service'
import {
ToolDataSource,
ToolSet,
VSCodeToolReference
} from 'vs/workbench/contrib/chat/common/languageModelToolsService'
} from 'vs/workbench/contrib/chat/common/tools/languageModelToolsService'
import { IRandomService } from 'vs/workbench/contrib/editTelemetry/browser/randomService.service'
import { IAiEditTelemetryService } from 'vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service'
import { LazyCollectionState } from 'vs/workbench/contrib/mcp/common/mcpTypes'
Expand Down Expand Up @@ -3247,7 +3247,6 @@ registerSingleton(
)
class ChatService implements IChatService {
_serviceBrand: undefined
isPersistedSessionEmpty: IChatService['isPersistedSessionEmpty'] = () => true
@Unsupported
activateDefaultAgent: IChatService['activateDefaultAgent'] = unsupported
@Unsupported
Expand All @@ -3265,7 +3264,6 @@ class ChatService implements IChatService {
clearAllHistoryEntries: IChatService['clearAllHistoryEntries'] = unsupported
hasSessions: IChatService['hasSessions'] = () => false
onDidDisposeSession: IChatService['onDidDisposeSession'] = Event.None
transferredSessionData: IChatService['transferredSessionData'] = undefined
@Unsupported
transferChatSession: IChatService['transferChatSession'] = unsupported
@Unsupported
Expand All @@ -3291,7 +3289,6 @@ class ChatService implements IChatService {
loadSessionForResource: IChatService['loadSessionForResource'] = unsupported
requestInProgressObs: IChatService['requestInProgressObs'] = constObservable(false)
edits2Enabled: IChatService['edits2Enabled'] = false
getPersistedSessionTitle: IChatService['getPersistedSessionTitle'] = () => undefined
editingSessions: IChatService['editingSessions'] = []
getChatSessionFromInternalUri: IChatService['getChatSessionFromInternalUri'] = () => undefined
getLocalSessionHistory: IChatService['getLocalSessionHistory'] = async () => []
Expand All @@ -3310,6 +3307,8 @@ class ChatService implements IChatService {

@Unsupported
setTitle: IChatService['setTitle'] = unsupported
transferredSessionResource: IChatService['transferredSessionResource'] = undefined
getSessionTitle: IChatService['getSessionTitle'] = () => undefined
}
registerSingleton(IChatService, ChatService, InstantiationType.Delayed)
class ChatMarkdownAnchorService implements IChatMarkdownAnchorService {
Expand Down Expand Up @@ -3971,6 +3970,7 @@ class ChatWidgetService implements IChatWidgetService {
_serviceBrand: undefined
getWidgetsByLocations: IChatWidgetService['getWidgetsByLocations'] = () => []
onDidAddWidget: IChatWidgetService['onDidAddWidget'] = Event.None
onDidBackgroundSession: IChatWidgetService['onDidBackgroundSession'] = Event.None
getAllWidgets: IChatWidgetService['getAllWidgets'] = () => []
lastFocusedWidget: IChatWidgetService['lastFocusedWidget'] = undefined
@Unsupported
Expand Down Expand Up @@ -5155,11 +5155,13 @@ registerSingleton(IWorkspaceIdentityService, WorkspaceIdentityService, Instantia
class DefaultLogLevelsService implements IDefaultLogLevelsService {
_serviceBrand: undefined
onDidChangeDefaultLogLevels: IDefaultLogLevelsService['onDidChangeDefaultLogLevels'] = Event.None
getDefaultLogLevel: IDefaultLogLevelsService['getDefaultLogLevel'] = async () => LogLevel.Off
@Unsupported
getDefaultLogLevels: IDefaultLogLevelsService['getDefaultLogLevels'] = unsupported
getDefaultLogLevel: IDefaultLogLevelsService['getDefaultLogLevel'] = () => LogLevel.Off
@Unsupported
setDefaultLogLevel: IDefaultLogLevelsService['setDefaultLogLevel'] = unsupported
defaultLogLevels: IDefaultLogLevelsService['defaultLogLevels'] = {
default: LogLevel.Off,
extensions: []
}
}
registerSingleton(IDefaultLogLevelsService, DefaultLogLevelsService, InstantiationType.Delayed)
class CustomEditorLabelService implements ICustomEditorLabelService {
Expand Down Expand Up @@ -5195,6 +5197,7 @@ class TrustedDomainService implements ITrustedDomainService {
isValid: ITrustedDomainService['isValid'] = (): boolean => {
return false
}
trustedDomains: ITrustedDomainService['trustedDomains'] = []
}
registerSingleton(ITrustedDomainService, TrustedDomainService, InstantiationType.Delayed)
class LanguageModelToolsService implements ILanguageModelToolsService {
Expand Down Expand Up @@ -5493,7 +5496,7 @@ class PromptsService implements IPromptsService {
getPromptSlashCommandName: IPromptsService['getPromptSlashCommandName'] = unsupported
registerCustomAgentsProvider: IPromptsService['registerCustomAgentsProvider'] = () =>
Disposable.None
findClaudeSkills: IPromptsService['findClaudeSkills'] = async () => undefined
findAgentSkills: IPromptsService['findAgentSkills'] = async () => undefined
}
registerSingleton(IPromptsService, PromptsService, InstantiationType.Eager)

Expand Down Expand Up @@ -5897,15 +5900,10 @@ class ChatSessionsService implements IChatSessionsService {
@Unsupported
reportInProgress: IChatSessionsService['reportInProgress'] = unsupported

@Unsupported
setEditableSession: IChatSessionsService['setEditableSession'] = unsupported

@Unsupported
notifySessionItemsChanged: IChatSessionsService['notifySessionItemsChanged'] = unsupported

getInProgress: IChatSessionsService['getInProgress'] = () => []
getEditableData: IChatSessionsService['getEditableData'] = () => undefined
isEditable: IChatSessionsService['isEditable'] = () => false

onDidChangeItemsProviders: IChatSessionsService['onDidChangeItemsProviders'] = Event.None
onDidChangeSessionItems: IChatSessionsService['onDidChangeSessionItems'] = Event.None
Expand Down Expand Up @@ -5964,7 +5962,6 @@ class ChatSessionsService implements IChatSessionsService {
undefined

onDidChangeOptionGroups: IChatSessionsService['onDidChangeOptionGroups'] = Event.None
isChatSessionInProgressStatus: IChatSessionsService['isChatSessionInProgressStatus'] = () => false
}
registerSingleton(IChatSessionsService, ChatSessionsService, InstantiationType.Delayed)

Expand Down Expand Up @@ -6154,6 +6151,8 @@ class TerminalChatService implements ITerminalChatService {
getMostRecentProgressPart: ITerminalChatService['getMostRecentProgressPart'] = () => undefined
setChatSessionAutoApproval: ITerminalChatService['setChatSessionAutoApproval'] = () => {}
hasChatSessionAutoApproval: ITerminalChatService['hasChatSessionAutoApproval'] = () => false
addSessionAutoApproveRule: ITerminalChatService['addSessionAutoApproveRule'] = () => {}
getSessionAutoApproveRules: ITerminalChatService['getSessionAutoApproveRules'] = () => ({})
}

registerSingleton(ITerminalChatService, TerminalChatService, InstantiationType.Delayed)
Expand Down
Loading