diff --git a/.changeset/azure-provider-settings.md b/.changeset/azure-provider-settings.md
new file mode 100644
index 00000000000..7bd22e1e156
--- /dev/null
+++ b/.changeset/azure-provider-settings.md
@@ -0,0 +1,6 @@
+---
+"@kilocode/cli": patch
+"kilo-code": patch
+---
+
+Support configuring Azure OpenAI resource names or endpoint URLs from the provider settings flow, and document using the native Azure provider for GPT-5 family deployments.
diff --git a/packages/kilo-docs/pages/ai-providers/openai-compatible.md b/packages/kilo-docs/pages/ai-providers/openai-compatible.md
index 89551016dcd..02af740576e 100644
--- a/packages/kilo-docs/pages/ai-providers/openai-compatible.md
+++ b/packages/kilo-docs/pages/ai-providers/openai-compatible.md
@@ -1,6 +1,6 @@
 ---
 title: "Using OpenAI-Compatible Providers with Kilo Code"
-description: "Connect any OpenAI-compatible API endpoint to Kilo Code, including Azure OpenAI, Together AI, and self-hosted servers."
+description: "Connect OpenAI-compatible API endpoints like Together AI, Perplexity, and self-hosted servers."
 sidebar_label: OpenAI Compatible
 ---
 
@@ -14,6 +14,12 @@ Kilo Code supports a wide range of AI model providers that offer APIs compatible
 
 This document focuses on setting up providers _other than_ the official OpenAI API (which has its own [dedicated configuration page](/docs/ai-providers/openai)).
 
+{% callout type="warning" %}
+Do not use a custom OpenAI-compatible provider for Azure OpenAI GPT-5 deployments. Azure GPT-5 rejects the `max_tokens` parameter used by generic OpenAI-compatible providers and requires Azure-specific handling.
+
+Use Kilo Code's native `azure` provider instead. If your Azure deployment name differs from the model name you select in Kilo, map it with the model `id` field in `kilo.json`.
+{% /callout %}
+
 ## General Configuration
 
 {% tabs %}
@@ -21,7 +27,7 @@ This document focuses on setting up providers _other than_ the official OpenAI A
 
 The key to using an OpenAI-compatible provider is to configure two main settings:
 
-1.  **Base URL:** This is the API endpoint for the provider. It will _not_ be `https://api.openai.com/v1` (that's for the official OpenAI API).
+1.  **Base URL:** This is the API endpoint for the provider. It will _not_ be `https://api.openai.com/v1` (that's for the official OpenAI API). For Azure OpenAI GPT-5, do not enter your Azure endpoint here. Configure the native `azure` provider instead.
 2.  **API Key:** This is the secret key you obtain from the provider.
 3.  **Model ID:** This is the model name of the specific model.
 
@@ -53,7 +59,7 @@ You'll find these settings in the Kilo Code settings panel (click the {% codicon
 
 - **Provider ID** — A unique identifier (e.g., `my-provider`).
 - **Display name** — A human-readable name shown in the UI.
-- **Base URL** — The provider's OpenAI-compatible API endpoint (e.g., `https://api.your-provider.com/v1`). Kilo auto-fetches available models when a valid URL is entered.
+- **Base URL** — The provider's OpenAI-compatible API endpoint (e.g., `https://api.your-provider.com/v1`). Kilo auto-fetches available models when a valid URL is entered. For Azure OpenAI GPT-5, use the native `azure` provider instead.
 - **API key** — Your API key. Optional — leave empty if authentication is handled via headers.
 - **Models** — Add models manually or select from the auto-fetched list (see [Automatic Model Detection](#automatic-model-detection) below).
 - **Headers** (optional) — Custom HTTP headers as key-value pairs.
@@ -114,7 +120,7 @@ Then set your default model using the `provider-id/model-id` format:
 **Configuration fields:**
 
 - **`models`** — A map of model IDs to model definitions. Each model should include a `name` and `limit` with `context` and `output` token counts. If `limit.context` or `limit.output` is omitted, it defaults to `0`, which limits context management.
-- **`options.baseURL`** — The base URL of your OpenAI-compatible API endpoint.
+- **`options.baseURL`** — The base URL of your OpenAI-compatible API endpoint. For Azure OpenAI GPT-5, configure `provider.azure` instead.
 - **`options.apiKey`** — Your API key. Use any non-empty string (e.g., `"none"`) if the provider doesn't require authentication.
 
 You can also set the API key via an environment variable instead of putting it in the config file. Use the `env` field to specify which variable to read:
@@ -172,6 +178,7 @@ This enhancement allows you to:
 - **"Invalid API Key":** Double-check that you've entered the API key correctly.
 - **"Model Not Found":** Make sure you're using a valid model ID for your chosen provider.
 - **Connection Errors:** Verify the Base URL is correct and that your provider's API is accessible.
+- **Azure GPT-5 rejects `max_tokens`:** Azure GPT-5 deployments must use Kilo Code's native `azure` provider. Generic OpenAI-compatible custom providers send `max_tokens`, which Azure GPT-5 rejects because it expects `max_completion_tokens`.
 - **Unexpected Results:** If you're getting unexpected results, try a different model.
 
 By using an OpenAI-compatible provider, you can leverage the flexibility of Kilo Code with a wider range of AI models. Remember to always consult your provider's documentation for the most accurate and up-to-date information.
diff --git a/packages/kilo-docs/pages/ai-providers/openai.md b/packages/kilo-docs/pages/ai-providers/openai.md
index f100680ccfa..3025b09a4ba 100644
--- a/packages/kilo-docs/pages/ai-providers/openai.md
+++ b/packages/kilo-docs/pages/ai-providers/openai.md
@@ -71,4 +71,4 @@ Then set your default model:
 ## Tips and Notes
 
 - **Pricing:** Refer to the [OpenAI Pricing](https://openai.com/pricing) page for details on model costs.
-- **Azure OpenAI Service:** If you'd like to use the Azure OpenAI service, please see our section on [OpenAI-compatible](/docs/ai-providers/openai-compatible) providers.
+- **Azure OpenAI Service:** Use Kilo Code's native `azure` provider for Azure OpenAI, especially GPT-5 deployments. Do not configure Azure GPT-5 through a generic [OpenAI-compatible](/docs/ai-providers/openai-compatible) custom provider.
diff --git a/packages/kilo-docs/pages/code-with-ai/agents/custom-models.md b/packages/kilo-docs/pages/code-with-ai/agents/custom-models.md
index 5d84f04f8d2..a8b035662c7 100644
--- a/packages/kilo-docs/pages/code-with-ai/agents/custom-models.md
+++ b/packages/kilo-docs/pages/code-with-ai/agents/custom-models.md
@@ -309,6 +309,38 @@ If the model key in your config differs from what the provider expects, use the
 
 Here `my-local-llama` is the key you use in your config and model picker, while `meta-llama-3.1-8b-instruct` is the actual model identifier sent to the LM Studio API.
 
+For Azure OpenAI, use the native `azure` provider and set `id` to your Azure deployment name when it differs from the model key. Do not configure Azure GPT-5 family deployments under `openai-compatible`, because that provider sends `max_tokens` and Azure GPT-5 expects `max_completion_tokens`.
+
+```jsonc
+{
+  "$schema": "https://app.kilo.ai/config.json",
+  "model": "azure/gpt-5.5",
+  "provider": {
+    "azure": {
+      "options": {
+        "apiKey": "{env:AZURE_API_KEY}",
+        "resourceName": "my-azure-resource",
+      },
+      "models": {
+        "gpt-5.5": {
+          "id": "my-gpt-5-5-deployment",
+          "name": "GPT-5.5 on Azure",
+          "reasoning": true,
+          "tool_call": true,
+          "temperature": false,
+          "limit": {
+            "context": 400000,
+            "output": 128000,
+          },
+        },
+      },
+    },
+  },
+}
+```
+
+Here `azure/gpt-5.5` is the model you select in Kilo Code, while `my-gpt-5-5-deployment` is the Azure deployment name sent to Azure. If you prefer to configure the full Azure endpoint instead of a resource name, replace `resourceName` with `baseURL`, for example `"baseURL": "https://my-resource.openai.azure.com/openai"`. If both are configured, Kilo Code uses `baseURL` and ignores `resourceName` to avoid sending conflicting Azure SDK options.
+
 ## Model Loading Priority
 
 When Kilo starts, it resolves the active model in this order:
diff --git a/packages/kilo-vscode/src/KiloProvider.ts b/packages/kilo-vscode/src/KiloProvider.ts
index d64da66be40..b56184a0474 100644
--- a/packages/kilo-vscode/src/KiloProvider.ts
+++ b/packages/kilo-vscode/src/KiloProvider.ts
@@ -1733,7 +1733,9 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     const keyChanged = msg.apiKeyChanged === true
     const code = typeof msg.code === "string" ? msg.code : undefined
     const config = msg.config && typeof msg.config === "object" ? (msg.config as Record<string, unknown>) : undefined
-    if (msg.type === "connectProvider" && key) return connectProviderAction(ctx, rid, pid, key)
+    const metadata =
+      msg.metadata && typeof msg.metadata === "object" ? (msg.metadata as Record<string, unknown>) : undefined
+    if (msg.type === "connectProvider" && key) return connectProviderAction(ctx, rid, pid, key, metadata)
     if (msg.type === "authorizeProviderOAuth") return authorizeOAuthAction(ctx, rid, pid, method)
     if (msg.type === "completeProviderOAuth") return completeOAuthAction(ctx, rid, pid, method, code)
     if (msg.type === "disconnectProvider") return disconnectProviderAction(ctx, rid, pid, this.cachedConfigMessage, set)
diff --git a/packages/kilo-vscode/src/provider-actions.ts b/packages/kilo-vscode/src/provider-actions.ts
index f95e3ba8609..cae5ba1e0c8 100644
--- a/packages/kilo-vscode/src/provider-actions.ts
+++ b/packages/kilo-vscode/src/provider-actions.ts
@@ -146,6 +146,7 @@ export function computeDefaultSelection(
 type PostMessage = (message: unknown) => void
 type GetErrorMessage = (error: unknown) => string
 type SetCachedConfig = (msg: unknown) => void
+type AuthMetadata = Record<string, string>
 
 interface ActionContext {
   client: KiloClient
@@ -178,6 +179,14 @@ function validateID(
   return null
 }
 
+function cleanMetadata(input?: Record<string, unknown>): AuthMetadata | undefined {
+  const entries = Object.entries(input ?? {})
+    .map(([key, value]) => [key, typeof value === "string" ? value.trim() : ""] as const)
+    .filter(([key, value]) => key !== "" && value !== "")
+  if (entries.length === 0) return undefined
+  return Object.fromEntries(entries)
+}
+
 async function configs(ctx: ActionContext) {
   const [{ data: global }, { data: merged }] = await Promise.all([
     ctx.client.global.config.get({ throwOnError: true }),
@@ -244,11 +253,19 @@ async function enableConfigured(ctx: ActionContext, id: string, config: Config)
   await saveGlobal(ctx, { disabled_providers: disabled })
 }
 
-export async function connectProvider(ctx: ActionContext, requestId: string, providerID: string, apiKey: string) {
+export async function connectProvider(
+  ctx: ActionContext,
+  requestId: string,
+  providerID: string,
+  apiKey: string,
+  metadata?: Record<string, unknown>,
+) {
   const id = validateID(ctx, requestId, providerID, "connect")
   if (!id) return
   try {
-    await ctx.client.auth.set({ providerID: id, auth: { type: "api", key: apiKey } }, { throwOnError: true })
+    const meta = cleanMetadata(metadata)
+    const auth = meta ? { type: "api" as const, key: apiKey, metadata: meta } : { type: "api" as const, key: apiKey }
+    await ctx.client.auth.set({ providerID: id, auth }, { throwOnError: true })
     await ctx.disposeGlobal(`provider connect (${id})`)
     await ctx.fetchAndSendProviders()
     ctx.postMessage({ type: "providerConnected", requestId, providerID: id })
diff --git a/packages/kilo-vscode/tests/unit/provider-actions-save.test.ts b/packages/kilo-vscode/tests/unit/provider-actions-save.test.ts
index dc1d97f27ca..375a44efdcf 100644
--- a/packages/kilo-vscode/tests/unit/provider-actions-save.test.ts
+++ b/packages/kilo-vscode/tests/unit/provider-actions-save.test.ts
@@ -1,11 +1,11 @@
 import { describe, expect, it } from "bun:test"
-import { disconnectProvider, fetchProviderData, saveCustomProvider } from "../../src/provider-actions"
+import { connectProvider, disconnectProvider, fetchProviderData, saveCustomProvider } from "../../src/provider-actions"
 
 type ExistingGlobal = { disabled_providers?: string[]; provider?: Record<string, unknown> }
 
 function createCtx(existing: ExistingGlobal = { disabled_providers: [] }, merged: ExistingGlobal = existing) {
   const calls = {
-    set: [] as Array<{ providerID: string; auth: { type: string; key: string } }>,
+    set: [] as Array<{ providerID: string; auth: { type: string; key: string; metadata?: Record<string, string> } }>,
     remove: [] as Array<{ providerID: string }>,
     posts: [] as unknown[],
     config: [] as Array<{ config: Record<string, unknown> }>,
@@ -18,7 +18,10 @@ function createCtx(existing: ExistingGlobal = { disabled_providers: [] }, merged
   const ctx = {
     client: {
       auth: {
-        set: async (input: { providerID: string; auth: { type: string; key: string } }) => {
+        set: async (input: {
+          providerID: string
+          auth: { type: string; key: string; metadata?: Record<string, string> }
+        }) => {
           calls.set.push(input)
           return { data: true }
         },
@@ -117,6 +120,54 @@ describe("disconnectProvider", () => {
   })
 })
 
+describe("connectProvider", () => {
+  it("stores api auth metadata from provider prompts", async () => {
+    const { ctx, calls } = createCtx()
+
+    await connectProvider(ctx, "req", "azure", "sk-test", {
+      resourceName: " my-resource ",
+      empty: "   ",
+    })
+
+    expect(calls.set).toEqual([
+      {
+        providerID: "azure",
+        auth: {
+          type: "api",
+          key: "sk-test",
+          metadata: { resourceName: "my-resource" },
+        },
+      },
+    ])
+    expect(calls.refresh).toBe(1)
+    expect(calls.posts).toContainEqual({ type: "providerConnected", requestId: "req", providerID: "azure" })
+  })
+
+  it("stores azure endpoint URL metadata from provider prompts", async () => {
+    const { ctx, calls } = createCtx()
+
+    await connectProvider(ctx, "req", "azure", "sk-test", {
+      endpointType: "baseURL",
+      baseURL: " https://my-resource.openai.azure.com/openai ",
+      resourceName: "   ",
+    })
+
+    expect(calls.set).toEqual([
+      {
+        providerID: "azure",
+        auth: {
+          type: "api",
+          key: "sk-test",
+          metadata: {
+            endpointType: "baseURL",
+            baseURL: "https://my-resource.openai.azure.com/openai",
+          },
+        },
+      },
+    ])
+  })
+})
+
 describe("saveCustomProvider", () => {
   it("preserves auth when the api key field is unchanged", async () => {
     const { ctx, calls, setCachedConfig } = createCtx()
diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/ProviderConnectDialog.tsx b/packages/kilo-vscode/webview-ui/src/components/settings/ProviderConnectDialog.tsx
index e0f4ace7e14..6dbfd0174ef 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/ProviderConnectDialog.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/ProviderConnectDialog.tsx
@@ -1,6 +1,7 @@
 import { Button } from "@kilocode/kilo-ui/button"
 import { useDialog } from "@kilocode/kilo-ui/context/dialog"
 import { Dialog } from "@kilocode/kilo-ui/dialog"
+import { Select } from "@kilocode/kilo-ui/select"
 import { Spinner } from "@kilocode/kilo-ui/spinner"
 import { TextField } from "@kilocode/kilo-ui/text-field"
 import { showToast } from "@kilocode/kilo-ui/toast"
@@ -22,9 +23,12 @@ interface ViewState {
   authorization?: ProviderAuthAuthorization
   phase?: "authorizing" | "connecting"
   error?: string
+  field?: string
   failed?: string
 }
 
+type Prompt = NonNullable<ProviderAuthMethod["prompts"]>[number]
+
 function fallbackMethods(label: string): ProviderAuthMethod[] {
   return [{ type: "api", label }]
 }
@@ -38,6 +42,14 @@ function formatError(value: unknown, fallback: string): string {
   return fallback
 }
 
+function visible(prompt: Prompt, values: Record<string, string>) {
+  const rule = prompt.when
+  if (!rule) return true
+  const value = values[rule.key] ?? ""
+  if (rule.op === "eq") return value === rule.value
+  return value !== rule.value
+}
+
 const ProviderConnectDialog: Component<ProviderConnectDialogProps> = (props) => {
   const dialog = useDialog()
   const language = useLanguage()
@@ -60,6 +72,56 @@ const ProviderConnectDialog: Component<ProviderConnectDialogProps> = (props) =>
     return index === undefined ? undefined : methods()[index]
   })
 
+  function promptLabel(prompt: Prompt) {
+    if (props.providerID === "azure" && prompt.key === "endpointType") {
+      return language.t("provider.connect.azure.endpointType.label")
+    }
+    if (props.providerID === "azure" && prompt.key === "resourceName") {
+      return language.t("provider.connect.azure.resourceName.label")
+    }
+    if (props.providerID === "azure" && prompt.key === "baseURL") {
+      return language.t("provider.connect.azure.baseURL.label")
+    }
+    return prompt.message
+  }
+
+  function promptPlaceholder(prompt: Prompt) {
+    if (props.providerID === "azure" && prompt.key === "resourceName") {
+      return language.t("provider.connect.azure.resourceName.placeholder")
+    }
+    if (props.providerID === "azure" && prompt.key === "baseURL") {
+      return language.t("provider.connect.azure.baseURL.placeholder")
+    }
+    if (prompt.type === "text") return prompt.placeholder
+    return undefined
+  }
+
+  function optionLabel(prompt: Prompt, option: { label: string; value: string; hint?: string }) {
+    if (props.providerID === "azure" && prompt.key === "endpointType" && option.value === "resourceName") {
+      return language.t("provider.connect.azure.endpointType.resourceName.label")
+    }
+    if (props.providerID === "azure" && prompt.key === "endpointType" && option.value === "baseURL") {
+      return language.t("provider.connect.azure.endpointType.baseURL.label")
+    }
+    return option.label
+  }
+
+  function optionHint(prompt: Prompt, option: { label: string; value: string; hint?: string }) {
+    if (props.providerID === "azure" && prompt.key === "endpointType" && option.value === "resourceName") {
+      return language.t("provider.connect.azure.endpointType.resourceName.hint")
+    }
+    if (props.providerID === "azure" && prompt.key === "endpointType" && option.value === "baseURL") {
+      return language.t("provider.connect.azure.endpointType.baseURL.hint")
+    }
+    return option.hint
+  }
+
+  function optionText(prompt: Prompt, option: { label: string; value: string; hint?: string }) {
+    const label = optionLabel(prompt, option)
+    const hint = optionHint(prompt, option)
+    return hint ? `${label} (${hint})` : label
+  }
+
   onCleanup(action.dispose)
 
   onMount(() => {
@@ -78,16 +140,26 @@ const ProviderConnectDialog: Component<ProviderConnectDialogProps> = (props) =>
       authorization: undefined,
       phase: undefined,
       error: undefined,
+      field: undefined,
       failed: undefined,
     })
   }
 
+  function back() {
+    if (methods().length === 1) {
+      dialog.close()
+      return
+    }
+    reset()
+  }
+
   function fail(message: string) {
     const failed = state.authorization?.method === "auto" || state.phase === "authorizing"
     setState({
       ...state,
       phase: undefined,
       error: failed ? undefined : message,
+      field: undefined,
       failed: failed ? message : undefined,
     })
   }
@@ -110,6 +182,7 @@ const ProviderConnectDialog: Component<ProviderConnectDialogProps> = (props) =>
       authorization: undefined,
       phase: current?.type === "oauth" ? "authorizing" : undefined,
       error: undefined,
+      field: undefined,
       failed: undefined,
     })
     if (current?.type !== "oauth") return
@@ -135,11 +208,12 @@ const ProviderConnectDialog: Component<ProviderConnectDialogProps> = (props) =>
     )
   }
 
-  function connect(apiKey: string) {
+  function connect(apiKey: string, metadata?: Record<string, string>) {
     setState({
       ...state,
       phase: "connecting",
       error: undefined,
+      field: undefined,
       failed: undefined,
     })
     action.send(
@@ -147,6 +221,7 @@ const ProviderConnectDialog: Component<ProviderConnectDialogProps> = (props) =>
         type: "connectProvider",
         providerID: props.providerID,
         apiKey,
+        metadata,
       },
       {
         onConnected: succeed,
@@ -163,6 +238,7 @@ const ProviderConnectDialog: Component<ProviderConnectDialogProps> = (props) =>
       ...state,
       phase: "connecting",
       error: undefined,
+      field: undefined,
       failed: undefined,
     })
     action.send(
@@ -205,15 +281,30 @@ const ProviderConnectDialog: Component<ProviderConnectDialogProps> = (props) =>
 
   const ApiView: Component = () => {
     const [value, setValue] = createSignal("")
+    const [fields, setFields] = createStore<Record<string, string>>({})
+    const prompts = createMemo(() => method()?.prompts?.filter((prompt) => visible(prompt, fields)) ?? [])
 
     function submit(e: SubmitEvent) {
       e.preventDefault()
       const apiKey = value().trim()
       if (!apiKey) {
-        setState({ ...state, error: language.t("provider.connect.apiKey.required") })
+        setState({ ...state, error: language.t("provider.connect.apiKey.required"), field: "apiKey" })
         return
       }
-      connect(apiKey)
+      const metadata: Record<string, string> = {}
+      for (const prompt of prompts()) {
+        const field = (fields[prompt.key] ?? "").trim()
+        if (!field) {
+          setState({
+            ...state,
+            error: language.t("provider.connect.prompt.required", { field: promptLabel(prompt) }),
+            field: prompt.key,
+          })
+          return
+        }
+        metadata[prompt.key] = field
+      }
+      connect(apiKey, Object.keys(metadata).length > 0 ? metadata : undefined)
     }
 
     return (
@@ -232,11 +323,65 @@ const ProviderConnectDialog: Component<ProviderConnectDialogProps> = (props) =>
           placeholder={language.t("provider.connect.apiKey.placeholder")}
           value={value()}
           onChange={setValue}
-          validationState={state.error ? "invalid" : undefined}
-          error={state.error}
+          validationState={state.field === "apiKey" ? "invalid" : undefined}
+          error={state.field === "apiKey" ? state.error : undefined}
         />
+        <For each={prompts()}>
+          {(prompt) => (
+            <Switch>
+              <Match when={prompt.type === "text"}>
+                <TextField
+                  type="text"
+                  label={promptLabel(prompt)}
+                  placeholder={promptPlaceholder(prompt)}
+                  value={fields[prompt.key] ?? ""}
+                  onChange={(next) => setFields(prompt.key, next)}
+                  validationState={state.field === prompt.key ? "invalid" : undefined}
+                  error={state.field === prompt.key ? state.error : undefined}
+                />
+              </Match>
+              <Match when={prompt.type === "select"}>
+                <div style={{ display: "flex", "flex-direction": "column", gap: "4px" }}>
+                  <label
+                    style={{
+                      "font-size": "var(--kilo-font-size-12)",
+                      "font-weight": "500",
+                      color: "var(--text-weak-base)",
+                    }}
+                  >
+                    {promptLabel(prompt)}
+                  </label>
+                  <Select
+                    options={prompt.type === "select" ? prompt.options : []}
+                    current={
+                      prompt.type === "select"
+                        ? prompt.options.find((item) => item.value === fields[prompt.key])
+                        : undefined
+                    }
+                    value={(item) => item.value}
+                    label={(item) => optionText(prompt, item)}
+                    onSelect={(item) => setFields(prompt.key, item?.value ?? "")}
+                    variant="secondary"
+                    size="small"
+                    triggerVariant="settings"
+                  />
+                  <Show when={state.field === prompt.key && state.error}>
+                    <span style={{ "font-size": "var(--kilo-font-size-12)", color: "var(--vscode-errorForeground)" }}>
+                      {state.error}
+                    </span>
+                  </Show>
+                </div>
+              </Match>
+            </Switch>
+          )}
+        </For>
+        <Show when={state.error && !state.field}>
+          <div style={{ color: "var(--vscode-errorForeground)", "font-size": "var(--kilo-font-size-13)" }}>
+            {state.error}
+          </div>
+        </Show>
         <div class="dialog-confirm-actions">
-          <Button variant="ghost" size="large" type="button" onClick={reset}>
+          <Button variant="ghost" size="large" type="button" onClick={back}>
             {language.t("common.goBack")}
           </Button>
           <Button variant="primary" size="large" type="submit" disabled={state.phase === "connecting"}>
@@ -296,7 +441,7 @@ const ProviderConnectDialog: Component<ProviderConnectDialogProps> = (props) =>
           error={state.error}
         />
         <div class="dialog-confirm-actions">
-          <Button variant="ghost" size="large" type="button" onClick={reset}>
+          <Button variant="ghost" size="large" type="button" onClick={back}>
             {language.t("common.goBack")}
           </Button>
           <Button variant="primary" size="large" type="submit" disabled={state.phase === "connecting"}>
@@ -377,7 +522,7 @@ const ProviderConnectDialog: Component<ProviderConnectDialogProps> = (props) =>
           <div class="dialog-confirm-body" style={{ display: "flex", "flex-direction": "column", gap: "16px" }}>
             <div>{formatError(state.failed, language.t("common.requestFailed"))}</div>
             <div class="dialog-confirm-actions">
-              <Button variant="ghost" size="large" onClick={reset}>
+              <Button variant="ghost" size="large" onClick={back}>
                 {language.t("common.goBack")}
               </Button>
             </div>
@@ -396,7 +541,7 @@ const ProviderConnectDialog: Component<ProviderConnectDialogProps> = (props) =>
           <div class="dialog-confirm-body" style={{ display: "flex", "flex-direction": "column", gap: "16px" }}>
             <div>{formatError(state.error ?? state.failed, language.t("common.requestFailed"))}</div>
             <div class="dialog-confirm-actions">
-              <Button variant="ghost" size="large" onClick={reset}>
+              <Button variant="ghost" size="large" onClick={back}>
                 {language.t("common.goBack")}
               </Button>
             </div>
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
index e474755bb21..5aabc7fe9ab 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
@@ -137,6 +137,16 @@ export const dict = {
   "provider.connect.apiKey.label": "مفتاح واجهة برمجة تطبيقات {{provider}}",
   "provider.connect.apiKey.placeholder": "مفتاح API",
   "provider.connect.apiKey.required": "مفتاح API مطلوب",
+  "provider.connect.prompt.required": "{{field}} مطلوب",
+  "provider.connect.azure.endpointType.label": "حدد تكوين نقطة نهاية Azure",
+  "provider.connect.azure.endpointType.resourceName.label": "اسم المورد",
+  "provider.connect.azure.endpointType.resourceName.hint": "قم بإنشاء نقطة النهاية من اسم مورد Azure الخاص بك",
+  "provider.connect.azure.endpointType.baseURL.label": "URL الكامل لنقطة النهاية",
+  "provider.connect.azure.endpointType.baseURL.hint": "استخدم نقطة نهاية Azure OpenAI مخصصة",
+  "provider.connect.azure.resourceName.label": "اسم مورد Azure",
+  "provider.connect.azure.resourceName.placeholder": "على سبيل المثال: my-models",
+  "provider.connect.azure.baseURL.label": "URL نقطة نهاية Azure OpenAI",
+  "provider.connect.azure.baseURL.placeholder": "على سبيل المثال: https://my-models.openai.azure.com/openai",
   "provider.connect.opencodeZen.line1":
     "يمنحك OpenCode Zen الوصول إلى مجموعة مختارة من النماذج الموثوقة والمحسنة لوكلاء البرمجة.",
   "provider.connect.opencodeZen.line2":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/br.ts b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
index 63793141d73..aafefdf9ef2 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/br.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
@@ -137,6 +137,16 @@ export const dict = {
   "provider.connect.apiKey.label": "Chave de API do {{provider}}",
   "provider.connect.apiKey.placeholder": "Chave de API",
   "provider.connect.apiKey.required": "A chave de API é obrigatória",
+  "provider.connect.prompt.required": "{{field}} é obrigatório",
+  "provider.connect.azure.endpointType.label": "Selecionar configuração de endpoint do Azure",
+  "provider.connect.azure.endpointType.resourceName.label": "Nome do recurso",
+  "provider.connect.azure.endpointType.resourceName.hint": "Criar o endpoint a partir do nome do seu recurso do Azure",
+  "provider.connect.azure.endpointType.baseURL.label": "URL completa do endpoint",
+  "provider.connect.azure.endpointType.baseURL.hint": "Usar um endpoint personalizado do Azure OpenAI",
+  "provider.connect.azure.resourceName.label": "Nome do recurso do Azure",
+  "provider.connect.azure.resourceName.placeholder": "ex. my-models",
+  "provider.connect.azure.baseURL.label": "URL do endpoint do Azure OpenAI",
+  "provider.connect.azure.baseURL.placeholder": "ex. https://my-models.openai.azure.com/openai",
   "provider.connect.opencodeZen.line1":
     "OpenCode Zen oferece acesso a um conjunto selecionado de modelos confiáveis otimizados para agentes de código.",
   "provider.connect.opencodeZen.line2":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
index 1fe3bcdea6d..90cef8bfde0 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
@@ -137,6 +137,16 @@ export const dict = {
   "provider.connect.apiKey.label": "{{provider}} API ključ",
   "provider.connect.apiKey.placeholder": "API ključ",
   "provider.connect.apiKey.required": "API ključ je obavezan",
+  "provider.connect.prompt.required": "{{field}} je obavezno",
+  "provider.connect.azure.endpointType.label": "Odaberite konfiguraciju krajnje tačke za Azure",
+  "provider.connect.azure.endpointType.resourceName.label": "Ime resursa",
+  "provider.connect.azure.endpointType.resourceName.hint": "Izgradite krajnju tačku iz imena vašeg Azure resursa",
+  "provider.connect.azure.endpointType.baseURL.label": "Puni URL krajnje tačke",
+  "provider.connect.azure.endpointType.baseURL.hint": "Koristite prilagođenu Azure OpenAI krajnju tačku",
+  "provider.connect.azure.resourceName.label": "Ime Azure resursa",
+  "provider.connect.azure.resourceName.placeholder": "npr. my-models",
+  "provider.connect.azure.baseURL.label": "URL krajnje tačke za Azure OpenAI",
+  "provider.connect.azure.baseURL.placeholder": "npr. https://my-models.openai.azure.com/openai",
   "provider.connect.opencodeZen.line1":
     "OpenCode Zen ti daje pristup kuriranom skupu pouzdanih, optimizovanih modela za coding agente.",
   "provider.connect.opencodeZen.line2":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/da.ts b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
index a1a699174b4..4510d200be2 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/da.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
@@ -137,6 +137,16 @@ export const dict = {
   "provider.connect.apiKey.label": "{{provider}} API-nøgle",
   "provider.connect.apiKey.placeholder": "API-nøgle",
   "provider.connect.apiKey.required": "API-nøgle er påkrævet",
+  "provider.connect.prompt.required": "{{field}} er påkrævet",
+  "provider.connect.azure.endpointType.label": "Vælg Azure-slutpunktskonfiguration",
+  "provider.connect.azure.endpointType.resourceName.label": "Ressourcenavn",
+  "provider.connect.azure.endpointType.resourceName.hint": "Byg slutpunktet fra dit Azure-ressourcenavn",
+  "provider.connect.azure.endpointType.baseURL.label": "Fuld slutpunkts-URL",
+  "provider.connect.azure.endpointType.baseURL.hint": "Brug et brugerdefineret Azure OpenAI-slutpunkt",
+  "provider.connect.azure.resourceName.label": "Azure-ressourcenavn",
+  "provider.connect.azure.resourceName.placeholder": "f.eks. my-models",
+  "provider.connect.azure.baseURL.label": "Azure OpenAI-slutpunkts-URL",
+  "provider.connect.azure.baseURL.placeholder": "f.eks. https://my-models.openai.azure.com/openai",
   "provider.connect.opencodeZen.line1":
     "OpenCode Zen giver dig adgang til et udvalg af pålidelige optimerede modeller til kodningsagenter.",
   "provider.connect.opencodeZen.line2":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/de.ts b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
index 6cfd211a00a..dc502d16378 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/de.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
@@ -141,6 +141,16 @@ export const dict = {
   "provider.connect.apiKey.label": "{{provider}} API-Schlüssel",
   "provider.connect.apiKey.placeholder": "API-Schlüssel",
   "provider.connect.apiKey.required": "API-Schlüssel ist erforderlich",
+  "provider.connect.prompt.required": "{{field}} ist erforderlich",
+  "provider.connect.azure.endpointType.label": "Azure-Endpunktkonfiguration auswählen",
+  "provider.connect.azure.endpointType.resourceName.label": "Ressourcenname",
+  "provider.connect.azure.endpointType.resourceName.hint": "Erstellen Sie den Endpunkt aus Ihrem Azure-Ressourcennamen",
+  "provider.connect.azure.endpointType.baseURL.label": "Vollständige Endpunkt-URL",
+  "provider.connect.azure.endpointType.baseURL.hint": "Einen benutzerdefinierten Azure OpenAI-Endpunkt verwenden",
+  "provider.connect.azure.resourceName.label": "Azure-Ressourcenname",
+  "provider.connect.azure.resourceName.placeholder": "z. B. my-models",
+  "provider.connect.azure.baseURL.label": "Azure OpenAI-Endpunkt-URL",
+  "provider.connect.azure.baseURL.placeholder": "z. B. https://my-models.openai.azure.com/openai",
   "provider.connect.opencodeZen.line1":
     "OpenCode Zen bietet Ihnen Zugriff auf eine kuratierte Auswahl zuverlässiger, optimierter Modelle für Coding-Agenten.",
   "provider.connect.opencodeZen.line2":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/en.ts b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
index 274127fb275..c437292974f 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/en.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
@@ -137,6 +137,16 @@ export const dict = {
   "provider.connect.apiKey.label": "{{provider}} API key",
   "provider.connect.apiKey.placeholder": "API key",
   "provider.connect.apiKey.required": "API key is required",
+  "provider.connect.prompt.required": "{{field}} is required",
+  "provider.connect.azure.endpointType.label": "Select Azure endpoint configuration",
+  "provider.connect.azure.endpointType.resourceName.label": "Resource name",
+  "provider.connect.azure.endpointType.resourceName.hint": "Build the endpoint from your Azure resource name",
+  "provider.connect.azure.endpointType.baseURL.label": "Full endpoint URL",
+  "provider.connect.azure.endpointType.baseURL.hint": "Use a custom Azure OpenAI endpoint",
+  "provider.connect.azure.resourceName.label": "Azure resource name",
+  "provider.connect.azure.resourceName.placeholder": "e.g. my-models",
+  "provider.connect.azure.baseURL.label": "Azure OpenAI endpoint URL",
+  "provider.connect.azure.baseURL.placeholder": "e.g. https://my-models.openai.azure.com/openai",
   "provider.connect.opencodeZen.line1":
     "OpenCode Zen gives you access to a curated set of reliable optimized models for coding agents.",
   "provider.connect.opencodeZen.line2":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/es.ts b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
index 70fa3e20764..bbe6d18b6a0 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/es.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
@@ -137,6 +137,17 @@ export const dict = {
   "provider.connect.apiKey.label": "Clave API de {{provider}}",
   "provider.connect.apiKey.placeholder": "Clave API",
   "provider.connect.apiKey.required": "La clave API es obligatoria",
+  "provider.connect.prompt.required": "{{field}} es obligatorio",
+  "provider.connect.azure.endpointType.label": "Seleccionar configuración de endpoint de Azure",
+  "provider.connect.azure.endpointType.resourceName.label": "Nombre del recurso",
+  "provider.connect.azure.endpointType.resourceName.hint":
+    "Crear el endpoint a partir del nombre de su recurso de Azure",
+  "provider.connect.azure.endpointType.baseURL.label": "URL completa del endpoint",
+  "provider.connect.azure.endpointType.baseURL.hint": "Usar un endpoint de Azure OpenAI personalizado",
+  "provider.connect.azure.resourceName.label": "Nombre del recurso de Azure",
+  "provider.connect.azure.resourceName.placeholder": "p. ej. my-models",
+  "provider.connect.azure.baseURL.label": "URL del endpoint de Azure OpenAI",
+  "provider.connect.azure.baseURL.placeholder": "p. ej. https://my-models.openai.azure.com/openai",
   "provider.connect.opencodeZen.line1":
     "OpenCode Zen te da acceso a un conjunto curado de modelos fiables optimizados para agentes de programación.",
   "provider.connect.opencodeZen.line2":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
index 68a704affcc..c772c2f51e8 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
@@ -138,6 +138,17 @@ export const dict = {
   "provider.connect.apiKey.label": "Clé API {{provider}}",
   "provider.connect.apiKey.placeholder": "Clé API",
   "provider.connect.apiKey.required": "La clé API est requise",
+  "provider.connect.prompt.required": "{{field}} est requis",
+  "provider.connect.azure.endpointType.label": "Sélectionner la configuration du point de terminaison Azure",
+  "provider.connect.azure.endpointType.resourceName.label": "Nom de la ressource",
+  "provider.connect.azure.endpointType.resourceName.hint":
+    "Créer le point de terminaison à partir du nom de votre ressource Azure",
+  "provider.connect.azure.endpointType.baseURL.label": "URL complète du point de terminaison",
+  "provider.connect.azure.endpointType.baseURL.hint": "Utiliser un point de terminaison Azure OpenAI personnalisé",
+  "provider.connect.azure.resourceName.label": "Nom de la ressource Azure",
+  "provider.connect.azure.resourceName.placeholder": "ex. my-models",
+  "provider.connect.azure.baseURL.label": "URL du point de terminaison Azure OpenAI",
+  "provider.connect.azure.baseURL.placeholder": "ex. https://my-models.openai.azure.com/openai",
   "provider.connect.opencodeZen.line1":
     "OpenCode Zen vous donne accès à un ensemble sélectionné de modèles fiables et optimisés pour les agents de codage.",
   "provider.connect.opencodeZen.line2":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
index 8f39c291435..efa4497353d 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
@@ -137,6 +137,16 @@ export const dict = {
   "provider.connect.apiKey.label": "{{provider}} APIキー",
   "provider.connect.apiKey.placeholder": "APIキー",
   "provider.connect.apiKey.required": "APIキーが必要です",
+  "provider.connect.prompt.required": "{{field}}は必須です",
+  "provider.connect.azure.endpointType.label": "Azure エンドポイント構成の選択",
+  "provider.connect.azure.endpointType.resourceName.label": "リソース名",
+  "provider.connect.azure.endpointType.resourceName.hint": "Azure リソース名からエンドポイントを構築します",
+  "provider.connect.azure.endpointType.baseURL.label": "完全なエンドポイント URL",
+  "provider.connect.azure.endpointType.baseURL.hint": "カスタム Azure OpenAI エンドポイントを使用します",
+  "provider.connect.azure.resourceName.label": "Azure リソース名",
+  "provider.connect.azure.resourceName.placeholder": "例：my-models",
+  "provider.connect.azure.baseURL.label": "Azure OpenAI エンドポイント URL",
+  "provider.connect.azure.baseURL.placeholder": "例：https://my-models.openai.azure.com/openai",
   "provider.connect.opencodeZen.line1":
     "OpenCode Zenは、コーディングエージェント向けに最適化された信頼性の高いモデルへのアクセスを提供します。",
   "provider.connect.opencodeZen.line2": "1つのAPIキーで、Claude、GPT、Gemini、GLMなどのモデルにアクセスできます。",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
index 46753b0ce94..c13fda9c959 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
@@ -141,6 +141,16 @@ export const dict = {
   "provider.connect.apiKey.label": "{{provider}} API 키",
   "provider.connect.apiKey.placeholder": "API 키",
   "provider.connect.apiKey.required": "API 키가 필요합니다",
+  "provider.connect.prompt.required": "{{field}} 항목은 필수입니다",
+  "provider.connect.azure.endpointType.label": "Azure 엔드포인트 구성 선택",
+  "provider.connect.azure.endpointType.resourceName.label": "리소스 이름",
+  "provider.connect.azure.endpointType.resourceName.hint": "Azure 리소스 이름에서 엔드포인트를 빌드합니다",
+  "provider.connect.azure.endpointType.baseURL.label": "전체 엔드포인트 URL",
+  "provider.connect.azure.endpointType.baseURL.hint": "사용자 지정 Azure OpenAI 엔드포인트 사용",
+  "provider.connect.azure.resourceName.label": "Azure 리소스 이름",
+  "provider.connect.azure.resourceName.placeholder": "예: my-models",
+  "provider.connect.azure.baseURL.label": "Azure OpenAI 엔드포인트 URL",
+  "provider.connect.azure.baseURL.placeholder": "예: https://my-models.openai.azure.com/openai",
   "provider.connect.opencodeZen.line1":
     "OpenCode Zen은 코딩 에이전트를 위해 최적화된 신뢰할 수 있는 엄선된 모델에 대한 액세스를 제공합니다.",
   "provider.connect.opencodeZen.line2": "단일 API 키로 Claude, GPT, Gemini, GLM 등 다양한 모델에 액세스할 수 있습니다.",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
index 706db7fa53e..75b373d1076 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
@@ -137,6 +137,16 @@ export const dict = {
   "provider.connect.apiKey.label": "{{provider}} API-sleutel",
   "provider.connect.apiKey.placeholder": "API-sleutel",
   "provider.connect.apiKey.required": "API-sleutel is vereist",
+  "provider.connect.prompt.required": "{{field}} is verplicht",
+  "provider.connect.azure.endpointType.label": "Selecteer Azure-eindpuntconfiguratie",
+  "provider.connect.azure.endpointType.resourceName.label": "Resourcenaam",
+  "provider.connect.azure.endpointType.resourceName.hint": "Bouw het eindpunt op basis van uw Azure-resourcenaam",
+  "provider.connect.azure.endpointType.baseURL.label": "Volledige eindpunt-URL",
+  "provider.connect.azure.endpointType.baseURL.hint": "Gebruik een aangepast Azure OpenAI-eindpunt",
+  "provider.connect.azure.resourceName.label": "Azure-resourcenaam",
+  "provider.connect.azure.resourceName.placeholder": "bijv. my-models",
+  "provider.connect.azure.baseURL.label": "Azure OpenAI-eindpunt-URL",
+  "provider.connect.azure.baseURL.placeholder": "bijv. https://my-models.openai.azure.com/openai",
   "provider.connect.opencodeZen.line1":
     "OpenCode Zen geeft u toegang tot een geselecteerde set betrouwbare en geoptimaliseerde modellen voor programmeer-agents.",
   "provider.connect.opencodeZen.line2":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/no.ts b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
index 23a84152969..c20993de910 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/no.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
@@ -140,6 +140,16 @@ export const dict = {
   "provider.connect.apiKey.label": "{{provider}} API-nøkkel",
   "provider.connect.apiKey.placeholder": "API-nøkkel",
   "provider.connect.apiKey.required": "API-nøkkel er påkrevd",
+  "provider.connect.prompt.required": "{{field}} er påkrevd",
+  "provider.connect.azure.endpointType.label": "Velg Azure-endepunktskonfigurasjon",
+  "provider.connect.azure.endpointType.resourceName.label": "Ressursnavn",
+  "provider.connect.azure.endpointType.resourceName.hint": "Bygg endepunktet fra ditt Azure-ressursnavn",
+  "provider.connect.azure.endpointType.baseURL.label": "Full endepunkts-URL",
+  "provider.connect.azure.endpointType.baseURL.hint": "Bruk et egendefinert Azure OpenAI-endepunkt",
+  "provider.connect.azure.resourceName.label": "Azure-ressursnavn",
+  "provider.connect.azure.resourceName.placeholder": "f.eks. my-models",
+  "provider.connect.azure.baseURL.label": "Azure OpenAI-endepunkts-URL",
+  "provider.connect.azure.baseURL.placeholder": "f.eks. https://my-models.openai.azure.com/openai",
   "provider.connect.opencodeZen.line1":
     "OpenCode Zen gir deg tilgang til et utvalg av pålitelige optimaliserte modeller for kodeagenter.",
   "provider.connect.opencodeZen.line2":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
index 160c726925f..84fdfbb02e5 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
@@ -137,6 +137,16 @@ export const dict = {
   "provider.connect.apiKey.label": "Klucz API {{provider}}",
   "provider.connect.apiKey.placeholder": "Klucz API",
   "provider.connect.apiKey.required": "Klucz API jest wymagany",
+  "provider.connect.prompt.required": "{{field}} jest wymagane",
+  "provider.connect.azure.endpointType.label": "Wybierz konfigurację punktu końcowego Azure",
+  "provider.connect.azure.endpointType.resourceName.label": "Nazwa zasobu",
+  "provider.connect.azure.endpointType.resourceName.hint": "Zbuduj punkt końcowy z nazwy zasobu Azure",
+  "provider.connect.azure.endpointType.baseURL.label": "Pełny adres URL punktu końcowego",
+  "provider.connect.azure.endpointType.baseURL.hint": "Użyj niestandardowego punktu końcowego Azure OpenAI",
+  "provider.connect.azure.resourceName.label": "Nazwa zasobu Azure",
+  "provider.connect.azure.resourceName.placeholder": "np. my-models",
+  "provider.connect.azure.baseURL.label": "Adres URL punktu końcowego Azure OpenAI",
+  "provider.connect.azure.baseURL.placeholder": "np. https://my-models.openai.azure.com/openai",
   "provider.connect.opencodeZen.line1":
     "OpenCode Zen daje dostęp do wybranego zestawu niezawodnych, zoptymalizowanych modeli dla agentów kodujących.",
   "provider.connect.opencodeZen.line2":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
index b61937eeb2d..d8424737d1d 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
@@ -137,6 +137,16 @@ export const dict = {
   "provider.connect.apiKey.label": "{{provider}} API ключ",
   "provider.connect.apiKey.placeholder": "API ключ",
   "provider.connect.apiKey.required": "API ключ обязателен",
+  "provider.connect.prompt.required": "{{field}} обязательно",
+  "provider.connect.azure.endpointType.label": "Выберите конфигурацию конечной точки Azure",
+  "provider.connect.azure.endpointType.resourceName.label": "Имя ресурса",
+  "provider.connect.azure.endpointType.resourceName.hint": "Создать конечную точку из имени ресурса Azure",
+  "provider.connect.azure.endpointType.baseURL.label": "Полный URL конечной точки",
+  "provider.connect.azure.endpointType.baseURL.hint": "Использовать пользовательскую конечную точку Azure OpenAI",
+  "provider.connect.azure.resourceName.label": "Имя ресурса Azure",
+  "provider.connect.azure.resourceName.placeholder": "например, my-models",
+  "provider.connect.azure.baseURL.label": "URL конечной точки Azure OpenAI",
+  "provider.connect.azure.baseURL.placeholder": "например, https://my-models.openai.azure.com/openai",
   "provider.connect.opencodeZen.line1":
     "OpenCode Zen даёт вам доступ к отобранным надёжным оптимизированным моделям для агентов программирования.",
   "provider.connect.opencodeZen.line2":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/th.ts b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
index cccec39218e..194e82b49d1 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/th.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
@@ -137,6 +137,16 @@ export const dict = {
   "provider.connect.apiKey.label": "คีย์ API ของ {{provider}}",
   "provider.connect.apiKey.placeholder": "คีย์ API",
   "provider.connect.apiKey.required": "ต้องใช้คีย์ API",
+  "provider.connect.prompt.required": "จำเป็นต้องระบุ {{field}}",
+  "provider.connect.azure.endpointType.label": "เลือกการกำหนดค่าปลายทางของ Azure",
+  "provider.connect.azure.endpointType.resourceName.label": "ชื่อทรัพยากร",
+  "provider.connect.azure.endpointType.resourceName.hint": "สร้างปลายทางจากชื่อทรัพยากร Azure ของคุณ",
+  "provider.connect.azure.endpointType.baseURL.label": "URL ปลายทางแบบเต็ม",
+  "provider.connect.azure.endpointType.baseURL.hint": "ใช้ปลายทาง Azure OpenAI แบบกำหนดเอง",
+  "provider.connect.azure.resourceName.label": "ชื่อทรัพยากร Azure",
+  "provider.connect.azure.resourceName.placeholder": "เช่น my-models",
+  "provider.connect.azure.baseURL.label": "URL ปลายทาง Azure OpenAI",
+  "provider.connect.azure.baseURL.placeholder": "เช่น https://my-models.openai.azure.com/openai",
   "provider.connect.opencodeZen.line1":
     "OpenCode Zen ให้คุณเข้าถึงชุดโมเดลที่เชื่อถือได้และปรับแต่งแล้วสำหรับเอเจนต์การเขียนโค้ด",
   "provider.connect.opencodeZen.line2":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
index dd17350ae91..13b77b089f0 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
@@ -137,6 +137,16 @@ export const dict = {
   "provider.connect.apiKey.label": "{{provider}} API anahtarı",
   "provider.connect.apiKey.placeholder": "API anahtarı",
   "provider.connect.apiKey.required": "API anahtarı gerekli",
+  "provider.connect.prompt.required": "{{field}} zorunludur",
+  "provider.connect.azure.endpointType.label": "Azure uç nokta yapılandırmasını seçin",
+  "provider.connect.azure.endpointType.resourceName.label": "Kaynak adı",
+  "provider.connect.azure.endpointType.resourceName.hint": "Azure kaynak adınızdan uç nokta oluşturun",
+  "provider.connect.azure.endpointType.baseURL.label": "Tam uç nokta URL'si",
+  "provider.connect.azure.endpointType.baseURL.hint": "Özel bir Azure OpenAI uç noktası kullanın",
+  "provider.connect.azure.resourceName.label": "Azure kaynak adı",
+  "provider.connect.azure.resourceName.placeholder": "örn. my-models",
+  "provider.connect.azure.baseURL.label": "Azure OpenAI uç nokta URL'si",
+  "provider.connect.azure.baseURL.placeholder": "örn. https://my-models.openai.azure.com/openai",
   "provider.connect.opencodeZen.line1":
     "OpenCode Zen, kodlama ajanları için seçilmiş güvenilir optimize edilmiş modellere erişim sağlar.",
   "provider.connect.opencodeZen.line2":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
index 9e0d7eec06c..7c928f6b884 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
@@ -137,6 +137,16 @@ export const dict = {
   "provider.connect.apiKey.label": "API-ключ {{provider}}",
   "provider.connect.apiKey.placeholder": "API-ключ",
   "provider.connect.apiKey.required": "API-ключ обов'язковий",
+  "provider.connect.prompt.required": "{{field}} є обов'язковим",
+  "provider.connect.azure.endpointType.label": "Виберіть конфігурацію кінцевої точки Azure",
+  "provider.connect.azure.endpointType.resourceName.label": "Назва ресурсу",
+  "provider.connect.azure.endpointType.resourceName.hint": "Створіть кінцеву точку з назви ресурсу Azure",
+  "provider.connect.azure.endpointType.baseURL.label": "Повна URL-адреса кінцевої точки",
+  "provider.connect.azure.endpointType.baseURL.hint": "Використовувати спеціальну кінцеву точку Azure OpenAI",
+  "provider.connect.azure.resourceName.label": "Назва ресурсу Azure",
+  "provider.connect.azure.resourceName.placeholder": "напр. my-models",
+  "provider.connect.azure.baseURL.label": "URL-адреса кінцевої точки Azure OpenAI",
+  "provider.connect.azure.baseURL.placeholder": "напр. https://my-models.openai.azure.com/openai",
   "provider.connect.opencodeZen.line1":
     "OpenCode Zen надає доступ до добірки надійних оптимізованих моделей для агентів кодування.",
   "provider.connect.opencodeZen.line2":
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
index dfdaeea385b..3e382615315 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
@@ -141,6 +141,16 @@ export const dict = {
   "provider.connect.apiKey.label": "{{provider}} API 密钥",
   "provider.connect.apiKey.placeholder": "API 密钥",
   "provider.connect.apiKey.required": "API 密钥为必填项",
+  "provider.connect.prompt.required": "{{field}} 为必填项",
+  "provider.connect.azure.endpointType.label": "选择 Azure 端点配置",
+  "provider.connect.azure.endpointType.resourceName.label": "资源名称",
+  "provider.connect.azure.endpointType.resourceName.hint": "从您的 Azure 资源名称构建端点",
+  "provider.connect.azure.endpointType.baseURL.label": "完整端点 URL",
+  "provider.connect.azure.endpointType.baseURL.hint": "使用自定义 Azure OpenAI 端点",
+  "provider.connect.azure.resourceName.label": "Azure 资源名称",
+  "provider.connect.azure.resourceName.placeholder": "例如：my-models",
+  "provider.connect.azure.baseURL.label": "Azure OpenAI 端点 URL",
+  "provider.connect.azure.baseURL.placeholder": "例如：https://my-models.openai.azure.com/openai",
   "provider.connect.opencodeZen.line1": "OpenCode Zen 为你提供一组精选的可靠优化模型，用于代码智能体。",
   "provider.connect.opencodeZen.line2": "只需一个 API 密钥，你就能使用 Claude、GPT、Gemini、GLM 等模型。",
   "provider.connect.opencodeZen.visit.prefix": "访问 ",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
index 4c27852ded3..97d72120286 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
@@ -141,6 +141,16 @@ export const dict = {
   "provider.connect.apiKey.label": "{{provider}} API 金鑰",
   "provider.connect.apiKey.placeholder": "API 金鑰",
   "provider.connect.apiKey.required": "API 金鑰為必填",
+  "provider.connect.prompt.required": "{{field}} 為必填項",
+  "provider.connect.azure.endpointType.label": "選擇 Azure 端點設定",
+  "provider.connect.azure.endpointType.resourceName.label": "資源名稱",
+  "provider.connect.azure.endpointType.resourceName.hint": "從您的 Azure 資源名稱建立端點",
+  "provider.connect.azure.endpointType.baseURL.label": "完整端點 URL",
+  "provider.connect.azure.endpointType.baseURL.hint": "使用自訂 Azure OpenAI 端點",
+  "provider.connect.azure.resourceName.label": "Azure 資源名稱",
+  "provider.connect.azure.resourceName.placeholder": "例如：my-models",
+  "provider.connect.azure.baseURL.label": "Azure OpenAI 端點 URL",
+  "provider.connect.azure.baseURL.placeholder": "例如：https://my-models.openai.azure.com/openai",
   "provider.connect.opencodeZen.line1": "OpenCode Zen 為你提供一組精選的可靠最佳化模型，用於程式碼 Agent。",
   "provider.connect.opencodeZen.line2": "只需一個 API 金鑰，你就能使用 Claude、GPT、Gemini、GLM 等模型。",
   "provider.connect.opencodeZen.visit.prefix": "造訪 ",
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/webview-messages.ts b/packages/kilo-vscode/webview-ui/src/types/messages/webview-messages.ts
index 74811c2959f..f43303ad0ca 100644
--- a/packages/kilo-vscode/webview-ui/src/types/messages/webview-messages.ts
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/webview-messages.ts
@@ -852,6 +852,7 @@ export interface ConnectProviderMessage {
   requestId: string
   providerID: string
   apiKey: string
+  metadata?: Record<string, string>
 }
 
 export interface AuthorizeProviderOAuthMessage {
diff --git a/packages/opencode/src/kilocode/provider/provider.ts b/packages/opencode/src/kilocode/provider/provider.ts
index 119931fd8c5..a7720734aef 100644
--- a/packages/opencode/src/kilocode/provider/provider.ts
+++ b/packages/opencode/src/kilocode/provider/provider.ts
@@ -190,8 +190,10 @@ export function patchCustomLoaderResult(
       })()
       if (url) {
         result.options.baseURL = url
+        delete result.options.resourceName
       } else if (resource) {
         result.options.resourceName = resource
+        delete result.options.baseURL
       }
       break
     }
diff --git a/packages/opencode/src/plugin/azure.ts b/packages/opencode/src/plugin/azure.ts
index 6f54dfce1f7..be6e28d6973 100644
--- a/packages/opencode/src/plugin/azure.ts
+++ b/packages/opencode/src/plugin/azure.ts
@@ -2,14 +2,43 @@ import type { Hooks, PluginInput } from "@kilocode/plugin"
 
 export async function AzureAuthPlugin(_input: PluginInput): Promise<Hooks> {
   const prompts = []
-  if (!process.env.AZURE_RESOURCE_NAME) {
+  // kilocode_change start - allow configuring either Azure resource name or full endpoint URL from the UI
+  const hasResource = process.env.AZURE_RESOURCE_NAME || process.env.AZURE_OPENAI_RESOURCE_NAME
+  const hasEndpoint = process.env.AZURE_OPENAI_ENDPOINT
+  if (!hasResource && !hasEndpoint) {
+    prompts.push({
+      type: "select" as const,
+      key: "endpointType",
+      message: "Select Azure endpoint configuration",
+      options: [
+        {
+          label: "Resource name",
+          value: "resourceName",
+          hint: "Build the endpoint from your Azure resource name",
+        },
+        {
+          label: "Full endpoint URL",
+          value: "baseURL",
+          hint: "Use a custom Azure OpenAI endpoint",
+        },
+      ],
+    })
     prompts.push({
       type: "text" as const,
       key: "resourceName",
       message: "Enter Azure Resource Name",
       placeholder: "e.g. my-models",
+      when: { key: "endpointType", op: "eq" as const, value: "resourceName" },
+    })
+    prompts.push({
+      type: "text" as const,
+      key: "baseURL",
+      message: "Enter Azure OpenAI endpoint URL",
+      placeholder: "e.g. https://my-models.openai.azure.com/openai",
+      when: { key: "endpointType", op: "eq" as const, value: "baseURL" },
     })
   }
+  // kilocode_change end
 
   return {
     auth: {
diff --git a/packages/opencode/src/provider/provider.ts b/packages/opencode/src/provider/provider.ts
index 95170f87dae..2f069343149 100644
--- a/packages/opencode/src/provider/provider.ts
+++ b/packages/opencode/src/provider/provider.ts
@@ -215,20 +215,32 @@ function custom(dep: CustomDep): Record<string, CustomLoader> {
     azure: Effect.fnUntraced(function* (provider: Info) {
       const env = yield* dep.env()
       const auth = yield* dep.auth(provider.id)
-      const resource = iife(() => {
+      // kilocode_change start - prefer explicit Azure endpoint over resource name to avoid conflicting SDK options
+      const endpoint = iife(() => {
         return [
-          provider.options?.resourceName,
-          auth?.type === "api" ? auth.metadata?.resourceName : undefined,
-          env["AZURE_RESOURCE_NAME"],
-        ].find((name) => typeof name === "string" && name.trim() !== "")
+          provider.options?.baseURL,
+          auth?.type === "api" ? auth.metadata?.baseURL : undefined,
+          env["AZURE_OPENAI_ENDPOINT"],
+        ].find((url) => typeof url === "string" && url.trim() !== "")
       })
+      const resource = endpoint
+        ? undefined
+        : iife(() => {
+            return [
+              provider.options?.resourceName,
+              auth?.type === "api" ? auth.metadata?.resourceName : undefined,
+              env["AZURE_RESOURCE_NAME"],
+              env["AZURE_OPENAI_RESOURCE_NAME"],
+            ].find((name) => typeof name === "string" && name.trim() !== "")
+          })
+      // kilocode_change end
 
-      if (!resource && !provider.options?.baseURL) {
+      if (!resource && !endpoint) { // kilocode_change
         return {
           autoload: false,
           async getModel() {
             throw new Error(
-              "AZURE_RESOURCE_NAME is missing, set it using env var or reconnecting the azure provider and setting it",
+              "Azure resource name or endpoint is missing. Set AZURE_RESOURCE_NAME, AZURE_OPENAI_RESOURCE_NAME, AZURE_OPENAI_ENDPOINT, or reconnect the azure provider.", // kilocode_change
             )
           },
         }
@@ -245,7 +257,7 @@ function custom(dep: CustomDep): Record<string, CustomLoader> {
           }
         },
         options: {
-          resourceName: resource,
+          ...(endpoint ? { baseURL: endpoint } : { resourceName: resource }), // kilocode_change
         },
         vars(_options): Record<string, string> {
           if (resource) {
diff --git a/script/extract-source-links.ts b/script/extract-source-links.ts
index 25e78ddad46..b3179fb7294 100755
--- a/script/extract-source-links.ts
+++ b/script/extract-source-links.ts
@@ -48,6 +48,7 @@ const EXCLUDE_PATTERNS = [
   /^https?:\/\/api\.openai\.com/,
   /^https?:\/\/api\.github\.com/,
   /^https?:\/\/api\.githubcopilot\.com/,
+  /^https?:\/\/[^/]+\.openai\.azure\.com\/openai/, // kilocode_change
   /^https?:\/\/api\.cloudflare\.com/,
   /^https?:\/\/api\.releases\.hashicorp\.com/,
   /^https?:\/\/auth\.openai\.com/,