Merge branch 'main' into vb/fireworks-provider

sourcegraph · Mar 18, 2024 · e84d3d4 · e84d3d4
2 parents 3ee933c + dee6562
commit e84d3d4
Show file tree

Hide file tree

Showing 200 changed files with 12,232 additions and 8,653 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -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",

diff --git a/...gs/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/ChatInputHistory.kt b/...gs/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/ChatInputHistory.kt
diff --git a/...indings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/ChatMessage.kt b/...indings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/ChatMessage.kt
@@ -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 {

diff --git a/...gs/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/UserLocalHistory.kt b/...gs/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/UserLocalHistory.kt
@@ -3,6 +3,5 @@ package com.sourcegraph.cody.protocol_generated
 
 data class UserLocalHistory(
   val chat: ChatHistory? = null,
-  val input: List<ChatInputHistory>? = null,
 )
 
diff --git a/...ings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/WebviewMessage.kt b/...ings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/WebviewMessage.kt
@@ -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 {
@@ -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 {

diff --git a/agent/package.json b/agent/package.json
@@ -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",
@@ -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",