sap-ai-dev-toolkit 0.8.4 → 0.9.0

package/README.md

@@ -290,7 +290,7 @@ Supported discovery and runtime behavior:
 - **Client selection:** SAP GUI entries may contain one default client but cannot reliably list every ABAP client available through ADT. Setup asks for one or more 3-digit clients per selected system; enter comma-separated values such as `100,200` to create separate MCP servers for each client.
 - **ADT endpoint derivation:** SAP GUI entries usually contain DIAG/router information, not the HTTP(S) ADT endpoint. Setup derives the common ADT port from the SAP instance when possible, for example instance `00` → `https://host:44300`, and asks for confirmation only when configuring the selected entry.
 - **Credential handling:** username/password local entries use VS Code MCP input prompts (`${input:...}`) at server start. Plain SAP credentials are not written to `mcp.json`.
-- **Windows SSO / smart-card Windows logon:** local Windows entries can use `SAP_AUTH_MODE=windows-sso` instead of username/password prompts when the ABAP ADT endpoint supports HTTP Negotiate/SPNEGO. The runtime starts a loopback ADT proxy and uses the bundled Windows SSPI helper with the current Windows logon session, including smart-card-backed Windows logon. The toolkit does not prompt for, store, or accept manually pasted bearer/SAML tokens. Use `SAP_AI_DEV_TOOLKIT_NEGOTIATE_HELPER` only to point to a trusted custom SSPI/Negotiate helper. NTLM fallback is rejected.
+- **Login methods:** local entries can use password, browser SAML/web SSO, SAML username/password, silent Windows Negotiate/SPNEGO, Windows Negotiate/SPNEGO with native Windows credential UI/smartcard PIN, or Windows SSO with password fallback. Browser/SAML modes are passed to the VSP runtime through `SAP_BROWSER_AUTH` / `SAP_SAML_AUTH`. Windows credential UI mode runs the bundled SSPI helper interactively so Windows can display its native credential/smartcard prompt when the desktop session allows it. NTLM fallback is rejected.
 - **IP-address HTTPS self-healing:** if the confirmed ADT URL is `https://<ip>:<port>` and the certificate is issued to DNS names, setup reads the certificate DNS SANs automatically and stores them as `SAP_TLS_SERVER_NAMES`. At runtime a loopback proxy dials the IP address but verifies TLS against those discovered DNS names, trying them one by one. Certificate verification stays enabled; there is no `--insecure` mode.
 - **Private CAs:** if the SAP HTTPS certificate chains to an internal CA that is not trusted by the local Node runtime, set `SAP_TLS_CA_FILE` or `SAP_AI_DEV_TOOLKIT_TLS_CA_FILE` to a PEM CA bundle. This adds trust roots for the self-healing proxy without disabling certificate validation.
 - **Redirect and request safety:** local loopback proxies reject cross-origin forward-form requests and rewrite same-origin SAP redirects back through the loopback listener, so VSP stays on the safe route.
@@ -782,10 +782,14 @@ The response contains a `tools` array. A `RunQuery` entry resembles this excerpt
 | `SAP_AI_DEV_TOOLKIT_DESTINATION` | Comma-separated destination allowlist for normal runtime discovery. Setup clears this temporarily so it can display all eligible systems. |
 | `SAP_AI_DEV_TOOLKIT_MODE` | VSP child mode (`expert` by default; `focused` omits `ActivateMultiple`, `GetUserTransports`, and `GetTransportInfo`). The proxy exposes its curated tool subset and local workflow tools, including `LintABAP`. |
 | `SAP_ALLOW_TRANSPORTABLE_EDITS` | Generated MCP entries set this to `true` to permit source edits in transportable packages; VSP safety checks and SAP authorizations still apply. |
-| `SAP_AUTH_MODE=windows-sso` | Local SAP GUI entry mode for experimental Windows Integrated Authentication over HTTP Negotiate/SPNEGO. Runtime starts a loopback ADT proxy, uses the current Windows logon session (including smart-card-backed Windows logon), and does not pass SAP username/password credentials or manual bearer/SAML tokens to VSP. |
+| `SAP_AUTH_MODE=windows-sso` | Local SAP GUI entry mode for experimental Windows Integrated Authentication over HTTP Negotiate/SPNEGO. Runtime starts a loopback ADT proxy. With `SAP_AI_DEV_TOOLKIT_WINDOWS_CREDENTIAL_UI=true`, the bundled helper is allowed to run interactively so Windows can show its native credential/smartcard PIN UI. |
 | `SAP_TLS_SERVER_NAMES` / `SAP_AI_DEV_TOOLKIT_TLS_SERVER_NAMES` | Comma-separated local SAP GUI TLS self-healing names, normally auto-discovered during setup from the SAP HTTPS certificate when `SAP_URL` uses an IP address. Runtime tries them one by one while keeping certificate validation enabled. |
 | `SAP_TLS_SERVER_NAME` / `SAP_AI_DEV_TOOLKIT_TLS_SERVER_NAME` | Single-name compatibility form of the local SAP GUI TLS self-healing override. Prefer the auto-discovered plural variable written by setup. |
 | `SAP_TLS_CA_FILE` / `SAP_AI_DEV_TOOLKIT_TLS_CA_FILE` | Optional PEM CA bundle for the local TLS self-healing proxy when the SAP HTTPS certificate chains to a private CA that is not in the OS/Node trust store. Certificate verification remains enabled. |
+| `SAP_AUTH_MODE=browser-saml` with `SAP_BROWSER_AUTH=true` / `SAP_SAML_AUTH=true` | Local browser SAML / web SSO mode. The generated entry delegates browser login handling to the VSP runtime instead of storing SAP credentials. |
+| `SAP_AUTH_MODE=saml-password` with `SAP_SAML_AUTH=true` | Local SAML username/password mode. Generated entries use MCP input prompts for `SAP_SAML_USER` and `SAP_SAML_PASSWORD`; raw credentials are not written to `mcp.json`. |
+| `SAP_AI_DEV_TOOLKIT_WINDOWS_CREDENTIAL_UI=true` / `SAP_WINDOWS_CREDENTIAL_UI=true` | Allows the bundled Windows SSPI helper to run without PowerShell `-NonInteractive`, enabling native Windows credential UI / smartcard PIN prompts when Windows and the MCP host desktop session permit them. |
+| `SAP_AUTH_FALLBACK_MODE=basic` / `SAP_AI_DEV_TOOLKIT_AUTH_FALLBACK_MODE=basic` | Enables Windows SSO self-healing fallback for local SAP GUI entries. If Negotiate/SPNEGO is unavailable or the SSPI helper cannot acquire a token, the loopback proxy retries with Basic auth using `SAP_USER`/`SAP_PASSWORD` from the MCP input prompts. |
 | `SAP_AI_DEV_TOOLKIT_NEGOTIATE_HELPER` / `SAP_AI_DEV_TOOLKIT_SSPI_HELPER` | Optional trusted Windows helper executable used by the local Windows SSO proxy to answer an HTTP `WWW-Authenticate: Negotiate` challenge with the current Windows SSPI/Kerberos/SPNEGO credentials. It is not a prompt for a user-entered token; the helper must obtain credentials from Windows. NTLM fallback is rejected because it is connection-oriented and unsafe for this proxy shape. When unset on Windows, the bundled PowerShell SSPI helper is used. A custom helper receives one JSON line on stdin (`url`, `challenge`, `mechanism`) and prints the base64 Negotiate response on stdout. |
 | `SAP_AI_DEV_TOOLKIT_HTTP_PROXY` | Egress proxy for BAS discovery and probe traffic. Takes precedence over `HTTP_PROXY`/`http_proxy`; unset means the default BAS proxy for `.dest` hosts, empty means direct. |
 | `SAP_AI_DEV_TOOLKIT_REQUEST_TIMEOUT_MS` | Per-request timeout for calls forwarded to a VSP child (default 600000 = 10 minutes; `0` disables). A stalled request fails with a timeout error; the child is left running. |

package/dist/checksums.txt

@@ -1,5 +1,5 @@
-8ab555658815db7de670b956dafe0f12d6a249e4f1e1cbbb058deb658a89a37d  vsp-linux-x64
-7011b716e295ce2cecc40b9a56e57d9a1ec24c2b9d6aa25ab46e5cde0ec23998  vsp-linux-arm64
-5c240a6b53e15ebaae817612aed1c5b95624a99adfc38e6abb9afa377de30d1a  vsp-darwin-x64
-28032c4d331253808ec9318e6db570420c6c9308935964de665e34374465d89f  vsp-darwin-arm64
-5bb45857489bbe5d57587d9abda0b768d3a1b352d89a2a6bf13b23af8d2fd45e  vsp-win32-x64.exe
+85333f1ac7cbc25bc10a938cea5712b43d1c7b241911f19c6794f897dbcb589c  vsp-linux-x64
+68cd2b79e7cda145135f9f516b6ba76f33839bc9226bbf58ea015ff2442b4b2d  vsp-linux-arm64
+62fd8cd8eba8d61e36813c098938a2479af68047fd2fa1c85782edb4d4b5261b  vsp-darwin-x64
+71eb9e64e292e3ac83a2ab6a630367cfb0d79fe465d62ad1cfb05ef8c6c2b6e7  vsp-darwin-arm64
+952a6d5a90265fb6a6b3494d01a5d143fd7c471f7ce560bed200c399522b180f  vsp-win32-x64.exe

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sap-ai-dev-toolkit",
-  "version": "0.8.4",
+  "version": "0.9.0",
   "description": "SAP AI development toolkit for BAS, ABAP, RAP, CAP, HANA Cloud, Fiori, UI5, and MCP",
   "author": "Gurkan Yilmaz",
   "type": "module",
@@ -22,8 +22,8 @@
   "scripts": {
     "postinstall": "node scripts/postinstall.mjs",
     "install:local": "node scripts/install-local.mjs",
-    "test": "node --test test/*.test.mjs",
-    "test:live:s4h": "SAP_AI_DEV_LIVE_S4H=1 node --test test/live-s4h.test.mjs",
+    "test": "node --test --test-force-exit test/*.test.mjs",
+    "test:live:s4h": "node scripts/run-live-s4h.mjs",
     "test:visibility": "node --test test/setup.test.mjs test/terminal-ui.test.mjs",
     "test:mutation": "node scripts/mutation-terminal-ui.mjs",
     "publish:npm": "node scripts/publish-npm.mjs",
@@ -55,5 +55,8 @@
   ],
   "publishConfig": {
     "access": "public"
+  },
+  "devDependencies": {
+    "@lydell/node-pty": "^1.2.0-beta.15"
   }
 }

package/patches/vsp-bas-proxy-auth.patch

@@ -1,21 +1,45 @@
 diff --git a/cmd/vsp/main.go b/cmd/vsp/main.go
+index 5007935..b2bc6be 100755
 --- a/cmd/vsp/main.go
 +++ b/cmd/vsp/main.go
-@@ -102,1 +102,2 @@
+@@ -100,6 +100,7 @@ func init() {
+ 	rootCmd.Flags().StringVar(&cfg.BaseURL, "service", "", "SAP system URL (alias for --url)")
+ 
  	// Authentication flags
 +	rootCmd.Flags().BoolVar(&cfg.ProxyAuth, "proxy-auth", false, "Use BAS destination proxy authentication; do not send local credentials")
-@@ -172,1 +172,2 @@
+ 	rootCmd.Flags().StringVarP(&cfg.Username, "user", "u", "", "SAP username")
+ 	rootCmd.Flags().StringVarP(&cfg.Password, "password", "p", "", "SAP password")
+ 	rootCmd.Flags().StringVar(&cfg.Password, "pass", "", "SAP password (alias for --password)")
+@@ -170,6 +171,7 @@ func init() {
+ 	rootCmd.PersistentFlags().BoolVarP(&cfg.Verbose, "verbose", "v", false, "Enable verbose output to stderr")
+ 
  	// Bind flags to viper for environment variable support
 +	viper.BindPFlag("proxy-auth", rootCmd.Flags().Lookup("proxy-auth"))
-@@ -235,1 +235,4 @@
+ 	viper.BindPFlag("url", rootCmd.Flags().Lookup("url"))
+ 	viper.BindPFlag("user", rootCmd.Flags().Lookup("user"))
+ 	viper.BindPFlag("password", rootCmd.Flags().Lookup("password"))
+@@ -233,6 +235,9 @@ func runServer(cmd *cobra.Command, args []string) error {
+ 	}
+ 
  	// Browser-based SSO authentication (must run before processCookieAuth)
 +	if err := validateProxyAuth(cmd); err != nil {
 +		return err
 +	}
-@@ -348,1 +348,2 @@
+ 	if err := processBrowserAuth(cmd); err != nil {
+ 		return err
+ 	}
+@@ -346,6 +351,7 @@ func runServer(cmd *cobra.Command, args []string) error {
+ }
+ 
  func resolveConfig(cmd *cobra.Command) {
 +	cfg.ProxyAuth = cfg.ProxyAuth || viper.GetBool("PROXY_AUTH")
-@@ -533,1 +533,19 @@
+ 	// Check if cookie auth is explicitly requested via CLI flags OR env vars
+ 	// If so, we should NOT load user/password from env/.env to avoid conflicts
+ 	// Cookie auth takes precedence over basic auth since it's more explicit
+@@ -530,6 +536,24 @@ func validateConfig() error {
+ 	return nil
+ }
+ 
 +func validateProxyAuth(cmd *cobra.Command) error {
 +	if !cfg.ProxyAuth {
 +		return nil
@@ -35,146 +59,68 @@ diff --git a/cmd/vsp/main.go b/cmd/vsp/main.go
 +	return nil
 +}
  func processBrowserAuth(cmd *cobra.Command) error {
-@@ -601,1 +601,4 @@
+ 	browserAuth, _ := cmd.Flags().GetBool("browser-auth")
+ 	if !browserAuth && !viper.GetBool("BROWSER_AUTH") {
+@@ -599,6 +623,9 @@ func ssoRequested(cmd *cobra.Command) bool {
+ // days will outlive any session it starts with, and the point of the exercise
+ // is that nobody has to notice when it does.
  func processSSOAuth(cmd *cobra.Command) error {
 +	if cfg.ProxyAuth {
 +		return nil
 +	}
-@@ -659,1 +659,4 @@
+ 	if !ssoRequested(cmd) {
+ 		return nil
+ 	}
+@@ -657,6 +684,9 @@ func processSSOAuth(cmd *cobra.Command) error {
+ }
+ 
  func processSAMLAuth(cmd *cobra.Command) error {
 +	if cfg.ProxyAuth {
 +		return nil
 +	}
-@@ -754,1 +754,4 @@
+ 	samlAuth, _ := cmd.Flags().GetBool("saml-auth")
+ 	if !samlAuth && !viper.GetBool("SAML_AUTH") {
+ 		return nil
+@@ -752,6 +782,9 @@ func processSAMLAuth(cmd *cobra.Command) error {
+ }
+ 
  func processCookieAuth(cmd *cobra.Command) error {
 +	if cfg.ProxyAuth {
 +		return nil
 +	}
+ 	cookieFile, _ := cmd.Flags().GetString("cookie-file")
+ 	cookieString, _ := cmd.Flags().GetString("cookie-string")
+ 
 diff --git a/internal/mcp/server.go b/internal/mcp/server.go
+index 9337857..11fc940 100644
 --- a/internal/mcp/server.go
 +++ b/internal/mcp/server.go
-@@ -71,2 +71,5 @@
+@@ -69,6 +69,9 @@ type Config struct {
+ 	InsecureSkipVerify bool
+ 
  	// Cookie authentication (alternative to basic auth)
 +	// ProxyAuth delegates identity to a BAS destination proxy. Local credentials are rejected.
 +	ProxyAuth bool
 +
  	Cookies map[string]string
-@@ -154,1 +154,4 @@
+ 
+ 	// Build names the binary, as "v2.52.0 (commit abc1234, built ...)".
+@@ -151,6 +154,9 @@ func NewServer(cfg *Config) *Server {
+ 	if cfg.InsecureSkipVerify {
+ 		opts = append(opts, adt.WithInsecureSkipVerify())
+ 	}
 +	if cfg.ProxyAuth {
 +		opts = append(opts, adt.WithProxyContextIDGuard())
 +	}
  	if len(cfg.Cookies) > 0 {
-diff --git a/pkg/adt/client.go b/pkg/adt/client.go
---- a/pkg/adt/client.go
-+++ b/pkg/adt/client.go
-@@ -1586 +1586 @@
--		Accept: "application/xml",
-+		Accept: "application/atom+xml;type=feed",
-@@ -1592,27 +1592,27 @@
--	type componentXML struct {
--		Name        string `xml:"name,attr"`
--		Release     string `xml:"release,attr"`
--		SupportPack string `xml:"supportPack,attr"`
--		Description string `xml:"description,attr"`
--	}
--	type componentsXML struct {
--		XMLName    xml.Name       `xml:"components"`
--		Components []componentXML `xml:"component"`
--	}
--
--	var comps componentsXML
--	if err := xml.Unmarshal(resp.Body, &comps); err != nil {
--		return nil, fmt.Errorf("parsing components: %w", err)
--	}
--
--	result := make([]InstalledComponent, len(comps.Components))
--	for i, c := range comps.Components {
--		result[i] = InstalledComponent{
--			Name:        c.Name,
--			Release:     c.Release,
--			SupportPack: c.SupportPack,
--			Description: c.Description,
--		}
--	}
--
--	return result, nil
-+	type componentEntry struct {
-+		ID    string `xml:"id"`
-+		Title string `xml:"title"`
-+	}
-+	type componentsFeed struct {
-+		Entries []componentEntry `xml:"entry"`
-+	}
-+	var feed componentsFeed
-+	if err := xml.Unmarshal(resp.Body, &feed); err != nil {
-+		return nil, fmt.Errorf("parsing components: %w", err)
-+	}
-+
-+	result := make([]InstalledComponent, 0, len(feed.Entries))
-+	for i, entry := range feed.Entries {
-+		fields := strings.SplitN(entry.Title, ";", 4)
-+		name := strings.TrimSpace(entry.ID)
-+		if name == "" || len(fields) != 4 {
-+			return nil, fmt.Errorf("parsing components: malformed feed entry %d", i+1)
-+		}
-+		result = append(result, InstalledComponent{
-+			Name:        name,
-+			Release:     strings.TrimSpace(fields[0]),
-+			SupportPack: strings.TrimSpace(fields[2]),
-+			Description: strings.TrimSpace(fields[3]),
-+		})
-+	}
-+	return result, nil
-diff --git a/pkg/adt/client_components_test.go b/pkg/adt/client_components_test.go
-new file mode 100644
---- /dev/null
-+++ b/pkg/adt/client_components_test.go
-@@ -0,0 +1,40 @@
-+package adt
-+
-+import (
-+	"context"
-+	"io"
-+	"net/http"
-+	"net/http/httptest"
-+	"testing"
-+)
-+
-+func TestGetInstalledComponentsUsesADTFeed(t *testing.T) {
-+	const accept = "application/atom+xml;type=feed"
-+	const response = `<atom:feed xmlns:atom="http://www.w3.org/2005/Atom"><atom:entry><atom:id>SAP_BASIS</atom:id><atom:title>758;SAPK-75802INSAPBASIS;0002;SAP Basis &gt; 2022; patch</atom:title></atom:entry></atom:feed>`
-+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-+		if r.URL.Path != "/sap/bc/adt/system/components" {
-+			t.Errorf("unexpected request path: %s", r.URL.Path)
-+			w.WriteHeader(http.StatusNotFound)
-+			return
-+		}
-+		if got := r.Header.Get("Accept"); got != accept {
-+			t.Errorf("Accept = %q, want %q", got, accept)
-+			w.WriteHeader(http.StatusNotAcceptable)
-+			return
-+		}
-+		w.Header().Set("Content-Type", accept)
-+		_, _ = io.WriteString(w, response)
-+	}))
-+	defer server.Close()
-+
-+	components, err := NewClient(server.URL, "user", "pass").GetInstalledComponents(context.Background())
-+	if err != nil {
-+		t.Fatalf("GetInstalledComponents returned an error: %v", err)
-+	}
-+	if len(components) != 1 {
-+		t.Fatalf("got %d components, want 1", len(components))
-+	}
-+	if got := components[0]; got.Name != "SAP_BASIS" || got.Release != "758" || got.SupportPack != "0002" || got.Description != "SAP Basis > 2022; patch" {
-+		t.Errorf("got component %#v", got)
-+	}
-+}
+ 		opts = append(opts, adt.WithCookies(cfg.Cookies))
+ 	}
 diff --git a/internal/mcp/server_test.go b/internal/mcp/server_test.go
+index 7740e56..b4c2faf 100755
 --- a/internal/mcp/server_test.go
 +++ b/internal/mcp/server_test.go
 @@ -159,3 +159,112 @@ func TestDebuggerGetVariablesSchemaIncludesItems(t *testing.T) {
- 		t.Fatalf("expected variableIDs.items.type to be 'string', got %v", items["type"])
+ 		t.Fatalf("expected variable_ids.items.type to be 'string', got %v", items["type"])
  	}
  }
 +
@@ -287,6 +233,7 @@ diff --git a/internal/mcp/server_test.go b/internal/mcp/server_test.go
 +	}
 +}
 diff --git a/internal/mcp/tools_register.go b/internal/mcp/tools_register.go
+index dd433d6..5553b7f 100644
 --- a/internal/mcp/tools_register.go
 +++ b/internal/mcp/tools_register.go
 @@ -837,6 +837,19 @@ func (s *Server) registerDevTools(shouldRegister func(string) bool) {
@@ -309,7 +256,117 @@ diff --git a/internal/mcp/tools_register.go b/internal/mcp/tools_register.go
  			),
  		), s.handleActivateMultiple)
  	}
+diff --git a/pkg/adt/client.go b/pkg/adt/client.go
+index 979e908..c7e9501 100755
+--- a/pkg/adt/client.go
++++ b/pkg/adt/client.go
+@@ -1583,38 +1583,38 @@ type InstalledComponent struct {
+ func (c *Client) GetInstalledComponents(ctx context.Context) ([]InstalledComponent, error) {
+ 	resp, err := c.transport.Request(ctx, "/sap/bc/adt/system/components", &RequestOptions{
+ 		Method: http.MethodGet,
+-		Accept: "application/xml",
++		Accept: "application/atom+xml;type=feed",
+ 	})
+ 	if err != nil {
+ 		return nil, fmt.Errorf("getting installed components: %w", err)
+ 	}
+ 
+-	type componentXML struct {
+-		Name        string `xml:"name,attr"`
+-		Release     string `xml:"release,attr"`
+-		SupportPack string `xml:"supportPack,attr"`
+-		Description string `xml:"description,attr"`
++	type componentEntry struct {
++		ID    string `xml:"id"`
++		Title string `xml:"title"`
+ 	}
+-	type componentsXML struct {
+-		XMLName    xml.Name       `xml:"components"`
+-		Components []componentXML `xml:"component"`
++	type componentsFeed struct {
++		Entries []componentEntry `xml:"entry"`
+ 	}
+-
+-	var comps componentsXML
+-	if err := xml.Unmarshal(resp.Body, &comps); err != nil {
++	var feed componentsFeed
++	if err := xml.Unmarshal(resp.Body, &feed); err != nil {
+ 		return nil, fmt.Errorf("parsing components: %w", err)
+ 	}
+ 
+-	result := make([]InstalledComponent, len(comps.Components))
+-	for i, c := range comps.Components {
+-		result[i] = InstalledComponent{
+-			Name:        c.Name,
+-			Release:     c.Release,
+-			SupportPack: c.SupportPack,
+-			Description: c.Description,
++	result := make([]InstalledComponent, 0, len(feed.Entries))
++	for i, entry := range feed.Entries {
++		fields := strings.SplitN(entry.Title, ";", 4)
++		name := strings.TrimSpace(entry.ID)
++		if name == "" || len(fields) != 4 {
++			return nil, fmt.Errorf("parsing components: malformed feed entry %d", i+1)
+ 		}
++		result = append(result, InstalledComponent{
++			Name:        name,
++			Release:     strings.TrimSpace(fields[0]),
++			SupportPack: strings.TrimSpace(fields[2]),
++			Description: strings.TrimSpace(fields[3]),
++		})
+ 	}
+-
+ 	return result, nil
+ }
+ 
+diff --git a/pkg/adt/client_components_test.go b/pkg/adt/client_components_test.go
+new file mode 100644
+index 0000000..1ed3c2b
+--- /dev/null
++++ b/pkg/adt/client_components_test.go
+@@ -0,0 +1,40 @@
++package adt
++
++import (
++	"context"
++	"io"
++	"net/http"
++	"net/http/httptest"
++	"testing"
++)
++
++func TestGetInstalledComponentsUsesADTFeed(t *testing.T) {
++	const accept = "application/atom+xml;type=feed"
++	const response = `<atom:feed xmlns:atom="http://www.w3.org/2005/Atom"><atom:entry><atom:id>SAP_BASIS</atom:id><atom:title>758;SAPK-75802INSAPBASIS;0002;SAP Basis &gt; 2022; patch</atom:title></atom:entry></atom:feed>`
++	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
++		if r.URL.Path != "/sap/bc/adt/system/components" {
++			t.Errorf("unexpected request path: %s", r.URL.Path)
++			w.WriteHeader(http.StatusNotFound)
++			return
++		}
++		if got := r.Header.Get("Accept"); got != accept {
++			t.Errorf("Accept = %q, want %q", got, accept)
++			w.WriteHeader(http.StatusNotAcceptable)
++			return
++		}
++		w.Header().Set("Content-Type", accept)
++		_, _ = io.WriteString(w, response)
++	}))
++	defer server.Close()
++
++	components, err := NewClient(server.URL, "user", "pass").GetInstalledComponents(context.Background())
++	if err != nil {
++		t.Fatalf("GetInstalledComponents returned an error: %v", err)
++	}
++	if len(components) != 1 {
++		t.Fatalf("got %d components, want 1", len(components))
++	}
++	if got := components[0]; got.Name != "SAP_BASIS" || got.Release != "758" || got.SupportPack != "0002" || got.Description != "SAP Basis > 2022; patch" {
++		t.Errorf("got component %#v", got)
++	}
++}
 diff --git a/pkg/adt/http.go b/pkg/adt/http.go
+index 0b4d9f1..3473536 100755
 --- a/pkg/adt/http.go
 +++ b/pkg/adt/http.go
 @@ -499,6 +499,7 @@ func (t *Transport) fetchCSRFTokenFor(ctx context.Context, stateful bool) error
@@ -375,9 +432,10 @@ diff --git a/pkg/adt/http.go b/pkg/adt/http.go
  	}
 diff --git a/pkg/adt/http_csrf_discovery_test.go b/pkg/adt/http_csrf_discovery_test.go
 new file mode 100644
+index 0000000..80741da
 --- /dev/null
 +++ b/pkg/adt/http_csrf_discovery_test.go
-@@ -0,0 +1,55 @@
+@@ -0,0 +1,56 @@
 +package adt
 +
 +import (
@@ -433,3 +491,4 @@ new file mode 100644
 +		t.Fatalf("expected both endpoint failures, got %v", err)
 +	}
 +}
++

package/scripts/ensure-go.mjs

@@ -10,7 +10,8 @@ const exec = promisify(execFile);
 export const GO_VERSION = brandedEnvValue(process.env, 'GO_VERSION') || 'go1.27.1';
 const GO_RELEASES = {
   'linux:x64': { archive: `${GO_VERSION}.linux-amd64.tar.gz`, sha256: '63d339f0da5ab53635a56f2490a7984dfe12dfcff22ad749f63edaf590168445' },
-  'linux:arm64': { archive: `${GO_VERSION}.linux-arm64.tar.gz`, sha256: '3450b45a3f9ee8568792736a5c5e70a1f2e9b36c35a8f74958c03e51d7d92bec' }
+  'linux:arm64': { archive: `${GO_VERSION}.linux-arm64.tar.gz`, sha256: '3450b45a3f9ee8568792736a5c5e70a1f2e9b36c35a8f74958c03e51d7d92bec' },
+  'win32:x64': { archive: `${GO_VERSION}.windows-amd64.zip`, sha256: 'a3911b5e0e1b1053f25ed0675f4c1c6aad1e2bfcf253df2b9be4caabd2edd95d' }
 };
 
 function localGoPath() {
@@ -28,7 +29,7 @@ function candidateGo() {
 
 export async function installGo() {
   const release = GO_RELEASES[`${process.platform}:${process.arch}`];
-  if (!release) throw new Error(`Go is missing and automatic installation is supported only for Linux x64/arm64. Install ${GO_VERSION} manually and ensure go is on PATH.`);
+  if (!release) throw new Error(`Go is missing and automatic installation is supported only for Linux x64/arm64 and Windows x64. Install ${GO_VERSION} manually and ensure go is on PATH.`);
   const response = await fetch(`https://go.dev/dl/${release.archive}`);
   if (!response.ok) throw new Error(`Go download failed with HTTP ${response.status}; install ${GO_VERSION} manually and ensure go is on PATH.`);
   const bytes = Buffer.from(await response.arrayBuffer());
@@ -39,13 +40,20 @@ export async function installGo() {
   await mkdir(root, { recursive: true, mode: 0o755 });
   const archive = join(tmpdir(), `${release.archive}.${process.pid}`);
   await writeFile(archive, bytes, { mode: 0o600 });
-  await exec('tar', ['-xzf', archive, '-C', root, '--strip-components=1'], { stdio: 'inherit' });
+  // bsdtar on Windows extracts zip archives the same way as gzip tarballs.
+  // Prefer the OS-supplied C:\Windows\System32\tar.exe: a GNU tar earlier on
+  // PATH (e.g. Git for Windows) misreads the drive-letter -C path as a
+  // remote host unless --force-local is passed.
+  const tarCommand = process.platform === 'win32' ? join(process.env.SystemRoot || 'C:\\WINDOWS', 'System32', 'tar.exe') : 'tar';
+  await exec(tarCommand, ['-xzf', archive, '-C', root, '--strip-components=1'], { stdio: 'inherit' });
   await rm(archive, { force: true });
-  const goPath = join(root, 'bin', 'go');
+  const goPath = join(root, 'bin', process.platform === 'win32' ? 'go.exe' : 'go');
   await chmod(goPath, 0o755);
-  const userBin = join(homedir(), '.local', 'bin');
-  await mkdir(userBin, { recursive: true, mode: 0o755 });
-  try { await symlink(goPath, join(userBin, process.platform === 'win32' ? 'go.exe' : 'go')); } catch {}
+  if (process.platform !== 'win32') {
+    const userBin = join(homedir(), '.local', 'bin');
+    await mkdir(userBin, { recursive: true, mode: 0o755 });
+    try { await symlink(goPath, join(userBin, 'go')); } catch {}
+  }
   return goPath;
 }
 

package/scripts/install-local.mjs

@@ -61,7 +61,11 @@ async function resolveGlobalBinaryPath() {
 async function verify() {
   const pkg = JSON.parse(await readFile(join(root, 'package.json'), 'utf8'));
   const prefix = await resolveGlobalBinaryPath();
-  const expected = resolvePath(prefix, 'lib', 'node_modules', pkg.name);
+  // npm's global layout differs per platform: Unix nests modules under
+  // <prefix>/lib/node_modules, Windows puts them directly under <prefix>.
+  const expected = process.platform === 'win32'
+    ? resolvePath(prefix, 'node_modules', pkg.name)
+    : resolvePath(prefix, 'lib', 'node_modules', pkg.name);
   const serverCommand = process.platform === 'win32'
     ? join(prefix, 'sap-ai-dev.cmd')
     : join(prefix, 'bin', 'sap-ai-dev');

package/scripts/postinstall.mjs

@@ -20,9 +20,16 @@ const runtimeEnv = withBrandedEnvironment(process.env);
 
 async function announce(message, tone = 'info') {
   const content = message.replace(/^sap-ai-dev-toolkit:\s*/, '');
+  // Windows cannot open CONOUT$ as a writable console stream from a
+  // piped npm script (libuv normalizes the device name, and the resulting
+  // handle drops writes), so output goes through stderr unconditionally.
+  if (process.platform === 'win32') {
+    console.error(formatStatus(content, tone, process.stderr));
+    return;
+  }
   let terminal;
   try {
-    terminal = await open(process.platform === 'win32' ? 'CONOUT$' : '/dev/tty', 'w');
+    terminal = await open('/dev/tty', 'w');
     await terminal.write(`${formatStatus(content, tone, true)}\n`);
   } catch {
     console.error(formatStatus(content, tone, process.stderr));
@@ -32,12 +39,17 @@ async function announce(message, tone = 'info') {
 }
 
 function openControllingTerminal() {
-  const inputPath = process.platform === 'win32' ? 'CONIN$' : '/dev/tty';
-  const outputPath = process.platform === 'win32' ? 'CONOUT$' : '/dev/tty';
-  const inputFd = openSync(inputPath, 'r');
+  if (process.platform === 'win32') {
+    // fs cannot open CONIN$/CONOUT$ (libuv path normalization rejects the
+    // device names), so there is no controlling-terminal recovery on
+    // Windows: npm-script installs run non-interactively and the printed
+    // guidance points at `sap-ai-dev --setup` in a real terminal.
+    throw new Error('controlling terminal recovery is unavailable on Windows');
+  }
+  const inputFd = openSync('/dev/tty', 'r');
   let outputFd;
   try {
-    outputFd = openSync(outputPath, 'w');
+    outputFd = openSync('/dev/tty', 'w');
     return { input: new TTYReadStream(inputFd), output: new TTYWriteStream(outputFd) };
   } catch (error) {
     closeSync(inputFd);

package/scripts/run-live-s4h.mjs

@@ -0,0 +1,10 @@
+// Cross-platform runner for the live S4H suite: Windows cmd cannot parse the
+// Unix `VAR=1 command` prefix used in npm scripts, so the flag is set here
+// and the test runner is spawned directly.
+import { spawnSync } from 'node:child_process';
+
+const result = spawnSync(process.execPath, ['--test', '--test-force-exit', 'test/live-s4h.test.mjs'], {
+  stdio: 'inherit',
+  env: { ...process.env, SAP_AI_DEV_LIVE_S4H: '1' }
+});
+process.exitCode = result.status ?? 1;

package/src/harnesses.mjs

@@ -5,7 +5,9 @@ export const HARNESS_ENV_VAR = 'SAP_AI_DEV_TOOLKIT_HARNESSES';
 export const DEFAULT_HARNESS_IDS = ['github-copilot', 'claude-code'];
 export const NON_INTERACTIVE_HARNESS_IDS = ['github-copilot'];
 
-const FRONTMATTER_PATTERN = /^---\n([\s\S]*?)\n---\n/;
+// \r? keeps frontmatter parsing working on Windows checkouts where git's
+// autocrlf converted the bundled agents and skills to CRLF line endings.
+const FRONTMATTER_PATTERN = /^---\r?\n([\s\S]*?)\r?\n---\r?\n/;
 
 function splitFrontmatter(source) {
   const match = FRONTMATTER_PATTERN.exec(String(source));

package/src/launcher.mjs

@@ -105,7 +105,10 @@ async function runDoctor(destinations) {
       const upstreamCount = tools.filter(tool => !localSegments.has(isUpstreamTool(tool))).length;
       checks.push(doctorRow(destination.name, 'MCP tools/list', upstreamCount ? 'passed' : 'failed', `${upstreamCount} VSP tools and ${tools.length} total MCP tools returned; chat-picker binding is host-managed`));
       const systemInfo = tools.find(tool => tool.name === 'get_system_info' || tool.name === `${toolPrefix}get_system_info`);
-      if (!systemInfo) {
+      const needsAdtUrl = destination.probe?.status === 'needs-adt-url';
+      if (needsAdtUrl) {
+        checks.push(doctorRow(destination.name, 'SAP system check', 'skipped', 'No ADT URL is configured for this SAP GUI system; run sap-ai-dev --setup to add one.'));
+      } else if (!systemInfo) {
         checks.push(doctorRow(destination.name, 'SAP system check', 'skipped', 'GetSystemInfo is not exposed by this VSP mode.'));
       } else {
         const inspected = await proxy.handle({ jsonrpc: '2.0', id: 3, method: 'tools/call', params: { name: systemInfo.name, arguments: {} } });
@@ -202,6 +205,22 @@ async function configuredLocalSapGuiDestination(env) {
       probe: { status: tlsRoute ? 'configured-tls-server-name' : 'configured', available: true }
     };
   }
+  const childEnv = (() => {
+    if (authMode === 'browser-saml') {
+      return { SAP_BROWSER_AUTH: 'true', SAP_SAML_AUTH: 'true' };
+    }
+    if (authMode === 'saml-password') {
+      return {
+        SAP_SAML_AUTH: 'true',
+        SAP_SAML_USER: env.SAP_SAML_USER || env.SAP_USER || env.SAP_USERNAME || '',
+        SAP_SAML_PASSWORD: env.SAP_SAML_PASSWORD || env.SAP_PASSWORD || env.SAP_PASS || ''
+      };
+    }
+    return {
+      SAP_USER: env.SAP_USER || env.SAP_USERNAME || '',
+      SAP_PASSWORD: env.SAP_PASSWORD || env.SAP_PASS || ''
+    };
+  })();
   return {
     source: 'sap-gui-local',
     name,
@@ -209,11 +228,8 @@ async function configuredLocalSapGuiDestination(env) {
     backendUrl: tlsRoute ? env.SAP_URL : undefined,
     client: env.SAP_CLIENT || '001',
     systemId: env.SAP_SYSTEM_ID || '',
-    authentication: 'Basic',
-    childEnv: {
-      SAP_USER: env.SAP_USER || env.SAP_USERNAME || '',
-      SAP_PASSWORD: env.SAP_PASSWORD || env.SAP_PASS || ''
-    },
+    authentication: authMode === 'browser-saml' ? 'BrowserSAML' : authMode === 'saml-password' ? 'SAML' : 'Basic',
+    childEnv,
     close: tlsRoute?.close,
     probe: { status: tlsRoute ? 'configured-tls-server-name' : 'configured', available: true }
   };
@@ -303,10 +319,18 @@ async function main() {
       return;
     }
     const binary = await binaryOrError();
-    const child = spawn(binary, process.argv.slice(2), { env: runtimeEnv, stdio: 'inherit' });
+    // Windows cannot exec a .js/.mjs file directly; route JavaScript entries
+    // (test fixtures) through the current Node binary like MCPProxy does.
+    const spawnTarget = /\.(?:mjs|cjs|js)$/i.test(binary)
+      ? { command: process.execPath, prefixArgs: [binary] }
+      : { command: binary, prefixArgs: [] };
+    const child = spawn(spawnTarget.command, [...spawnTarget.prefixArgs, ...process.argv.slice(2)], { env: runtimeEnv, stdio: 'inherit' });
     process.once('SIGINT', () => child.kill('SIGINT'));
     process.once('SIGTERM', () => child.kill('SIGTERM'));
-    const [code, signal] = await new Promise(resolve => child.once('exit', (exitCode, exitSignal) => resolve([exitCode, exitSignal])));
+    const [code, signal] = await new Promise((resolve, reject) => {
+      child.once('error', reject);
+      child.once('exit', (exitCode, exitSignal) => resolve([exitCode, exitSignal]));
+    });
     if (signal) process.kill(process.pid, signal);
     process.exitCode = code ?? 1;
     return;

package/src/local-sap-gui.mjs

@@ -300,6 +300,10 @@ function registryPathCandidates(value) {
 
 async function windowsRegistrySapGuiCandidates(env = process.env) {
   if (platform() !== 'win32') return [];
+  // Escape hatch for locked-down machines and for tests that must not see
+  // the real registry's landscape paths.
+  const disabled = String(env.SAP_AI_DEV_TOOLKIT_DISABLE_SAP_GUI_REGISTRY || '').toLowerCase() === 'true';
+  if (disabled) return [];
   const candidates = [];
   for (const root of SAP_GUI_REGISTRY_ROOTS) {
     try {

package/src/mcp-proxy.mjs

@@ -198,6 +198,14 @@ export function childArguments(destination, env = process.env) {
   return args;
 }
 
+// Windows cannot exec a .js/.mjs file directly (no shebang support), so test
+// fixtures written in JavaScript are launched through the current Node binary.
+// The production VSP binary is a native executable and is unaffected.
+function spawnCommand(binary) {
+  if (/\.(?:mjs|cjs|js)$/i.test(binary)) return [process.execPath, binary];
+  return [binary];
+}
+
 class Child {
   constructor(binary, destination, options) {
     this.destination = destination;
@@ -208,7 +216,8 @@ class Child {
     this.exited = false;
     this.closing = false;
     this.requestTimeoutMs = options.requestTimeoutMs ?? 0;
-    this.process = (options.spawn || nodeSpawn)(binary, options.args || childArguments(destination, options.env), {
+    const [command, ...commandPrefixArgs] = spawnCommand(binary);
+    this.process = (options.spawn || nodeSpawn)(command, [...commandPrefixArgs, ...(options.args || childArguments(destination, options.env))], {
       env: childEnvironment(destination, options.env),
       stdio: ['pipe', 'pipe', 'pipe']
     });
@@ -346,8 +355,22 @@ class Child {
     if (this.exited) return;
     this.closing = true;
     this.notify('notifications/cancelled', { reason: 'proxy shutdown' });
-    this.process.kill('SIGTERM');
+    // Give well-behaved MCP children a graceful exit first: stdin EOF lets
+    // them finish and log their own shutdown. Windows cannot trap SIGTERM
+    // (Node maps it to TerminateProcess), so EOF is the only graceful path —
+    // wait briefly for it before escalating.
+    this.process.stdin?.end();
     let timeout;
+    try {
+      await Promise.race([
+        once(this.process, 'exit').catch(() => {}),
+        new Promise(resolve => { timeout = setTimeout(resolve, 750); })
+      ]);
+    } finally {
+      clearTimeout(timeout);
+    }
+    if (this.exited) return;
+    this.process.kill('SIGTERM');
     try {
       await Promise.race([
         once(this.process, 'exit').catch(() => {}),

package/src/setup.mjs

@@ -61,7 +61,11 @@ async function chooseLocalAuthMode(destination, { input = stdin, output = stdout
     defaultValue: 'basic',
     choices: [
       { name: 'password', value: 'basic', shortcut: 'p' },
-      { name: 'windows-sso (Kerberos/SPNEGO, including smart-card Windows logon)', value: 'windows-sso', shortcut: 's' }
+      { name: 'windows-sso (Kerberos/SPNEGO, silent current Windows logon)', value: 'windows-sso', shortcut: 's' },
+      { name: 'windows-sso with native Windows credential UI / smartcard PIN', value: 'windows-credential-ui', shortcut: 'w' },
+      { name: 'windows-sso with password fallback (self-heal when Negotiate/PIN is unavailable)', value: 'windows-sso-basic-fallback', shortcut: 'f' },
+      { name: 'browser SAML / web SSO (opens browser if supported by VSP)', value: 'browser-saml', shortcut: 'b' },
+      { name: 'SAML username/password', value: 'saml-password', shortcut: 'm' }
     ]
   }, { input, output });
 }
@@ -438,26 +442,56 @@ export async function runSetup({
         }
       }
       const authMode = await chooseLocalAuthMode({ ...destination, name: promptLabel }, { input, output, env });
-      destination.authentication = authMode === 'windows-sso' ? 'WindowsSSO' : 'Basic';
+      destination.authentication = ['windows-sso', 'windows-credential-ui', 'windows-sso-basic-fallback'].includes(authMode) ? 'WindowsSSO' : 'Basic';
       destination.authMode = authMode;
       for (const client of clients) {
         const name = localClientDestinationName(destination, client, { multipleClients: clients.length > 1, duplicateSystemName });
         const localDestination = { ...destination, name, serverName: name, client };
+        const userInputId = `sap-ai-dev-${localDestination.serverName || localDestination.name}-user`.toLowerCase().replace(/[^a-z0-9_-]+/g, '-');
+        const passwordInputId = `sap-ai-dev-${localDestination.serverName || localDestination.name}-password`.toLowerCase().replace(/[^a-z0-9_-]+/g, '-');
+        const credentialInputs = [
+          { id: userInputId, type: 'promptString', description: `SAP user for ${localDestination.name}` },
+          { id: passwordInputId, type: 'promptString', description: `SAP password for ${localDestination.name}`, password: true }
+        ];
         if (authMode === 'windows-sso') {
           localDestination.childEnv = { SAP_AUTH_MODE: 'windows-sso' };
           localDestination.inputs = [];
+        } else if (authMode === 'windows-credential-ui') {
+          localDestination.childEnv = {
+            SAP_AUTH_MODE: 'windows-sso',
+            SAP_AI_DEV_TOOLKIT_WINDOWS_CREDENTIAL_UI: 'true'
+          };
+          localDestination.inputs = [];
+        } else if (authMode === 'windows-sso-basic-fallback') {
+          localDestination.childEnv = {
+            SAP_AUTH_MODE: 'windows-sso',
+            SAP_AUTH_FALLBACK_MODE: 'basic',
+            SAP_USER: `\${input:${userInputId}}`,
+            SAP_PASSWORD: `\${input:${passwordInputId}}`
+          };
+          localDestination.inputs = credentialInputs;
+        } else if (authMode === 'browser-saml') {
+          localDestination.childEnv = {
+            SAP_AUTH_MODE: 'browser-saml',
+            SAP_BROWSER_AUTH: 'true',
+            SAP_SAML_AUTH: 'true'
+          };
+          localDestination.inputs = [];
+        } else if (authMode === 'saml-password') {
+          localDestination.childEnv = {
+            SAP_AUTH_MODE: 'saml-password',
+            SAP_SAML_AUTH: 'true',
+            SAP_SAML_USER: `\${input:${userInputId}}`,
+            SAP_SAML_PASSWORD: `\${input:${passwordInputId}}`
+          };
+          localDestination.inputs = credentialInputs;
         } else {
-          const userInputId = `sap-ai-dev-${localDestination.serverName || localDestination.name}-user`.toLowerCase().replace(/[^a-z0-9_-]+/g, '-');
-          const passwordInputId = `sap-ai-dev-${localDestination.serverName || localDestination.name}-password`.toLowerCase().replace(/[^a-z0-9_-]+/g, '-');
           localDestination.childEnv = {
             SAP_AUTH_MODE: 'basic',
             SAP_USER: `\${input:${userInputId}}`,
             SAP_PASSWORD: `\${input:${passwordInputId}}`
           };
-          localDestination.inputs = [
-            { id: userInputId, type: 'promptString', description: `SAP user for ${localDestination.name}` },
-            { id: passwordInputId, type: 'promptString', description: `SAP password for ${localDestination.name}`, password: true }
-          ];
+          localDestination.inputs = credentialInputs;
         }
         expanded.push(localDestination);
       }

package/src/terminal-ui.mjs

@@ -186,11 +186,13 @@ export async function selectPrompt({ message, choices, defaultValue } = {}, { in
       else if (key.name === 'return' || key.name === 'enter') return finish(choices[cursor]);
       else if (chunk) {
         const typed = String(chunk).toLowerCase();
-        const match = choices.findIndex(choice => !choice.disabled && (
-          String(choice.shortcut || '').toLowerCase() === typed ||
-          String(choice.value || '').toLowerCase().startsWith(typed) ||
-          String(choice.name || '').toLowerCase().startsWith(typed)
-        ));
+        let match = choices.findIndex(choice => !choice.disabled && String(choice.shortcut || '').toLowerCase() === typed);
+        if (match === -1) {
+          match = choices.findIndex(choice => !choice.disabled && (
+            String(choice.value || '').toLowerCase().startsWith(typed) ||
+            String(choice.name || '').toLowerCase().startsWith(typed)
+          ));
+        }
         if (match !== -1) cursor = match;
         else return;
       } else return;

package/src/windows-sso-adt-proxy.mjs

@@ -99,9 +99,10 @@ function helperCommand(env) {
   const command = env.SAP_AI_DEV_TOOLKIT_NEGOTIATE_HELPER || env.SAP_AI_DEV_TOOLKIT_SSPI_HELPER;
   if (command) return { command, args: [] };
   if (process.platform !== 'win32') return null;
+  const interactiveCredentialUi = env.SAP_AI_DEV_TOOLKIT_WINDOWS_CREDENTIAL_UI === 'true' || env.SAP_WINDOWS_CREDENTIAL_UI === 'true';
   return {
     command: env.SystemRoot ? join(env.SystemRoot, 'System32', 'WindowsPowerShell', 'v1.0', 'powershell.exe') : 'powershell.exe',
-    args: ['-NoLogo', '-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-File', join(root, 'scripts', 'windows-negotiate-helper.ps1')]
+    args: ['-NoLogo', '-NoProfile', ...(interactiveCredentialUi ? [] : ['-NonInteractive']), '-ExecutionPolicy', 'Bypass', '-File', join(root, 'scripts', 'windows-negotiate-helper.ps1')]
   };
 }
 
@@ -140,6 +141,29 @@ async function acquireNegotiateToken({ targetUrl, challenge, env, execFileImpl }
   return execHelper(helper, { url: targetUrl, challenge, mechanism: 'Negotiate' }, execFileImpl, env);
 }
 
+function basicFallbackCredentials(env) {
+  const mode = String(env.SAP_AUTH_FALLBACK_MODE || env.SAP_AI_DEV_TOOLKIT_AUTH_FALLBACK_MODE || '').toLowerCase();
+  const enabled = mode === 'basic' || env.SAP_AI_DEV_TOOLKIT_SSO_BASIC_FALLBACK === 'true';
+  const user = String(env.SAP_USER || env.SAP_USERNAME || '').trim();
+  const password = String(env.SAP_PASSWORD || env.SAP_PASS || '');
+  if (!enabled || !user || !password) return null;
+  return { user, password };
+}
+
+function hasBasicChallenge(headers) {
+  const value = headers.get?.('www-authenticate') || '';
+  return /(?:^|,)\s*Basic\b/i.test(value);
+}
+
+async function retryWithBasicFallback({ req, target, headers, body, fetchImpl, env }) {
+  const credentials = basicFallbackCredentials(env);
+  if (!credentials) return null;
+  return forward(req, target, {
+    ...headers,
+    Authorization: `Basic ${Buffer.from(`${credentials.user}:${credentials.password}`).toString('base64')}`
+  }, body, fetchImpl);
+}
+
 async function forward(req, targetUrl, headers, body, fetchImpl) {
   return fetchImpl(targetUrl, {
     method: req.method,
@@ -181,15 +205,24 @@ export async function createWindowsSsoAdtProxy({ destinationUrl, env = process.e
       let response = await forward(req, target, headers, body, fetchImpl);
       if (response.status === 401 && hasNegotiateChallenge(response.headers)) {
         const challenge = response.headers.get('www-authenticate') || '';
+        const cookies = mergeCookieHeader(headers.cookie || headers.Cookie, setCookies(response.headers));
         const cancel = response.body?.cancel?.();
         await cancel?.catch?.(() => {});
-        const token = await acquireNegotiateToken({ targetUrl: target.href, challenge, env, execFileImpl });
-        const retryHeaders = { ...headers, Authorization: `Negotiate ${token}` };
-        const cookies = mergeCookieHeader(headers.cookie || headers.Cookie, setCookies(response.headers));
-        delete retryHeaders.cookie;
-        delete retryHeaders.Cookie;
-        if (cookies) retryHeaders.Cookie = cookies;
-        response = await forward(req, target, retryHeaders, body, fetchImpl);
+        try {
+          const token = await acquireNegotiateToken({ targetUrl: target.href, challenge, env, execFileImpl });
+          const retryHeaders = { ...headers, Authorization: `Negotiate ${token}` };
+          delete retryHeaders.cookie;
+          delete retryHeaders.Cookie;
+          if (cookies) retryHeaders.Cookie = cookies;
+          response = await forward(req, target, retryHeaders, body, fetchImpl);
+        } catch (error) {
+          response = await retryWithBasicFallback({ req, target, headers: { ...headers, ...(cookies ? { Cookie: cookies } : {}) }, body, fetchImpl, env });
+          if (!response) throw error;
+        }
+      } else if (response.status === 401 && hasBasicChallenge(response.headers) && basicFallbackCredentials(env)) {
+        const cancel = response.body?.cancel?.();
+        await cancel?.catch?.(() => {});
+        response = await retryWithBasicFallback({ req, target, headers, body, fetchImpl, env }) || response;
       }
       writeFetchResponse(res, response, base, proxyOrigin);
     } catch (error) {