install-dependencies.sh fails on dev branch

davidbrai commented 2 weeks ago

Before submitting your bug report

[X] I believe this is a bug. I'll try to join the Continue Discord for questions
[X] I'm not able to find an open issue that reports the same bug
[X] I've seen the troubleshooting guide on the Continue Docs

Relevant environment info

- OS: macOS
- on commit: c3dada07729f75e3767f88facc302ff9a9d6c753

Description

Running ./scripts/install-dependencies.sh and it throws an error. Same script works on main branch. The error:

> continue@0.9.222 prepackage
> node scripts/prepackage.js

[info] Using target:  darwin-x64
[info] Packaging extension for target  darwin-x64
undefined:3123
<<<<<<< HEAD
^

SyntaxError: Expected double-quoted property name in JSON at position 108593

running git diff I see some unmerged file change was created:

diff --git a/extensions/intellij/src/main/resources/config_schema.json b/extensions/intellij/src/main/resources/config_schema.json
index f911def9e..40f7322f2 100644
--- a/extensions/intellij/src/main/resources/config_schema.json
+++ b/extensions/intellij/src/main/resources/config_schema.json
@@ -369,7 +369,7 @@
             "presencePenalty": null,
             "frequencyPenalty": null,
             "stop": null,
-            "maxTokens": 600
+            "maxTokens": 2048
           },
           "allOf": [
             {
@@ -3120,15 +3120,20 @@
           "properties": {
             "provider": {
               "type": "string",
+<<<<<<< HEAD
+              "enum": [
+                "posthog"
+              ],
+=======
               "enum": [
                 "posthog",
                 "logstash"
               ],
+>>>>>>> 6e622157f1a727ba54d3bc22b337079e832c7556
               "description": "The 3rd party analytics provider to use.",
               "default": "posthog",
               "markdownEnumDescriptions": [
-                "### Posthog\nTo use Posthog, set up an account, obtain your client key, and enter it in the client key field.",
-                "### Logstash\nContinue's Logstash integration uses the TCP input at the specified URL"
+                "### Posthog\nTo use Posthog, set up an account, obtain your client key, and enter it in the client key field."
               ]
             },
             "url": {

To reproduce

Run ./scripts/install-dependencies.sh

Log output

No response

davidbrai commented 2 weeks ago

if it helps, I ran git bisect and this error started on this commit: d725bc45f4a9617213c75cd5685cb8370037c7a5 before that there was a different error running this script

PRANJALRANA11 commented 2 weeks ago

@davidbrai yeah man it's coming on mine to from today only

davidbrai commented 2 weeks ago

looks like it's fixed on latest dev commit

RomneyDa commented 2 weeks ago

@davidbrai agreed, not sure what fixed but can't reproduce anymore. Will close

continuedev / continue