diff --git a/.gitmessage b/.gitmessage
new file mode 100644
index 0000000..dc1e832
--- /dev/null
+++ b/.gitmessage
@@ -0,0 +1,17 @@
+# <type>(<scope>): <subject>
+# 
+# <body>
+# 
+# <footer>
+#
+# Types: feat | fix | docs | style | refactor | perf | test | chore | ci | build | revert
+# Scopes: epd | auth | api | ui | db | docs | swift | behandelplan | verpleegrapportage
+#
+# Voorbeelden:
+# feat(epd): voeg AI-samenvatting toe
+# fix(auth): corrigeer redirect loop
+# docs: update API documentatie
+#
+# Regels: imperatief, max 50 karakters, kleine letter, geen punt
+# Tip: Blijf compact - body is optioneel, alleen toevoegen als nodig
+
diff --git a/components/swift/artifacts/artifact-area.tsx b/components/swift/artifacts/artifact-area.tsx
new file mode 100644
index 0000000..8d4cf48
--- /dev/null
+++ b/components/swift/artifacts/artifact-area.tsx
@@ -0,0 +1,63 @@
+'use client';
+
+/**
+ * Artifact Area (v3.0)
+ *
+ * Placeholder component voor artifact display area.
+ * Toont welke artifacts hier zullen verschijnen.
+ *
+ * Epic: E1 (Foundation)
+ * Story: E1.S3 (Placeholder componenten)
+ */
+
+export function ArtifactArea() {
+  return (
+    <div className="h-full flex items-center justify-center bg-slate-50 p-6">
+      <div className="max-w-lg text-center text-slate-500">
+        <div className="text-5xl mb-4">📋</div>
+        <h3 className="text-xl font-medium text-slate-700 mb-3">
+          Artifacts verschijnen hier
+        </h3>
+        <p className="text-sm mb-6">
+          Wanneer je een actie vraagt in de chat, verschijnt het bijbehorende formulier of overzicht hier.
+        </p>
+
+        <div className="bg-white rounded-lg border border-slate-200 p-4 text-left space-y-3">
+          <div className="flex items-start gap-3">
+            <div className="w-8 h-8 rounded bg-blue-100 flex items-center justify-center text-sm">
+              📝
+            </div>
+            <div className="flex-1">
+              <p className="font-medium text-slate-700 text-sm">Dagnotitie</p>
+              <p className="text-xs text-slate-500">Voor snelle notities tijdens de dienst</p>
+            </div>
+          </div>
+
+          <div className="flex items-start gap-3">
+            <div className="w-8 h-8 rounded bg-green-100 flex items-center justify-center text-sm">
+              🔍
+            </div>
+            <div className="flex-1">
+              <p className="font-medium text-slate-700 text-sm">Patiënt Zoeken</p>
+              <p className="text-xs text-slate-500">Zoek en selecteer patiënten</p>
+            </div>
+          </div>
+
+          <div className="flex items-start gap-3">
+            <div className="w-8 h-8 rounded bg-purple-100 flex items-center justify-center text-sm">
+              🔄
+            </div>
+            <div className="flex-1">
+              <p className="font-medium text-slate-700 text-sm">Overdracht</p>
+              <p className="text-xs text-slate-500">Dienst overdracht met AI-samenvatting</p>
+            </div>
+          </div>
+        </div>
+
+        <p className="text-xs text-slate-400 mt-6">
+          Artifact functionaliteit komt in Epic 4
+        </p>
+      </div>
+    </div>
+  );
+}
diff --git a/components/swift/chat/chat-message.tsx b/components/swift/chat/chat-message.tsx
index 7529863..789407a 100644
--- a/components/swift/chat/chat-message.tsx
+++ b/components/swift/chat/chat-message.tsx
@@ -12,8 +12,10 @@
 
 import { format } from 'date-fns';
 import { nl } from 'date-fns/locale';
+import { CheckCircle2, Sparkles } from 'lucide-react';
 import { cn } from '@/lib/utils';
 import type { ChatMessage as ChatMessageType } from '@/stores/swift-store';
+import { getConfidenceLabel } from '@/lib/swift/action-parser';
 
 // Message styling configuration per type
 const MESSAGE_STYLES = {
@@ -65,6 +67,27 @@ export function ChatMessage({ message, showTimestamp = false }: ChatMessageProps
         {message.content}
       </div>
 
+      {/* Action badge (E3.S4) - show if action was detected */}
+      {message.action && message.type === 'assistant' && (
+        <div className="mt-2 pt-2 border-t border-slate-200">
+          <div className="flex items-center gap-2 text-xs">
+            <Sparkles className="w-3.5 h-3.5 text-amber-600" />
+            <span className="font-medium text-slate-700">
+              {message.action.intent === 'dagnotitie' && 'Dagnotitie'}
+              {message.action.intent === 'zoeken' && 'Patiënt zoeken'}
+              {message.action.intent === 'overdracht' && 'Overdracht'}
+              {message.action.intent === 'unknown' && 'Onbekend'}
+            </span>
+            {message.action.confidence >= 0.7 && (
+              <CheckCircle2 className="w-3.5 h-3.5 text-green-600" />
+            )}
+            <span className="text-slate-500">
+              {getConfidenceLabel(message.action.confidence)}
+            </span>
+          </div>
+        </div>
+      )}
+
       {/* Timestamp (optional) */}
       {showTimestamp && message.timestamp && (
         <div className="text-xs text-slate-400 mt-1.5">
diff --git a/components/swift/chat/chat-panel.tsx b/components/swift/chat/chat-panel.tsx
index badaf90..4eb1973 100644
--- a/components/swift/chat/chat-panel.tsx
+++ b/components/swift/chat/chat-panel.tsx
@@ -15,6 +15,7 @@ import { ChatMessage } from './chat-message';
 import { ChatInput, ChatInputHandle } from './chat-input';
 import { useSwiftStore } from '@/stores/swift-store';
 import { sendChatMessage } from '@/lib/swift/chat-api';
+import { parseActionFromResponse, shouldOpenArtifact } from '@/lib/swift/action-parser';
 import { cn } from '@/lib/utils';
 
 export function ChatPanel() {
@@ -23,6 +24,7 @@ export function ChatPanel() {
   const updateLastMessage = useSwiftStore((s) => s.updateLastMessage);
   const setStreaming = useSwiftStore((s) => s.setStreaming);
   const isStreaming = useSwiftStore((s) => s.isStreaming);
+  const setPendingAction = useSwiftStore((s) => s.setPendingAction);
   const activePatient = useSwiftStore((s) => s.activePatient);
   const shift = useSwiftStore((s) => s.shift);
 
@@ -174,8 +176,28 @@ export function ChatPanel() {
               updateLastMessage(accumulatedContent);
             },
             () => {
-              // On done
+              // On done - parse action from complete response
               setStreaming(false);
+
+              // E3.S4: Parse action object from AI response
+              const parsed = parseActionFromResponse(accumulatedContent);
+
+              if (parsed.action) {
+                console.log('[ChatPanel] Action detected:', parsed.action);
+
+                // Update last message with cleaned text content and action
+                updateLastMessage(parsed.textContent, parsed.action);
+
+                // Store action in pendingAction for artifact opening (E3.S6)
+                if (shouldOpenArtifact(parsed.action.confidence)) {
+                  setPendingAction(parsed.action);
+                  console.log('[ChatPanel] Pending action set (confidence:', parsed.action.confidence, ')');
+                } else {
+                  console.log('[ChatPanel] Action confidence too low:', parsed.action.confidence);
+                }
+              } else {
+                console.log('[ChatPanel] No action detected in response');
+              }
             },
             (error) => {
               // On error
diff --git a/components/swift/command-center/command-center.tsx b/components/swift/command-center/command-center.tsx
index c9ba766..08d7b90 100644
--- a/components/swift/command-center/command-center.tsx
+++ b/components/swift/command-center/command-center.tsx
@@ -1,25 +1,27 @@
 'use client';
 
 /**
- * Command Center
+ * Command Center (v3.0)
  *
  * Main container for the Swift interface.
- * 4-zone layout: Context Bar | Canvas Area | Recent Strip | Command Input
+ * Split-screen layout: Chat Panel (40%) | Artifact Area (60%)
  *
  * Layout specs:
- * - Context Bar: 48px (h-12)
- * - Canvas Area: flex-1 (fills remaining space)
- * - Recent Strip: 48px (h-12)
- * - Command Input: 64px (h-16)
+ * - Context Bar: 48px (h-12) - UNCHANGED
+ * - Split container: flex-1 (fills remaining space)
+ *   - Chat Panel: 40% width (desktop), 100% (mobile)
+ *   - Artifact Area: 60% width (desktop), 100% (mobile)
+ *
+ * Epic: E1 (Foundation)
+ * Stories: E1.S2 (Split-screen layout), E1.S3 (Placeholders), E1.S4 (Responsive)
  */
 
 import { useEffect, useCallback, useRef } from 'react';
 import { useSwiftStore } from '@/stores/swift-store';
 import { ContextBar } from './context-bar';
-import { CommandInput } from './command-input';
-import { RecentStrip } from './recent-strip';
-import { CanvasArea } from './canvas-area';
 import { OfflineBanner } from './offline-banner';
+import { ChatPanel } from '../chat/chat-panel';
+import { ArtifactArea } from '../artifacts/artifact-area';
 
 export function CommandCenter() {
   const { closeBlock, activeBlock } = useSwiftStore();
@@ -34,7 +36,7 @@ export function CommandCenter() {
         closeBlock();
       }
 
-      // Cmd/Ctrl + K: focus input
+      // Cmd/Ctrl + K: focus input (chat input in v3.0)
       if ((e.metaKey || e.ctrlKey) && e.key === 'k') {
         e.preventDefault();
         inputRef.current?.focus();
@@ -49,21 +51,25 @@ export function CommandCenter() {
   }, [handleKeyDown]);
 
   return (
-    <>
+    <div className="flex flex-col h-screen overflow-hidden">
       {/* Offline Banner */}
       <OfflineBanner />
 
-      {/* Context Bar - 48px */}
+      {/* Context Bar - 48px (unchanged) */}
       <ContextBar />
 
-      {/* Canvas Area - flex */}
-      <CanvasArea />
+      {/* Split-screen container - flex-1 */}
+      <div className="flex-1 flex overflow-hidden">
+        {/* Chat Panel - 40% (desktop), 100% (mobile) */}
+        <div className="w-full lg:w-[40%] border-r border-slate-200 flex flex-col">
+          <ChatPanel />
+        </div>
 
-      {/* Recent Strip - 48px */}
-      <RecentStrip />
-
-      {/* Command Input - 64px */}
-      <CommandInput ref={inputRef} />
-    </>
+        {/* Artifact Area - 60% (desktop), hidden on mobile */}
+        <div className="hidden lg:flex lg:w-[60%] flex-col">
+          <ArtifactArea />
+        </div>
+      </div>
+    </div>
   );
 }
diff --git a/docs/swift/bouwplan-swift-v1.md b/docs/swift/archive/bouwplan-swift-v1.md
similarity index 100%
rename from docs/swift/bouwplan-swift-v1.md
rename to docs/swift/archive/bouwplan-swift-v1.md
diff --git a/docs/swift/bouwplan-swift-v2.md b/docs/swift/archive/bouwplan-swift-v2.md
similarity index 100%
rename from docs/swift/bouwplan-swift-v2.md
rename to docs/swift/archive/bouwplan-swift-v2.md
diff --git a/docs/swift/bouwplan-swift-v3.md b/docs/swift/bouwplan-swift-v3.md
index 80cb7ee..3fe7453 100644
--- a/docs/swift/bouwplan-swift-v3.md
+++ b/docs/swift/bouwplan-swift-v3.md
@@ -221,13 +221,13 @@ const useChatStore = create<ChatState>((set) => ({
 | E0 | Pre-work & Planning | Design tokens, component audit, system prompt | ✅ **Compleet** | 3/3 | 5 SP | Docs aangemaakt |
 | E1 | Foundation - Split-screen | Layout naar 40/60 split | ✅ **Compleet** | 3/3 | 12 SP | E1.S1 geskipt (geen feature flag) |
 | E2 | Chat Panel & Messages | Chat UI zonder AI | ✅ **Compleet** | 5/5 | 13 SP | Scrolling, input, shortcuts |
-| E3 | Chat API & Medical Scribe | AI conversatie werkend | ⏳ In Progress | 3/6 | 21 SP | Medical scribe prompt v1.0 |
+| E3 | Chat API & Medical Scribe | AI conversatie werkend | ⏳ In Progress | 4/6 | 21 SP | Intent detection parsing |
 | E4 | Artifact Area & Tabs | Meerdere artifacts mogelijk | ⏳ To Do | 0/4 | 13 SP | Week 5 |
 | E5 | AI-Filtering & Polish | Psychiater filtering, polish | ⏳ To Do | 0/5 | 13 SP | Week 6 |
 | E6 | Testing & Refinement | QA, bugs, performance | ⏳ To Do | 0/4 | 8 SP | Week 7-8 |
 
 **Totaal:** 31 stories, **85 Story Points** (~7 weken à 12 SP/week)
-**Voortgang:** ✅ 14/31 stories compleet (41 SP / 85 SP = **48%**)
+**Voortgang:** ✅ 15/31 stories compleet (46 SP / 85 SP = **54%**)
 
 **Belangrijk:**
 - ⚠️ Voer niet in 1x het volledige plan uit. Bouw per epic en per story.
@@ -409,7 +409,7 @@ const MESSAGE_STYLES = {
 | E3.S1 | Chat API endpoint skeleton | `/api/swift/chat` route met SSE setup | ✅ **Compleet** | E2.S5 | 3 |
 | E3.S2 | Streaming response logic | Claude API streaming werkt, chunks naar frontend | ✅ **Compleet** | E3.S1 | 5 |
 | E3.S3 | Medical scribe system prompt | Prompt met role, intents, examples, Nederlands | ✅ **Compleet** | E3.S2 | 3 |
-| E3.S4 | Intent detection in response | AI genereert action objects (intent + entities) | ⏳ | E3.S3 | 5 |
+| E3.S4 | Intent detection in response | AI genereert action objects (intent + entities) | ✅ **Compleet** | E3.S3 | 5 |
 | E3.S5 | Frontend streaming handling | useChatStream hook, message chunks renderen | ⏳ | E3.S4 | 3 |
 | E3.S6 | Artifact opening from chat | Action object opent juiste block met prefill | ⏳ | E3.S5 | 2 |
 
@@ -553,11 +553,29 @@ export function useChatStream() {
 - ✅ 4 voorbeelden: dagnotitie, zoeken, verduidelijking, onduidelijke intent
 - ✅ Build succesvol zonder type errors
 
+**Deliverables (E3.S4 compleet):**
+- ✅ `lib/swift/action-parser.ts` (149 regels) — JSON action parser met Zod validatie
+- ✅ `parseActionFromResponse()` — Extract JSON from ```json code blocks
+- ✅ `extractJsonBlock()` — Markdown code block regex matching
+- ✅ `removeJsonBlocks()` — Clean text content zonder JSON
+- ✅ `shouldOpenArtifact()` — Confidence threshold check (≥0.7)
+- ✅ `getConfidenceLabel()` — User-friendly labels (Zeer zeker, Redelijk zeker, etc.)
+- ✅ `validateArtifactType()` — Intent/artifact type matching validation
+- ✅ ChatPanel: Action parsing in onDone callback
+- ✅ ChatPanel: setPendingAction voor artifact opening (E3.S6)
+- ✅ ChatMessage: Action badge met intent + confidence indicator
+- ✅ Store: updateLastMessage met optional action parameter
+- ✅ Action schema validation: intent, entities, confidence, artifact
+- ✅ Visual feedback: Sparkles icon, CheckCircle voor high confidence
+- ✅ Console logging voor debugging action detection
+- ✅ Build succesvol zonder type errors
+
 **Git Commits:**
 - `a51acf6` — E3.S1 & E3.S2 (Chat API + Claude streaming)
-- (to be committed) — E3.S3 (Medical scribe system prompt v1.0)
+- `8efac84` — E3.S3 (Medical scribe system prompt v1.0)
+- (to be committed) — E3.S4 (Intent detection in response)
 
-**Remaining:** E3.S4-E3.S6 voor intent detection parsing, frontend handling, en artifact opening
+**Remaining:** E3.S5-E3.S6 voor frontend streaming polish en artifact opening
 
 ---
 
diff --git a/docs/templates/commit_template.md b/docs/templates/commit_template.md
new file mode 100644
index 0000000..bdfdf3a
--- /dev/null
+++ b/docs/templates/commit_template.md
@@ -0,0 +1,163 @@
+# 📝 Commit Message Template
+
+**Doel:** Consistente commit messages voor een begrijpelijke projectgeschiedenis.  
+**Tip:** Blijf compact - body en footer zijn optioneel, alleen toevoegen als het nodig is voor duidelijkheid.
+
+---
+
+## Structuur
+
+```
+<type>(<scope>): <subject>
+
+<body>
+
+<footer>
+```
+
+**Voorbeeld:**
+```
+feat(epd): voeg AI-samenvatting toe aan intakeverslag
+
+Voegt een nieuwe knop toe in de rich text editor die de intake
+automatisch samenvat met behulp van de AI API.
+
+Closes #123
+```
+
+---
+
+## Types
+
+| Type | Beschrijving | Voorbeeld |
+|------|--------------|-----------|
+| `feat` | Nieuwe functionaliteit | `feat(epd): voeg behandelplan editor toe` |
+| `fix` | Bug fix | `fix(auth): corrigeer redirect loop` |
+| `docs` | Documentatie | `docs: update API documentatie` |
+| `style` | Code formatting | `style: format code met prettier` |
+| `refactor` | Code refactoring | `refactor(api): herstructureer error handling` |
+| `perf` | Performance verbetering | `perf(db): optimaliseer query met index` |
+| `test` | Tests | `test: voeg unit tests toe` |
+| `chore` | Build/tooling | `chore: update dependencies` |
+| `ci` | CI/CD | `ci: voeg GitHub Actions toe` |
+| `build` | Build systeem | `build: configureer webpack` |
+| `revert` | Revert commit | `revert: revert "feat: voeg X toe"` |
+
+---
+
+## Scopes
+
+- `epd` - EPD features
+- `auth` - Authenticatie/autor-isatie
+- `api` - API endpoints
+- `ui` - UI componenten
+- `db` - Database migraties
+- `docs` - Documentatie
+- `swift` - Swift medical scribe
+- `behandelplan` - Behandelplan
+- `verpleegrapportage` - Verpleegrapportage
+
+---
+
+## Subject Regels
+
+- ✅ Imperatief ("voeg toe", niet "toegevoegd")
+- ✅ Maximaal 50 karakters
+- ✅ Geen punt aan het einde
+- ✅ Begin met kleine letter
+- ✅ Beschrijf **wat**, niet **waarom**
+
+**Goed:** `feat(epd): voeg AI-samenvatting toe`  
+**Slecht:** `feat(epd): Voeg AI-samenvatting toe.` ← hoofdletter en punt
+
+---
+
+## Body (Optioneel)
+
+**Tip:** Alleen toevoegen als de subject regel niet voldoende duidelijkheid geeft.
+
+- Scheid van subject met lege regel
+- Maximaal 72 karakters per regel
+- Leg uit **waarom** en **hoe** (alleen indien nodig)
+- Beschrijf edge cases indien relevant
+- **Blijf compact** - vaak is alleen de subject regel voldoende
+
+---
+
+## Footer (Optioneel)
+
+- `Closes #123` - Sluit issue automatisch
+- `Fixes #456` - Fix issue
+- `BREAKING CHANGE: beschrijving` - Breaking change
+
+---
+
+## Voorbeelden
+
+### Feature
+```
+feat(swift): voeg voice commands toe
+
+Voegt spraakherkenning toe voor commando's tijdens dicteren.
+Ondersteunt "nieuwe sectie", "opslaan", en "annuleren".
+
+Closes #234
+```
+
+### Bug Fix
+```
+fix(behandelplan): corrigeer opslaan leefgebieden scores
+
+Het opslaan faalde wanneer er geen vorige scores waren.
+Toegevoegd: check voor null/undefined waarden.
+
+Fixes #567
+```
+
+### Breaking Change
+```
+feat(auth): migreer naar Supabase Auth v2
+
+BREAKING CHANGE: `loginUser()` vervangen door `signInWithPassword()`
+
+Migratie:
+- Vervang `loginUser(email, password)` met `signInWithPassword(email, password)`
+- Update imports van `@/lib/auth` naar `@/lib/auth/client`
+
+Closes #890
+```
+
+---
+
+## Tips
+
+**✅ Do's:**
+- Wees specifiek: `fix(epd): corrigeer null pointer` > `fix: bug fix`
+- Gebruik scope voor duidelijkheid
+- Verwijs naar issues met `Closes #123`
+- Gebruik imperatief
+- **Blijf compact** - vaak is alleen `type(scope): subject` voldoende
+
+**❌ Don'ts:**
+- Geen vage beschrijvingen (`fix: stuff`)
+- Geen emoji's in commit message
+- Geen verleden tijd ("voegde toe")
+- Geen meerdere wijzigingen in één commit
+
+---
+
+## Git Configuratie
+
+```bash
+# Lokaal
+git config commit.template .gitmessage
+
+# Globaal
+git config --global commit.template .gitmessage
+```
+
+Gebruik: `git commit` (zonder `-m`) opent editor met template.
+
+---
+
+**Zie `.gitmessage` voor de Git template.**
diff --git a/lib/swift/action-parser.ts b/lib/swift/action-parser.ts
new file mode 100644
index 0000000..d860520
--- /dev/null
+++ b/lib/swift/action-parser.ts
@@ -0,0 +1,148 @@
+/**
+ * Action Parser for Swift Medical Scribe
+ *
+ * Parses JSON action objects from AI responses and validates them.
+ *
+ * Epic: E3 (Chat API & Medical Scribe)
+ * Story: E3.S4 (Intent detection in response)
+ */
+
+import { z } from 'zod';
+import type { ChatAction, SwiftIntent, BlockType } from '@/stores/swift-store';
+
+// Validation schema for action objects
+const ActionSchema = z.object({
+  type: z.literal('action'),
+  intent: z.enum(['dagnotitie', 'zoeken', 'overdracht', 'unknown']),
+  entities: z.object({
+    patientName: z.string().optional(),
+    patientId: z.string().optional(),
+    category: z.enum(['medicatie', 'adl', 'gedrag', 'incident', 'observatie']).optional(),
+    content: z.string().optional(),
+    query: z.string().optional(), // For zoeken intent
+  }),
+  confidence: z.number().min(0).max(1),
+  artifact: z
+    .object({
+      type: z.enum(['dagnotitie', 'zoeken', 'overdracht', 'fallback']),
+      prefill: z.record(z.string(), z.any()),
+    })
+    .optional(),
+});
+
+export interface ParsedActionResult {
+  action: ChatAction | null;
+  textContent: string; // Text without JSON block
+  rawJson?: string; // Raw JSON string if found
+}
+
+/**
+ * Extract JSON code block from markdown text
+ * Looks for ```json ... ``` blocks
+ */
+function extractJsonBlock(text: string): string | null {
+  // Match ```json ... ``` blocks (with newlines)
+  const jsonBlockRegex = /```json\s*\n([\s\S]*?)\n```/;
+  const match = text.match(jsonBlockRegex);
+
+  if (match && match[1]) {
+    return match[1].trim();
+  }
+
+  return null;
+}
+
+/**
+ * Remove JSON code blocks from text
+ */
+function removeJsonBlocks(text: string): string {
+  return text.replace(/```json\s*\n[\s\S]*?\n```/g, '').trim();
+}
+
+/**
+ * Parse action object from AI response
+ *
+ * Extracts and validates JSON action objects from markdown code blocks.
+ *
+ * @param responseText - Full AI response text
+ * @returns Parsed action (if valid), cleaned text content, and raw JSON
+ */
+export function parseActionFromResponse(responseText: string): ParsedActionResult {
+  // Extract JSON block from markdown
+  const jsonString = extractJsonBlock(responseText);
+
+  if (!jsonString) {
+    return {
+      action: null,
+      textContent: responseText,
+    };
+  }
+
+  // Try to parse JSON
+  let parsedJson: unknown;
+  try {
+    parsedJson = JSON.parse(jsonString);
+  } catch (error) {
+    console.error('Failed to parse JSON action:', error);
+    return {
+      action: null,
+      textContent: responseText,
+      rawJson: jsonString,
+    };
+  }
+
+  // Validate against schema
+  const validation = ActionSchema.safeParse(parsedJson);
+
+  if (!validation.success) {
+    console.error('Action validation failed:', validation.error);
+    return {
+      action: null,
+      textContent: removeJsonBlocks(responseText),
+      rawJson: jsonString,
+    };
+  }
+
+  // Valid action found
+  const action: ChatAction = {
+    intent: validation.data.intent,
+    entities: validation.data.entities,
+    confidence: validation.data.confidence,
+    artifact: validation.data.artifact,
+  };
+
+  return {
+    action,
+    textContent: removeJsonBlocks(responseText),
+    rawJson: jsonString,
+  };
+}
+
+/**
+ * Check if confidence is high enough to open artifact
+ */
+export function shouldOpenArtifact(confidence: number): boolean {
+  return confidence >= 0.7;
+}
+
+/**
+ * Get user-friendly confidence label
+ */
+export function getConfidenceLabel(confidence: number): string {
+  if (confidence >= 0.9) return 'Zeer zeker';
+  if (confidence >= 0.7) return 'Redelijk zeker';
+  if (confidence >= 0.5) return 'Onzeker';
+  return 'Zeer onzeker';
+}
+
+/**
+ * Validate that artifact type matches intent
+ */
+export function validateArtifactType(intent: SwiftIntent, artifactType?: BlockType): boolean {
+  if (!artifactType) return true; // No artifact is valid
+
+  // Intent should match artifact type (except for 'unknown' and 'fallback')
+  if (intent === 'unknown') return artifactType === 'fallback';
+
+  return intent === artifactType;
+}
diff --git a/stores/swift-store.ts b/stores/swift-store.ts
index 1cc089d..b84037a 100644
--- a/stores/swift-store.ts
+++ b/stores/swift-store.ts
@@ -102,7 +102,7 @@ interface SwiftStore {
 
   // Chat actions (v3.0)
   addChatMessage: (message: Omit<ChatMessage, 'id' | 'timestamp'>) => void;
-  updateLastMessage: (content: string) => void;
+  updateLastMessage: (content: string, action?: ChatAction | null) => void;
   clearChat: () => void;
   setStreaming: (streaming: boolean) => void;
   setPendingAction: (action: ChatAction | null) => void;
@@ -215,15 +215,22 @@ export const useSwiftStore = create<SwiftStore>()(
         );
       },
 
-      updateLastMessage: (content) => {
+      updateLastMessage: (content, action?) => {
         set(
           (state) => {
             const messages = [...state.chatMessages];
             if (messages.length > 0) {
-              messages[messages.length - 1] = {
+              const updatedMessage: ChatMessage = {
                 ...messages[messages.length - 1],
                 content,
               };
+
+              // Only add action if it's not null/undefined
+              if (action !== undefined && action !== null) {
+                updatedMessage.action = action;
+              }
+
+              messages[messages.length - 1] = updatedMessage;
             }
             return { chatMessages: messages };
           },
