diff --git a/src/components/assistants/AssistantConfigView.tsx b/src/components/assistants/AssistantConfigView.tsx
new file mode 100644
index 0000000..357452c
--- /dev/null
+++ b/src/components/assistants/AssistantConfigView.tsx
@@ -0,0 +1,188 @@
+import { ChevronDown } from 'lucide-react'
+import { useDraftAssistant } from '../../context/DraftAssistantContext'
+import { useKeyboardShortcuts } from '../../hooks/useKeyboardShortcut'
+import { SHORTCUTS } from '../../constants/keyboard-shortcuts'
+
+const inputClassName = "w-full h-6 text-[11px] px-1.5 rounded-md border border-input bg-background placeholder:text-muted-foreground focus:outline-none focus:ring-1 focus:ring-ring"
+const inputStyle = { boxShadow: 'inset 0 1px 2px 0 rgb(0 0 0 / 0.05)' }
+
+export function AssistantConfigView() {
+  const {
+    draftAssistant,
+    isEditing,
+    isSubmitting,
+    validationErrors,
+    updateDraft,
+    cancelDraft,
+    saveDraft,
+  } = useDraftAssistant()
+
+  const handleSave = () => {
+    if (draftAssistant) saveDraft()
+  }
+
+  // Keyboard shortcuts
+  useKeyboardShortcuts([
+    { shortcut: SHORTCUTS.SAVE, handler: handleSave, options: { skipInputs: false } },
+    { shortcut: SHORTCUTS.SAVE_ENTER, handler: handleSave, options: { skipInputs: false } },
+    { shortcut: SHORTCUTS.CANCEL, handler: cancelDraft },
+  ])
+
+  if (!draftAssistant) return null
+
+  const isNameValid = !validationErrors.name
+  const canSubmit = isEditing
+    ? !isSubmitting && isNameValid
+    : !isSubmitting && isNameValid && draftAssistant.name.trim().length > 0
+
+  return (
+    <div className="flex flex-col h-full bg-background">
+      {/* Header */}
+      <div className="px-4 py-3 border-b border-border">
+        <h2 className="text-[13px] font-semibold">
+          {isEditing ? 'Edit Assistant' : 'Create Assistant'}
+        </h2>
+        <p className="text-[11px] text-muted-foreground mt-0.5">
+          {isEditing
+            ? 'Update assistant configuration'
+            : 'Configure a new Pinecone Assistant'}
+        </p>
+      </div>
+
+      {/* Configuration Form */}
+      <div className="flex-1 overflow-auto p-4 space-y-4">
+        {/* Form error */}
+        {validationErrors._form && (
+          <div className="p-2 bg-destructive/10 border border-destructive/20 rounded-md">
+            <p className="text-[11px] text-destructive">{validationErrors._form}</p>
+          </div>
+        )}
+
+        {/* Assistant Name */}
+        <div className="space-y-1">
+          <label htmlFor="assistant-name" className="text-[11px] font-medium text-muted-foreground">
+            Name <span className="text-destructive">*</span>
+          </label>
+          <input
+            id="assistant-name"
+            type="text"
+            value={draftAssistant.name}
+            onChange={(e) => updateDraft({ name: e.target.value.toLowerCase() })}
+            placeholder="my-assistant"
+            className={inputClassName}
+            style={inputStyle}
+            autoFocus={!isEditing}
+            disabled={isEditing}
+          />
+          {validationErrors.name && (
+            <p className="text-[10px] text-destructive">{validationErrors.name}</p>
+          )}
+          {!isEditing && (
+            <p className="text-[10px] text-muted-foreground">
+              1-63 characters, lowercase letters, numbers, and hyphens only
+            </p>
+          )}
+        </div>
+
+        {/* Instructions */}
+        <div className="space-y-1">
+          <label htmlFor="assistant-instructions" className="text-[11px] font-medium text-muted-foreground">
+            Instructions
+          </label>
+          <textarea
+            id="assistant-instructions"
+            value={draftAssistant.instructions}
+            onChange={(e) => updateDraft({ instructions: e.target.value })}
+            placeholder="You are a helpful assistant that answers questions based on the provided documents..."
+            className="w-full h-32 text-[11px] px-1.5 py-1.5 rounded-md border border-input bg-background placeholder:text-muted-foreground focus:outline-none focus:ring-1 focus:ring-ring resize-none"
+            style={inputStyle}
+          />
+          {validationErrors.instructions && (
+            <p className="text-[10px] text-destructive">{validationErrors.instructions}</p>
+          )}
+          <p className="text-[10px] text-muted-foreground">
+            System instructions that guide the assistant's behavior (max 16KB)
+          </p>
+        </div>
+
+        {/* Metadata */}
+        <div className="space-y-1">
+          <label htmlFor="assistant-metadata" className="text-[11px] font-medium text-muted-foreground">
+            Metadata
+          </label>
+          <textarea
+            id="assistant-metadata"
+            value={draftAssistant.metadata}
+            onChange={(e) => updateDraft({ metadata: e.target.value })}
+            placeholder={`{
+  "team": "engineering",
+  "project": "docs"
+}`}
+            className="w-full h-24 text-[11px] px-1.5 py-1.5 rounded-md border border-input bg-background placeholder:text-muted-foreground/50 focus:outline-none focus:ring-1 focus:ring-ring resize-none font-mono"
+            style={inputStyle}
+          />
+          {validationErrors.metadata && (
+            <p className="text-[10px] text-destructive">{validationErrors.metadata}</p>
+          )}
+          <p className="text-[10px] text-muted-foreground">
+            Optional JSON object with string key-value pairs
+          </p>
+        </div>
+
+        {/* Region */}
+        <div className="space-y-1">
+          <label htmlFor="assistant-region" className="text-[11px] font-medium text-muted-foreground">
+            Region
+          </label>
+          <div className="relative">
+            <select
+              id="assistant-region"
+              value={draftAssistant.region}
+              onChange={(e) => updateDraft({ region: e.target.value as 'us' | 'eu' })}
+              className="w-full h-6 appearance-none rounded-md border border-input bg-background pl-1.5 pr-6 text-[11px] focus:outline-none focus:ring-1 focus:ring-ring cursor-pointer disabled:opacity-50 disabled:cursor-not-allowed"
+              style={inputStyle}
+              disabled={isEditing}
+            >
+              <option value="us">US (United States)</option>
+              <option value="eu">EU (Europe)</option>
+            </select>
+            <ChevronDown className="absolute right-1.5 top-1/2 -translate-y-1/2 h-3 w-3 text-muted-foreground pointer-events-none" />
+          </div>
+          {isEditing && (
+            <p className="text-[10px] text-muted-foreground">
+              Region cannot be changed after creation
+            </p>
+          )}
+        </div>
+      </div>
+
+      {/* Footer Actions */}
+      <div className="px-4 py-2 border-t border-border flex items-center justify-between bg-background">
+        <div className="text-[10px] text-muted-foreground">
+          <kbd className="px-1 py-0.5 bg-muted rounded text-[9px] font-mono">{SHORTCUTS.SAVE_ENTER.keys}</kbd> {isEditing ? 'save' : 'create'}
+          {' · '}
+          <kbd className="px-1 py-0.5 bg-muted rounded text-[9px] font-mono">{SHORTCUTS.CANCEL.keys}</kbd> cancel
+        </div>
+        <div className="flex items-center gap-1.5">
+          <button
+            onClick={cancelDraft}
+            disabled={isSubmitting}
+            className="h-6 px-2 text-[11px] rounded-md border border-input bg-background hover:bg-accent disabled:opacity-50 disabled:cursor-not-allowed"
+            style={inputStyle}
+          >
+            Cancel
+          </button>
+          <button
+            onClick={handleSave}
+            disabled={!canSubmit}
+            className="h-6 px-2 text-[11px] rounded-md bg-[#007AFF] hover:bg-[#0071E3] active:bg-[#006DD9] text-white disabled:opacity-50 disabled:cursor-not-allowed"
+          >
+            {isSubmitting
+              ? (isEditing ? 'Saving...' : 'Creating...')
+              : (isEditing ? 'Save Changes' : 'Create Assistant')}
+          </button>
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/src/components/layout/MainContent.tsx b/src/components/layout/MainContent.tsx
index e240152..e0a5305 100644
--- a/src/components/layout/MainContent.tsx
+++ b/src/components/layout/MainContent.tsx
@@ -2,6 +2,7 @@ import { useState, useCallback, useEffect } from 'react'
 import { useSelection } from '../../context/SelectionContext'
 import { useDraftIndex } from '../../context/DraftIndexContext'
 import { useDraftNamespace } from '../../context/DraftNamespaceContext'
+import { useDraftAssistant } from '../../context/DraftAssistantContext'
 import { usePanel } from '../../context/PanelContext'
 import { useEmbedding } from '../../context/EmbeddingContext'
 import { usePinecone } from '../../providers/PineconeProvider'
@@ -11,6 +12,7 @@ import { IndexesPanel } from '../indexes/IndexesPanel'
 import { NamespacesPanel } from '../namespaces/NamespacesPanel'
 import { IndexConfigView } from '../indexes/IndexConfigView'
 import { NamespaceConfigView } from '../namespaces/NamespaceConfigView'
+import { AssistantConfigView } from '../assistants/AssistantConfigView'
 import VectorsView from '../vectors/VectorsView'
 import VectorDetailPanel from '../vectors/VectorDetailPanel'
 import { AssistantsPanel } from '../assistants/AssistantsPanel'
@@ -28,6 +30,7 @@ export function MainContent() {
   const { activeIndex, activeNamespace } = useSelection()
   const { draftIndex } = useDraftIndex()
   const { draftNamespace } = useDraftNamespace()
+  const { draftAssistant, startCreation: startAssistantCreation, startEditing: startAssistantEditing } = useDraftAssistant()
   const { currentProfile } = usePinecone()
   const { mode } = useMode()
   const { activeAssistant } = useAssistantSelection()
@@ -136,7 +139,11 @@ export function MainContent() {
         data-testid={mode === 'assistant' ? 'assistants-panel' : 'indexes-panel'}
       >
         {mode === 'assistant' ? (
-          <AssistantsPanel onToggleCollapse={() => setIndexesPanelOpen(false)} />
+          <AssistantsPanel
+            onToggleCollapse={() => setIndexesPanelOpen(false)}
+            onCreateNew={startAssistantCreation}
+            onEditAssistant={startAssistantEditing}
+          />
         ) : (
           <IndexesPanel onToggleCollapse={() => setIndexesPanelOpen(false)} />
         )}
@@ -158,8 +165,10 @@ export function MainContent() {
         className="h-full transition-[padding] duration-200"
         style={{ paddingLeft: `${leftPadding}px`, paddingRight: `${rightPadding}px` }}
       >
-        {/* Assistant mode - Chat View */}
-        {mode === 'assistant' && activeAssistant ? (
+        {/* Assistant mode - Config View or Chat View */}
+        {mode === 'assistant' && draftAssistant ? (
+          <AssistantConfigView />
+        ) : mode === 'assistant' && activeAssistant ? (
           <ChatView
             key={activeAssistant}
             assistantName={activeAssistant}
@@ -283,7 +292,9 @@ export function MainContent() {
             }}
           >
             <div className="text-center text-muted-foreground">
-              <p className="text-sm">No vector selected</p>
+              <p className="text-sm">
+                {mode === 'assistant' ? 'No file selected' : 'No vector selected'}
+              </p>
             </div>
           </div>
         )}
diff --git a/src/context/DraftAssistantContext.tsx b/src/context/DraftAssistantContext.tsx
new file mode 100644
index 0000000..e05ab42
--- /dev/null
+++ b/src/context/DraftAssistantContext.tsx
@@ -0,0 +1,254 @@
+import { createContext, useContext, useState, useCallback, useMemo, useEffect, ReactNode } from 'react'
+import { usePinecone } from '../providers/PineconeProvider'
+import { useCreateAssistantMutation, useUpdateAssistantMutation, useAssistantDetailQuery } from '../hooks/useAssistantQueries'
+import { useAssistantSelection } from './AssistantSelectionContext'
+import type { AssistantModel } from '../../electron/types'
+
+export interface DraftAssistant {
+  name: string
+  instructions: string
+  metadata: string // JSON string for editing
+  region: 'us' | 'eu'
+}
+
+interface DraftAssistantContextValue {
+  draftAssistant: DraftAssistant | null
+  isEditing: boolean
+  editingAssistantName: string | null
+  isSubmitting: boolean
+  validationErrors: Record<string, string>
+  startCreation: () => void
+  startEditing: (assistantName: string) => void
+  updateDraft: (updates: Partial<DraftAssistant>) => void
+  cancelDraft: () => void
+  saveDraft: () => Promise<void>
+}
+
+const DraftAssistantContext = createContext<DraftAssistantContextValue | null>(null)
+
+// Validation constants
+const NAME_MIN_LENGTH = 1
+const NAME_MAX_LENGTH = 63
+const NAME_PATTERN = /^[a-z0-9]+(-[a-z0-9]+)*$/
+const INSTRUCTIONS_MAX_LENGTH = 16 * 1024 // 16KB
+
+// Helper: create initial draft with defaults
+function createInitialDraft(): DraftAssistant {
+  return {
+    name: '',
+    instructions: '',
+    metadata: '',
+    region: 'us',
+  }
+}
+
+// Helper: create draft from existing assistant
+function createDraftFromAssistant(assistant: AssistantModel): DraftAssistant {
+  return {
+    name: assistant.name,
+    instructions: assistant.instructions || '',
+    metadata: assistant.metadata ? JSON.stringify(assistant.metadata, null, 2) : '',
+    region: 'us', // Region is set at creation time; cannot be changed
+  }
+}
+
+// Helper: validate draft and return errors
+function validateDraft(draft: DraftAssistant, isEditing: boolean): Record<string, string> {
+  const errors: Record<string, string> = {}
+
+  // Name validation (only for create, not edit)
+  if (!isEditing) {
+    const name = draft.name.trim()
+    if (!name) {
+      errors.name = 'Name is required'
+    } else if (name.length < NAME_MIN_LENGTH || name.length > NAME_MAX_LENGTH) {
+      errors.name = `Name must be ${NAME_MIN_LENGTH}-${NAME_MAX_LENGTH} characters`
+    } else if (!NAME_PATTERN.test(name)) {
+      errors.name = 'Name must be lowercase alphanumeric with hyphens (e.g., my-assistant)'
+    }
+  }
+
+  // Instructions validation
+  if (draft.instructions && draft.instructions.length > INSTRUCTIONS_MAX_LENGTH) {
+    errors.instructions = `Instructions must be under ${INSTRUCTIONS_MAX_LENGTH / 1024}KB`
+  }
+
+  // Metadata validation (must be valid JSON if provided)
+  if (draft.metadata.trim()) {
+    try {
+      const parsed = JSON.parse(draft.metadata)
+      if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
+        errors.metadata = 'Metadata must be a JSON object'
+      } else {
+        // Check that all values are strings
+        for (const [key, value] of Object.entries(parsed)) {
+          if (typeof value !== 'string') {
+            errors.metadata = `Metadata value for "${key}" must be a string`
+            break
+          }
+        }
+      }
+    } catch {
+      errors.metadata = 'Invalid JSON format'
+    }
+  }
+
+  return errors
+}
+
+export function DraftAssistantProvider({ children }: { children: ReactNode }) {
+  const [draftAssistant, setDraftAssistant] = useState<DraftAssistant | null>(null)
+  const [isEditing, setIsEditing] = useState(false)
+  const [editingAssistantName, setEditingAssistantName] = useState<string | null>(null)
+  const [isSubmitting, setIsSubmitting] = useState(false)
+  const [validationErrors, setValidationErrors] = useState<Record<string, string>>({})
+
+  const { currentProfile } = usePinecone()
+  const { setActiveAssistant } = useAssistantSelection()
+  const createMutation = useCreateAssistantMutation(currentProfile?.id || '')
+  const updateMutation = useUpdateAssistantMutation(currentProfile?.id || '')
+
+  // Fetch assistant detail when editing
+  const { data: editingAssistant } = useAssistantDetailQuery(
+    currentProfile?.id || null,
+    editingAssistantName,
+    !!editingAssistantName
+  )
+
+  // Update draft when editing assistant data loads
+  useEffect(() => {
+    if (isEditing && editingAssistant && editingAssistantName) {
+      setDraftAssistant(createDraftFromAssistant(editingAssistant))
+    }
+  }, [isEditing, editingAssistant, editingAssistantName])
+
+  const startCreation = useCallback(() => {
+    setDraftAssistant(createInitialDraft())
+    setIsEditing(false)
+    setEditingAssistantName(null)
+    setValidationErrors({})
+    setActiveAssistant(null)
+  }, [setActiveAssistant])
+
+  const startEditing = useCallback((assistantName: string) => {
+    setEditingAssistantName(assistantName)
+    setIsEditing(true)
+    setValidationErrors({})
+    // Draft will be populated when editingAssistant data loads
+    setDraftAssistant({
+      name: assistantName,
+      instructions: '',
+      metadata: '',
+      region: 'us',
+    })
+    setActiveAssistant(null)
+  }, [setActiveAssistant])
+
+  const updateDraft = useCallback((updates: Partial<DraftAssistant>) => {
+    setDraftAssistant(prev => prev ? { ...prev, ...updates } : prev)
+    // Clear validation errors for updated fields
+    const updatedKeys = Object.keys(updates)
+    if (updatedKeys.length > 0) {
+      setValidationErrors(prev => {
+        const next = { ...prev }
+        updatedKeys.forEach(key => delete next[key])
+        return next
+      })
+    }
+  }, [])
+
+  const cancelDraft = useCallback(() => {
+    setDraftAssistant(null)
+    setIsEditing(false)
+    setEditingAssistantName(null)
+    setValidationErrors({})
+  }, [])
+
+  const saveDraft = useCallback(async () => {
+    if (!draftAssistant || !currentProfile) return
+
+    // Validate
+    const errors = validateDraft(draftAssistant, isEditing)
+    if (Object.keys(errors).length > 0) {
+      setValidationErrors(errors)
+      return
+    }
+
+    setIsSubmitting(true)
+    try {
+      // Parse metadata
+      let metadata: Record<string, string> | undefined
+      if (draftAssistant.metadata.trim()) {
+        metadata = JSON.parse(draftAssistant.metadata)
+      }
+
+      if (isEditing && editingAssistantName) {
+        // Update existing assistant
+        await updateMutation.mutateAsync({
+          name: editingAssistantName,
+          params: {
+            instructions: draftAssistant.instructions || undefined,
+            metadata,
+          },
+        })
+        // Select the updated assistant
+        setActiveAssistant(editingAssistantName)
+      } else {
+        // Create new assistant
+        await createMutation.mutateAsync({
+          name: draftAssistant.name.trim(),
+          instructions: draftAssistant.instructions || undefined,
+          metadata,
+          region: draftAssistant.region,
+        })
+        // Select the new assistant
+        setActiveAssistant(draftAssistant.name.trim())
+      }
+
+      // Clear draft on success
+      setDraftAssistant(null)
+      setIsEditing(false)
+      setEditingAssistantName(null)
+      setValidationErrors({})
+    } catch (error) {
+      const message = error instanceof Error ? error.message : 'Failed to save assistant'
+      setValidationErrors({ _form: message })
+    } finally {
+      setIsSubmitting(false)
+    }
+  }, [draftAssistant, currentProfile, isEditing, editingAssistantName, createMutation, updateMutation, setActiveAssistant])
+
+  const value = useMemo<DraftAssistantContextValue>(() => ({
+    draftAssistant,
+    isEditing,
+    editingAssistantName,
+    isSubmitting,
+    validationErrors,
+    startCreation,
+    startEditing,
+    updateDraft,
+    cancelDraft,
+    saveDraft,
+  }), [
+    draftAssistant,
+    isEditing,
+    editingAssistantName,
+    isSubmitting,
+    validationErrors,
+    startCreation,
+    startEditing,
+    updateDraft,
+    cancelDraft,
+    saveDraft,
+  ])
+
+  return <DraftAssistantContext.Provider value={value}>{children}</DraftAssistantContext.Provider>
+}
+
+export function useDraftAssistant() {
+  const context = useContext(DraftAssistantContext)
+  if (!context) {
+    throw new Error('useDraftAssistant must be used within a DraftAssistantProvider')
+  }
+  return context
+}
diff --git a/src/windows/ConnectionWindow.tsx b/src/windows/ConnectionWindow.tsx
index 6a51d46..efd5871 100644
--- a/src/windows/ConnectionWindow.tsx
+++ b/src/windows/ConnectionWindow.tsx
@@ -4,6 +4,7 @@ import { QueryStateProvider } from '../context/QueryStateContext'
 import { EmbeddingProvider } from '../context/EmbeddingContext'
 import { DraftIndexProvider } from '../context/DraftIndexContext'
 import { DraftNamespaceProvider } from '../context/DraftNamespaceContext'
+import { DraftAssistantProvider } from '../context/DraftAssistantContext'
 import { ClipboardProvider } from '../context/ClipboardContext'
 import { ModeProvider } from '../context/ModeContext'
 import { AssistantSelectionProvider } from '../context/AssistantSelectionContext'
@@ -49,9 +50,11 @@ export function ConnectionWindow({ windowId, profileId }: ConnectionWindowProps)
                   <EmbeddingProvider>
                     <DraftIndexProvider>
                       <DraftNamespaceProvider>
-                        <ErrorBoundary>
-                          <AppLayout />
-                        </ErrorBoundary>
+                        <DraftAssistantProvider>
+                          <ErrorBoundary>
+                            <AppLayout />
+                          </ErrorBoundary>
+                        </DraftAssistantProvider>
                       </DraftNamespaceProvider>
                     </DraftIndexProvider>
                   </EmbeddingProvider>