@sourcegraph/cody-web 0.38.0 → 0.40.0

package/dist/{util-Ci-ROool.mjs → util-DSBgjmTR.mjs}

@@ -1,4 +1,4 @@
-import { dm as commonjsGlobal } from "./vscode-shim-CdmSM8Q0.mjs";
+import { dm as commonjsGlobal } from "./vscode-shim-BM22pmQn.mjs";
 function _mergeNamespaces(n, m) {
   for (var i = 0; i < m.length; i++) {
     const e = m[i];

package/dist/{vscode-shim-CdmSM8Q0.mjs → vscode-shim-BM22pmQn.mjs}

@@ -5980,14 +5980,32 @@ class OAuthCredential {
     const result = await refreshOAuthToken(endpoint, refreshToken);
     if (!(result == null ? void 0 : result.accessToken)) return void 0;
     if (result.refreshToken) {
-      await ((_a3 = clientSecrets.storeRefreshToken) == null ? void 0 : _a3.call(clientSecrets, endpoint, result.refreshToken));
+      try {
+        await ((_a3 = clientSecrets.storeRefreshToken) == null ? void 0 : _a3.call(clientSecrets, endpoint, result.refreshToken));
+      } catch (error2) {
+        logError(
+          "OAuthCredential",
+          "Failed to store new refresh token - user must re-authenticate",
+          { error: error2 }
+        );
+        throw error2;
+      }
     }
-    if (result.expiresIn) {
-      const expiresAt = Date.now() + result.expiresIn * 1e3;
-      await ((_b2 = clientSecrets.storeTokenExpiresAt) == null ? void 0 : _b2.call(clientSecrets, endpoint, expiresAt));
+    try {
+      if (result.expiresIn) {
+        const expiresAt = Date.now() + result.expiresIn * 1e3;
+        await ((_b2 = clientSecrets.storeTokenExpiresAt) == null ? void 0 : _b2.call(clientSecrets, endpoint, expiresAt));
+      }
+    } catch (error2) {
+      logError("OAuthCredential", "Failed to store token expiry", { error: error2 });
     }
-    if (result.accessToken) {
-      await ((_c2 = clientSecrets.storeToken) == null ? void 0 : _c2.call(clientSecrets, endpoint, result.accessToken, "oauth"));
+    try {
+      if (result.accessToken) {
+        await ((_c2 = clientSecrets.storeToken) == null ? void 0 : _c2.call(clientSecrets, endpoint, result.accessToken, "oauth"));
+      }
+    } catch (error2) {
+      logError("OAuthCredential", "Failed to store access token", { error: error2 });
+      throw error2;
     }
     return result.accessToken;
   }
@@ -5996,7 +6014,7 @@ class OAuthCredential {
     const refreshToken = await ((_b2 = (_a3 = this.clientSecrets).getRefreshToken) == null ? void 0 : _b2.call(_a3, this.endpoint));
     const expiresAt = await ((_d2 = (_c2 = this.clientSecrets).getTokenExpiresAt) == null ? void 0 : _d2.call(_c2, this.endpoint));
     let token = await ((_f2 = (_e2 = this.clientSecrets).getToken) == null ? void 0 : _f2.call(_e2, this.endpoint));
-    if (!token || this.needsRefresh(expiresAt, refreshToken)) {
+    if (!token || refreshToken && this.needsRefresh(expiresAt)) {
       if (!this.refreshInFlight && refreshToken) {
         this.refreshInFlight = OAuthCredential.refreshAndStore(
           this.endpoint,
@@ -6008,16 +6026,20 @@ class OAuthCredential {
       }
       const refreshPromise = this.refreshInFlight;
       if (refreshPromise) {
-        token = await refreshPromise;
-        if (!token) {
+        const refreshedToken = await refreshPromise;
+        if (refreshedToken) {
+          token = refreshedToken;
+          this.error = null;
+        } else if (!token) {
           if (!this.error) {
             externalAuthRefresh.next();
           }
           this.error = new OAuthProviderError("An error occurred while refreshing the token");
           throw this.error;
+        } else {
+          this.error = null;
         }
-        this.error = null;
-      } else {
+      } else if (!token) {
         if (!this.error) {
           externalAuthRefresh.next();
         }
@@ -6030,8 +6052,8 @@ class OAuthCredential {
     };
     return headers;
   }
-  needsRefresh(expiresAt, refreshToken) {
-    if (!expiresAt || !refreshToken) {
+  needsRefresh(expiresAt) {
+    if (!expiresAt) {
       return true;
     }
     const now2 = Date.now();
@@ -6049,7 +6071,7 @@ async function executeCommand(cmd) {
     throw new Error("Command execution is only supported in Node.js environments");
   }
   const { exec: exec2 } = await Promise.resolve().then(() => child_process);
-  const { promisify: promisify2 } = await import("./util-Ci-ROool.mjs").then((n) => n.u);
+  const { promisify: promisify2 } = await import("./util-DSBgjmTR.mjs").then((n) => n.u);
   const execAsync = promisify2(exec2);
   const command = cmd.commandLine.join(" ");
   const { stdout } = await execAsync(command, {
@@ -27703,15 +27725,27 @@ function toLightweightChatTranscript(transcript) {
       return !!((_a4 = i2.assistantMessage) == null ? void 0 : _a4.model);
     }
   )) == null ? void 0 : _b2.assistantMessage;
+  const MAX_SEARCHABLE_LENGTH = 2e3;
+  const title = transcript.chatTitle ?? "";
+  const message = (firstHumanMessage == null ? void 0 : firstHumanMessage.text) ?? "";
+  const fullSearchableText = title && message && !message.startsWith(title) ? `${title} ${message}` : title || message;
+  const searchableText = fullSearchableText.slice(0, MAX_SEARCHABLE_LENGTH).toLowerCase();
   return {
     id: transcript.id,
-    chatTitle: transcript.chatTitle || (firstHumanMessage == null ? void 0 : firstHumanMessage.text),
+    chatTitle: transcript.chatTitle ?? truncateText(firstHumanMessage == null ? void 0 : firstHumanMessage.text),
     lastInteractionTimestamp: transcript.lastInteractionTimestamp,
     firstHumanMessageText: firstHumanMessage == null ? void 0 : firstHumanMessage.text,
     model: lastAssistantMessage == null ? void 0 : lastAssistantMessage.model,
-    mode: (lastAssistantMessage == null ? void 0 : lastAssistantMessage.intent) ?? "chat"
+    mode: (lastAssistantMessage == null ? void 0 : lastAssistantMessage.intent) ?? "chat",
+    searchableText
   };
 }
+function truncateText(text, maxLength = 25) {
+  var _a3;
+  const line = ((_a3 = text == null ? void 0 : text.trim()) == null ? void 0 : _a3.split("\n")[0]) ?? "";
+  if (!line) return "";
+  return line.length > maxLength ? `${line.slice(0, maxLength).trim()}...` : line;
+}
 const CODY_PASSTHROUGH_VSCODE_OPEN_COMMAND_ID = "_cody.vscode.open";
 function commandURIForVSCodeOpen(resource, range2) {
   return `command:${CODY_PASSTHROUGH_VSCODE_OPEN_COMMAND_ID}?${encodeURIComponent(
@@ -42394,7 +42428,7 @@ const camelCase$1 = /* @__PURE__ */ getDefaultExportFromCjs(camelCase_1);
 const $schema = "package.schema.json";
 const name = "cody-ai";
 const displayName = "Cody: AI Code Assistant";
-const version = "1.136.0";
+const version = "1.138.0";
 const publisher = "sourcegraph";
 const license = "Apache-2.0";
 const icon = "resources/sourcegraph.png";
@@ -42928,7 +42962,21 @@ const contributes = {
     },
     {
       command: "cody.debug.auth.setInvalidRefreshToken",
-      title: "[Dev] Set Invalid Refesh Token",
+      title: "[Dev] Set Invalid Refresh Token",
+      category: "Cody Debug",
+      group: "Debug",
+      enablement: "cody.activated && cody.devOrTest"
+    },
+    {
+      command: "cody.debug.auth.clearRefreshToken",
+      title: "[Dev] Clear Refresh Token Only",
+      category: "Cody Debug",
+      group: "Debug",
+      enablement: "cody.activated && cody.devOrTest"
+    },
+    {
+      command: "cody.debug.auth.simulateRefreshStorageFailure",
+      title: "[Dev] Simulate Refresh Storage Failure",
       category: "Cody Debug",
       group: "Debug",
       enablement: "cody.activated && cody.devOrTest"
@@ -47219,32 +47267,33 @@ export {
   onDidChangeTextEditorSelection as g7,
   statSync as g8,
   copySync as g9,
+  child_process as gA,
   getOIDCConfiguration as ga,
   getOAuthClientId as gb,
   OAuthCredential as gc,
-  structuredPatch as gd,
-  capitalize$2 as ge,
-  InlineCompletionItem as gf,
-  createTwoFilesPatch as gg,
-  vsCodeMocks as gh,
-  metrics as gi,
-  _ as gj,
-  _baseGetTag as gk,
-  exec as gl,
-  getPlatform as gm,
-  CodeActionKind as gn,
-  createCodeSearchProvider as go,
-  formatRuleForPrompt as gp,
-  DecorationRangeBehavior as gq,
-  diffLines as gr,
-  CODY_SUPPORT_URL as gs,
-  CODY_DOC_URL as gt,
-  DISCORD_URL as gu,
-  VSCODE_CHANGELOG_URL as gv,
-  SG_CHANGELOG_URL as gw,
-  ACCOUNT_LIMITS_INFO_URL as gx,
-  ExtensionMode as gy,
-  child_process as gz,
+  refreshOAuthToken as gd,
+  structuredPatch as ge,
+  capitalize$2 as gf,
+  InlineCompletionItem as gg,
+  createTwoFilesPatch as gh,
+  vsCodeMocks as gi,
+  metrics as gj,
+  _ as gk,
+  _baseGetTag as gl,
+  exec as gm,
+  getPlatform as gn,
+  CodeActionKind as go,
+  createCodeSearchProvider as gp,
+  formatRuleForPrompt as gq,
+  DecorationRangeBehavior as gr,
+  diffLines as gs,
+  CODY_SUPPORT_URL as gt,
+  CODY_DOC_URL as gu,
+  DISCORD_URL as gv,
+  VSCODE_CHANGELOG_URL as gw,
+  SG_CHANGELOG_URL as gx,
+  ACCOUNT_LIMITS_INFO_URL as gy,
+  ExtensionMode as gz,
   DefaultEditCommands as h,
   isAbortError as i,
   dedupeWith as j,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sourcegraph/cody-web",
-  "version": "0.38.0",
+  "version": "0.40.0",
   "description": "Cody standalone web app",
   "license": "Apache-2.0",
   "repository": {
@@ -11,20 +11,29 @@
   "main": "dist/index.js",
   "types": "dist/lib/index.d.ts",
   "sideEffects": true,
-  "files": [
-    "dist/*"
-  ],
+  "files": ["dist/*"],
+  "scripts": {
+    "dev": "vite --mode development",
+    "dev:standalone": "CODY_WEB_DEMO_STANDALONE_MODE=true vite --mode development",
+    "build": "vite build --mode production && tsc --build",
+    "test": "vitest",
+    "build-ts": "tsc --build"
+  },
   "dependencies": {
     "@emotion/is-prop-valid": "^1.3.1"
   },
   "devDependencies": {
     "@openctx/vscode-lib": "^0.0.26",
+    "@sourcegraph/cody": "workspace:*",
+    "@sourcegraph/cody-shared": "workspace:*",
+    "@sourcegraph/prompt-editor": "workspace:*",
     "@types/lodash": "4.14.195",
     "@types/vscode": "^1.92.0",
     "@vitejs/plugin-react-swc": "^3.6.0",
     "@vscode/codicons": "^0.0.35",
     "buffer": "^6.0.3",
     "classnames": "^2.5.1",
+    "cody-ai": "workspace:*",
     "events": "^3.3.0",
     "idb": "^8.0.0",
     "lodash": "4.17.21",
@@ -37,17 +46,6 @@
     "util": "^0.12.5",
     "vite-bundle-analyzer": "^0.10.5",
     "vite-plugin-svgr": "^4.2.0",
-    "vscode-uri": "^3.0.8",
-    "@sourcegraph/cody": "5.5.23",
-    "@sourcegraph/cody-shared": "0.0.10",
-    "@sourcegraph/prompt-editor": "0.0.1",
-    "cody-ai": "1.136.0"
-  },
-  "scripts": {
-    "dev": "vite --mode development",
-    "dev:standalone": "CODY_WEB_DEMO_STANDALONE_MODE=true vite --mode development",
-    "build": "vite build --mode production && tsc --build",
-    "test": "vitest",
-    "build-ts": "tsc --build"
+    "vscode-uri": "^3.0.8"
   }
-}
+}

package/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2022 Sourcegraph, Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.