From 17386a36eb55fd5a80239357aa3b8219fc1297d3 Mon Sep 17 00:00:00 2001
From: Oleg Samarin <osamarin@openintegration.inc>
Date: Fri, 16 Oct 2026 15:01:34 +0300
Subject: [PATCH 1/3] Fixed "OpenAI-compatible API" connection type being reset
 to "Claude-compatible API" on the Default profile
 (https://github.com/nbplugins/NetbeansPluginClaudeCodeGui/issues/191)

Resolves: #191

The Default profile was rebuilt from stored settings by copying fields one
by one, and the openaiProxy flag was not copied, so the connection type was
re-derived as OTHER_API. The connection type is now stored explicitly as
connectionType; the Default profile is deserialised as a whole like named
profiles. Settings written by older versions (legacy openaiProxy /
openaiSubscription flags, no connectionType) are still read and the type is
derived from them; settings are always written in the new format.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 CHANGELOG.md                                  |   1 +
 pom.xml                                       |   2 +-
 .../claudecodegui/process/ClaudeProcess.java  |  10 +-
 .../claudecodegui/settings/ClaudeProfile.java |  95 +++++++-----
 .../settings/ClaudeProfileStore.java          |  40 +++--
 .../settings/ClaudeProfilesPanel.java         |  22 +--
 .../chatgptauth/ChatGptTokenManagerTest.java  |   4 +-
 .../ClaudeProfileStoreConnectionTypeTest.java | 140 ++++++++++++++++++
 .../settings/ClaudeProfileStoreTest.java      |  45 ++++++
 .../settings/ClaudeProfileTest.java           |  62 ++++----
 .../ClaudeProfilesPanelFlushTest.java         |   9 +-
 11 files changed, 306 insertions(+), 124 deletions(-)
 create mode 100644 src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfileStoreConnectionTypeTest.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f27d061..680879e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Fixed "OpenAI-compatible API" connection type being reset to "Claude-compatible API" on the Default profile (https://github.com/nbplugins/NetbeansPluginClaudeCodeGui/issues/191)
 - Improved the IDE log (messages.log): per-request and per-click diagnostics (tab label polling, PreToolUse hooks with file contents, diff tabs, choice menus, permission prompts) are now written only when debug logging is enabled, so the log is no longer flooded and no longer contains edited code
 
 # 1.3.28 (2026-10-07)
diff --git a/pom.xml b/pom.xml
index ca0c1a1..b949b10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.nbplugins</groupId>
     <artifactId>netbeans-plugin-claude-code-gui</artifactId>
-    <version>1.3.53-SNAPSHOT</version>
+    <version>1.3.54-SNAPSHOT</version>
     <packaging>nbm</packaging>
     <name>Netbeans Plugin Claude Code GUI</name>
     <description>NetBeans plugin that provides a GUI for Claude Code CLI — run claude code sessions directly inside the IDE.</description>
diff --git a/src/main/java/io/github/nbplugins/claudecodegui/process/ClaudeProcess.java b/src/main/java/io/github/nbplugins/claudecodegui/process/ClaudeProcess.java
index 137ef3c..d5f9d0a 100644
--- a/src/main/java/io/github/nbplugins/claudecodegui/process/ClaudeProcess.java
+++ b/src/main/java/io/github/nbplugins/claudecodegui/process/ClaudeProcess.java
@@ -161,7 +161,7 @@ public PtyProcess start(String workingDir, ClaudeProfile profile, String extraCl
 
         // OpenAI proxy: register session and inject ANTHROPIC_BASE_URL pointing to internal proxy
         if (profile != null
-                && profile.computeConnectionType() == ClaudeProfile.ConnectionType.OPENAI_PROXY) {
+                && profile.getConnectionType() == ClaudeProfile.ConnectionType.OPENAI_PROXY) {
             ClaudeCodeStatusService mcpSvc = Lookup.getDefault().lookup(ClaudeCodeStatusService.class);
             if (mcpSvc != null && mcpSvc.isServerRunning()) {
                 String uuid = UUID.randomUUID().toString();
@@ -191,7 +191,7 @@ public PtyProcess start(String workingDir, ClaudeProfile profile, String extraCl
         // ChatGPT subscription: pre-emptively refresh the OAuth token, register the
         // session, and inject ANTHROPIC_BASE_URL pointing to the internal Codex proxy.
         if (profile != null
-                && profile.computeConnectionType() == ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION) {
+                && profile.getConnectionType() == ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION) {
             ClaudeCodeStatusService mcpSvc = Lookup.getDefault().lookup(ClaudeCodeStatusService.class);
             if (mcpSvc != null && mcpSvc.isServerRunning()) {
                 try {
@@ -219,9 +219,9 @@ public PtyProcess start(String workingDir, ClaudeProfile profile, String extraCl
         }
 
         boolean apiKeyHelper = profile != null && !profile.getApiKey().isBlank() && profile.getBaseUrl().isBlank()
-                && profile.computeConnectionType() != ClaudeProfile.ConnectionType.OPENAI_PROXY
-                && profile.computeConnectionType() != ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION;
-        LOG.info("Starting Claude: profile=" + (profile != null ? profile.getName() + " (" + profile.computeConnectionType() + ")" : "Default")
+                && profile.getConnectionType() != ClaudeProfile.ConnectionType.OPENAI_PROXY
+                && profile.getConnectionType() != ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION;
+        LOG.info("Starting Claude: profile=" + (profile != null ? profile.getName() + " (" + profile.getConnectionType() + ")" : "Default")
                 + ", apiKeyHelper=" + (apiKeyHelper ? "SET" : "NOT SET")
                 + ", ANTHROPIC_AUTH_TOKEN=" + (!env.getOrDefault("ANTHROPIC_AUTH_TOKEN", "").isBlank() ? "SET" : "NOT SET")
                 + ", ANTHROPIC_BASE_URL=" + env.getOrDefault("ANTHROPIC_BASE_URL", "(not set)")
diff --git a/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfile.java b/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfile.java
index de70b45..446229c 100644
--- a/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfile.java
+++ b/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfile.java
@@ -1,6 +1,7 @@
 package io.github.nbplugins.claudecodegui.settings;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonSetter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -17,9 +18,13 @@
  * programmatically.
  *
  * <h2>Connection type</h2>
- * {@link ConnectionType} is <em>not</em> stored — it is derived from the
- * credential fields by {@link #computeConnectionType()}:
+ * The {@link ConnectionType} is stored explicitly (see {@link #getConnectionType()}).
+ * Settings written by older plugin versions have no stored type (only the legacy
+ * {@code openaiProxy} / {@code openaiSubscription} flags and the credential fields);
+ * for them the type is derived on read:
  * <ul>
+ *   <li>{@code openaiSubscription} flag → {@link ConnectionType#OPENAI_SUBSCRIPTION}</li>
+ *   <li>{@code openaiProxy} flag → {@link ConnectionType#OPENAI_PROXY}</li>
  *   <li>non-blank {@code apiKey} + non-blank {@code baseUrl} → {@link ConnectionType#OTHER_API}</li>
  *   <li>non-blank {@code apiKey} → {@link ConnectionType#CLAUDE_API}</li>
  *   <li>non-blank {@code token} → {@link ConnectionType#SUBSCRIPTION}</li>
@@ -40,7 +45,8 @@ public final class ClaudeProfile {
 
     /**
      * Describes how a profile authenticates with Claude / the AI backend.
-     * Derived at runtime from credential fields; never persisted.
+     * Persisted by name; for settings written by older versions derived from
+     * the legacy flags and credential fields.
      */
     public enum ConnectionType {
         /** Claude manages its own authentication (OAuth flow). No env vars injected. */
@@ -189,20 +195,23 @@ public enum ProxyMode {
     private String storageDir;
 
     /**
-     * When {@code true}, this profile uses the internal OpenAI-compatible proxy.
-     * {@link #computeConnectionType()} returns {@link ConnectionType#OPENAI_PROXY}.
-     * {@link #baseUrl} and {@link #apiKey} hold the OpenAI endpoint URL and API key.
-     */
-    private boolean openaiProxy;
-
-    /**
-     * When {@code true}, this profile uses a ChatGPT Plus/Pro/Team subscription
-     * (OAuth login) routed through the internal proxy to OpenAI's Codex backend.
-     * {@link #computeConnectionType()} returns {@link ConnectionType#OPENAI_SUBSCRIPTION}.
-     * The {@code chatgpt*} fields hold the OAuth token set obtained via
+     * The connection type chosen for this profile. {@code null} only for settings written
+     * by older plugin versions, which did not store it; {@link #getConnectionType()} then
+     * derives it from {@link #legacyOpenaiProxy}, {@link #legacyOpenaiSubscription} and the
+     * credential fields.
+     *
+     * <p>{@link ConnectionType#OPENAI_PROXY}: {@link #baseUrl} and {@link #apiKey} hold the
+     * OpenAI endpoint URL and API key. {@link ConnectionType#OPENAI_SUBSCRIPTION}: the
+     * {@code chatgpt*} fields hold the OAuth token set obtained via
      * {@code io.github.nbplugins.claudecodegui.chatgptauth.ChatGptOAuthClient}.
      */
-    private boolean openaiSubscription;
+    private ConnectionType connectionType;
+
+    /** Legacy flag from older settings ({@code openaiProxy}); read-only, never written. */
+    private boolean legacyOpenaiProxy;
+
+    /** Legacy flag from older settings ({@code openaiSubscription}); read-only, never written. */
+    private boolean legacyOpenaiSubscription;
 
     /**
      * ChatGPT OAuth access token. Short-lived (hours); refreshed automatically
@@ -324,16 +333,38 @@ public boolean isDefault() {
     }
 
     /**
-     * Computes the {@link ConnectionType} from the stored credential fields.
-     * This value is intentionally not persisted.
+     * Returns the connection type of this profile: the stored one, or, for settings written
+     * by older plugin versions that did not store it, the type derived from the legacy flags
+     * and credential fields.
      *
-     * @return the connection type inferred from current field values
+     * @return the connection type; never {@code null}
      */
-    public ConnectionType computeConnectionType() {
-        if (openaiSubscription) {
+    public ConnectionType getConnectionType() {
+        return connectionType != null ? connectionType : deriveLegacyConnectionType();
+    }
+
+    /**
+     * Sets the connection type. {@code null} means "derive from legacy fields".
+     *
+     * @param connectionType the connection type
+     */
+    public void setConnectionType(ConnectionType connectionType) {
+        this.connectionType = connectionType;
+    }
+
+    /** Legacy flag accepted when reading settings written by older plugin versions. */
+    @JsonSetter("openaiProxy")
+    private void readLegacyOpenaiProxy(boolean value) { this.legacyOpenaiProxy = value; }
+
+    /** Legacy flag accepted when reading settings written by older plugin versions. */
+    @JsonSetter("openaiSubscription")
+    private void readLegacyOpenaiSubscription(boolean value) { this.legacyOpenaiSubscription = value; }
+
+    private ConnectionType deriveLegacyConnectionType() {
+        if (legacyOpenaiSubscription) {
             return ConnectionType.OPENAI_SUBSCRIPTION;
         }
-        if (openaiProxy) {
+        if (legacyOpenaiProxy) {
             return ConnectionType.OPENAI_PROXY;
         }
         if (!isBlank(apiKey)) {
@@ -351,7 +382,7 @@ public ConnectionType computeConnectionType() {
      *
      * <p>Variables are added in this order (later entries win):
      * <ol>
-     *   <li>Auth variables (based on {@link #computeConnectionType()})</li>
+     *   <li>Auth variables (based on {@link #getConnectionType()})</li>
      *   <li>Proxy variables (based on {@link #proxyMode})</li>
      *   <li>{@link #extraEnvVars} (in list order)</li>
      * </ol>
@@ -366,7 +397,7 @@ public Map<String, String> toEnvVars() {
         Map<String, String> env = new HashMap<>();
 
         // Auth
-        switch (computeConnectionType()) {
+        switch (getConnectionType()) {
             case SUBSCRIPTION  -> env.put("CLAUDE_CODE_OAUTH_TOKEN", blankToEmpty(token));
             case CLAUDE_API    -> { /* API key is written to settings.local.json as apiKeyHelper */ }
             case OTHER_API     -> {
@@ -695,7 +726,7 @@ public void setModelOrder(List<String> ids) {
      * potentially harmful) for Anthropic's own connections.
      */
     private boolean modelAliasesApply() {
-        ConnectionType ct = computeConnectionType();
+        ConnectionType ct = getConnectionType();
         return ct == ConnectionType.OTHER_API || ct == ConnectionType.OPENAI_PROXY
                 || ct == ConnectionType.OPENAI_SUBSCRIPTION;
     }
@@ -788,18 +819,6 @@ public ClaudeProfile withStorageDir(String storageDir) {
         return this;
     }
 
-    /** Returns {@code true} if this profile uses the internal OpenAI-compatible proxy. */
-    public boolean isOpenaiProxy() { return openaiProxy; }
-
-    /** Sets whether this profile uses the internal OpenAI-compatible proxy. */
-    public void setOpenaiProxy(boolean openaiProxy) { this.openaiProxy = openaiProxy; }
-
-    /** Returns {@code true} if this profile uses a ChatGPT subscription (OAuth) via the internal proxy. */
-    public boolean isOpenaiSubscription() { return openaiSubscription; }
-
-    /** Sets whether this profile uses a ChatGPT subscription (OAuth) via the internal proxy. */
-    public void setOpenaiSubscription(boolean openaiSubscription) { this.openaiSubscription = openaiSubscription; }
-
     /** Returns the ChatGPT OAuth access token; blank when not signed in. */
     public String getChatgptAccessToken() { return blankToEmpty(chatgptAccessToken); }
 
@@ -843,7 +862,7 @@ public boolean isSignedIntoChatgpt() {
 
     /**
      * Clears all ChatGPT OAuth token fields (access token, refresh token,
-     * account id, expiry, email), leaving {@link #openaiSubscription} untouched.
+     * account id, expiry, email), leaving the {@link #getConnectionType() connection type} untouched.
      * Used by the "Sign out" action and when switching away from the
      * {@link ConnectionType#OPENAI_SUBSCRIPTION} connection type.
      */
@@ -862,7 +881,7 @@ public void clearChatgptAuth() {
     @Override
     public String toString() {
         return "ClaudeProfile{id='" + getId() + "', name='" + getName()
-                + "', connectionType=" + computeConnectionType()
+                + "', connectionType=" + getConnectionType()
                 + ", proxyMode=" + getProxyMode() + "}";
     }
 
diff --git a/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfileStore.java b/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfileStore.java
index 4d02393..8986688 100644
--- a/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfileStore.java
+++ b/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfileStore.java
@@ -38,7 +38,8 @@ public final class ClaudeProfileStore {
     private static final String KEY_DEFAULT_PROFILE = "defaultProfile";
 
     private static final ObjectMapper MAPPER = new ObjectMapper()
-            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+            .enable(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL);
     private static final TypeReference<List<ClaudeProfile>> LIST_TYPE =
             new TypeReference<>() {};
 
@@ -64,27 +65,7 @@ public static List<ClaudeProfile> getProfiles() {
                 .get(KEY_DEFAULT_PROFILE, null);
         if (defaultJson != null) {
             try {
-                ClaudeProfile stored = MAPPER.readValue(defaultJson, ClaudeProfile.class);
-                def.setToken(stored.getToken());
-                def.setApiKey(stored.getApiKey());
-                def.setBaseUrl(stored.getBaseUrl());
-                def.setProxyMode(stored.getProxyMode());
-                def.setHttpProxy(stored.getHttpProxy());
-                def.setHttpsProxy(stored.getHttpsProxy());
-                def.setNoProxy(stored.getNoProxy());
-                def.setExtraEnvVars(stored.getExtraEnvVars());
-                def.setExtraCliArgs(stored.getExtraCliArgs());
-                def.setModelAliases(stored.getModelAliases());
-                def.setCustomModels(stored.getCustomModels());
-                def.setModelOrder(stored.getModelOrder());
-                def.setExplicitPromptCachingModels(stored.getExplicitPromptCachingModels());
-                def.setStorageDir(stored.getStorageDir());
-                def.setOpenaiSubscription(stored.isOpenaiSubscription());
-                def.setChatgptAccessToken(stored.getChatgptAccessToken());
-                def.setChatgptRefreshToken(stored.getChatgptRefreshToken());
-                def.setChatgptAccountId(stored.getChatgptAccountId());
-                def.setChatgptTokenExpiresAt(stored.getChatgptTokenExpiresAt());
-                def.setChatgptEmail(stored.getChatgptEmail());
+                def = parseDefaultProfile(defaultJson);
             } catch (Exception e) {
                 LOG.warning("Could not parse stored Default profile JSON, using defaults. Cause: " + e);
                 def.setExtraCliArgs(ClaudeCodePreferences.getDefaultExtraCliArgs());
@@ -108,6 +89,21 @@ public static List<ClaudeProfile> getProfiles() {
         return result;
     }
 
+    /**
+     * Parses a stored Default profile. The whole profile is deserialised (so no field can be
+     * forgotten), then the identity is forced to the built-in Default.
+     *
+     * @param json the stored Default profile JSON, in the current or an older plugin format
+     * @return the Default profile
+     * @throws java.io.IOException if the JSON cannot be parsed
+     */
+    static ClaudeProfile parseDefaultProfile(String json) throws java.io.IOException {
+        ClaudeProfile def = MAPPER.readValue(json, ClaudeProfile.class);
+        def.setId(ClaudeProfile.DEFAULT_ID);
+        def.setName(ClaudeProfile.DEFAULT_NAME);
+        return def;
+    }
+
     /**
      * Returns the preference-backed Default profile.
      *
diff --git a/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanel.java b/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanel.java
index d5e63e3..7d7b2c1 100644
--- a/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanel.java
+++ b/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanel.java
@@ -753,26 +753,22 @@ private void flushFormToCurrentProfile() {
             p.setToken(new String(tokenField.getPassword()));
             p.setApiKey("");
             p.setBaseUrl("");
-            p.setOpenaiProxy(false);
-            p.setOpenaiSubscription(false);
+            p.setConnectionType(ClaudeProfile.ConnectionType.SUBSCRIPTION);
         } else if (rbClaudeApi.isSelected()) {
             p.setApiKey(new String(apiKeyField.getPassword()));
             p.setToken("");
             p.setBaseUrl("");
-            p.setOpenaiProxy(false);
-            p.setOpenaiSubscription(false);
+            p.setConnectionType(ClaudeProfile.ConnectionType.CLAUDE_API);
         } else if (rbOtherApi.isSelected()) {
             p.setApiKey(new String(apiKeyField.getPassword()));
             p.setBaseUrl(baseUrlField.getText().trim());
             p.setToken("");
-            p.setOpenaiProxy(false);
-            p.setOpenaiSubscription(false);
+            p.setConnectionType(ClaudeProfile.ConnectionType.OTHER_API);
         } else if (rbOpenAIProxy.isSelected()) {
             p.setApiKey(new String(apiKeyField.getPassword()));
             p.setBaseUrl(baseUrlField.getText().trim());
             p.setToken("");
-            p.setOpenaiProxy(true);
-            p.setOpenaiSubscription(false);
+            p.setConnectionType(ClaudeProfile.ConnectionType.OPENAI_PROXY);
         } else if (rbChatgptSubscription.isSelected()) {
             // chatgpt* token fields are written directly by the sign-in/sign-out button
             // handlers, not by this text-field flush — they are opaque credentials, not
@@ -780,14 +776,12 @@ private void flushFormToCurrentProfile() {
             p.setToken("");
             p.setApiKey("");
             p.setBaseUrl("");
-            p.setOpenaiProxy(false);
-            p.setOpenaiSubscription(true);
+            p.setConnectionType(ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION);
         } else {
             p.setToken("");
             p.setApiKey("");
             p.setBaseUrl("");
-            p.setOpenaiProxy(false);
-            p.setOpenaiSubscription(false);
+            p.setConnectionType(ClaudeProfile.ConnectionType.CLAUDE_MANAGED);
         }
 
         // Clear model aliases/custom models when switching to a connection type that does not
@@ -843,7 +837,7 @@ private void loadProfileIntoForm(ClaudeProfile p) {
         refreshStorageDirField(p);
 
         // Connection type
-        ClaudeProfile.ConnectionType ct = p.computeConnectionType();
+        ClaudeProfile.ConnectionType ct = p.getConnectionType();
         tokenField.setText("");
         apiKeyField.setText("");
         baseUrlField.setText("");
@@ -1004,7 +998,7 @@ private void onModelAliases() {
             return i >= 0 ? i : Integer.MAX_VALUE;
         }));
         ModelAliasesDialog dlg;
-        if (p.computeConnectionType() == ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION) {
+        if (p.getConnectionType() == ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION) {
             ModelAliasesDialog.ModelFetcher fetcher = () -> {
                 String token = new io.github.nbplugins.claudecodegui.chatgptauth.ChatGptTokenManager()
                         .getValidAccessToken(p);
diff --git a/src/test/java/io/github/nbplugins/claudecodegui/chatgptauth/ChatGptTokenManagerTest.java b/src/test/java/io/github/nbplugins/claudecodegui/chatgptauth/ChatGptTokenManagerTest.java
index ec6d69c..9c98047 100644
--- a/src/test/java/io/github/nbplugins/claudecodegui/chatgptauth/ChatGptTokenManagerTest.java
+++ b/src/test/java/io/github/nbplugins/claudecodegui/chatgptauth/ChatGptTokenManagerTest.java
@@ -36,7 +36,7 @@ void setUp() {
 
     private static ClaudeProfile signedInProfile(Instant expiresAt) {
         ClaudeProfile p = ClaudeProfile.createNamed("chatgpt-test-" + System.nanoTime());
-        p.setOpenaiSubscription(true);
+        p.setConnectionType(ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION);
         p.setChatgptAccessToken("access-old");
         p.setChatgptRefreshToken("refresh-old");
         p.setChatgptAccountId("acct-1");
@@ -98,7 +98,7 @@ void getValidAccessToken_withinSkewOfExpiry_refreshesAndPersists() throws Except
     @Test
     void getValidAccessToken_noRecordedExpiry_refreshes() throws Exception {
         ClaudeProfile profile = ClaudeProfile.createNamed("chatgpt-test-noexp-" + System.nanoTime());
-        profile.setOpenaiSubscription(true);
+        profile.setConnectionType(ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION);
         profile.setChatgptAccessToken("access-old");
         profile.setChatgptRefreshToken("refresh-old");
         // chatgptTokenExpiresAt left blank
diff --git a/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfileStoreConnectionTypeTest.java b/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfileStoreConnectionTypeTest.java
new file mode 100644
index 0000000..95d5542
--- /dev/null
+++ b/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfileStoreConnectionTypeTest.java
@@ -0,0 +1,140 @@
+package io.github.nbplugins.claudecodegui.settings;
+
+import io.github.nbplugins.claudecodegui.settings.ClaudeProfile.ConnectionType;
+import java.util.List;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.openide.util.NbPreferences;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * Reading the connection type of the Default and of a custom profile from settings
+ * written by older plugin versions (no {@code connectionType}, legacy
+ * {@code openaiProxy}/{@code openaiSubscription} flags) and by the current version
+ * (explicit {@code connectionType}); issue #191.
+ *
+ * <p>Profiles are stored as JSON strings in {@link NbPreferences} and read back through
+ * {@link ClaudeProfileStore#getProfiles()}, the production loading path.
+ */
+class ClaudeProfileStoreConnectionTypeTest {
+
+    private static final String KEY_DEFAULT = "defaultProfile"; // ClaudeProfileStore.KEY_DEFAULT_PROFILE (private)
+
+    @BeforeEach
+    @AfterEach
+    void clean() {
+        NbPreferences.forModule(ClaudeProfileStore.class).remove(KEY_DEFAULT);
+        ClaudeProfileStore.clearProfiles();
+    }
+
+    /** {name, JSON body fields, expected type}. */
+    static Stream<Arguments> settings() {
+        return Stream.of(
+                // --- old settings: no connectionType, legacy flags + credentials ---
+                Arguments.of("old managed", "", ConnectionType.CLAUDE_MANAGED),
+                Arguments.of("old subscription", "\"token\":\"t\"", ConnectionType.SUBSCRIPTION),
+                Arguments.of("old claude api", "\"apiKey\":\"k\"", ConnectionType.CLAUDE_API),
+                Arguments.of("old other api", "\"apiKey\":\"k\",\"baseUrl\":\"https://x/v1\"",
+                        ConnectionType.OTHER_API),
+                Arguments.of("old openai proxy (issue 191)",
+                        "\"openaiProxy\":true,\"apiKey\":\"k\",\"baseUrl\":\"https://x/v1\"",
+                        ConnectionType.OPENAI_PROXY),
+                Arguments.of("old chatgpt subscription",
+                        "\"openaiSubscription\":true,\"chatgptAccessToken\":\"a\",\"chatgptRefreshToken\":\"r\"",
+                        ConnectionType.OPENAI_SUBSCRIPTION),
+                Arguments.of("old, both openai flags", "\"openaiProxy\":true,\"openaiSubscription\":true",
+                        ConnectionType.OPENAI_SUBSCRIPTION),
+                Arguments.of("old, apiKey and token", "\"apiKey\":\"k\",\"token\":\"t\"",
+                        ConnectionType.CLAUDE_API),
+                Arguments.of("old, explicit false flags", "\"openaiProxy\":false,\"openaiSubscription\":false",
+                        ConnectionType.CLAUDE_MANAGED),
+                // --- new settings: explicit connectionType ---
+                Arguments.of("new managed", "\"connectionType\":\"CLAUDE_MANAGED\"", ConnectionType.CLAUDE_MANAGED),
+                Arguments.of("new subscription", "\"connectionType\":\"SUBSCRIPTION\",\"token\":\"t\"",
+                        ConnectionType.SUBSCRIPTION),
+                Arguments.of("new claude api", "\"connectionType\":\"CLAUDE_API\",\"apiKey\":\"k\"",
+                        ConnectionType.CLAUDE_API),
+                Arguments.of("new other api",
+                        "\"connectionType\":\"OTHER_API\",\"apiKey\":\"k\",\"baseUrl\":\"https://x/v1\"",
+                        ConnectionType.OTHER_API),
+                Arguments.of("new openai proxy",
+                        "\"connectionType\":\"OPENAI_PROXY\",\"apiKey\":\"k\",\"baseUrl\":\"https://x/v1\"",
+                        ConnectionType.OPENAI_PROXY),
+                Arguments.of("new chatgpt subscription", "\"connectionType\":\"OPENAI_SUBSCRIPTION\"",
+                        ConnectionType.OPENAI_SUBSCRIPTION),
+                Arguments.of("new wins over stale legacy flags",
+                        "\"connectionType\":\"CLAUDE_API\",\"apiKey\":\"k\",\"openaiProxy\":true",
+                        ConnectionType.CLAUDE_API),
+                Arguments.of("unknown future type falls back to legacy derivation",
+                        "\"connectionType\":\"SOMETHING_NEW\",\"apiKey\":\"k\",\"baseUrl\":\"https://x/v1\"",
+                        ConnectionType.OTHER_API));
+    }
+
+    @ParameterizedTest(name = "Default: {0}")
+    @MethodSource("settings")
+    void defaultProfile_readsConnectionType(String name, String fields, ConnectionType expected) {
+        NbPreferences.forModule(ClaudeProfileStore.class).put(KEY_DEFAULT, "{" + fields + "}");
+
+        ClaudeProfile loaded = ClaudeProfileStore.getProfiles().get(0);
+
+        assertTrue(loaded.isDefault());
+        assertEquals("Default", loaded.getName());
+        assertEquals(expected, loaded.getConnectionType());
+    }
+
+    @ParameterizedTest(name = "Custom: {0}")
+    @MethodSource("settings")
+    void customProfile_readsConnectionType(String name, String fields, ConnectionType expected) {
+        String body = "\"name\":\"Work\",\"id\":\"Work\"" + (fields.isEmpty() ? "" : "," + fields);
+        NbPreferences.forModule(ClaudeProfileStore.class).put(ClaudeProfileStore.KEY_PROFILES, "[{" + body + "}]");
+
+        List<ClaudeProfile> profiles = ClaudeProfileStore.getProfiles();
+
+        assertEquals(2, profiles.size());
+        assertEquals("Work", profiles.get(1).getName());
+        assertEquals(expected, profiles.get(1).getConnectionType());
+    }
+
+    @Test
+    void defaultProfile_oldOpenaiProxy_keepsCredentials() {
+        NbPreferences.forModule(ClaudeProfileStore.class).put(KEY_DEFAULT,
+                "{\"openaiProxy\":true,\"apiKey\":\"sk\",\"baseUrl\":\"https://x/v1\","
+                        + "\"proxyMode\":\"CUSTOM\",\"httpProxy\":\"http://p:3128\","
+                        + "\"modelAliases\":{\"sonnet\":\"gpt-x\"},\"extraCliArgs\":\"--verbose\"}");
+
+        ClaudeProfile loaded = ClaudeProfileStore.getProfiles().get(0);
+
+        assertEquals("sk", loaded.getApiKey());
+        assertEquals("https://x/v1", loaded.getBaseUrl());
+        assertEquals(ClaudeProfile.ProxyMode.CUSTOM, loaded.getProxyMode());
+        assertEquals("http://p:3128", loaded.getHttpProxy());
+        assertEquals("gpt-x", loaded.getModelAliases().get("sonnet"));
+        assertEquals("--verbose", loaded.getExtraCliArgs());
+        assertEquals("", loaded.getId());
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("settings")
+    void write_alwaysUsesNewFormat_andIsLossless(String name, String fields, ConnectionType expected) throws Exception {
+        NbPreferences.forModule(ClaudeProfileStore.class).put(KEY_DEFAULT, "{" + fields + "}");
+        ClaudeProfile loaded = ClaudeProfileStore.getProfiles().get(0);
+
+        ClaudeProfileStore.saveProfiles(List.of(loaded));
+        String written = NbPreferences.forModule(ClaudeProfileStore.class).get(KEY_DEFAULT, null);
+
+        assertNotNull(written);
+        assertTrue(written.contains("\"connectionType\":\"" + expected.name() + "\""), written);
+        assertFalse(written.contains("openaiProxy"), written);
+        assertFalse(written.contains("openaiSubscription"), written);
+        ClaudeProfile reloaded = ClaudeProfileStore.getProfiles().get(0);
+        assertEquals(expected, reloaded.getConnectionType());
+        assertEquals(loaded.getApiKey(), reloaded.getApiKey());
+        assertEquals(loaded.getBaseUrl(), reloaded.getBaseUrl());
+        assertEquals(loaded.getToken(), reloaded.getToken());
+    }
+}
diff --git a/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfileStoreTest.java b/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfileStoreTest.java
index c2a0908..39d2e9d 100644
--- a/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfileStoreTest.java
+++ b/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfileStoreTest.java
@@ -179,6 +179,51 @@ void saveAndReload_namedProfile_persistsCorrectly() {
         }
     }
 
+    // -------------------------------------------------------------------------
+    // Connection type persistence (issue #191)
+    // -------------------------------------------------------------------------
+
+    @org.junit.jupiter.api.AfterEach
+    void removeStoredDefaultProfile() {
+        org.openide.util.NbPreferences.forModule(ClaudeProfileStore.class)
+                .remove("defaultProfile"); // ClaudeProfileStore.KEY_DEFAULT_PROFILE (private)
+        ClaudeProfileStore.clearProfiles();
+    }
+
+    /**
+     * Regression test for issue #191: "OpenAI-compatible API" selected on the Default
+     * profile was reset to "Claude-compatible API" after reload, because the Default
+     * profile is rebuilt field by field and {@code openaiProxy} was not copied.
+     */
+    @Test
+    void defaultProfile_openaiProxy_survivesSaveAndReload() {
+        ClaudeProfile def = ClaudeProfile.createDefault();
+        def.setConnectionType(ClaudeProfile.ConnectionType.OPENAI_PROXY);
+        def.setApiKey("sk-openai");
+        def.setBaseUrl("https://api.example.com/v1");
+        ClaudeProfileStore.saveProfiles(List.of(def));
+
+        ClaudeProfile loaded = ClaudeProfileStore.getProfiles().get(0);
+        assertTrue(loaded.isDefault());
+        assertEquals(ClaudeProfile.ConnectionType.OPENAI_PROXY, loaded.getConnectionType());
+        assertEquals("sk-openai", loaded.getApiKey());
+        assertEquals("https://api.example.com/v1", loaded.getBaseUrl());
+    }
+
+    /** Companion: the same settings on a named profile were never affected by the bug. */
+    @Test
+    void namedProfile_openaiProxy_survivesSaveAndReload() {
+        ClaudeProfile p = ClaudeProfile.createNamed("OpenAI");
+        p.setConnectionType(ClaudeProfile.ConnectionType.OPENAI_PROXY);
+        p.setApiKey("sk-openai");
+        p.setBaseUrl("https://api.example.com/v1");
+        ClaudeProfileStore.saveProfiles(List.of(ClaudeProfile.createDefault(), p));
+
+        ClaudeProfile loaded = ClaudeProfileStore.findByName("OpenAI");
+        assertEquals("OpenAI", loaded.getName());
+        assertEquals(ClaudeProfile.ConnectionType.OPENAI_PROXY, loaded.getConnectionType());
+    }
+
     // -------------------------------------------------------------------------
     // saveProfiles — skips Default entries
     // -------------------------------------------------------------------------
diff --git a/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfileTest.java b/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfileTest.java
index b7cf60c..b02c029 100644
--- a/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfileTest.java
+++ b/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfileTest.java
@@ -27,7 +27,7 @@ void createDefault_hasBlankId() {
     @Test
     void createDefault_connectionTypeIsClaudeManaged() {
         assertEquals(ConnectionType.CLAUDE_MANAGED,
-                ClaudeProfile.createDefault().computeConnectionType());
+                ClaudeProfile.createDefault().getConnectionType());
     }
 
     // -------------------------------------------------------------------------
@@ -90,60 +90,48 @@ void validateName_valid_returnsNull() {
     // -------------------------------------------------------------------------
 
     @Test
-    void computeConnectionType_emptyCredentials_isClaudeManaged() {
+    void getConnectionType_emptyCredentials_isClaudeManaged() {
         ClaudeProfile p = ClaudeProfile.createNamed("P");
-        assertEquals(ConnectionType.CLAUDE_MANAGED, p.computeConnectionType());
+        assertEquals(ConnectionType.CLAUDE_MANAGED, p.getConnectionType());
     }
 
     @Test
-    void computeConnectionType_tokenOnly_isSubscription() {
+    void getConnectionType_tokenOnly_isSubscription() {
         ClaudeProfile p = ClaudeProfile.createNamed("P");
         p.setToken("tok123");
-        assertEquals(ConnectionType.SUBSCRIPTION, p.computeConnectionType());
+        assertEquals(ConnectionType.SUBSCRIPTION, p.getConnectionType());
     }
 
     @Test
-    void computeConnectionType_apiKeyOnly_isClaudeApi() {
+    void getConnectionType_apiKeyOnly_isClaudeApi() {
         ClaudeProfile p = ClaudeProfile.createNamed("P");
         p.setApiKey("sk-ant-123");
-        assertEquals(ConnectionType.CLAUDE_API, p.computeConnectionType());
+        assertEquals(ConnectionType.CLAUDE_API, p.getConnectionType());
     }
 
     @Test
-    void computeConnectionType_apiKeyAndBaseUrl_isOtherApi() {
+    void getConnectionType_apiKeyAndBaseUrl_isOtherApi() {
         ClaudeProfile p = ClaudeProfile.createNamed("P");
         p.setApiKey("sk-ant-123");
         p.setBaseUrl("https://api.example.com");
-        assertEquals(ConnectionType.OTHER_API, p.computeConnectionType());
+        assertEquals(ConnectionType.OTHER_API, p.getConnectionType());
     }
 
     @Test
-    void computeConnectionType_apiKeyTakesPrecedenceOverToken() {
+    void getConnectionType_apiKeyTakesPrecedenceOverToken() {
         ClaudeProfile p = ClaudeProfile.createNamed("P");
         p.setToken("tok");
         p.setApiKey("key");
-        assertEquals(ConnectionType.CLAUDE_API, p.computeConnectionType());
+        assertEquals(ConnectionType.CLAUDE_API, p.getConnectionType());
     }
 
     @Test
-    void computeConnectionType_openaiSubscription_isOpenaiSubscription() {
+    void getConnectionType_openaiSubscription_isOpenaiSubscription() {
         ClaudeProfile p = ClaudeProfile.createNamed("P");
-        p.setOpenaiSubscription(true);
-        assertEquals(ConnectionType.OPENAI_SUBSCRIPTION, p.computeConnectionType());
+        p.setConnectionType(ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION);
+        assertEquals(ConnectionType.OPENAI_SUBSCRIPTION, p.getConnectionType());
     }
 
-    @Test
-    void computeConnectionType_openaiSubscriptionTakesPrecedenceOverOpenaiProxy() {
-        ClaudeProfile p = ClaudeProfile.createNamed("P");
-        p.setOpenaiProxy(true);
-        p.setOpenaiSubscription(true);
-        assertEquals(ConnectionType.OPENAI_SUBSCRIPTION, p.computeConnectionType());
-    }
-
-    // -------------------------------------------------------------------------
-    // ChatGPT OAuth state
-    // -------------------------------------------------------------------------
-
     @Test
     void isSignedIntoChatgpt_falseByDefault() {
         ClaudeProfile p = ClaudeProfile.createNamed("P");
@@ -168,7 +156,7 @@ void isSignedIntoChatgpt_falseWhenOnlyAccessTokenPresent() {
     @Test
     void clearChatgptAuth_clearsAllTokenFieldsButNotFlag() {
         ClaudeProfile p = ClaudeProfile.createNamed("P");
-        p.setOpenaiSubscription(true);
+        p.setConnectionType(ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION);
         p.setChatgptAccessToken("access");
         p.setChatgptRefreshToken("refresh");
         p.setChatgptAccountId("acct-1");
@@ -183,7 +171,7 @@ void clearChatgptAuth_clearsAllTokenFieldsButNotFlag() {
         assertEquals("", p.getChatgptAccountId());
         assertEquals("", p.getChatgptTokenExpiresAt());
         assertEquals("", p.getChatgptEmail());
-        assertTrue(p.isOpenaiSubscription(), "clearChatgptAuth must not change the connection-type flag");
+        assertEquals(ConnectionType.OPENAI_SUBSCRIPTION, p.getConnectionType(), "clearChatgptAuth must not change the connection type");
     }
 
     // -------------------------------------------------------------------------
@@ -222,7 +210,7 @@ void toEnvVars_claudeApi_doesNotInjectApiKey() {
     @Test
     void toEnvVars_openaiSubscription_noAuthVars() {
         ClaudeProfile p = ClaudeProfile.createNamed("P");
-        p.setOpenaiSubscription(true);
+        p.setConnectionType(ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION);
         Map<String, String> env = p.toEnvVars();
         assertFalse(env.containsKey("ANTHROPIC_AUTH_TOKEN"));
         assertFalse(env.containsKey("ANTHROPIC_BASE_URL"));
@@ -470,7 +458,7 @@ void toEnvVars_doesNotInjectModelAliasesForManagedConnection() {
         p.setModelAliases(Map.of("sonnet", "old-model-id"));
         p.setCustomModels(List.of("old-custom-model"));
 
-        assertEquals(ConnectionType.CLAUDE_MANAGED, p.computeConnectionType());
+        assertEquals(ConnectionType.CLAUDE_MANAGED, p.getConnectionType());
         Map<String, String> env = p.toEnvVars();
 
         assertFalse(env.containsKey("ANTHROPIC_DEFAULT_SONNET_MODEL"),
@@ -484,7 +472,7 @@ void toEnvVars_injectsModelAliasesForOtherApiConnection() {
         p.setBaseUrl("https://example.com");
         p.setModelAliases(Map.of("sonnet", "my-sonnet-model"));
 
-        assertEquals(ConnectionType.OTHER_API, p.computeConnectionType());
+        assertEquals(ConnectionType.OTHER_API, p.getConnectionType());
         Map<String, String> env = p.toEnvVars();
 
         assertEquals("my-sonnet-model", env.get("ANTHROPIC_DEFAULT_SONNET_MODEL"),
@@ -496,10 +484,10 @@ void toEnvVars_injectsModelAliasesForOpenaiSubscriptionConnection() {
         // Without these, subagents (haiku) and side requests (sonnet) reach the
         // ChatGPT Codex backend as claude-* model ids and fail with HTTP 400.
         ClaudeProfile p = ClaudeProfile.createNamed("Test");
-        p.setOpenaiSubscription(true);
+        p.setConnectionType(ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION);
         p.setModelAliases(Map.of("haiku", "gpt-5.6-luna", "sonnet", "gpt-5.6-terra"));
 
-        assertEquals(ConnectionType.OPENAI_SUBSCRIPTION, p.computeConnectionType());
+        assertEquals(ConnectionType.OPENAI_SUBSCRIPTION, p.getConnectionType());
         Map<String, String> env = p.toEnvVars();
 
         assertEquals("gpt-5.6-luna", env.get("ANTHROPIC_DEFAULT_HAIKU_MODEL"));
@@ -511,7 +499,7 @@ void getComboModelIds_followsModelAliasesDialogOrder() {
         // Models mapped to sonnet/opus/haiku stay selectable by their own id, in the
         // order of the rows in the Model Aliases dialog
         ClaudeProfile p = ClaudeProfile.createNamed("Test");
-        p.setOpenaiSubscription(true);
+        p.setConnectionType(ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION);
         p.setModelAliases(Map.of("sonnet", "gpt-5.6-terra", "opus", "gpt-5.6-terra", "haiku", "gpt-5.6-luna"));
         p.setCustomModels(List.of("gpt-5.6-sol", "gpt-5.5"));
         p.setModelOrder(List.of("gpt-5.6-sol", "gpt-5.6-luna", "gpt-5.5", "gpt-5.6-terra"));
@@ -522,7 +510,7 @@ void getComboModelIds_followsModelAliasesDialogOrder() {
     @Test
     void getComboModelIds_skipsOrderEntriesNoLongerAliased_andAppendsUnorderedOnes() {
         ClaudeProfile p = ClaudeProfile.createNamed("Test");
-        p.setOpenaiSubscription(true);
+        p.setConnectionType(ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION);
         p.setModelAliases(Map.of("haiku", "gpt-5.6-luna"));
         p.setCustomModels(List.of("gpt-5.6-sol"));
         p.setModelOrder(List.of("removed-model", "gpt-5.6-sol"));
@@ -533,7 +521,7 @@ void getComboModelIds_skipsOrderEntriesNoLongerAliased_andAppendsUnorderedOnes()
     @Test
     void getComboModelIds_legacyProfileWithoutOrder_aliasedThenCustom_withoutDuplicates() {
         ClaudeProfile p = ClaudeProfile.createNamed("Test");
-        p.setOpenaiSubscription(true);
+        p.setConnectionType(ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION);
         p.setModelAliases(Map.of("sonnet", "gpt-5.6-terra", "opus", "gpt-5.6-terra", "haiku", "gpt-5.6-luna"));
         p.setCustomModels(List.of("gpt-5.6-sol", "gpt-5.6-luna"));
 
@@ -551,7 +539,7 @@ void jsonRoundTrip_withAliasesAndCustomModels_keepsModelOrder_andDoesNotStoreCom
         // on load, Jackson tried to fill the immutable list it returns → every profile
         // except Default failed to load.
         ClaudeProfile p = ClaudeProfile.createNamed("Test");
-        p.setOpenaiSubscription(true);
+        p.setConnectionType(ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION);
         p.setModelAliases(Map.of("haiku", "gpt-5.6-luna"));
         p.setCustomModels(List.of("gpt-5.6-sol"));
         p.setModelOrder(List.of("gpt-5.6-sol", "gpt-5.6-luna"));
diff --git a/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanelFlushTest.java b/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanelFlushTest.java
index 47693f4..2b5c107 100644
--- a/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanelFlushTest.java
+++ b/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanelFlushTest.java
@@ -155,9 +155,8 @@ void flush_chatgptSubscription_setsFlagAndClearsOtherAuthFields() throws Excepti
 
         invoke(panel, "flushFormToCurrentProfile");
 
-        assertTrue(work.isOpenaiSubscription());
-        assertFalse(work.isOpenaiProxy());
-        assertEquals("", work.getApiKey());
+        assertEquals(ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION, work.getConnectionType());
+                assertEquals("", work.getApiKey());
         assertEquals("", work.getBaseUrl());
         assertEquals("", work.getToken());
     }
@@ -190,7 +189,7 @@ void flush_chatgptSubscription_doesNotAutoPopulateCustomModels() throws Exceptio
     @Test
     void flush_switchingAwayFromChatgptSubscription_clearsFlag() throws Exception {
         ClaudeProfile work = ClaudeProfile.createNamed("Work");
-        work.setOpenaiSubscription(true);
+        work.setConnectionType(ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION);
         work.setChatgptAccessToken("access");
         work.setChatgptRefreshToken("refresh");
 
@@ -204,7 +203,7 @@ void flush_switchingAwayFromChatgptSubscription_clearsFlag() throws Exception {
 
         invoke(panel, "flushFormToCurrentProfile");
 
-        assertFalse(work.isOpenaiSubscription());
+        assertNotEquals(ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION, work.getConnectionType());
         // Switching connection type does not sign the user out — chatgpt* tokens
         // are only cleared explicitly via the "Sign out" button.
         assertTrue(work.isSignedIntoChatgpt());

From 8a205c18edfa2ce91f9550ccb3902eb9b582b845 Mon Sep 17 00:00:00 2001
From: Oleg Samarin <osamarin@openintegration.inc>
Date: Fri, 16 Oct 2026 19:49:50 +0300
Subject: [PATCH 2/3] Fixed Copy Profile changing the connection type of the
 copied profile

Copy Profile copied only token, apiKey and baseUrl, so with the connection
type now stored explicitly a copy of a profile whose type is not inferable
from its credentials (e.g. Other API before a key is entered, or OpenAI
profiles) opened as Claude-managed. Extracted ClaudeProfilesPanel.copyOf()
and made it copy the connection type.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 pom.xml                                       |  2 +-
 .../settings/ClaudeProfilesPanel.java         | 26 ++++++++++++++-----
 .../ClaudeProfilesPanelFlushTest.java         | 13 ++++++++++
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index b949b10..305ca47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.nbplugins</groupId>
     <artifactId>netbeans-plugin-claude-code-gui</artifactId>
-    <version>1.3.54-SNAPSHOT</version>
+    <version>1.3.55-SNAPSHOT</version>
     <packaging>nbm</packaging>
     <name>Netbeans Plugin Claude Code GUI</name>
     <description>NetBeans plugin that provides a GUI for Claude Code CLI — run claude code sessions directly inside the IDE.</description>
diff --git a/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanel.java b/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanel.java
index 7d7b2c1..2f5ced0 100644
--- a/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanel.java
+++ b/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanel.java
@@ -914,14 +914,16 @@ private void onNew() {
         loadProfileIntoForm(p);
     }
 
-    private void onCopy() {
-        flushFormToCurrentProfile();
-        ClaudeProfile src = currentProfile();
-        if (src == null) return;
-        String name = promptProfileName("Copy Profile", nextDefaultName(), null);
-        if (name == null) return;
-        // Deep-copy
+    /**
+     * Creates a named copy of {@code src} with the same connection settings.
+     *
+     * @param src  profile to copy
+     * @param name valid name of the new profile
+     * @return the new profile
+     */
+    static ClaudeProfile copyOf(ClaudeProfile src, String name) {
         ClaudeProfile copy = ClaudeProfile.createNamed(name);
+        copy.setConnectionType(src.getConnectionType());
         copy.setToken(src.getToken());
         copy.setApiKey(src.getApiKey());
         copy.setBaseUrl(src.getBaseUrl());
@@ -934,6 +936,16 @@ private void onCopy() {
         copy.setCustomModels(src.getCustomModels());
         copy.setModelOrder(src.getModelOrder());
         copy.setExtraCliArgs(src.getExtraCliArgs());
+        return copy;
+    }
+
+    private void onCopy() {
+        flushFormToCurrentProfile();
+        ClaudeProfile src = currentProfile();
+        if (src == null) return;
+        String name = promptProfileName("Copy Profile", nextDefaultName(), null);
+        if (name == null) return;
+        ClaudeProfile copy = copyOf(src, name);
         profiles.add(copy);
         suppressProfileChange = true;
         rebuildProfileCombo();
diff --git a/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanelFlushTest.java b/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanelFlushTest.java
index 2b5c107..df4f15e 100644
--- a/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanelFlushTest.java
+++ b/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanelFlushTest.java
@@ -247,4 +247,17 @@ private static void invoke(Object obj, String name, Class<?> paramType, Object a
         m.setAccessible(true);
         m.invoke(obj, arg);
     }
+
+    /** Copy Profile must keep the explicitly selected connection type (PR #194 review). */
+    @org.junit.jupiter.params.ParameterizedTest
+    @org.junit.jupiter.params.provider.EnumSource(ClaudeProfile.ConnectionType.class)
+    void copyOf_preservesConnectionType(ClaudeProfile.ConnectionType type) {
+        ClaudeProfile src = ClaudeProfile.createNamed("Src");
+        src.setConnectionType(type); // no credentials: not inferable from the fields
+
+        ClaudeProfile copy = ClaudeProfilesPanel.copyOf(src, "Copy");
+
+        assertEquals("Copy", copy.getName());
+        assertEquals(type, copy.getConnectionType());
+    }
 }

From 6267a5c775a3ccb7f0b7d2273253045fbdc54084 Mon Sep 17 00:00:00 2001
From: Oleg Samarin <osamarin@openintegration.inc>
Date: Fri, 16 Oct 2026 20:31:08 +0300
Subject: [PATCH 3/3] Fixed Copy Profile losing the ChatGPT sign-in of a
 ChatGPT Subscription profile

copyOf() preserved the connection type but not the chatgpt* OAuth fields, so
a copy of a signed-in ChatGPT Subscription profile was reported as not
signed in and could not start a session.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 pom.xml                                       |  2 +-
 .../settings/ClaudeProfilesPanel.java         |  5 +++++
 .../ClaudeProfilesPanelFlushTest.java         | 21 +++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 305ca47..3c22317 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.nbplugins</groupId>
     <artifactId>netbeans-plugin-claude-code-gui</artifactId>
-    <version>1.3.55-SNAPSHOT</version>
+    <version>1.3.56-SNAPSHOT</version>
     <packaging>nbm</packaging>
     <name>Netbeans Plugin Claude Code GUI</name>
     <description>NetBeans plugin that provides a GUI for Claude Code CLI — run claude code sessions directly inside the IDE.</description>
diff --git a/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanel.java b/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanel.java
index 2f5ced0..7ed04bf 100644
--- a/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanel.java
+++ b/src/main/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanel.java
@@ -927,6 +927,11 @@ static ClaudeProfile copyOf(ClaudeProfile src, String name) {
         copy.setToken(src.getToken());
         copy.setApiKey(src.getApiKey());
         copy.setBaseUrl(src.getBaseUrl());
+        copy.setChatgptAccessToken(src.getChatgptAccessToken());
+        copy.setChatgptRefreshToken(src.getChatgptRefreshToken());
+        copy.setChatgptAccountId(src.getChatgptAccountId());
+        copy.setChatgptTokenExpiresAt(src.getChatgptTokenExpiresAt());
+        copy.setChatgptEmail(src.getChatgptEmail());
         copy.setProxyMode(src.getProxyMode());
         copy.setHttpProxy(src.getHttpProxy());
         copy.setHttpsProxy(src.getHttpsProxy());
diff --git a/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanelFlushTest.java b/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanelFlushTest.java
index df4f15e..14290a2 100644
--- a/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanelFlushTest.java
+++ b/src/test/java/io/github/nbplugins/claudecodegui/settings/ClaudeProfilesPanelFlushTest.java
@@ -260,4 +260,25 @@ void copyOf_preservesConnectionType(ClaudeProfile.ConnectionType type) {
         assertEquals("Copy", copy.getName());
         assertEquals(type, copy.getConnectionType());
     }
+
+    /** Copy of a signed-in ChatGPT Subscription profile must stay signed in (PR #194 review). */
+    @org.junit.jupiter.api.Test
+    void copyOf_preservesChatgptAuth() {
+        ClaudeProfile src = ClaudeProfile.createNamed("Src");
+        src.setConnectionType(ClaudeProfile.ConnectionType.OPENAI_SUBSCRIPTION);
+        src.setChatgptAccessToken("access");
+        src.setChatgptRefreshToken("refresh");
+        src.setChatgptAccountId("acc-1");
+        src.setChatgptTokenExpiresAt("2026-10-16T20:00:00Z");
+        src.setChatgptEmail("me@example.com");
+
+        ClaudeProfile copy = ClaudeProfilesPanel.copyOf(src, "Copy");
+
+        assertEquals("access", copy.getChatgptAccessToken());
+        assertEquals("refresh", copy.getChatgptRefreshToken());
+        assertEquals("acc-1", copy.getChatgptAccountId());
+        assertEquals("2026-10-16T20:00:00Z", copy.getChatgptTokenExpiresAt());
+        assertEquals("me@example.com", copy.getChatgptEmail());
+        assertTrue(copy.isSignedIntoChatgpt());
+    }
 }