From 489eb4005780046a4f87719e5a30ae4449958fc2 Mon Sep 17 00:00:00 2001
From: neuronull <9162534+neuronull@users.noreply.github.com>
Date: Fri, 21 Nov 2025 14:02:22 -0700
Subject: [PATCH] Desktop Autotype fix IPC error handling (#17332)

* Desktop Autotype fix IPC error handling

* TS lint

* sweep sweep: fix unecessary member name qualifier
---
 .../src/autofill/main/main-desktop-autotype.service.ts |  9 +++++++++
 apps/desktop/src/autofill/models/autotype-errors.ts    |  8 ++++++++
 apps/desktop/src/autofill/preload.ts                   | 10 ++++++----
 3 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 apps/desktop/src/autofill/models/autotype-errors.ts

diff --git a/apps/desktop/src/autofill/main/main-desktop-autotype.service.ts b/apps/desktop/src/autofill/main/main-desktop-autotype.service.ts
index e33ab0d4c3b..4dcf05a4220 100644
--- a/apps/desktop/src/autofill/main/main-desktop-autotype.service.ts
+++ b/apps/desktop/src/autofill/main/main-desktop-autotype.service.ts
@@ -5,6 +5,7 @@ import { LogService } from "@bitwarden/logging";
 
 import { WindowMain } from "../../main/window.main";
 import { stringIsNotUndefinedNullAndEmpty } from "../../utils";
+import { AutotypeMatchError } from "../models/autotype-errors";
 import { AutotypeVaultData } from "../models/autotype-vault-data";
 import { AutotypeKeyboardShortcut } from "../models/main-autotype-keyboard-shortcut";
 
@@ -56,6 +57,14 @@ export class MainDesktopAutotypeService {
         this.doAutotype(vaultData, this.autotypeKeyboardShortcut.getArrayFormat());
       }
     });
+
+    ipcMain.on("autofill.completeAutotypeError", (_event, matchError: AutotypeMatchError) => {
+      this.logService.debug(
+        "autofill.completeAutotypeError",
+        "No match for window: " + matchError.windowTitle,
+      );
+      this.logService.error("autofill.completeAutotypeError", matchError.errorMessage);
+    });
   }
 
   disableAutotype() {
diff --git a/apps/desktop/src/autofill/models/autotype-errors.ts b/apps/desktop/src/autofill/models/autotype-errors.ts
new file mode 100644
index 00000000000..9e59b102302
--- /dev/null
+++ b/apps/desktop/src/autofill/models/autotype-errors.ts
@@ -0,0 +1,8 @@
+/**
+ * This error is surfaced when there is no matching
+ * vault item found.
+ */
+export interface AutotypeMatchError {
+  windowTitle: string;
+  errorMessage: string;
+}
diff --git a/apps/desktop/src/autofill/preload.ts b/apps/desktop/src/autofill/preload.ts
index 22b5cdf9463..e839ac223b7 100644
--- a/apps/desktop/src/autofill/preload.ts
+++ b/apps/desktop/src/autofill/preload.ts
@@ -5,6 +5,7 @@ import type { autofill } from "@bitwarden/desktop-napi";
 import { Command } from "../platform/main/autofill/command";
 import { RunCommandParams, RunCommandResult } from "../platform/main/autofill/native-autofill.main";
 
+import { AutotypeMatchError } from "./models/autotype-errors";
 import { AutotypeVaultData } from "./models/autotype-vault-data";
 
 export default {
@@ -141,7 +142,7 @@ export default {
     ipcRenderer.on(
       "autofill.listenAutotypeRequest",
       (
-        event,
+        _event,
         data: {
           windowTitle: string;
         },
@@ -150,10 +151,11 @@ export default {
 
         fn(windowTitle, (error, vaultData) => {
           if (error) {
-            ipcRenderer.send("autofill.completeError", {
+            const matchError: AutotypeMatchError = {
               windowTitle,
-              error: error.message,
-            });
+              errorMessage: error.message,
+            };
+            ipcRenderer.send("autofill.completeAutotypeError", matchError);
             return;
           }
           if (vaultData !== null) {