Merge pull request #1 from alfasoftware/fix-debounce-timeout

bdavj · web-flow · commit 21ecefbdd8a4 · 2025-03-06T15:07:06.000Z
Fix debounce timeout
diff --git a/.github/workflows/jetbrains-release.yaml b/.github/workflows/jetbrains-release.yaml
@@ -53,14 +53,6 @@ jobs:
         with:
           ref: ${{ github.event.release.tag_name }}
 
-      - name: Import Apple certificate
-        uses: apple-actions/import-codesign-certs@v3
-        with:
-          keychain: ${{ github.run_id }}
-          keychain-password: ${{ github.run_id }}
-          p12-file-base64: ${{ secrets.APPLE_CERT_DATA }}
-          p12-password: ${{ secrets.APPLE_CERT_PASSWORD }}
-
       # Validate wrapper
       - name: Gradle Wrapper Validation
         uses: gradle/actions/wrapper-validation@v3
@@ -156,50 +148,11 @@ jobs:
           cd ../../binary
           npm run build
 
-      # - name: Code sign darwin binaries
-      #   run: |
-      #     echo "Signing executable with keychain: ${{ github.run_id }}"
-      #     codesign --sign - ../../binary/bin/darwin-x64/continue-binary
-      #     codesign --sign - ../../binary/bin/darwin-arm64/continue-binary
-
-      # - name: Sign darwin-arm64 binary
-      #   uses: lando/code-sign-action@v2
-      #   with:
-      #     file: ./binary/bin/darwin-arm64/continue-binary
-      #     certificate-data: ${{ secrets.APPLE_CERT_DATA }}
-      #     certificate-password: ${{ secrets.APPLE_CERT_PASSWORD }}
-      #     apple-notary-user: ${{ secrets.APPLE_NOTARY_USER }}
-      #     apple-notary-password: ${{ secrets.APPLE_NOTARY_PASSWORD }}
-      #     apple-notary-tool: altool
-      #     apple-team-id: 43XFLY66ZD
-      #     apple-product-id: dev.continue.continue-binary
-      #     options: --options runtime --entitlements entitlements.xml
 
       # Build plugin
       - name: Build plugin
         run: ./gradlew buildPlugin
 
-      # Publish the plugin to JetBrains Marketplace
-      - name: Publish EAP Plugin
-        if: github.event_name == 'release' || github.event.inputs.publish_build == 'true'
-        env:
-          PUBLISH_TOKEN: ${{ secrets.JETBRAINS_PUBLISH_TOKEN }}
-          CERTIFICATE_CHAIN: ${{ secrets.JETBRAINS_CERTIFICATE_CHAIN }}
-          PRIVATE_KEY: ${{ secrets.JETBRAINS_PRIVATE_KEY }}
-          PRIVATE_KEY_PASSWORD: ${{ secrets.JETBRAINS_PRIVATE_KEY_PASSWORD }}
-          RELEASE_CHANNEL: eap
-        run: ./gradlew publishPlugin
-
-      - name: Publish Stable Plugin
-        if: github.event_name == 'release' || github.event.inputs.publish_build == 'true'
-        env:
-          PUBLISH_TOKEN: ${{ secrets.JETBRAINS_PUBLISH_TOKEN }}
-          CERTIFICATE_CHAIN: ${{ secrets.JETBRAINS_CERTIFICATE_CHAIN }}
-          PRIVATE_KEY: ${{ secrets.JETBRAINS_PRIVATE_KEY }}
-          PRIVATE_KEY_PASSWORD: ${{ secrets.JETBRAINS_PRIVATE_KEY_PASSWORD }}
-          RELEASE_CHANNEL: default
-        run: ./gradlew publishPlugin
-
       # Prepare plugin archive content for creating artifact
       - name: Prepare Plugin Artifact
         id: artifact
@@ -474,68 +427,3 @@ jobs:
           name: pluginVerifier-result
           path: ${{ github.workspace }}/build/reports/pluginVerifier
 
-  upload-release:
-    if: false
-    name: Upload Release
-    needs:
-      - build
-      - test-binaries
-      - test
-    runs-on: ubuntu-latest
-    steps:
-      # # Update Unreleased section with the current release note
-      # - name: Patch Changelog
-      #   if: ${{ steps.properties.outputs.changelog != '' }}
-      #   env:
-      #     CHANGELOG: ${{ steps.properties.outputs.changelog }}
-      #   run: |
-      #     ./gradlew patchChangelog --release-note="$CHANGELOG"
-
-      - name: Download the plugin
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ steps.artifact.outputs.filename }}
-          path: ./build/distributions/
-
-      # Upload artifact as a release asset
-      # - name: Upload Release Asset
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #   run: gh release upload ${{ github.event.release.tag_name }} ./build/distributions/*
-
-      # Publish the plugin to JetBrains Marketplace
-      - name: Publish Plugin
-        env:
-          PUBLISH_TOKEN: ${{ secrets.JETBRAINS_PUBLISH_TOKEN }}
-          CERTIFICATE_CHAIN: ${{ secrets.JETBRAINS_CERTIFICATE_CHAIN }}
-          PRIVATE_KEY: ${{ secrets.JETBRAINS_PRIVATE_KEY }}
-          PRIVATE_KEY_PASSWORD: ${{ secrets.JETBRAINS_PRIVATE_KEY_PASSWORD }}
-        run: ./gradlew publishPlugin
-
-      # Create a pull request
-      - name: Create Pull Request
-        if: ${{ steps.properties.outputs.changelog != '' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          VERSION="${{ github.event.release.tag_name }}"
-          BRANCH="changelog-update-$VERSION"
-          LABEL="release changelog"
-
-          git config user.email "action@github.com"
-          git config user.name "GitHub Action"
-
-          git checkout -b $BRANCH
-          git commit -am "Changelog update - $VERSION"
-          git push --set-upstream origin $BRANCH
-
-          gh label create "$LABEL" \
-            --description "Pull requests with release changelog update" \
-            --force \
-            || true
-
-          gh pr create \
-            --title "Changelog update - \`$VERSION\`" \
-            --body "Current pull request contains patched \`CHANGELOG.md\` file for the \`$VERSION\` version." \
-            --label "$LABEL" \
-            --head $BRANCH
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -230,18 +230,3 @@ jobs:
           pattern: "*-vsix"
           path: vsix-artifacts
           merge-multiple: true
-
-      # 2. Publish the extension to VS Code Marketplace
-      - name: Publish to VS Code Marketplace
-        run: |
-          cd extensions/vscode
-          npx vsce publish --packagePath ../../vsix-artifacts/*.vsix
-        env:
-          VSCE_PAT: ${{ secrets.VSCE_TOKEN }}
-
-      # 3. Publish the extension to Open VSX Registry
-      - name: Publish (Open VSX Registry)
-        continue-on-error: true
-        run: |
-          cd extensions/vscode
-          npx ovsx publish -p ${{ secrets.VSX_REGISTRY_TOKEN }} --packagePath ../../vsix-artifacts/*.vsix
diff --git a/core/autocomplete/filtering/streamTransforms/StreamTransformPipeline.ts b/core/autocomplete/filtering/streamTransforms/StreamTransformPipeline.ts
@@ -1,5 +1,4 @@
 import { streamLines } from "../../../diff/util";
-import { PosthogFeatureFlag, Telemetry } from "../../../util/posthog";
 import { HelperVars } from "../../util/HelperVars";
 
 import { stopAtStartOf, stopAtStopTokens } from "./charStream";
@@ -73,10 +72,7 @@ export class StreamTransformPipeline {
       fullStop,
     );
 
-    const timeoutValue = await Telemetry.getValueForFeatureFlag(
-      PosthogFeatureFlag.AutocompleteTimeout,
-    );
-
+    const timeoutValue = helper.options.modelTimeout;
     lineGenerator = showWhateverWeHaveAtXMs(lineGenerator, timeoutValue!);
 
     const finalGenerator = streamWithNewLines(lineGenerator);
diff --git a/core/autocomplete/util/AutocompleteDebouncer.ts b/core/autocomplete/util/AutocompleteDebouncer.ts
@@ -1,32 +1,32 @@
 import { v4 as uuidv4 } from "uuid";
+
 export class AutocompleteDebouncer {
   private debounceTimeout: NodeJS.Timeout | undefined = undefined;
-  private debouncing = false;
-  private lastUUID: string | undefined = undefined;
+  private currentRequestId: string | undefined = undefined;
 
   async delayAndShouldDebounce(debounceDelay: number): Promise<boolean> {
-    // Debounce
-    const uuid = uuidv4();
-    this.lastUUID = uuid;
-
-    // Debounce
-    if (this.debouncing) {
-      this.debounceTimeout?.refresh();
-      const lastUUID = await new Promise((resolve) =>
-        setTimeout(() => {
-          resolve(this.lastUUID);
-        }, debounceDelay),
-      );
-      if (uuid !== lastUUID) {
-        return true;
-      }
-    } else {
-      this.debouncing = true;
-      this.debounceTimeout = setTimeout(async () => {
-        this.debouncing = false;
-      }, debounceDelay);
+    // Generate a unique ID for this request
+    const requestId = uuidv4();
+    this.currentRequestId = requestId;
+    
+    // Clear any existing timeout
+    if (this.debounceTimeout) {
+      clearTimeout(this.debounceTimeout);
     }
-
-    return false;
+    
+    // Create a new promise that resolves after the debounce delay
+    return new Promise<boolean>((resolve) => {
+      this.debounceTimeout = setTimeout(() => {
+        // When the timeout completes, check if this is still the most recent request
+        const shouldDebounce = this.currentRequestId !== requestId;
+        
+        // If this is the most recent request, it shouldn't be debounced
+        if (!shouldDebounce) {
+          this.currentRequestId = undefined;
+        }
+        
+        resolve(shouldDebounce);
+      }, debounceDelay);
+    });
   }
 }
diff --git a/core/config/sharedConfig.ts b/core/config/sharedConfig.ts
@@ -31,6 +31,8 @@ export const sharedConfigSchema = z
     useAutocompleteCache: z.boolean(),
     useAutocompleteMultilineCompletions: z.enum(["always", "never", "auto"]),
     disableAutocompleteInFiles: z.array(z.string()),
+    modelTimeout: z.number(),
+    debounceDelay: z.number(),
   })
   .partial();
 
@@ -103,6 +105,14 @@ export function modifyAnyConfigWithSharedConfig<
     configCopy.tabAutocompleteOptions.disableInFiles =
       sharedConfig.disableAutocompleteInFiles;
   }
+  if (sharedConfig.modelTimeout !== undefined) {
+    configCopy.tabAutocompleteOptions.modelTimeout =
+      sharedConfig.modelTimeout;
+  }
+  if (sharedConfig.debounceDelay !== undefined) {
+    configCopy.tabAutocompleteOptions.debounceDelay =
+      sharedConfig.debounceDelay;
+  }
 
   configCopy.ui = {
     ...configCopy.ui,
diff --git a/core/index.d.ts b/core/index.d.ts
@@ -983,6 +983,7 @@ export interface TabAutocompleteOptions {
   disable: boolean;
   maxPromptTokens: number;
   debounceDelay: number;
+  modelTimeout: number;
   maxSuffixPercentage: number;
   prefixPercentage: number;
   transform?: boolean;
diff --git a/core/util/parameters.ts b/core/util/parameters.ts
@@ -6,6 +6,7 @@ export const DEFAULT_AUTOCOMPLETE_OPTS: TabAutocompleteOptions = {
   prefixPercentage: 0.3,
   maxSuffixPercentage: 0.2,
   debounceDelay: 350,
+  modelTimeout: 150,
   multilineCompletions: "auto",
   // @deprecated TO BE REMOVED
   slidingWindowPrefixPercentage: 0.75,
diff --git a/gui/src/components/gui/NumberInput.tsx b/gui/src/components/gui/NumberInput.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 
 interface NumberInputProps {
   value: number;
@@ -13,24 +13,50 @@ const NumberInput: React.FC<NumberInputProps> = ({
   max,
   min,
 }) => {
+  const [inputValue, setInputValue] = useState(value.toString());
+
   const handleIncrement = () => {
     if (value < max) {
-      onChange(value + 1);
+      const newValue = value + 1;
+      onChange(newValue);
+      setInputValue(newValue.toString());
     }
   };
 
   const handleDecrement = () => {
     if (value > min) {
-      onChange(value - 1);
+      const newValue = value - 1;
+      onChange(newValue);
+      setInputValue(newValue.toString());
+    }
+  };
+
+  const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const newInputValue = e.target.value;
+    setInputValue(newInputValue);
+    
+    // Only update the actual value if it's a valid number
+    const numValue = parseInt(newInputValue, 10);
+    if (!isNaN(numValue)) {
+      // Apply min/max constraints
+      const constrainedValue = Math.min(Math.max(numValue, min), max);
+      onChange(constrainedValue);
     }
   };
 
+  const handleBlur = () => {
+    // When input loses focus, ensure the displayed value matches the actual value
+    // This handles cases where the user entered an invalid value
+    setInputValue(value.toString());
+  };
+
   return (
     <div className="border-vsc-input-border bg-vsc-input-background flex flex-row overflow-hidden rounded-md border border-solid">
       <input
         type="text"
-        value={value}
-        readOnly
+        value={inputValue}
+        onChange={handleInputChange}
+        onBlur={handleBlur}
         className="text-vsc-foreground max-w-7 border-none bg-inherit pr-1.5 text-right outline-none ring-0 focus:border-none focus:outline-none focus:ring-0"
         style={{
           appearance: "none",
diff --git a/gui/src/pages/config/index.tsx b/gui/src/pages/config/index.tsx
@@ -130,6 +130,10 @@ function ConfigPage() {
   const codeBlockToolbarPosition = config.ui?.codeBlockToolbarPosition ?? "top";
   const useAutocompleteMultilineCompletions =
     config.tabAutocompleteOptions?.multilineCompletions ?? "auto";
+  const modelTimeout = 
+    config.tabAutocompleteOptions?.modelTimeout ?? 150;
+  const debounceDelay = 
+    config.tabAutocompleteOptions?.debounceDelay ?? 250;
   const fontSize = getFontSize();
 
   // Disable autocomplete
@@ -513,7 +517,32 @@ function ConfigPage() {
                       <option value="never">Never</option>
                     </Select>
                   </label>
-
+                  <label className="flex items-center justify-between gap-3">
+                    <span className="text-left">Model Timeout (ms)</span>
+                    <NumberInput
+                      value={modelTimeout}
+                      onChange={(val) =>
+                        handleUpdate({
+                          modelTimeout: val,
+                        })
+                      }
+                      min={100}
+                      max={5000}
+                    />
+                  </label>
+                  <label className="flex items-center justify-between gap-3">
+                    <span className="text-left">Model Debounce (ms)</span>
+                    <NumberInput
+                      value={debounceDelay}
+                      onChange={(val) =>
+                        handleUpdate({
+                          debounceDelay: val,
+                        })
+                      }
+                      min={0}
+                      max={2500}
+                    />
+                  </label>
                   <label className="flex items-center justify-between gap-3">
                     <span className="text-left">Font Size</span>
                     <NumberInput
