diff --git a/agent/CHANGELOG.md b/agent/CHANGELOG.md index 319215c54169..8dfac6313d89 100644 --- a/agent/CHANGELOG.md +++ b/agent/CHANGELOG.md @@ -10,6 +10,16 @@ This is a log of all notable changes to the Cody command-line tool. [Unreleased] ### Changed +## 0.2.0 + +### Changed + +- `cody-agent` is now just `cody`. Install the `@sourcegraph/cody` npm package instead of `@sourcegraph/cody-agent`. +- `cody-agent jsonrpc` is now `cody api jsonrpc-stdio`. If you previously relied on calling `node agent/dist/index.js`, now you need to call `node agent/dist/index.js api jsonrpc-stdio`. +- `cody-agent server` is now `cody api jsonrpc-websocket` +- `cody-agent cody-bench` is now `cody internal bench` +- Running `cody` now prints out the help message instead of defaulting to the old `cody-agent jsonrpc` command. + ## 0.1.2 ### Changed @@ -20,7 +30,7 @@ This is a log of all notable changes to the Cody command-line tool. [Unreleased] ### Fixed -- Running `cody-agent help` should work now. It was previously crashing about a missing keytar dependencies. +- Running `cody help` should work now. It was previously crashing about a missing keytar dependencies. ## 0.1.1 ### Fixed diff --git a/agent/package.json b/agent/package.json index d41cd19ad61c..0eb4f4a458f7 100644 --- a/agent/package.json +++ b/agent/package.json @@ -1,6 +1,6 @@ { - "name": "@sourcegraph/cody-agent", - "version": "0.1.2", + "name": "@sourcegraph/cody", + "version": "0.2.0", "description": "Cody JSON-RPC agent for consistent cross-editor support", "license": "Apache-2.0", "repository": { diff --git a/agent/src/TestClient.ts b/agent/src/TestClient.ts index 8e549df5a1ac..b188c741f868 100644 --- a/agent/src/TestClient.ts +++ b/agent/src/TestClient.ts @@ -145,9 +145,10 @@ export class TestClient extends MessageHandler { '--enable-source-maps', // '--expose-gc', // Uncoment when running memory.test.ts agentScript, - 'jsonrpc', + 'api', + 'jsonrpc-stdio', ] - : ['jsonrpc'] + : ['api', 'jsonrpc-stdio'] const child = spawn(bin, args, { stdio: 'pipe', diff --git a/agent/src/agent.ts b/agent/src/agent.ts index 9af33dd1738f..875ef3223e68 100644 --- a/agent/src/agent.ts +++ b/agent/src/agent.ts @@ -61,7 +61,7 @@ import { AgentGlobalState } from './AgentGlobalState' import { AgentProviders } from './AgentProviders' import { AgentWebviewPanel, AgentWebviewPanels } from './AgentWebviewPanel' import { AgentWorkspaceDocuments } from './AgentWorkspaceDocuments' -import type { PollyRequestError } from './cli/jsonrpc' +import type { PollyRequestError } from './cli/command-jsonrpc-stdio' import { codyPaths } from './codyPaths' import { MessageHandler, @@ -185,7 +185,7 @@ export async function newAgentClient( const nodeArguments = process.argv0.endsWith('node') ? ['--enable-source-maps', ...process.argv.slice(1, 2)] : [] - nodeArguments.push('jsonrpc') + nodeArguments.push('api', 'jsonrpc-stdio') const arg0 = clientInfo.codyAgentPath ?? process.argv[0] const args = clientInfo.codyAgentPath ? [] : nodeArguments const child = spawn(arg0, args, { diff --git a/agent/src/cli/__snapshots__/command-chat.test.ts.snap b/agent/src/cli/__snapshots__/command-chat.test.ts.snap new file mode 100644 index 000000000000..f04b7f046800 --- /dev/null +++ b/agent/src/cli/__snapshots__/command-chat.test.ts.snap @@ -0,0 +1,42 @@ +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html + +exports[`--context-file (animal test) 1`] = ` +"command: cody chat chat --context-file animal.ts -m implement a cow. Only print + the code without any explanation. +exitCode: 0 +stdout: |+ + \`\`\`typescript + class Cow implements StrangeAnimal { + makesSound(): 'moo' { + return 'moo'; + } + } + \`\`\` + +stderr: "" +" +`; + +exports[`--context-repo (squirrel test) 1`] = ` +"command: cody chat chat --context-repo github.com/sourcegraph/sourcegraph -m + what is squirrel? Explain as briefly as possible. +exitCode: 0 +stdout: >+ + Squirrel is a high-performance, open-source object-relational database (ORD) + that provides a SQL interface for storing and querying JSON data. It is + designed to be embedded in applications, making it suitable for use cases such + as caching, analytics, and data storage in edge computing environments. + +stderr: "" +" +`; + +exports[`--message (hello world test) 1`] = ` +"command: cody chat chat -m respond with "hello" and nothing else +exitCode: 0 +stdout: |+ + hello + +stderr: "" +" +`; diff --git a/agent/src/cli/auth/AuthenticatedAccount.ts b/agent/src/cli/command-auth/AuthenticatedAccount.ts similarity index 100% rename from agent/src/cli/auth/AuthenticatedAccount.ts rename to agent/src/cli/command-auth/AuthenticatedAccount.ts diff --git a/agent/src/cli/auth/command-accounts.ts b/agent/src/cli/command-auth/command-accounts.ts similarity index 100% rename from agent/src/cli/auth/command-accounts.ts rename to agent/src/cli/command-auth/command-accounts.ts diff --git a/agent/src/cli/auth/command-auth.ts b/agent/src/cli/command-auth/command-auth.ts similarity index 100% rename from agent/src/cli/auth/command-auth.ts rename to agent/src/cli/command-auth/command-auth.ts diff --git a/agent/src/cli/auth/command-login.ts b/agent/src/cli/command-auth/command-login.ts similarity index 100% rename from agent/src/cli/auth/command-login.ts rename to agent/src/cli/command-auth/command-login.ts diff --git a/agent/src/cli/auth/command-logout.ts b/agent/src/cli/command-auth/command-logout.ts similarity index 100% rename from agent/src/cli/auth/command-logout.ts rename to agent/src/cli/command-auth/command-logout.ts diff --git a/agent/src/cli/auth/command-whoami.ts b/agent/src/cli/command-auth/command-whoami.ts similarity index 100% rename from agent/src/cli/auth/command-whoami.ts rename to agent/src/cli/command-auth/command-whoami.ts diff --git a/agent/src/cli/auth/messages.ts b/agent/src/cli/command-auth/messages.ts similarity index 100% rename from agent/src/cli/auth/messages.ts rename to agent/src/cli/command-auth/messages.ts diff --git a/agent/src/cli/auth/secrets.ts b/agent/src/cli/command-auth/secrets.ts similarity index 100% rename from agent/src/cli/auth/secrets.ts rename to agent/src/cli/command-auth/secrets.ts diff --git a/agent/src/cli/auth/settings.ts b/agent/src/cli/command-auth/settings.ts similarity index 100% rename from agent/src/cli/auth/settings.ts rename to agent/src/cli/command-auth/settings.ts diff --git a/agent/src/cli/cody-bench/AutocompleteMatcher.test.ts b/agent/src/cli/command-bench/AutocompleteMatcher.test.ts similarity index 99% rename from agent/src/cli/cody-bench/AutocompleteMatcher.test.ts rename to agent/src/cli/command-bench/AutocompleteMatcher.test.ts index 4a854aa61c98..393d9f51104f 100644 --- a/agent/src/cli/cody-bench/AutocompleteMatcher.test.ts +++ b/agent/src/cli/command-bench/AutocompleteMatcher.test.ts @@ -9,7 +9,7 @@ import { getLanguageForFileName } from '../../language' import { AutocompleteMatcher } from './AutocompleteMatcher' import { EvaluationDocument } from './EvaluationDocument' import { Queries } from './Queries' -import { BenchStrategy } from './cody-bench' +import { BenchStrategy } from './command-bench' import { isWindows } from './isWindows' describe.skipIf(isWindows())('AutocompleteMatcher', () => { diff --git a/agent/src/cli/cody-bench/AutocompleteMatcher.ts b/agent/src/cli/command-bench/AutocompleteMatcher.ts similarity index 99% rename from agent/src/cli/cody-bench/AutocompleteMatcher.ts rename to agent/src/cli/command-bench/AutocompleteMatcher.ts index ef5eb84db4ad..f24a1e123a7a 100644 --- a/agent/src/cli/cody-bench/AutocompleteMatcher.ts +++ b/agent/src/cli/command-bench/AutocompleteMatcher.ts @@ -6,7 +6,7 @@ import { type WrappedParser, createParser } from '../../../../vscode/src/tree-si import { EvaluationDocument, type EvaluationDocumentParams } from './EvaluationDocument' import type { Queries } from './Queries' -import { BenchStrategy } from './cody-bench' +import { BenchStrategy } from './command-bench' export type AutocompleteMatchKind = | 'if_statement' diff --git a/agent/src/cli/cody-bench/EvaluationDocument.ts b/agent/src/cli/command-bench/EvaluationDocument.ts similarity index 99% rename from agent/src/cli/cody-bench/EvaluationDocument.ts rename to agent/src/cli/command-bench/EvaluationDocument.ts index 22f58f67eff1..67a7c4d66fd1 100644 --- a/agent/src/cli/cody-bench/EvaluationDocument.ts +++ b/agent/src/cli/command-bench/EvaluationDocument.ts @@ -12,7 +12,7 @@ import { ProtocolTextDocumentWithUri } from '../../../../vscode/src/jsonrpc/Text import { AgentTextDocument } from '../../AgentTextDocument' import type { AutocompleteMatchKind } from './AutocompleteMatcher' -import { BenchStrategy, type CodyBenchOptions } from './cody-bench' +import { BenchStrategy, type CodyBenchOptions } from './command-bench' import type { EvaluateFileParams } from './evaluateEachFile' export type EvaluationDocumentParams = Pick< diff --git a/agent/src/cli/cody-bench/Queries.ts b/agent/src/cli/command-bench/Queries.ts similarity index 100% rename from agent/src/cli/cody-bench/Queries.ts rename to agent/src/cli/command-bench/Queries.ts diff --git a/agent/src/cli/cody-bench/SnapshotWriter.ts b/agent/src/cli/command-bench/SnapshotWriter.ts similarity index 95% rename from agent/src/cli/cody-bench/SnapshotWriter.ts rename to agent/src/cli/command-bench/SnapshotWriter.ts index cbcc480a7f4a..8cd239d0915f 100644 --- a/agent/src/cli/cody-bench/SnapshotWriter.ts +++ b/agent/src/cli/command-bench/SnapshotWriter.ts @@ -5,7 +5,7 @@ import type { CsvWriter } from 'csv-writer/src/lib/csv-writer' import { rimraf } from 'rimraf' import { type EvaluationDocument, headerItems } from './EvaluationDocument' -import type { CodyBenchOptions } from './cody-bench' +import type { CodyBenchOptions } from './command-bench' export class SnapshotWriter { public csvWriter: CsvWriter | undefined diff --git a/agent/src/cli/cody-bench/TestParameters.ts b/agent/src/cli/command-bench/TestParameters.ts similarity index 100% rename from agent/src/cli/cody-bench/TestParameters.ts rename to agent/src/cli/command-bench/TestParameters.ts diff --git a/agent/src/cli/cody-bench/Timer.ts b/agent/src/cli/command-bench/Timer.ts similarity index 100% rename from agent/src/cli/cody-bench/Timer.ts rename to agent/src/cli/command-bench/Timer.ts diff --git a/agent/src/cli/cody-bench/__snapshots__/llm-judge.test.ts.snap b/agent/src/cli/command-bench/__snapshots__/llm-judge.test.ts.snap similarity index 100% rename from agent/src/cli/cody-bench/__snapshots__/llm-judge.test.ts.snap rename to agent/src/cli/command-bench/__snapshots__/llm-judge.test.ts.snap diff --git a/agent/src/cli/cody-bench/cli-parsers.ts b/agent/src/cli/command-bench/cli-parsers.ts similarity index 100% rename from agent/src/cli/cody-bench/cli-parsers.ts rename to agent/src/cli/command-bench/cli-parsers.ts diff --git a/agent/src/cli/cody-bench/cody-bench.ts b/agent/src/cli/command-bench/command-bench.ts similarity index 99% rename from agent/src/cli/cody-bench/cody-bench.ts rename to agent/src/cli/command-bench/command-bench.ts index b7c1d90b4e52..65a8cedd7b8b 100644 --- a/agent/src/cli/cody-bench/cody-bench.ts +++ b/agent/src/cli/command-bench/command-bench.ts @@ -130,7 +130,7 @@ async function loadEvaluationConfig(options: CodyBenchOptions): Promise { return new Promise(resolve => { diff --git a/agent/src/cli/cody-bench/triggerAutocomplete.ts b/agent/src/cli/command-bench/triggerAutocomplete.ts similarity index 99% rename from agent/src/cli/cody-bench/triggerAutocomplete.ts rename to agent/src/cli/command-bench/triggerAutocomplete.ts index 696567cff345..e268c548e409 100644 --- a/agent/src/cli/cody-bench/triggerAutocomplete.ts +++ b/agent/src/cli/command-bench/triggerAutocomplete.ts @@ -11,7 +11,7 @@ import type { WrappedParser } from '../../../../vscode/src/tree-sitter/parser' import type { AutocompleteMatchKind } from './AutocompleteMatcher' import type { EvaluationDocument } from './EvaluationDocument' import type { TestParameters } from './TestParameters' -import type { CodyBenchOptions } from './cody-bench' +import type { CodyBenchOptions } from './command-bench' import { testParses } from './testParse' import { testTypecheck } from './testTypecheck' diff --git a/agent/src/cli/chat.test.ts b/agent/src/cli/command-chat.test.ts similarity index 96% rename from agent/src/cli/chat.test.ts rename to agent/src/cli/command-chat.test.ts index f61a4028c8a6..ea632b719f46 100644 --- a/agent/src/cli/chat.test.ts +++ b/agent/src/cli/command-chat.test.ts @@ -8,9 +8,10 @@ import { TESTING_CREDENTIALS } from '../../../vscode/src/testutils/testing-crede import { buildAgentBinary, getAgentDir } from '../TestClient' import { TestWorkspace } from '../TestWorkspace' import { Streams, StringBufferStream } from './Streams' -import { type ChatOptions, chatAction, chatCommand } from './chat' +import { type ChatOptions, chatAction, chatCommand } from './command-chat' process.env.CODY_SHIM_TESTING = 'true' +process.env.DISABLE_FEATURE_FLAGS = 'true' interface ChatCommandResult { command: string @@ -32,6 +33,7 @@ describe('cody chat', () => { // `--access-token` or `--endpoint` so we modify process.env instead. process.env.SRC_ACCESS_TOKEN = credentials.token ?? credentials.redactedToken process.env.SRC_ENDPOINT = credentials.serverEndpoint + process.env.DISABLE_FEATURE_FLAGS = 'true' process.env.CODY_TELEMETRY_EXPORTER = 'testing' const args = [...params.args, '--dir', tmp.rootPath, '--silent'] diff --git a/agent/src/cli/chat.ts b/agent/src/cli/command-chat.ts similarity index 98% rename from agent/src/cli/chat.ts rename to agent/src/cli/command-chat.ts index 8729e5190062..446507df626a 100644 --- a/agent/src/cli/chat.ts +++ b/agent/src/cli/command-chat.ts @@ -13,8 +13,8 @@ import packageJson from '../../package.json' import { newEmbeddedAgentClient } from '../agent' import type { ClientInfo } from '../protocol-alias' import { Streams } from './Streams' -import { AuthenticatedAccount } from './auth/AuthenticatedAccount' -import { notLoggedIn } from './auth/messages' +import { AuthenticatedAccount } from './command-auth/AuthenticatedAccount' +import { notLoggedIn } from './command-auth/messages' declare const process: { pkg: { entrypoint: string } } & NodeJS.Process export interface ChatOptions { diff --git a/agent/src/cli/jsonrpc.ts b/agent/src/cli/command-jsonrpc-stdio.ts similarity index 98% rename from agent/src/cli/jsonrpc.ts rename to agent/src/cli/command-jsonrpc-stdio.ts index aa91ca1a5abc..272d0cbbe33f 100644 --- a/agent/src/cli/jsonrpc.ts +++ b/agent/src/cli/command-jsonrpc-stdio.ts @@ -8,7 +8,7 @@ import { startPollyRecording } from '../../../vscode/src/testutils/polly' import { Agent } from '../agent' import { activate } from '../../../vscode/src/extension.node' -import { booleanOption } from './cody-bench/cli-parsers' +import { booleanOption } from './command-bench/cli-parsers' interface JsonrpcCommandOptions { expiresIn?: string | null | undefined @@ -57,7 +57,7 @@ const debugPort = process.env.CODY_AGENT_DEBUG_PORT ? Number.parseInt(process.env.CODY_AGENT_DEBUG_PORT, 10) : 3113 -export const jsonrpcCommand = new Command('jsonrpc') +export const jsonrpcCommand = new Command('jsonrpc-stdio') .description( 'Interact with the Agent using JSON-RPC via stdout/stdin. ' + 'This is the subcommand that is used by Cody clients like the JetBrains and Neovim plugins.' diff --git a/agent/src/cli/server.ts b/agent/src/cli/command-jsonrpc-websocket.ts similarity index 88% rename from agent/src/cli/server.ts rename to agent/src/cli/command-jsonrpc-websocket.ts index 08c4b98372aa..dfe1ae7360bb 100644 --- a/agent/src/cli/server.ts +++ b/agent/src/cli/command-jsonrpc-websocket.ts @@ -3,13 +3,16 @@ import { Command } from 'commander' import { WebSocketServer } from 'ws' import { newAgentClient } from '../agent' import type { RpcMessageHandler } from '../jsonrpc-alias' -import { intOption } from './cody-bench/cli-parsers' +import { intOption } from './command-bench/cli-parsers' interface ServerOptions { port: number } -export const serverCommand = new Command('server') +export const serverCommand = new Command('jsonrpc-websocket') + .description( + 'Start a server that opens JSON-RPC connections through websockets. This command does not work at the moment.' + ) .option('--port ', 'Which port to listen to', intOption, 7000) .action(async (options: ServerOptions) => { const wss = new WebSocketServer({ diff --git a/agent/src/cli/command-root.ts b/agent/src/cli/command-root.ts new file mode 100644 index 000000000000..6577ca9e8078 --- /dev/null +++ b/agent/src/cli/command-root.ts @@ -0,0 +1,20 @@ +import { Command } from 'commander' + +import { authCommand } from './command-auth/command-auth' +import { benchCommand } from './command-bench/command-bench' +import { chatCommand } from './command-chat' +import { jsonrpcCommand } from './command-jsonrpc-stdio' +import { serverCommand } from './command-jsonrpc-websocket' + +import { version } from '../../package.json' + +export const rootCommand = new Command() + .name('cody') + .version(version) + .description( + 'The Cody cli supports running Cody in headless mode and interacting with it via JSON-RPC. Run `cody chat -m "Hello" to get started.' + ) + .addCommand(authCommand()) + .addCommand(chatCommand()) + .addCommand(new Command('api').addCommand(serverCommand).addCommand(jsonrpcCommand)) + .addCommand(new Command('internal').addCommand(benchCommand)) diff --git a/agent/src/cli/root.ts b/agent/src/cli/root.ts deleted file mode 100644 index 762956d68c8e..000000000000 --- a/agent/src/cli/root.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { Command } from 'commander' - -import { authCommand } from './auth/command-auth' -import { chatCommand } from './chat' -import { codyBenchCommand } from './cody-bench/cody-bench' -import { jsonrpcCommand } from './jsonrpc' -import { serverCommand } from './server' - -export const rootCommand = new Command() - .name('cody-agent') - .version('0.1.0') - .description( - 'Cody Agent supports running the Cody VS Code extension in headless mode and interact with it via JSON-RPC. ' + - 'The Agent is used by editor clients like JetBrains and Neovim.' - ) - .addCommand(serverCommand) - .addCommand(jsonrpcCommand) - .addCommand(codyBenchCommand) - .addCommand(chatCommand()) - .addCommand(authCommand()) diff --git a/agent/src/index.test.ts b/agent/src/index.test.ts index e2ccb14dee40..3b86a6360ca8 100644 --- a/agent/src/index.test.ts +++ b/agent/src/index.test.ts @@ -127,7 +127,7 @@ describe('Agent', () => { }) expect(valid?.isLoggedIn).toBeTruthy() - // Please don't update the recordings to use a different account without consulting #wg-cody-agent. + // Please don't update the recordings to use a different account without consulting #team-cody-core. // When changing an account, you also need to update the REDACTED_ hash above. // // To update the recordings with the correct account, run the following command diff --git a/agent/src/index.ts b/agent/src/index.ts index ba4948b765f5..4c60cf4ab3c4 100644 --- a/agent/src/index.ts +++ b/agent/src/index.ts @@ -11,7 +11,7 @@ console.log = console.error // process.stdout, which breaks the `jsonrpc` command, which uses stdout/stdin // to communicate with the agent client`jsonrpc` command, which uses // stdout/stdin to communicate with the agent client. -const rootCommand: Command = require('./cli/root').rootCommand +const rootCommand: Command = require('./cli/command-root').rootCommand process.on('uncaughtException', e => { // By default, an uncaught exception will take down the entire process. @@ -26,10 +26,6 @@ process.on('uncaughtException', e => { registerLocalCertificates() const args = process.argv.slice(2) -const { operands } = rootCommand.parseOptions(args) -if (operands.length === 0) { - args.push('jsonrpc') -} rootCommand.parseAsync(args, { from: 'user' }).catch(error => { console.error('Error:', error) diff --git a/agent/src/vscode-shim.ts b/agent/src/vscode-shim.ts index 740082875dd9..721776cbd33e 100644 --- a/agent/src/vscode-shim.ts +++ b/agent/src/vscode-shim.ts @@ -51,7 +51,7 @@ import { AgentQuickPick } from './AgentQuickPick' import { AgentTabGroups } from './AgentTabGroups' import { AgentWorkspaceConfiguration } from './AgentWorkspaceConfiguration' import type { Agent } from './agent' -import { matchesGlobPatterns } from './cli/cody-bench/matchesGlobPatterns' +import { matchesGlobPatterns } from './cli/command-bench/matchesGlobPatterns' import type { ClientInfo, ExtensionConfiguration } from './protocol-alias' // Not using CODY_TESTING because it changes the URL endpoint we send requests diff --git a/cli/README.md b/cli/README.md index 6ed7ddb997c0..0e65e62eaf36 100644 --- a/cli/README.md +++ b/cli/README.md @@ -1,36 +1,33 @@ # Cody CLI (experimental) -A command-line interface for Cody. +A command-line interface for Cody. Important note: this tool used to be called `cody-agent` but was renamed to just `cody`. **Status:** experimental -## Usage - -Set the `SRC_ENDPOINT` and `SRC_ACCESS_TOKEN` environment variables: +## Changelog -``` -# Sourcegraph URL (https://sourcegraph.com or a URL to an enterprise instance) -export SRC_ENDPOINT=https://sourcegraph.com +See [CHANGELOG.md](../agent/CHANGELOG.md). -# Sourcegraph access token (created in Sourcegraph > User settings > Access tokens) -export SRC_ACCESS_TOKEN=sgp_0000000000_0000000000000000000 -``` +## Usage -Then run: +Run the following commands to get started with the Cody CLI: ``` -npm install -g @sourcegraph/cody-agent +npm install -g @sourcegraph/cody + +# Authenticate with Sourcegraph by opening a browser window +cody auth login --web # Ask Cody a question (with no context): -cody-agent experimental-cli chat -m 'what color is the sky?' +cody chat -m 'what color is the sky?' # Ask Cody a question (with Sourcegraph Enterprise repository context): -cody-agent experimental-cli chat --context-repo github.com/sourcegraph/{sourcegraph,cody} --show-context -m 'how is authentication handled in sourcegraph/cody?' +cody chat --context-repo github.com/sourcegraph/{sourcegraph,cody} --show-context -m 'how is authentication handled in sourcegraph/cody?' ``` ## Development & feedback -Use the [Feedback on Cody CLI (experimental feature)](https://community.sourcegraph.com/t/feedback-on-cody-cli-experimental-feature/78) thread in the Sourcegraph community forum. +Use the [Feedback on upcoming Cody CLI Beta](https://community.sourcegraph.com/t/share-your-feedback-on-the-upcoming-cody-cli-beta/672) thread in the Sourcegraph community forum. Issues and PRs appreciated! diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e1e1880cbfb6..ea5883ac35fa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -776,7 +776,7 @@ importers: web: devDependencies: - '@sourcegraph/cody-agent': + '@sourcegraph/cody': specifier: workspace:* version: link:../agent '@sourcegraph/cody-shared': diff --git a/web/lib/agent/agent.worker.ts b/web/lib/agent/agent.worker.ts index fa8752f3452b..1f7d7862715e 100644 --- a/web/lib/agent/agent.worker.ts +++ b/web/lib/agent/agent.worker.ts @@ -1,4 +1,4 @@ -import { Agent } from '@sourcegraph/cody-agent/src/agent' +import { Agent } from '@sourcegraph/cody/src/agent' import { BrowserMessageReader, BrowserMessageWriter, diff --git a/web/package.json b/web/package.json index ff26cd458f0a..cc608bc33fbd 100644 --- a/web/package.json +++ b/web/package.json @@ -38,7 +38,7 @@ "tailwindcss": "^3.4.3", "cody-ai": "workspace:*", "@types/lodash": "4.14.195", - "@sourcegraph/cody-agent": "workspace:*", + "@sourcegraph/cody": "workspace:*", "@sourcegraph/cody-shared": "workspace:*" } }