10 files changed, 421 insertions, 35 deletions

diff --git a/renderer/src/App.tsx b/renderer/src/App.tsx
index 719faac..7c5c969 100644
--- a/renderer/src/App.tsx
+++ b/renderer/src/App.tsx
@@ -5,6 +5,7 @@ import { DocumentPane } from "./components/DocumentPane";
 import { ChatPane } from "./components/ChatPane";
 import { ActionBar } from "./components/ActionBar";
 import { SettingsPage } from "./components/SettingsPage";
+import { NewSessionModal } from "./components/NewSessionModal";
 import type { Project, Session, Message, Phase, TokenUsage } from "./types";
 import "./styles/globals.css";
 
@@ -66,6 +67,8 @@ export function App() {
   });
   const [error, setError] = useState<string | null>(null);
   const [showSettings, setShowSettings] = useState(false);
+  const [showNewSessionModal, setShowNewSessionModal] = useState(false);
+  const [newSessionProjectId, setNewSessionProjectId] = useState<string | null>(null);
   const [activeModel, setActiveModel] = useState<string | null>(null);
 
   const [theme, setTheme] = useState<Theme>(
@@ -451,12 +454,25 @@ export function App() {
     setSelectedProject(project);
   };
 
-  const handleCreateSession = async (projectId: string) => {
+  // Called by Sidebar when user clicks "+" — opens the phase-selection modal
+  const handleCreateSession = (projectId: string) => {
+    setNewSessionProjectId(projectId);
+    setShowNewSessionModal(true);
+  };
+
+  // Called by NewSessionModal when user clicks "Create"
+  const handleConfirmNewSession = async (phase: Phase) => {
+    setShowNewSessionModal(false);
+    const projectId = newSessionProjectId;
+    setNewSessionProjectId(null);
+    if (!projectId) return;
+
     const project = projects.find((p) => p.id === projectId);
     if (!project) return;
+
     const projectSessions = sessions.filter((s) => s.project_id === projectId);
     const name = `Session ${projectSessions.length + 1}`;
-    const session = await api.createSession(projectId, name);
+    const session = await api.createSession(projectId, name, phase);
     setSessions((prev) => [session, ...prev]);
     setSelectedProject(project);
     setSelectedSession(session);
@@ -623,6 +639,16 @@ export function App() {
       {showSettings && (
         <SettingsPage onClose={() => setShowSettings(false)} />
       )}
+
+      {showNewSessionModal && (
+        <NewSessionModal
+          onConfirm={handleConfirmNewSession}
+          onCancel={() => {
+            setShowNewSessionModal(false);
+            setNewSessionProjectId(null);
+          }}
+        />
+      )}
     </div>
   );
 }
diff --git a/renderer/src/components/DocumentPane.tsx b/renderer/src/components/DocumentPane.tsx
index f5368b3..2ec66f6 100644
--- a/renderer/src/components/DocumentPane.tsx
+++ b/renderer/src/components/DocumentPane.tsx
@@ -117,6 +117,11 @@ export function DocumentPane({
 }: DocumentPaneProps) {
   const [isEditing, setIsEditing] = useState(false);
 
+  // Always exit edit mode when the pane becomes read-only.
+  useEffect(() => {
+    if (disabled) setIsEditing(false);
+  }, [disabled]);
+
   if (showOnboarding) {
     return (
       <div className="document-pane">
@@ -206,9 +211,13 @@ export function DocumentPane({
     <div className="document-pane">
       <div className="document-header">
         <span>{filename}</span>
-        <button onClick={() => setIsEditing(!isEditing)}>
-          {isEditing ? "Preview" : "Edit"}
-        </button>
+        {disabled ? (
+          <span className="badge badge-readonly">Read-only</span>
+        ) : (
+          <button onClick={() => setIsEditing(!isEditing)}>
+            {isEditing ? "Preview" : "Edit"}
+          </button>
+        )}
       </div>
 
       {isEditing ? (
diff --git a/renderer/src/components/NewSessionModal.tsx b/renderer/src/components/NewSessionModal.tsx
new file mode 100644
index 0000000..ad5dae9
--- /dev/null
+++ b/renderer/src/components/NewSessionModal.tsx
@@ -0,0 +1,60 @@
+import React, { useState, useEffect } from "react";
+import type { Phase } from "../types";
+
+interface NewSessionModalProps {
+  onConfirm: (phase: Phase) => void;
+  onCancel: () => void;
+}
+
+const phaseOptions: { phase: Phase; label: string; description: string }[] = [
+  { phase: "research",  label: "Research",  description: "Understand the codebase and requirements" },
+  { phase: "plan",      label: "Plan",      description: "Create a detailed implementation strategy" },
+  { phase: "implement", label: "Implement", description: "Execute the implementation plan" },
+];
+
+export function NewSessionModal({ onConfirm, onCancel }: NewSessionModalProps) {
+  const [selected, setSelected] = useState<Phase>("research");
+
+  // Close on Escape
+  useEffect(() => {
+    const onKey = (e: KeyboardEvent) => { if (e.key === "Escape") onCancel(); };
+    window.addEventListener("keydown", onKey);
+    return () => window.removeEventListener("keydown", onKey);
+  }, [onCancel]);
+
+  return (
+    <div className="modal-backdrop" onClick={onCancel}>
+      <div className="modal" onClick={(e) => e.stopPropagation()}>
+
+        <div className="modal-header">
+          <span className="modal-title">New Session</span>
+          <button className="modal-close" onClick={onCancel}>×</button>
+        </div>
+
+        <div className="modal-body">
+          <p className="modal-prompt">Choose where to start</p>
+          <div className="phase-cards">
+            {phaseOptions.map(({ phase, label, description }) => (
+              <button
+                key={phase}
+                className={`phase-card${selected === phase ? " selected" : ""}`}
+                onClick={() => setSelected(phase)}
+              >
+                <span className="phase-card-label">{label}</span>
+                <span className="phase-card-desc">{description}</span>
+              </button>
+            ))}
+          </div>
+        </div>
+
+        <div className="modal-footer">
+          <button className="modal-btn-secondary" onClick={onCancel}>Cancel</button>
+          <button className="modal-btn-primary" onClick={() => onConfirm(selected)}>
+            Create
+          </button>
+        </div>
+
+      </div>
+    </div>
+  );
+}
diff --git a/renderer/src/components/settings/ModelSettings.tsx b/renderer/src/components/settings/ModelSettings.tsx
index ecfc12c..f0cbda5 100644
--- a/renderer/src/components/settings/ModelSettings.tsx
+++ b/renderer/src/components/settings/ModelSettings.tsx
@@ -1,21 +1,61 @@
 import React, { useState, useEffect } from "react";
+import type { Phase } from "../../types";
 
 const api = window.api;
 
+const PHASES: Phase[] = ["research", "plan", "implement"];
+const PHASE_LABELS: Record<Phase, string> = {
+  research: "Research",
+  plan: "Plan",
+  implement: "Implement",
+};
+
 export function ModelSettings() {
-  // null = not yet loaded from DB
+  // ── Global default ───────────────────────────────────────────
   const [model, setModel] = useState<string | null>(null);
   const [draft, setDraft] = useState("");
   const [saveStatus, setSaveStatus] = useState<"idle" | "saved">("idle");
 
+  // ── Per-phase overrides ──────────────────────────────────────
+  const [phaseModels, setPhaseModels] = useState<Record<Phase, string | null>>({
+    research: null,
+    plan: null,
+    implement: null,
+  });
+  const [phaseDrafts, setPhaseDrafts] = useState<Record<Phase, string>>({
+    research: "",
+    plan: "",
+    implement: "",
+  });
+  const [phaseStatus, setPhaseStatus] = useState<Record<Phase, "idle" | "saved">>({
+    research: "idle",
+    plan: "idle",
+    implement: "idle",
+  });
+
   useEffect(() => {
-    api.getSettings(["model"]).then((settings) => {
-      const saved = settings["model"] ?? "";
-      setModel(saved);
-      setDraft(saved);
-    });
+    api
+      .getSettings(["model", "model.research", "model.plan", "model.implement"])
+      .then((settings) => {
+        const saved = settings["model"] ?? "";
+        setModel(saved);
+        setDraft(saved);
+
+        const pm: Record<Phase, string | null> = {
+          research: settings["model.research"],
+          plan: settings["model.plan"],
+          implement: settings["model.implement"],
+        };
+        setPhaseModels(pm);
+        setPhaseDrafts({
+          research: pm.research ?? "",
+          plan: pm.plan ?? "",
+          implement: pm.implement ?? "",
+        });
+      });
   }, []);
 
+  // ── Global handlers ──────────────────────────────────────────
   const handleSave = async () => {
     const trimmed = draft.trim();
     if (trimmed) {
@@ -37,6 +77,34 @@ export function ModelSettings() {
     setTimeout(() => setSaveStatus("idle"), 1500);
   };
 
+  // ── Per-phase handlers ───────────────────────────────────────
+  const handlePhaseSave = async (phase: Phase) => {
+    const trimmed = phaseDrafts[phase].trim();
+    if (trimmed) {
+      await api.setSetting(`model.${phase}`, trimmed);
+      setPhaseModels((prev) => ({ ...prev, [phase]: trimmed }));
+    } else {
+      await api.deleteSetting(`model.${phase}`);
+      setPhaseModels((prev) => ({ ...prev, [phase]: null }));
+    }
+    setPhaseStatus((prev) => ({ ...prev, [phase]: "saved" }));
+    setTimeout(
+      () => setPhaseStatus((prev) => ({ ...prev, [phase]: "idle" })),
+      1500
+    );
+  };
+
+  const handlePhaseReset = async (phase: Phase) => {
+    await api.deleteSetting(`model.${phase}`);
+    setPhaseModels((prev) => ({ ...prev, [phase]: null }));
+    setPhaseDrafts((prev) => ({ ...prev, [phase]: "" }));
+    setPhaseStatus((prev) => ({ ...prev, [phase]: "saved" }));
+    setTimeout(
+      () => setPhaseStatus((prev) => ({ ...prev, [phase]: "idle" })),
+      1500
+    );
+  };
+
   if (model === null) {
     return (
       <div style={{ color: "var(--text-secondary)", fontSize: 12 }}>
@@ -49,10 +117,11 @@ export function ModelSettings() {
 
   return (
     <div>
-      <div className="settings-section-title">Model</div>
+      {/* ── Global default ──────────────────────────────────── */}
+      <div className="settings-section-title">Default Model</div>
       <div className="settings-section-desc">
-        Claude model to use for all phases. Leave blank to use the SDK&apos;s
-        default model. Takes effect on the next message sent in any session.
+        Fallback model used for all phases unless a per-phase override is set.
+        Leave blank to use the SDK&apos;s built-in default.
       </div>
 
       <div className="settings-toggle-row">
@@ -60,7 +129,7 @@ export function ModelSettings() {
           className="settings-model-input"
           type="text"
           value={draft}
-          placeholder="Default (e.g. claude-sonnet-4-5)"
+          placeholder="e.g. claude-sonnet-4-5"
           onChange={(e) => {
             setDraft(e.target.value);
             setSaveStatus("idle");
@@ -75,7 +144,7 @@ export function ModelSettings() {
       <div className="settings-actions">
         {model && (
           <button className="btn-secondary" onClick={handleReset}>
-            Reset to Default
+            Reset
           </button>
         )}
         <button
@@ -85,9 +154,68 @@ export function ModelSettings() {
         >
           {saveStatus === "saved" ? "Saved \u2713" : "Save"}
         </button>
-        {model && (
-          <span className="settings-custom-badge">custom</span>
-        )}
+        {model && <span className="settings-custom-badge">custom</span>}
+      </div>
+
+      {/* ── Per-phase overrides ─────────────────────────────── */}
+      <div className="settings-section-title" style={{ marginTop: 24 }}>
+        Phase Overrides
+      </div>
+      <div className="settings-section-desc">
+        Use a different model for a specific phase. Leave blank to inherit the
+        default above. Takes effect on the next message in any session.
+      </div>
+
+      <div className="settings-phase-model-list">
+        {PHASES.map((phase) => {
+          const saved = phaseModels[phase];
+          const phaseDirty = phaseDrafts[phase].trim() !== (saved ?? "");
+
+          return (
+            <div key={phase} className="settings-phase-model-row">
+              <span className="settings-phase-model-label">
+                {PHASE_LABELS[phase]}
+              </span>
+              <input
+                className="settings-model-input"
+                type="text"
+                value={phaseDrafts[phase]}
+                placeholder={model ? `Inherits: ${model}` : "Inherits default"}
+                onChange={(e) => {
+                  setPhaseDrafts((prev) => ({
+                    ...prev,
+                    [phase]: e.target.value,
+                  }));
+                  setPhaseStatus((prev) => ({ ...prev, [phase]: "idle" }));
+                }}
+                onKeyDown={(e) => {
+                  if (e.key === "Enter") handlePhaseSave(phase);
+                }}
+                spellCheck={false}
+              />
+              <div className="settings-phase-model-actions">
+                {saved && (
+                  <button
+                    className="btn-secondary"
+                    onClick={() => handlePhaseReset(phase)}
+                  >
+                    Reset
+                  </button>
+                )}
+                <button
+                  className="btn-primary"
+                  onClick={() => handlePhaseSave(phase)}
+                  disabled={!phaseDirty}
+                >
+                  {phaseStatus[phase] === "saved" ? "Saved \u2713" : "Save"}
+                </button>
+                {saved && (
+                  <span className="settings-custom-badge">custom</span>
+                )}
+              </div>
+            </div>
+          );
+        })}
       </div>
     </div>
   );
diff --git a/renderer/src/styles/globals.css b/renderer/src/styles/globals.css
index c463432..dc7d4a5 100644
--- a/renderer/src/styles/globals.css
+++ b/renderer/src/styles/globals.css
@@ -1711,6 +1711,166 @@ html[data-theme="light"] .settings-textarea:focus {
   margin-left: 4px;
 }
 
+/* ── New Session Modal ───────────────────────────────────────── */
+.modal-backdrop {
+  position: fixed;
+  inset: 0;
+  background: rgba(0, 0, 0, 0.55);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 200;
+}
+
+.modal {
+  background: var(--bg-secondary);
+  border: 1px solid var(--border);
+  border-radius: 4px;
+  width: 400px;
+  display: flex;
+  flex-direction: column;
+  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.4);
+}
+
+.modal-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 12px 16px;
+  border-bottom: 1px solid var(--border);
+}
+
+.modal-title {
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--text-primary);
+  text-transform: uppercase;
+  letter-spacing: 0.08em;
+}
+
+.modal-close {
+  background: transparent;
+  border: 1px solid var(--border);
+  border-radius: 2px;
+  color: var(--text-secondary);
+  font-size: 14px;
+  width: 22px;
+  height: 22px;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: background 0.15s;
+}
+
+.modal-close:hover {
+  background: var(--bg-tertiary);
+  color: var(--text-primary);
+}
+
+.modal-body {
+  padding: 20px 16px 16px;
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.modal-prompt {
+  font-size: 12px;
+  color: var(--text-secondary);
+  text-transform: uppercase;
+  letter-spacing: 0.08em;
+}
+
+.phase-cards {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+}
+
+.phase-card {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 2px;
+  padding: 10px 12px;
+  background: var(--bg-primary);
+  border: 1px solid var(--border);
+  border-radius: 3px;
+  cursor: pointer;
+  text-align: left;
+  transition: border-color 0.15s, background 0.15s;
+  width: 100%;
+}
+
+.phase-card:hover {
+  border-color: var(--accent);
+  background: var(--bg-tertiary);
+}
+
+.phase-card.selected {
+  border-color: var(--accent);
+  background: var(--bg-tertiary);
+}
+
+.phase-card-label {
+  font-size: 12px;
+  font-weight: 600;
+  color: var(--text-primary);
+}
+
+.phase-card.selected .phase-card-label {
+  color: var(--accent);
+}
+
+.phase-card-desc {
+  font-size: 11px;
+  color: var(--text-secondary);
+}
+
+.modal-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+  padding: 12px 16px;
+  border-top: 1px solid var(--border);
+}
+
+.modal-btn-secondary {
+  background: transparent;
+  border: 1px solid var(--border);
+  border-radius: 2px;
+  color: var(--text-secondary);
+  font-size: 12px;
+  padding: 5px 12px;
+  cursor: pointer;
+  font-family: inherit;
+  transition: background 0.15s;
+}
+
+.modal-btn-secondary:hover {
+  background: var(--bg-tertiary);
+  color: var(--text-primary);
+}
+
+.modal-btn-primary {
+  background: var(--accent);
+  border: 1px solid var(--accent);
+  border-radius: 2px;
+  color: #fff;
+  font-size: 12px;
+  padding: 5px 12px;
+  cursor: pointer;
+  font-family: inherit;
+  font-weight: 600;
+  transition: background 0.15s;
+}
+
+.modal-btn-primary:hover {
+  background: var(--accent-hover);
+  border-color: var(--accent-hover);
+}
+
 .mcp-tools-empty {
   font-size: 11px;
   color: var(--text-secondary);
diff --git a/src/main/claude/index.ts b/src/main/claude/index.ts
index 8cf512c..9139f17 100644
--- a/src/main/claude/index.ts
+++ b/src/main/claude/index.ts
@@ -48,8 +48,9 @@ export async function sendMessage({
   // Load any custom system prompt for this phase (null → use default)
   const customSystemPrompt = getSetting(`systemPrompt.${session.phase}`) ?? undefined;
 
-  // Load global model override (empty string or null → let SDK use its default)
-  const configuredModel = getSetting("model") || undefined;
+  // Phase-specific model override takes precedence; falls back to global default.
+  const configuredModel =
+    getSetting(`model.${session.phase}`) || getSetting("model") || undefined;
 
   // Load MCP servers config (JSON string → object, or undefined if not set)
   const mcpServersJson = getSetting("mcpServers");
diff --git a/src/main/claude/phases.ts b/src/main/claude/phases.ts
index a1cbba1..e8c16df 100644
--- a/src/main/claude/phases.ts
+++ b/src/main/claude/phases.ts
@@ -87,11 +87,12 @@ CRITICAL RULES:
 
 CONTEXT:
 - Read CLAUDE.md at project root for codebase overview
-- Read ${artifactDir}/research.md to understand the specific task
+- Read ${artifactDir}/research.md to understand the specific task.
+  If research.md does not exist, this session began at the planning phase — base your plan on the task description provided in the chat instead.
 
 WORKFLOW:
 1. Read CLAUDE.md for codebase overview
-2. Read ${artifactDir}/research.md to understand the specific task
+2. Read ${artifactDir}/research.md if it exists; otherwise use the task description from chat
 3. Write a detailed plan to ${artifactDir}/plan.md
 4. Include specific code snippets showing proposed changes
 5. Make the plan detailed enough that implementation is mechanical
@@ -141,14 +142,15 @@ Remember: Your output goes in ${artifactDir}/plan.md, not chat. Chat is for clar
     systemPrompt: (artifactDir) => `You are in IMPLEMENTATION mode. Execute the approved plan.
 
 CRITICAL RULES:
-1. Read ${artifactDir}/plan.md and follow it exactly
+1. Read ${artifactDir}/plan.md if it exists and follow it exactly.
+   If plan.md does not exist, this session began at the implementation phase — implement based on the task description provided in the chat messages.
 2. Mark tasks complete in ${artifactDir}/plan.md as you finish them: - [ ] → - [x]
 3. DO NOT deviate from the plan without asking
 4. Run tests/typecheck if available
 5. Stop and ask if you encounter issues not covered by the plan
 
 WORKFLOW:
-1. Read ${artifactDir}/plan.md
+1. Read ${artifactDir}/plan.md (if it exists)
 2. Execute each task in order
 3. Update ${artifactDir}/plan.md to mark tasks complete
 4. Continue until all tasks are done
diff --git a/src/main/db/sessions.ts b/src/main/db/sessions.ts
index 3e6352c..bc22d15 100644
--- a/src/main/db/sessions.ts
+++ b/src/main/db/sessions.ts
@@ -36,21 +36,21 @@ export function getSession(id: string): Session | undefined {
     .get(id) as Session | undefined;
 }
 
-export function createSession(projectId: string, name: string): Session {
+export function createSession(projectId: string, name: string, phase: Phase = "research"): Session {
   const db = getDb();
   const id = uuid();
   const now = Math.floor(Date.now() / 1000);
 
   db.prepare(
     `INSERT INTO sessions (id, project_id, name, phase, permission_mode, created_at, updated_at)
-     VALUES (?, ?, ?, 'research', 'acceptEdits', ?, ?)`
-  ).run(id, projectId, name, now, now);
+     VALUES (?, ?, ?, ?, 'acceptEdits', ?, ?)`
+  ).run(id, projectId, name, phase, now, now);
 
   return {
     id,
     project_id: projectId,
     name,
-    phase: "research",
+    phase,
     claude_session_id: null,
     permission_mode: "acceptEdits",
     git_branch: null,
diff --git a/src/main/ipc/handlers.ts b/src/main/ipc/handlers.ts
index 4894e1d..975ad01 100644
--- a/src/main/ipc/handlers.ts
+++ b/src/main/ipc/handlers.ts
@@ -5,7 +5,7 @@ import * as claude from "../claude";
 import * as settingsDb from "../db/settings";
 import { createSessionBranch, ensureGitIgnore, ensureGitRepo, getCurrentBranch } from "../git";
 import { discoverMcpTools } from "../mcp";
-import type { UserPermissionMode } from "../claude/phases";
+import type { UserPermissionMode, Phase } from "../claude/phases";
 import { getDefaultSystemPromptTemplate } from "../claude/phases";
 
 export function registerIpcHandlers(mainWindow: BrowserWindow): void {
@@ -23,11 +23,11 @@ export function registerIpcHandlers(mainWindow: BrowserWindow): void {
     sessions.listSessions(projectId)
   );
 
-  ipcMain.handle("sessions:create", (_, projectId: string, name: string) => {
+  ipcMain.handle("sessions:create", (_, projectId: string, name: string, phase?: Phase) => {
     const project = projects.getProject(projectId);
     if (!project) throw new Error("Project not found");
 
-    const session = sessions.createSession(projectId, name);
+    const session = sessions.createSession(projectId, name, phase);
 
     // Ensure .claude-flow/ is gitignored from day one.
     // Branch creation is deferred until the session advances to implement.
diff --git a/src/main/preload.ts b/src/main/preload.ts
index e7ee0aa..fbdf871 100644
--- a/src/main/preload.ts
+++ b/src/main/preload.ts
@@ -12,7 +12,7 @@ export interface ClaudeFlowAPI {
 
   // Sessions
   listSessions: (projectId: string) => Promise<Session[]>;
-  createSession: (projectId: string, name: string) => Promise<Session>;
+  createSession: (projectId: string, name: string, phase?: Phase) => Promise<Session>;
   deleteSession: (id: string) => Promise<void>;
   getSession: (id: string) => Promise<Session | undefined>;
   renameSession: (id: string, name: string) => Promise<void>;
@@ -86,8 +86,8 @@ const api: ClaudeFlowAPI = {
 
   // Sessions
   listSessions: (projectId) => ipcRenderer.invoke("sessions:list", projectId),
-  createSession: (projectId, name) =>
-    ipcRenderer.invoke("sessions:create", projectId, name),
+  createSession: (projectId, name, phase) =>
+    ipcRenderer.invoke("sessions:create", projectId, name, phase),
   deleteSession: (id) => ipcRenderer.invoke("sessions:delete", id),
   getSession: (id) => ipcRenderer.invoke("sessions:get", id),
   renameSession: (id, name) => ipcRenderer.invoke("sessions:rename", id, name),