Skip to content

Commit

Permalink
Merge branch 'main' into vb/fireworks-provider
Browse files Browse the repository at this point in the history
  • Loading branch information
valerybugakov committed Mar 18, 2024
2 parents 3ee933c + dee6562 commit e84d3d4
Show file tree
Hide file tree
Showing 200 changed files with 12,232 additions and 8,653 deletions.
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"typescript.tsc.autoDetect": "off",
"typescript.tsdk": "node_modules/typescript/lib",
"task.allowAutomaticTasks": "on",
"biome.enabled": true,
"editor.defaultFormatter": "biomejs.biome",
"editor.codeActionsOnSave": {
"source.organizeImports": "never",
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ data class ChatMessage(
val text: String? = null,
val contextFiles: List<ContextItem>? = null,
val error: ChatError? = null,
val editorState: Any? = null,
) {

enum class SpeakerEnum {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ package com.sourcegraph.cody.protocol_generated

data class UserLocalHistory(
val chat: ChatHistory? = null,
val input: List<ChatInputHistory>? = null,
)

Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ data class SubmitWebviewMessage(
val contextFiles: List<ContextItem>? = null,
val text: String? = null,
val submitType: ChatSubmitType? = null, // Oneof: user, user-newchat
val editorState: Any? = null,
) : WebviewMessage() {

enum class CommandEnum {
Expand Down Expand Up @@ -194,6 +195,7 @@ data class EditWebviewMessage(
val contextFiles: List<ContextItem>? = null,
val text: String? = null,
val index: Int? = null,
val editorState: Any? = null,
) : WebviewMessage() {

enum class CommandEnum {
Expand Down
16 changes: 14 additions & 2 deletions agent/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"name": "@sourcegraph/cody-agent",
"name": "@sourcegraph/agent",
"version": "0.0.1",
"description": "Cody JSON-RPC agent for consistent cross-editor support",
"license": "Apache-2.0",
Expand All @@ -19,9 +19,21 @@
"agent": "pnpm run build && node dist/index.js",
"agent:debug": "pnpm run build && node --inspect --enable-source-maps ./dist/index.js",
"build-ts": "tsc --build",
"build-agent-binaries": "pnpm run build && cp dist/index.js dist/agent.js && pkg -t latest-linux-arm64,latest-linux-x64,latest-macos-arm64,latest-macos-x64,latest-win-x64 dist/agent.js --out-path ${AGENT_EXECUTABLE_TARGET_DIRECTORY:-dist}",
"build-agent-binaries": "pnpm run build && pkg --compress GZip --no-bytecode --public-packages \"*\" --public . --out-path ${AGENT_EXECUTABLE_TARGET_DIRECTORY:-dist}",
"test-agent-binary": "esbuild ./scripts/test-agent-binary.ts --bundle --platform=node --alias:vscode=./src/vscode-shim.ts --outdir=dist && node ./dist/test-agent-binary.js",
"test": "vitest"
},
"pkg": {
"targets": [
"latest-linux-arm64",
"latest-linux-x64",
"latest-macos-x64",
"latest-win-x64",
"latest-macos-arm64"
],
"assets": "dist/*.{wasm,map}"
},
"bin": "dist/index.js",
"dependencies": {
"@pollyjs/core": "^6.0.6",
"@pollyjs/persister": "^6.0.6",
Expand Down
Loading

0 comments on commit e84d3d4

Please sign in to comment.