diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000000..6836901226a --- /dev/null +++ b/.dockerignore @@ -0,0 +1,31 @@ +# Git +.git +.github +.gitignore +.gitattributes + +# Node (rebuilt in Docker) +node_modules + +# IDE +.idea + +# Documentation +README.md +HOW_TO_CONTRIBUTE.md +VOID_CODEBASE_GUIDE.md +LICENSE*.txt +ThirdPartyNotices.txt + +# CI/CD +CodeQL.yml + +# Build output (rebuilt in Docker) +out + +# OS +.DS_Store +Thumbs.db + +# Playwright browsers (not needed for server) +.playwright diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 00000000000..3010d42a857 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,3 @@ +# Default code owners for all files +* @danialsamiei + diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000000..99b0c21cb91 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +version: 2 +updates: + - package-ecosystem: "npm" + directory: "/" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 diff --git a/.voidrules b/.orciderules similarity index 75% rename from .voidrules rename to .orciderules index 55ab5af65de..1a70ff18d88 100644 --- a/.voidrules +++ b/.orciderules @@ -1,6 +1,6 @@ -This is a fork of the VSCode repo called Void. +This is the Orcide IDE repository, a fork of VSCode. -Most code we care about lives in src/vs/workbench/contrib/void. +Most code we care about lives in src/vs/workbench/contrib/orcide. You may often need to explore the full repo to find relevant parts of code. Look for services and built-in functions that you might need to use to solve the problem. @@ -9,7 +9,7 @@ In typescript, do NOT cast to types if not neccessary. NEVER lazily cast to 'any Do not add or remove semicolons to any of my files. Just go with convention and make the least number of changes. -Never modify files outside src/vs/workbench/contrib/void without consulting with the user first. +Never modify files outside src/vs/workbench/contrib/orcide without consulting with the user first. All types that map from a value A to B should be called bOfA. For example, if you create a hashmap that goes from toolId to toolName, it should be called toolNameOfToolId, etc. diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000000..4242b506245 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,61 @@ +# Dockerfile for ide.orcest.ai (VS Code fork) - Render.com deploy +# Requires X11 libs for native-keymap, node-pty, etc. + +FROM node:20-bookworm-slim + +# Install build deps for native modules (native-keymap, node-pty, etc.) +# ripgrep: @vscode/ripgrep postinstall downloads from GitHub and gets 403 in cloud builds +RUN apt-get update && apt-get install -y --no-install-recommends \ + python3 \ + make \ + g++ \ + pkg-config \ + libxkbfile-dev \ + libx11-dev \ + libxrandr-dev \ + libxi-dev \ + libxtst-dev \ + libxrender-dev \ + libxfixes-dev \ + libxext-dev \ + libxkbcommon-dev \ + libsecret-1-dev \ + libkrb5-dev \ + git \ + ripgrep \ + && rm -rf /var/lib/apt/lists/* + +WORKDIR /app + +# Copy source (postinstall needs full tree for build/, remote/, etc.) +COPY . . + +# Install deps - requires X11 libs above for native-keymap, node-pty +# Use --ignore-scripts to skip @vscode/ripgrep postinstall (403 from GitHub in cloud builds), +# supply system ripgrep, run postinstall (with install not rebuild for subdirs), then rebuild native modules +RUN npm i --ignore-scripts \ + && mkdir -p node_modules/@vscode/ripgrep/bin \ + && cp /usr/bin/rg node_modules/@vscode/ripgrep/bin/rg \ + && VSCODE_USE_SYSTEM_RIPGREP=1 npm rebuild \ + && mkdir -p build/node_modules/@vscode/ripgrep/bin \ + && cp /usr/bin/rg build/node_modules/@vscode/ripgrep/bin/rg \ + && (cd build && npm rebuild) \ + && mkdir -p remote/node_modules/@vscode/ripgrep/bin \ + && cp /usr/bin/rg remote/node_modules/@vscode/ripgrep/bin/rg \ + && (cd remote && npm rebuild) + +# Build: React components first, then compile produces out/ (server + workbench), compile-web adds extension web bundles +ENV NODE_OPTIONS="--max-old-space-size=4096" +RUN npm run buildreact \ + && npm run compile \ + && npm run compile-web + +# VSCODE_DEV=1 tells the server to use the dev workbench template which loads CSS +# dynamically via import maps. Without this, the server expects a bundled workbench.css +# that is only produced by the full packaging pipeline (gulp vscode-web-min), not by +# npm run compile. +ENV VSCODE_DEV=1 + +# Render sets PORT; use code-server (production) not code-web (test harness) +EXPOSE 10000 +CMD ["sh", "-c", "node out/server-main.js --host 0.0.0.0 --port ${PORT:-10000} --without-connection-token --accept-server-license-terms"] diff --git a/HOW_TO_CONTRIBUTE.md b/HOW_TO_CONTRIBUTE.md index 443e3540acf..4b4bcab8248 100644 --- a/HOW_TO_CONTRIBUTE.md +++ b/HOW_TO_CONTRIBUTE.md @@ -4,15 +4,15 @@ This is the official guide on how to contribute to Void. We want to make it as e There are a few ways to contribute: -- 💫 Complete items on the [Roadmap](https://github.com/orgs/voideditor/projects/2). +- 💫 Complete items on the [Roadmap](https://github.com/orgs/orcide/projects/2). - 💡 Make suggestions in our [Discord](https://discord.gg/RSNjgaugJs). -- 🪴 Start new Issues - see [Issues](https://github.com/voideditor/void/issues). +- 🪴 Start new Issues - see [Issues](https://github.com/orcest-ai/Orcide/issues). ### Codebase Guide -We [highly recommend reading this](https://github.com/voideditor/void/blob/main/VOID_CODEBASE_GUIDE.md) guide that we put together on Void's sourcecode if you'd like to add new features. +We [highly recommend reading this](https://github.com/orcest-ai/Orcide/blob/main/VOID_CODEBASE_GUIDE.md) guide that we put together on Void's sourcecode if you'd like to add new features. The repo is not as intimidating as it first seems if you read the guide! @@ -56,7 +56,7 @@ First, run `npm install -g node-gyp`. Then: Here's how to start changing Void's code. These steps cover everything from cloning Void, to opening a Developer Mode window where you can play around with your updates. -1. `git clone https://github.com/voideditor/void` to clone the repo. +1. `git clone https://github.com/orcest-ai/Orcide` to clone the repo. 2. `npm install` to install all dependencies. 3. Open Void or VSCode, and initialize Developer Mode (this can take ~5 min to finish, it's done when 2 of the 3 spinners turn to check marks): - Windows: Press Ctrl+Shift+B. @@ -85,7 +85,7 @@ If you get any errors, scroll down for common fixes. - If you get errors like `npm error libtool: error: unrecognised option: '-static'`, when running ./scripts/code.sh, make sure you have GNU libtool instead of BSD libtool (BSD is the default in macos) - If you get errors like `The SUID sandbox helper binary was found, but is not configured correctly` when running ./scripts/code.sh, run `sudo chown root:root .build/electron/chrome-sandbox && sudo chmod 4755 .build/electron/chrome-sandbox` and then run `./scripts/code.sh` again. -- If you have any other questions, feel free to [submit an issue](https://github.com/voideditor/void/issues/new). You can also refer to VSCode's complete [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute) page. +- If you have any other questions, feel free to [submit an issue](https://github.com/orcest-ai/Orcide/issues/new). You can also refer to VSCode's complete [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute) page. @@ -103,9 +103,9 @@ To build Void from the terminal instead of from inside VSCode, follow the steps ### Distributing -Void's maintainers distribute Void on our website and in releases. Our build pipeline is a fork of VSCodium, and it works by running GitHub Actions which create the downloadables. The build repo with more instructions lives [here](https://github.com/voideditor/void-builder). +Void's maintainers distribute Void on our website and in releases. Our build pipeline is a fork of VSCodium, and it works by running GitHub Actions which create the downloadables. The build repo with more instructions lives [here](https://github.com/orcest-ai/Orcide-builder). -If you want to completely control Void's build pipeline for your own internal usage, which comes with a lot of time cost (and is typically not recommended), see our [`void-builder`](https://github.com/voideditor/void-builder) repo which builds Void and contains a few important notes about auto-updating and rebasing. +If you want to completely control Void's build pipeline for your own internal usage, which comes with a lot of time cost (and is typically not recommended), see our [`void-builder`](https://github.com/orcest-ai/Orcide-builder) repo which builds Void and contains a few important notes about auto-updating and rebasing. #### Building a Local Executible diff --git a/VOID_CODEBASE_GUIDE.md b/ORCIDE_CODEBASE_GUIDE.md similarity index 79% rename from VOID_CODEBASE_GUIDE.md rename to ORCIDE_CODEBASE_GUIDE.md index 14a04686a6d..ba1704a6c97 100644 --- a/VOID_CODEBASE_GUIDE.md +++ b/ORCIDE_CODEBASE_GUIDE.md @@ -1,10 +1,10 @@ -# Void Codebase Guide +# Orcide Codebase Guide -The Void codebase is not as intimidating as it seems! +The Orcide codebase is not as intimidating as it seems! -Most of Void's code lives in the folder `src/vs/workbench/contrib/void/`. +Most of Orcide's code lives in the folder `src/vs/workbench/contrib/orcide/`. -The purpose of this document is to explain how Void's codebase works. If you want build instructions instead, see [Contributing](https://github.com/voideditor/void/blob/main/HOW_TO_CONTRIBUTE.md). +The purpose of this document is to explain how Orcide's codebase works. If you want build instructions instead, see [Contributing](https://github.com/orcest-ai/Orcide/blob/main/HOW_TO_CONTRIBUTE.md). @@ -14,10 +14,10 @@ The purpose of this document is to explain how Void's codebase works. If you wan -## Void Codebase Guide +## Orcide Codebase Guide ### VSCode Rundown -Here's a VSCode rundown if you're just getting started with Void. You can also see Microsoft's [wiki](https://github.com/microsoft/vscode/wiki/Source-Code-Organization) for some pictures. VSCode is an Electron app. Electron runs two processes: a **main** process (for internals) and a **browser** process (browser means HTML in general, not just "web browser"). +Here's a VSCode rundown if you're just getting started with Orcide. You can also see Microsoft's [wiki](https://github.com/microsoft/vscode/wiki/Source-Code-Organization) for some pictures. VSCode is an Electron app. Electron runs two processes: a **main** process (for internals) and a **browser** process (browser means HTML in general, not just "web browser").

Credit - https://github.com/microsoft/vscode/wiki/Source-Code-Organization

@@ -54,7 +54,7 @@ Here's some terminology you might want to know about when working inside VSCode: ### Internal LLM Message Pipeline -Here's a picture of all the dependencies that are relevent between the time you first send a message through Void's sidebar, and the time a request is sent to your provider. +Here's a picture of all the dependencies that are relevent between the time you first send a message through Orcide's sidebar, and the time a request is sent to your provider. Sending LLM messages from the main process avoids CSP issues with local providers and lets us use node_modules more easily. @@ -69,7 +69,7 @@ Sending LLM messages from the main process avoids CSP issues with local provider ### Apply -Void has two types of Apply: **Fast Apply** (uses Search/Replace, see below), and **Slow Apply** (rewrites whole file). +Orcide has two types of Apply: **Fast Apply** (uses Search/Replace, see below), and **Slow Apply** (rewrites whole file). When you click Apply and Fast Apply is enabled, we prompt the LLM to output Search/Replace block(s) like this: ``` @@ -79,7 +79,7 @@ When you click Apply and Fast Apply is enabled, we prompt the LLM to output Sear // replaced code goes here >>>>>>> UPDATED ``` -This is what allows Void to quickly apply code even on 1000-line files. It's the same as asking the LLM to press Ctrl+F and enter in a search/replace query. +This is what allows Orcide to quickly apply code even on 1000-line files. It's the same as asking the LLM to press Ctrl+F and enter in a search/replace query. ### Apply Inner Workings @@ -97,10 +97,10 @@ How Apply works: ### Writing Files Inner Workings -When Void wants to change your code, it just writes to a text model. This means all you need to know to write to a file is its URI - you don't have to load it, save it, etc. There are some annoying background URI/model things to think about to get this to work, but we handled them all in `voidModelService`. +When Orcide wants to change your code, it just writes to a text model. This means all you need to know to write to a file is its URI - you don't have to load it, save it, etc. There are some annoying background URI/model things to think about to get this to work, but we handled them all in `orcideModelService`. -### Void Settings Inner Workings -We have a service `voidSettingsService` that stores all your Void settings (providers, models, global Void settings, etc). Imagine this as an implicit dependency for any of the core Void services: +### Orcide Settings Inner Workings +We have a service `orcideSettingsService` that stores all your Orcide settings (providers, models, global Orcide settings, etc). Imagine this as an implicit dependency for any of the core Orcide services:
@@ -126,13 +126,13 @@ Here's a guide to some of the terminology we're using: ### Build process -If you want to know how our build pipeline works, see our build repo [here](https://github.com/voideditor/void-builder). +If you want to know how our build pipeline works, see our build repo [here](https://github.com/orcest-ai/Orcide-builder). ## VSCode Codebase Guide -For additional references, the Void team put together this list of links to get up and running with VSCode. +For additional references, the Orcide team put together this list of links to get up and running with VSCode.
@@ -155,7 +155,7 @@ For additional references, the Void team put together this list of links to get #### VSCode's Extension API -Void is no longer an extension, so these links are no longer required, but they might be useful if we ever build an extension again. +Orcide is no longer an extension, so these links are no longer required, but they might be useful if we ever build an extension again. - [Files you need in an extension](https://code.visualstudio.com/api/get-started/extension-anatomy). - [An extension's `package.json` schema](https://code.visualstudio.com/api/references/extension-manifest). diff --git a/README.md b/README.md index 63e779a40f7..5af1a9afe78 100644 --- a/README.md +++ b/README.md @@ -1,41 +1,70 @@ -# Welcome to Void. +
- Void Welcome +

Orcide: Cloud IDE

+

Part of the Orcest AI Ecosystem

-Void is the open-source Cursor alternative. +
+ MIT License +
+ +
+ +Orcide is an AI-powered cloud IDE that provides intelligent code editing, autocomplete, and refactoring capabilities. It is a core component of the **Orcest AI** ecosystem, integrated with **RainyModel** (rm.orcest.ai) for intelligent LLM routing. -Use AI agents on your codebase, checkpoint and visualize changes, and bring any model or host locally. Void sends messages directly to providers without retaining your data. +### Orcest AI Ecosystem -This repo contains the full sourcecode for Void. If you're new, welcome! +| Service | Domain | Role | +|---------|--------|------| +| **Lamino** | llm.orcest.ai | LLM Workspace | +| **RainyModel** | rm.orcest.ai | LLM Routing Proxy | +| **Maestrist** | agent.orcest.ai | AI Agent Platform | +| **Orcide** | ide.orcest.ai | Cloud IDE | +| **Login** | login.orcest.ai | SSO Authentication | -- 🧭 [Website](https://voideditor.com) +## Features -- 👋 [Discord](https://discord.gg/RSNjgaugJs) +- **AI-Powered Code Editing**: Intelligent code suggestions and completions +- **Chat Interface**: Built-in AI chat for code assistance +- **Autocomplete**: Context-aware code completion powered by RainyModel +- **Code Refactoring**: AI-assisted code improvements +- **RainyModel Integration**: Smart LLM routing with automatic fallback (Free → Internal → Premium) +- **SSO Authentication**: Enterprise-grade access control via login.orcest.ai +- **VS Code Compatible**: Full VS Code extension ecosystem support -- 🚙 [Project Board](https://github.com/orgs/voideditor/projects/2) +## RainyModel Configuration +Configure Orcide to use RainyModel as its AI backend: -## Note +1. Open Settings (Ctrl+,) +2. Navigate to AI / LLM settings +3. Set: + - **API Provider**: OpenAI-Compatible + - **Base URL**: `https://rm.orcest.ai/v1` + - **API Key**: Your RainyModel API key + - **Chat Model**: `rainymodel/chat` + - **Autocomplete Model**: `rainymodel/code` -We've paused work on the Void IDE (this repo) to explore a few novel coding ideas. We want to focus on innovation over feature-parity. Void will continue running, but without maintenance some existing features might stop working over time. Depending on the direction of our new work, we might not resume Void as an IDE. +## Development -We won't be actively reviewing Issues and PRs, but we will respond to all [email](mailto:hello@voideditor.com) inquiries on building and maintaining your own version of Void while we're paused. +```bash +# Install dependencies +yarn install -## Reference +# Build +yarn build -Void is a fork of the [vscode](https://github.com/microsoft/vscode) repository. For a guide to the codebase, see [VOID_CODEBASE_GUIDE](https://github.com/voideditor/void/blob/main/VOID_CODEBASE_GUIDE.md). +# Run in development mode +yarn watch +``` -For a guide on how to develop your own version of Void, see [HOW_TO_CONTRIBUTE](https://github.com/voideditor/void/blob/main/HOW_TO_CONTRIBUTE.md) and [void-builder](https://github.com/voideditor/void-builder). +## Contributing +See [HOW_TO_CONTRIBUTE.md](HOW_TO_CONTRIBUTE.md) for contribution guidelines. +## License +This project is licensed under the [MIT License](LICENSE). -## Support -You can always reach us in our Discord server or contact us via email: hello@voideditor.com. +Part of the [Orcest AI](https://orcest.ai) ecosystem. diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000000..608839cf7c7 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,27 @@ +# Security Policy + +## Supported Versions + +| Version | Supported | +|---------|-----------| +| Latest | Yes | + +## Reporting a Vulnerability + +If you discover a security vulnerability, please report it responsibly: + +1. **Do NOT** open a public GitHub issue +2. Use [GitHub Security Advisories](https://github.com/orcest-ai/Orcide/security/advisories/new) to report privately +3. Or email: support@orcest.ai + +We will acknowledge receipt within 48 hours and provide a timeline for resolution. + +## Security Best Practices + +- All secrets must be stored in environment variables, never in code +- All services require SSO authentication via login.orcest.ai +- API keys must be rotated regularly +- All traffic must use HTTPS/TLS + +Part of the [Orcest AI](https://orcest.ai) ecosystem. + diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js index 458847afac5..02b716904ee 100644 --- a/build/npm/postinstall.js +++ b/build/npm/postinstall.js @@ -46,7 +46,12 @@ function npmInstall(dir, opts) { shell: true }; - const command = process.env['npm_command'] || 'install'; + // When parent runs "npm rebuild", npm_command=rebuild causes subdirs to run "npm rebuild" + // which doesn't install packages. Subdirs need "npm install" to populate node_modules. + const rawCommand = opts.npmCommandOverride != null + ? opts.npmCommandOverride + : (process.env['npm_command'] || 'install'); + const command = (rawCommand === 'rebuild' ? 'install' : rawCommand); if (process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'] && /^(.build\/distro\/npm\/)?remote$/.test(dir)) { const userinfo = os.userInfo(); @@ -128,6 +133,10 @@ for (let dir of dirs) { ...process.env }, } + // When set, use --ignore-scripts for build to skip @vscode/ripgrep postinstall (403 from GitHub). + if (process.env['VSCODE_USE_SYSTEM_RIPGREP']) { + opts.npmCommandOverride = 'install --ignore-scripts'; + } if (process.env['CC']) { opts.env['CC'] = 'gcc'; } if (process.env['CXX']) { opts.env['CXX'] = 'g++'; } if (process.env['CXXFLAGS']) { opts.env['CXXFLAGS'] = ''; } @@ -145,6 +154,11 @@ for (let dir of dirs) { ...process.env }, } + // When set, use --ignore-scripts for remote to skip @vscode/ripgrep postinstall (403 from GitHub). + // Caller must then copy system ripgrep into remote/node_modules/@vscode/ripgrep/bin and run npm rebuild in remote. + if (process.env['VSCODE_USE_SYSTEM_RIPGREP']) { + opts.npmCommandOverride = 'install --ignore-scripts'; + } if (process.env['VSCODE_REMOTE_CC']) { opts.env['CC'] = process.env['VSCODE_REMOTE_CC']; } else { @@ -188,5 +202,8 @@ for (let dir of dirs) { npmInstall(dir, opts); } -cp.execSync('git config pull.rebase merges'); -cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs'); +// Skip git config if not in a git repo (e.g. Docker build where .git is not copied) +if (fs.existsSync(path.join(root, '.git'))) { + cp.execSync('git config pull.rebase merges'); + cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs'); +} diff --git a/extensions/open-remote-ssh/package.json b/extensions/open-remote-ssh/package.json index 48276a7a05f..762ff56547b 100644 --- a/extensions/open-remote-ssh/package.json +++ b/extensions/open-remote-ssh/package.json @@ -1,7 +1,7 @@ { "name": "open-remote-ssh", "displayName": "Open Remote - SSH", - "publisher": "voideditor", + "publisher": "orcide", "description": "Use any remote machine with a SSH server as your development environment.", "version": "0.0.48", "icon": "resources/icon.png", @@ -71,7 +71,7 @@ "type": "string", "description": "The URL from where the vscode server will be downloaded. You can use the following variables and they will be replaced dynamically:\n- ${quality}: vscode server quality, e.g. stable or insiders\n- ${version}: vscode server version, e.g. 1.69.0\n- ${commit}: vscode server release commit\n- ${arch}: vscode server arch, e.g. x64, armhf, arm64\n- ${release}: release number", "scope": "application", - "default": "https://github.com/voideditor/binaries/releases/download/${version}/void-reh-${os}-${arch}-${version}.tar.gz" + "default": "https://github.com/orcest-ai/Orcide-binaries/releases/download/${version}/void-reh-${os}-${arch}-${version}.tar.gz" }, "remote.SSH.remotePlatform": { "type": "object", diff --git a/extensions/open-remote-ssh/src/serverSetup.ts b/extensions/open-remote-ssh/src/serverSetup.ts index 673a795746c..70891f9061c 100644 --- a/extensions/open-remote-ssh/src/serverSetup.ts +++ b/extensions/open-remote-ssh/src/serverSetup.ts @@ -39,7 +39,7 @@ export class ServerInstallError extends Error { } } -const DEFAULT_DOWNLOAD_URL_TEMPLATE = 'https://github.com/voideditor/binaries/releases/download/${version}/void-reh-${os}-${arch}-${version}.tar.gz'; +const DEFAULT_DOWNLOAD_URL_TEMPLATE = 'https://github.com/orcest-ai/Orcide-binaries/releases/download/${version}/void-reh-${os}-${arch}-${version}.tar.gz'; export async function installCodeServer(conn: SSHConnection, serverDownloadUrlTemplate: string | undefined, extensionIds: string[], envVariables: string[], platform: string | undefined, useSocketPath: boolean, logger: Log): Promise { let shell = 'powershell'; diff --git a/extensions/open-remote-wsl/package.json b/extensions/open-remote-wsl/package.json index bba06d81239..4afeb8b582b 100644 --- a/extensions/open-remote-wsl/package.json +++ b/extensions/open-remote-wsl/package.json @@ -38,7 +38,7 @@ "type": "string", "description": "The URL from where the vscode server will be downloaded. You can use the following variables and they will be replaced dynamically:\n- ${quality}: vscode server quality, e.g. stable or insiders\n- ${version}: vscode server version, e.g. 1.69.0\n- ${commit}: vscode server release commit\n- ${arch}: vscode server arch, e.g. x64, armhf, arm64\n- ${release}: release number", "scope": "application", - "default": "https://github.com/voideditor/binaries/releases/download/${version}/void-reh-${os}-${arch}-${version}.tar.gz" + "default": "https://github.com/orcest-ai/Orcide-binaries/releases/download/${version}/void-reh-${os}-${arch}-${version}.tar.gz" } } }, diff --git a/extensions/open-remote-wsl/src/serverSetup.ts b/extensions/open-remote-wsl/src/serverSetup.ts index 2f56862cfbb..e33a456df1c 100644 --- a/extensions/open-remote-wsl/src/serverSetup.ts +++ b/extensions/open-remote-wsl/src/serverSetup.ts @@ -39,7 +39,7 @@ export class ServerInstallError extends Error { } } -const DEFAULT_DOWNLOAD_URL_TEMPLATE = 'https://github.com/voideditor/binaries/releases/download/${version}/void-reh-${os}-${arch}-${version}.tar.gz'; +const DEFAULT_DOWNLOAD_URL_TEMPLATE = 'https://github.com/orcest-ai/Orcide-binaries/releases/download/${version}/void-reh-${os}-${arch}-${version}.tar.gz'; export async function installCodeServer(wslManager: WSLManager, distroName: string, serverDownloadUrlTemplate: string | undefined, extensionIds: string[], envVariables: string[], logger: Log): Promise { const scriptId = crypto.randomBytes(12).toString('hex'); diff --git a/void_icons/code.ico b/orcide_icons/code.ico similarity index 100% rename from void_icons/code.ico rename to orcide_icons/code.ico diff --git a/void_icons/cubecircled.png b/orcide_icons/cubecircled.png similarity index 100% rename from void_icons/cubecircled.png rename to orcide_icons/cubecircled.png diff --git a/void_icons/logo_cube_noshadow.png b/orcide_icons/logo_cube_noshadow.png similarity index 100% rename from void_icons/logo_cube_noshadow.png rename to orcide_icons/logo_cube_noshadow.png diff --git a/void_icons/slice_of_void.png b/orcide_icons/slice_of_void.png similarity index 100% rename from void_icons/slice_of_void.png rename to orcide_icons/slice_of_void.png diff --git a/package.json b/package.json index e6341c0903b..2fa4ba13db8 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,17 @@ { - "name": "code-oss-dev", - "version": "1.99.3", + "name": "orcide", + "version": "2.0.0", "distro": "21c8d8ea1e46d97c5639a7cabda6c0e063cc8dd5", "author": { - "name": "Microsoft Corporation" + "name": "Orcest AI" }, "license": "MIT", "main": "./out/main.js", "type": "module", "private": true, "scripts": { - "buildreact": "cd ./src/vs/workbench/contrib/void/browser/react/ && node build.js && cd ../../../../../../../", - "watchreact": "cd ./src/vs/workbench/contrib/void/browser/react/ && node build.js --watch && cd ../../../../../../../", + "buildreact": "cd ./src/vs/workbench/contrib/orcide/browser/react/ && node build.js && cd ../../../../../../../", + "watchreact": "cd ./src/vs/workbench/contrib/orcide/browser/react/ && node build.js --watch && cd ../../../../../../../", "watchreactd": "deemon npm run watchreact", "test": "echo Please run any of the test scripts from the scripts folder.", "test-browser": "npx playwright install && node test/unit/browser/index.js", @@ -263,10 +263,10 @@ }, "repository": { "type": "git", - "url": "https://github.com/microsoft/vscode.git" + "url": "https://github.com/orcest-ai/Orcide.git" }, "bugs": { - "url": "https://github.com/microsoft/vscode/issues" + "url": "https://github.com/orcest-ai/Orcide/issues" }, "optionalDependencies": { "windows-foreground-love": "0.5.0" diff --git a/product.json b/product.json index b939424b68c..1788d4824cd 100644 --- a/product.json +++ b/product.json @@ -1,46 +1,74 @@ { - "nameShort": "Void", - "nameLong": "Void", - "voidVersion": "1.4.9", - "voidRelease": "0044", - "applicationName": "void", - "dataFolderName": ".void-editor", - "win32MutexName": "voideditor", + "nameShort": "Orcide", + "nameLong": "Orcide", + "orcideVersion": "2.0.0", + "orcideRelease": "0001", + "applicationName": "orcide", + "dataFolderName": ".orcide", + "win32MutexName": "orcide", "licenseName": "MIT", - "licenseUrl": "https://github.com/voideditor/void/blob/main/LICENSE.txt", - "serverLicenseUrl": "https://github.com/voideditor/void/blob/main/LICENSE.txt", + "licenseUrl": "https://github.com/orcest-ai/Orcide/blob/main/LICENSE.txt", + "serverLicenseUrl": "https://github.com/orcest-ai/Orcide/blob/main/LICENSE.txt", "serverGreeting": [], "serverLicense": [], "serverLicensePrompt": "", - "serverApplicationName": "void-server", - "serverDataFolderName": ".void-server", - "tunnelApplicationName": "void-tunnel", - "win32DirName": "Void", - "win32NameVersion": "Void", - "win32RegValueName": "VoidEditor", + "serverApplicationName": "orcide-server", + "serverDataFolderName": ".orcide-server", + "tunnelApplicationName": "orcide-tunnel", + "win32DirName": "Orcide", + "win32NameVersion": "Orcide", + "win32RegValueName": "Orcide", "win32x64AppId": "{{9D394D01-1728-45A7-B997-A6C82C5452C3}", "win32arm64AppId": "{{0668DD58-2BDE-4101-8CDA-40252DF8875D}", "win32x64UserAppId": "{{8BED5DC1-6C55-46E6-9FE6-18F7E6F7C7F1}", "win32arm64UserAppId": "{{F6C87466-BC82-4A8F-B0FF-18CA366BA4D8}", - "win32AppUserModelId": "Void.Editor", - "win32ShellNameShort": "V&oid", - "win32TunnelServiceMutex": "void-tunnelservice", - "win32TunnelMutex": "void-tunnel", - "darwinBundleIdentifier": "com.voideditor.code", - "linuxIconName": "void-editor", + "win32AppUserModelId": "Orcide.Editor", + "win32ShellNameShort": "O&rcide", + "win32TunnelServiceMutex": "orcide-tunnelservice", + "win32TunnelMutex": "orcide-tunnel", + "darwinBundleIdentifier": "com.orcide.code", + "linuxIconName": "orcide", "licenseFileName": "LICENSE.txt", - "reportIssueUrl": "https://github.com/voideditor/void/issues/new", + "reportIssueUrl": "https://github.com/orcest-ai/Orcide/issues/new", "nodejsRepository": "https://nodejs.org", - "urlProtocol": "void", + "urlProtocol": "orcide", + "ssoProvider": { + "issuer": "https://login.orcest.ai", + "clientId": "orcide", + "redirectUri": "https://ide.orcest.ai/auth/callback", + "scopes": ["openid", "profile", "email"], + "authorizationEndpoint": "https://login.orcest.ai/oauth2/authorize", + "tokenEndpoint": "https://login.orcest.ai/oauth2/token", + "userInfoEndpoint": "https://login.orcest.ai/oauth2/userinfo", + "jwksUri": "https://login.orcest.ai/oauth2/jwks", + "logoutUrl": "https://login.orcest.ai/logout" + }, + "defaultApiProvider": { + "name": "rainymodel", + "endpoint": "https://rm.orcest.ai/v1", + "displayName": "RainyModel" + }, + "orcestApis": { + "rainymodel": "https://rm.orcest.ai", + "lamino": "https://llm.orcest.ai", + "maestrist": "https://agent.orcest.ai", + "ollamafreeapi": "https://ollamafreeapi.orcest.ai" + }, "extensionsGallery": { "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", "itemUrl": "https://marketplace.visualstudio.com/items" }, "builtInExtensions": [], "linkProtectionTrustedDomains": [ - "https://voideditor.com", - "https://voideditor.dev", - "https://github.com/voideditor/void", + "https://orcest.ai", + "https://login.orcest.ai", + "https://ide.orcest.ai", + "https://rm.orcest.ai", + "https://llm.orcest.ai", + "https://agent.orcest.ai", + "https://ollamafreeapi.orcest.ai", + "https://orcide.dev", + "https://github.com/orcest-ai/Orcide", "https://ollama.com" ] } diff --git a/scripts/appimage/void-url-handler.desktop b/scripts/appimage/orcide-url-handler.desktop similarity index 60% rename from scripts/appimage/void-url-handler.desktop rename to scripts/appimage/orcide-url-handler.desktop index 948a823b6a6..f694fced895 100644 --- a/scripts/appimage/void-url-handler.desktop +++ b/scripts/appimage/orcide-url-handler.desktop @@ -1,12 +1,12 @@ [Desktop Entry] -Name=Void - URL Handler +Name=Orcide - URL Handler Comment=Open source AI code editor. GenericName=Text Editor -Exec=void --open-url %U -Icon=void +Exec=orcide --open-url %U +Icon=orcide Type=Application NoDisplay=true StartupNotify=true Categories=Utility;TextEditor;Development;IDE; -MimeType=x-scheme-handler/void; -Keywords=void; +MimeType=x-scheme-handler/orcide; +Keywords=orcide; diff --git a/scripts/appimage/void.desktop b/scripts/appimage/orcide.desktop similarity index 76% rename from scripts/appimage/void.desktop rename to scripts/appimage/orcide.desktop index 0ccbce43f51..36bb77d25db 100755 --- a/scripts/appimage/void.desktop +++ b/scripts/appimage/orcide.desktop @@ -1,15 +1,15 @@ [Desktop Entry] -Name=Void +Name=Orcide Comment=Open source AI code editor. GenericName=Text Editor -Exec=void %F -Icon=void +Exec=orcide %F +Icon=orcide Type=Application StartupNotify=false -StartupWMClass=Void +StartupWMClass=Orcide Categories=TextEditor;Development;IDE; -MimeType=application/x-void-workspace; -Keywords=void; +MimeType=application/x-orcide-workspace; +Keywords=orcide; Actions=new-empty-window; [Desktop Action new-empty-window] @@ -23,5 +23,5 @@ Name[ko]=새 빈 창 Name[ru]=Новое пустое окно Name[zh_CN]=新建空窗口 Name[zh_TW]=開新空視窗 -Exec=void --new-window %F -Icon=void +Exec=orcide --new-window %F +Icon=orcide diff --git a/scripts/appimage/void.png b/scripts/appimage/orcide.png similarity index 100% rename from scripts/appimage/void.png rename to scripts/appimage/orcide.png diff --git a/scripts/appimage/readme.md b/scripts/appimage/readme.md index f31301a6d9e..fb19f3b805e 100644 --- a/scripts/appimage/readme.md +++ b/scripts/appimage/readme.md @@ -7,13 +7,13 @@ This is a community-made AppImage creation script. There are some reported bugs with it. To generate an AppImage yourself, feel free to look at -stable-linux.yml in the separate `void-builder/` repo, +stable-linux.yml in the separate `orcide-builder/` repo, which runs a GitHub Action that builds the AppImage you see on our website. -# Void AppImage Creation Script +# Orcide AppImage Creation Script -This script automates the process of creating an AppImage for the Void Editor using Docker. It works on macOS and Linux platforms. +This script automates the process of creating an AppImage for the Orcide Editor using Docker. It works on macOS and Linux platforms. ## Requirements * **Docker:** The script relies on Docker to build the AppImage inside a container. @@ -87,8 +87,8 @@ These dependencies are installed within the Docker container (Ubuntu 20.04 base) Copy the following files to the directory where the app binary is being bundled (created during the build process): * `create_appimage.sh` - * `void.desktop` - * `void.png` + * `orcide.desktop` + * `orcide.png` 4. **Run the Script:** @@ -98,7 +98,7 @@ These dependencies are installed within the Docker container (Ubuntu 20.04 base) 5. **Result:** - After the script completes, it will generate an AppImage named `Void-x86_64.AppImage` (or similar, depending on your architecture) in the current directory. + After the script completes, it will generate an AppImage named `Orcide-x86_64.AppImage` (or similar, depending on your architecture) in the current directory. ## Script Overview @@ -109,9 +109,9 @@ These dependencies are installed within the Docker container (Ubuntu 20.04 base) * **Dockerfile Creation:** Creates a temporary `Dockerfile.build` for the Ubuntu-based environment. * **Docker Image Build:** Builds a Docker image and runs the build process. * **AppImage Creation:** - * Creates the `VoidApp.AppDir` structure. + * Creates the `OrcideApp.AppDir` structure. * Copies binaries, resources, and the `.desktop` entry. - * Copies `void.desktop` and `void.png`. + * Copies `orcide.desktop` and `orcide.png`. * Strips unnecessary symbols from the binary. * Runs `appimagetool` to generate the AppImage. * **Cleanup:** Removes the temporary `Dockerfile.build`. diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts index c3d2dfe5461..177fc7481a2 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -125,14 +125,14 @@ import ErrorTelemetry from '../../platform/telemetry/electron-main/errorTelemetr // in theory this is not allowed // ignore the eslint errors below -import { IMetricsService } from '../../workbench/contrib/void/common/metricsService.js'; -import { IVoidUpdateService } from '../../workbench/contrib/void/common/voidUpdateService.js'; -import { MetricsMainService } from '../../workbench/contrib/void/electron-main/metricsMainService.js'; -import { VoidMainUpdateService } from '../../workbench/contrib/void/electron-main/voidUpdateMainService.js'; -import { LLMMessageChannel } from '../../workbench/contrib/void/electron-main/sendLLMMessageChannel.js'; -import { VoidSCMService } from '../../workbench/contrib/void/electron-main/voidSCMMainService.js'; -import { IVoidSCMService } from '../../workbench/contrib/void/common/voidSCMTypes.js'; -import { MCPChannel } from '../../workbench/contrib/void/electron-main/mcpChannel.js'; +import { IMetricsService } from '../../workbench/contrib/orcide/common/metricsService.js'; +import { IOrcideUpdateService } from '../../workbench/contrib/orcide/common/orcideUpdateService.js'; +import { MetricsMainService } from '../../workbench/contrib/orcide/electron-main/metricsMainService.js'; +import { OrcideMainUpdateService } from '../../workbench/contrib/orcide/electron-main/orcideUpdateMainService.js'; +import { LLMMessageChannel } from '../../workbench/contrib/orcide/electron-main/sendLLMMessageChannel.js'; +import { OrcideSCMService } from '../../workbench/contrib/orcide/electron-main/orcideSCMMainService.js'; +import { IOrcideSCMService } from '../../workbench/contrib/orcide/common/orcideSCMTypes.js'; +import { MCPChannel } from '../../workbench/contrib/orcide/electron-main/mcpChannel.js'; /** * The main VS Code application. There will only ever be one instance, * even if the user starts many instances (e.g. from the command line). @@ -1103,8 +1103,8 @@ export class CodeApplication extends Disposable { // Void main process services (required for services with a channel for comm between browser and electron-main (node)) services.set(IMetricsService, new SyncDescriptor(MetricsMainService, undefined, false)); - services.set(IVoidUpdateService, new SyncDescriptor(VoidMainUpdateService, undefined, false)); - services.set(IVoidSCMService, new SyncDescriptor(VoidSCMService, undefined, false)); + services.set(IOrcideUpdateService, new SyncDescriptor(OrcideMainUpdateService, undefined, false)); + services.set(IOrcideSCMService, new SyncDescriptor(OrcideSCMService, undefined, false)); // Default Extensions Profile Init services.set(IExtensionsProfileScannerService, new SyncDescriptor(ExtensionsProfileScannerService, undefined, true)); @@ -1238,21 +1238,21 @@ export class CodeApplication extends Disposable { // Void - use loggerChannel as reference const metricsChannel = ProxyChannel.fromService(accessor.get(IMetricsService), disposables); - mainProcessElectronServer.registerChannel('void-channel-metrics', metricsChannel); + mainProcessElectronServer.registerChannel('orcide-channel-metrics', metricsChannel); - const voidUpdatesChannel = ProxyChannel.fromService(accessor.get(IVoidUpdateService), disposables); - mainProcessElectronServer.registerChannel('void-channel-update', voidUpdatesChannel); + const orcideUpdatesChannel = ProxyChannel.fromService(accessor.get(IOrcideUpdateService), disposables); + mainProcessElectronServer.registerChannel('orcide-channel-update', orcideUpdatesChannel); const sendLLMMessageChannel = new LLMMessageChannel(accessor.get(IMetricsService)); - mainProcessElectronServer.registerChannel('void-channel-llmMessage', sendLLMMessageChannel); + mainProcessElectronServer.registerChannel('orcide-channel-llmMessage', sendLLMMessageChannel); // Void added this - const voidSCMChannel = ProxyChannel.fromService(accessor.get(IVoidSCMService), disposables); - mainProcessElectronServer.registerChannel('void-channel-scm', voidSCMChannel); + const orcideSCMChannel = ProxyChannel.fromService(accessor.get(IOrcideSCMService), disposables); + mainProcessElectronServer.registerChannel('orcide-channel-scm', orcideSCMChannel); // Void added this const mcpChannel = new MCPChannel(); - mainProcessElectronServer.registerChannel('void-channel-mcp', mcpChannel); + mainProcessElectronServer.registerChannel('orcide-channel-mcp', mcpChannel); // Extension Host Debug Broadcasting const electronExtensionHostDebugBroadcastChannel = new ElectronExtensionHostDebugBroadcastChannel(accessor.get(IWindowsMainService)); diff --git a/src/vs/platform/keybinding/common/keybindingsRegistry.ts b/src/vs/platform/keybinding/common/keybindingsRegistry.ts index e83230ae2db..825bdb4b90e 100644 --- a/src/vs/platform/keybinding/common/keybindingsRegistry.ts +++ b/src/vs/platform/keybinding/common/keybindingsRegistry.ts @@ -65,7 +65,7 @@ export const enum KeybindingWeight { WorkbenchContrib = 200, BuiltinExtension = 300, ExternalExtension = 400, - VoidExtension = 605, // Void - must trump any external extension + OrcideExtension = 605, // Orcide - must trump any external extension } export interface ICommandAndKeybindingRule extends IKeybindingRule { diff --git a/src/vs/server/node/webClientServer.ts b/src/vs/server/node/webClientServer.ts index e36113b4bfe..807854829cb 100644 --- a/src/vs/server/node/webClientServer.ts +++ b/src/vs/server/node/webClientServer.ts @@ -298,6 +298,9 @@ export class WebClientServer { remoteAuthority = replacePort(remoteAuthority, forwardedPort); } + const forwardedProto = getFirstHeader('x-forwarded-proto'); + const remoteScheme: 'http' | 'https' = forwardedProto === 'https' ? 'https' : 'http'; + function asJSON(value: unknown): string { return JSON.stringify(value).replace(/"/g, '"'); } @@ -338,7 +341,7 @@ export class WebClientServer { extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? { ...this._productService.extensionsGallery, resourceUrlTemplate: this._webExtensionResourceUrlTemplate.with({ - scheme: 'http', + scheme: remoteScheme, authority: remoteAuthority, path: `${webExtensionRoute}/${this._webExtensionResourceUrlTemplate.authority}${this._webExtensionResourceUrlTemplate.path}` }).toString(true) @@ -415,10 +418,11 @@ export class WebClientServer { const webWorkerExtensionHostIframeScriptSHA = 'sha256-2Q+j4hfT09+1+imS46J2YlkCtHWQt0/BE79PXjJ0ZJ8='; const cspDirectives = [ + ...(remoteScheme === 'https' ? ['upgrade-insecure-requests;'] : []), 'default-src \'self\';', 'img-src \'self\' https: data: blob:;', 'media-src \'self\';', - `script-src 'self' 'unsafe-eval' ${WORKBENCH_NLS_BASE_URL ?? ''} blob: 'nonce-1nline-m4p' ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' 'sha256-/r7rqQ+yrxt57sxLuQ6AMYcy/lUpvAIzHjIJt/OeLWU=' ${useTestResolver ? '' : `http://${remoteAuthority}`};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html + `script-src 'self' 'unsafe-eval' ${WORKBENCH_NLS_BASE_URL ?? ''} blob: 'nonce-1nline-m4p' ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' 'sha256-/r7rqQ+yrxt57sxLuQ6AMYcy/lUpvAIzHjIJt/OeLWU=' ${useTestResolver ? '' : `${remoteScheme}://${remoteAuthority}`};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html 'child-src \'self\';', `frame-src 'self' https://*.vscode-cdn.net data:;`, 'worker-src \'self\' data: blob:;', diff --git a/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts b/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts index 120223e43c1..3f29ee88fa9 100644 --- a/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts +++ b/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts @@ -25,7 +25,7 @@ import { splitRecentLabel } from '../../../../base/common/labels.js'; import { IViewsService } from '../../../services/views/common/viewsService.js'; /* eslint-disable */ // Void -import { VOID_CTRL_K_ACTION_ID, VOID_CTRL_L_ACTION_ID } from '../../../contrib/void/browser/actionIDs.js'; +import { ORCIDE_CTRL_K_ACTION_ID, ORCIDE_CTRL_L_ACTION_ID } from '../../../contrib/orcide/browser/actionIDs.js'; import { VIEWLET_ID as REMOTE_EXPLORER_VIEWLET_ID } from '../../../contrib/remote/browser/remoteExplorer.js'; /* eslint-enable */ @@ -284,7 +284,7 @@ export class EditorGroupWatermark extends Disposable { else { // show them Void keybindings - const keys = this.keybindingService.lookupKeybinding(VOID_CTRL_L_ACTION_ID); + const keys = this.keybindingService.lookupKeybinding(ORCIDE_CTRL_L_ACTION_ID); const dl = append(voidIconBox, $('dl')); const dt = append(dl, $('dt')); dt.textContent = 'Chat' @@ -295,7 +295,7 @@ export class EditorGroupWatermark extends Disposable { this.currentDisposables.add(label); - const keys2 = this.keybindingService.lookupKeybinding(VOID_CTRL_K_ACTION_ID); + const keys2 = this.keybindingService.lookupKeybinding(ORCIDE_CTRL_K_ACTION_ID); const dl2 = append(voidIconBox, $('dl')); const dt2 = append(dl2, $('dt')); dt2.textContent = 'Quick Edit' diff --git a/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts b/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts index 38a342c58b4..6235af85344 100644 --- a/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts +++ b/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts @@ -27,7 +27,7 @@ import { ThemeIcon } from '../../../../base/common/themables.js'; import { IExplorerService } from './files.js'; import { Codicon } from '../../../../base/common/codicons.js'; import { Categories } from '../../../../platform/action/common/actionCommonCategories.js'; -import { VOID_OPEN_SETTINGS_ACTION_ID } from '../../void/browser/voidSettingsPane.js'; +import { ORCIDE_OPEN_SETTINGS_ACTION_ID } from '../../orcide/browser/orcideSettingsPane.js'; // Contribute Global Actions @@ -681,7 +681,7 @@ for (const menuId of [MenuId.EmptyEditorGroupContext, MenuId.EditorTabsBarContex MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, { group: '0_void', command: { - id: VOID_OPEN_SETTINGS_ACTION_ID, + id: ORCIDE_OPEN_SETTINGS_ACTION_ID, title: nls.localize({ key: 'openVoid', comment: ['&& denotes a mnemonic'] }, "&&Open Void Settings"), }, order: 1 diff --git a/src/vs/workbench/contrib/void/browser/_dummyContrib.ts b/src/vs/workbench/contrib/orcide/browser/_dummyContrib.ts similarity index 87% rename from src/vs/workbench/contrib/void/browser/_dummyContrib.ts rename to src/vs/workbench/contrib/orcide/browser/_dummyContrib.ts index 88dbc6c1d10..2fe593117dc 100644 --- a/src/vs/workbench/contrib/void/browser/_dummyContrib.ts +++ b/src/vs/workbench/contrib/orcide/browser/_dummyContrib.ts @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js'; @@ -29,11 +29,11 @@ registerAction2(class extends Action2 { constructor() { super({ f1: true, - id: 'void.dummy', + id: 'orcide.dummy', title: localize2('dummy', 'dummy: Init'), keybinding: { primary: KeyMod.CtrlCmd | KeyCode.Digit0, - weight: KeybindingWeight.VoidExtension, + weight: KeybindingWeight.OrcideExtension, } }); } @@ -45,7 +45,7 @@ registerAction2(class extends Action2 { class DummyService extends Disposable implements IWorkbenchContribution, IDummyService { - static readonly ID = 'workbench.contrib.void.dummy' // workbenchContributions need this, services do not + static readonly ID = 'workbench.contrib.orcide.dummy' // workbenchContributions need this, services do not _serviceBrand: undefined; constructor( diff --git a/src/vs/workbench/contrib/void/browser/_markerCheckService.ts b/src/vs/workbench/contrib/orcide/browser/_markerCheckService.ts similarity index 96% rename from src/vs/workbench/contrib/void/browser/_markerCheckService.ts rename to src/vs/workbench/contrib/orcide/browser/_markerCheckService.ts index be1ca0074bf..3b3571e9fd4 100644 --- a/src/vs/workbench/contrib/void/browser/_markerCheckService.ts +++ b/src/vs/workbench/contrib/orcide/browser/_markerCheckService.ts @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { Disposable } from '../../../../base/common/lifecycle.js'; diff --git a/src/vs/workbench/contrib/orcide/browser/actionIDs.ts b/src/vs/workbench/contrib/orcide/browser/actionIDs.ts new file mode 100644 index 00000000000..367d37aa1aa --- /dev/null +++ b/src/vs/workbench/contrib/orcide/browser/actionIDs.ts @@ -0,0 +1,26 @@ +// Normally you'd want to put these exports in the files that register them, but if you do that you'll get an import order error if you import them in certain cases. +// (importing them runs the whole file to get the ID, causing an import error). I guess it's best practice to separate out IDs, pretty annoying... + +export const ORCIDE_CTRL_L_ACTION_ID = 'orcide.ctrlLAction' + +export const ORCIDE_CTRL_K_ACTION_ID = 'orcide.ctrlKAction' + +export const ORCIDE_ACCEPT_DIFF_ACTION_ID = 'orcide.acceptDiff' + +export const ORCIDE_REJECT_DIFF_ACTION_ID = 'orcide.rejectDiff' + +export const ORCIDE_GOTO_NEXT_DIFF_ACTION_ID = 'orcide.goToNextDiff' + +export const ORCIDE_GOTO_PREV_DIFF_ACTION_ID = 'orcide.goToPrevDiff' + +export const ORCIDE_GOTO_NEXT_URI_ACTION_ID = 'orcide.goToNextUri' + +export const ORCIDE_GOTO_PREV_URI_ACTION_ID = 'orcide.goToPrevUri' + +export const ORCIDE_ACCEPT_FILE_ACTION_ID = 'orcide.acceptFile' + +export const ORCIDE_REJECT_FILE_ACTION_ID = 'orcide.rejectFile' + +export const ORCIDE_ACCEPT_ALL_DIFFS_ACTION_ID = 'orcide.acceptAllDiffs' + +export const ORCIDE_REJECT_ALL_DIFFS_ACTION_ID = 'orcide.rejectAllDiffs' diff --git a/src/vs/workbench/contrib/void/browser/aiRegexService.ts b/src/vs/workbench/contrib/orcide/browser/aiRegexService.ts similarity index 94% rename from src/vs/workbench/contrib/void/browser/aiRegexService.ts rename to src/vs/workbench/contrib/orcide/browser/aiRegexService.ts index b0d02024018..0c686acfb93 100644 --- a/src/vs/workbench/contrib/void/browser/aiRegexService.ts +++ b/src/vs/workbench/contrib/orcide/browser/aiRegexService.ts @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ // 1. search(ai) diff --git a/src/vs/workbench/contrib/void/browser/autocompleteService.ts b/src/vs/workbench/contrib/orcide/browser/autocompleteService.ts similarity index 98% rename from src/vs/workbench/contrib/void/browser/autocompleteService.ts rename to src/vs/workbench/contrib/orcide/browser/autocompleteService.ts index 22c86eb6afc..c3862bd1d33 100644 --- a/src/vs/workbench/contrib/void/browser/autocompleteService.ts +++ b/src/vs/workbench/contrib/orcide/browser/autocompleteService.ts @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { Disposable } from '../../../../base/common/lifecycle.js'; @@ -18,8 +18,8 @@ import { extractCodeFromRegular } from '../common/helpers/extractCodeFromResult. import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js'; import { ILLMMessageService } from '../common/sendLLMMessageService.js'; import { isWindows } from '../../../../base/common/platform.js'; -import { IVoidSettingsService } from '../common/voidSettingsService.js'; -import { FeatureName } from '../common/voidSettingsTypes.js'; +import { IOrcideSettingsService } from '../common/orcideSettingsService.js'; +import { FeatureName } from '../common/orcideSettingsTypes.js'; import { IConvertToLLMMessageService } from './convertToLLMMessageService.js'; // import { IContextGatheringService } from './contextGatheringService.js'; @@ -28,7 +28,7 @@ import { IConvertToLLMMessageService } from './convertToLLMMessageService.js'; const allLinebreakSymbols = ['\r\n', '\n'] const _ln = isWindows ? allLinebreakSymbols[0] : allLinebreakSymbols[1] -// The extension this was called from is here - https://github.com/voideditor/void/blob/autocomplete/extensions/void/src/extension/extension.ts +// The extension this was called from is here - https://github.com/orcest-ai/Orcide/blob/autocomplete/extensions/void/src/extension/extension.ts /* @@ -617,7 +617,7 @@ export const IAutocompleteService = createDecorator('Autoc export class AutocompleteService extends Disposable implements IAutocompleteService { - static readonly ID = 'void.autocompleteService' + static readonly ID = 'orcide.autocompleteService' _serviceBrand: undefined; @@ -893,7 +893,7 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ @ILLMMessageService private readonly _llmMessageService: ILLMMessageService, @IEditorService private readonly _editorService: IEditorService, @IModelService private readonly _modelService: IModelService, - @IVoidSettingsService private readonly _settingsService: IVoidSettingsService, + @IOrcideSettingsService private readonly _settingsService: IOrcideSettingsService, @IConvertToLLMMessageService private readonly _convertToLLMMessageService: IConvertToLLMMessageService // @IContextGatheringService private readonly _contextGatheringService: IContextGatheringService, ) { diff --git a/src/vs/workbench/contrib/void/browser/chatThreadService.ts b/src/vs/workbench/contrib/orcide/browser/chatThreadService.ts similarity index 95% rename from src/vs/workbench/contrib/void/browser/chatThreadService.ts rename to src/vs/workbench/contrib/orcide/browser/chatThreadService.ts index 30f38f10ba8..f637ce9c635 100644 --- a/src/vs/workbench/contrib/void/browser/chatThreadService.ts +++ b/src/vs/workbench/contrib/orcide/browser/chatThreadService.ts @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { Disposable } from '../../../../base/common/lifecycle.js'; @@ -14,8 +14,8 @@ import { ILLMMessageService } from '../common/sendLLMMessageService.js'; import { chat_userMessageContent, isABuiltinToolName } from '../common/prompt/prompts.js'; import { AnthropicReasoning, getErrorMessage, RawToolCallObj, RawToolParamsObj } from '../common/sendLLMMessageTypes.js'; import { generateUuid } from '../../../../base/common/uuid.js'; -import { FeatureName, ModelSelection, ModelSelectionOptions } from '../common/voidSettingsTypes.js'; -import { IVoidSettingsService } from '../common/voidSettingsService.js'; +import { FeatureName, ModelSelection, ModelSelectionOptions } from '../common/orcideSettingsTypes.js'; +import { IOrcideSettingsService } from '../common/orcideSettingsService.js'; import { approvalTypeOfBuiltinToolName, BuiltinToolCallParams, ToolCallParams, ToolName, ToolResult } from '../common/toolsServiceTypes.js'; import { IToolsService } from './toolsService.js'; import { CancellationToken } from '../../../../base/common/cancellation.js'; @@ -24,10 +24,10 @@ import { ChatMessage, CheckpointEntry, CodespanLocationLink, StagingSelectionIte import { Position } from '../../../../editor/common/core/position.js'; import { IMetricsService } from '../common/metricsService.js'; import { shorten } from '../../../../base/common/labels.js'; -import { IVoidModelService } from '../common/voidModelService.js'; +import { IOrcideModelService } from '../common/orcideModelService.js'; import { findLast, findLastIdx } from '../../../../base/common/arraysFind.js'; import { IEditCodeService } from './editCodeServiceInterface.js'; -import { VoidFileSnapshot } from '../common/editCodeServiceTypes.js'; +import { OrcideFileSnapshot } from '../common/editCodeServiceTypes.js'; import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js'; import { truncate } from '../../../../base/common/strings.js'; import { THREAD_STORAGE_KEY } from '../common/storageKeys.js'; @@ -314,10 +314,10 @@ class ChatThreadService extends Disposable implements IChatThreadService { constructor( @IStorageService private readonly _storageService: IStorageService, - @IVoidModelService private readonly _voidModelService: IVoidModelService, + @IOrcideModelService private readonly _orcideModelService: IOrcideModelService, @ILLMMessageService private readonly _llmMessageService: ILLMMessageService, @IToolsService private readonly _toolsService: IToolsService, - @IVoidSettingsService private readonly _settingsService: IVoidSettingsService, + @IOrcideSettingsService private readonly _settingsService: IOrcideSettingsService, @ILanguageFeaturesService private readonly _languageFeaturesService: ILanguageFeaturesService, @IMetricsService private readonly _metricsService: IMetricsService, @IEditCodeService private readonly _editCodeService: IEditCodeService, @@ -443,11 +443,11 @@ class ChatThreadService extends Disposable implements IChatThreadService { // set streamState const messages = newState.allThreads[threadId]?.messages const lastMessage = messages && messages[messages.length - 1] - // if awaiting user but stream state doesn't indicate it (happens if restart Void) + // if awaiting user but stream state doesn't indicate it (happens if restart Orcide) if (lastMessage && lastMessage.role === 'tool' && lastMessage.type === 'tool_request') this._setStreamState(threadId, { isRunning: 'awaiting_user', }) - // if running now but stream state doesn't indicate it (happens if restart Void), cancel that last tool + // if running now but stream state doesn't indicate it (happens if restart Orcide), cancel that last tool if (lastMessage && lastMessage.role === 'tool' && lastMessage.type === 'running_now') { this._updateLatestTool(threadId, { role: 'tool', type: 'rejected', content: lastMessage.content, id: lastMessage.id, rawParams: lastMessage.rawParams, result: null, name: lastMessage.name, params: lastMessage.params, mcpServerName: lastMessage.mcpServerName }) @@ -945,11 +945,11 @@ class ChatThreadService extends Disposable implements IChatThreadService { private _getCheckpointInfo = (checkpointMessage: ChatMessage & { role: 'checkpoint' }, fsPath: string, opts: { includeUserModifiedChanges: boolean }) => { - const voidFileSnapshot = checkpointMessage.voidFileSnapshotOfURI ? checkpointMessage.voidFileSnapshotOfURI[fsPath] ?? null : null - if (!opts.includeUserModifiedChanges) { return { voidFileSnapshot, } } + const orcideFileSnapshot = checkpointMessage.orcideFileSnapshotOfURI ? checkpointMessage.orcideFileSnapshotOfURI[fsPath] ?? null : null + if (!opts.includeUserModifiedChanges) { return { orcideFileSnapshot, } } - const userModifiedVoidFileSnapshot = fsPath in checkpointMessage.userModifications.voidFileSnapshotOfURI ? checkpointMessage.userModifications.voidFileSnapshotOfURI[fsPath] ?? null : null - return { voidFileSnapshot: userModifiedVoidFileSnapshot ?? voidFileSnapshot, } + const userModifiedOrcideFileSnapshot = fsPath in checkpointMessage.userModifications.orcideFileSnapshotOfURI ? checkpointMessage.userModifications.orcideFileSnapshotOfURI[fsPath] ?? null : null + return { orcideFileSnapshot: userModifiedOrcideFileSnapshot ?? orcideFileSnapshot, } } private _computeNewCheckpointInfo({ threadId }: { threadId: string }) { @@ -959,59 +959,59 @@ class ChatThreadService extends Disposable implements IChatThreadService { const lastCheckpointIdx = findLastIdx(thread.messages, (m) => m.role === 'checkpoint') ?? -1 if (lastCheckpointIdx === -1) return - const voidFileSnapshotOfURI: { [fsPath: string]: VoidFileSnapshot | undefined } = {} + const orcideFileSnapshotOfURI: { [fsPath: string]: OrcideFileSnapshot | undefined } = {} // add a change for all the URIs in the checkpoint history const { lastIdxOfURI } = this._getCheckpointsBetween({ threadId, loIdx: 0, hiIdx: lastCheckpointIdx, }) ?? {} for (const fsPath in lastIdxOfURI ?? {}) { - const { model } = this._voidModelService.getModelFromFsPath(fsPath) + const { model } = this._orcideModelService.getModelFromFsPath(fsPath) if (!model) continue const checkpoint2 = thread.messages[lastIdxOfURI[fsPath]] || null if (!checkpoint2) continue if (checkpoint2.role !== 'checkpoint') continue const res = this._getCheckpointInfo(checkpoint2, fsPath, { includeUserModifiedChanges: false }) if (!res) continue - const { voidFileSnapshot: oldVoidFileSnapshot } = res + const { orcideFileSnapshot: oldOrcideFileSnapshot } = res // if there was any change to the str or diffAreaSnapshot, update. rough approximation of equality, oldDiffAreasSnapshot === diffAreasSnapshot is not perfect - const voidFileSnapshot = this._editCodeService.getVoidFileSnapshot(URI.file(fsPath)) - if (oldVoidFileSnapshot === voidFileSnapshot) continue - voidFileSnapshotOfURI[fsPath] = voidFileSnapshot + const orcideFileSnapshot = this._editCodeService.getOrcideFileSnapshot(URI.file(fsPath)) + if (oldOrcideFileSnapshot === orcideFileSnapshot) continue + orcideFileSnapshotOfURI[fsPath] = orcideFileSnapshot } // // add a change for all user-edited files (that aren't in the history) // for (const fsPath of this._userModifiedFilesToCheckInCheckpoints.keys()) { // if (fsPath in lastIdxOfURI) continue // if already visisted, don't visit again - // const { model } = this._voidModelService.getModelFromFsPath(fsPath) + // const { model } = this._orcideModelService.getModelFromFsPath(fsPath) // if (!model) continue // currStrOfFsPath[fsPath] = model.getValue(EndOfLinePreference.LF) // } - return { voidFileSnapshotOfURI } + return { orcideFileSnapshotOfURI } } private _addUserCheckpoint({ threadId }: { threadId: string }) { - const { voidFileSnapshotOfURI } = this._computeNewCheckpointInfo({ threadId }) ?? {} + const { orcideFileSnapshotOfURI } = this._computeNewCheckpointInfo({ threadId }) ?? {} this._addCheckpoint(threadId, { role: 'checkpoint', type: 'user_edit', - voidFileSnapshotOfURI: voidFileSnapshotOfURI ?? {}, - userModifications: { voidFileSnapshotOfURI: {}, }, + orcideFileSnapshotOfURI: orcideFileSnapshotOfURI ?? {}, + userModifications: { orcideFileSnapshotOfURI: {}, }, }) } // call this right after LLM edits a file private _addToolEditCheckpoint({ threadId, uri, }: { threadId: string, uri: URI }) { const thread = this.state.allThreads[threadId] if (!thread) return - const { model } = this._voidModelService.getModel(uri) + const { model } = this._orcideModelService.getModel(uri) if (!model) return // should never happen - const diffAreasSnapshot = this._editCodeService.getVoidFileSnapshot(uri) + const diffAreasSnapshot = this._editCodeService.getOrcideFileSnapshot(uri) this._addCheckpoint(threadId, { role: 'checkpoint', type: 'tool_edit', - voidFileSnapshotOfURI: { [uri.fsPath]: diffAreasSnapshot }, - userModifications: { voidFileSnapshotOfURI: {} }, + orcideFileSnapshotOfURI: { [uri.fsPath]: diffAreasSnapshot }, + userModifications: { orcideFileSnapshotOfURI: {} }, }) } @@ -1035,7 +1035,7 @@ class ChatThreadService extends Disposable implements IChatThreadService { for (let i = loIdx; i <= hiIdx; i += 1) { const message = thread.messages[i] if (message?.role !== 'checkpoint') continue - for (const fsPath in message.voidFileSnapshotOfURI) { // do not include userModified.beforeStrOfURI here, jumping should not include those changes + for (const fsPath in message.orcideFileSnapshotOfURI) { // do not include userModified.beforeStrOfURI here, jumping should not include those changes lastIdxOfURI[fsPath] = i } } @@ -1055,13 +1055,13 @@ class ChatThreadService extends Disposable implements IChatThreadService { return [checkpoint, currCheckpointIdx] } private _addUserModificationsToCurrCheckpoint({ threadId }: { threadId: string }) { - const { voidFileSnapshotOfURI } = this._computeNewCheckpointInfo({ threadId }) ?? {} + const { orcideFileSnapshotOfURI } = this._computeNewCheckpointInfo({ threadId }) ?? {} const res = this._readCurrentCheckpoint(threadId) if (!res) return const [checkpoint, checkpointIdx] = res this._editMessageInThread(threadId, checkpointIdx, { ...checkpoint, - userModifications: { voidFileSnapshotOfURI: voidFileSnapshotOfURI ?? {}, }, + userModifications: { orcideFileSnapshotOfURI: orcideFileSnapshotOfURI ?? {}, }, }) } @@ -1139,9 +1139,9 @@ We only need to do it for files that were edited since `to`, ie files between to if (message.role !== 'checkpoint') continue const res = this._getCheckpointInfo(message, fsPath, { includeUserModifiedChanges: jumpToUserModified }) if (!res) continue - const { voidFileSnapshot } = res - if (!voidFileSnapshot) continue - this._editCodeService.restoreVoidFileSnapshot(URI.file(fsPath), voidFileSnapshot) + const { orcideFileSnapshot } = res + if (!orcideFileSnapshot) continue + this._editCodeService.restoreOrcideFileSnapshot(URI.file(fsPath), orcideFileSnapshot) break } } @@ -1173,9 +1173,9 @@ We only need to do it for files that were edited since `from`, ie files between if (message.role !== 'checkpoint') continue const res = this._getCheckpointInfo(message, fsPath, { includeUserModifiedChanges: jumpToUserModified }) if (!res) continue - const { voidFileSnapshot } = res - if (!voidFileSnapshot) continue - this._editCodeService.restoreVoidFileSnapshot(URI.file(fsPath), voidFileSnapshot) + const { orcideFileSnapshot } = res + if (!orcideFileSnapshot) continue + this._editCodeService.restoreOrcideFileSnapshot(URI.file(fsPath), orcideFileSnapshot) break } } @@ -1201,7 +1201,7 @@ We only need to do it for files that were edited since `from`, ie files between sticky: true, actions: { primary: [{ - id: 'void.goToChat', + id: 'orcide.goToChat', enabled: true, label: `Jump to Chat`, tooltip: '', @@ -1463,7 +1463,7 @@ We only need to do it for files that were edited since `from`, ie files between // check all prevUris for the target for (const uri of prevUris) { - const modelRef = await this._voidModelService.getModelSafe(uri) + const modelRef = await this._orcideModelService.getModelSafe(uri) const { model } = modelRef if (!model) continue diff --git a/src/vs/workbench/contrib/void/browser/contextGatheringService.ts b/src/vs/workbench/contrib/orcide/browser/contextGatheringService.ts similarity index 100% rename from src/vs/workbench/contrib/void/browser/contextGatheringService.ts rename to src/vs/workbench/contrib/orcide/browser/contextGatheringService.ts diff --git a/src/vs/workbench/contrib/void/browser/convertToLLMMessageService.ts b/src/vs/workbench/contrib/orcide/browser/convertToLLMMessageService.ts similarity index 94% rename from src/vs/workbench/contrib/void/browser/convertToLLMMessageService.ts rename to src/vs/workbench/contrib/orcide/browser/convertToLLMMessageService.ts index 94545c0d751..817a76bf5d6 100644 --- a/src/vs/workbench/contrib/void/browser/convertToLLMMessageService.ts +++ b/src/vs/workbench/contrib/orcide/browser/convertToLLMMessageService.ts @@ -9,11 +9,11 @@ import { ChatMessage } from '../common/chatThreadServiceTypes.js'; import { getIsReasoningEnabledState, getReservedOutputTokenSpace, getModelCapabilities } from '../common/modelCapabilities.js'; import { reParsedToolXMLString, chat_systemMessage } from '../common/prompt/prompts.js'; import { AnthropicLLMChatMessage, AnthropicReasoning, GeminiLLMChatMessage, LLMChatMessage, LLMFIMMessage, OpenAILLMChatMessage, RawToolParamsObj } from '../common/sendLLMMessageTypes.js'; -import { IVoidSettingsService } from '../common/voidSettingsService.js'; -import { ChatMode, FeatureName, ModelSelection, ProviderName } from '../common/voidSettingsTypes.js'; +import { IOrcideSettingsService } from '../common/orcideSettingsService.js'; +import { ChatMode, FeatureName, ModelSelection, ProviderName } from '../common/orcideSettingsTypes.js'; import { IDirectoryStrService } from '../common/directoryStrService.js'; import { ITerminalToolService } from './terminalToolService.js'; -import { IVoidModelService } from '../common/voidModelService.js'; +import { IOrcideModelService } from '../common/orcideModelService.js'; import { URI } from '../../../../base/common/uri.js'; import { EndOfLinePreference } from '../../../../editor/common/model.js'; import { ToolName } from '../common/toolsServiceTypes.js'; @@ -538,25 +538,25 @@ class ConvertToLLMMessageService extends Disposable implements IConvertToLLMMess @IEditorService private readonly editorService: IEditorService, @IDirectoryStrService private readonly directoryStrService: IDirectoryStrService, @ITerminalToolService private readonly terminalToolService: ITerminalToolService, - @IVoidSettingsService private readonly voidSettingsService: IVoidSettingsService, - @IVoidModelService private readonly voidModelService: IVoidModelService, + @IOrcideSettingsService private readonly orcideSettingsService: IOrcideSettingsService, + @IOrcideModelService private readonly orcideModelService: IOrcideModelService, @IMCPService private readonly mcpService: IMCPService, ) { super() } // Read .voidrules files from workspace folders - private _getVoidRulesFileContents(): string { + private _getOrcideRulesFileContents(): string { try { const workspaceFolders = this.workspaceContextService.getWorkspace().folders; - let voidRules = ''; + let orcideRules = ''; for (const folder of workspaceFolders) { - const uri = URI.joinPath(folder.uri, '.voidrules') - const { model } = this.voidModelService.getModel(uri) + const uri = URI.joinPath(folder.uri, '.orciderules') + const { model } = this.orcideModelService.getModel(uri) if (!model) continue - voidRules += model.getValue(EndOfLinePreference.LF) + '\n\n'; + orcideRules += model.getValue(EndOfLinePreference.LF) + '\n\n'; } - return voidRules.trim(); + return orcideRules.trim(); } catch (e) { return '' @@ -565,12 +565,12 @@ class ConvertToLLMMessageService extends Disposable implements IConvertToLLMMess // Get combined AI instructions from settings and .voidrules files private _getCombinedAIInstructions(): string { - const globalAIInstructions = this.voidSettingsService.state.globalSettings.aiInstructions; - const voidRulesFileContent = this._getVoidRulesFileContents(); + const globalAIInstructions = this.orcideSettingsService.state.globalSettings.aiInstructions; + const orcideRulesFileContent = this._getOrcideRulesFileContents(); const ans: string[] = [] if (globalAIInstructions) ans.push(globalAIInstructions) - if (voidRulesFileContent) ans.push(voidRulesFileContent) + if (orcideRulesFileContent) ans.push(orcideRulesFileContent) return ans.join('\n\n') } @@ -637,7 +637,7 @@ class ConvertToLLMMessageService extends Disposable implements IConvertToLLMMess prepareLLMSimpleMessages: IConvertToLLMMessageService['prepareLLMSimpleMessages'] = ({ simpleMessages, systemMessage, modelSelection, featureName }) => { if (modelSelection === null) return { messages: [], separateSystemMessage: undefined } - const { overridesOfModel } = this.voidSettingsService.state + const { overridesOfModel } = this.orcideSettingsService.state const { providerName, modelName } = modelSelection const { @@ -646,7 +646,7 @@ class ConvertToLLMMessageService extends Disposable implements IConvertToLLMMess supportsSystemMessage, } = getModelCapabilities(providerName, modelName, overridesOfModel) - const modelSelectionOptions = this.voidSettingsService.state.optionsOfModelSelection[featureName][modelSelection.providerName]?.[modelSelection.modelName] + const modelSelectionOptions = this.orcideSettingsService.state.optionsOfModelSelection[featureName][modelSelection.providerName]?.[modelSelection.modelName] // Get combined AI instructions const aiInstructions = this._getCombinedAIInstructions(); @@ -670,7 +670,7 @@ class ConvertToLLMMessageService extends Disposable implements IConvertToLLMMess prepareLLMChatMessages: IConvertToLLMMessageService['prepareLLMChatMessages'] = async ({ chatMessages, chatMode, modelSelection }) => { if (modelSelection === null) return { messages: [], separateSystemMessage: undefined } - const { overridesOfModel } = this.voidSettingsService.state + const { overridesOfModel } = this.orcideSettingsService.state const { providerName, modelName } = modelSelection const { @@ -679,11 +679,11 @@ class ConvertToLLMMessageService extends Disposable implements IConvertToLLMMess supportsSystemMessage, } = getModelCapabilities(providerName, modelName, overridesOfModel) - const { disableSystemMessage } = this.voidSettingsService.state.globalSettings; + const { disableSystemMessage } = this.orcideSettingsService.state.globalSettings; const fullSystemMessage = await this._generateChatMessagesSystemMessage(chatMode, specialToolFormat) const systemMessage = disableSystemMessage ? '' : fullSystemMessage; - const modelSelectionOptions = this.voidSettingsService.state.optionsOfModelSelection['Chat'][modelSelection.providerName]?.[modelSelection.modelName] + const modelSelectionOptions = this.orcideSettingsService.state.optionsOfModelSelection['Chat'][modelSelection.providerName]?.[modelSelection.modelName] // Get combined AI instructions const aiInstructions = this._getCombinedAIInstructions(); diff --git a/src/vs/workbench/contrib/void/browser/convertToLLMMessageWorkbenchContrib.ts b/src/vs/workbench/contrib/orcide/browser/convertToLLMMessageWorkbenchContrib.ts similarity index 72% rename from src/vs/workbench/contrib/void/browser/convertToLLMMessageWorkbenchContrib.ts rename to src/vs/workbench/contrib/orcide/browser/convertToLLMMessageWorkbenchContrib.ts index f77dde387b8..86ca5ff0268 100644 --- a/src/vs/workbench/contrib/void/browser/convertToLLMMessageWorkbenchContrib.ts +++ b/src/vs/workbench/contrib/orcide/browser/convertToLLMMessageWorkbenchContrib.ts @@ -1,28 +1,28 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { Disposable } from '../../../../base/common/lifecycle.js'; import { URI } from '../../../../base/common/uri.js'; import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js'; import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js'; -import { IVoidModelService } from '../common/voidModelService.js'; +import { IOrcideModelService } from '../common/orcideModelService.js'; class ConvertContribWorkbenchContribution extends Disposable implements IWorkbenchContribution { - static readonly ID = 'workbench.contrib.void.convertcontrib' + static readonly ID = 'workbench.contrib.orcide.convertcontrib' _serviceBrand: undefined; constructor( - @IVoidModelService private readonly voidModelService: IVoidModelService, + @IOrcideModelService private readonly orcideModelService: IOrcideModelService, @IWorkspaceContextService private readonly workspaceContext: IWorkspaceContextService, ) { super() const initializeURI = (uri: URI) => { this.workspaceContext.getWorkspace() - const voidRulesURI = URI.joinPath(uri, '.voidrules') - this.voidModelService.initializeModel(voidRulesURI) + const orcideRulesURI = URI.joinPath(uri, '.orciderules') + this.orcideModelService.initializeModel(orcideRulesURI) } // call diff --git a/src/vs/workbench/contrib/void/browser/editCodeService.ts b/src/vs/workbench/contrib/orcide/browser/editCodeService.ts similarity index 95% rename from src/vs/workbench/contrib/void/browser/editCodeService.ts rename to src/vs/workbench/contrib/orcide/browser/editCodeService.ts index 80ee4bc9925..78726753784 100644 --- a/src/vs/workbench/contrib/void/browser/editCodeService.ts +++ b/src/vs/workbench/contrib/orcide/browser/editCodeService.ts @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { Disposable } from '../../../../base/common/lifecycle.js'; @@ -24,9 +24,9 @@ import { Widget } from '../../../../base/browser/ui/widget.js'; import { URI } from '../../../../base/common/uri.js'; import { IConsistentEditorItemService, IConsistentItemService } from './helperServices/consistentItemService.js'; import { voidPrefixAndSuffix, ctrlKStream_userMessage, ctrlKStream_systemMessage, defaultQuickEditFimTags, rewriteCode_systemMessage, rewriteCode_userMessage, searchReplaceGivenDescription_systemMessage, searchReplaceGivenDescription_userMessage, tripleTick, } from '../common/prompt/prompts.js'; -import { IVoidCommandBarService } from './voidCommandBarService.js'; +import { IOrcideCommandBarService } from './orcideCommandBarService.js'; import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js'; -import { VOID_ACCEPT_DIFF_ACTION_ID, VOID_REJECT_DIFF_ACTION_ID } from './actionIDs.js'; +import { ORCIDE_ACCEPT_DIFF_ACTION_ID, ORCIDE_REJECT_DIFF_ACTION_ID } from './actionIDs.js'; import { mountCtrlK } from './react/out/quick-edit-tsx/index.js' import { QuickEditPropsType } from './quickEditActions.js'; @@ -39,15 +39,15 @@ import { ILLMMessageService } from '../common/sendLLMMessageService.js'; import { LLMChatMessage } from '../common/sendLLMMessageTypes.js'; import { IMetricsService } from '../common/metricsService.js'; import { IEditCodeService, AddCtrlKOpts, StartApplyingOpts, CallBeforeStartApplyingOpts, } from './editCodeServiceInterface.js'; -import { IVoidSettingsService } from '../common/voidSettingsService.js'; -import { FeatureName } from '../common/voidSettingsTypes.js'; -import { IVoidModelService } from '../common/voidModelService.js'; +import { IOrcideSettingsService } from '../common/orcideSettingsService.js'; +import { FeatureName } from '../common/orcideSettingsTypes.js'; +import { IOrcideModelService } from '../common/orcideModelService.js'; import { deepClone } from '../../../../base/common/objects.js'; import { acceptBg, acceptBorder, buttonFontSize, buttonTextColor, rejectBg, rejectBorder } from '../common/helpers/colors.js'; -import { DiffArea, Diff, CtrlKZone, VoidFileSnapshot, DiffAreaSnapshotEntry, diffAreaSnapshotKeys, DiffZone, TrackingZone, ComputedDiff } from '../common/editCodeServiceTypes.js'; +import { DiffArea, Diff, CtrlKZone, OrcideFileSnapshot, DiffAreaSnapshotEntry, diffAreaSnapshotKeys, DiffZone, TrackingZone, ComputedDiff } from '../common/editCodeServiceTypes.js'; import { IConvertToLLMMessageService } from './convertToLLMMessageService.js'; // import { isMacintosh } from '../../../../base/common/platform.js'; -// import { VOID_OPEN_SETTINGS_ACTION_ID } from './voidSettingsPane.js'; +// import { ORCIDE_OPEN_SETTINGS_ACTION_ID } from './orcideSettingsPane.js'; const numLinesOfStr = (str: string) => str.split('\n').length @@ -192,9 +192,9 @@ class EditCodeService extends Disposable implements IEditCodeService { @IMetricsService private readonly _metricsService: IMetricsService, @INotificationService private readonly _notificationService: INotificationService, // @ICommandService private readonly _commandService: ICommandService, - @IVoidSettingsService private readonly _settingsService: IVoidSettingsService, + @IOrcideSettingsService private readonly _settingsService: IOrcideSettingsService, // @IFileService private readonly _fileService: IFileService, - @IVoidModelService private readonly _voidModelService: IVoidModelService, + @IOrcideModelService private readonly _orcideModelService: IOrcideModelService, @IConvertToLLMMessageService private readonly _convertToLLMMessageService: IConvertToLLMMessageService, ) { super(); @@ -203,7 +203,7 @@ class EditCodeService extends Disposable implements IEditCodeService { const registeredModelURIs = new Set() const initializeModel = async (model: ITextModel) => { - await this._voidModelService.initializeModel(model.uri) + await this._orcideModelService.initializeModel(model.uri) // do not add listeners to the same model twice - important, or will see duplicates if (registeredModelURIs.has(model.uri.fsPath)) return @@ -279,18 +279,18 @@ class EditCodeService extends Disposable implements IEditCodeService { // const details = errorDetails(e.fullError) // this._notificationService.notify({ // severity: Severity.Warning, - // message: `Void Error: ${e.message}`, + // message: `Orcide Error: ${e.message}`, // actions: { // secondary: [{ // id: 'void.onerror.opensettings', // enabled: true, - // label: `Open Void's settings`, + // label: `Open Orcide's settings`, // tooltip: '', // class: undefined, - // run: () => { this._commandService.executeCommand(VOID_OPEN_SETTINGS_ACTION_ID) } + // run: () => { this._commandService.executeCommand(ORCIDE_OPEN_SETTINGS_ACTION_ID) } // }] // }, - // source: details ? `(Hold ${isMacintosh ? 'Option' : 'Alt'} to hover) - ${details}\n\nIf this persists, feel free to [report](https://github.com/voideditor/void/issues/new) it.` : undefined + // source: details ? `(Hold ${isMacintosh ? 'Option' : 'Alt'} to hover) - ${details}\n\nIf this persists, feel free to [report](https://github.com/orcest-ai/Orcide/issues/new) it.` : undefined // }) // } @@ -315,7 +315,7 @@ class EditCodeService extends Disposable implements IEditCodeService { private _addDiffAreaStylesToURI = (uri: URI) => { - const { model } = this._voidModelService.getModel(uri) + const { model } = this._orcideModelService.getModel(uri) for (const diffareaid of this.diffAreasOfURI[uri.fsPath] || []) { const diffArea = this.diffAreaOfId[diffareaid] @@ -324,10 +324,10 @@ class EditCodeService extends Disposable implements IEditCodeService { // add sweep styles to the diffZone if (diffArea._streamState.isStreaming) { // sweepLine ... sweepLine - const fn1 = this._addLineDecoration(model, diffArea._streamState.line, diffArea._streamState.line, 'void-sweepIdxBG') + const fn1 = this._addLineDecoration(model, diffArea._streamState.line, diffArea._streamState.line, 'orcide.sweepIdxBG') // sweepLine+1 ... endLine const fn2 = diffArea._streamState.line + 1 <= diffArea.endLine ? - this._addLineDecoration(model, diffArea._streamState.line + 1, diffArea.endLine, 'void-sweepBG') + this._addLineDecoration(model, diffArea._streamState.line + 1, diffArea.endLine, 'orcide.sweepBG') : null diffArea._removeStylesFns.add(() => { fn1?.(); fn2?.(); }) @@ -336,7 +336,7 @@ class EditCodeService extends Disposable implements IEditCodeService { else if (diffArea.type === 'CtrlKZone' && diffArea._linkedStreamingDiffZone === null) { // highlight zone's text - const fn = this._addLineDecoration(model, diffArea.startLine, diffArea.endLine, 'void-highlightBG') + const fn = this._addLineDecoration(model, diffArea.startLine, diffArea.endLine, 'orcide.highlightBG') diffArea._removeStylesFns.add(() => fn?.()); } } @@ -344,7 +344,7 @@ class EditCodeService extends Disposable implements IEditCodeService { private _computeDiffsAndAddStylesToURI = (uri: URI) => { - const { model } = this._voidModelService.getModel(uri) + const { model } = this._orcideModelService.getModel(uri) if (model === null) return const fullFileText = model.getValue(EndOfLinePreference.LF) @@ -477,11 +477,11 @@ class EditCodeService extends Disposable implements IEditCodeService { const disposeInThisEditorFns: (() => void)[] = [] - const { model } = this._voidModelService.getModel(uri) + const { model } = this._orcideModelService.getModel(uri) // green decoration and minimap decoration if (type !== 'deletion') { - const fn = this._addLineDecoration(model, diff.startLine, diff.endLine, 'void-greenBG', { + const fn = this._addLineDecoration(model, diff.startLine, diff.endLine, 'orcide.greenBG', { minimap: { color: { id: 'minimapGutter.addedBackground' }, position: 2 }, overviewRuler: { color: { id: 'editorOverviewRuler.addedForeground' }, position: 7 } }) @@ -496,7 +496,7 @@ class EditCodeService extends Disposable implements IEditCodeService { fn: (editor) => { const domNode = document.createElement('div'); - domNode.className = 'void-redBG' + domNode.className = 'orcide.redBG' const renderOptions = RenderOptions.fromEditor(editor) @@ -585,7 +585,7 @@ class EditCodeService extends Disposable implements IEditCodeService { offsetLines = 1 } } - else { throw new Error('Void 1') } + else { throw new Error('Orcide 1') } const buttonsWidget = this._instantiationService.createInstance(AcceptRejectInlineWidget, { editor, @@ -625,7 +625,7 @@ class EditCodeService extends Disposable implements IEditCodeService { weAreWriting = false private _writeURIText(uri: URI, text: string, range_: IRange | 'wholeFileRange', { shouldRealignDiffAreas, }: { shouldRealignDiffAreas: boolean, }) { - const { model } = this._voidModelService.getModel(uri) + const { model } = this._orcideModelService.getModel(uri) if (!model) { this._refreshStylesAndDiffsInURI(uri) // at the end of a write, we still expect to refresh all styles. e.g. sometimes we expect to restore all the decorations even if no edits were made when _writeText is used return @@ -663,8 +663,8 @@ class EditCodeService extends Disposable implements IEditCodeService { - private _getCurrentVoidFileSnapshot = (uri: URI): VoidFileSnapshot => { - const { model } = this._voidModelService.getModel(uri) + private _getCurrentOrcideFileSnapshot = (uri: URI): OrcideFileSnapshot => { + const { model } = this._orcideModelService.getModel(uri) const snapshottedDiffAreaOfId: Record = {} for (const diffareaid in this.diffAreaOfId) { @@ -687,7 +687,7 @@ class EditCodeService extends Disposable implements IEditCodeService { } - private _restoreVoidFileSnapshot = async (uri: URI, snapshot: VoidFileSnapshot) => { + private _restoreOrcideFileSnapshot = async (uri: URI, snapshot: OrcideFileSnapshot) => { // for each diffarea in this uri, stop streaming if currently streaming for (const diffareaid in this.diffAreaOfId) { const diffArea = this.diffAreaOfId[diffareaid] @@ -737,34 +737,34 @@ class EditCodeService extends Disposable implements IEditCodeService { } private _addToHistory(uri: URI, opts?: { onWillUndo?: () => void }) { - const beforeSnapshot: VoidFileSnapshot = this._getCurrentVoidFileSnapshot(uri) - let afterSnapshot: VoidFileSnapshot | null = null + const beforeSnapshot: OrcideFileSnapshot = this._getCurrentOrcideFileSnapshot(uri) + let afterSnapshot: OrcideFileSnapshot | null = null const elt: IUndoRedoElement = { type: UndoRedoElementType.Resource, resource: uri, - label: 'Void Agent', + label: 'Orcide Agent', code: 'undoredo.editCode', - undo: async () => { opts?.onWillUndo?.(); await this._restoreVoidFileSnapshot(uri, beforeSnapshot) }, - redo: async () => { if (afterSnapshot) await this._restoreVoidFileSnapshot(uri, afterSnapshot) } + undo: async () => { opts?.onWillUndo?.(); await this._restoreOrcideFileSnapshot(uri, beforeSnapshot) }, + redo: async () => { if (afterSnapshot) await this._restoreOrcideFileSnapshot(uri, afterSnapshot) } } this._undoRedoService.pushElement(elt) const onFinishEdit = async () => { - afterSnapshot = this._getCurrentVoidFileSnapshot(uri) - await this._voidModelService.saveModel(uri) + afterSnapshot = this._getCurrentOrcideFileSnapshot(uri) + await this._orcideModelService.saveModel(uri) } return { onFinishEdit } } - public getVoidFileSnapshot(uri: URI) { - return this._getCurrentVoidFileSnapshot(uri) + public getOrcideFileSnapshot(uri: URI) { + return this._getCurrentOrcideFileSnapshot(uri) } - public restoreVoidFileSnapshot(uri: URI, snapshot: VoidFileSnapshot): void { - this._restoreVoidFileSnapshot(uri, snapshot) + public restoreOrcideFileSnapshot(uri: URI, snapshot: OrcideFileSnapshot): void { + this._restoreOrcideFileSnapshot(uri, snapshot) } @@ -997,7 +997,7 @@ class EditCodeService extends Disposable implements IEditCodeService { else if (lastDiff.type === 'deletion') endLineInLlmTextSoFar = lastDiff.startLine else - throw new Error(`Void: diff.type not recognized on: ${lastDiff}`) + throw new Error(`Orcide: diff.type not recognized on: ${lastDiff}`) } // at the start, add a newline between the stream and originalCode to make reasoning easier @@ -1127,8 +1127,8 @@ class EditCodeService extends Disposable implements IEditCodeService { public async callBeforeApplyOrEdit(givenURI: URI | 'current') { const uri = this._uriOfGivenURI(givenURI) if (!uri) return - await this._voidModelService.initializeModel(uri) - await this._voidModelService.saveModel(uri) // save the URI + await this._orcideModelService.initializeModel(uri) + await this._orcideModelService.saveModel(uri) // save the URI } @@ -1269,7 +1269,7 @@ class EditCodeService extends Disposable implements IEditCodeService { linkedCtrlKZone: CtrlKZone | null, onWillUndo: () => void, }) { - const { model } = this._voidModelService.getModel(uri) + const { model } = this._orcideModelService.getModel(uri) if (!model) return // treat like full file, unless linkedCtrlKZone was provided in which case use its diff's range @@ -1376,10 +1376,10 @@ class EditCodeService extends Disposable implements IEditCodeService { startRange = [startLine_, endLine_] } else { - throw new Error(`Void: diff.type not recognized on: ${from}`) + throw new Error(`Orcide: diff.type not recognized on: ${from}`) } - const { model } = this._voidModelService.getModel(uri) + const { model } = this._orcideModelService.getModel(uri) if (!model) return let streamRequestIdRef: { current: string | null } = { current: null } // can use this as a proxy to set the diffArea's stream state requestId @@ -1480,7 +1480,7 @@ class EditCodeService extends Disposable implements IEditCodeService { else if (from === 'ClickApply') { return extractCodeFromRegular({ text: fullText, recentlyAddedTextLen }) } - throw new Error('Void 1') + throw new Error('Orcide 1') } // refresh now in case onText takes a while to get 1st message @@ -1578,7 +1578,7 @@ class EditCodeService extends Disposable implements IEditCodeService { _fileLengthOfGivenURI(givenURI: URI | 'current') { const uri = this._uriOfGivenURI(givenURI) if (!uri) return null - const { model } = this._voidModelService.getModel(uri) + const { model } = this._orcideModelService.getModel(uri) if (!model) return null const numCharsInFile = model.getValueLength(EndOfLinePreference.LF) return numCharsInFile @@ -1617,7 +1617,7 @@ class EditCodeService extends Disposable implements IEditCodeService { const blocks = extractSearchReplaceBlocks(blocksStr) if (blocks.length === 0) throw new Error(`No Search/Replace blocks were received!`) - const { model } = this._voidModelService.getModel(uri) + const { model } = this._orcideModelService.getModel(uri) if (!model) throw new Error(`Error applying Search/Replace blocks: File does not exist.`) const modelStr = model.getValue(EndOfLinePreference.LF) // .split('\n').map(l => '\t' + l).join('\n') // for testing purposes only, remember to remove this @@ -1678,7 +1678,7 @@ class EditCodeService extends Disposable implements IEditCodeService { const uri = this._getURIBeforeStartApplying(opts) if (!uri) return - const { model } = this._voidModelService.getModel(uri) + const { model } = this._orcideModelService.getModel(uri) if (!model) return let streamRequestIdRef: { current: string | null } = { current: null } // can use this as a proxy to set the diffArea's stream state requestId @@ -1968,7 +1968,7 @@ class EditCodeService extends Disposable implements IEditCodeService { const blocks = extractSearchReplaceBlocks(fullText) if (blocks.length === 0) { - this._notificationService.info(`Void: We ran Fast Apply, but the LLM didn't output any changes.`) + this._notificationService.info(`Orcide: We ran Fast Apply, but the LLM didn't output any changes.`) } this._writeURIText(uri, originalFileCode, 'wholeFileRange', { shouldRealignDiffAreas: true }) @@ -2158,7 +2158,7 @@ class EditCodeService extends Disposable implements IEditCodeService { ].join('\n') } else { - throw new Error(`Void error: ${diff}.type not recognized`) + throw new Error(`Orcide error: ${diff}.type not recognized`) } // console.log('DIFF', diff) @@ -2250,7 +2250,7 @@ class EditCodeService extends Disposable implements IEditCodeService { toRange = { startLineNumber: diff.startLine, startColumn: 1, endLineNumber: diff.endLine, endColumn: Number.MAX_SAFE_INTEGER } // 1-indexed } else { - throw new Error(`Void error: ${diff}.type not recognized`) + throw new Error(`Orcide error: ${diff}.type not recognized`) } // update the file @@ -2305,7 +2305,7 @@ class AcceptRejectInlineWidget extends Widget implements IOverlayWidget { startLine: number, offsetLines: number }, - @IVoidCommandBarService private readonly _voidCommandBarService: IVoidCommandBarService, + @IOrcideCommandBarService private readonly _orcideCommandBarService: IOrcideCommandBarService, @IKeybindingService private readonly _keybindingService: IKeybindingService, @IEditCodeService private readonly _editCodeService: IEditCodeService, ) { @@ -2328,15 +2328,15 @@ class AcceptRejectInlineWidget extends Widget implements IOverlayWidget { const lineHeight = editor.getOption(EditorOption.lineHeight); const getAcceptRejectText = () => { - const acceptKeybinding = this._keybindingService.lookupKeybinding(VOID_ACCEPT_DIFF_ACTION_ID); - const rejectKeybinding = this._keybindingService.lookupKeybinding(VOID_REJECT_DIFF_ACTION_ID); + const acceptKeybinding = this._keybindingService.lookupKeybinding(ORCIDE_ACCEPT_DIFF_ACTION_ID); + const rejectKeybinding = this._keybindingService.lookupKeybinding(ORCIDE_REJECT_DIFF_ACTION_ID); // Use the standalone function directly since we're in a nested class that // can't access EditCodeService's methods const acceptKeybindLabel = this._editCodeService.processRawKeybindingText(acceptKeybinding && acceptKeybinding.getLabel() || ''); const rejectKeybindLabel = this._editCodeService.processRawKeybindingText(rejectKeybinding && rejectKeybinding.getLabel() || ''); - const commandBarStateAtUri = this._voidCommandBarService.stateOfURI[uri.fsPath]; + const commandBarStateAtUri = this._orcideCommandBarService.stateOfURI[uri.fsPath]; const selectedDiffIdx = commandBarStateAtUri?.diffIdx ?? 0; // 0th item is selected by default const thisDiffIdx = commandBarStateAtUri?.sortedDiffIds.indexOf(diffid) ?? null; @@ -2435,7 +2435,7 @@ class AcceptRejectInlineWidget extends Widget implements IOverlayWidget { // Listen for state changes in the command bar service - this._register(this._voidCommandBarService.onDidChangeState(e => { + this._register(this._orcideCommandBarService.onDidChangeState(e => { if (uri && e.uri.fsPath === uri.fsPath) { const { acceptText, rejectText } = getAcceptRejectText() diff --git a/src/vs/workbench/contrib/void/browser/editCodeServiceInterface.ts b/src/vs/workbench/contrib/orcide/browser/editCodeServiceInterface.ts similarity index 88% rename from src/vs/workbench/contrib/void/browser/editCodeServiceInterface.ts rename to src/vs/workbench/contrib/orcide/browser/editCodeServiceInterface.ts index 9e33fbd21d9..77f736b4d59 100644 --- a/src/vs/workbench/contrib/void/browser/editCodeServiceInterface.ts +++ b/src/vs/workbench/contrib/orcide/browser/editCodeServiceInterface.ts @@ -1,13 +1,13 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { Event } from '../../../../base/common/event.js'; import { URI } from '../../../../base/common/uri.js'; import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js'; import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js'; -import { Diff, DiffArea, VoidFileSnapshot } from '../common/editCodeServiceTypes.js'; +import { Diff, DiffArea, OrcideFileSnapshot } from '../common/editCodeServiceTypes.js'; export type StartBehavior = 'accept-conflicts' | 'reject-conflicts' | 'keep-conflicts' @@ -73,6 +73,6 @@ export interface IEditCodeService { interruptURIStreaming(opts: { uri: URI }): void; // testDiffs(): void; - getVoidFileSnapshot(uri: URI): VoidFileSnapshot; - restoreVoidFileSnapshot(uri: URI, snapshot: VoidFileSnapshot): void; + getOrcideFileSnapshot(uri: URI): OrcideFileSnapshot; + restoreOrcideFileSnapshot(uri: URI, snapshot: OrcideFileSnapshot): void; } diff --git a/src/vs/workbench/contrib/void/browser/extensionTransferService.ts b/src/vs/workbench/contrib/orcide/browser/extensionTransferService.ts similarity index 85% rename from src/vs/workbench/contrib/void/browser/extensionTransferService.ts rename to src/vs/workbench/contrib/orcide/browser/extensionTransferService.ts index b8843e98b96..26fbbc239d9 100644 --- a/src/vs/workbench/contrib/void/browser/extensionTransferService.ts +++ b/src/vs/workbench/contrib/orcide/browser/extensionTransferService.ts @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { VSBuffer } from '../../../../base/common/buffer.js'; @@ -31,7 +31,7 @@ const extensionBlacklist = [ // ignore extensions 'ms-vscode-remote.remote', // ms-vscode-remote.remote-ssh, ms-vscode-remote.remote-wsl 'ms-vscode.remote', // ms-vscode.remote-explorer - // ignore other AI copilots that could conflict with Void keybindings + // ignore other AI copilots that could conflict with Orcide keybindings 'sourcegraph.cody-ai', 'continue.continue', 'codeium.codeium', @@ -195,37 +195,37 @@ const transferTheseFilesOfOS = (os: 'mac' | 'windows' | 'linux' | null, fromEdit if (fromEditor === 'VS Code') { return [{ from: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, 'Library', 'Application Support', 'Code', 'User', 'settings.json'), - to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, 'Library', 'Application Support', 'Void', 'User', 'settings.json'), + to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, 'Library', 'Application Support', 'Orcide', 'User', 'settings.json'), }, { from: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, 'Library', 'Application Support', 'Code', 'User', 'keybindings.json'), - to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, 'Library', 'Application Support', 'Void', 'User', 'keybindings.json'), + to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, 'Library', 'Application Support', 'Orcide', 'User', 'keybindings.json'), }, { from: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.vscode', 'extensions'), - to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.void-editor', 'extensions'), + to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.orcide', 'extensions'), isExtensions: true, }] } else if (fromEditor === 'Cursor') { return [{ from: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, 'Library', 'Application Support', 'Cursor', 'User', 'settings.json'), - to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, 'Library', 'Application Support', 'Void', 'User', 'settings.json'), + to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, 'Library', 'Application Support', 'Orcide', 'User', 'settings.json'), }, { from: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, 'Library', 'Application Support', 'Cursor', 'User', 'keybindings.json'), - to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, 'Library', 'Application Support', 'Void', 'User', 'keybindings.json'), + to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, 'Library', 'Application Support', 'Orcide', 'User', 'keybindings.json'), }, { from: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.cursor', 'extensions'), - to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.void-editor', 'extensions'), + to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.orcide', 'extensions'), isExtensions: true, }] } else if (fromEditor === 'Windsurf') { return [{ from: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, 'Library', 'Application Support', 'Windsurf', 'User', 'settings.json'), - to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, 'Library', 'Application Support', 'Void', 'User', 'settings.json'), + to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, 'Library', 'Application Support', 'Orcide', 'User', 'settings.json'), }, { from: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, 'Library', 'Application Support', 'Windsurf', 'User', 'keybindings.json'), - to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, 'Library', 'Application Support', 'Void', 'User', 'keybindings.json'), + to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, 'Library', 'Application Support', 'Orcide', 'User', 'keybindings.json'), }, { from: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.windsurf', 'extensions'), - to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.void-editor', 'extensions'), + to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.orcide', 'extensions'), isExtensions: true, }] } @@ -238,37 +238,37 @@ const transferTheseFilesOfOS = (os: 'mac' | 'windows' | 'linux' | null, fromEdit if (fromEditor === 'VS Code') { return [{ from: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.config', 'Code', 'User', 'settings.json'), - to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.config', 'Void', 'User', 'settings.json'), + to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.config', 'Orcide', 'User', 'settings.json'), }, { from: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.config', 'Code', 'User', 'keybindings.json'), - to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.config', 'Void', 'User', 'keybindings.json'), + to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.config', 'Orcide', 'User', 'keybindings.json'), }, { from: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.vscode', 'extensions'), - to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.void-editor', 'extensions'), + to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.orcide', 'extensions'), isExtensions: true, }] } else if (fromEditor === 'Cursor') { return [{ from: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.config', 'Cursor', 'User', 'settings.json'), - to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.config', 'Void', 'User', 'settings.json'), + to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.config', 'Orcide', 'User', 'settings.json'), }, { from: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.config', 'Cursor', 'User', 'keybindings.json'), - to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.config', 'Void', 'User', 'keybindings.json'), + to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.config', 'Orcide', 'User', 'keybindings.json'), }, { from: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.cursor', 'extensions'), - to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.void-editor', 'extensions'), + to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.orcide', 'extensions'), isExtensions: true, }] } else if (fromEditor === 'Windsurf') { return [{ from: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.config', 'Windsurf', 'User', 'settings.json'), - to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.config', 'Void', 'User', 'settings.json'), + to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.config', 'Orcide', 'User', 'settings.json'), }, { from: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.config', 'Windsurf', 'User', 'keybindings.json'), - to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.config', 'Void', 'User', 'keybindings.json'), + to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.config', 'Orcide', 'User', 'keybindings.json'), }, { from: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.windsurf', 'extensions'), - to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.void-editor', 'extensions'), + to: URI.joinPath(URI.from({ scheme: 'file' }), homeDir, '.orcide', 'extensions'), isExtensions: true, }] } @@ -283,37 +283,37 @@ const transferTheseFilesOfOS = (os: 'mac' | 'windows' | 'linux' | null, fromEdit if (fromEditor === 'VS Code') { return [{ from: URI.joinPath(URI.from({ scheme: 'file' }), appdata, 'Code', 'User', 'settings.json'), - to: URI.joinPath(URI.from({ scheme: 'file' }), appdata, 'Void', 'User', 'settings.json'), + to: URI.joinPath(URI.from({ scheme: 'file' }), appdata, 'Orcide', 'User', 'settings.json'), }, { from: URI.joinPath(URI.from({ scheme: 'file' }), appdata, 'Code', 'User', 'keybindings.json'), - to: URI.joinPath(URI.from({ scheme: 'file' }), appdata, 'Void', 'User', 'keybindings.json'), + to: URI.joinPath(URI.from({ scheme: 'file' }), appdata, 'Orcide', 'User', 'keybindings.json'), }, { from: URI.joinPath(URI.from({ scheme: 'file' }), userprofile, '.vscode', 'extensions'), - to: URI.joinPath(URI.from({ scheme: 'file' }), userprofile, '.void-editor', 'extensions'), + to: URI.joinPath(URI.from({ scheme: 'file' }), userprofile, '.orcide', 'extensions'), isExtensions: true, }] } else if (fromEditor === 'Cursor') { return [{ from: URI.joinPath(URI.from({ scheme: 'file' }), appdata, 'Cursor', 'User', 'settings.json'), - to: URI.joinPath(URI.from({ scheme: 'file' }), appdata, 'Void', 'User', 'settings.json'), + to: URI.joinPath(URI.from({ scheme: 'file' }), appdata, 'Orcide', 'User', 'settings.json'), }, { from: URI.joinPath(URI.from({ scheme: 'file' }), appdata, 'Cursor', 'User', 'keybindings.json'), - to: URI.joinPath(URI.from({ scheme: 'file' }), appdata, 'Void', 'User', 'keybindings.json'), + to: URI.joinPath(URI.from({ scheme: 'file' }), appdata, 'Orcide', 'User', 'keybindings.json'), }, { from: URI.joinPath(URI.from({ scheme: 'file' }), userprofile, '.cursor', 'extensions'), - to: URI.joinPath(URI.from({ scheme: 'file' }), userprofile, '.void-editor', 'extensions'), + to: URI.joinPath(URI.from({ scheme: 'file' }), userprofile, '.orcide', 'extensions'), isExtensions: true, }] } else if (fromEditor === 'Windsurf') { return [{ from: URI.joinPath(URI.from({ scheme: 'file' }), appdata, 'Windsurf', 'User', 'settings.json'), - to: URI.joinPath(URI.from({ scheme: 'file' }), appdata, 'Void', 'User', 'settings.json'), + to: URI.joinPath(URI.from({ scheme: 'file' }), appdata, 'Orcide', 'User', 'settings.json'), }, { from: URI.joinPath(URI.from({ scheme: 'file' }), appdata, 'Windsurf', 'User', 'keybindings.json'), - to: URI.joinPath(URI.from({ scheme: 'file' }), appdata, 'Void', 'User', 'keybindings.json'), + to: URI.joinPath(URI.from({ scheme: 'file' }), appdata, 'Orcide', 'User', 'keybindings.json'), }, { from: URI.joinPath(URI.from({ scheme: 'file' }), userprofile, '.windsurf', 'extensions'), - to: URI.joinPath(URI.from({ scheme: 'file' }), userprofile, '.void-editor', 'extensions'), + to: URI.joinPath(URI.from({ scheme: 'file' }), userprofile, '.orcide', 'extensions'), isExtensions: true, }] } diff --git a/src/vs/workbench/contrib/void/browser/extensionTransferTypes.ts b/src/vs/workbench/contrib/orcide/browser/extensionTransferTypes.ts similarity index 79% rename from src/vs/workbench/contrib/void/browser/extensionTransferTypes.ts rename to src/vs/workbench/contrib/orcide/browser/extensionTransferTypes.ts index 4e10707c6dc..d5d45d0800b 100644 --- a/src/vs/workbench/contrib/void/browser/extensionTransferTypes.ts +++ b/src/vs/workbench/contrib/orcide/browser/extensionTransferTypes.ts @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { URI } from '../../../../base/common/uri.js' diff --git a/src/vs/workbench/contrib/void/browser/fileService.ts b/src/vs/workbench/contrib/orcide/browser/fileService.ts similarity index 80% rename from src/vs/workbench/contrib/void/browser/fileService.ts rename to src/vs/workbench/contrib/orcide/browser/fileService.ts index 93da1b1e2cf..e857cc1ae96 100644 --- a/src/vs/workbench/contrib/void/browser/fileService.ts +++ b/src/vs/workbench/contrib/orcide/browser/fileService.ts @@ -7,20 +7,20 @@ import { IFileService } from '../../../../platform/files/common/files.js'; import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js'; import { IDirectoryStrService } from '../common/directoryStrService.js'; import { messageOfSelection } from '../common/prompt/prompts.js'; -import { IVoidModelService } from '../common/voidModelService.js'; +import { IOrcideModelService } from '../common/orcideModelService.js'; class FilePromptActionService extends Action2 { - private static readonly VOID_COPY_FILE_PROMPT_ID = 'void.copyfileprompt' + private static readonly ORCIDE_COPY_FILE_PROMPT_ID = 'orcide.copyfileprompt' constructor() { super({ - id: FilePromptActionService.VOID_COPY_FILE_PROMPT_ID, - title: localize2('voidCopyPrompt', 'Void: Copy Prompt'), + id: FilePromptActionService.ORCIDE_COPY_FILE_PROMPT_ID, + title: localize2('orcideCopyPrompt', 'Orcide: Copy Prompt'), menu: [{ id: MenuId.ExplorerContext, - group: '8_void', + group: '8_orcide', order: 1, }] }); @@ -31,7 +31,7 @@ class FilePromptActionService extends Action2 { const fileService = accessor.get(IFileService); const clipboardService = accessor.get(IClipboardService) const directoryStrService = accessor.get(IDirectoryStrService) - const voidModelService = accessor.get(IVoidModelService) + const orcideModelService = accessor.get(IOrcideModelService) const stat = await fileService.stat(uri) @@ -45,7 +45,7 @@ class FilePromptActionService extends Action2 { m = await messageOfSelection({ type: 'File', uri, - language: (await voidModelService.getModelSafe(uri)).model?.getLanguageId() || '', + language: (await orcideModelService.getModelSafe(uri)).model?.getLanguageId() || '', state: { wasAddedAsCurrentFile: false, }, }, { folderOpts, diff --git a/src/vs/workbench/contrib/void/browser/helperServices/consistentItemService.ts b/src/vs/workbench/contrib/orcide/browser/helperServices/consistentItemService.ts similarity index 98% rename from src/vs/workbench/contrib/void/browser/helperServices/consistentItemService.ts rename to src/vs/workbench/contrib/orcide/browser/helperServices/consistentItemService.ts index ba906ff5978..6aea76c5460 100644 --- a/src/vs/workbench/contrib/void/browser/helperServices/consistentItemService.ts +++ b/src/vs/workbench/contrib/orcide/browser/helperServices/consistentItemService.ts @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { Disposable } from '../../../../../base/common/lifecycle.js'; diff --git a/src/vs/workbench/contrib/void/browser/helpers/findDiffs.ts b/src/vs/workbench/contrib/orcide/browser/helpers/findDiffs.ts similarity index 94% rename from src/vs/workbench/contrib/void/browser/helpers/findDiffs.ts rename to src/vs/workbench/contrib/orcide/browser/helpers/findDiffs.ts index 703b2775be6..d092de5c6a5 100644 --- a/src/vs/workbench/contrib/void/browser/helpers/findDiffs.ts +++ b/src/vs/workbench/contrib/orcide/browser/helpers/findDiffs.ts @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { ComputedDiff } from '../../common/editCodeServiceTypes.js'; @@ -130,7 +130,7 @@ export function findDiffs(oldStr: string, newStr: string) { // let keys = new Set([...Object.keys(a), ...Object.keys(b)]) // for (let k of keys) { // if (a[k] !== b[k]) { -// console.error('Void Test Error:', name_, '\n', `${k}=`, `${JSON.stringify(a[k])}, ${JSON.stringify(b[k])}`) +// console.error('Orcide Test Error:', name_, '\n', `${k}=`, `${JSON.stringify(a[k])}, ${JSON.stringify(b[k])}`) // // console.error(JSON.stringify(a, null, 4)) // // console.error(JSON.stringify(b, null, 4)) // testsFailed += 1 @@ -244,8 +244,8 @@ export function findDiffs(oldStr: string, newStr: string) { // if (testsFailed === 0) { -// console.log('✅ Void - All tests passed') +// console.log('✅ Orcide - All tests passed') // } // else { -// console.log('❌ Void - At least one test failed') +// console.log('❌ Orcide - At least one test failed') // } diff --git a/src/vs/workbench/contrib/orcide/browser/media/orcide.css b/src/vs/workbench/contrib/orcide/browser/media/orcide.css new file mode 100644 index 00000000000..9fa9f29335e --- /dev/null +++ b/src/vs/workbench/contrib/orcide/browser/media/orcide.css @@ -0,0 +1,204 @@ +/*-------------------------------------------------------------------------------------- + * Copyright 2025 Glass Devtools, Inc. All rights reserved. + * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + *--------------------------------------------------------------------------------------*/ + +.monaco-editor .orcide-sweepIdxBG { + background-color: var(--vscode-orcide-sweepIdxBG); +} + +.orcide-sweepBG { + background-color: var(--vscode-orcide-sweepBG); +} + +.orcide-highlightBG { + background-color: var(--vscode-orcide-highlightBG); +} + +.orcide-greenBG { + background-color: var(--vscode-orcide-greenBG); +} + +.orcide-redBG { + background-color: var(--vscode-orcide-redBG); +} + + +/* Renamed from void-watermark-button to orcide-openfolder-button */ +.orcide-openfolder-button { + padding: 8px 20px; + background-color: #306dce; + color: white; + border: none; + border-radius: 4px; + outline: none !important; + box-shadow: none !important; + cursor: pointer; + transition: background-color 0.2s ease; +} +.orcide-openfolder-button:hover { + background-color: #2563eb; +} +.orcide-openfolder-button:active { + background-color: #2563eb; +} + +/* Added for Open SSH button with slightly darker color */ +.orcide-openssh-button { + padding: 8px 20px; + background-color: #656565; /* Slightly darker than the #5a5a5a in the TS file */ + color: white; + border: none; + border-radius: 4px; + outline: none !important; + box-shadow: none !important; + cursor: pointer; + transition: background-color 0.2s ease; +} +.orcide-openssh-button:hover { + background-color: #474747; /* Darker on hover */ +} +.orcide-openssh-button:active { + background-color: #474747; +} + + +.orcide-settings-watermark-button { + margin: 8px 0; + padding: 8px 20px; + background-color: var(--vscode-input-background); + color: var(--vscode-input-foreground); + border: none; + border-radius: 4px; + outline: none !important; + box-shadow: none !important; + cursor: pointer; + transition: all 0.2s ease; +} + +.orcide-settings-watermark-button:hover { + filter: brightness(1.1); +} + +.orcide-settings-watermark-button:active { + filter: brightness(1.1); +} + +.orcide-link { + color: #3b82f6; + cursor: pointer; + transition: all 0.2s ease; +} + +.orcide-link:hover { + opacity: 80%; +} + +/* styles for all containers used by orcide */ +.orcide-scope { + --scrollbar-vertical-width: 8px; + --scrollbar-horizontal-height: 6px; +} + +/* Target both orcide-scope and all its descendants with scrollbars */ +.orcide-scope, +.orcide-scope * { + scrollbar-width: thin !important; + scrollbar-color: var(--orcide-bg-1) var(--orcide-bg-3) !important; + /* For Firefox */ +} + +.orcide-scope::-webkit-scrollbar, +.orcide-scope *::-webkit-scrollbar { + width: var(--scrollbar-vertical-width) !important; + height: var(--scrollbar-horizontal-height) !important; + background-color: var(--orcide-bg-3) !important; +} + +.orcide-scope::-webkit-scrollbar-thumb, +.orcide-scope *::-webkit-scrollbar-thumb { + background-color: var(--orcide-bg-1) !important; + border-radius: 4px !important; + border: none !important; + -webkit-box-shadow: none !important; + box-shadow: none !important; +} + +.orcide-scope::-webkit-scrollbar-thumb:hover, +.orcide-scope *::-webkit-scrollbar-thumb:hover { + background-color: var(--orcide-bg-1) !important; + filter: brightness(1.1) !important; +} + +.orcide-scope::-webkit-scrollbar-thumb:active, +.orcide-scope *::-webkit-scrollbar-thumb:active { + background-color: var(--orcide-bg-1) !important; + filter: brightness(1.2) !important; +} + +.orcide-scope::-webkit-scrollbar-track, +.orcide-scope *::-webkit-scrollbar-track { + background-color: var(--orcide-bg-3) !important; + border: none !important; +} + +.orcide-scope::-webkit-scrollbar-corner, +.orcide-scope *::-webkit-scrollbar-corner { + background-color: var(--orcide-bg-3) !important; +} + +/* Add orcide-scrollable-element styles to match */ +.orcide-scrollable-element { + background-color: var(--vscode-editor-background); + --scrollbar-vertical-width: 14px; + --scrollbar-horizontal-height: 6px; + overflow: auto; + /* Ensure scrollbars are shown when needed */ +} + +.orcide-scrollable-element, +.orcide-scrollable-element * { + scrollbar-width: thin !important; + /* For Firefox */ + scrollbar-color: var(--orcide-bg-1) var(--orcide-bg-3) !important; + /* For Firefox */ +} + +.orcide-scrollable-element::-webkit-scrollbar, +.orcide-scrollable-element *::-webkit-scrollbar { + width: var(--scrollbar-vertical-width) !important; + height: var(--scrollbar-horizontal-height) !important; + background-color: var(--orcide-bg-3) !important; +} + +.orcide-scrollable-element::-webkit-scrollbar-thumb, +.orcide-scrollable-element *::-webkit-scrollbar-thumb { + background-color: var(--orcide-bg-1) !important; + border-radius: 4px !important; + border: none !important; + -webkit-box-shadow: none !important; + box-shadow: none !important; +} + +.orcide-scrollable-element::-webkit-scrollbar-thumb:hover, +.orcide-scrollable-element *::-webkit-scrollbar-thumb:hover { + background-color: var(--orcide-bg-1) !important; + filter: brightness(1.1) !important; +} + +.orcide-scrollable-element::-webkit-scrollbar-thumb:active, +.orcide-scrollable-element *::-webkit-scrollbar-thumb:active { + background-color: var(--orcide-bg-1) !important; + filter: brightness(1.2) !important; +} + +.orcide-scrollable-element::-webkit-scrollbar-track, +.orcide-scrollable-element *::-webkit-scrollbar-track { + background-color: var(--orcide-bg-3) !important; + border: none !important; +} + +.orcide-scrollable-element::-webkit-scrollbar-corner, +.orcide-scrollable-element *::-webkit-scrollbar-corner { + background-color: var(--orcide-bg-3) !important; +} diff --git a/src/vs/workbench/contrib/void/browser/metricsPollService.ts b/src/vs/workbench/contrib/orcide/browser/metricsPollService.ts similarity index 91% rename from src/vs/workbench/contrib/void/browser/metricsPollService.ts rename to src/vs/workbench/contrib/orcide/browser/metricsPollService.ts index 493c7edaccd..f9ab5ab23b7 100644 --- a/src/vs/workbench/contrib/void/browser/metricsPollService.ts +++ b/src/vs/workbench/contrib/orcide/browser/metricsPollService.ts @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { Disposable } from '../../../../base/common/lifecycle.js'; diff --git a/src/vs/workbench/contrib/void/browser/miscWokrbenchContrib.ts b/src/vs/workbench/contrib/orcide/browser/miscWokrbenchContrib.ts similarity index 90% rename from src/vs/workbench/contrib/void/browser/miscWokrbenchContrib.ts rename to src/vs/workbench/contrib/orcide/browser/miscWokrbenchContrib.ts index 83b3ed7b7fd..3b116b9dd7b 100644 --- a/src/vs/workbench/contrib/void/browser/miscWokrbenchContrib.ts +++ b/src/vs/workbench/contrib/orcide/browser/miscWokrbenchContrib.ts @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { Disposable } from '../../../../base/common/lifecycle.js'; @@ -26,7 +26,7 @@ export class MiscWorkbenchContribs extends Disposable implements IWorkbenchContr private initialize(): void { // delete blacklisted extensions once (this is for people who already installed them) - const deleteExtensionsStorageId = 'void-deleted-blacklist-2' + const deleteExtensionsStorageId = 'orcide-deleted-blacklist-2' const alreadyDeleted = this.storageService.get(deleteExtensionsStorageId, StorageScope.APPLICATION) if (!alreadyDeleted) { this.storageService.store(deleteExtensionsStorageId, 'true', StorageScope.APPLICATION, StorageTarget.MACHINE) diff --git a/src/vs/workbench/contrib/void/browser/void.contribution.ts b/src/vs/workbench/contrib/orcide/browser/orcide.contribution.ts similarity index 55% rename from src/vs/workbench/contrib/void/browser/void.contribution.ts rename to src/vs/workbench/contrib/orcide/browser/orcide.contribution.ts index 35c89184c08..4d4b6508b6e 100644 --- a/src/vs/workbench/contrib/void/browser/void.contribution.ts +++ b/src/vs/workbench/contrib/orcide/browser/orcide.contribution.ts @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ @@ -23,13 +23,13 @@ import './autocompleteService.js' // import './contextUserChangesService.js' // settings pane -import './voidSettingsPane.js' +import './orcideSettingsPane.js' // register css -import './media/void.css' +import './media/orcide.css' // update (frontend part, also see platform/) -import './voidUpdateActions.js' +import './orcideUpdateActions.js' import './convertToLLMMessageWorkbenchContrib.js' @@ -47,13 +47,13 @@ import './metricsPollService.js' import './helperServices/consistentItemService.js' // register selection helper -import './voidSelectionHelperWidget.js' +import './orcideSelectionHelperWidget.js' // register tooltip service import './tooltipService.js' // register onboarding service -import './voidOnboardingService.js' +import './orcideOnboardingService.js' // register misc service import './miscWokrbenchContrib.js' @@ -62,15 +62,20 @@ import './miscWokrbenchContrib.js' import './fileService.js' // register source control management -import './voidSCMService.js' +import './orcideSCMService.js' -// ---------- common (unclear if these actually need to be imported, because they're already imported wherever they're used) ---------- +// ---------- Orcide SSO & Profile services ---------- + +// SSO authentication service (browser-side) +import './orcideSSOBrowserService.js' + +// ---------- common ---------- // llmMessage import '../common/sendLLMMessageService.js' -// voidSettings -import '../common/voidSettingsService.js' +// orcideSettings (previously orcideSettings) +import '../common/orcideSettingsService.js' // refreshModel import '../common/refreshModelService.js' @@ -79,7 +84,25 @@ import '../common/refreshModelService.js' import '../common/metricsService.js' // updates -import '../common/voidUpdateService.js' +import '../common/orcideUpdateService.js' // model service -import '../common/voidModelService.js' +import '../common/orcideModelService.js' + +// Orcide SSO service +import '../common/orcideSSOService.js' + +// Orcide user profile service +import '../common/orcideUserProfileService.js' + +// Orcide collaboration service +import '../common/orcideCollaborationService.js' + +// Orcide LangChain integration service +import '../common/orcideLangChainService.js' + +// Orcide Git PR generation & deployment service +import '../common/orcideGitService.js' + +// Orcide Enterprise & Cursor Ultra features service +import '../common/orcideEnterpriseService.js' diff --git a/src/vs/workbench/contrib/orcide/browser/orcide.web.services.ts b/src/vs/workbench/contrib/orcide/browser/orcide.web.services.ts new file mode 100644 index 00000000000..662a6a7906a --- /dev/null +++ b/src/vs/workbench/contrib/orcide/browser/orcide.web.services.ts @@ -0,0 +1,294 @@ +/*-------------------------------------------------------------------------------------- + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. + *--------------------------------------------------------------------------------------*/ + +import { Disposable } from '../../../../base/common/lifecycle.js'; +import { Emitter, Event } from '../../../../base/common/event.js'; +import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js'; +import { generateUuid } from '../../../../base/common/uuid.js'; + +import { ILLMMessageService } from '../common/sendLLMMessageService.js'; +import { ServiceSendLLMMessageParams, ServiceModelListParams, OllamaModelResponse, OpenaiCompatibleModelResponse } from '../common/sendLLMMessageTypes.js'; +import { IOrcideSettingsService } from '../common/orcideSettingsService.js'; +import { IMCPService } from '../common/mcpService.js'; +import { MCPToolCallParams, RawMCPToolCall } from '../common/mcpServiceTypes.js'; +import { InternalToolInfo } from '../common/prompt/prompts.js'; +import { IMetricsService } from '../common/metricsService.js'; +import { IOrcideUpdateService } from '../common/orcideUpdateService.js'; +import { IGenerateCommitMessageService } from './orcideSCMService.js'; +import { ProviderName } from '../common/orcideSettingsTypes.js'; + + +const OPENAI_COMPAT_BASE_URLS: Partial> = { + openRouter: 'https://openrouter.ai/api/v1', + openAI: 'https://api.openai.com/v1', + deepseek: 'https://api.deepseek.com', + groq: 'https://api.groq.com/openai/v1', + xAI: 'https://api.x.ai/v1', + mistral: 'https://api.mistral.ai/v1', +}; + +class LLMMessageServiceWeb extends Disposable implements ILLMMessageService { + readonly _serviceBrand: undefined; + private readonly _abortControllers = new Map(); + + constructor( + @IOrcideSettingsService private readonly orcideSettingsService: IOrcideSettingsService, + ) { + super(); + } + + sendLLMMessage(params: ServiceSendLLMMessageParams): string | null { + const { onError, modelSelection } = params; + + if (modelSelection === null) { + onError({ message: 'Please add a provider in Orcide\'s Settings.', fullError: null }); + return null; + } + + if (params.messagesType === 'chatMessages' && (params.messages?.length ?? 0) === 0) { + onError({ message: 'No messages detected.', fullError: null }); + return null; + } + + if (params.messagesType === 'FIMMessage') { + onError({ message: 'Autocomplete (FIM) is not supported in web mode.', fullError: null }); + return null; + } + + const requestId = generateUuid(); + const abortController = new AbortController(); + this._abortControllers.set(requestId, abortController); + + this._doSendChat(params, requestId, abortController); + + return requestId; + } + + private async _doSendChat( + params: ServiceSendLLMMessageParams, + requestId: string, + abortController: AbortController + ) { + const { onText, onFinalMessage, onError, modelSelection } = params; + + if (params.messagesType !== 'chatMessages' || !modelSelection) return; + + try { + const { settingsOfProvider } = this.orcideSettingsService.state; + const providerSettings = settingsOfProvider[modelSelection.providerName]; + const apiKey = (providerSettings as Record).apiKey as string | undefined; + + if (!apiKey) { + onError({ + message: `API key not set for ${modelSelection.providerName}. Please configure it in Orcide Settings.`, + fullError: null + }); + return; + } + + const baseUrl = this._getBaseUrl(modelSelection.providerName, providerSettings); + if (!baseUrl) { + onError({ + message: `Provider "${modelSelection.providerName}" requires the desktop app. Use OpenRouter instead.`, + fullError: null + }); + return; + } + + const messages = this._buildMessages(params.messages, params.separateSystemMessage); + + const body: Record = { + model: modelSelection.modelName, + messages, + stream: true, + }; + + const headers: Record = { + 'Content-Type': 'application/json', + 'Authorization': `Bearer ${apiKey}`, + }; + + if (modelSelection.providerName === 'openRouter') { + headers['HTTP-Referer'] = 'https://ide.orcest.ai'; + headers['X-Title'] = 'ide.orcest.ai'; + } + + const response = await fetch(`${baseUrl}/chat/completions`, { + method: 'POST', + headers, + body: JSON.stringify(body), + signal: abortController.signal, + }); + + if (!response.ok) { + const errorText = await response.text(); + onError({ + message: `API error (${response.status}): ${errorText}`, + fullError: new Error(errorText) + }); + this._abortControllers.delete(requestId); + return; + } + + const reader = response.body!.getReader(); + const decoder = new TextDecoder(); + let fullText = ''; + let fullReasoning = ''; + let buffer = ''; + + while (true) { + const { done, value } = await reader.read(); + if (done) break; + + buffer += decoder.decode(value, { stream: true }); + const lines = buffer.split('\n'); + buffer = lines.pop() || ''; + + for (const line of lines) { + const trimmed = line.trim(); + if (!trimmed.startsWith('data: ')) continue; + + const data = trimmed.slice(6); + if (data === '[DONE]') { + onFinalMessage({ fullText, fullReasoning, anthropicReasoning: null }); + this._abortControllers.delete(requestId); + return; + } + + try { + const parsed = JSON.parse(data); + const delta = parsed.choices?.[0]?.delta; + if (delta?.content) { + fullText += delta.content; + onText({ fullText, fullReasoning }); + } + if (delta?.reasoning_content || delta?.reasoning) { + fullReasoning += (delta.reasoning_content || delta.reasoning); + onText({ fullText, fullReasoning }); + } + } catch { + // skip malformed SSE chunks + } + } + } + + onFinalMessage({ fullText, fullReasoning, anthropicReasoning: null }); + this._abortControllers.delete(requestId); + } catch (err: unknown) { + if (err instanceof Error && err.name === 'AbortError') return; + const message = err instanceof Error ? err.message : String(err); + onError({ message, fullError: err instanceof Error ? err : new Error(message) }); + this._abortControllers.delete(requestId); + } + } + + private _getBaseUrl(providerName: ProviderName, providerSettings: Record): string | null { + const known = OPENAI_COMPAT_BASE_URLS[providerName]; + if (known) return known; + + if (providerName === 'openAICompatible' || providerName === 'liteLLM' || providerName === 'awsBedrock') { + return (providerSettings.endpoint as string) || null; + } + + return null; + } + + private _buildMessages( + messages: unknown[], + separateSystemMessage: string | undefined + ): { role: string; content: string }[] { + const result: { role: string; content: string }[] = []; + + if (separateSystemMessage) { + result.push({ role: 'system', content: separateSystemMessage }); + } + + for (const msg of messages) { + const m = msg as { role: string; content: unknown }; + if (typeof m.content === 'string') { + result.push({ role: m.role === 'model' ? 'assistant' : m.role, content: m.content }); + } else if (Array.isArray(m.content)) { + const textParts = m.content + .filter((p: Record) => p.type === 'text' || p.text) + .map((p: Record) => (p.text as string) || '') + .join(''); + if (textParts) { + result.push({ role: m.role === 'model' ? 'assistant' : m.role, content: textParts }); + } + } + } + + return result; + } + + abort(requestId: string) { + const controller = this._abortControllers.get(requestId); + if (controller) { + controller.abort(); + this._abortControllers.delete(requestId); + } + } + + ollamaList(params: ServiceModelListParams) { + params.onError({ error: 'Ollama model listing is not available in web mode.' }); + } + + openAICompatibleList(params: ServiceModelListParams) { + params.onError({ error: 'Model listing is not available in web mode.' }); + } +} + + +class MCPServiceWeb extends Disposable implements IMCPService { + readonly _serviceBrand: undefined; + + state: { mcpServerOfName: Record; error: string | undefined } = { + mcpServerOfName: {}, + error: undefined, + }; + + private readonly _onDidChangeState = new Emitter(); + readonly onDidChangeState: Event = this._onDidChangeState.event; + + async revealMCPConfigFile(): Promise { } + async toggleServerIsOn(): Promise { } + getMCPTools(): InternalToolInfo[] | undefined { return undefined; } + + async callMCPTool(_toolData: MCPToolCallParams): Promise<{ result: RawMCPToolCall }> { + throw new Error('MCP is not available in web mode.'); + } + + stringifyResult(result: RawMCPToolCall): string { + return JSON.stringify(result); + } +} + + +class MetricsServiceWeb implements IMetricsService { + readonly _serviceBrand: undefined; + capture(): void { } + setOptOut(): void { } + async getDebuggingProperties(): Promise { return { mode: 'web' }; } +} + + +class OrcideUpdateServiceWeb implements IOrcideUpdateService { + readonly _serviceBrand: undefined; + check: IOrcideUpdateService['check'] = async () => null; +} + + +class GenerateCommitMessageServiceWeb implements IGenerateCommitMessageService { + readonly _serviceBrand: undefined; + async generateCommitMessage(): Promise { } + abort(): void { } +} + + +registerSingleton(ILLMMessageService, LLMMessageServiceWeb, InstantiationType.Eager); +registerSingleton(IMCPService, MCPServiceWeb, InstantiationType.Eager); +registerSingleton(IMetricsService, MetricsServiceWeb, InstantiationType.Eager); +registerSingleton(IOrcideUpdateService, OrcideUpdateServiceWeb, InstantiationType.Eager); +registerSingleton(IGenerateCommitMessageService, GenerateCommitMessageServiceWeb, InstantiationType.Delayed); diff --git a/src/vs/workbench/contrib/void/browser/voidCommandBarService.ts b/src/vs/workbench/contrib/orcide/browser/orcideCommandBarService.ts similarity index 86% rename from src/vs/workbench/contrib/void/browser/voidCommandBarService.ts rename to src/vs/workbench/contrib/orcide/browser/orcideCommandBarService.ts index 6c0c17a9b98..bc2d3c17582 100644 --- a/src/vs/workbench/contrib/void/browser/voidCommandBarService.ts +++ b/src/vs/workbench/contrib/orcide/browser/orcideCommandBarService.ts @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js'; @@ -11,7 +11,7 @@ import { Widget } from '../../../../base/browser/ui/widget.js'; import { IOverlayWidget, ICodeEditor, OverlayWidgetPositionPreference } from '../../../../editor/browser/editorBrowser.js'; import { Emitter, Event } from '../../../../base/common/event.js'; import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js'; -import { mountVoidCommandBar } from './react/out/void-editor-widgets-tsx/index.js' +import { mountOrcideCommandBar } from './react/out/orcide-editor-widgets-tsx/index.js' import { deepClone } from '../../../../base/common/objects.js'; import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; import { IEditCodeService } from './editCodeServiceInterface.js'; @@ -19,7 +19,7 @@ import { ITextModel } from '../../../../editor/common/model.js'; import { IModelService } from '../../../../editor/common/services/model.js'; import { generateUuid } from '../../../../base/common/uuid.js'; import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js'; -import { VOID_ACCEPT_DIFF_ACTION_ID, VOID_REJECT_DIFF_ACTION_ID, VOID_GOTO_NEXT_DIFF_ACTION_ID, VOID_GOTO_PREV_DIFF_ACTION_ID, VOID_GOTO_NEXT_URI_ACTION_ID, VOID_GOTO_PREV_URI_ACTION_ID, VOID_ACCEPT_FILE_ACTION_ID, VOID_REJECT_FILE_ACTION_ID, VOID_ACCEPT_ALL_DIFFS_ACTION_ID, VOID_REJECT_ALL_DIFFS_ACTION_ID } from './actionIDs.js'; +import { ORCIDE_ACCEPT_DIFF_ACTION_ID, ORCIDE_REJECT_DIFF_ACTION_ID, ORCIDE_GOTO_NEXT_DIFF_ACTION_ID, ORCIDE_GOTO_PREV_DIFF_ACTION_ID, ORCIDE_GOTO_NEXT_URI_ACTION_ID, ORCIDE_GOTO_PREV_URI_ACTION_ID, ORCIDE_ACCEPT_FILE_ACTION_ID, ORCIDE_REJECT_FILE_ACTION_ID, ORCIDE_ACCEPT_ALL_DIFFS_ACTION_ID, ORCIDE_REJECT_ALL_DIFFS_ACTION_ID } from './actionIDs.js'; import { localize2 } from '../../../../nls.js'; import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js'; import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js'; @@ -27,11 +27,11 @@ import { IMetricsService } from '../common/metricsService.js'; import { KeyMod } from '../../../../editor/common/services/editorBaseApi.js'; import { KeyCode } from '../../../../base/common/keyCodes.js'; import { ScrollType } from '../../../../editor/common/editorCommon.js'; -import { IVoidModelService } from '../common/voidModelService.js'; +import { IOrcideModelService } from '../common/orcideModelService.js'; -export interface IVoidCommandBarService { +export interface IOrcideCommandBarService { readonly _serviceBrand: undefined; stateOfURI: { [uri: string]: CommandBarStateType }; sortedURIs: URI[]; @@ -54,7 +54,7 @@ export interface IVoidCommandBarService { } -export const IVoidCommandBarService = createDecorator('VoidCommandBarService'); +export const IOrcideCommandBarService = createDecorator('OrcideCommandBarService'); export type CommandBarStateType = undefined | { @@ -75,10 +75,10 @@ const defaultState: NonNullable = { } -export class VoidCommandBarService extends Disposable implements IVoidCommandBarService { +export class OrcideCommandBarService extends Disposable implements IOrcideCommandBarService { _serviceBrand: undefined; - static readonly ID: 'void.VoidCommandBarService' + static readonly ID: 'orcide.OrcideCommandBarService' // depends on uri -> diffZone -> {streaming, diffs} public stateOfURI: { [uri: string]: CommandBarStateType } = {} @@ -100,7 +100,7 @@ export class VoidCommandBarService extends Disposable implements IVoidCommandBar @ICodeEditorService private readonly _codeEditorService: ICodeEditorService, @IModelService private readonly _modelService: IModelService, @IEditCodeService private readonly _editCodeService: IEditCodeService, - @IVoidModelService private readonly _voidModelService: IVoidModelService, + @IOrcideModelService private readonly _orcideModelService: IOrcideModelService, ) { super(); @@ -460,7 +460,7 @@ export class VoidCommandBarService extends Disposable implements IVoidCommandBar if (!nextURI) return; // Get the model for this URI - const { model } = await this._voidModelService.getModelSafe(nextURI); + const { model } = await this._orcideModelService.getModelSafe(nextURI); if (!model) return; // Find an editor to use @@ -488,10 +488,10 @@ export class VoidCommandBarService extends Disposable implements IVoidCommandBar } -registerSingleton(IVoidCommandBarService, VoidCommandBarService, InstantiationType.Delayed); // delayed is needed here :( +registerSingleton(IOrcideCommandBarService, OrcideCommandBarService, InstantiationType.Delayed); // delayed is needed here :( -export type VoidCommandBarProps = { +export type OrcideCommandBarProps = { uri: URI | null; editor: ICodeEditor; } @@ -535,12 +535,12 @@ class AcceptRejectAllFloatingWidget extends Widget implements IOverlayWidget { this.instantiationService.invokeFunction(accessor => { const uri = editor.getModel()?.uri || null - const res = mountVoidCommandBar(root, accessor, { uri, editor } satisfies VoidCommandBarProps) + const res = mountOrcideCommandBar(root, accessor, { uri, editor } satisfies OrcideCommandBarProps) if (!res) return this._register(toDisposable(() => res.dispose?.())) this._register(editor.onWillChangeModel((model) => { const uri = model.newModelUrl - res.rerender({ uri, editor } satisfies VoidCommandBarProps) + res.rerender({ uri, editor } satisfies OrcideCommandBarProps) })) }) } @@ -570,20 +570,20 @@ class AcceptRejectAllFloatingWidget extends Widget implements IOverlayWidget { registerAction2(class extends Action2 { constructor() { super({ - id: VOID_ACCEPT_DIFF_ACTION_ID, + id: ORCIDE_ACCEPT_DIFF_ACTION_ID, f1: true, - title: localize2('voidAcceptDiffAction', 'Void: Accept Diff'), + title: localize2('orcideAcceptDiffAction', 'Orcide: Accept Diff'), keybinding: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.Enter, mac: { primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.Enter }, - weight: KeybindingWeight.VoidExtension, + weight: KeybindingWeight.OrcideExtension, } }); } async run(accessor: ServicesAccessor): Promise { const editCodeService = accessor.get(IEditCodeService); - const commandBarService = accessor.get(IVoidCommandBarService); + const commandBarService = accessor.get(IOrcideCommandBarService); const metricsService = accessor.get(IMetricsService); @@ -613,20 +613,20 @@ registerAction2(class extends Action2 { registerAction2(class extends Action2 { constructor() { super({ - id: VOID_REJECT_DIFF_ACTION_ID, + id: ORCIDE_REJECT_DIFF_ACTION_ID, f1: true, - title: localize2('voidRejectDiffAction', 'Void: Reject Diff'), + title: localize2('orcideRejectDiffAction', 'Orcide: Reject Diff'), keybinding: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.Backspace, mac: { primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.Backspace }, - weight: KeybindingWeight.VoidExtension, + weight: KeybindingWeight.OrcideExtension, } }); } async run(accessor: ServicesAccessor): Promise { const editCodeService = accessor.get(IEditCodeService); - const commandBarService = accessor.get(IVoidCommandBarService); + const commandBarService = accessor.get(IOrcideCommandBarService); const metricsService = accessor.get(IMetricsService); const activeURI = commandBarService.activeURI; @@ -654,19 +654,19 @@ registerAction2(class extends Action2 { registerAction2(class extends Action2 { constructor() { super({ - id: VOID_GOTO_NEXT_DIFF_ACTION_ID, + id: ORCIDE_GOTO_NEXT_DIFF_ACTION_ID, f1: true, - title: localize2('voidGoToNextDiffAction', 'Void: Go to Next Diff'), + title: localize2('orcideGoToNextDiffAction', 'Orcide: Go to Next Diff'), keybinding: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.DownArrow, mac: { primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.DownArrow }, - weight: KeybindingWeight.VoidExtension, + weight: KeybindingWeight.OrcideExtension, } }); } async run(accessor: ServicesAccessor): Promise { - const commandBarService = accessor.get(IVoidCommandBarService); + const commandBarService = accessor.get(IOrcideCommandBarService); const metricsService = accessor.get(IMetricsService); const nextDiffIdx = commandBarService.getNextDiffIdx(1); @@ -681,19 +681,19 @@ registerAction2(class extends Action2 { registerAction2(class extends Action2 { constructor() { super({ - id: VOID_GOTO_PREV_DIFF_ACTION_ID, + id: ORCIDE_GOTO_PREV_DIFF_ACTION_ID, f1: true, - title: localize2('voidGoToPrevDiffAction', 'Void: Go to Previous Diff'), + title: localize2('orcideGoToPrevDiffAction', 'Orcide: Go to Previous Diff'), keybinding: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.UpArrow, mac: { primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.UpArrow }, - weight: KeybindingWeight.VoidExtension, + weight: KeybindingWeight.OrcideExtension, } }); } async run(accessor: ServicesAccessor): Promise { - const commandBarService = accessor.get(IVoidCommandBarService); + const commandBarService = accessor.get(IOrcideCommandBarService); const metricsService = accessor.get(IMetricsService); const prevDiffIdx = commandBarService.getNextDiffIdx(-1); @@ -708,19 +708,19 @@ registerAction2(class extends Action2 { registerAction2(class extends Action2 { constructor() { super({ - id: VOID_GOTO_NEXT_URI_ACTION_ID, + id: ORCIDE_GOTO_NEXT_URI_ACTION_ID, f1: true, - title: localize2('voidGoToNextUriAction', 'Void: Go to Next File with Diffs'), + title: localize2('orcideGoToNextUriAction', 'Orcide: Go to Next File with Diffs'), keybinding: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.RightArrow, mac: { primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.RightArrow }, - weight: KeybindingWeight.VoidExtension, + weight: KeybindingWeight.OrcideExtension, } }); } async run(accessor: ServicesAccessor): Promise { - const commandBarService = accessor.get(IVoidCommandBarService); + const commandBarService = accessor.get(IOrcideCommandBarService); const metricsService = accessor.get(IMetricsService); const nextUriIdx = commandBarService.getNextUriIdx(1); @@ -735,19 +735,19 @@ registerAction2(class extends Action2 { registerAction2(class extends Action2 { constructor() { super({ - id: VOID_GOTO_PREV_URI_ACTION_ID, + id: ORCIDE_GOTO_PREV_URI_ACTION_ID, f1: true, - title: localize2('voidGoToPrevUriAction', 'Void: Go to Previous File with Diffs'), + title: localize2('orcideGoToPrevUriAction', 'Orcide: Go to Previous File with Diffs'), keybinding: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.LeftArrow, mac: { primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.LeftArrow }, - weight: KeybindingWeight.VoidExtension, + weight: KeybindingWeight.OrcideExtension, } }); } async run(accessor: ServicesAccessor): Promise { - const commandBarService = accessor.get(IVoidCommandBarService); + const commandBarService = accessor.get(IOrcideCommandBarService); const metricsService = accessor.get(IMetricsService); const prevUriIdx = commandBarService.getNextUriIdx(-1); @@ -762,18 +762,18 @@ registerAction2(class extends Action2 { registerAction2(class extends Action2 { constructor() { super({ - id: VOID_ACCEPT_FILE_ACTION_ID, + id: ORCIDE_ACCEPT_FILE_ACTION_ID, f1: true, - title: localize2('voidAcceptFileAction', 'Void: Accept All Diffs in Current File'), + title: localize2('orcideAcceptFileAction', 'Orcide: Accept All Diffs in Current File'), keybinding: { primary: KeyMod.Alt | KeyMod.Shift | KeyCode.Enter, - weight: KeybindingWeight.VoidExtension, + weight: KeybindingWeight.OrcideExtension, } }); } async run(accessor: ServicesAccessor): Promise { - const commandBarService = accessor.get(IVoidCommandBarService); + const commandBarService = accessor.get(IOrcideCommandBarService); const editCodeService = accessor.get(IEditCodeService); const metricsService = accessor.get(IMetricsService); @@ -793,18 +793,18 @@ registerAction2(class extends Action2 { registerAction2(class extends Action2 { constructor() { super({ - id: VOID_REJECT_FILE_ACTION_ID, + id: ORCIDE_REJECT_FILE_ACTION_ID, f1: true, - title: localize2('voidRejectFileAction', 'Void: Reject All Diffs in Current File'), + title: localize2('orcideRejectFileAction', 'Orcide: Reject All Diffs in Current File'), keybinding: { primary: KeyMod.Alt | KeyMod.Shift | KeyCode.Backspace, - weight: KeybindingWeight.VoidExtension, + weight: KeybindingWeight.OrcideExtension, } }); } async run(accessor: ServicesAccessor): Promise { - const commandBarService = accessor.get(IVoidCommandBarService); + const commandBarService = accessor.get(IOrcideCommandBarService); const editCodeService = accessor.get(IEditCodeService); const metricsService = accessor.get(IMetricsService); @@ -824,18 +824,18 @@ registerAction2(class extends Action2 { registerAction2(class extends Action2 { constructor() { super({ - id: VOID_ACCEPT_ALL_DIFFS_ACTION_ID, + id: ORCIDE_ACCEPT_ALL_DIFFS_ACTION_ID, f1: true, - title: localize2('voidAcceptAllDiffsAction', 'Void: Accept All Diffs in All Files'), + title: localize2('orcideAcceptAllDiffsAction', 'Orcide: Accept All Diffs in All Files'), keybinding: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter, - weight: KeybindingWeight.VoidExtension, + weight: KeybindingWeight.OrcideExtension, } }); } async run(accessor: ServicesAccessor): Promise { - const commandBarService = accessor.get(IVoidCommandBarService); + const commandBarService = accessor.get(IOrcideCommandBarService); const metricsService = accessor.get(IMetricsService); if (commandBarService.anyFileIsStreaming()) return; @@ -849,18 +849,18 @@ registerAction2(class extends Action2 { registerAction2(class extends Action2 { constructor() { super({ - id: VOID_REJECT_ALL_DIFFS_ACTION_ID, + id: ORCIDE_REJECT_ALL_DIFFS_ACTION_ID, f1: true, - title: localize2('voidRejectAllDiffsAction', 'Void: Reject All Diffs in All Files'), + title: localize2('orcideRejectAllDiffsAction', 'Orcide: Reject All Diffs in All Files'), keybinding: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Backspace, - weight: KeybindingWeight.VoidExtension, + weight: KeybindingWeight.OrcideExtension, } }); } async run(accessor: ServicesAccessor): Promise { - const commandBarService = accessor.get(IVoidCommandBarService); + const commandBarService = accessor.get(IOrcideCommandBarService); const metricsService = accessor.get(IMetricsService); if (commandBarService.anyFileIsStreaming()) return; diff --git a/src/vs/workbench/contrib/void/browser/voidOnboardingService.ts b/src/vs/workbench/contrib/orcide/browser/orcideOnboardingService.ts similarity index 84% rename from src/vs/workbench/contrib/void/browser/voidOnboardingService.ts rename to src/vs/workbench/contrib/orcide/browser/orcideOnboardingService.ts index 097fac76c4f..fb66bace368 100644 --- a/src/vs/workbench/contrib/void/browser/voidOnboardingService.ts +++ b/src/vs/workbench/contrib/orcide/browser/orcideOnboardingService.ts @@ -1,13 +1,13 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js'; import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'; import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js'; import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js'; -import { mountVoidOnboarding } from './react/out/void-onboarding/index.js' +import { mountOrcideOnboarding } from './react/out/orcide-onboarding/index.js' import { h, getActiveWindow } from '../../../../base/browser/dom.js'; // Onboarding contribution that mounts the component at startup @@ -30,10 +30,10 @@ export class OnboardingContribution extends Disposable implements IWorkbenchCont if (workbench) { - const onboardingContainer = h('div.void-onboarding-container').root; + const onboardingContainer = h('div.orcide-onboarding-container').root; workbench.appendChild(onboardingContainer); this.instantiationService.invokeFunction((accessor: ServicesAccessor) => { - const result = mountVoidOnboarding(onboardingContainer, accessor); + const result = mountOrcideOnboarding(onboardingContainer, accessor); if (result && typeof result.dispose === 'function') { this._register(toDisposable(result.dispose)); } diff --git a/src/vs/workbench/contrib/void/browser/voidSCMService.ts b/src/vs/workbench/contrib/orcide/browser/orcideSCMService.ts similarity index 79% rename from src/vs/workbench/contrib/void/browser/voidSCMService.ts rename to src/vs/workbench/contrib/orcide/browser/orcideSCMService.ts index e93c4882935..150ddc52975 100644 --- a/src/vs/workbench/contrib/void/browser/voidSCMService.ts +++ b/src/vs/workbench/contrib/orcide/browser/orcideSCMService.ts @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { ThemeIcon } from '../../../../base/common/themables.js' @@ -9,18 +9,19 @@ import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/c import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js' import { ISCMService } from '../../scm/common/scm.js' import { ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js' -import { IVoidSCMService } from '../common/voidSCMTypes.js' +import { IOrcideSCMService } from '../common/orcideSCMTypes.js' import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js' -import { IVoidSettingsService } from '../common/voidSettingsService.js' +import { IOrcideSettingsService } from '../common/orcideSettingsService.js' import { IConvertToLLMMessageService } from './convertToLLMMessageService.js' import { ILLMMessageService } from '../common/sendLLMMessageService.js' -import { ModelSelection, OverridesOfModel, ModelSelectionOptions } from '../common/voidSettingsTypes.js' +import { ModelSelection, OverridesOfModel, ModelSelectionOptions } from '../common/orcideSettingsTypes.js' import { gitCommitMessage_systemMessage, gitCommitMessage_userMessage } from '../common/prompt/prompts.js' import { LLMChatMessage } from '../common/sendLLMMessageTypes.js' import { generateUuid } from '../../../../base/common/uuid.js' import { ThrottledDelayer } from '../../../../base/common/async.js' import { CancellationError, isCancellationError } from '../../../../base/common/errors.js' import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js' +import { isWeb } from '../../../../base/common/platform.js' import { createDecorator, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js' import { Disposable } from '../../../../base/common/lifecycle.js' import { INotificationService } from '../../../../platform/notification/common/notification.js' @@ -46,13 +47,13 @@ class GenerateCommitMessageService extends Disposable implements IGenerateCommit private readonly execute = new ThrottledDelayer(300) private llmRequestId: string | null = null private currentRequestId: string | null = null - private voidSCM: IVoidSCMService + private voidSCM: IOrcideSCMService private loadingContextKey: IContextKey constructor( @ISCMService private readonly scmService: ISCMService, @IMainProcessService mainProcessService: IMainProcessService, - @IVoidSettingsService private readonly voidSettingsService: IVoidSettingsService, + @IOrcideSettingsService private readonly orcideSettingsService: IOrcideSettingsService, @IConvertToLLMMessageService private readonly convertToLLMMessageService: IConvertToLLMMessageService, @ILLMMessageService private readonly llmMessageService: ILLMMessageService, @IContextKeyService private readonly contextKeyService: IContextKeyService, @@ -60,7 +61,7 @@ class GenerateCommitMessageService extends Disposable implements IGenerateCommit ) { super() this.loadingContextKey = this.contextKeyService.createKey(loadingContextKey, false) - this.voidSCM = ProxyChannel.toService(mainProcessService.getChannel('void-channel-scm')) + this.voidSCM = ProxyChannel.toService(mainProcessService.getChannel('orcide-channel-scm')) } override dispose() { @@ -86,9 +87,9 @@ class GenerateCommitMessageService extends Disposable implements IGenerateCommit if (!this.isCurrentRequest(requestId)) { throw new CancellationError() } - const modelSelection = this.voidSettingsService.state.modelSelectionOfFeature['SCM'] ?? null - const modelSelectionOptions = modelSelection ? this.voidSettingsService.state.optionsOfModelSelection['SCM'][modelSelection?.providerName]?.[modelSelection.modelName] : undefined - const overridesOfModel = this.voidSettingsService.state.overridesOfModel + const modelSelection = this.orcideSettingsService.state.modelSelectionOfFeature['SCM'] ?? null + const modelSelectionOptions = modelSelection ? this.orcideSettingsService.state.optionsOfModelSelection['SCM'][modelSelection?.providerName]?.[modelSelection.modelName] : undefined + const overridesOfModel = this.orcideSettingsService.state.overridesOfModel const modelOptions: ModelOptions = { modelSelection, modelSelectionOptions, overridesOfModel } @@ -159,7 +160,7 @@ class GenerateCommitMessageService extends Disposable implements IGenerateCommit onAbort: () => { reject(new CancellationError()) }, - logging: { loggingName: 'VoidSCM - Commit Message' }, + logging: { loggingName: 'OrcideSCM - Commit Message' }, }) }) } @@ -185,10 +186,10 @@ class GenerateCommitMessageService extends Disposable implements IGenerateCommit class GenerateCommitMessageAction extends Action2 { constructor() { super({ - id: 'void.generateCommitMessageAction', - title: localize2('voidCommitMessagePrompt', 'Void: Generate Commit Message'), + id: 'orcide.generateCommitMessageAction', + title: localize2('orcideCommitMessagePrompt', 'Orcide: Generate Commit Message'), icon: ThemeIcon.fromId('sparkle'), - tooltip: localize2('voidCommitMessagePromptTooltip', 'Void: Generate Commit Message'), + tooltip: localize2('orcideCommitMessagePromptTooltip', 'Orcide: Generate Commit Message'), f1: true, menu: [{ id: MenuId.SCMInputBox, @@ -207,10 +208,10 @@ class GenerateCommitMessageAction extends Action2 { class LoadingGenerateCommitMessageAction extends Action2 { constructor() { super({ - id: 'void.loadingGenerateCommitMessageAction', - title: localize2('voidCommitMessagePromptCancel', 'Void: Cancel Commit Message Generation'), + id: 'orcide.loadingGenerateCommitMessageAction', + title: localize2('orcideCommitMessagePromptCancel', 'Orcide: Cancel Commit Message Generation'), icon: ThemeIcon.fromId('stop-circle'), - tooltip: localize2('voidCommitMessagePromptCancelTooltip', 'Void: Cancel Commit Message Generation'), + tooltip: localize2('orcideCommitMessagePromptCancelTooltip', 'Orcide: Cancel Commit Message Generation'), f1: false, //Having a cancel command in the command palette is more confusing than useful. menu: [{ id: MenuId.SCMInputBox, @@ -227,4 +228,13 @@ class LoadingGenerateCommitMessageAction extends Action2 { registerAction2(GenerateCommitMessageAction) registerAction2(LoadingGenerateCommitMessageAction) -registerSingleton(IGenerateCommitMessageService, GenerateCommitMessageService, InstantiationType.Delayed) +if (!isWeb) { + registerSingleton(IGenerateCommitMessageService, GenerateCommitMessageService, InstantiationType.Delayed) +} else { + class GenerateCommitMessageServiceWeb implements IGenerateCommitMessageService { + readonly _serviceBrand: undefined; + async generateCommitMessage() { } + abort() { } + } + registerSingleton(IGenerateCommitMessageService, GenerateCommitMessageServiceWeb, InstantiationType.Delayed) +} diff --git a/src/vs/workbench/contrib/orcide/browser/orcideSSOBrowserService.ts b/src/vs/workbench/contrib/orcide/browser/orcideSSOBrowserService.ts new file mode 100644 index 00000000000..42621c59f76 --- /dev/null +++ b/src/vs/workbench/contrib/orcide/browser/orcideSSOBrowserService.ts @@ -0,0 +1,459 @@ +/*-------------------------------------------------------------------------------------- + * Copyright 2025 Orcest. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. + *--------------------------------------------------------------------------------------*/ + +import { Disposable } from '../../../../base/common/lifecycle.js'; +import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js'; +import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js'; +import { getActiveWindow } from '../../../../base/browser/dom.js'; +import { IOrcideSSOService, ORCIDE_SSO_CONFIG } from '../common/orcideSSOService.js'; +import { localize2 } from '../../../../nls.js'; +import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js'; +import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js'; + + +// ─── Constants ────────────────────────────────────────────────────────────────── + +// Popup window dimensions +const POPUP_WIDTH = 500; +const POPUP_HEIGHT = 700; + +// Maximum time to wait for the popup to complete (10 minutes) +const POPUP_TIMEOUT_MS = 10 * 60 * 1000; + +// Interval for polling the popup window state +const POPUP_POLL_INTERVAL_MS = 500; + + +// ─── Browser SSO Contribution ─────────────────────────────────────────────────── + +/** + * Workbench contribution that handles browser-specific SSO behavior: + * - Listens for OAuth2 callback messages from the popup window + * - Handles the authorization code exchange + * - Manages the popup window lifecycle + */ +export class OrcideSSOBrowserContribution extends Disposable implements IWorkbenchContribution { + static readonly ID = 'workbench.contrib.orcideSSO'; + + private _popupWindow: Window | null = null; + private _popupPollTimer: ReturnType | null = null; + private _popupTimeoutTimer: ReturnType | null = null; + + constructor( + @IOrcideSSOService private readonly _ssoService: IOrcideSSOService, + @INotificationService private readonly _notificationService: INotificationService, + ) { + super(); + this._initialize(); + } + + private _initialize(): void { + const targetWindow = getActiveWindow(); + + // Listen for postMessage from the OAuth2 callback popup. + // The callback page at /auth/callback posts a message with the authorization + // code and state back to the opener window. + const messageHandler = (event: MessageEvent) => { + this._handleOAuthMessage(event); + }; + targetWindow.addEventListener('message', messageHandler); + this._register({ + dispose: () => targetWindow.removeEventListener('message', messageHandler), + }); + + // Also check if the current URL itself is a callback (for redirect-based flow + // where the entire IDE is redirected to the callback URL) + this._handleRedirectCallback(targetWindow); + } + + + // ── Redirect Flow Handling ───────────────────────────────────────────────── + + /** + * If the IDE is loaded at the callback URL itself (redirect-based OAuth flow), + * extract the code and state from the URL parameters and process the callback. + */ + private _handleRedirectCallback(targetWindow: Window): void { + try { + const url = new URL(targetWindow.location.href); + const callbackPath = new URL(ORCIDE_SSO_CONFIG.redirectUri).pathname; + + if (url.pathname !== callbackPath) { + return; + } + + const code = url.searchParams.get('code'); + const state = url.searchParams.get('state'); + const error = url.searchParams.get('error'); + const errorDescription = url.searchParams.get('error_description'); + + // Clean the callback parameters from the URL so they don't persist + // in the address bar or browser history + url.searchParams.delete('code'); + url.searchParams.delete('state'); + url.searchParams.delete('error'); + url.searchParams.delete('error_description'); + url.searchParams.delete('session_state'); + targetWindow.history.replaceState({}, '', url.pathname + url.search + url.hash); + + if (error) { + const message = errorDescription ?? error; + console.error(`[OrcideSSOBrowser] OAuth error in redirect: ${message}`); + this._notificationService.notify({ + severity: Severity.Error, + message: `SSO login failed: ${message}`, + }); + return; + } + + if (code && state) { + this._processAuthorizationCode(code, state); + } + } catch (e) { + // Not a callback URL, or parsing failed. This is expected in the + // common case where the IDE is loaded normally. + } + } + + + // ── Popup Flow Handling ──────────────────────────────────────────────────── + + /** + * Opens the SSO login page in a centered popup window. + * Called when the login() method triggers _openAuthorizationUrl. + */ + openLoginPopup(authUrl: string): void { + // Close any existing popup + this._closePopup(); + + const targetWindow = getActiveWindow(); + + // Calculate center position for the popup + const left = Math.max(0, Math.round(targetWindow.screenX + (targetWindow.outerWidth - POPUP_WIDTH) / 2)); + const top = Math.max(0, Math.round(targetWindow.screenY + (targetWindow.outerHeight - POPUP_HEIGHT) / 2)); + + const features = [ + `width=${POPUP_WIDTH}`, + `height=${POPUP_HEIGHT}`, + `left=${left}`, + `top=${top}`, + 'menubar=no', + 'toolbar=no', + 'location=yes', + 'status=yes', + 'resizable=yes', + 'scrollbars=yes', + ].join(','); + + this._popupWindow = targetWindow.open(authUrl, 'orcide-sso-login', features); + + if (!this._popupWindow) { + // Popup was blocked by the browser. Fall back to redirect flow. + console.warn('[OrcideSSOBrowser] Popup blocked, falling back to redirect flow'); + this._notificationService.notify({ + severity: Severity.Warning, + message: 'Popup was blocked by the browser. Redirecting to SSO login page...', + }); + targetWindow.location.href = authUrl; + return; + } + + // Focus the popup + this._popupWindow.focus(); + + // Poll the popup to detect if the user closes it manually + this._popupPollTimer = setInterval(() => { + if (this._popupWindow && this._popupWindow.closed) { + this._cleanupPopup(); + } + }, POPUP_POLL_INTERVAL_MS); + + // Set a timeout to auto-close the popup if it takes too long + this._popupTimeoutTimer = setTimeout(() => { + if (this._popupWindow && !this._popupWindow.closed) { + console.warn('[OrcideSSOBrowser] Login popup timed out'); + this._closePopup(); + this._notificationService.notify({ + severity: Severity.Warning, + message: 'SSO login timed out. Please try again.', + }); + } + }, POPUP_TIMEOUT_MS); + } + + + // ── Message Handling ─────────────────────────────────────────────────────── + + /** + * Handles postMessage events from the OAuth callback page. + * The callback page at the redirect URI should post a message with: + * { type: 'orcide-sso-callback', code: string, state: string } + * or + * { type: 'orcide-sso-callback', error: string, errorDescription?: string } + */ + private _handleOAuthMessage(event: MessageEvent): void { + // Validate the origin - only accept messages from our SSO issuer or + // from the IDE itself (for same-origin callback pages) + const allowedOrigins = [ + ORCIDE_SSO_CONFIG.issuer, + new URL(ORCIDE_SSO_CONFIG.redirectUri).origin, + ]; + + if (!allowedOrigins.includes(event.origin)) { + return; + } + + const data = event.data; + if (!data || typeof data !== 'object' || data.type !== 'orcide-sso-callback') { + return; + } + + // Close the popup since we got our response + this._closePopup(); + + if (data.error) { + const message = data.errorDescription ?? data.error; + console.error(`[OrcideSSOBrowser] OAuth error from callback: ${message}`); + this._notificationService.notify({ + severity: Severity.Error, + message: `SSO login failed: ${message}`, + }); + return; + } + + if (data.code && data.state) { + this._processAuthorizationCode(data.code, data.state); + } + } + + + // ── Authorization Code Processing ────────────────────────────────────────── + + /** + * Processes the received authorization code by delegating to the SSO service + * to exchange it for tokens and set up the session. + */ + private async _processAuthorizationCode(code: string, state: string): Promise { + try { + await this._ssoService.handleAuthorizationCallback(code, state); + + const user = this._ssoService.getUserProfile(); + const displayName = user?.name || user?.email || 'User'; + this._notificationService.notify({ + severity: Severity.Info, + message: `Welcome, ${displayName}! You are now signed in.`, + }); + } catch (e) { + const message = e instanceof Error ? e.message : String(e); + console.error('[OrcideSSOBrowser] Failed to process authorization code:', e); + this._notificationService.notify({ + severity: Severity.Error, + message: `SSO login failed: ${message}`, + }); + } + } + + + // ── Popup Lifecycle ──────────────────────────────────────────────────────── + + private _closePopup(): void { + if (this._popupWindow && !this._popupWindow.closed) { + this._popupWindow.close(); + } + this._cleanupPopup(); + } + + private _cleanupPopup(): void { + this._popupWindow = null; + + if (this._popupPollTimer !== null) { + clearInterval(this._popupPollTimer); + this._popupPollTimer = null; + } + + if (this._popupTimeoutTimer !== null) { + clearTimeout(this._popupTimeoutTimer); + this._popupTimeoutTimer = null; + } + } + + + // ── Cleanup ──────────────────────────────────────────────────────────────── + + override dispose(): void { + this._closePopup(); + super.dispose(); + } +} + + +// ─── Register the browser contribution ────────────────────────────────────────── + +registerWorkbenchContribution2( + OrcideSSOBrowserContribution.ID, + OrcideSSOBrowserContribution, + WorkbenchPhase.AfterRestored +); + + +// ─── Command Palette Actions ──────────────────────────────────────────────────── + +registerAction2(class extends Action2 { + constructor() { + super({ + id: 'orcide.sso.login', + f1: true, + title: localize2('orcideSSOLogin', 'Orcide: Sign In with SSO'), + }); + } + + async run(accessor: ServicesAccessor): Promise { + const ssoService = accessor.get(IOrcideSSOService); + const notificationService = accessor.get(INotificationService); + + if (ssoService.isAuthenticated()) { + const user = ssoService.getUserProfile(); + notificationService.notify({ + severity: Severity.Info, + message: `Already signed in as ${user?.name ?? user?.email ?? 'unknown user'}.`, + }); + return; + } + + try { + await ssoService.login(); + } catch (e) { + const message = e instanceof Error ? e.message : String(e); + notificationService.notify({ + severity: Severity.Error, + message: `SSO login failed: ${message}`, + }); + } + } +}); + + +registerAction2(class extends Action2 { + constructor() { + super({ + id: 'orcide.sso.logout', + f1: true, + title: localize2('orcideSSOLogout', 'Orcide: Sign Out'), + }); + } + + async run(accessor: ServicesAccessor): Promise { + const ssoService = accessor.get(IOrcideSSOService); + const notificationService = accessor.get(INotificationService); + + if (!ssoService.isAuthenticated()) { + notificationService.notify({ + severity: Severity.Info, + message: 'You are not currently signed in.', + }); + return; + } + + const user = ssoService.getUserProfile(); + try { + await ssoService.logout(); + notificationService.notify({ + severity: Severity.Info, + message: `Signed out${user?.name ? ` (${user.name})` : ''}. See you next time!`, + }); + } catch (e) { + const message = e instanceof Error ? e.message : String(e); + notificationService.notify({ + severity: Severity.Error, + message: `Sign out failed: ${message}`, + }); + } + } +}); + + +registerAction2(class extends Action2 { + constructor() { + super({ + id: 'orcide.sso.status', + f1: true, + title: localize2('orcideSSOStatus', 'Orcide: SSO Status'), + }); + } + + async run(accessor: ServicesAccessor): Promise { + const ssoService = accessor.get(IOrcideSSOService); + const notificationService = accessor.get(INotificationService); + + if (!ssoService.isAuthenticated()) { + notificationService.notify({ + severity: Severity.Info, + message: 'Not signed in. Use "Orcide: Sign In with SSO" to authenticate.', + }); + return; + } + + const user = ssoService.getUserProfile(); + const { expiresAt } = ssoService.state; + const expiresIn = expiresAt ? Math.max(0, Math.round((expiresAt - Date.now()) / 1000 / 60)) : 'unknown'; + + const lines = [ + `Signed in as: ${user?.name ?? 'Unknown'}`, + `Email: ${user?.email ?? 'N/A'}`, + `Role: ${user?.role ?? 'N/A'}`, + `Token expires in: ${expiresIn} minutes`, + ]; + + notificationService.notify({ + severity: Severity.Info, + message: lines.join('\n'), + }); + } +}); + + +registerAction2(class extends Action2 { + constructor() { + super({ + id: 'orcide.sso.refreshToken', + f1: true, + title: localize2('orcideSSORefresh', 'Orcide: Refresh SSO Token'), + }); + } + + async run(accessor: ServicesAccessor): Promise { + const ssoService = accessor.get(IOrcideSSOService); + const notificationService = accessor.get(INotificationService); + + if (!ssoService.isAuthenticated()) { + notificationService.notify({ + severity: Severity.Warning, + message: 'Cannot refresh token: not signed in.', + }); + return; + } + + try { + const success = await ssoService.refreshToken(); + if (success) { + notificationService.notify({ + severity: Severity.Info, + message: 'SSO token refreshed successfully.', + }); + } else { + notificationService.notify({ + severity: Severity.Error, + message: 'Failed to refresh SSO token. You may need to sign in again.', + }); + } + } catch (e) { + const message = e instanceof Error ? e.message : String(e); + notificationService.notify({ + severity: Severity.Error, + message: `Token refresh failed: ${message}`, + }); + } + } +}); diff --git a/src/vs/workbench/contrib/void/browser/voidSelectionHelperWidget.ts b/src/vs/workbench/contrib/orcide/browser/orcideSelectionHelperWidget.ts similarity index 93% rename from src/vs/workbench/contrib/void/browser/voidSelectionHelperWidget.ts rename to src/vs/workbench/contrib/orcide/browser/orcideSelectionHelperWidget.ts index cb26f9b7e37..2c5b7779a81 100644 --- a/src/vs/workbench/contrib/void/browser/voidSelectionHelperWidget.ts +++ b/src/vs/workbench/contrib/orcide/browser/orcideSelectionHelperWidget.ts @@ -11,9 +11,9 @@ import { IEditorContribution } from '../../../../editor/common/editorCommon.js'; import { Selection } from '../../../../editor/common/core/selection.js'; import { RunOnceScheduler } from '../../../../base/common/async.js'; import * as dom from '../../../../base/browser/dom.js'; -import { mountVoidSelectionHelper } from './react/out/void-editor-widgets-tsx/index.js'; +import { mountOrcideSelectionHelper } from './react/out/orcide-editor-widgets-tsx/index.js'; import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'; -import { IVoidSettingsService } from '../common/voidSettingsService.js'; +import { IOrcideSettingsService } from '../common/orcideSettingsService.js'; import { EditorOption } from '../../../../editor/common/config/editorOptions.js'; import { getLengthOfTextPx } from './editCodeService.js'; @@ -22,7 +22,7 @@ const minDistanceFromRightPx = 400; const minLeftPx = 60; -export type VoidSelectionHelperProps = { +export type OrcideSelectionHelperProps = { rerenderKey: number // alternates between 0 and 1 } @@ -43,7 +43,7 @@ export class SelectionHelperContribution extends Disposable implements IEditorCo constructor( private readonly _editor: ICodeEditor, @IInstantiationService private readonly _instantiationService: IInstantiationService, - @IVoidSettingsService private readonly _voidSettingsService: IVoidSettingsService + @IOrcideSettingsService private readonly _orcideSettingsService: IOrcideSettingsService ) { super(); @@ -63,13 +63,13 @@ export class SelectionHelperContribution extends Disposable implements IEditorCo if (this._reactComponentDisposable) { this._reactComponentDisposable.dispose(); } - const res = mountVoidSelectionHelper(content, accessor); + const res = mountOrcideSelectionHelper(content, accessor); if (!res) return; this._reactComponentDisposable = res; this._rerender = res.rerender; - this._register(this._reactComponentDisposable); + this._register(res); }); @@ -242,11 +242,11 @@ export class SelectionHelperContribution extends Disposable implements IEditorCo this._isVisible = true; // rerender - const enabled = this._voidSettingsService.state.globalSettings.showInlineSuggestions + const enabled = this._orcideSettingsService.state.globalSettings.showInlineSuggestions && this._editor.hasTextFocus() // needed since VS Code counts unfocused selections as selections, which causes this to rerender when it shouldnt (bad ux) if (enabled) { - this._rerender({ rerenderKey: this._rerenderKey } satisfies VoidSelectionHelperProps) + this._rerender({ rerenderKey: this._rerenderKey } satisfies OrcideSelectionHelperProps) this._rerenderKey = (this._rerenderKey + 1) % 2; // this._reactComponentRerender(); } diff --git a/src/vs/workbench/contrib/void/browser/voidSettingsPane.ts b/src/vs/workbench/contrib/orcide/browser/orcideSettingsPane.ts similarity index 75% rename from src/vs/workbench/contrib/void/browser/voidSettingsPane.ts rename to src/vs/workbench/contrib/orcide/browser/orcideSettingsPane.ts index b70aef91bbb..492a72067a8 100644 --- a/src/vs/workbench/contrib/void/browser/voidSettingsPane.ts +++ b/src/vs/workbench/contrib/orcide/browser/orcideSettingsPane.ts @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'; @@ -23,33 +23,33 @@ import { URI } from '../../../../base/common/uri.js'; import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js'; -import { mountVoidSettings } from './react/out/void-settings-tsx/index.js' +import { mountOrcideSettings } from './react/out/orcide-settings-tsx/index.js' import { Codicon } from '../../../../base/common/codicons.js'; import { toDisposable } from '../../../../base/common/lifecycle.js'; // refer to preferences.contribution.ts keybindings editor -class VoidSettingsInput extends EditorInput { +class OrcideSettingsInput extends EditorInput { - static readonly ID: string = 'workbench.input.void.settings'; + static readonly ID: string = 'workbench.input.orcide.settings'; static readonly RESOURCE = URI.from({ // I think this scheme is invalid, it just shuts up TS - scheme: 'void', // Custom scheme for our editor (try Schemas.https) + scheme: 'orcide', // Custom scheme for our editor (try Schemas.https) path: 'settings' }) - readonly resource = VoidSettingsInput.RESOURCE; + readonly resource = OrcideSettingsInput.RESOURCE; constructor() { super(); } override get typeId(): string { - return VoidSettingsInput.ID; + return OrcideSettingsInput.ID; } override getName(): string { - return nls.localize('voidSettingsInputsName', 'Void\'s Settings'); + return nls.localize('orcideSettingsInputsName', 'Orcide Settings'); } override getIcon() { @@ -59,7 +59,7 @@ class VoidSettingsInput extends EditorInput { } -class VoidSettingsPane extends EditorPane { +class OrcideSettingsPane extends EditorPane { static readonly ID = 'workbench.test.myCustomPane'; // private _scrollbar: DomScrollableElement | undefined; @@ -71,7 +71,7 @@ class VoidSettingsPane extends EditorPane { @IStorageService storageService: IStorageService, @IInstantiationService private readonly instantiationService: IInstantiationService ) { - super(VoidSettingsPane.ID, group, telemetryService, themeService, storageService); + super(OrcideSettingsPane.ID, group, telemetryService, themeService, storageService); } protected createEditor(parent: HTMLElement): void { @@ -90,7 +90,7 @@ class VoidSettingsPane extends EditorPane { // Mount React into the scrollable content this.instantiationService.invokeFunction(accessor => { - const disposeFn = mountVoidSettings(settingsElt, accessor)?.dispose; + const disposeFn = mountOrcideSettings(settingsElt, accessor)?.dispose; this._register(toDisposable(() => disposeFn?.())) // setTimeout(() => { // this is a complete hack and I don't really understand how scrollbar works here @@ -112,18 +112,18 @@ class VoidSettingsPane extends EditorPane { // register Settings pane Registry.as(EditorExtensions.EditorPane).registerEditorPane( - EditorPaneDescriptor.create(VoidSettingsPane, VoidSettingsPane.ID, nls.localize('VoidSettingsPane', "Void\'s Settings Pane")), - [new SyncDescriptor(VoidSettingsInput)] + EditorPaneDescriptor.create(OrcideSettingsPane, OrcideSettingsPane.ID, nls.localize('OrcideSettingsPane', "Orcide Settings Pane")), + [new SyncDescriptor(OrcideSettingsInput)] ); // register the gear on the top right -export const VOID_TOGGLE_SETTINGS_ACTION_ID = 'workbench.action.toggleVoidSettings' +export const ORCIDE_TOGGLE_SETTINGS_ACTION_ID = 'workbench.action.toggleOrcideSettings' registerAction2(class extends Action2 { constructor() { super({ - id: VOID_TOGGLE_SETTINGS_ACTION_ID, - title: nls.localize2('voidSettings', "Void: Toggle Settings"), + id: ORCIDE_TOGGLE_SETTINGS_ACTION_ID, + title: nls.localize2('orcideSettings', "Orcide: Toggle Settings"), icon: Codicon.settingsGear, menu: [ { @@ -146,7 +146,7 @@ registerAction2(class extends Action2 { const instantiationService = accessor.get(IInstantiationService); // if is open, close it - const openEditors = editorService.findEditors(VoidSettingsInput.RESOURCE); // should only have 0 or 1 elements... + const openEditors = editorService.findEditors(OrcideSettingsInput.RESOURCE); // should only have 0 or 1 elements... if (openEditors.length !== 0) { const openEditor = openEditors[0].editor const isCurrentlyOpen = editorService.activeEditor?.resource?.fsPath === openEditor.resource?.fsPath @@ -159,7 +159,7 @@ registerAction2(class extends Action2 { // else open it - const input = instantiationService.createInstance(VoidSettingsInput); + const input = instantiationService.createInstance(OrcideSettingsInput); await editorGroupService.activeGroup.openEditor(input); } @@ -167,12 +167,12 @@ registerAction2(class extends Action2 { -export const VOID_OPEN_SETTINGS_ACTION_ID = 'workbench.action.openVoidSettings' +export const ORCIDE_OPEN_SETTINGS_ACTION_ID = 'workbench.action.openOrcideSettings' registerAction2(class extends Action2 { constructor() { super({ - id: VOID_OPEN_SETTINGS_ACTION_ID, - title: nls.localize2('voidSettingsAction2', "Void: Open Settings"), + id: ORCIDE_OPEN_SETTINGS_ACTION_ID, + title: nls.localize2('orcideSettingsAction2', "Orcide: Open Settings"), f1: true, icon: Codicon.settingsGear, }); @@ -182,13 +182,13 @@ registerAction2(class extends Action2 { const instantiationService = accessor.get(IInstantiationService); // close all instances if found - const openEditors = editorService.findEditors(VoidSettingsInput.RESOURCE); + const openEditors = editorService.findEditors(OrcideSettingsInput.RESOURCE); if (openEditors.length > 0) { await editorService.closeEditors(openEditors); } // then, open one single editor - const input = instantiationService.createInstance(VoidSettingsInput); + const input = instantiationService.createInstance(OrcideSettingsInput); await editorService.openEditor(input); } }) @@ -201,8 +201,8 @@ registerAction2(class extends Action2 { MenuRegistry.appendMenuItem(MenuId.GlobalActivity, { group: '0_command', command: { - id: VOID_TOGGLE_SETTINGS_ACTION_ID, - title: nls.localize('voidSettingsActionGear', "Void\'s Settings") + id: ORCIDE_TOGGLE_SETTINGS_ACTION_ID, + title: nls.localize('orcideSettingsActionGear', "Orcide Settings") }, order: 1 }); diff --git a/src/vs/workbench/contrib/void/browser/voidUpdateActions.ts b/src/vs/workbench/contrib/orcide/browser/orcideUpdateActions.ts similarity index 68% rename from src/vs/workbench/contrib/void/browser/voidUpdateActions.ts rename to src/vs/workbench/contrib/orcide/browser/orcideUpdateActions.ts index 3a890cc1859..ade2755ba06 100644 --- a/src/vs/workbench/contrib/void/browser/voidUpdateActions.ts +++ b/src/vs/workbench/contrib/orcide/browser/orcideUpdateActions.ts @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { Disposable } from '../../../../base/common/lifecycle.js'; @@ -10,18 +10,18 @@ import { localize2 } from '../../../../nls.js'; import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js'; import { INotificationActions, INotificationHandle, INotificationService } from '../../../../platform/notification/common/notification.js'; import { IMetricsService } from '../common/metricsService.js'; -import { IVoidUpdateService } from '../common/voidUpdateService.js'; +import { IOrcideUpdateService } from '../common/orcideUpdateService.js'; import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js'; import * as dom from '../../../../base/browser/dom.js'; import { IUpdateService } from '../../../../platform/update/common/update.js'; -import { VoidCheckUpdateRespose } from '../common/voidUpdateServiceTypes.js'; +import { OrcideCheckUpdateResponse } from '../common/orcideUpdateServiceTypes.js'; import { IAction } from '../../../../base/common/actions.js'; -const notifyUpdate = (res: VoidCheckUpdateRespose & { message: string }, notifService: INotificationService, updateService: IUpdateService): INotificationHandle => { - const message = res?.message || 'This is a very old version of Void, please download the latest version! [Void Editor](https://voideditor.com/download-beta)!' +const notifyUpdate = (res: OrcideCheckUpdateResponse & { message: string }, notifService: INotificationService, updateService: IUpdateService): INotificationHandle => { + const message = res?.message || 'This is a very old version of Orcide. Please download the latest version! [Orcide](https://orcest.ai/download-beta)!' let actions: INotificationActions | undefined @@ -31,13 +31,13 @@ const notifyUpdate = (res: VoidCheckUpdateRespose & { message: string }, notifSe if (res.action === 'reinstall') { primary.push({ label: `Reinstall`, - id: 'void.updater.reinstall', + id: 'orcide.updater.reinstall', enabled: true, tooltip: '', class: undefined, run: () => { const { window } = dom.getActiveWindow() - window.open('https://voideditor.com/download-beta') + window.open('https://orcest.ai/download-beta') } }) } @@ -45,7 +45,7 @@ const notifyUpdate = (res: VoidCheckUpdateRespose & { message: string }, notifSe if (res.action === 'download') { primary.push({ label: `Download`, - id: 'void.updater.download', + id: 'orcide.updater.download', enabled: true, tooltip: '', class: undefined, @@ -59,7 +59,7 @@ const notifyUpdate = (res: VoidCheckUpdateRespose & { message: string }, notifSe if (res.action === 'apply') { primary.push({ label: `Apply`, - id: 'void.updater.apply', + id: 'orcide.updater.apply', enabled: true, tooltip: '', class: undefined, @@ -72,7 +72,7 @@ const notifyUpdate = (res: VoidCheckUpdateRespose & { message: string }, notifSe if (res.action === 'restart') { primary.push({ label: `Restart`, - id: 'void.updater.restart', + id: 'orcide.updater.restart', enabled: true, tooltip: '', class: undefined, @@ -83,21 +83,21 @@ const notifyUpdate = (res: VoidCheckUpdateRespose & { message: string }, notifSe } primary.push({ - id: 'void.updater.site', + id: 'orcide.updater.site', enabled: true, - label: `Void Site`, + label: `Orcide Site`, tooltip: '', class: undefined, run: () => { const { window } = dom.getActiveWindow() - window.open('https://voideditor.com/') + window.open('https://orcest.ai/') } }) actions = { primary: primary, secondary: [{ - id: 'void.updater.close', + id: 'orcide.updater.close', enabled: true, label: `Keep current version`, tooltip: '', @@ -127,7 +127,7 @@ const notifyUpdate = (res: VoidCheckUpdateRespose & { message: string }, notifSe // }) } const notifyErrChecking = (notifService: INotificationService): INotificationHandle => { - const message = `Void Error: There was an error checking for updates. If this persists, please get in touch or reinstall Void [here](https://voideditor.com/download-beta)!` + const message = `Orcide Error: There was an error checking for updates. If this persists, please get in touch or reinstall Orcide [here](https://orcest.ai/download-beta)!` const notifController = notifService.notify({ severity: Severity.Info, message: message, @@ -137,31 +137,31 @@ const notifyErrChecking = (notifService: INotificationService): INotificationHan } -const performVoidCheck = async ( +const performOrcideCheck = async ( explicit: boolean, notifService: INotificationService, - voidUpdateService: IVoidUpdateService, + orcideUpdateService: IOrcideUpdateService, metricsService: IMetricsService, updateService: IUpdateService, ): Promise => { const metricsTag = explicit ? 'Manual' : 'Auto' - metricsService.capture(`Void Update ${metricsTag}: Checking...`, {}) - const res = await voidUpdateService.check(explicit) + metricsService.capture(`Orcide Update ${metricsTag}: Checking...`, {}) + const res = await orcideUpdateService.check(explicit) if (!res) { const notifController = notifyErrChecking(notifService); - metricsService.capture(`Void Update ${metricsTag}: Error`, { res }) + metricsService.capture(`Orcide Update ${metricsTag}: Error`, { res }) return notifController } else { if (res.message) { const notifController = notifyUpdate(res, notifService, updateService) - metricsService.capture(`Void Update ${metricsTag}: Yes`, { res }) + metricsService.capture(`Orcide Update ${metricsTag}: Yes`, { res }) return notifController } else { - metricsService.capture(`Void Update ${metricsTag}: No`, { res }) + metricsService.capture(`Orcide Update ${metricsTag}: No`, { res }) return null } } @@ -176,19 +176,19 @@ registerAction2(class extends Action2 { constructor() { super({ f1: true, - id: 'void.voidCheckUpdate', - title: localize2('voidCheckUpdate', 'Void: Check for Updates'), + id: 'orcide.checkUpdate', + title: localize2('orcideCheckUpdate', 'Orcide: Check for Updates'), }); } async run(accessor: ServicesAccessor): Promise { - const voidUpdateService = accessor.get(IVoidUpdateService) + const orcideUpdateService = accessor.get(IOrcideUpdateService) const notifService = accessor.get(INotificationService) const metricsService = accessor.get(IMetricsService) const updateService = accessor.get(IUpdateService) const currNotifController = lastNotifController - const newController = await performVoidCheck(true, notifService, voidUpdateService, metricsService, updateService) + const newController = await performOrcideCheck(true, notifService, orcideUpdateService, metricsService, updateService) if (newController) { currNotifController?.close() @@ -198,10 +198,10 @@ registerAction2(class extends Action2 { }) // on mount -class VoidUpdateWorkbenchContribution extends Disposable implements IWorkbenchContribution { - static readonly ID = 'workbench.contrib.void.voidUpdate' +class OrcideUpdateWorkbenchContribution extends Disposable implements IWorkbenchContribution { + static readonly ID = 'workbench.contrib.orcide.orcideUpdate' constructor( - @IVoidUpdateService voidUpdateService: IVoidUpdateService, + @IOrcideUpdateService orcideUpdateService: IOrcideUpdateService, @IMetricsService metricsService: IMetricsService, @INotificationService notifService: INotificationService, @IUpdateService updateService: IUpdateService, @@ -209,7 +209,7 @@ class VoidUpdateWorkbenchContribution extends Disposable implements IWorkbenchCo super() const autoCheck = () => { - performVoidCheck(false, notifService, voidUpdateService, metricsService, updateService) + performOrcideCheck(false, notifService, orcideUpdateService, metricsService, updateService) } // check once 5 seconds after mount @@ -225,4 +225,4 @@ class VoidUpdateWorkbenchContribution extends Disposable implements IWorkbenchCo } } -registerWorkbenchContribution2(VoidUpdateWorkbenchContribution.ID, VoidUpdateWorkbenchContribution, WorkbenchPhase.BlockRestore); +registerWorkbenchContribution2(OrcideUpdateWorkbenchContribution.ID, OrcideUpdateWorkbenchContribution, WorkbenchPhase.BlockRestore); diff --git a/src/vs/workbench/contrib/void/browser/quickEditActions.ts b/src/vs/workbench/contrib/orcide/browser/quickEditActions.ts similarity index 86% rename from src/vs/workbench/contrib/void/browser/quickEditActions.ts rename to src/vs/workbench/contrib/orcide/browser/quickEditActions.ts index 63deba31de8..a9038b08e70 100644 --- a/src/vs/workbench/contrib/void/browser/quickEditActions.ts +++ b/src/vs/workbench/contrib/orcide/browser/quickEditActions.ts @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js'; @@ -10,7 +10,7 @@ import { KeybindingWeight } from '../../../../platform/keybinding/common/keybind import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js'; import { IEditCodeService } from './editCodeServiceInterface.js'; import { roundRangeToLines } from './sidebarActions.js'; -import { VOID_CTRL_K_ACTION_ID } from './actionIDs.js'; +import { ORCIDE_CTRL_K_ACTION_ID } from './actionIDs.js'; import { localize2 } from '../../../../nls.js'; import { IMetricsService } from '../common/metricsService.js'; import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js'; @@ -36,12 +36,12 @@ registerAction2(class extends Action2 { constructor( ) { super({ - id: VOID_CTRL_K_ACTION_ID, + id: ORCIDE_CTRL_K_ACTION_ID, f1: true, - title: localize2('voidQuickEditAction', 'Void: Quick Edit'), + title: localize2('voidQuickEditAction', 'Orcide: Quick Edit'), keybinding: { primary: KeyMod.CtrlCmd | KeyCode.KeyK, - weight: KeybindingWeight.VoidExtension, + weight: KeybindingWeight.OrcideExtension, when: ContextKeyExpr.deserialize('editorFocus && !terminalFocus'), } }); diff --git a/src/vs/workbench/contrib/void/browser/react/.gitignore b/src/vs/workbench/contrib/orcide/browser/react/.gitignore similarity index 100% rename from src/vs/workbench/contrib/void/browser/react/.gitignore rename to src/vs/workbench/contrib/orcide/browser/react/.gitignore diff --git a/src/vs/workbench/contrib/void/browser/react/README.md b/src/vs/workbench/contrib/orcide/browser/react/README.md similarity index 100% rename from src/vs/workbench/contrib/void/browser/react/README.md rename to src/vs/workbench/contrib/orcide/browser/react/README.md diff --git a/src/vs/workbench/contrib/void/browser/react/build.js b/src/vs/workbench/contrib/orcide/browser/react/build.js similarity index 86% rename from src/vs/workbench/contrib/void/browser/react/build.js rename to src/vs/workbench/contrib/orcide/browser/react/build.js index 9507aa59f26..864a749d364 100755 --- a/src/vs/workbench/contrib/void/browser/react/build.js +++ b/src/vs/workbench/contrib/orcide/browser/react/build.js @@ -1,10 +1,9 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ -import { execSync } from 'child_process'; -import { spawn } from 'cross-spawn' +import { execSync, spawn } from 'child_process'; // Added lines below import fs from 'fs'; import path from 'path'; @@ -33,7 +32,7 @@ This function finds `globalDesiredPath` given `localDesiredPath` and `currentPat Diagram: ...basePath/ -└── void/ +└── orcide/ ├── ...currentPath/ (defined globally) └── ...localDesiredPath/ (defined locally) @@ -60,7 +59,7 @@ function findDesiredPathFromLocalPath(localDesiredPath, currentPath) { function saveStylesFile() { setTimeout(() => { try { - const pathToCssFile = findDesiredPathFromLocalPath('./src/vs/workbench/contrib/void/browser/react/src2/styles.css', __dirname); + const pathToCssFile = findDesiredPathFromLocalPath('./src/vs/workbench/contrib/orcide/browser/react/src2/styles.css', __dirname); if (pathToCssFile === undefined) { console.error('[scope-tailwind] Error finding styles.css'); @@ -87,7 +86,7 @@ if (isWatch) { try { console.log('🔨 Running initial scope-tailwind build to create src2 folder...'); execSync( - 'npx scope-tailwind ./src -o src2/ -s void-scope -c styles.css -p "void-"', + 'npx scope-tailwind ./src -o src2/ -s orcide-scope -c styles.css -p "orcide-"', { stdio: 'inherit' } ); console.log('✅ src2/ created successfully.'); @@ -103,7 +102,7 @@ if (isWatch) { '--watch', 'src', '--ext', 'ts,tsx,css', '--exec', - 'npx scope-tailwind ./src -o src2/ -s void-scope -c styles.css -p "void-"' + 'npx scope-tailwind ./src -o src2/ -s orcide-scope -c styles.css -p "orcide-"' ]); const tsupWatcher = spawn('npx', [ @@ -145,7 +144,7 @@ if (isWatch) { console.log('📦 Building...'); // Run scope-tailwind once - execSync('npx scope-tailwind ./src -o src2/ -s void-scope -c styles.css -p "void-"', { stdio: 'inherit' }); + execSync('npx scope-tailwind ./src -o src2/ -s orcide-scope -c styles.css -p "orcide-"', { stdio: 'inherit' }); // Run tsup once execSync('npx tsup', { stdio: 'inherit' }); diff --git a/src/vs/workbench/contrib/void/browser/react/src/diff/index.tsx b/src/vs/workbench/contrib/orcide/browser/react/src/diff/index.tsx similarity index 62% rename from src/vs/workbench/contrib/void/browser/react/src/diff/index.tsx rename to src/vs/workbench/contrib/orcide/browser/react/src/diff/index.tsx index 31fee15509e..af44882d2e4 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/diff/index.tsx +++ b/src/vs/workbench/contrib/orcide/browser/react/src/diff/index.tsx @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { diffLines, Change } from 'diff'; diff --git a/src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx b/src/vs/workbench/contrib/orcide/browser/react/src/markdown/ApplyBlockHoverButtons.tsx similarity index 88% rename from src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx rename to src/vs/workbench/contrib/orcide/browser/react/src/markdown/ApplyBlockHoverButtons.tsx index 93e26b0d7b4..f970f9db8ab 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx +++ b/src/vs/workbench/contrib/orcide/browser/react/src/markdown/ApplyBlockHoverButtons.tsx @@ -1,16 +1,16 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { useState, useEffect, useCallback, useRef, Fragment } from 'react' import { useAccessor, useChatThreadsState, useChatThreadsStreamState, useCommandBarState, useCommandBarURIListener, useSettingsState } from '../util/services.js' import { usePromise, useRefState } from '../util/helpers.js' -import { isFeatureNameDisabled } from '../../../../common/voidSettingsTypes.js' +import { isFeatureNameDisabled } from '../../../../common/orcideSettingsTypes.js' import { URI } from '../../../../../../../base/common/uri.js' import { FileSymlink, LucideIcon, RotateCw, Terminal } from 'lucide-react' import { Check, X, Square, Copy, Play, } from 'lucide-react' -import { getBasename, ListableToolItem, voidOpenFileFn, ToolChildrenWrapper } from '../sidebar-tsx/SidebarChat.js' +import { getBasename, ListableToolItem, orcideOpenFileFn, ToolChildrenWrapper } from '../sidebar-tsx/SidebarChat.js' import { PlacesType, VariantType } from 'react-tooltip' enum CopyButtonText { @@ -33,12 +33,12 @@ export const IconShell1 = ({ onClick, Icon, disabled, className, ...props }: Ico e.stopPropagation(); onClick?.(e); }} - // border border-void-border-1 rounded + // border border-orcide-border-1 rounded className={` size-[18px] p-[2px] flex items-center justify-center - text-sm text-void-fg-3 + text-sm text-orcide-fg-3 hover:brightness-110 disabled:opacity-50 disabled:cursor-not-allowed ${className} @@ -109,7 +109,7 @@ export const JumpToFileButton = ({ uri, ...props }: { uri: URI | 'current' } & R { - voidOpenFileFn(uri, accessor) + orcideOpenFileFn(uri, accessor) }} {...tooltipPropsForApplyBlock({ tooltipName: 'Go to file' })} {...props} @@ -141,13 +141,13 @@ const getUriBeingApplied = (applyBoxId: string) => { export const useApplyStreamState = ({ applyBoxId }: { applyBoxId: string }) => { const accessor = useAccessor() - const voidCommandBarService = accessor.get('IVoidCommandBarService') + const orcideCommandBarService = accessor.get('IOrcideCommandBarService') const getStreamState = useCallback(() => { const uri = getUriBeingApplied(applyBoxId) if (!uri) return 'idle-no-changes' - return voidCommandBarService.getStreamState(uri) - }, [voidCommandBarService, applyBoxId]) + return orcideCommandBarService.getStreamState(uri) + }, [orcideCommandBarService, applyBoxId]) const [currStreamStateRef, setStreamState] = useRefState(getStreamState()) @@ -173,15 +173,15 @@ export const useApplyStreamState = ({ applyBoxId }: { applyBoxId: string }) => { type IndicatorColor = 'green' | 'orange' | 'dark' | 'yellow' | null export const StatusIndicator = ({ indicatorColor, title, className, ...props }: { indicatorColor: IndicatorColor, title?: React.ReactNode, className?: string } & React.HTMLAttributes) => { return ( -
+
{title && {title}}
@@ -190,7 +190,7 @@ export const StatusIndicator = ({ indicatorColor, title, className, ...props }: }; const tooltipPropsForApplyBlock = ({ tooltipName, color = undefined, position = 'top', offset = undefined }: { tooltipName: string, color?: IndicatorColor, position?: PlacesType, offset?: number }) => ({ - 'data-tooltip-id': color === 'orange' ? `void-tooltip-orange` : color === 'green' ? 'void-tooltip-green' : 'void-tooltip', + 'data-tooltip-id': color === 'orange' ? `orcide-tooltip-orange` : color === 'green' ? 'orcide-tooltip-green' : 'orcide-tooltip', 'data-tooltip-place': position as PlacesType, 'data-tooltip-content': `${tooltipName}`, 'data-tooltip-offset': offset, @@ -198,13 +198,13 @@ const tooltipPropsForApplyBlock = ({ tooltipName, color = undefined, position = export const useEditToolStreamState = ({ applyBoxId, uri }: { applyBoxId: string, uri: URI }) => { const accessor = useAccessor() - const voidCommandBarService = accessor.get('IVoidCommandBarService') - const [streamState, setStreamState] = useState(voidCommandBarService.getStreamState(uri)) + const orcideCommandBarService = accessor.get('IOrcideCommandBarService') + const [streamState, setStreamState] = useState(orcideCommandBarService.getStreamState(uri)) // listen for stream updates on this box useCommandBarURIListener(useCallback((uri_) => { const shouldUpdate = uri.fsPath === uri_.fsPath - if (shouldUpdate) { setStreamState(voidCommandBarService.getStreamState(uri)) } - }, [voidCommandBarService, applyBoxId, uri])) + if (shouldUpdate) { setStreamState(orcideCommandBarService.getStreamState(uri)) } + }, [orcideCommandBarService, applyBoxId, uri])) return { streamState, } } @@ -351,14 +351,14 @@ const ApplyButtonsForEdit = ({ setApplying(newApplyingUri) if (!applyDonePromise) { - notificationService.info(`Void Error: We couldn't run Apply here. ${uri === 'current' ? 'This Apply block wants to run on the current file, but you might not have a file open.' : `This Apply block wants to run on ${uri.fsPath}, but it might not exist.`}`) + notificationService.info(`Orcide Error: We couldn't run Apply here. ${uri === 'current' ? 'This Apply block wants to run on the current file, but you might not have a file open.' : `This Apply block wants to run on ${uri.fsPath}, but it might not exist.`}`) } // catch any errors by interrupting the stream applyDonePromise?.catch(e => { const uri = getUriBeingApplied(applyBoxId) if (uri) editCodeService.interruptURIStreaming({ uri: uri }) - notificationService.info(`Void Error: There was a problem running Apply: ${e}.`) + notificationService.info(`Orcide Error: There was a problem running Apply: ${e}.`) }) metricsService.capture('Apply Code', { length: codeStr.length }) // capture the length only @@ -530,17 +530,17 @@ export const BlockCodeApplyWrapper = ({ name={{getBasename(uri.fsPath)}} isSmall={true} showDot={false} - onClick={() => { voidOpenFileFn(uri, accessor) }} + onClick={() => { orcideOpenFileFn(uri, accessor) }} /> : {language} - return
+ return
{/* header */} -
+
- + {name}
diff --git a/src/vs/workbench/contrib/void/browser/react/src/markdown/ChatMarkdownRender.tsx b/src/vs/workbench/contrib/orcide/browser/react/src/markdown/ChatMarkdownRender.tsx similarity index 94% rename from src/vs/workbench/contrib/void/browser/react/src/markdown/ChatMarkdownRender.tsx rename to src/vs/workbench/contrib/orcide/browser/react/src/markdown/ChatMarkdownRender.tsx index 97214330b2f..983383f67f8 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/markdown/ChatMarkdownRender.tsx +++ b/src/vs/workbench/contrib/orcide/browser/react/src/markdown/ChatMarkdownRender.tsx @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import React, { JSX, useMemo, useState } from 'react' @@ -14,7 +14,7 @@ import { isAbsolute } from '../../../../../../../base/common/path.js' import { separateOutFirstLine } from '../../../../common/helpers/util.js' import { BlockCode } from '../util/inputs.js' import { CodespanLocationLink } from '../../../../common/chatThreadServiceTypes.js' -import { getBasename, getRelative, voidOpenFileFn } from '../sidebar-tsx/SidebarChat.js' +import { getBasename, getRelative, orcideOpenFileFn } from '../sidebar-tsx/SidebarChat.js' export type ChatMessageLocation = { @@ -94,10 +94,10 @@ const Codespan = ({ text, className, onClick, tooltip }: { text: string, classNa // TODO compute this once for efficiency. we should use `labels.ts/shorten` to display duplicates properly return { if (!link) return; - // Use the updated voidOpenFileFn to open the file and handle selection + // Use the updated orcideOpenFileFn to open the file and handle selection if (link.selection) - voidOpenFileFn(link.uri, accessor, [link.selection.startLineNumber, link.selection.endLineNumber]); + orcideOpenFileFn(link.uri, accessor, [link.selection.startLineNumber, link.selection.endLineNumber]); else - voidOpenFileFn(link.uri, accessor); + orcideOpenFileFn(link.uri, accessor); } return - // + //
// - // + // // {t.header.map((cell: any, index: number) => ( // // // {t.rows.map((row: any[], rowIndex: number) => ( - // + // // {row.map((cell: any, cellIndex: number) => ( //
// {cell.raw} @@ -391,11 +391,11 @@ const RenderToken = ({ token, inPTag, codeURI, chatMessageLocation, tokenIdx, .. //
// {cell.raw} @@ -487,7 +487,7 @@ const RenderToken = ({ token, inPTag, codeURI, chatMessageLocation, tokenIdx, .. onClick={() => { window.open(t.href) }} href={t.href} title={t.title ?? undefined} - className='underline cursor-pointer hover:brightness-90 transition-all duration-200 text-void-fg-2' + className='underline cursor-pointer hover:brightness-90 transition-all duration-200 text-orcide-fg-2' > {t.text} diff --git a/src/vs/workbench/contrib/void/browser/react/src/void-editor-widgets-tsx/VoidCommandBar.tsx b/src/vs/workbench/contrib/orcide/browser/react/src/orcide-editor-widgets-tsx/OrcideCommandBar.tsx similarity index 84% rename from src/vs/workbench/contrib/void/browser/react/src/void-editor-widgets-tsx/VoidCommandBar.tsx rename to src/vs/workbench/contrib/orcide/browser/react/src/orcide-editor-widgets-tsx/OrcideCommandBar.tsx index 9d57e443113..a01f30695b2 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/void-editor-widgets-tsx/VoidCommandBar.tsx +++ b/src/vs/workbench/contrib/orcide/browser/react/src/orcide-editor-widgets-tsx/OrcideCommandBar.tsx @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ @@ -10,26 +10,26 @@ import '../styles.css' import { useCallback, useEffect, useState, useRef } from 'react'; import { ScrollType } from '../../../../../../../editor/common/editorCommon.js'; import { acceptAllBg, acceptBorder, buttonFontSize, buttonTextColor, rejectAllBg, rejectBg, rejectBorder } from '../../../../common/helpers/colors.js'; -import { VoidCommandBarProps } from '../../../voidCommandBarService.js'; +import { OrcideCommandBarProps } from '../../../orcideCommandBarService.js'; import { Check, EllipsisVertical, Menu, MoveDown, MoveLeft, MoveRight, MoveUp, X } from 'lucide-react'; import { - VOID_GOTO_NEXT_DIFF_ACTION_ID, - VOID_GOTO_PREV_DIFF_ACTION_ID, - VOID_GOTO_NEXT_URI_ACTION_ID, - VOID_GOTO_PREV_URI_ACTION_ID, - VOID_ACCEPT_FILE_ACTION_ID, - VOID_REJECT_FILE_ACTION_ID, - VOID_ACCEPT_ALL_DIFFS_ACTION_ID, - VOID_REJECT_ALL_DIFFS_ACTION_ID + ORCIDE_GOTO_NEXT_DIFF_ACTION_ID, + ORCIDE_GOTO_PREV_DIFF_ACTION_ID, + ORCIDE_GOTO_NEXT_URI_ACTION_ID, + ORCIDE_GOTO_PREV_URI_ACTION_ID, + ORCIDE_ACCEPT_FILE_ACTION_ID, + ORCIDE_REJECT_FILE_ACTION_ID, + ORCIDE_ACCEPT_ALL_DIFFS_ACTION_ID, + ORCIDE_REJECT_ALL_DIFFS_ACTION_ID } from '../../../actionIDs.js'; -export const VoidCommandBarMain = ({ uri, editor }: VoidCommandBarProps) => { +export const OrcideCommandBarMain = ({ uri, editor }: OrcideCommandBarProps) => { const isDark = useIsDark() return
- +
} @@ -83,14 +83,14 @@ export const RejectAllButtonWrapper = ({ text, onClick, className, ...props }: { -export const VoidCommandBar = ({ uri, editor }: VoidCommandBarProps) => { +export const OrcideCommandBar = ({ uri, editor }: OrcideCommandBarProps) => { const accessor = useAccessor() const editCodeService = accessor.get('IEditCodeService') const editorService = accessor.get('ICodeEditorService') const metricsService = accessor.get('IMetricsService') const commandService = accessor.get('ICommandService') - const commandBarService = accessor.get('IVoidCommandBarService') - const voidModelService = accessor.get('IVoidModelService') + const commandBarService = accessor.get('IOrcideCommandBarService') + const orcideModelService = accessor.get('IOrcideModelService') const keybindingService = accessor.get('IKeybindingService') const { stateOfURI: commandBarState, sortedURIs: sortedCommandBarURIs } = useCommandBarState() const [showAcceptRejectAllButtons, setShowAcceptRejectAllButtons] = useState(false) @@ -171,14 +171,14 @@ export const VoidCommandBar = ({ uri, editor }: VoidCommandBarProps) => { - const _upKeybinding = keybindingService.lookupKeybinding(VOID_GOTO_PREV_DIFF_ACTION_ID); - const _downKeybinding = keybindingService.lookupKeybinding(VOID_GOTO_NEXT_DIFF_ACTION_ID); - const _leftKeybinding = keybindingService.lookupKeybinding(VOID_GOTO_PREV_URI_ACTION_ID); - const _rightKeybinding = keybindingService.lookupKeybinding(VOID_GOTO_NEXT_URI_ACTION_ID); - const _acceptFileKeybinding = keybindingService.lookupKeybinding(VOID_ACCEPT_FILE_ACTION_ID); - const _rejectFileKeybinding = keybindingService.lookupKeybinding(VOID_REJECT_FILE_ACTION_ID); - const _acceptAllKeybinding = keybindingService.lookupKeybinding(VOID_ACCEPT_ALL_DIFFS_ACTION_ID); - const _rejectAllKeybinding = keybindingService.lookupKeybinding(VOID_REJECT_ALL_DIFFS_ACTION_ID); + const _upKeybinding = keybindingService.lookupKeybinding(ORCIDE_GOTO_PREV_DIFF_ACTION_ID); + const _downKeybinding = keybindingService.lookupKeybinding(ORCIDE_GOTO_NEXT_DIFF_ACTION_ID); + const _leftKeybinding = keybindingService.lookupKeybinding(ORCIDE_GOTO_PREV_URI_ACTION_ID); + const _rightKeybinding = keybindingService.lookupKeybinding(ORCIDE_GOTO_NEXT_URI_ACTION_ID); + const _acceptFileKeybinding = keybindingService.lookupKeybinding(ORCIDE_ACCEPT_FILE_ACTION_ID); + const _rejectFileKeybinding = keybindingService.lookupKeybinding(ORCIDE_REJECT_FILE_ACTION_ID); + const _acceptAllKeybinding = keybindingService.lookupKeybinding(ORCIDE_ACCEPT_ALL_DIFFS_ACTION_ID); + const _rejectAllKeybinding = keybindingService.lookupKeybinding(ORCIDE_REJECT_ALL_DIFFS_ACTION_ID); const upKeybindLabel = editCodeService.processRawKeybindingText(_upKeybinding?.getLabel() || ''); const downKeybindLabel = editCodeService.processRawKeybindingText(_downKeybinding?.getLabel() || ''); @@ -196,7 +196,7 @@ export const VoidCommandBar = ({ uri, editor }: VoidCommandBarProps) => { if (currFileIdx === null) { return (
-
+
{`${sortedCommandBarURIs.length} file${sortedCommandBarURIs.length === 1 ? '' : 's'} changed`} @@ -226,12 +226,12 @@ export const VoidCommandBar = ({ uri, editor }: VoidCommandBarProps) => { {/* Accept All / Reject All buttons that appear when the vertical ellipsis is clicked */} {showAcceptRejectAllButtons && showAcceptRejectAll && (
-
-
+
+
{ {
)} -
+
{/* Diff Navigation Group */}
@@ -263,7 +263,7 @@ export const VoidCommandBar = ({ uri, editor }: VoidCommandBarProps) => { commandBarService.goToDiffIdx(prevDiffIdx); } }} - data-tooltip-id="void-tooltip" + data-tooltip-id="orcide-tooltip" data-tooltip-content={`${upKeybindLabel ? `${upKeybindLabel}` : ''}`} data-tooltip-delay-show={500} > @@ -288,7 +288,7 @@ export const VoidCommandBar = ({ uri, editor }: VoidCommandBarProps) => { commandBarService.goToDiffIdx(nextDiffIdx); } }} - data-tooltip-id="void-tooltip" + data-tooltip-id="orcide-tooltip" data-tooltip-content={`${downKeybindLabel ? `${downKeybindLabel}` : ''}`} data-tooltip-delay-show={500} > @@ -310,7 +310,7 @@ export const VoidCommandBar = ({ uri, editor }: VoidCommandBarProps) => { commandBarService.goToURIIdx(prevURIIdx); } }} - data-tooltip-id="void-tooltip" + data-tooltip-id="orcide-tooltip" data-tooltip-content={`${leftKeybindLabel ? `${leftKeybindLabel}` : ''}`} data-tooltip-delay-show={500} > @@ -332,7 +332,7 @@ export const VoidCommandBar = ({ uri, editor }: VoidCommandBarProps) => { commandBarService.goToURIIdx(nextURIIdx); } }} - data-tooltip-id="void-tooltip" + data-tooltip-id="orcide-tooltip" data-tooltip-content={`${rightKeybindLabel ? `${rightKeybindLabel}` : ''}`} data-tooltip-delay-show={500} > @@ -347,7 +347,7 @@ export const VoidCommandBar = ({ uri, editor }: VoidCommandBarProps) => { { { +export const OrcideSelectionHelperMain = (props: OrcideSelectionHelperProps) => { const isDark = useIsDark() return
- +
} -const VoidSelectionHelper = ({ rerenderKey }: VoidSelectionHelperProps) => { +const OrcideSelectionHelper = ({ rerenderKey }: OrcideSelectionHelperProps) => { const accessor = useAccessor() const keybindingService = accessor.get('IKeybindingService') const commandService = accessor.get('ICommandService') - const ctrlLKeybind = keybindingService.lookupKeybinding(VOID_CTRL_L_ACTION_ID) - const ctrlKKeybind = keybindingService.lookupKeybinding(VOID_CTRL_K_ACTION_ID) + const ctrlLKeybind = keybindingService.lookupKeybinding(ORCIDE_CTRL_L_ACTION_ID) + const ctrlKKeybind = keybindingService.lookupKeybinding(ORCIDE_CTRL_K_ACTION_ID) - const dividerHTML =
+ const dividerHTML =
const [reactRerenderCount, setReactRerenderKey] = useState(rerenderKey) const [clickState, setClickState] = useState<'init' | 'clickedOption' | 'clickedMore'>('init') useEffect(() => { const disposable = commandService.onWillExecuteCommand(e => { - if (e.commandId === VOID_CTRL_L_ACTION_ID || e.commandId === VOID_CTRL_K_ACTION_ID) { + if (e.commandId === ORCIDE_CTRL_L_ACTION_ID || e.commandId === ORCIDE_CTRL_K_ACTION_ID) { setClickState('clickedOption') } }); @@ -79,7 +79,7 @@ const VoidSelectionHelper = ({ rerenderKey }: VoidSelectionHelperProps) => { cursor-pointer ' onClick={() => { - commandService.executeCommand(VOID_CTRL_L_ACTION_ID) + commandService.executeCommand(ORCIDE_CTRL_L_ACTION_ID) setClickState('clickedOption'); }} > @@ -99,7 +99,7 @@ const VoidSelectionHelper = ({ rerenderKey }: VoidSelectionHelperProps) => { cursor-pointer ' onClick={() => { - commandService.executeCommand(VOID_CTRL_K_ACTION_ID) + commandService.executeCommand(ORCIDE_CTRL_K_ACTION_ID) setClickState('clickedOption'); }} > @@ -133,7 +133,7 @@ const VoidSelectionHelper = ({ rerenderKey }: VoidSelectionHelperProps) => { cursor-pointer ' onClick={() => { - commandService.executeCommand(VOID_OPEN_SETTINGS_ACTION_ID); + commandService.executeCommand(ORCIDE_OPEN_SETTINGS_ACTION_ID); setClickState('clickedOption'); }} > @@ -159,7 +159,7 @@ const VoidSelectionHelper = ({ rerenderKey }: VoidSelectionHelperProps) => { pointer-events-auto select-none z-[1000] rounded-sm shadow-md flex flex-nowrap text-nowrap - border border-void-border-3 bg-void-bg-2 + border border-orcide-border-3 bg-orcide-bg-2 transition-all duration-200 '> {clickState === 'init' ? defaultHTML diff --git a/src/vs/workbench/contrib/orcide/browser/react/src/orcide-editor-widgets-tsx/index.tsx b/src/vs/workbench/contrib/orcide/browser/react/src/orcide-editor-widgets-tsx/index.tsx new file mode 100644 index 00000000000..0d3655dc883 --- /dev/null +++ b/src/vs/workbench/contrib/orcide/browser/react/src/orcide-editor-widgets-tsx/index.tsx @@ -0,0 +1,11 @@ +/*-------------------------------------------------------------------------------------- + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. + *--------------------------------------------------------------------------------------*/ + +import { mountFnGenerator } from '../util/mountFnGenerator.js' +import { OrcideCommandBar } from './OrcideCommandBar.js' +import { OrcideSelectionHelperMain } from './OrcideSelectionHelper.js' + +export const mountOrcideCommandBar = mountFnGenerator(OrcideCommandBar) +export const mountOrcideSelectionHelper = mountFnGenerator(OrcideSelectionHelperMain) diff --git a/src/vs/workbench/contrib/void/browser/react/src/void-onboarding/VoidOnboarding.tsx b/src/vs/workbench/contrib/orcide/browser/react/src/orcide-onboarding/OrcideOnboarding.tsx similarity index 79% rename from src/vs/workbench/contrib/void/browser/react/src/void-onboarding/VoidOnboarding.tsx rename to src/vs/workbench/contrib/orcide/browser/react/src/orcide-onboarding/OrcideOnboarding.tsx index a27cbf76039..f14821119e0 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/void-onboarding/VoidOnboarding.tsx +++ b/src/vs/workbench/contrib/orcide/browser/react/src/orcide-onboarding/OrcideOnboarding.tsx @@ -1,52 +1,70 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { useEffect, useRef, useState } from 'react'; import { useAccessor, useIsDark, useSettingsState } from '../util/services.js'; import { Brain, Check, ChevronRight, DollarSign, ExternalLink, Lock, X } from 'lucide-react'; -import { displayInfoOfProviderName, ProviderName, providerNames, localProviderNames, featureNames, FeatureName, isFeatureNameDisabled } from '../../../../common/voidSettingsTypes.js'; +import { displayInfoOfProviderName, ProviderName, providerNames, localProviderNames, featureNames, FeatureName, isFeatureNameDisabled } from '../../../../common/orcideSettingsTypes.js'; import { ChatMarkdownRender } from '../markdown/ChatMarkdownRender.js'; -import { OllamaSetupInstructions, OneClickSwitchButton, SettingsForProvider, ModelDump } from '../void-settings-tsx/Settings.js'; +import { OllamaSetupInstructions, OneClickSwitchButton, SettingsForProvider, ModelDump } from '../orcide-settings-tsx/Settings.js'; import { ColorScheme } from '../../../../../../../platform/theme/common/theme.js'; import ErrorBoundary from '../sidebar-tsx/ErrorBoundary.js'; import { isLinux } from '../../../../../../../base/common/platform.js'; const OVERRIDE_VALUE = false -export const VoidOnboarding = () => { +export const OrcideOnboarding = () => { - const voidSettingsState = useSettingsState() - const isOnboardingComplete = voidSettingsState.globalSettings.isOnboardingComplete || OVERRIDE_VALUE + const settingsState = useSettingsState() + const accessor = useAccessor() + const orcideSettingsService = accessor.get('IOrcideSettingsService') + + // Auto-complete onboarding - Orcide uses pre-configured models via SSO + // No API key setup page needed - models are pre-configured from environment + useEffect(() => { + if (!settingsState.globalSettings.isOnboardingComplete) { + // Auto-configure OrcestAI provider as ready (API key populated from environment/SSO) + orcideSettingsService.setSettingOfProvider('orcestAI', '_didFillInProviderSettings', true) + // Set default model selections to RainyModel + orcideSettingsService.setModelSelectionOfFeature('Chat', { providerName: 'orcestAI', modelName: 'rainymodel/chat' }) + orcideSettingsService.setModelSelectionOfFeature('Ctrl+K', { providerName: 'orcestAI', modelName: 'rainymodel/code' }) + orcideSettingsService.setModelSelectionOfFeature('Autocomplete', { providerName: 'orcestAI', modelName: 'rainymodel/code' }) + orcideSettingsService.setModelSelectionOfFeature('Apply', { providerName: 'orcestAI', modelName: 'rainymodel/chat' }) + orcideSettingsService.setModelSelectionOfFeature('SCM', { providerName: 'orcestAI', modelName: 'rainymodel/agent' }) + } + }, []) + + const isOnboardingComplete = settingsState.globalSettings.isOnboardingComplete || OVERRIDE_VALUE const isDark = useIsDark() return ( -
+
- +
) } -const VoidIcon = () => { +const OrcideIcon = () => { const accessor = useAccessor() const themeService = accessor.get('IThemeService') const divRef = useRef(null) useEffect(() => { - // void icon style + // orcide icon style const updateTheme = () => { const theme = themeService.getColorTheme().type const isDark = theme === ColorScheme.DARK || theme === ColorScheme.HIGH_CONTRAST_DARK @@ -61,7 +79,7 @@ const VoidIcon = () => { return () => d.dispose() }, []) - return
+ return
} const FADE_DURATION_MS = 2000 @@ -151,7 +169,7 @@ const AddProvidersPage = ({ pageIndex, setPageIndex }: { pageIndex: number, setP return (
{/* Left Column */} -
+
{/* Tab Selector */}
{[...tabNames, 'Cloud/Other'].map(tab => ( @@ -159,7 +177,7 @@ const AddProvidersPage = ({ pageIndex, setPageIndex }: { pageIndex: number, setP key={tab} className={`py-2 px-4 rounded-md text-left ${currentTab === tab ? 'bg-[#0e70c0]/80 text-white font-medium shadow-sm' - : 'bg-void-bg-2 hover:bg-void-bg-2/80 text-void-fg-1' + : 'bg-orcide-bg-2 hover:bg-orcide-bg-2/80 text-orcide-fg-1' } transition-all duration-200`} onClick={() => { setCurrentTab(tab as TabName); @@ -197,7 +215,7 @@ const AddProvidersPage = ({ pageIndex, setPageIndex }: { pageIndex: number, setP
{currentTab}
-
{descriptionOfTab[currentTab]}
+
{descriptionOfTab[currentTab]}
{providerNamesOfTab[currentTab].map((providerName) => ( @@ -206,7 +224,7 @@ const AddProvidersPage = ({ pageIndex, setPageIndex }: { pageIndex: number, setP Add {displayInfoOfProviderName(providerName).title} {providerName === 'gemini' && ( +
Models
{currentTab === 'Local' && ( -
Local models should be detected automatically. You can add custom models below.
+
Local models should be detected automatically. You can add custom models below.
)} {currentTab === 'Local' && } @@ -275,7 +293,7 @@ const AddProvidersPage = ({ pageIndex, setPageIndex }: { pageIndex: number, setP // OnboardingPage // title: // div -// "Welcome to Void" +// "Welcome to Orcide" // image // content:<> // title @@ -285,7 +303,7 @@ const AddProvidersPage = ({ pageIndex, setPageIndex }: { pageIndex: number, setP // OnboardingPage // title: // div -// "How would you like to use Void?" +// "How would you like to use Orcide?" // content: // ModelQuestionContent // | @@ -328,7 +346,7 @@ const NextButton = ({ onClick, ...props }: { onClick: () => void } & React.Butto } rounded text-black duration-600 transition-all `} {...disabled && { - 'data-tooltip-id': 'void-tooltip', + 'data-tooltip-id': 'orcide-tooltip', "data-tooltip-content": 'Please enter all required fields or choose another provider', // (double-click to proceed anyway, can come back in Settings) "data-tooltip-place": 'top', }} @@ -343,7 +361,7 @@ const PreviousButton = ({ onClick, ...props }: { onClick: () => void } & React.B return (
@@ -563,7 +581,7 @@ const VoidOnboardingContent = () => { // can be md const detailedDescOfWantToUseOption: { [wantToUseOption in WantToUseOption]: string } = { smart: "Most intelligent and best for agent mode.", - private: "Private-hosted so your data never leaves your computer or network. [Email us](mailto:founders@voideditor.com) for help setting up at your company.", + private: "Private-hosted so your data never leaves your computer or network. [Email us](mailto:support@orcest.ai) for help setting up at your company.", cheap: "Use great deals like Gemini 2.5 Pro, or self-host a model with Ollama or vLLM for free.", all: "", } @@ -586,23 +604,30 @@ const VoidOnboardingContent = () => { // reset the page to page 0 if the user redos onboarding useEffect(() => { - if (!voidSettingsState.globalSettings.isOnboardingComplete) { + if (!orcideSettingsState.globalSettings.isOnboardingComplete) { setPageIndex(0) } - }, [setPageIndex, voidSettingsState.globalSettings.isOnboardingComplete]) + }, [setPageIndex, orcideSettingsState.globalSettings.isOnboardingComplete]) const contentOfIdx: { [pageIndex: number]: React.ReactNode } = { 0: -
Welcome to Void
+
Welcome to Orcide
+
+ AI-powered Cloud IDE — Part of the Orcest AI Ecosystem +
- {/* Slice of Void image */} -
- {!isLinux && } + {/* Orcide icon */} +
+ {!isLinux && }
+
+ Your IDE is pre-configured with RainyModel as the default AI backend. + All models are available through your SSO login. +
{ } />, - 1: - } - />, - 2:
Settings and Themes
-

Transfer your settings from an existing editor?

+

Transfer your settings from an existing editor?

diff --git a/src/vs/workbench/contrib/orcide/browser/react/src/orcide-onboarding/index.tsx b/src/vs/workbench/contrib/orcide/browser/react/src/orcide-onboarding/index.tsx new file mode 100644 index 00000000000..a69502add46 --- /dev/null +++ b/src/vs/workbench/contrib/orcide/browser/react/src/orcide-onboarding/index.tsx @@ -0,0 +1,9 @@ +/*-------------------------------------------------------------------------------------- + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. + *--------------------------------------------------------------------------------------*/ + +import { mountFnGenerator } from '../util/mountFnGenerator.js' +import { OrcideOnboarding } from './OrcideOnboarding.js' + +export const mountOrcideOnboarding = mountFnGenerator(OrcideOnboarding) diff --git a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/ModelDropdown.tsx b/src/vs/workbench/contrib/orcide/browser/react/src/orcide-settings-tsx/ModelDropdown.tsx similarity index 79% rename from src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/ModelDropdown.tsx rename to src/vs/workbench/contrib/orcide/browser/react/src/orcide-settings-tsx/ModelDropdown.tsx index 3facd801094..849ed1fa6ef 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/ModelDropdown.tsx +++ b/src/vs/workbench/contrib/orcide/browser/react/src/orcide-settings-tsx/ModelDropdown.tsx @@ -1,16 +1,16 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import { useCallback, useEffect, useMemo, useRef, useState } from 'react' -import { FeatureName, featureNames, isFeatureNameDisabled, ModelSelection, modelSelectionsEqual, ProviderName, providerNames, SettingsOfProvider } from '../../../../../../../workbench/contrib/void/common/voidSettingsTypes.js' +import { FeatureName, featureNames, isFeatureNameDisabled, ModelSelection, modelSelectionsEqual, ProviderName, providerNames, SettingsOfProvider } from '../../../../../../../workbench/contrib/orcide/common/orcideSettingsTypes.js' import { useSettingsState, useRefreshModelState, useAccessor } from '../util/services.js' -import { _VoidSelectBox, VoidCustomDropdownBox } from '../util/inputs.js' +import { _OrcideSelectBox, OrcideCustomDropdownBox } from '../util/inputs.js' import { SelectBox } from '../../../../../../../base/browser/ui/selectBox/selectBox.js' import { IconWarning } from '../sidebar-tsx/SidebarChat.js' -import { VOID_OPEN_SETTINGS_ACTION_ID, VOID_TOGGLE_SETTINGS_ACTION_ID } from '../../../voidSettingsPane.js' -import { modelFilterOfFeatureName, ModelOption } from '../../../../../../../workbench/contrib/void/common/voidSettingsService.js' +import { ORCIDE_OPEN_SETTINGS_ACTION_ID, ORCIDE_TOGGLE_SETTINGS_ACTION_ID } from '../../../orcideSettingsPane.js' +import { modelFilterOfFeatureName, ModelOption } from '../../../../../../../workbench/contrib/orcide/common/orcideSettingsService.js' import { WarningBox } from './WarningBox.js' import ErrorBoundary from '../sidebar-tsx/ErrorBoundary.js' @@ -24,16 +24,16 @@ const optionsEqual = (m1: ModelOption[], m2: ModelOption[]) => { const ModelSelectBox = ({ options, featureName, className }: { options: ModelOption[], featureName: FeatureName, className: string }) => { const accessor = useAccessor() - const voidSettingsService = accessor.get('IVoidSettingsService') + const orcideSettingsService = accessor.get('IOrcideSettingsService') - const selection = voidSettingsService.state.modelSelectionOfFeature[featureName] - const selectedOption = selection ? voidSettingsService.state._modelOptions.find(v => modelSelectionsEqual(v.selection, selection))! : options[0] + const selection = orcideSettingsService.state.modelSelectionOfFeature[featureName] + const selectedOption = selection ? orcideSettingsService.state._modelOptions.find(v => modelSelectionsEqual(v.selection, selection))! : options[0] const onChangeOption = useCallback((newOption: ModelOption) => { - voidSettingsService.setModelSelectionOfFeature(featureName, newOption.selection) - }, [voidSettingsService, featureName]) + orcideSettingsService.setModelSelectionOfFeature(featureName, newOption.selection) + }, [orcideSettingsService, featureName]) - return { commandService.executeCommand(VOID_OPEN_SETTINGS_ACTION_ID); }; + const openSettings = () => { commandService.executeCommand(ORCIDE_OPEN_SETTINGS_ACTION_ID); }; const { emptyMessage } = modelFilterOfFeatureName[featureName] diff --git a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx b/src/vs/workbench/contrib/orcide/browser/react/src/orcide-settings-tsx/Settings.tsx similarity index 75% rename from src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx rename to src/vs/workbench/contrib/orcide/browser/react/src/orcide-settings-tsx/Settings.tsx index acc3c6d6cdc..af6fc538469 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx +++ b/src/vs/workbench/contrib/orcide/browser/react/src/orcide-settings-tsx/Settings.tsx @@ -1,12 +1,12 @@ /*-------------------------------------------------------------------------------------- - * Copyright 2025 Glass Devtools, Inc. All rights reserved. - * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. + * Copyright 2025 Orcest AI. All rights reserved. + * Licensed under the MIT License. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ import React, { useCallback, useEffect, useMemo, useState, useRef } from 'react'; // Added useRef import just in case it was missed, though likely already present -import { ProviderName, SettingName, displayInfoOfSettingName, providerNames, VoidStatefulModelInfo, customSettingNamesOfProvider, RefreshableProviderName, refreshableProviderNames, displayInfoOfProviderName, nonlocalProviderNames, localProviderNames, GlobalSettingName, featureNames, displayInfoOfFeatureName, isProviderNameDisabled, FeatureName, hasDownloadButtonsOnModelsProviderNames, subTextMdOfProviderName } from '../../../../common/voidSettingsTypes.js' +import { ProviderName, SettingName, displayInfoOfSettingName, providerNames, OrcideStatefulModelInfo, customSettingNamesOfProvider, RefreshableProviderName, refreshableProviderNames, displayInfoOfProviderName, nonlocalProviderNames, localProviderNames, GlobalSettingName, featureNames, displayInfoOfFeatureName, isProviderNameDisabled, FeatureName, hasDownloadButtonsOnModelsProviderNames, subTextMdOfProviderName } from '../../../../common/orcideSettingsTypes.js' import ErrorBoundary from '../sidebar-tsx/ErrorBoundary.js' -import { VoidButtonBgDarken, VoidCustomDropdownBox, VoidInputBox2, VoidSimpleInputBox, VoidSwitch } from '../util/inputs.js' +import { OrcideButtonBgDarken, OrcideCustomDropdownBox, OrcideInputBox2, OrcideSimpleInputBox, OrcideSwitch } from '../util/inputs.js' import { useAccessor, useIsDark, useIsOptedOut, useRefreshModelListener, useRefreshModelState, useSettingsState } from '../util/services.js' import { X, RefreshCw, Loader2, Check, Asterisk, Plus } from 'lucide-react' import { URI } from '../../../../../../../base/common/uri.js' @@ -36,7 +36,7 @@ type Tab = const ButtonLeftTextRightOption = ({ text, leftButton }: { text: string, leftButton?: React.ReactNode }) => { - return
+ return
{leftButton ? leftButton : null} {text} @@ -184,7 +184,7 @@ const ConfirmButton = ({ children, onConfirm, className }: { children: React.Rea }, [confirm]); return (
- { + { if (!confirm) { setConfirm(true); } else { @@ -193,7 +193,7 @@ const ConfirmButton = ({ children, onConfirm, className }: { children: React.Rea } }}> {confirm ? `Confirm Reset` : children} - +
); }; @@ -220,7 +220,7 @@ const SimpleModelSettingsDialog = ({ const accessor = useAccessor() const settingsState = useSettingsState() const mouseDownInsideModal = useRef(false); // Ref to track mousedown origin - const settingsStateService = accessor.get('IVoidSettingsService') + const settingsStateService = accessor.get('IOrcideSettingsService') // current overrides and defaults const defaultModelCapabilities = getModelCapabilities(providerName, modelName, undefined); @@ -283,7 +283,7 @@ const SimpleModelSettingsDialog = ({ onClose(); }; - const sourcecodeOverridesLink = `https://github.com/voideditor/void/blob/2e5ecb291d33afbe4565921664fb7e183189c1c5/src/vs/workbench/contrib/void/common/modelCapabilities.ts#L146-L172` + const sourcecodeOverridesLink = `https://github.com/orcest-ai/Orcide/blob/2e5ecb291d33afbe4565921664fb7e183189c1c5/src/vs/workbench/contrib/orcide/common/modelCapabilities.ts#L146-L172` return (
{/* MODAL */}
e.stopPropagation()} // Keep stopping propagation for normal clicks inside onMouseDown={(e) => { mouseDownInsideModal.current = true; @@ -313,36 +313,36 @@ const SimpleModelSettingsDialog = ({
{/* Display model recognition status */} -
- {type === 'default' ? `${modelName} comes packaged with Void, so you shouldn't need to change these settings.` +
+ {type === 'default' ? `${modelName} comes packaged with Orcide, so you shouldn't need to change these settings.` : isUnrecognizedModel - ? `Model not recognized by Void.` - : `Void recognizes ${modelName} ("${recognizedModelName}").`} + ? `Model not recognized by Orcide.` + : `Orcide recognizes ${modelName} ("${recognizedModelName}").`}
{/* override toggle */}
- - Override model defaults + + Override model defaults
{/* Informational link */} - {overrideEnabled &&
+ {overrideEnabled &&
}