Fix clear githubuser (#2091)

e2e-tests/github.spec.ts

@@ -143,3 +143,36 @@ test("create and sync to existing repo - custom branch", async ({ po }) => {
     operation: "create",
   });
 });
+
+test("github clear integration settings", async ({ po }) => {
+  await po.setUp({ autoApprove: true });
+  await po.sendPrompt("tc=basic");
+
+  await po.getTitleBarAppNameButton().click();
+  await po.githubConnector.connect();
+  await expect(po.githubConnector.getCreateNewRepoModeButton()).toBeVisible();
+
+  // Capture settings before disconnecting
+
+  await po.clickOpenInChatButton();
+  // Make sure we are committing so that githubUser.email is getting set.
+  await po.sendPrompt("tc=write-index");
+  const beforeSettings = po.captureSettings();
+
+  // Navigate to settings
+  await po.goToSettingsTab();
+
+  // Verify the "Disconnect from GitHub" button is visible (meaning we're connected)
+  const disconnectButton = po.page.getByRole("button", {
+    name: "Disconnect from GitHub",
+  });
+
+  // Click disconnect
+  await disconnectButton.click();
+
+  // Verify the button is no longer visible (component returns null when not connected)
+  await expect(disconnectButton).not.toBeVisible();
+
+  // Snapshot only the settings that changed (GitHub token/user removed)
+  po.snapshotSettingsDelta(beforeSettings);
+});

e2e-tests/helpers/test_helper.ts

@@ -1034,6 +1034,63 @@ export class PageObject {
     expect(sanitizedSettingsContent).toMatchSnapshot();
   }
 
+  /**
+   * Captures the current settings state for later comparison.
+   * Use with `snapshotSettingsDelta()` to snapshot only what changed.
+   */
+  captureSettings(): Record<string, unknown> {
+    const settingsPath = path.join(this.userDataDir, "user-settings.json");
+    const settingsContent = fs.readFileSync(settingsPath, "utf-8");
+    return JSON.parse(settingsContent);
+  }
+
+  /**
+   * Snapshots only the differences between the current settings and a previously captured state.
+   * Output is in git diff style for easy reading.
+   */
+  snapshotSettingsDelta(beforeSettings: Record<string, unknown>) {
+    const afterSettings = this.captureSettings();
+
+    const diffLines: string[] = [];
+
+    const allKeys = new Set([
+      ...Object.keys(beforeSettings),
+      ...Object.keys(afterSettings),
+    ]);
+
+    // Sort keys for deterministic output
+    const sortedKeys = Array.from(allKeys).sort();
+
+    for (const key of sortedKeys) {
+      const beforeValue = beforeSettings[key];
+      const afterValue = afterSettings[key];
+      const beforeExists = key in beforeSettings;
+      const afterExists = key in afterSettings;
+
+      // Format value with diff marker on each line for multiline values
+      const formatValue = (val: unknown, marker: "+" | "-") => {
+        const lines = JSON.stringify(val, null, 2).split("\n");
+        return lines
+          .map((line, i) => (i === 0 ? line : `${marker}   ${line}`))
+          .join("\n");
+      };
+
+      if (!beforeExists && afterExists) {
+        // Added
+        diffLines.push(`+ "${key}": ${formatValue(afterValue, "+")}`);
+      } else if (beforeExists && !afterExists) {
+        // Removed
+        diffLines.push(`- "${key}": ${formatValue(beforeValue, "-")}`);
+      } else if (JSON.stringify(beforeValue) !== JSON.stringify(afterValue)) {
+        // Changed
+        diffLines.push(`- "${key}": ${formatValue(beforeValue, "-")}`);
+        diffLines.push(`+ "${key}": ${formatValue(afterValue, "+")}`);
+      }
+    }
+
+    expect(diffLines.join("\n")).toMatchSnapshot();
+  }
+
   async toggleAutoUpdate() {
     await this.page.getByRole("switch", { name: "Auto-update" }).click();
   }

e2e-tests/snapshots/github.spec.ts_github-clear-integration-settings-1.txt

+- "githubAccessToken": {
+-     "value": "fake_access_token_12345",
+-     "encryptionType": "plaintext"
+-   }
+- "githubUser": {
+-     "email": "testuser@example.com"
+-   }
\ No newline at end of file

src/components/GitHubIntegration.tsx

@@ -13,6 +13,7 @@ export function GitHubIntegration() {
     try {
       const result = await updateSettings({
         githubAccessToken: undefined,
+        githubUser: undefined,
       });
       if (result) {
         showSuccess("Successfully disconnected from GitHub");