feat(knowledge-base): Knowledge Base UI — browse/edit, modal, project links

- Knowledge Bases list page + sidebar entry + "+ New" create modal
- Detail page with a recursive structure tree: add/edit/delete topics,
  categories and facts inline, including name + description editing
- Create/metadata-edit modal (title, description)
- Project edit modal gains a link/remove knowledge base section
- Types and routes for /knowledge-bases and /knowledge-bases/:id
- Scoped .kb-* styles (contained panel, topic cards, hierarchy guides)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

.env

@@ -1,2 +1 @@
 VITE_API_BASE=http://backend:8000
-VITE_WIZARD_PORT=8080

Dockerfile

@@ -1,6 +1,14 @@
 # Build stage
 FROM node:20-alpine AS build
 WORKDIR /app
+
+# Build-time backend URL — Vite inlines this into the bundle. Passed as
+# `--build-arg VITE_HF_BACKEND_BASE_URL=https://hf-api.example.com` in
+# the compose file. Without it the bundle calls relative paths (only
+# works in dev with the Vite proxy).
+ARG VITE_HF_BACKEND_BASE_URL=""
+ENV VITE_HF_BACKEND_BASE_URL=${VITE_HF_BACKEND_BASE_URL}
+
 COPY package.json package-lock.json* ./
 RUN npm install
 COPY . .
@@ -12,5 +20,19 @@ RUN npm install -g serve@14
 WORKDIR /app
 COPY --from=build /app ./
 ENV FRONTEND_DEV_MODE=0
+# OIDC-only mode flag. Injected into the SPA at container start as
+# /runtime-config.js so the setup wizard knows it before the backend
+# exists; /auth/config remains authoritative once the backend is up.
+ARG HARBORFORGE_OIDC_ONLY=false
+ENV HARBORFORGE_OIDC_ONLY=${HARBORFORGE_OIDC_ONLY}
+# Optional deploy-time branding override: a URL the SPA uses for the
+# logo + favicon. Empty → bundled /logo.svg default.
+ARG HARBORFORGE_LOGO_URL=
+ENV HARBORFORGE_LOGO_URL=${HARBORFORGE_LOGO_URL}
 EXPOSE 3000
-CMD ["sh", "-c", "if [ \"$FRONTEND_DEV_MODE\" = \"1\" ]; then npm run dev -- --host 0.0.0.0 --port 3000 --strictPort; else serve -s dist -l 3000; fi"]
+CMD ["sh", "-c", "\
+  if [ \"$HARBORFORGE_OIDC_ONLY\" = \"true\" ]; then OO=true; else OO=false; fi; \
+  CFG=\"window.__HF_RUNTIME__={\\\"oidc_only\\\":$OO,\\\"logo_url\\\":\\\"$HARBORFORGE_LOGO_URL\\\"};\"; \
+  mkdir -p public; printf '%s' \"$CFG\" > public/runtime-config.js; \
+  [ -d dist ] && printf '%s' \"$CFG\" > dist/runtime-config.js; \
+  if [ \"$FRONTEND_DEV_MODE\" = \"1\" ]; then npm run dev -- --host 0.0.0.0 --port 3000 --strictPort; else serve -s dist -l 3000; fi"]

README.md

@@ -1,3 +1,181 @@
 # HarborForge.Frontend
 
-HarborForge Frontend - React + TypeScript
+Single-page web client for HarborForge — the agent/human collaborative
+task-management platform. It provides the operator UI for projects,
+milestones, tasks, proposals, calendar/meetings, users, roles and the
+live monitor, and walks operators through first-time provisioning via the
+SSH-tunnel Setup Wizard.
+
+Part of the [HarborForge](../README.md) platform.
+
+## Tech Stack
+
+- **React 18** (`react`, `react-dom`)
+- **TypeScript 5**
+- **Vite 5** dev server / bundler (`@vitejs/plugin-react`)
+- **react-router-dom 6** for client-side routing
+- **axios** for HTTP, with a shared request/response interceptor layer
+- **dayjs** for date handling
+- **Vitest 4** + Testing Library (`@testing-library/react`, `jsdom`) for unit tests
+
+Path alias `@` → `src/` (configured in `vite.config.ts` and `tsconfig.json`).
+
+## Pages
+
+Routes are declared in `src/App.tsx`. The app gates rendering on three
+states — `checking` (probing configuration), `setup` (Setup Wizard), and
+`ready` (authenticated app). `/monitor`, `/login`, `/roles` and `/users`
+are reachable without an authenticated session; everything else requires login.
+
+| Route | Page | Purpose |
+|---|---|---|
+| `/` | `DashboardPage` | Landing dashboard |
+| `/tasks` | `TasksPage` | Task list / filtering |
+| `/tasks/:taskCode` | `TaskDetailPage` | Task detail, transitions, comments |
+| `/projects` | `ProjectsPage` | Project list |
+| `/projects/:id` | `ProjectDetailPage` | Project detail / editor |
+| `/milestones` | `MilestonesPage` | Milestone list |
+| `/milestones/:milestoneCode` | `MilestoneDetailPage` | Milestone detail / actions |
+| `/proposals` (`/proposes`) | `ProposalsPage` | Proposal list |
+| `/proposals/:proposalCode` (`/proposes/:proposalCode`) | `ProposalDetailPage` | Proposal detail, accept/reject/reopen |
+| `/calendar` | `CalendarPage` | Calendar view |
+| `/meetings/:meetingCode` | `MeetingDetailPage` | Meeting detail |
+| `/supports/:supportCode` | `SupportDetailPage` | Support request detail |
+| `/notifications` | `NotificationsPage` | Notification inbox |
+| `/roles` | `RoleEditorPage` | Role / permission (RBAC) editor |
+| `/users` | `UsersPage` | User management |
+| `/monitor` | `MonitorPage` | Live system monitor (public) |
+| `/login` | `LoginPage` | Authentication |
+| _(state-gated)_ | `SetupWizardPage` | First-run provisioning wizard |
+
+Shared building blocks live in `src/components/` (`Sidebar`,
+`CreateTaskModal`, `MilestoneFormModal`, `ProjectFormModal`,
+`CopyableCode`); the auth hook is `src/hooks/useAuth.ts`; shared types are
+in `src/types/index.ts`.
+
+## How It Talks to the Backend
+
+All API access goes through the shared axios instance in
+`src/services/api.ts`:
+
+- The base URL is **resolved at runtime** from
+  `localStorage['HF_BACKEND_BASE_URL']` (re-read on every request via an
+  axios request interceptor), not baked in at build time.
+- A bearer token from `localStorage['token']` is attached automatically
+  when present.
+- A response interceptor clears the token and redirects to `/login` on
+  HTTP `401`, except on the public paths `/monitor` and `/login`.
+
+Authentication (`src/hooks/useAuth.ts`) posts form-encoded credentials to
+`/auth/token`, stores the returned `access_token`, and loads the current
+user from `/auth/me`.
+
+In local dev, `vite.config.ts` also proxies `/api/*` to
+`http://backend:8000` (stripping the `/api` prefix) for same-origin
+development against a Compose backend.
+
+## Setup Wizard / SSH-Tunnel Flow
+
+On startup `App.tsx` runs `checkInitialized()`:
+
+1. It calls the backend `GET /config/status`. If that returns
+   `initialized: true`, the app is `ready` (and `backend_url`, if present,
+   is cached into `localStorage['HF_BACKEND_BASE_URL']`).
+2. Otherwise, if a wizard port was previously saved
+   (`localStorage['HF_WIZARD_PORT']`), it tries
+   `http://127.0.0.1:<port>/api/v1/config/harborforge.json` directly.
+3. If neither indicates an initialized install, it renders
+   `SetupWizardPage`.
+
+The Setup Wizard (`src/pages/SetupWizardPage.tsx`) is a 4-step flow —
+**Wizard → Admin → Backend → Finish**:
+
+- **Wizard**: the operator enters the local port that an SSH tunnel
+  forwards to **AbstractWizard**
+  (`ssh -L <port>:127.0.0.1:<port> user@server`). The UI health-checks
+  `http://127.0.0.1:<port>/health` and stores the port.
+- **Admin**: collects the first admin account (username, password, email,
+  full name).
+- **Backend**: optional backend base URL override.
+- **Finish**: writes the assembled config to AbstractWizard via
+  `PUT http://127.0.0.1:<port>/api/v1/config/harborforge.json`, caches the
+  backend URL locally, and instructs the operator to
+  `docker compose restart` on the server before refreshing.
+
+## Local Development
+
+```bash
+npm install
+npm run dev          # Vite dev server on http://0.0.0.0:3000
+```
+
+The dev server proxies `/api` to `http://backend:8000` and allows the
+hosts `frontend`, `127.0.0.1`, `localhost`.
+
+### Build
+
+```bash
+npm run build        # tsc type-check, then vite build → dist/
+npm run preview      # serve the production build locally
+```
+
+### Test
+
+```bash
+npm test             # vitest run (jsdom)
+npm run test:watch   # watch mode
+npm run test:ui      # Vitest UI
+```
+
+Tests live in `src/test/**/*.test.{ts,tsx}` (e.g. `calendar.test.tsx`,
+`proposal-essential.test.tsx`) with global setup in `src/test/setup.ts`.
+
+### Docker
+
+```bash
+docker build -t harborforge-frontend .
+docker run -p 3000:3000 harborforge-frontend
+```
+
+The multi-stage `Dockerfile` builds with Node 20 and serves `dist/` via
+`serve` on port 3000. Set `FRONTEND_DEV_MODE=1` to run the Vite dev server
+inside the container instead of serving the static build.
+
+## Environment / Configuration
+
+- **`VITE_API_BASE`** (`.env`, default `http://backend:8000`) — a build
+  hint for the default backend location.
+- The effective backend base URL is determined at **runtime** from
+  `localStorage['HF_BACKEND_BASE_URL']`, which is populated by the Setup
+  Wizard or by the backend's `/config/status` response — so changing the
+  backend target does not require a rebuild.
+- `localStorage['HF_WIZARD_PORT']` — last AbstractWizard tunnel port.
+- `localStorage['token']` — current JWT bearer token.
+
+## Theming
+
+The entire visual design is a single self-contained design system in
+**`src/index.css`** — there is no CSS-in-JS, no Tailwind, and no
+per-component stylesheets. Components only reference global CSS classes;
+all colors, typography, spacing and effects are driven by CSS custom
+properties on `:root`. To re-theme the app, edit this one file.
+
+The theme is **"Foundry Deck"** — a shipwright's drafting table meets a
+foundry control panel:
+
+- **Blackened-steel dark palette** — cool-tinted near-black surfaces
+  (`--bg`, `--bg-card`, `--bg-hover`, `--bg-sink`) with machined,
+  tight-radius borders.
+- **Molten-ember accent** — a single hot orange accent
+  (`--accent`, `--accent-hover`, `--ember` gradient, ember glow) used
+  sparingly as the signature element.
+- **Oxidized-steel secondary** plus a forge-mapped status palette
+  (patina success, heat-amber warning, rust danger, arc violet).
+- **Blueprint-grid background** — layered radial ember/steel vignettes, a
+  fine 40px draughting grid, and a subtle SVG film-grain overlay.
+- **Technical web fonts** loaded via a Google Fonts `@import` at the top
+  of `src/index.css`: **Saira Condensed** (headings), **Hanken Grotesk**
+  (body), and **JetBrains Mono** (code/monospace).
+
+Selectors are kept 1:1 with the existing markup, so theming changes are
+made entirely in `src/index.css` via the CSS variables and global classes.

index.html

@@ -2,12 +2,22 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link id="hf-favicon" rel="icon" type="image/svg+xml" href="/logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>HarborForge</title>
   </head>
   <body>
     <div id="root"></div>
+    <!-- Runtime config injected by the container entrypoint (deploy-time
+         HARBORFORGE_OIDC_ONLY). Absent in dev → app falls back to /auth/config. -->
+    <script src="/runtime-config.js"></script>
+    <script>
+      // Optional deploy-time branding override (HARBORFORGE_LOGO_URL).
+      try {
+        var u = window.__HF_RUNTIME__ && window.__HF_RUNTIME__.logo_url;
+        if (u) document.getElementById('hf-favicon').href = u;
+      } catch (e) {}
+    </script>
     <script type="module" src="/src/main.tsx"></script>
   </body>
 </html>

package.json

@@ -5,21 +5,31 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "tsc && vite build",
+    "build": "npx tsc && vite build",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:ui": "vitest --ui"
   },
   "dependencies": {
+    "axios": "^1.6.7",
+    "dayjs": "^1.11.10",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router-dom": "^6.22.0",
+    "react-router-dom": "^6.22.0"
-    "axios": "^1.6.7",
-    "dayjs": "^1.11.10"
   },
   "devDependencies": {
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/jest-dom": "^6.9.1",
+    "@testing-library/react": "^16.3.2",
+    "@testing-library/user-event": "^14.6.1",
     "@types/react": "^18.3.1",
     "@types/react-dom": "^18.3.0",
     "@vitejs/plugin-react": "^4.2.1",
+    "@vitest/ui": "^4.1.2",
+    "jsdom": "^29.0.1",
     "typescript": "^5.4.0",
-    "vite": "^5.1.0"
+    "vite": "^5.1.0",
+    "vitest": "^4.1.2"
   }
 }

public/logo.svg

@@ -0,0 +1,44 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 733.000000 733.000000" role="img" aria-label="Hangman Lab">
+<g transform="translate(0.000000,733.000000) scale(0.100000,-0.100000)"
+fill="#ff6a1a" stroke="none">
+<path d="M812 6860 c-66 -40 -73 -66 -70 -242 3 -141 5 -159 24 -185 43 -58
+63 -63 262 -64 l182 -1 0 -2694 0 -2694 -290 0 c-314 0 -332 -3 -380 -54 -24
+-27 -25 -32 -28 -199 -3 -195 4 -218 71 -250 32 -16 257 -17 3084 -17 2955 0
+3049 1 3083 19 65 34 75 66 75 236 0 186 -16 224 -104 254 -25 8 -682 11
+-2512 11 l-2479 0 0 1998 0 1997 698 697 697 697 670 -3 c369 -2 680 -4 693
+-5 22 -1 22 -1 22 -269 l0 -268 84 -12 c47 -7 103 -19 125 -27 41 -14 41 -14
+43 283 l3 297 631 1 c698 2 673 -1 714 67 18 28 20 51 20 187 0 173 -8 201
+-72 240 -33 20 -56 20 -2623 20 -2567 0 -2590 0 -2623 -20z m1725 -500 c-1 -3
+-183 -185 -404 -404 l-403 -399 0 405 0 406 405 -1 c223 -1 404 -4 402 -7z
+M4283 5701 c-459 -125 -690 -624 -483 -1046 67 -138 196 -266 335 -335 281
+-139 612 -93 837 118 235 219 297 575 152 870 -85 174 -235 306 -427 375 -111
+40 -302 48 -414 18z m267 -211 c95 -15 201 -70 274 -144 273 -274 173 -723
+-189 -851 -93 -33 -236 -35 -326 -5 -202 68 -340 249 -356 465 -18 242 153
+471 394 529 71 18 119 19 203 6z M5945 4716 c-56 -25 -80 -61 -80 -122 0 -48
+4 -57 36 -90 88 -88 219 -29 219 98 0 45 -34 96 -75 114 -42 17 -61 17 -100 0z
+M5675 4466 c-60 -26 -73 -109 -26 -157 62 -61 161 -19 161 70 0 74 -68 118
+-135 87z M3747 4397 c-10 -7 -226 -223 -479 -482 -307 -313 -467 -483 -479
+-510 -35 -75 -17 -177 38 -227 39 -35 114 -61 160 -54 100 13 104 17 583 554
+l145 162 3 -404 c3 -455 15 -342 -137 -1186 -76 -423 -101 -587 -101 -664 0
+-190 182 -307 377 -242 62 21 136 95 152 152 6 22 29 188 52 369 57 466 109
+839 118 848 4 4 52 6 106 5 l99 -3 67 -210 c38 -115 68 -220 69 -232 0 -12
+-38 -152 -85 -311 -47 -159 -85 -302 -85 -317 0 -128 109 -225 255 -225 109 1
+185 42 228 125 26 51 237 683 237 710 0 11 -54 182 -121 380 -121 360 -121
+360 -134 605 -8 135 -14 292 -14 350 l0 105 152 -158 c84 -87 166 -167 182
+-177 44 -29 98 -26 135 8 38 35 187 379 173 401 -5 8 -34 20 -64 26 -59 11
+-38 -8 -393 362 -89 93 -100 97 -174 59 -59 -30 -161 -62 -229 -71 -52 -7 -53
+-7 -53 -41 0 -44 -21 -84 -61 -118 -38 -32 -41 0 32 -455 l52 -325 -82 -78
+c-45 -43 -85 -78 -89 -78 -4 0 -42 35 -84 78 l-77 77 34 215 c19 118 46 289
+61 379 26 164 26 164 -5 188 -42 33 -54 58 -61 121 -5 54 -5 54 -92 87 -98 38
+-184 89 -243 145 -76 70 -123 87 -168 57z M5504 4170 c-74 -30 -69 -170 6
+-170 19 0 20 -7 20 -123 0 -122 0 -122 -54 -262 -30 -77 -97 -243 -150 -369
+-106 -252 -113 -287 -73 -347 46 -70 38 -69 560 -69 327 0 475 3 490 11 69 35
+107 109 88 172 -5 17 -62 142 -126 277 -225 470 -215 443 -215 586 0 114 2
+124 18 124 57 0 72 101 23 151 -29 29 -29 29 -298 28 -147 0 -278 -4 -289 -9z
+m376 -307 c1 -148 1 -148 81 -333 101 -231 98 -222 68 -216 -13 3 -116 22
+-229 42 -112 19 -208 37 -212 40 -4 2 18 75 48 160 54 156 54 156 54 305 l0
+149 95 0 95 0 0 -147z m-219 -593 c22 0 49 -42 49 -75 0 -46 -29 -75 -74 -75
+-37 0 -76 36 -76 71 0 46 45 94 78 83 8 -2 18 -4 23 -4z m327 -126 c53 -59 -7
+-144 -80 -113 -54 22 -65 83 -22 125 30 31 67 27 102 -12z"/>
+</g>
+</svg>

src/App.tsx

@@ -3,83 +3,100 @@ import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom'
 import { useAuth } from '@/hooks/useAuth'
 import Sidebar from '@/components/Sidebar'
 import LoginPage from '@/pages/LoginPage'
-import SetupWizardPage from '@/pages/SetupWizardPage'
 import DashboardPage from '@/pages/DashboardPage'
 import TasksPage from '@/pages/TasksPage'
 import TaskDetailPage from '@/pages/TaskDetailPage'
 import ProjectsPage from '@/pages/ProjectsPage'
 import ProjectDetailPage from '@/pages/ProjectDetailPage'
+import KnowledgeBasesPage from '@/pages/KnowledgeBasesPage'
+import KnowledgeBaseDetailPage from '@/pages/KnowledgeBaseDetailPage'
 import MilestonesPage from '@/pages/MilestonesPage'
 import MilestoneDetailPage from '@/pages/MilestoneDetailPage'
 import NotificationsPage from '@/pages/NotificationsPage'
 import RoleEditorPage from '@/pages/RoleEditorPage'
 import MonitorPage from '@/pages/MonitorPage'
-import ProposesPage from '@/pages/ProposesPage'
+import ProposalsPage from '@/pages/ProposalsPage'
-import ProposeDetailPage from '@/pages/ProposeDetailPage'
+import ProposalDetailPage from '@/pages/ProposalDetailPage'
 import UsersPage from '@/pages/UsersPage'
+import CalendarPage from '@/pages/CalendarPage'
 import SupportDetailPage from '@/pages/SupportDetailPage'
 import MeetingDetailPage from '@/pages/MeetingDetailPage'
+import OidcCallbackPage from '@/pages/OidcCallbackPage'
+import OidcSettingsPage from '@/pages/OidcSettingsPage'
 import axios from 'axios'
 
-const WIZARD_PORT = Number(import.meta.env.VITE_WIZARD_PORT) || 18080
+// Backend URL is baked in at build time via VITE_HF_BACKEND_BASE_URL
-const WIZARD_BASE = `http://127.0.0.1:${WIZARD_PORT}`
+// (docker build --build-arg). Empty string → same-origin call (only
+// works in dev with the Vite proxy).
+const API_BASE = import.meta.env.VITE_HF_BACKEND_BASE_URL || ''
 
-const getApiBase = () => {
+type AppState = 'checking' | 'no-admin' | 'ready'
-  return localStorage.getItem('HF_BACKEND_BASE_URL') || import.meta.env.VITE_API_BASE || 'http://127.0.0.1:8000'
-}
-
-type AppState = 'checking' | 'setup' | 'ready'
 
 export default function App() {
   const [appState, setAppState] = useState<AppState>('checking')
-  const { user, loading, login, logout } = useAuth()
+  const [errorMessage, setErrorMessage] = useState<string>('')
+  const { user, loading, login, loginWithToken, logout } = useAuth()
 
   useEffect(() => {
     checkInitialized()
   }, [])
 
   const checkInitialized = async () => {
-    // First try the backend /config/status endpoint (reads from config volume directly)
     try {
-      const res = await axios.get(`${getApiBase()}/config/status`, { timeout: 5000 })
+      const res = await axios.get(`${API_BASE}/config/status`, { timeout: 5000 })
       const cfg = res.data || {}
-      if (cfg.backend_url) {
-        localStorage.setItem('HF_BACKEND_BASE_URL', cfg.backend_url)
-      }
       if (cfg.initialized === true) {
         setAppState('ready')
         return
       }
-    } catch {
+      setAppState('no-admin')
-      // Backend unreachable — fall through to wizard check
+    } catch (err) {
-    }
+      const msg = err instanceof Error ? err.message : String(err)
-
+      setErrorMessage(`Backend unreachable at ${API_BASE || '<same origin>'} — ${msg}`)
-    // Fallback: try the wizard directly (needed during initial setup before backend starts)
+      setAppState('no-admin')
-    try {
-      const res = await axios.get(`${WIZARD_BASE}/api/v1/config/harborforge.json`, {
-        timeout: 5000,
-      })
-      const cfg = res.data || {}
-      if (cfg.backend_url) {
-        localStorage.setItem('HF_BACKEND_BASE_URL', cfg.backend_url)
-      }
-      if (cfg.initialized === true) {
-        setAppState('ready')
-      } else {
-        setAppState('setup')
-      }
-    } catch {
-      // Neither backend nor wizard reachable → setup needed
-      setAppState('setup')
     }
   }
 
   if (appState === 'checking') {
-    return <div className="loading">Checking configuration status...</div>
+    return <div className="loading">Checking deployment status…</div>
   }
 
-  if (appState === 'setup') {
+  if (appState === 'no-admin') {
-    return <SetupWizardPage wizardBase={WIZARD_BASE} onComplete={checkInitialized} />
+    return (
+      <div className="login-page">
+        <div className="login-card">
+          <h1>⚓ HarborForge</h1>
+          {errorMessage ? (
+            <>
+              <p className="text-dim">Cannot reach the backend.</p>
+              <pre style={{ whiteSpace: 'pre-wrap', fontSize: '0.85em' }}>{errorMessage}</pre>
+              <p className="text-dim">
+                Set <code>VITE_HF_BACKEND_BASE_URL</code> at build time
+                (e.g. <code>https://hf-api.example.com</code>) in the
+                frontend container's compose entry.
+              </p>
+            </>
+          ) : (
+            <>
+              <p className="text-dim">
+                No admin user found. Bootstrap the deployment by running, on the host:
+              </p>
+              <pre style={{ whiteSpace: 'pre-wrap', fontSize: '0.85em' }}>
+{`docker exec hf-backend hf-cli admin create-user \\
+  --email you@example.com \\
+  --password '...' \\
+  # ...or in OIDC_ONLY mode:
+  --oidc-issuer https://login.example.com/realms/your-realm \\
+  --oidc-subject <sub-from-idp>`}
+              </pre>
+              <button className="btn-primary" onClick={checkInitialized}>
+                Recheck
+              </button>
+            </>
+          )}
+        </div>
+      </div>
+    )
   }
 
   if (loading) return <div className="loading">Loading...</div>
@@ -95,6 +112,7 @@ export default function App() {
               <Route path="/users" element={<UsersPage />} />
               <Route path="/monitor" element={<MonitorPage />} />
               <Route path="/login" element={<LoginPage onLogin={login} />} />
+              <Route path="/oidc/callback" element={<OidcCallbackPage onToken={loginWithToken} />} />
               <Route path="*" element={<Navigate to="/monitor" />} />
             </Routes>
           </main>
@@ -111,19 +129,27 @@ export default function App() {
           <Routes>
             <Route path="/" element={<DashboardPage />} />
             <Route path="/tasks" element={<TasksPage />} />
-            <Route path="/tasks/:id" element={<TaskDetailPage />} />
+            <Route path="/tasks/:taskCode" element={<TaskDetailPage />} />
             <Route path="/projects" element={<ProjectsPage />} />
             <Route path="/projects/:id" element={<ProjectDetailPage />} />
+            <Route path="/knowledge-bases" element={<KnowledgeBasesPage />} />
+            <Route path="/knowledge-bases/:id" element={<KnowledgeBaseDetailPage />} />
             <Route path="/milestones" element={<MilestonesPage />} />
-            <Route path="/milestones/:id" element={<MilestoneDetailPage />} />
+            <Route path="/milestones/:milestoneCode" element={<MilestoneDetailPage />} />
-            <Route path="/proposes" element={<ProposesPage />} />
+            <Route path="/proposals" element={<ProposalsPage />} />
-            <Route path="/proposes/:id" element={<ProposeDetailPage />} />
+            <Route path="/proposals/:proposalCode" element={<ProposalDetailPage />} />
-            <Route path="/meetings/:meetingId" element={<MeetingDetailPage />} />
+            <Route path="/calendar" element={<CalendarPage />} />
-            <Route path="/supports/:supportId" element={<SupportDetailPage />} />
+            {/* Legacy routes for backward compatibility */}
+            <Route path="/proposes" element={<ProposalsPage />} />
+            <Route path="/proposes/:proposalCode" element={<ProposalDetailPage />} />
+            <Route path="/meetings/:meetingCode" element={<MeetingDetailPage />} />
+            <Route path="/supports/:supportCode" element={<SupportDetailPage />} />
             <Route path="/notifications" element={<NotificationsPage />} />
             <Route path="/roles" element={<RoleEditorPage />} />
             <Route path="/users" element={<UsersPage />} />
             <Route path="/monitor" element={<MonitorPage />} />
+            {user?.is_admin && <Route path="/settings/oidc" element={<OidcSettingsPage />} />}
+            <Route path="/oidc/callback" element={<OidcCallbackPage onToken={loginWithToken} />} />
             <Route path="*" element={<Navigate to="/" />} />
           </Routes>
         </main>

src/components/CreateTaskModal.tsx

@@ -3,7 +3,7 @@ import api from '@/services/api'
 import type { Milestone, Project, Task } from '@/types'
 
 const TASK_TYPES = [
-  { value: 'story', label: 'Story', subtypes: ['improvement', 'refactor'] },  // P9.6: 'feature' removed — must come from propose accept
+  // P9.6: 'story' removed — all story/* types are restricted; must come from Proposal Accept workflow
   { value: 'issue', label: 'Issue', subtypes: ['infrastructure', 'performance', 'regression', 'security', 'user_experience', 'defect'] },
   // P7.1: 'task' type removed — defect subtype migrated to issue/defect
   { value: 'test', label: 'Test', subtypes: ['regression', 'security', 'smoke', 'stress'] },
@@ -18,8 +18,8 @@ type Props = {
   onClose: () => void
   onCreated?: (task: Task) => void | Promise<void>
   onSaved?: (task: Task) => void | Promise<void>
-  initialProjectId?: number
+  initialProjectCode?: string
-  initialMilestoneId?: number
+  initialMilestoneCode?: string
   lockProject?: boolean
   lockMilestone?: boolean
   task?: Task | null
@@ -28,8 +28,8 @@ type Props = {
 type FormState = {
   title: string
   description: string
-  project_id: number
+  project_code: string
-  milestone_id: number
+  milestone_code: string
   task_type: string
   task_subtype: string
   priority: string
@@ -37,11 +37,11 @@ type FormState = {
   reporter_id: number
 }
 
-const makeInitialForm = (projectId = 0, milestoneId = 0): FormState => ({
+const makeInitialForm = (projectCode = '', milestoneCode = ''): FormState => ({
   title: '',
   description: '',
-  project_id: projectId,
+  project_code: projectCode,
-  milestone_id: milestoneId,
+  milestone_code: milestoneCode,
   task_type: 'issue',  // P7.1: default changed from 'task' to 'issue'
   task_subtype: '',
   priority: 'medium',
@@ -54,8 +54,8 @@ export default function CreateTaskModal({
   onClose,
   onCreated,
   onSaved,
-  initialProjectId,
+  initialProjectCode,
-  initialMilestoneId,
+  initialMilestoneCode,
   lockProject = false,
   lockMilestone = false,
   task,
@@ -63,7 +63,7 @@ export default function CreateTaskModal({
   const [projects, setProjects] = useState<Project[]>([])
   const [milestones, setMilestones] = useState<Milestone[]>([])
   const [saving, setSaving] = useState(false)
-  const [form, setForm] = useState<FormState>(makeInitialForm(initialProjectId, initialMilestoneId))
+  const [form, setForm] = useState<FormState>(makeInitialForm(initialProjectCode, initialMilestoneCode))
 
   const isEdit = Boolean(task)
   const currentType = useMemo(
@@ -72,18 +72,18 @@ export default function CreateTaskModal({
   )
   const subtypes = currentType.subtypes || []
 
-  const loadMilestones = async (projectId: number, preferredMilestoneId?: number) => {
+  const loadMilestones = async (projectCode: string, preferredMilestoneCode?: string) => {
-    if (!projectId) {
+    if (!projectCode) {
       setMilestones([])
-      setForm((f) => ({ ...f, milestone_id: 0 }))
+      setForm((f) => ({ ...f, milestone_code: '' }))
       return
     }
 
-    const { data } = await api.get<Milestone[]>(`/milestones?project_id=${projectId}`)
+    const { data } = await api.get<Milestone[]>(`/milestones?project_code=${projectCode}`)
     setMilestones(data)
-    const hasPreferred = preferredMilestoneId && data.some((m) => m.id === preferredMilestoneId)
+    const hasPreferred = preferredMilestoneCode && data.some((m) => m.milestone_code === preferredMilestoneCode)
-    const nextMilestoneId = hasPreferred ? preferredMilestoneId! : (data[0]?.id || 0)
+    const nextMilestoneCode = hasPreferred ? preferredMilestoneCode! : (data[0]?.milestone_code || '')
-    setForm((f) => ({ ...f, milestone_id: nextMilestoneId }))
+    setForm((f) => ({ ...f, milestone_code: nextMilestoneCode }))
   }
 
   useEffect(() => {
@@ -93,30 +93,30 @@ export default function CreateTaskModal({
       const { data } = await api.get<Project[]>('/projects')
       setProjects(data)
 
-      const chosenProjectId = task?.project_id || initialProjectId || data[0]?.id || 0
+      const chosenProjectCode = task?.project_code || initialProjectCode || data[0]?.project_code || ''
-      const chosenMilestoneId = task?.milestone_id || initialMilestoneId || 0
+      const chosenMilestoneCode = task?.milestone_code || initialMilestoneCode || ''
 
       setForm(task ? {
         title: task.title,
         description: task.description || '',
-        project_id: task.project_id,
+        project_code: task.project_code || '',
-        milestone_id: task.milestone_id || 0,
+        milestone_code: task.milestone_code || '',
         task_type: task.task_type,
         task_subtype: task.task_subtype || '',
         priority: task.priority,
         tags: task.tags || '',
         reporter_id: task.reporter_id,
-      } : makeInitialForm(chosenProjectId, chosenMilestoneId))
+      } : makeInitialForm(chosenProjectCode, chosenMilestoneCode))
 
-      await loadMilestones(chosenProjectId, chosenMilestoneId)
+      await loadMilestones(chosenProjectCode, chosenMilestoneCode)
     }
 
     init().catch(console.error)
-  }, [isOpen, initialProjectId, initialMilestoneId, task])
+  }, [isOpen, initialProjectCode, initialMilestoneCode, task])
 
-  const handleProjectChange = async (projectId: number) => {
+  const handleProjectChange = async (projectCode: string) => {
-    setForm((f) => ({ ...f, project_id: projectId, milestone_id: 0 }))
+    setForm((f) => ({ ...f, project_code: projectCode, milestone_code: '' }))
-    await loadMilestones(projectId)
+    await loadMilestones(projectCode)
   }
 
   const handleTypeChange = (taskType: string) => {
@@ -125,7 +125,7 @@ export default function CreateTaskModal({
 
   const submit = async (e: React.FormEvent) => {
     e.preventDefault()
-    if (!form.milestone_id) {
+    if (!form.milestone_code) {
       alert('Please select a milestone')
       return
     }
@@ -136,7 +136,7 @@ export default function CreateTaskModal({
     setSaving(true)
     try {
       const { data } = isEdit
-        ? await api.patch<Task>(`/tasks/${task!.id}`, payload)
+        ? await api.patch<Task>(`/tasks/${task!.task_code}`, payload)
         : await api.post<Task>('/tasks', payload)
       await onCreated?.(data)
       await onSaved?.(data)
@@ -181,12 +181,12 @@ export default function CreateTaskModal({
               Project
               <select
                 data-testid="project-select"
-                value={form.project_id}
+                value={form.project_code}
-                onChange={(e) => handleProjectChange(Number(e.target.value))}
+                onChange={(e) => handleProjectChange(e.target.value)}
                 disabled={lockProject}
               >
                 {projects.map((p) => (
-                  <option key={p.id} value={p.id}>{p.name}</option>
+                  <option key={p.id} value={p.project_code || ''}>{p.name}</option>
                 ))}
               </select>
             </label>
@@ -195,13 +195,13 @@ export default function CreateTaskModal({
               Milestone
               <select
                 data-testid="milestone-select"
-                value={form.milestone_id}
+                value={form.milestone_code}
-                onChange={(e) => setForm({ ...form, milestone_id: Number(e.target.value) })}
+                onChange={(e) => setForm({ ...form, milestone_code: e.target.value })}
                 disabled={lockMilestone}
               >
                 {milestones.length === 0 && <option value={0}>No milestones available</option>}
                 {milestones.map((m) => (
-                  <option key={m.id} value={m.id}>{m.title}</option>
+                  <option key={m.id} value={m.milestone_code || ''}>{m.title}</option>
                 ))}
               </select>
             </label>

src/components/KnowledgeBaseFormModal.tsx

@@ -0,0 +1,104 @@
+import { useEffect, useState } from 'react'
+import api from '@/services/api'
+import type { KnowledgeBase } from '@/types'
+
+type Props = {
+  isOpen: boolean
+  onClose: () => void
+  onSaved?: (kb: KnowledgeBase) => void | Promise<void>
+  knowledgeBase?: KnowledgeBase | null
+}
+
+type FormState = {
+  title: string
+  description: string
+}
+
+const emptyForm: FormState = { title: '', description: '' }
+
+export default function KnowledgeBaseFormModal({ isOpen, onClose, onSaved, knowledgeBase }: Props) {
+  const [saving, setSaving] = useState(false)
+  const [error, setError] = useState('')
+  const [form, setForm] = useState<FormState>(emptyForm)
+
+  useEffect(() => {
+    if (!isOpen) return
+    setError('')
+    if (knowledgeBase) {
+      setForm({ title: knowledgeBase.title, description: knowledgeBase.description || '' })
+    } else {
+      setForm(emptyForm)
+    }
+  }, [isOpen, knowledgeBase])
+
+  const submit = async (e: React.FormEvent) => {
+    e.preventDefault()
+    setSaving(true)
+    setError('')
+    try {
+      if (knowledgeBase) {
+        const { data } = await api.patch<KnowledgeBase>(`/knowledge-bases/${knowledgeBase.id}`, {
+          title: form.title,
+          description: form.description || null,
+        })
+        await onSaved?.(data)
+      } else {
+        const { data } = await api.post<KnowledgeBase>('/knowledge-bases', {
+          title: form.title,
+          description: form.description || null,
+        })
+        await onSaved?.(data)
+      }
+      onClose()
+    } catch (err: any) {
+      setError(err?.response?.data?.detail || 'Failed to save knowledge base')
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  if (!isOpen) return null
+
+  return (
+    <div className="modal-overlay" onClick={onClose}>
+      <div className="modal" onClick={(e) => e.stopPropagation()}>
+        <div className="modal-header">
+          <h3>{knowledgeBase ? 'Edit Knowledge Base' : 'Create Knowledge Base'}</h3>
+          <button type="button" className="btn-secondary" onClick={onClose}>✕</button>
+        </div>
+
+        <form className="task-create-form" onSubmit={submit}>
+          <label>
+            Title
+            <input
+              data-testid="kb-title-input"
+              required
+              placeholder="Knowledge base title"
+              value={form.title}
+              onChange={(e) => setForm((f) => ({ ...f, title: e.target.value }))}
+            />
+          </label>
+
+          <label>
+            Description
+            <textarea
+              data-testid="kb-description-input"
+              placeholder="Description (optional)"
+              value={form.description}
+              onChange={(e) => setForm((f) => ({ ...f, description: e.target.value }))}
+            />
+          </label>
+
+          {error && <p className="error-text" style={{ color: 'var(--danger, #e5534b)' }}>{error}</p>}
+
+          <div className="modal-actions">
+            <button type="submit" className="btn-primary" disabled={saving}>
+              {saving ? 'Saving...' : (knowledgeBase ? 'Save' : 'Create')}
+            </button>
+            <button type="button" className="btn-secondary" onClick={onClose} disabled={saving}>Cancel</button>
+          </div>
+        </form>
+      </div>
+    </div>
+  )
+}

src/components/KnowledgeBaseTree.tsx

@@ -0,0 +1,275 @@
+import { useState } from 'react'
+import api from '@/services/api'
+import type { KnowledgeBaseTree as Tree, KnowledgeTopicNode, KnowledgeCategoryNode, KnowledgeFact } from '@/types'
+
+type Reload = () => void | Promise<void>
+
+function errMsg(err: any, fallback: string): string {
+  return err?.response?.data?.detail || fallback
+}
+
+/** A toggle button that reveals a single-line input with save/cancel. */
+function InlineForm({ label, placeholder, onSubmit }: {
+  label: string
+  placeholder: string
+  onSubmit: (value: string) => Promise<void>
+}) {
+  const [open, setOpen] = useState(false)
+  const [value, setValue] = useState('')
+  const [busy, setBusy] = useState(false)
+
+  if (!open) {
+    return <button className="kb-mini-btn" onClick={() => { setValue(''); setOpen(true) }}>{label}</button>
+  }
+  const save = async () => {
+    if (!value.trim()) return
+    setBusy(true)
+    try { await onSubmit(value.trim()); setOpen(false) }
+    finally { setBusy(false) }
+  }
+  return (
+    <span className="kb-inline-form">
+      <input
+        autoFocus
+        placeholder={placeholder}
+        value={value}
+        disabled={busy}
+        onChange={(e) => setValue(e.target.value)}
+        onKeyDown={(e) => { if (e.key === 'Enter') save(); if (e.key === 'Escape') setOpen(false) }}
+      />
+      <button className="kb-mini-btn" disabled={busy} onClick={save}>✓</button>
+      <button className="kb-mini-btn" disabled={busy} onClick={() => setOpen(false)}>✕</button>
+    </span>
+  )
+}
+
+/** Inline editor for a node's name + description (used by topics & categories). */
+function NodeEditForm({ initialName, initialDesc, namePlaceholder, onSave, onCancel }: {
+  initialName: string
+  initialDesc: string
+  namePlaceholder: string
+  onSave: (name: string, description: string) => Promise<void>
+  onCancel: () => void
+}) {
+  const [name, setName] = useState(initialName)
+  const [desc, setDesc] = useState(initialDesc)
+  const [busy, setBusy] = useState(false)
+
+  const save = async () => {
+    if (!name.trim()) return
+    setBusy(true)
+    try { await onSave(name.trim(), desc) } finally { setBusy(false) }
+  }
+  return (
+    <div className="kb-edit-form">
+      <input
+        autoFocus
+        placeholder={namePlaceholder}
+        value={name}
+        disabled={busy}
+        onChange={(e) => setName(e.target.value)}
+        onKeyDown={(e) => { if (e.key === 'Enter') save(); if (e.key === 'Escape') onCancel() }}
+      />
+      <textarea
+        placeholder="Description (optional)"
+        rows={2}
+        value={desc}
+        disabled={busy}
+        onChange={(e) => setDesc(e.target.value)}
+      />
+      <span className="kb-row-actions">
+        <button className="kb-mini-btn" disabled={busy} onClick={save}>save</button>
+        <button className="kb-mini-btn" disabled={busy} onClick={onCancel}>cancel</button>
+      </span>
+    </div>
+  )
+}
+
+function FactRow({ fact, onChange }: { fact: KnowledgeFact; onChange: Reload }) {
+  const [editing, setEditing] = useState(false)
+  const [value, setValue] = useState(fact.fact)
+
+  const save = async () => {
+    try {
+      await api.patch(`/knowledge-facts/${fact.id}`, { fact: value })
+      setEditing(false)
+      await onChange()
+    } catch (err) { alert(errMsg(err, 'Failed to update fact')) }
+  }
+  const remove = async () => {
+    if (!confirm('Delete this fact?')) return
+    try { await api.delete(`/knowledge-facts/${fact.id}`); await onChange() }
+    catch (err) { alert(errMsg(err, 'Failed to delete fact')) }
+  }
+
+  return (
+    <div className="kb-fact">
+      <span className="kb-bullet">•</span>
+      {editing ? (
+        <span className="kb-inline-form kb-inline-grow">
+          <input autoFocus value={value} onChange={(e) => setValue(e.target.value)}
+            onKeyDown={(e) => { if (e.key === 'Enter') save(); if (e.key === 'Escape') setEditing(false) }} />
+          <button className="kb-mini-btn" onClick={save}>✓</button>
+          <button className="kb-mini-btn" onClick={() => { setValue(fact.fact); setEditing(false) }}>✕</button>
+        </span>
+      ) : (
+        <>
+          <span className="kb-fact-text">{fact.fact}</span>
+          <span className="kb-row-actions">
+            <button className="kb-mini-btn" onClick={() => setEditing(true)}>edit</button>
+            <button className="kb-mini-btn kb-danger" onClick={remove}>del</button>
+          </span>
+        </>
+      )}
+    </div>
+  )
+}
+
+function CategoryNode({ cat, onChange }: { cat: KnowledgeCategoryNode; onChange: Reload }) {
+  const [editing, setEditing] = useState(false)
+
+  const saveEdit = async (name: string, description: string) => {
+    try {
+      await api.patch(`/knowledge-categories/${cat.id}`, { name, description: description || null })
+      setEditing(false)
+      await onChange()
+    } catch (err) { alert(errMsg(err, 'Failed to update category')) }
+  }
+  const remove = async () => {
+    if (!confirm('Delete this category and everything under it?')) return
+    try { await api.delete(`/knowledge-categories/${cat.id}`); await onChange() }
+    catch (err) { alert(errMsg(err, 'Failed to delete category')) }
+  }
+  const addSubcategory = async (value: string) => {
+    try { await api.post('/knowledge-categories', { topic_id: cat.topic_id, parent: cat.id, name: value }); await onChange() }
+    catch (err) { alert(errMsg(err, 'Failed to add category')) }
+  }
+  const addFact = async (value: string) => {
+    try { await api.post('/knowledge-facts', { topic_id: cat.topic_id, category_id: cat.id, fact: value }); await onChange() }
+    catch (err) { alert(errMsg(err, 'Failed to add fact')) }
+  }
+
+  return (
+    <div className="kb-node kb-category">
+      {editing ? (
+        <div className="kb-node-header">
+          <NodeEditForm
+            initialName={cat.name}
+            initialDesc={cat.description || ''}
+            namePlaceholder="Category name"
+            onSave={saveEdit}
+            onCancel={() => setEditing(false)}
+          />
+        </div>
+      ) : (
+        <>
+          <div className="kb-node-header">
+            <span className="kb-node-title">📂 {cat.name}</span>
+            <span className="kb-row-actions">
+              <InlineForm label="+ category" placeholder="Category name" onSubmit={addSubcategory} />
+              <InlineForm label="+ fact" placeholder="Fact" onSubmit={addFact} />
+              <button className="kb-mini-btn" onClick={() => setEditing(true)}>edit</button>
+              <button className="kb-mini-btn kb-danger" onClick={remove}>del</button>
+            </span>
+          </div>
+          {cat.description && <div className="kb-node-desc">{cat.description}</div>}
+        </>
+      )}
+      <div className="kb-children">
+        {cat.facts.map((f) => <FactRow key={f.id} fact={f} onChange={onChange} />)}
+        {cat.categories.map((c) => <CategoryNode key={c.id} cat={c} onChange={onChange} />)}
+      </div>
+    </div>
+  )
+}
+
+function TopicNode({ topic, onChange }: { topic: KnowledgeTopicNode; onChange: Reload }) {
+  const [editing, setEditing] = useState(false)
+
+  const saveEdit = async (name: string, description: string) => {
+    try {
+      await api.patch(`/knowledge-topics/${topic.id}`, { topic: name, description: description || null })
+      setEditing(false)
+      await onChange()
+    } catch (err) { alert(errMsg(err, 'Failed to update topic')) }
+  }
+  const remove = async () => {
+    if (!confirm('Delete this topic and everything under it?')) return
+    try { await api.delete(`/knowledge-topics/${topic.id}`); await onChange() }
+    catch (err) { alert(errMsg(err, 'Failed to delete topic')) }
+  }
+  const addCategory = async (value: string) => {
+    try { await api.post('/knowledge-categories', { topic_id: topic.id, name: value }); await onChange() }
+    catch (err) { alert(errMsg(err, 'Failed to add category')) }
+  }
+  const addFact = async (value: string) => {
+    try { await api.post('/knowledge-facts', { topic_id: topic.id, fact: value }); await onChange() }
+    catch (err) { alert(errMsg(err, 'Failed to add fact')) }
+  }
+
+  return (
+    <div className="kb-node kb-topic">
+      {editing ? (
+        <div className="kb-node-header">
+          <NodeEditForm
+            initialName={topic.topic}
+            initialDesc={topic.description || ''}
+            namePlaceholder="Topic name"
+            onSave={saveEdit}
+            onCancel={() => setEditing(false)}
+          />
+        </div>
+      ) : (
+        <>
+          <div className="kb-node-header">
+            <span className="kb-node-title kb-topic-title"># {topic.topic}</span>
+            <span className="kb-row-actions">
+              <InlineForm label="+ category" placeholder="Category name" onSubmit={addCategory} />
+              <InlineForm label="+ fact" placeholder="Fact" onSubmit={addFact} />
+              <button className="kb-mini-btn" onClick={() => setEditing(true)}>edit</button>
+              <button className="kb-mini-btn kb-danger" onClick={remove}>del</button>
+            </span>
+          </div>
+          {topic.description && <div className="kb-node-desc">{topic.description}</div>}
+        </>
+      )}
+      <div className="kb-children">
+        {topic.facts.map((f) => <FactRow key={f.id} fact={f} onChange={onChange} />)}
+        {topic.categories.map((c) => <CategoryNode key={c.id} cat={c} onChange={onChange} />)}
+      </div>
+    </div>
+  )
+}
+
+export default function KnowledgeBaseTree({ tree, onChange }: { tree: Tree; onChange: Reload }) {
+  const [addingTopic, setAddingTopic] = useState(false)
+  const [topicName, setTopicName] = useState('')
+
+  const addTopic = async () => {
+    if (!topicName.trim()) return
+    try {
+      await api.post(`/knowledge-bases/${tree.id}/topics`, { topic: topicName.trim() })
+      setTopicName(''); setAddingTopic(false)
+      await onChange()
+    } catch (err) { alert(errMsg(err, 'Failed to add topic')) }
+  }
+
+  return (
+    <div className="kb-tree">
+      <div className="kb-tree-toolbar">
+        {addingTopic ? (
+          <span className="kb-inline-form">
+            <input autoFocus placeholder="Topic name" value={topicName} onChange={(e) => setTopicName(e.target.value)}
+              onKeyDown={(e) => { if (e.key === 'Enter') addTopic(); if (e.key === 'Escape') setAddingTopic(false) }} />
+            <button className="kb-mini-btn" onClick={addTopic}>✓</button>
+            <button className="kb-mini-btn" onClick={() => setAddingTopic(false)}>✕</button>
+          </span>
+        ) : (
+          <button className="btn-secondary" onClick={() => setAddingTopic(true)}>+ Add topic</button>
+        )}
+      </div>
+      {tree.topics.length === 0 && <p className="empty">No topics yet. Add one above.</p>}
+      {tree.topics.map((t) => <TopicNode key={t.id} topic={t} onChange={onChange} />)}
+    </div>
+  )
+}

src/components/MilestoneFormModal.tsx

@@ -7,14 +7,14 @@ type Props = {
   onClose: () => void
   onSaved?: (milestone: Milestone) => void | Promise<void>
   milestone?: Milestone | null
-  initialProjectId?: number
+  initialProjectCode?: string
   lockProject?: boolean
 }
 
 type FormState = {
   title: string
   description: string
-  project_id: number
+  project_code: string
   status: string
   due_date: string
   planned_release_date: string
@@ -23,7 +23,7 @@ type FormState = {
 const emptyForm: FormState = {
   title: '',
   description: '',
-  project_id: 0,
+  project_code: '',
   status: 'open',
   due_date: '',
   planned_release_date: '',
@@ -31,7 +31,7 @@ const emptyForm: FormState = {
 
 const toDateInput = (value?: string | null) => (value ? String(value).slice(0, 10) : '')
 
-export default function MilestoneFormModal({ isOpen, onClose, onSaved, milestone, initialProjectId, lockProject = false }: Props) {
+export default function MilestoneFormModal({ isOpen, onClose, onSaved, milestone, initialProjectCode, lockProject = false }: Props) {
   const [projects, setProjects] = useState<Project[]>([])
   const [saving, setSaving] = useState(false)
   const [form, setForm] = useState<FormState>(emptyForm)
@@ -42,11 +42,11 @@ export default function MilestoneFormModal({ isOpen, onClose, onSaved, milestone
     const init = async () => {
       const { data } = await api.get<Project[]>('/projects')
       setProjects(data)
-      const defaultProjectId = milestone?.project_id || initialProjectId || data[0]?.id || 0
+      const defaultProjectCode = milestone?.project_code || initialProjectCode || data[0]?.project_code || ''
       setForm({
         title: milestone?.title || '',
         description: milestone?.description || '',
-        project_id: defaultProjectId,
+        project_code: defaultProjectCode,
         status: milestone?.status || 'open',
         due_date: toDateInput(milestone?.due_date),
         planned_release_date: toDateInput(milestone?.planned_release_date),
@@ -54,7 +54,7 @@ export default function MilestoneFormModal({ isOpen, onClose, onSaved, milestone
     }
 
     init().catch(console.error)
-  }, [isOpen, milestone, initialProjectId])
+  }, [isOpen, milestone, initialProjectCode])
 
   const submit = async (e: React.FormEvent) => {
     e.preventDefault()
@@ -63,13 +63,13 @@ export default function MilestoneFormModal({ isOpen, onClose, onSaved, milestone
       const payload = {
         title: form.title,
         description: form.description || null,
-        project_id: form.project_id,
+        project_code: form.project_code,
         status: form.status,
         due_date: form.due_date || null,
         planned_release_date: form.planned_release_date || null,
       }
       if (milestone) {
-        const { data } = await api.patch<Milestone>(`/milestones/${milestone.id}`, payload)
+        const { data } = await api.patch<Milestone>(`/milestones/${milestone.milestone_code}`, payload)
         await onSaved?.(data)
       } else {
         const { data } = await api.post<Milestone>('/milestones', payload)
@@ -116,8 +116,8 @@ export default function MilestoneFormModal({ isOpen, onClose, onSaved, milestone
           <div className="task-create-grid">
             <label>
               Project
-              <select value={form.project_id} onChange={(e) => setForm((f) => ({ ...f, project_id: Number(e.target.value) }))} disabled={lockProject}>
+              <select value={form.project_code} onChange={(e) => setForm((f) => ({ ...f, project_code: e.target.value }))} disabled={lockProject}>
-                {projects.map((p) => <option key={p.id} value={p.id}>{p.name}</option>)}
+                {projects.map((p) => <option key={p.id} value={p.project_code || ''}>{p.name}</option>)}
               </select>
             </label>
 

src/components/ProjectFormModal.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useState } from 'react'
 import api from '@/services/api'
-import type { Project, User } from '@/types'
+import type { Project, User, KnowledgeBase } from '@/types'
 
 type Props = {
   isOpen: boolean
@@ -34,6 +34,15 @@ export default function ProjectFormModal({ isOpen, onClose, onSaved, project }:
   const [projects, setProjects] = useState<Project[]>([])
   const [saving, setSaving] = useState(false)
   const [form, setForm] = useState<FormState>(emptyForm)
+  const [allKBs, setAllKBs] = useState<KnowledgeBase[]>([])
+  const [linkedKBs, setLinkedKBs] = useState<KnowledgeBase[]>([])
+  const [kbToLink, setKbToLink] = useState('')
+
+  const refreshLinkedKBs = async () => {
+    if (!project) return
+    const { data } = await api.get<KnowledgeBase[]>(`/projects/${project.id}/knowledge-bases`)
+    setLinkedKBs(data)
+  }
 
   useEffect(() => {
     if (!isOpen) return
@@ -46,6 +55,21 @@ export default function ProjectFormModal({ isOpen, onClose, onSaved, project }:
       setUsers(userData)
       setProjects(projectData)
 
+      // Knowledge-base linking is only meaningful for an existing project.
+      if (project) {
+        try {
+          const [{ data: kbs }, { data: linked }] = await Promise.all([
+            api.get<KnowledgeBase[]>('/knowledge-bases'),
+            api.get<KnowledgeBase[]>(`/projects/${project.id}/knowledge-bases`),
+          ])
+          setAllKBs(kbs)
+          setLinkedKBs(linked)
+        } catch {
+          setAllKBs([])
+          setLinkedKBs([])
+        }
+      }
+
       if (project) {
         setForm({
           name: project.name,
@@ -79,6 +103,32 @@ export default function ProjectFormModal({ isOpen, onClose, onSaved, project }:
     setForm((f) => ({ ...f, [field]: values }))
   }
 
+  const linkableKBs = useMemo(
+    () => allKBs.filter((kb) => !linkedKBs.some((l) => l.id === kb.id)),
+    [allKBs, linkedKBs]
+  )
+
+  const linkKB = async () => {
+    if (!project || !kbToLink) return
+    try {
+      await api.post(`/projects/${project.id}/knowledge-bases`, { knowledge_base: kbToLink })
+      setKbToLink('')
+      await refreshLinkedKBs()
+    } catch (err: any) {
+      alert(err?.response?.data?.detail || 'Failed to link knowledge base')
+    }
+  }
+
+  const unlinkKB = async (kbId: number) => {
+    if (!project) return
+    try {
+      await api.delete(`/projects/${project.id}/knowledge-bases/${kbId}`)
+      await refreshLinkedKBs()
+    } catch (err: any) {
+      alert(err?.response?.data?.detail || 'Failed to unlink knowledge base')
+    }
+  }
+
   const submit = async (e: React.FormEvent) => {
     e.preventDefault()
     setSaving(true)
@@ -193,6 +243,32 @@ export default function ProjectFormModal({ isOpen, onClose, onSaved, project }:
             </select>
           </label>
 
+          {project && (
+            <div className="kb-link-section">
+              <label style={{ marginBottom: 4 }}>Knowledge Bases</label>
+              {linkedKBs.length === 0 && <p className="text-dim" style={{ margin: '4px 0' }}>None linked.</p>}
+              <ul className="kb-link-list">
+                {linkedKBs.map((kb) => (
+                  <li key={kb.id}>
+                    <span>{kb.knowledge_base_code ? `${kb.knowledge_base_code} · ` : ''}{kb.title}</span>
+                    <button type="button" className="kb-mini-btn kb-danger" onClick={() => unlinkKB(kb.id)}>remove</button>
+                  </li>
+                ))}
+              </ul>
+              <div className="kb-link-add">
+                <select value={kbToLink} onChange={(e) => setKbToLink(e.target.value)}>
+                  <option value="">— select a knowledge base —</option>
+                  {linkableKBs.map((kb) => (
+                    <option key={kb.id} value={kb.knowledge_base_code || String(kb.id)}>
+                      {kb.knowledge_base_code ? `${kb.knowledge_base_code} · ` : ''}{kb.title}
+                    </option>
+                  ))}
+                </select>
+                <button type="button" className="btn-secondary" disabled={!kbToLink} onClick={linkKB}>Link</button>
+              </div>
+            </div>
+          )}
+
           <div className="modal-actions">
             <button type="submit" className="btn-primary" disabled={saving}>{saving ? 'Saving...' : (project ? 'Save' : 'Create')}</button>
             <button type="button" className="btn-secondary" onClick={onClose} disabled={saving}>Cancel</button>

src/components/Sidebar.tsx

@@ -1,6 +1,8 @@
 import { useState, useEffect } from 'react'
 import { Link, useLocation, useNavigate } from 'react-router-dom'
 import api from '@/services/api'
+import { useAuthConfig, oidcLinkHref } from '@/hooks/useAuthConfig'
+import { getLogoUrl } from '@/runtime'
 import type { User } from '@/types'
 
 interface Props {
@@ -11,6 +13,7 @@ interface Props {
 export default function Sidebar({ user, onLogout }: Props) {
   const { pathname } = useLocation()
   const navigate = useNavigate()
+  const { config: authCfg } = useAuthConfig()
   const [unreadCount, setUnreadCount] = useState(0)
 
   useEffect(() => {
@@ -32,12 +35,15 @@ export default function Sidebar({ user, onLogout }: Props) {
   const links = user ? [
     { to: '/', icon: '📊', label: 'Dashboard' },
     { to: '/projects', icon: '📁', label: 'Projects' },
-    { to: '/proposes', icon: '💡', label: 'Proposes' },
+    { to: '/knowledge-bases', icon: '📚', label: 'Knowledge Bases' },
+    { to: '/proposals', icon: '💡', label: 'Proposals' },
+    { to: '/calendar', icon: '📅', label: 'Calendar' },
     { to: '/notifications', icon: '🔔', label: 'Notifications' + (unreadCount > 0 ? ' (' + unreadCount + ')' : '') },
     { to: '/monitor', icon: '📡', label: 'Monitor' },
     ...(user.is_admin ? [
       { to: '/users', icon: '👥', label: 'Users' },
       { to: '/roles', icon: '🔐', label: 'Roles' },
+      { to: '/settings/oidc', icon: '🪪', label: 'OIDC' },
     ] : []),
   ] : [
     { to: '/monitor', icon: '📡', label: 'Monitor' },
@@ -46,7 +52,7 @@ export default function Sidebar({ user, onLogout }: Props) {
   return (
     <nav className="sidebar">
       <div className="sidebar-header">
-        <h1>⚓ HarborForge</h1>
+        <h1><img src={getLogoUrl()} className="brand-logo" alt="" /> HarborForge</h1>
       </div>
       <ul className="nav-links">
         {links.map((l) => (
@@ -63,6 +69,11 @@ export default function Sidebar({ user, onLogout }: Props) {
           <button onClick={() => navigate('/login')}>Log in</button>
         )}
       </div>
+      {user && authCfg.oidcEnabled && !authCfg.oidcOnly && (
+        <div className="sidebar-footer" style={{ borderTop: 'none', paddingTop: 0 }}>
+          <a href={oidcLinkHref()} title="Link your account to an OIDC identity">🔗 Link OIDC account</a>
+        </div>
+      )}
     </nav>
   )
 }

src/hooks/useAuth.ts

@@ -44,10 +44,16 @@ export function useAuth() {
     await fetchUser()
   }
 
+  const loginWithToken = async (token: string) => {
+    localStorage.setItem('token', token)
+    setState((s) => ({ ...s, token }))
+    await fetchUser()
+  }
+
   const logout = () => {
     localStorage.removeItem('token')
     setState({ user: null, token: null, loading: false })
   }
 
-  return { ...state, login, logout }
+  return { ...state, login, loginWithToken, logout }
 }

src/hooks/useAuthConfig.ts

@@ -0,0 +1,76 @@
+import { useState, useEffect } from 'react'
+import api from '@/services/api'
+
+export interface AuthConfig {
+  oidcEnabled: boolean
+  oidcOnly: boolean
+  passwordLogin: boolean
+  oidcLoginUrl: string
+}
+
+const DEFAULT: AuthConfig = {
+  oidcEnabled: false,
+  oidcOnly: false,
+  passwordLogin: true,
+  oidcLoginUrl: '/auth/oidc/login',
+}
+
+let cache: AuthConfig | null = null
+let inflight: Promise<AuthConfig> | null = null
+
+async function load(): Promise<AuthConfig> {
+  if (cache) return cache
+  if (inflight) return inflight
+  inflight = api
+    .get('/auth/config')
+    .then(({ data }) => {
+      cache = {
+        oidcEnabled: !!data.oidc_enabled,
+        oidcOnly: !!data.oidc_only,
+        passwordLogin: data.password_login !== false,
+        oidcLoginUrl: data.oidc_login_url || '/auth/oidc/login',
+      }
+      return cache
+    })
+    .catch(() => {
+      // Backend unreachable / old backend without /auth/config:
+      // fall back to password-only so login is never fully blocked.
+      cache = { ...DEFAULT }
+      return cache
+    })
+    .finally(() => {
+      inflight = null
+    })
+  return inflight
+}
+
+/** Absolute backend URL for full-page OIDC redirects. */
+const BACKEND_BASE = import.meta.env.VITE_HF_BACKEND_BASE_URL || ''
+
+export function oidcLoginHref(cfg: AuthConfig): string {
+  return `${BACKEND_BASE}${cfg.oidcLoginUrl}`
+}
+
+export function oidcLinkHref(): string {
+  return `${BACKEND_BASE}/auth/oidc/link`
+}
+
+export function useAuthConfig() {
+  const [config, setConfig] = useState<AuthConfig | null>(cache)
+  const [loading, setLoading] = useState(!cache)
+
+  useEffect(() => {
+    let alive = true
+    load().then((c) => {
+      if (alive) {
+        setConfig(c)
+        setLoading(false)
+      }
+    })
+    return () => {
+      alive = false
+    }
+  }, [])
+
+  return { config: config ?? DEFAULT, loading }
+}

src/pages/CalendarPage.tsx

@@ -0,0 +1,851 @@
+import { useState, useEffect } from 'react'
+import api from '@/services/api'
+import dayjs from 'dayjs'
+
+// Types for Calendar entities
+type SlotType = 'work' | 'on_call' | 'entertainment' | 'system'
+type EventType = 'job' | 'entertainment' | 'system_event'
+type SlotStatus = 'not_started' | 'ongoing' | 'deferred' | 'skipped' | 'paused' | 'finished' | 'aborted'
+
+interface TimeSlotResponse {
+  slot_id: string  // real int id or "plan-{planId}-{date}" for virtual
+  date: string
+  slot_type: SlotType
+  estimated_duration: number
+  scheduled_at: string  // HH:mm
+  started_at: string | null
+  attended: boolean
+  actual_duration: number | null
+  event_type: EventType | null
+  event_data: Record<string, any> | null
+  priority: number
+  status: SlotStatus
+  plan_id: number | null
+  is_virtual: boolean
+  created_at: string | null
+  updated_at: string | null
+}
+
+interface DayViewResponse {
+  date: string
+  user_id: number
+  slots: TimeSlotResponse[]
+}
+
+interface SchedulePlanResponse {
+  id: number
+  slot_type: SlotType
+  estimated_duration: number
+  event_type: string | null
+  event_data: Record<string, any> | null
+  at_time: string
+  on_day: string | null
+  on_week: number | null
+  on_month: string | null
+  is_active: boolean
+  created_at: string
+  updated_at: string | null
+}
+
+interface PlanListResponse {
+  plans: SchedulePlanResponse[]
+}
+
+type Weekday = 'sun' | 'mon' | 'tue' | 'wed' | 'thu' | 'fri' | 'sat'
+type MonthName = 'jan' | 'feb' | 'mar' | 'apr' | 'may' | 'jun' | 'jul' | 'aug' | 'sep' | 'oct' | 'nov' | 'dec'
+
+interface WorkloadWarning {
+  period: string
+  slot_type: string
+  current: number
+  minimum: number
+  message: string
+}
+
+interface ScheduleResponse {
+  slot: TimeSlotResponse
+  warnings: WorkloadWarning[]
+}
+
+const SLOT_TYPES: { value: SlotType; label: string }[] = [
+  { value: 'work', label: 'Work' },
+  { value: 'on_call', label: 'On Call' },
+  { value: 'entertainment', label: 'Entertainment' },
+  { value: 'system', label: 'System' },
+]
+
+const EVENT_TYPES: { value: EventType; label: string }[] = [
+  { value: 'job', label: 'Job' },
+  { value: 'entertainment', label: 'Entertainment' },
+  { value: 'system_event', label: 'System Event' },
+]
+
+const WEEKDAYS: { value: Weekday; label: string }[] = [
+  { value: 'sun', label: 'Sunday' },
+  { value: 'mon', label: 'Monday' },
+  { value: 'tue', label: 'Tuesday' },
+  { value: 'wed', label: 'Wednesday' },
+  { value: 'thu', label: 'Thursday' },
+  { value: 'fri', label: 'Friday' },
+  { value: 'sat', label: 'Saturday' },
+]
+
+const MONTHS: { value: MonthName; label: string }[] = [
+  { value: 'jan', label: 'January' },
+  { value: 'feb', label: 'February' },
+  { value: 'mar', label: 'March' },
+  { value: 'apr', label: 'April' },
+  { value: 'may', label: 'May' },
+  { value: 'jun', label: 'June' },
+  { value: 'jul', label: 'July' },
+  { value: 'aug', label: 'August' },
+  { value: 'sep', label: 'September' },
+  { value: 'oct', label: 'October' },
+  { value: 'nov', label: 'November' },
+  { value: 'dec', label: 'December' },
+]
+
+const SLOT_TYPE_ICONS: Record<string, string> = {
+  work: '💼',
+  on_call: '📞',
+  entertainment: '🎮',
+  system: '⚙️',
+}
+
+const STATUS_CLASSES: Record<string, string> = {
+  not_started: 'status-open',
+  ongoing: 'status-undergoing',
+  deferred: 'status-pending',
+  skipped: 'status-closed',
+  paused: 'status-pending',
+  finished: 'status-completed',
+  aborted: 'status-closed',
+}
+
+export default function CalendarPage() {
+  const [selectedDate, setSelectedDate] = useState(dayjs().format('YYYY-MM-DD'))
+  const [slots, setSlots] = useState<TimeSlotResponse[]>([])
+  const [plans, setPlans] = useState<SchedulePlanResponse[]>([])
+  const [loading, setLoading] = useState(false)
+  const [activeTab, setActiveTab] = useState<'daily' | 'plans'>('daily')
+  const [error, setError] = useState('')
+
+  // Create/Edit slot modal state
+  const [showSlotModal, setShowSlotModal] = useState(false)
+  const [editingSlot, setEditingSlot] = useState<TimeSlotResponse | null>(null)
+  const [slotForm, setSlotForm] = useState({
+    slot_type: 'work' as SlotType,
+    scheduled_at: '09:00',
+    estimated_duration: 25,
+    event_type: '' as string,
+    event_data_code: '',
+    event_data_event: '',
+    priority: 50,
+  })
+  const [slotSaving, setSlotSaving] = useState(false)
+  const [warnings, setWarnings] = useState<WorkloadWarning[]>([])
+  const [showPlanModal, setShowPlanModal] = useState(false)
+  const [editingPlan, setEditingPlan] = useState<SchedulePlanResponse | null>(null)
+  const [planSaving, setPlanSaving] = useState(false)
+  const [planForm, setPlanForm] = useState({
+    slot_type: 'work' as SlotType,
+    estimated_duration: 25,
+    at_time: '09:00',
+    on_day: '' as Weekday | '',
+    on_week: '' as string,
+    on_month: '' as MonthName | '',
+    event_type: '' as string,
+    event_data_code: '',
+    event_data_event: '',
+  })
+
+  const fetchSlots = async (date: string) => {
+    setLoading(true)
+    setError('')
+    try {
+      const { data } = await api.get<DayViewResponse>(`/calendar/day?date=${date}`)
+      setSlots(Array.isArray(data?.slots) ? data.slots : [])
+    } catch (err: any) {
+      setError(err.response?.data?.detail || 'Failed to load calendar')
+      setSlots([])
+    } finally {
+      setLoading(false)
+    }
+  }
+
+  const fetchPlans = async () => {
+    try {
+      const { data } = await api.get<PlanListResponse>('/calendar/plans')
+      setPlans(Array.isArray(data?.plans) ? data.plans : [])
+    } catch (err: any) {
+      console.error('Failed to load plans:', err)
+    }
+  }
+
+  useEffect(() => {
+    fetchSlots(selectedDate)
+    fetchPlans()
+  }, [])
+
+  useEffect(() => {
+    if (activeTab === 'daily') {
+      fetchSlots(selectedDate)
+    }
+  }, [selectedDate])
+
+  const handleDateChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    setSelectedDate(e.target.value)
+  }
+
+  const goToday = () => setSelectedDate(dayjs().format('YYYY-MM-DD'))
+  const goPrev = () => setSelectedDate(dayjs(selectedDate).subtract(1, 'day').format('YYYY-MM-DD'))
+  const goNext = () => setSelectedDate(dayjs(selectedDate).add(1, 'day').format('YYYY-MM-DD'))
+
+  const formatPlanSchedule = (plan: SchedulePlanResponse) => {
+    const parts: string[] = [`at ${plan.at_time}`]
+    if (plan.on_day) parts.push(`on ${plan.on_day}`)
+    if (plan.on_week) parts.push(`week ${plan.on_week}`)
+    if (plan.on_month) parts.push(`in ${plan.on_month}`)
+    return parts.join(' · ')
+  }
+
+  // --- Slot create/edit ---
+  const openCreateSlotModal = () => {
+    setEditingSlot(null)
+    setSlotForm({
+      slot_type: 'work',
+      scheduled_at: '09:00',
+      estimated_duration: 25,
+      event_type: '',
+      event_data_code: '',
+      event_data_event: '',
+      priority: 50,
+    })
+    setWarnings([])
+    setError('')
+    setShowSlotModal(true)
+  }
+
+  const openEditSlotModal = (slot: TimeSlotResponse) => {
+    setEditingSlot(slot)
+    setSlotForm({
+      slot_type: slot.slot_type,
+      scheduled_at: slot.scheduled_at,
+      estimated_duration: slot.estimated_duration,
+      event_type: slot.event_type || '',
+      event_data_code: slot.event_data?.code || '',
+      event_data_event: slot.event_data?.event || '',
+      priority: slot.priority,
+    })
+    setWarnings([])
+    setError('')
+    setShowSlotModal(true)
+  }
+
+  const buildEventData = () => {
+    if (!slotForm.event_type) return null
+    if (slotForm.event_type === 'job') {
+      return slotForm.event_data_code ? { type: 'Task', code: slotForm.event_data_code } : null
+    }
+    if (slotForm.event_type === 'system_event') {
+      return slotForm.event_data_event ? { event: slotForm.event_data_event } : null
+    }
+    return null
+  }
+
+  const buildPlanEventData = () => {
+    if (!planForm.event_type) return null
+    if (planForm.event_type === 'job') {
+      return planForm.event_data_code ? { type: 'Task', code: planForm.event_data_code } : null
+    }
+    if (planForm.event_type === 'system_event') {
+      return planForm.event_data_event ? { event: planForm.event_data_event } : null
+    }
+    return null
+  }
+
+  const openCreatePlanModal = () => {
+    setEditingPlan(null)
+    setPlanForm({
+      slot_type: 'work',
+      estimated_duration: 25,
+      at_time: '09:00',
+      on_day: '',
+      on_week: '',
+      on_month: '',
+      event_type: '',
+      event_data_code: '',
+      event_data_event: '',
+    })
+    setError('')
+    setShowPlanModal(true)
+  }
+
+  const openEditPlanModal = (plan: SchedulePlanResponse) => {
+    setEditingPlan(plan)
+    setPlanForm({
+      slot_type: plan.slot_type,
+      estimated_duration: plan.estimated_duration,
+      at_time: plan.at_time.slice(0, 5),
+      on_day: (plan.on_day?.toLowerCase() as Weekday | undefined) || '',
+      on_week: plan.on_week ? String(plan.on_week) : '',
+      on_month: (plan.on_month?.toLowerCase() as MonthName | undefined) || '',
+      event_type: plan.event_type || '',
+      event_data_code: plan.event_data?.code || '',
+      event_data_event: plan.event_data?.event || '',
+    })
+    setError('')
+    setShowPlanModal(true)
+  }
+
+  const handleSavePlan = async () => {
+    setPlanSaving(true)
+    setError('')
+    try {
+      const payload: any = {
+        slot_type: planForm.slot_type,
+        estimated_duration: planForm.estimated_duration,
+        at_time: planForm.at_time,
+        on_day: planForm.on_day || null,
+        on_week: planForm.on_week ? Number(planForm.on_week) : null,
+        on_month: planForm.on_month || null,
+        event_type: planForm.event_type || null,
+        event_data: buildPlanEventData(),
+      }
+
+      if (editingPlan) {
+        await api.patch(`/calendar/plans/${editingPlan.id}`, payload)
+      } else {
+        await api.post('/calendar/plans', payload)
+      }
+
+      setShowPlanModal(false)
+      fetchPlans()
+      if (activeTab === 'daily') {
+        fetchSlots(selectedDate)
+      }
+    } catch (err: any) {
+      setError(err.response?.data?.detail || 'Save plan failed')
+    } finally {
+      setPlanSaving(false)
+    }
+  }
+
+  const handleSaveSlot = async () => {
+    setSlotSaving(true)
+    setError('')
+    setWarnings([])
+    try {
+      const payload: any = {
+        slot_type: slotForm.slot_type,
+        scheduled_at: slotForm.scheduled_at,
+        estimated_duration: slotForm.estimated_duration,
+        priority: slotForm.priority,
+        event_type: slotForm.event_type || null,
+        event_data: buildEventData(),
+      }
+
+      let response: any
+      if (editingSlot) {
+        // Edit existing slot
+        if (editingSlot.is_virtual) {
+          response = await api.patch(`/calendar/slots/virtual/${editingSlot.slot_id}`, payload)
+        } else if (editingSlot.slot_id) {
+          response = await api.patch(`/calendar/slots/${editingSlot.slot_id}`, payload)
+        } else {
+          throw new Error('Missing slot identifier for edit')
+        }
+      } else {
+        // Create new slot
+        payload.date = selectedDate
+        response = await api.post('/calendar/slots', payload)
+      }
+
+      // Check for warnings in response
+      if (response.data?.warnings && response.data.warnings.length > 0) {
+        setWarnings(response.data.warnings)
+      }
+
+      setShowSlotModal(false)
+      fetchSlots(selectedDate)
+    } catch (err: any) {
+      const detail = err.response?.data?.detail
+      if (typeof detail === 'string' && detail.toLowerCase().includes('overlap')) {
+        setError(`⚠️ Overlap conflict: ${detail}`)
+      } else if (detail && typeof detail === 'object') {
+        const message = typeof detail.message === 'string' ? detail.message : 'Save failed'
+        const conflicts = Array.isArray(detail.conflicts) ? detail.conflicts : []
+        if (conflicts.length > 0) {
+          const summary = conflicts
+            .map((conflict: any) => `${conflict.slot_type || 'slot'} at ${conflict.scheduled_at || 'unknown time'}`)
+            .join(', ')
+          setError(`⚠️ ${message}: ${summary}`)
+        } else {
+          setError(`⚠️ ${message}`)
+        }
+      } else {
+        setError(detail || 'Save failed')
+      }
+    } finally {
+      setSlotSaving(false)
+    }
+  }
+
+  // --- Slot cancel ---
+  const handleCancelSlot = async (slot: TimeSlotResponse) => {
+    if (!confirm(`Cancel this ${slot.slot_type} slot at ${slot.scheduled_at}?`)) return
+    setError('')
+    try {
+      if (slot.is_virtual) {
+        await api.post(`/calendar/slots/virtual/${slot.slot_id}/cancel`)
+      } else if (slot.slot_id) {
+        await api.post(`/calendar/slots/${slot.slot_id}/cancel`)
+      } else {
+        throw new Error('Missing slot identifier for cancel')
+      }
+      fetchSlots(selectedDate)
+    } catch (err: any) {
+      setError(err.response?.data?.detail || 'Cancel failed')
+    }
+  }
+
+  // --- Plan cancel ---
+  const handleCancelPlan = async (plan: SchedulePlanResponse) => {
+    if (!confirm(`Cancel plan #${plan.id}? This won't affect past materialized slots.`)) return
+    setError('')
+    try {
+      await api.post(`/calendar/plans/${plan.id}/cancel`)
+      fetchPlans()
+    } catch (err: any) {
+      setError(err.response?.data?.detail || 'Cancel plan failed')
+    }
+  }
+
+  // Check if a date is in the past
+  const isPastDate = dayjs(selectedDate).isBefore(dayjs().startOf('day'))
+
+  return (
+    <div className="calendar-page">
+      <div className="page-header" style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 16 }}>
+        <h2>📅 Calendar</h2>
+      </div>
+
+      {/* Tab switcher */}
+      <div style={{ display: 'flex', gap: 8, marginBottom: 16 }}>
+        <button
+          className={activeTab === 'daily' ? 'btn-primary' : 'btn-secondary'}
+          onClick={() => setActiveTab('daily')}
+        >
+          Daily View
+        </button>
+        <button
+          className={activeTab === 'plans' ? 'btn-primary' : 'btn-secondary'}
+          onClick={() => setActiveTab('plans')}
+        >
+          Plans ({plans.length})
+        </button>
+      </div>
+
+      {error && <div className="error-message" style={{ color: 'var(--danger)', marginBottom: 12 }}>{error}</div>}
+
+      {/* Workload warnings banner */}
+      {warnings.length > 0 && (
+        <div style={{ background: 'var(--warning-bg, #fff3cd)', border: '1px solid var(--warning-border, #ffc107)', borderRadius: 8, padding: 12, marginBottom: 12 }}>
+          <strong>⚠️ Workload Warnings:</strong>
+          <ul style={{ margin: '4px 0 0 16px', padding: 0 }}>
+            {warnings.map((w, i) => (
+              <li key={i}>{w.message} ({w.period} {w.slot_type}: {w.current}/{w.minimum} min)</li>
+            ))}
+          </ul>
+        </div>
+      )}
+
+      {activeTab === 'daily' && (
+        <>
+          {/* Date navigation */}
+          <div style={{ display: 'flex', alignItems: 'center', gap: 8, marginBottom: 16 }}>
+            <button className="btn-secondary" onClick={goPrev}>◀</button>
+            <input
+              type="date"
+              value={selectedDate}
+              onChange={handleDateChange}
+              style={{ fontSize: '1rem', padding: '4px 8px' }}
+            />
+            <button className="btn-secondary" onClick={goNext}>▶</button>
+            <button className="btn-transition" onClick={goToday}>Today</button>
+            {!isPastDate && (
+              <button className="btn-primary" onClick={openCreateSlotModal} style={{ marginLeft: 'auto' }}>+ New Slot</button>
+            )}
+          </div>
+
+          {/* Deferred slots notice */}
+          {slots.some(s => s.status === 'deferred') && (
+            <div style={{ background: 'var(--warning-bg, #fff3cd)', border: '1px solid var(--warning-border, #ffc107)', borderRadius: 8, padding: 10, marginBottom: 12, fontSize: '0.9rem' }}>
+              ⏳ Some slots are <strong>deferred</strong> — they were postponed due to scheduling conflicts or agent unavailability.
+            </div>
+          )}
+
+          {/* Slot list */}
+          {loading ? (
+            <div className="loading">Loading...</div>
+          ) : slots.length === 0 ? (
+            <div className="empty" style={{ padding: '40px 0', color: 'var(--text-secondary)', textAlign: 'center' }}>
+              No slots scheduled for {dayjs(selectedDate).format('MMMM D, YYYY')}.
+            </div>
+          ) : (
+            <div className="milestone-grid">
+              {slots.map((slot) => (
+                <div
+                  key={slot.slot_id}
+                  className="milestone-card"
+                  style={{ opacity: slot.is_virtual ? 0.8 : 1 }}
+                >
+                  <div className="milestone-card-header" style={{ display: 'flex', alignItems: 'center', gap: 8, flexWrap: 'wrap' }}>
+                    <span style={{ fontSize: '1.2rem' }}>{SLOT_TYPE_ICONS[slot.slot_type] || '📋'}</span>
+                    <span className="badge">{slot.slot_type.replace('_', ' ')}</span>
+                    <span className={`badge ${STATUS_CLASSES[slot.status] || ''}`}>{slot.status.replace('_', ' ')}</span>
+                    {slot.is_virtual && <span className="badge" style={{ background: 'var(--text-secondary)', color: 'white', fontSize: '0.7rem' }}>plan</span>}
+                    <span style={{ marginLeft: 'auto', fontWeight: 600 }}>{slot.scheduled_at}</span>
+                  </div>
+                  <div style={{ marginTop: 8, display: 'flex', gap: 16, fontSize: '0.9rem', color: 'var(--text-secondary)' }}>
+                    <span>⏱ {slot.estimated_duration} min</span>
+                    <span>⚡ Priority: {slot.priority}</span>
+                    {slot.event_type && <span>📌 {slot.event_type.replace('_', ' ')}</span>}
+                  </div>
+                  {slot.event_data && slot.event_data.code && (
+                    <div style={{ marginTop: 4, fontSize: '0.85rem', color: 'var(--text-secondary)' }}>
+                      🔗 {slot.event_data.code}
+                    </div>
+                  )}
+                  {slot.event_data && slot.event_data.event && (
+                    <div style={{ marginTop: 4, fontSize: '0.85rem', color: 'var(--text-secondary)' }}>
+                      📣 {slot.event_data.event}
+                    </div>
+                  )}
+                  {/* Action buttons for non-past, modifiable slots */}
+                  {!isPastDate && (slot.status === 'not_started' || slot.status === 'deferred') && (
+                    <div style={{ marginTop: 8, display: 'flex', gap: 6 }}>
+                      <button
+                        className="btn-transition"
+                        style={{ padding: '4px 10px', fontSize: '0.8rem' }}
+                        onClick={() => openEditSlotModal(slot)}
+                      >
+                        ✏️ Edit
+                      </button>
+                      <button
+                        className="btn-danger"
+                        style={{ padding: '4px 10px', fontSize: '0.8rem' }}
+                        onClick={() => handleCancelSlot(slot)}
+                      >
+                        ❌ Cancel
+                      </button>
+                    </div>
+                  )}
+                </div>
+              ))}
+            </div>
+          )}
+        </>
+      )}
+
+      {activeTab === 'plans' && (
+        <>
+          <div style={{ display: 'flex', justifyContent: 'flex-end', marginBottom: 16 }}>
+            <button className="btn-primary" onClick={openCreatePlanModal}>+ New Plan</button>
+          </div>
+
+          <div className="milestone-grid">
+          {plans.length === 0 ? (
+            <div className="empty" style={{ padding: '40px 0', color: 'var(--text-secondary)', textAlign: 'center' }}>
+              No schedule plans configured.
+            </div>
+          ) : (
+            plans.map((plan) => (
+              <div key={plan.id} className="milestone-card">
+                <div className="milestone-card-header" style={{ display: 'flex', alignItems: 'center', gap: 8, flexWrap: 'wrap' }}>
+                  <span style={{ fontSize: '1.2rem' }}>{SLOT_TYPE_ICONS[plan.slot_type] || '📋'}</span>
+                  <span className="badge">{plan.slot_type.replace('_', ' ')}</span>
+                  {!plan.is_active && <span className="badge status-closed">inactive</span>}
+                  <span style={{ marginLeft: 'auto', fontWeight: 600 }}>Plan #{plan.id}</span>
+                </div>
+                <div style={{ marginTop: 8, fontSize: '0.9rem', color: 'var(--text-secondary)' }}>
+                  <div>🔄 {formatPlanSchedule(plan)}</div>
+                  <div>⏱ {plan.estimated_duration} min</div>
+                  {plan.event_type && <div>📌 {plan.event_type.replace('_', ' ')}</div>}
+                </div>
+                {plan.is_active && (
+                  <div style={{ marginTop: 8, display: 'flex', gap: 8 }}>
+                    <button
+                      className="btn-transition"
+                      style={{ padding: '4px 10px', fontSize: '0.8rem' }}
+                      onClick={() => openEditPlanModal(plan)}
+                    >
+                      ✏️ Edit Plan
+                    </button>
+                    <button
+                      className="btn-danger"
+                      style={{ padding: '4px 10px', fontSize: '0.8rem' }}
+                      onClick={() => handleCancelPlan(plan)}
+                    >
+                      ❌ Cancel Plan
+                    </button>
+                  </div>
+                )}
+              </div>
+            ))
+          )}
+          </div>
+        </>
+      )}
+
+      {/* Create/Edit Slot Modal */}
+      {showSlotModal && (
+        <div className="modal-overlay" onClick={() => setShowSlotModal(false)}>
+          <div className="modal" onClick={(e) => e.stopPropagation()}>
+            <h3>{editingSlot ? 'Edit Slot' : 'New Slot'}</h3>
+            <p style={{ color: 'var(--text-secondary)', fontSize: '0.9rem' }}>
+              Date: <strong>{dayjs(selectedDate).format('MMMM D, YYYY')}</strong>
+            </p>
+
+            <label style={{ display: 'block', marginBottom: 8 }}>
+              <strong>Slot Type</strong>
+              <select
+                value={slotForm.slot_type}
+                onChange={(e) => setSlotForm({ ...slotForm, slot_type: e.target.value as SlotType })}
+                style={{ width: '100%', marginTop: 4 }}
+              >
+                {SLOT_TYPES.map((t) => (
+                  <option key={t.value} value={t.value}>{t.label}</option>
+                ))}
+              </select>
+            </label>
+
+            <label style={{ display: 'block', marginBottom: 8 }}>
+              <strong>Scheduled At</strong>
+              <input
+                type="time"
+                value={slotForm.scheduled_at}
+                onChange={(e) => setSlotForm({ ...slotForm, scheduled_at: e.target.value })}
+                style={{ width: '100%', marginTop: 4 }}
+              />
+            </label>
+
+            <label style={{ display: 'block', marginBottom: 8 }}>
+              <strong>Estimated Duration (minutes, 1–50)</strong>
+              <input
+                type="number"
+                min={1}
+                max={50}
+                value={slotForm.estimated_duration}
+                onChange={(e) => setSlotForm({ ...slotForm, estimated_duration: Number(e.target.value) })}
+                style={{ width: '100%', marginTop: 4 }}
+              />
+            </label>
+
+            <label style={{ display: 'block', marginBottom: 8 }}>
+              <strong>Priority (0–99)</strong>
+              <input
+                type="number"
+                min={0}
+                max={99}
+                value={slotForm.priority}
+                onChange={(e) => setSlotForm({ ...slotForm, priority: Number(e.target.value) })}
+                style={{ width: '100%', marginTop: 4 }}
+              />
+            </label>
+
+            <label style={{ display: 'block', marginBottom: 8 }}>
+              <strong>Event Type</strong>
+              <select
+                value={slotForm.event_type}
+                onChange={(e) => setSlotForm({ ...slotForm, event_type: e.target.value })}
+                style={{ width: '100%', marginTop: 4 }}
+              >
+                <option value="">None</option>
+                {EVENT_TYPES.map((t) => (
+                  <option key={t.value} value={t.value}>{t.label}</option>
+                ))}
+              </select>
+            </label>
+
+            {slotForm.event_type === 'job' && (
+              <label style={{ display: 'block', marginBottom: 8 }}>
+                <strong>Job Code</strong>
+                <input
+                  type="text"
+                  value={slotForm.event_data_code}
+                  onChange={(e) => setSlotForm({ ...slotForm, event_data_code: e.target.value })}
+                  placeholder="e.g. TASK-42"
+                  style={{ width: '100%', marginTop: 4 }}
+                />
+              </label>
+            )}
+
+            {slotForm.event_type === 'system_event' && (
+              <label style={{ display: 'block', marginBottom: 8 }}>
+                <strong>System Event</strong>
+                <select
+                  value={slotForm.event_data_event}
+                  onChange={(e) => setSlotForm({ ...slotForm, event_data_event: e.target.value })}
+                  style={{ width: '100%', marginTop: 4 }}
+                >
+                  <option value="">Select event</option>
+                  <option value="ScheduleToday">Schedule Today</option>
+                  <option value="SummaryToday">Summary Today</option>
+                  <option value="ScheduledGatewayRestart">Scheduled Gateway Restart</option>
+                </select>
+              </label>
+            )}
+
+            <div style={{ marginTop: 12, display: 'flex', gap: 8 }}>
+              <button
+                className="btn-primary"
+                onClick={handleSaveSlot}
+                disabled={slotSaving}
+              >
+                {slotSaving ? 'Saving...' : 'Save'}
+              </button>
+              <button className="btn-back" onClick={() => setShowSlotModal(false)}>Cancel</button>
+            </div>
+          </div>
+        </div>
+      )}
+
+      {showPlanModal && (
+        <div className="modal-overlay" onClick={() => setShowPlanModal(false)}>
+          <div className="modal" onClick={(e) => e.stopPropagation()}>
+            <h3>{editingPlan ? 'Edit Plan' : 'New Plan'}</h3>
+
+            <label style={{ display: 'block', marginBottom: 8 }}>
+              <strong>Slot Type</strong>
+              <select
+                value={planForm.slot_type}
+                onChange={(e) => setPlanForm({ ...planForm, slot_type: e.target.value as SlotType })}
+                style={{ width: '100%', marginTop: 4 }}
+              >
+                {SLOT_TYPES.map((t) => (
+                  <option key={t.value} value={t.value}>{t.label}</option>
+                ))}
+              </select>
+            </label>
+
+            <label style={{ display: 'block', marginBottom: 8 }}>
+              <strong>At Time</strong>
+              <input
+                type="time"
+                value={planForm.at_time}
+                onChange={(e) => setPlanForm({ ...planForm, at_time: e.target.value })}
+                style={{ width: '100%', marginTop: 4 }}
+              />
+            </label>
+
+            <label style={{ display: 'block', marginBottom: 8 }}>
+              <strong>Estimated Duration (minutes, 1–50)</strong>
+              <input
+                type="number"
+                min={1}
+                max={50}
+                value={planForm.estimated_duration}
+                onChange={(e) => setPlanForm({ ...planForm, estimated_duration: Number(e.target.value) })}
+                style={{ width: '100%', marginTop: 4 }}
+              />
+            </label>
+
+            <label style={{ display: 'block', marginBottom: 8 }}>
+              <strong>On Day (optional)</strong>
+              <select
+                value={planForm.on_day}
+                onChange={(e) => setPlanForm({ ...planForm, on_day: e.target.value as Weekday | '' })}
+                style={{ width: '100%', marginTop: 4 }}
+              >
+                <option value="">Every day</option>
+                {WEEKDAYS.map((d) => (
+                  <option key={d.value} value={d.value}>{d.label}</option>
+                ))}
+              </select>
+            </label>
+
+            <label style={{ display: 'block', marginBottom: 8 }}>
+              <strong>On Week (optional)</strong>
+              <select
+                value={planForm.on_week}
+                onChange={(e) => setPlanForm({ ...planForm, on_week: e.target.value })}
+                style={{ width: '100%', marginTop: 4 }}
+              >
+                <option value="">Every matching week</option>
+                <option value="1">1</option>
+                <option value="2">2</option>
+                <option value="3">3</option>
+                <option value="4">4</option>
+              </select>
+            </label>
+
+            <label style={{ display: 'block', marginBottom: 8 }}>
+              <strong>On Month (optional)</strong>
+              <select
+                value={planForm.on_month}
+                onChange={(e) => setPlanForm({ ...planForm, on_month: e.target.value as MonthName | '' })}
+                style={{ width: '100%', marginTop: 4 }}
+              >
+                <option value="">Every month</option>
+                {MONTHS.map((m) => (
+                  <option key={m.value} value={m.value}>{m.label}</option>
+                ))}
+              </select>
+            </label>
+
+            <label style={{ display: 'block', marginBottom: 8 }}>
+              <strong>Event Type</strong>
+              <select
+                value={planForm.event_type}
+                onChange={(e) => setPlanForm({ ...planForm, event_type: e.target.value })}
+                style={{ width: '100%', marginTop: 4 }}
+              >
+                <option value="">None</option>
+                {EVENT_TYPES.map((t) => (
+                  <option key={t.value} value={t.value}>{t.label}</option>
+                ))}
+              </select>
+            </label>
+
+            {planForm.event_type === 'job' && (
+              <label style={{ display: 'block', marginBottom: 8 }}>
+                <strong>Job Code</strong>
+                <input
+                  type="text"
+                  value={planForm.event_data_code}
+                  onChange={(e) => setPlanForm({ ...planForm, event_data_code: e.target.value })}
+                  placeholder="e.g. TASK-42"
+                  style={{ width: '100%', marginTop: 4 }}
+                />
+              </label>
+            )}
+
+            {planForm.event_type === 'system_event' && (
+              <label style={{ display: 'block', marginBottom: 8 }}>
+                <strong>System Event</strong>
+                <select
+                  value={planForm.event_data_event}
+                  onChange={(e) => setPlanForm({ ...planForm, event_data_event: e.target.value })}
+                  style={{ width: '100%', marginTop: 4 }}
+                >
+                  <option value="">Select event</option>
+                  <option value="ScheduleToday">Schedule Today</option>
+                  <option value="SummaryToday">Summary Today</option>
+                  <option value="ScheduledGatewayRestart">Scheduled Gateway Restart</option>
+                </select>
+              </label>
+            )}
+
+            <div style={{ marginTop: 12, display: 'flex', gap: 8 }}>
+              <button className="btn-primary" onClick={handleSavePlan} disabled={planSaving}>
+                {planSaving ? 'Saving...' : 'Save Plan'}
+              </button>
+              <button className="btn-back" onClick={() => setShowPlanModal(false)}>Cancel</button>
+            </div>
+          </div>
+        </div>
+      )}
+    </div>
+  )
+}

src/pages/CreateTaskPage.tsx

@@ -4,7 +4,7 @@ import api from '@/services/api'
 import type { Project, Milestone } from '@/types'
 
 const TASK_TYPES = [
-  { value: 'story', label: 'Story', subtypes: ['improvement', 'refactor'] },  // P9.6: 'feature' removed — must come from propose accept
+  // P9.6: 'story' removed — all story/* types are restricted; must come from Proposal Accept workflow
   { value: 'issue', label: 'Issue', subtypes: ['infrastructure', 'performance', 'regression', 'security', 'user_experience', 'defect'] },
   // P7.1: 'task' type removed — defect subtype migrated to issue/defect
   { value: 'test', label: 'Test', subtypes: ['regression', 'security', 'smoke', 'stress'] },
@@ -19,7 +19,7 @@ export default function CreateTaskPage() {
   const [projects, setProjects] = useState<Project[]>([])
   const [milestones, setMilestones] = useState<Milestone[]>([])
   const [form, setForm] = useState({
-    title: '', description: '', project_id: 0, milestone_id: 0, task_type: 'issue',  // P7.1: default changed from 'task' to 'issue'
+    title: '', description: '', project_code: '', milestone_code: '', task_type: 'issue',  // P7.1: default changed from 'task' to 'issue'
     task_subtype: '', priority: 'medium', tags: '', reporter_id: 1,
   })
 
@@ -27,21 +27,21 @@ export default function CreateTaskPage() {
     api.get<Project[]>('/projects').then(({ data }) => {
       setProjects(data)
       if (data.length) {
-        setForm((f) => ({ ...f, project_id: data[0].id }))
+        setForm((f) => ({ ...f, project_code: data[0].project_code || '' }))
         // Load milestones for the first project
-        api.get<Milestone[]>(`/milestones?project_id=${data[0].id}`).then(({ data: ms }) => {
+        api.get<Milestone[]>(`/milestones?project_code=${data[0].project_code}`).then(({ data: ms }) => {
           setMilestones(ms)
-          if (ms.length) setForm((f) => ({ ...f, milestone_id: ms[0].id }))
+          if (ms.length) setForm((f) => ({ ...f, milestone_code: ms[0].milestone_code || '' }))
         })
       }
     })
   }, [])
 
-  const handleProjectChange = (projectId: number) => {
+  const handleProjectChange = (projectCode: string) => {
-    setForm(f => ({ ...f, project_id: projectId, milestone_id: 0 }))
+    setForm(f => ({ ...f, project_code: projectCode, milestone_code: '' }))
-    api.get<Milestone[]>(`/milestones?project_id=${projectId}`).then(({ data: ms }) => {
+    api.get<Milestone[]>(`/milestones?project_code=${projectCode}`).then(({ data: ms }) => {
       setMilestones(ms)
-      if (ms.length) setForm((f) => ({ ...f, milestone_id: ms[0].id }))
+      if (ms.length) setForm((f) => ({ ...f, milestone_code: ms[0].milestone_code || '' }))
     })
   }
 
@@ -54,7 +54,7 @@ export default function CreateTaskPage() {
 
   const submit = async (e: React.FormEvent) => {
     e.preventDefault()
-    if (!form.milestone_id) {
+    if (!form.milestone_code) {
       alert('Please select a milestone')
       return
     }
@@ -71,14 +71,14 @@ export default function CreateTaskPage() {
         <label>Title <input data-testid="task-title-input" required value={form.title} onChange={(e) => setForm({ ...form, title: e.target.value })} /></label>
         <label>Description <textarea data-testid="task-description-input" value={form.description} onChange={(e) => setForm({ ...form, description: e.target.value })} /></label>
         <label>Projects
-          <select data-testid="project-select" value={form.project_id} onChange={(e) => handleProjectChange(Number(e.target.value))}>
+          <select data-testid="project-select" value={form.project_code} onChange={(e) => handleProjectChange(e.target.value)}>
-            {projects.map((p) => <option key={p.id} value={p.id}>{p.name}</option>)}
+            {projects.map((p) => <option key={p.id} value={p.project_code || ''}>{p.name}</option>)}
           </select>
         </label>
         <label>Milestone
-          <select data-testid="milestone-select" value={form.milestone_id} onChange={(e) => setForm({ ...form, milestone_id: Number(e.target.value) })}>
+          <select data-testid="milestone-select" value={form.milestone_code} onChange={(e) => setForm({ ...form, milestone_code: e.target.value })}>
-            {milestones.length === 0 && <option value={0}>No milestones available</option>}
+            {milestones.length === 0 && <option value="">No milestones available</option>}
-            {milestones.map((m) => <option key={m.id} value={m.id}>{m.title}</option>)}
+            {milestones.map((m) => <option key={m.id} value={m.milestone_code || ''}>{m.title}</option>)}
           </select>
         </label>
         <label>Type

src/pages/DashboardPage.tsx

@@ -1,4 +1,5 @@
 import { useState, useEffect } from 'react'
+import { Link } from 'react-router-dom'
 import api from '@/services/api'
 import type { DashboardStats, Task } from '@/types'
 
@@ -60,8 +61,8 @@ export default function DashboardPage() {
           <tbody>
             {(stats.recent_tasks || []).map((i) => (
               <tr key={i.id}>
-                <td>{i.task_code || `#${i.id}`}</td>
+                <td>{i.task_code || '—'}</td>
-                <td><a href={`/tasks/${i.task_code || i.id}`}>{i.title}</a></td>
+                <td>{i.task_code ? <Link to={`/tasks/${i.task_code}`}>{i.title}</Link> : i.title}</td>
                 <td><span className={`badge status-${i.status}`}>{i.status}</span></td>
                 <td><span className={`badge priority-${i.priority}`}>{i.priority}</span></td>
                 <td>{i.task_type}</td><td>{i.task_subtype || "-"}</td>

src/pages/KnowledgeBaseDetailPage.tsx

@@ -0,0 +1,87 @@
+import { useCallback, useEffect, useState } from 'react'
+import { useNavigate, useParams } from 'react-router-dom'
+import api from '@/services/api'
+import type { KnowledgeBase, KnowledgeBaseTree as Tree } from '@/types'
+import KnowledgeBaseTree from '@/components/KnowledgeBaseTree'
+import KnowledgeBaseFormModal from '@/components/KnowledgeBaseFormModal'
+
+export default function KnowledgeBaseDetailPage() {
+  const { id } = useParams<{ id: string }>()
+  const navigate = useNavigate()
+  const [kb, setKb] = useState<KnowledgeBase | null>(null)
+  const [tree, setTree] = useState<Tree | null>(null)
+  const [showEdit, setShowEdit] = useState(false)
+  const [error, setError] = useState('')
+
+  const loadTree = useCallback(async () => {
+    if (!id) return
+    const { data } = await api.get<Tree>(`/knowledge-bases/${id}/tree`)
+    setTree(data)
+  }, [id])
+
+  const loadMeta = useCallback(async () => {
+    if (!id) return
+    const { data } = await api.get<KnowledgeBase>(`/knowledge-bases/${id}`)
+    setKb(data)
+  }, [id])
+
+  useEffect(() => {
+    setError('')
+    Promise.all([loadMeta(), loadTree()]).catch((err) => {
+      setError(err?.response?.data?.detail || 'Failed to load knowledge base')
+    })
+  }, [loadMeta, loadTree])
+
+  const onDelete = async () => {
+    if (!kb) return
+    if (!confirm(`Delete knowledge base "${kb.title}" and all its content?`)) return
+    try {
+      await api.delete(`/knowledge-bases/${kb.id}`)
+      navigate('/knowledge-bases')
+    } catch (err: any) {
+      alert(err?.response?.data?.detail || 'Failed to delete knowledge base')
+    }
+  }
+
+  if (error) {
+    return (
+      <div className="project-detail-page">
+        <button className="btn-back" onClick={() => navigate('/knowledge-bases')}>← Knowledge Bases</button>
+        <p className="empty">{error}</p>
+      </div>
+    )
+  }
+
+  if (!kb) return <div className="loading">Loading…</div>
+
+  return (
+    <div className="project-detail-page">
+      <button className="btn-back" onClick={() => navigate('/knowledge-bases')}>← Knowledge Bases</button>
+
+      <div className="page-header">
+        <h2>
+          📚 {kb.title}
+          {kb.knowledge_base_code && <span className="badge" style={{ marginLeft: 8 }}>{kb.knowledge_base_code}</span>}
+        </h2>
+        <div style={{ display: 'flex', gap: 8 }}>
+          <button className="btn-secondary" onClick={() => setShowEdit(true)}>Edit</button>
+          <button className="btn-danger" onClick={onDelete}>Delete</button>
+        </div>
+      </div>
+
+      {kb.description && <p className="project-desc">{kb.description}</p>}
+
+      <KnowledgeBaseFormModal
+        isOpen={showEdit}
+        knowledgeBase={kb}
+        onClose={() => setShowEdit(false)}
+        onSaved={async () => { await loadMeta() }}
+      />
+
+      <div className="section">
+        <h3>Structure</h3>
+        {tree && <KnowledgeBaseTree tree={tree} onChange={loadTree} />}
+      </div>
+    </div>
+  )
+}

src/pages/KnowledgeBasesPage.tsx

@@ -0,0 +1,51 @@
+import { useState, useEffect } from 'react'
+import { useNavigate } from 'react-router-dom'
+import api from '@/services/api'
+import type { KnowledgeBase } from '@/types'
+import dayjs from 'dayjs'
+import KnowledgeBaseFormModal from '@/components/KnowledgeBaseFormModal'
+
+export default function KnowledgeBasesPage() {
+  const [items, setItems] = useState<KnowledgeBase[]>([])
+  const [showCreate, setShowCreate] = useState(false)
+  const navigate = useNavigate()
+
+  const fetchItems = () => {
+    api.get<KnowledgeBase[]>('/knowledge-bases').then(({ data }) => setItems(data)).catch(() => setItems([]))
+  }
+
+  useEffect(() => { fetchItems() }, [])
+
+  return (
+    <div className="projects-page">
+      <div className="page-header">
+        <h2>📚 Knowledge Bases ({items.length})</h2>
+        <button className="btn-primary" onClick={() => setShowCreate(true)}>+ New</button>
+      </div>
+
+      <KnowledgeBaseFormModal
+        isOpen={showCreate}
+        onClose={() => setShowCreate(false)}
+        onSaved={() => fetchItems()}
+      />
+
+      <div className="project-grid">
+        {items.map((kb) => (
+          <div
+            key={kb.id}
+            className="project-card"
+            onClick={() => navigate(`/knowledge-bases/${kb.knowledge_base_code || kb.id}`)}
+          >
+            <h3>{kb.title}</h3>
+            {kb.knowledge_base_code && <span className="badge" style={{ marginLeft: 8 }}>{kb.knowledge_base_code}</span>}
+            <p className="project-desc">{kb.description || 'No description'}</p>
+            <div className="project-meta">
+              <span>Created {kb.created_at ? dayjs(kb.created_at).format('YYYY-MM-DD') : '—'}</span>
+            </div>
+          </div>
+        ))}
+        {items.length === 0 && <p className="empty">No knowledge bases yet. Create one above.</p>}
+      </div>
+    </div>
+  )
+}

src/pages/LoginPage.tsx

@@ -1,15 +1,31 @@
 import React, { useState } from 'react'
+import { useAuthConfig, oidcLoginHref } from '@/hooks/useAuthConfig'
+import { getLogoUrl } from '@/runtime'
 
 interface Props {
   onLogin: (username: string, password: string) => Promise<void>
 }
 
+const OIDC_ERRORS: Record<string, string> = {
+  not_linked: 'This OIDC account is not linked to any HarborForge user. Ask an administrator to bind it first.',
+  exchange_failed: 'OIDC sign-in failed during token exchange. Please try again.',
+  no_subject: 'The identity provider did not return a subject. Sign-in aborted.',
+  token_rejected: 'The issued session token was rejected. Please try again.',
+  missing_token: 'No session token was returned. Please try again.',
+  link_not_allowed: 'Account linking is not allowed in this mode.',
+  already_bound: 'That OIDC identity is already bound to another user.',
+}
+
 export default function LoginPage({ onLogin }: Props) {
+  const { config, loading: cfgLoading } = useAuthConfig()
   const [username, setUsername] = useState('')
   const [password, setPassword] = useState('')
   const [error, setError] = useState('')
   const [loading, setLoading] = useState(false)
 
+  const urlError = new URLSearchParams(window.location.search).get('oidc_error')
+  const oidcError = urlError ? (OIDC_ERRORS[urlError] || `OIDC error: ${urlError}`) : ''
+
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault()
     setError('')
@@ -23,31 +39,58 @@ export default function LoginPage({ onLogin }: Props) {
     }
   }
 
+  const showPassword = !cfgLoading && config.passwordLogin && !config.oidcOnly
+  const showOidc = !cfgLoading && config.oidcEnabled
+
   return (
     <div className="login-page">
       <div className="login-card">
-        <h1>⚓ HarborForge</h1>
+        <h1><img src={getLogoUrl()} className="brand-logo" alt="" /> HarborForge</h1>
         <p className="subtitle">Agent/Human collaborative task management platform</p>
-        <form onSubmit={handleSubmit}>
+
-          <input
+        {oidcError && <p className="error" style={{ marginBottom: 14 }}>{oidcError}</p>}
-            type="text"
+
-            placeholder="Username"
+        {showPassword && (
-            value={username}
+          <form onSubmit={handleSubmit}>
-            onChange={(e) => setUsername(e.target.value)}
+            <input
-            required
+              type="text"
-          />
+              placeholder="Username"
-          <input
+              value={username}
-            type="password"
+              onChange={(e) => setUsername(e.target.value)}
-            placeholder="Password"
+              required
-            value={password}
+            />
-            onChange={(e) => setPassword(e.target.value)}
+            <input
-            required
+              type="password"
-          />
+              placeholder="Password"
-          {error && <p className="error">{error}</p>}
+              value={password}
-          <button type="submit" disabled={loading}>
+              onChange={(e) => setPassword(e.target.value)}
-            {loading ? 'Signing in...' : 'Sign in'}
+              required
-          </button>
+            />
-        </form>
+            {error && <p className="error">{error}</p>}
+            <button type="submit" disabled={loading}>
+              {loading ? 'Signing in...' : 'Sign in'}
+            </button>
+          </form>
+        )}
+
+        {showPassword && showOidc && (
+          <p className="text-dim" style={{ textAlign: 'center', margin: '14px 0' }}>— or —</p>
+        )}
+
+        {showOidc && (
+          <a
+            className="btn-primary"
+            style={{ display: 'block', textAlign: 'center', textDecoration: 'none' }}
+            href={oidcLoginHref(config)}
+          >
+            Sign in with SSO
+          </a>
+        )}
+
+        {cfgLoading && <p className="subtitle">Loading sign-in options…</p>}
+        {!cfgLoading && !showPassword && !showOidc && (
+          <p className="error">No sign-in method is available. Check server configuration.</p>
+        )}
       </div>
     </div>
   )

src/pages/MeetingDetailPage.tsx

@@ -29,7 +29,7 @@ interface MeetingItem {
 const STATUS_OPTIONS = ['scheduled', 'in_progress', 'completed', 'cancelled']
 
 export default function MeetingDetailPage() {
-  const { meetingId } = useParams()
+  const { meetingCode } = useParams()
   const navigate = useNavigate()
   const { user } = useAuth()
   const [meeting, setMeeting] = useState<MeetingItem | null>(null)
@@ -46,7 +46,7 @@ export default function MeetingDetailPage() {
 
   const fetchMeeting = async () => {
     try {
-      const { data } = await api.get<MeetingItem>(`/meetings/${meetingId}`)
+      const { data } = await api.get<MeetingItem>(`/meetings/${meetingCode}`)
       setMeeting(data)
       setEditForm({
         title: data.title,
@@ -63,14 +63,14 @@ export default function MeetingDetailPage() {
 
   useEffect(() => {
     fetchMeeting()
-  }, [meetingId])
+  }, [meetingCode])
 
   const handleAttend = async () => {
     if (!meeting) return
     setSaving(true)
     setMessage('')
     try {
-      const { data } = await api.post<MeetingItem>(`/meetings/${meetingId}/attend`)
+      const { data } = await api.post<MeetingItem>(`/meetings/${meetingCode}/attend`)
       setMeeting(data)
       setMessage('You have joined this meeting')
     } catch (err: any) {
@@ -85,7 +85,7 @@ export default function MeetingDetailPage() {
     setSaving(true)
     setMessage('')
     try {
-      const { data } = await api.patch<MeetingItem>(`/meetings/${meetingId}`, {
+      const { data } = await api.patch<MeetingItem>(`/meetings/${meetingCode}`, {
         status: newStatus,
       })
       setMeeting(data)
@@ -117,7 +117,7 @@ export default function MeetingDetailPage() {
         return
       }
 
-      const { data } = await api.patch<MeetingItem>(`/meetings/${meetingId}`, payload)
+      const { data } = await api.patch<MeetingItem>(`/meetings/${meetingCode}`, payload)
       setMeeting(data)
       setEditMode(false)
       setMessage('Meeting updated')
@@ -133,7 +133,7 @@ export default function MeetingDetailPage() {
     if (!confirm(`Delete meeting ${meeting.meeting_code || meeting.id}? This cannot be undone.`)) return
     setSaving(true)
     try {
-      await api.delete(`/meetings/${meetingId}`)
+      await api.delete(`/meetings/${meetingCode}`)
       navigate(-1)
     } catch (err: any) {
       setMessage(err.response?.data?.detail || 'Failed to delete meeting')

src/pages/MilestoneDetailPage.tsx

@@ -24,7 +24,7 @@ interface MilestoneTask {
 }
 
 export default function MilestoneDetailPage() {
-  const { id } = useParams()
+  const { milestoneCode } = useParams()
   const navigate = useNavigate()
   const { user } = useAuth()
   const [milestone, setMilestone] = useState<Milestone | null>(null)
@@ -49,7 +49,8 @@ export default function MilestoneDetailPage() {
   const [preflight, setPreflight] = useState<{ freeze?: { allowed: boolean; reason: string | null }; start?: { allowed: boolean; reason: string | null } } | null>(null)
 
   const fetchMilestone = () => {
-    api.get<Milestone>(`/milestones/${id}`).then(({ data }) => {
+    if (!milestoneCode) return
+    api.get<Milestone>(`/milestones/${milestoneCode}`).then(({ data }) => {
       setMilestone(data)
       if (data.project_id) {
         api.get<Project>(`/projects/${data.project_id}`).then(({ data: proj }) => {
@@ -57,40 +58,44 @@ export default function MilestoneDetailPage() {
           setProjectCode(proj.project_code || '')
         })
         api.get<ProjectMember[]>(`/projects/${data.project_id}/members`).then(({ data }) => setMembers(data)).catch(() => {})
-        fetchPreflight(data.project_id, data.id)
+        if (data.project_code && data.milestone_code) {
+          fetchPreflight(data.project_code, data.milestone_code)
+        }
+      }
+      if (data.milestone_code) {
+        api.get<MilestoneProgress>(`/milestones/${data.milestone_code}/progress`).then(({ data: prog }) => setProgress(prog)).catch(() => {})
       }
-      api.get<MilestoneProgress>(`/milestones/${data.id}/progress`).then(({ data: prog }) => setProgress(prog)).catch(() => {})
     })
   }
 
-  const fetchPreflight = (projectId: number, milestoneId: number) => {
+  const fetchPreflight = (projectCode: string, milestoneCode: string) => {
-    api.get(`/projects/${projectId}/milestones/${milestoneId}/actions/preflight`)
+    api.get(`/projects/${projectCode}/milestones/${milestoneCode}/actions/preflight`)
       .then(({ data }) => setPreflight(data))
       .catch(() => setPreflight(null))
   }
 
   useEffect(() => {
     fetchMilestone()
-  }, [id])
+  }, [milestoneCode])
 
   const refreshMilestoneItems = () => {
-    if (!projectCode || !milestone) return
+    if (!projectCode || !milestone?.milestone_code) return
-    api.get<MilestoneTask[]>(`/tasks/${projectCode}/${milestone.id}`).then(({ data }) => setTasks(data)).catch(() => {})
+    api.get<MilestoneTask[]>(`/tasks/${projectCode}/${milestone.milestone_code}`).then(({ data }) => setTasks(data)).catch(() => {})
-    api.get<any[]>(`/supports/${projectCode}/${milestone.id}`).then(({ data }) => setSupports(data)).catch(() => {})
+    api.get<any[]>(`/supports/${projectCode}/${milestone.milestone_code}`).then(({ data }) => setSupports(data)).catch(() => {})
-    api.get<any[]>(`/meetings/${projectCode}/${milestone.id}`).then(({ data }) => setMeetings(data)).catch(() => {})
+    api.get<any[]>(`/meetings/${projectCode}/${milestone.milestone_code}`).then(({ data }) => setMeetings(data)).catch(() => {})
   }
 
   useEffect(() => {
     refreshMilestoneItems()
-  }, [projectCode, milestone?.id])
+  }, [projectCode, milestone?.milestone_code])
 
   const createItem = async (type: 'supports' | 'meetings') => {
-    if (!newTitle.trim() || !projectCode || !milestone) return
+    if (!newTitle.trim() || !projectCode || !milestone?.milestone_code) return
     const payload = {
       title: newTitle,
       description: newDesc || null,
     }
-    await api.post(`/${type}/${projectCode}/${milestone.id}`, payload)
+    await api.post(`/${type}/${projectCode}/${milestone.milestone_code}`, payload)
     setNewTitle('')
     setNewDesc('')
     setShowCreateSupport(false)
@@ -119,10 +124,12 @@ export default function MilestoneDetailPage() {
     setActionLoading(action)
     setActionError(null)
     try {
-      await api.post(`/projects/${project.id}/milestones/${milestone.id}/actions/${action}`, body ?? {})
+      await api.post(`/projects/${project.project_code}/milestones/${milestone.milestone_code}/actions/${action}`, body ?? {})
       fetchMilestone()
       refreshMilestoneItems()
-      fetchPreflight(project.id, milestone.id)
+      if (project.project_code && milestone.milestone_code) {
+        fetchPreflight(project.project_code, milestone.milestone_code)
+      }
     } catch (err: any) {
       const detail = err?.response?.data?.detail
       setActionError(typeof detail === 'string' ? detail : `${action} failed`)
@@ -142,8 +149,8 @@ export default function MilestoneDetailPage() {
   if (!milestone) return <div className="loading">Loading...</div>
 
   const renderTaskRow = (t: MilestoneTask) => (
-    <tr key={t.id} className="clickable" onClick={() => navigate(`/tasks/${t.task_code || t.id}`)}>
+    <tr key={t.id} className={t.task_code ? 'clickable' : ''} onClick={() => t.task_code && navigate(`/tasks/${t.task_code}`)}>
-      <td>{t.task_code || t.id}</td>
+      <td>{t.task_code || '—'}</td>
       <td className="task-title">{t.title}</td>
       <td><span className={`badge status-${t.task_status || t.status}`}>{t.task_status || t.status}</span></td>
       <td>{t.estimated_effort || '-'}</td>
@@ -297,8 +304,8 @@ export default function MilestoneDetailPage() {
         <CreateTaskModal
           isOpen={showCreateTask}
           onClose={() => setShowCreateTask(false)}
-          initialProjectId={milestone.project_id}
+          initialProjectCode={milestone.project_code || ''}
-          initialMilestoneId={milestone.id}
+          initialMilestoneCode={milestone.milestone_code || ''}
           lockProject
           lockMilestone
           onCreated={() => {
@@ -356,8 +363,8 @@ export default function MilestoneDetailPage() {
               <thead><tr><th>Code</th><th>Title</th><th>Status</th><th>Priority</th></tr></thead>
               <tbody>
                 {supports.map((i) => (
-                  <tr key={i.id} className="clickable" onClick={() => navigate(`/supports/${i.support_code || i.id}`)}>
+                  <tr key={i.id} className={i.support_code ? 'clickable' : ''} onClick={() => i.support_code && navigate(`/supports/${i.support_code}`)}>
-                    <td>{i.support_code || i.id}</td>
+                    <td>{i.support_code || '—'}</td>
                     <td className="task-title">{i.title}</td>
                     <td><span className={`badge status-${i.status}`}>{i.status}</span></td>
                     <td><span className={`badge priority-${i.priority}`}>{i.priority}</span></td>
@@ -373,8 +380,8 @@ export default function MilestoneDetailPage() {
               <thead><tr><th>Code</th><th>Title</th><th>Status</th><th>Priority</th></tr></thead>
               <tbody>
                 {meetings.map((i) => (
-                  <tr key={i.id} className="clickable" onClick={() => navigate(`/meetings/${i.meeting_code || i.id}`)}>
+                  <tr key={i.id} className={i.meeting_code ? 'clickable' : ''} onClick={() => i.meeting_code && navigate(`/meetings/${i.meeting_code}`)}>
-                    <td>{i.meeting_code || i.id}</td>
+                    <td>{i.meeting_code || '—'}</td>
                     <td className="task-title">{i.title}</td>
                     <td><span className={`badge status-${i.status}`}>{i.status}</span></td>
                     <td><span className={`badge priority-${i.priority}`}>{i.priority}</span></td>

src/pages/MilestonesPage.tsx

@@ -13,7 +13,7 @@ export default function MilestonesPage() {
   const navigate = useNavigate()
 
   const fetchMilestones = () => {
-    const params = projectFilter ? `?project_id=${projectFilter}` : ''
+    const params = projectFilter ? `?project_code=${projectFilter}` : ''
     api.get<Milestone[]>(`/milestones${params}`).then(({ data }) => setMilestones(data))
   }
 
@@ -35,21 +35,21 @@ export default function MilestonesPage() {
       <div className="filters">
         <select value={projectFilter} onChange={(e) => setProjectFilter(e.target.value)}>
           <option value="">All projects</option>
-          {projects.map((p) => <option key={p.id} value={p.id}>{p.name}</option>)}
+          {projects.map((p) => <option key={p.id} value={p.project_code || ''}>{p.name}</option>)}
         </select>
       </div>
 
       <MilestoneFormModal
         isOpen={showCreate}
         onClose={() => setShowCreate(false)}
-        initialProjectId={projectFilter ? Number(projectFilter) : undefined}
+        initialProjectCode={projectFilter || undefined}
         lockProject={Boolean(projectFilter)}
         onSaved={() => fetchMilestones()}
       />
 
       <div className="milestone-grid">
         {milestones.map((ms) => (
-          <div key={ms.id} className="milestone-card" onClick={() => navigate(`/milestones/${ms.milestone_code || ms.id}`)}>
+          <div key={ms.id} className="milestone-card" onClick={() => ms.milestone_code && navigate(`/milestones/${ms.milestone_code}`)}>
             <div className="milestone-card-header">
               <span className={`badge status-${ms.status}`}>{ms.status}</span>
               <h3>{ms.title}</h3>{ms.milestone_code && <span className="badge" style={{ marginLeft: 8, fontSize: '0.75em' }}>{ms.milestone_code}</span>}

src/pages/NotificationsPage.tsx

@@ -52,7 +52,7 @@ export default function NotificationsPage() {
             className={`notification-item ${n.is_read ? 'read' : 'unread'}`}
             onClick={() => {
               if (!n.is_read) markRead(n.id)
-              if (n.task_id) navigate(`/tasks/${n.task_id}`)
+              if (n.task_code) navigate(`/tasks/${n.task_code}`)
             }}
           >
             <div className="notification-dot">{n.is_read ? '' : '●'}</div>

src/pages/OidcCallbackPage.tsx

@@ -0,0 +1,56 @@
+import { useEffect, useRef, useState } from 'react'
+import { useNavigate } from 'react-router-dom'
+import { getLogoUrl } from '@/runtime'
+
+interface Props {
+  onToken: (token: string) => Promise<void>
+}
+
+/**
+ * Lands here after the backend OIDC callback redirect.
+ * - sign-in:  URL fragment `#token=<jwt>`  → apply token, go to dashboard
+ * - self-link: query `?oidc_linked=1`        → success notice, go to /users
+ * - failure:  query `?oidc_error=<code>`     → back to /login with the code
+ */
+export default function OidcCallbackPage({ onToken }: Props) {
+  const navigate = useNavigate()
+  const [msg, setMsg] = useState('Completing sign-in…')
+  const ran = useRef(false)
+
+  useEffect(() => {
+    if (ran.current) return
+    ran.current = true
+
+    const hash = new URLSearchParams(window.location.hash.replace(/^#/, ''))
+    const query = new URLSearchParams(window.location.search)
+    const token = hash.get('token')
+    const oidcError = query.get('oidc_error')
+    const linked = query.get('oidc_linked')
+
+    if (oidcError) {
+      navigate(`/login?oidc_error=${encodeURIComponent(oidcError)}`, { replace: true })
+      return
+    }
+    if (linked) {
+      setMsg('OIDC account linked. Redirecting…')
+      const t = setTimeout(() => navigate('/users', { replace: true }), 1200)
+      return () => clearTimeout(t)
+    }
+    if (token) {
+      onToken(token)
+        .then(() => navigate('/', { replace: true }))
+        .catch(() => navigate('/login?oidc_error=token_rejected', { replace: true }))
+      return
+    }
+    navigate('/login?oidc_error=missing_token', { replace: true })
+  }, [navigate, onToken])
+
+  return (
+    <div className="login-page">
+      <div className="login-card">
+        <h1><img src={getLogoUrl()} className="brand-logo" alt="" /> HarborForge</h1>
+        <p className="subtitle">{msg}</p>
+      </div>
+    </div>
+  )
+}

src/pages/OidcSettingsPage.tsx

@@ -0,0 +1,171 @@
+import { useEffect, useState } from 'react'
+import api from '@/services/api'
+import { useAuth } from '@/hooks/useAuth'
+
+interface Settings {
+  enabled: boolean
+  issuer: string | null
+  client_id: string | null
+  has_client_secret: boolean
+  redirect_uri: string | null
+  scopes: string | null
+  post_login_redirect: string | null
+  admin_role: string
+  oidc_only: boolean
+  effective_enabled: boolean
+  source: string
+}
+
+export default function OidcSettingsPage() {
+  const { user } = useAuth()
+  const isAdmin = user?.is_admin === true
+
+  const [loaded, setLoaded] = useState<Settings | null>(null)
+  const [loading, setLoading] = useState(true)
+  const [saving, setSaving] = useState(false)
+  const [message, setMessage] = useState('')
+  const [form, setForm] = useState({
+    enabled: false,
+    issuer: '',
+    client_id: '',
+    client_secret: '',
+    redirect_uri: '',
+    scopes: 'openid email profile',
+    post_login_redirect: '',
+    admin_role: 'admin',
+  })
+
+  useEffect(() => {
+    if (!isAdmin) { setLoading(false); return }
+    api.get<Settings>('/auth/oidc/settings')
+      .then(({ data }) => {
+        setLoaded(data)
+        setForm({
+          enabled: data.enabled,
+          issuer: data.issuer || '',
+          client_id: data.client_id || '',
+          client_secret: '',
+          redirect_uri: data.redirect_uri || '',
+          scopes: data.scopes || 'openid email profile',
+          post_login_redirect: data.post_login_redirect || '',
+          admin_role: data.admin_role || 'admin',
+        })
+      })
+      .catch((e) => setMessage(e.response?.data?.detail || 'Failed to load OIDC settings'))
+      .finally(() => setLoading(false))
+  }, [isAdmin])
+
+  const save = async () => {
+    setSaving(true)
+    setMessage('')
+    try {
+      const payload: Record<string, any> = {
+        enabled: form.enabled,
+        issuer: form.issuer.trim(),
+        client_id: form.client_id.trim(),
+        redirect_uri: form.redirect_uri.trim(),
+        scopes: form.scopes.trim(),
+        post_login_redirect: form.post_login_redirect.trim(),
+        admin_role: form.admin_role.trim() || 'admin',
+      }
+      if (form.client_secret) payload.client_secret = form.client_secret
+      const { data } = await api.put<Settings>('/auth/oidc/settings', payload)
+      setLoaded(data)
+      setForm((f) => ({ ...f, client_secret: '' }))
+      setMessage('OIDC settings saved successfully')
+    } catch (e: any) {
+      setMessage(e.response?.data?.detail || 'Failed to save OIDC settings')
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  if (loading) return <div className="loading">Loading OIDC settings...</div>
+  if (!isAdmin) {
+    return (
+      <div className="section">
+        <h2>🔐 OIDC Settings</h2>
+        <p className="empty">Admin access required.</p>
+      </div>
+    )
+  }
+
+  const callbackHint = form.redirect_uri.trim() || loaded?.redirect_uri || '(set the Redirect / Callback URL below)'
+
+  return (
+    <div className="section">
+      <div className="page-header">
+        <div>
+          <h2>🔐 OIDC Settings</h2>
+          <div className="text-dim">Configure the OpenID Connect provider. Saved values override environment defaults.</div>
+        </div>
+      </div>
+
+      {message && (
+        <div style={{
+          padding: '10px 12px', marginBottom: 16, borderRadius: 8,
+          background: message.includes('success') ? 'rgba(70,180,135,.14)' : 'rgba(226,85,60,.14)',
+          border: `1px solid ${message.includes('success') ? 'rgba(70,180,135,.4)' : 'rgba(226,85,60,.4)'}`,
+        }}>{message}</div>
+      )}
+
+      <div className="monitor-card" style={{ marginBottom: 16 }}>
+        <div className="monitor-card-header">
+          <div style={{ fontWeight: 600 }}>Status</div>
+          <span className={'badge ' + (loaded?.effective_enabled ? 'status-online' : 'status-offline')}>
+            {loaded?.effective_enabled ? 'OIDC active' : 'OIDC inactive'}
+          </span>
+        </div>
+        <div className="monitor-metrics">
+          config source: <b>{loaded?.source}</b> · OIDC-only mode (deploy env): <b>{loaded?.oidc_only ? 'on' : 'off'}</b>
+        </div>
+        <div style={{ marginTop: 8 }}>
+          <div className="text-dim">Register this Redirect / Callback URL at your identity provider:</div>
+          <code style={{ display: 'block', marginTop: 6, wordBreak: 'break-all' }}>{callbackHint}</code>
+        </div>
+      </div>
+
+      <div className="task-create-form" style={{ maxWidth: 640 }}>
+        <label className="filter-check">
+          <input type="checkbox" checked={form.enabled} onChange={(e) => setForm({ ...form, enabled: e.target.checked })} />
+          Enable OIDC sign-in
+        </label>
+        <label>
+          Issuer (OIDC source)
+          <input placeholder="https://idp.example.com" value={form.issuer} onChange={(e) => setForm({ ...form, issuer: e.target.value })} />
+        </label>
+        <label>
+          Client ID
+          <input value={form.client_id} onChange={(e) => setForm({ ...form, client_id: e.target.value })} />
+        </label>
+        <label>
+          Client Secret
+          <input type="password" placeholder={loaded?.has_client_secret ? '•••••• (leave blank to keep current)' : 'client secret'} value={form.client_secret} onChange={(e) => setForm({ ...form, client_secret: e.target.value })} />
+        </label>
+        <label>
+          Redirect / Callback URL
+          <input placeholder="https://hf-api.example.com/auth/oidc/callback" value={form.redirect_uri} onChange={(e) => setForm({ ...form, redirect_uri: e.target.value })} />
+        </label>
+        <label>
+          Scopes
+          <input value={form.scopes} onChange={(e) => setForm({ ...form, scopes: e.target.value })} />
+        </label>
+        <label>
+          Post-login redirect (frontend)
+          <input placeholder="https://hf.example.com/oidc/callback" value={form.post_login_redirect} onChange={(e) => setForm({ ...form, post_login_redirect: e.target.value })} />
+        </label>
+        <label>
+          Admin role (bootstrap)
+          <input placeholder="admin" value={form.admin_role} onChange={(e) => setForm({ ...form, admin_role: e.target.value })} />
+        </label>
+        <p className="text-dim">
+          OIDC-only bootstrap: before any admin is linked, an IdP user whose token carries this role
+          auto-connects to the HarborForge admin account on first sign-in. Disables itself once an admin is bound.
+        </p>
+        <button className="btn-primary" disabled={saving} onClick={save}>
+          {saving ? 'Saving...' : 'Save OIDC Settings'}
+        </button>
+      </div>
+    </div>
+  )
+}

src/pages/ProjectDetailPage.tsx

@@ -114,7 +114,7 @@ export default function ProjectDetailPage() {
           {canEditProject && <button className="btn-sm" onClick={() => setShowMilestoneModal(true)}>+ New</button>}
         </h3>
         {milestones.map((ms) => (
-          <div key={ms.id} className="milestone-item" onClick={() => navigate(`/milestones/${ms.milestone_code || ms.id}`)}>
+          <div key={ms.id} className="milestone-item" onClick={() => ms.milestone_code && navigate(`/milestones/${ms.milestone_code}`)}>
             <span className={`badge status-${ms.status === 'open' ? 'open' : ms.status === 'closed' ? 'closed' : 'in_progress'}`}>{ms.status}</span>
             <span className="milestone-title">{ms.title}</span>
             {ms.due_date && <span className="text-dim"> · Due {dayjs(ms.due_date).format('YYYY-MM-DD')}</span>}
@@ -136,7 +136,7 @@ export default function ProjectDetailPage() {
       <MilestoneFormModal
         isOpen={showMilestoneModal}
         onClose={() => setShowMilestoneModal(false)}
-        initialProjectId={project.id}
+        initialProjectCode={project.project_code || ''}
         lockProject
         onSaved={() => fetchProject()}
       />

src/pages/ProposalDetailPage.tsx

@@ -0,0 +1,465 @@
+import { useState, useEffect } from 'react'
+import { useParams, useNavigate, useSearchParams } from 'react-router-dom'
+import api from '@/services/api'
+import type { Proposal, Milestone, Essential, EssentialType } from '@/types'
+import dayjs from 'dayjs'
+import CopyableCode from '@/components/CopyableCode'
+
+export default function ProposalDetailPage() {
+  const { proposalCode } = useParams()
+  const [searchParams] = useSearchParams()
+  const projectCode = searchParams.get('project_code')
+  const navigate = useNavigate()
+
+  const [proposal, setProposal] = useState<Proposal | null>(null)
+  const [milestones, setMilestones] = useState<Milestone[]>([])
+  const [showAccept, setShowAccept] = useState(false)
+  const [selectedMilestone, setSelectedMilestone] = useState<string>('')
+  const [actionLoading, setActionLoading] = useState(false)
+  const [error, setError] = useState('')
+
+  // Edit state
+  const [showEdit, setShowEdit] = useState(false)
+  const [editTitle, setEditTitle] = useState('')
+  const [editDescription, setEditDescription] = useState('')
+  const [editLoading, setEditLoading] = useState(false)
+
+  // Essential state
+  const [essentials, setEssentials] = useState<Essential[]>([])
+  const [loadingEssentials, setLoadingEssentials] = useState(false)
+
+  // Essential create/edit state
+  const [showEssentialModal, setShowEssentialModal] = useState(false)
+  const [editingEssential, setEditingEssential] = useState<Essential | null>(null)
+  const [essentialTitle, setEssentialTitle] = useState('')
+  const [essentialType, setEssentialType] = useState<EssentialType>('feature')
+  const [essentialDesc, setEssentialDesc] = useState('')
+  const [essentialLoading, setEssentialLoading] = useState(false)
+
+  const fetchProposal = () => {
+    if (!projectCode || !proposalCode) return
+    api.get<Proposal>(`/projects/${projectCode}/proposals/${proposalCode}`).then(({ data }) => setProposal(data))
+  }
+
+  useEffect(() => {
+    fetchProposal()
+  }, [proposalCode, projectCode])
+
+  const loadMilestones = () => {
+    if (!projectCode) return
+    api.get<Milestone[]>(`/milestones?project_code=${projectCode}`)
+      .then(({ data }) => setMilestones(data.filter((m) => m.status === 'open')))
+  }
+
+  const fetchEssentials = () => {
+    if (!projectCode || !proposalCode) return
+    setLoadingEssentials(true)
+    api.get<Essential[]>(`/projects/${projectCode}/proposals/${proposalCode}/essentials`)
+      .then(({ data }) => setEssentials(data))
+      .finally(() => setLoadingEssentials(false))
+  }
+
+  useEffect(() => {
+    fetchEssentials()
+  }, [proposalCode, projectCode])
+
+  const handleAccept = async () => {
+    if (!selectedMilestone || !projectCode || !proposalCode) return
+    setActionLoading(true)
+    setError('')
+    try {
+      await api.post(`/projects/${projectCode}/proposals/${proposalCode}/accept`, { milestone_code: selectedMilestone })
+      setShowAccept(false)
+      fetchProposal()
+    } catch (err: any) {
+      setError(err.response?.data?.detail || 'Accept failed')
+    } finally {
+      setActionLoading(false)
+    }
+  }
+
+  const handleReject = async () => {
+    if (!projectCode || !proposalCode) return
+    const reason = prompt('Reject reason (optional):')
+    setActionLoading(true)
+    setError('')
+    try {
+      await api.post(`/projects/${projectCode}/proposals/${proposalCode}/reject`, { reason: reason || undefined })
+      fetchProposal()
+    } catch (err: any) {
+      setError(err.response?.data?.detail || 'Reject failed')
+    } finally {
+      setActionLoading(false)
+    }
+  }
+
+  const openEditModal = () => {
+    if (!proposal) return
+    setEditTitle(proposal.title)
+    setEditDescription(proposal.description || '')
+    setError('')
+    setShowEdit(true)
+  }
+
+  const handleEdit = async () => {
+    if (!projectCode || !proposalCode) return
+    setEditLoading(true)
+    setError('')
+    try {
+      await api.patch(`/projects/${projectCode}/proposals/${proposalCode}`, {
+        title: editTitle,
+        description: editDescription,
+      })
+      setShowEdit(false)
+      fetchProposal()
+    } catch (err: any) {
+      setError(err.response?.data?.detail || 'Update failed')
+    } finally {
+      setEditLoading(false)
+    }
+  }
+
+  const handleReopen = async () => {
+    if (!projectCode || !proposalCode) return
+    setActionLoading(true)
+    setError('')
+    try {
+      await api.post(`/projects/${projectCode}/proposals/${proposalCode}/reopen`)
+      fetchProposal()
+    } catch (err: any) {
+      setError(err.response?.data?.detail || 'Reopen failed')
+    } finally {
+      setActionLoading(false)
+    }
+  }
+
+  // Essential handlers
+  const openEssentialModal = (essential?: Essential) => {
+    if (essential) {
+      setEditingEssential(essential)
+      setEssentialTitle(essential.title)
+      setEssentialType(essential.type)
+      setEssentialDesc(essential.description || '')
+    } else {
+      setEditingEssential(null)
+      setEssentialTitle('')
+      setEssentialType('feature')
+      setEssentialDesc('')
+    }
+    setError('')
+    setShowEssentialModal(true)
+  }
+
+  const handleSaveEssential = async () => {
+    if (!projectCode || !proposalCode) return
+    setEssentialLoading(true)
+    setError('')
+    try {
+      if (editingEssential) {
+        await api.patch(`/projects/${projectCode}/proposals/${proposalCode}/essentials/${editingEssential.essential_code}`, {
+          title: essentialTitle,
+          type: essentialType,
+          description: essentialDesc || null,
+        })
+      } else {
+        await api.post(`/projects/${projectCode}/proposals/${proposalCode}/essentials`, {
+          title: essentialTitle,
+          type: essentialType,
+          description: essentialDesc || null,
+        })
+      }
+      setShowEssentialModal(false)
+      fetchEssentials()
+    } catch (err: any) {
+      setError(err.response?.data?.detail || 'Save failed')
+    } finally {
+      setEssentialLoading(false)
+    }
+  }
+
+  const handleDeleteEssential = async (essentialCode: string) => {
+    if (!projectCode || !proposalCode) return
+    if (!confirm('Are you sure you want to delete this Essential?')) return
+    setEssentialLoading(true)
+    try {
+      await api.delete(`/projects/${projectCode}/proposals/${proposalCode}/essentials/${essentialCode}`)
+      fetchEssentials()
+    } catch (err: any) {
+      setError(err.response?.data?.detail || 'Delete failed')
+    } finally {
+      setEssentialLoading(false)
+    }
+  }
+
+  if (!proposal) return <div className="loading">Loading...</div>
+
+  const statusBadgeClass = (s: string) => {
+    if (s === 'open') return 'status-open'
+    if (s === 'accepted') return 'status-completed'
+    if (s === 'rejected') return 'status-closed'
+    return ''
+  }
+
+  return (
+    <div className="task-detail">
+      <button className="btn-back" onClick={() => navigate(-1)}>← Back</button>
+
+      <div className="task-header">
+        <h2>
+          💡 {proposal.title}
+          {proposal.proposal_code && <span style={{ marginLeft: 8 }}><CopyableCode code={proposal.proposal_code} /></span>}
+        </h2>
+        <span className={`badge ${statusBadgeClass(proposal.status)}`} style={{ fontSize: '1rem' }}>
+          {proposal.status}
+        </span>
+      </div>
+
+      {error && <div className="error-message" style={{ color: 'var(--danger)', marginBottom: 12 }}>{error}</div>}
+
+      <div className="section">
+        <h3>Details</h3>
+        <div className="detail-grid">
+          <div><strong>Proposal Code:</strong> {proposal.proposal_code ? <CopyableCode code={proposal.proposal_code} /> : '—'}</div>
+          <div><strong>Status:</strong> {proposal.status}</div>
+          <div><strong>Created By:</strong> {proposal.created_by_username || (proposal.created_by_id ? `User #${proposal.created_by_id}` : '—')}</div>
+          <div><strong>Created:</strong> {dayjs(proposal.created_at).format('YYYY-MM-DD HH:mm')}</div>
+          <div><strong>Updated:</strong> {proposal.updated_at ? dayjs(proposal.updated_at).format('YYYY-MM-DD HH:mm') : '—'}</div>
+        </div>
+      </div>
+
+      <div className="section">
+        <h3>Description</h3>
+        <p style={{ whiteSpace: 'pre-wrap' }}>{proposal.description || 'No description'}</p>
+      </div>
+
+      {/* Essentials section */}
+      <div className="section">
+        <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 12 }}>
+          <h3>Essentials ({essentials.length})</h3>
+          {proposal.status === 'open' && (
+            <button className="btn-primary" onClick={() => openEssentialModal()}>+ New Essential</button>
+          )}
+        </div>
+        {loadingEssentials ? (
+          <div className="loading">Loading...</div>
+        ) : essentials.length === 0 ? (
+          <div className="empty" style={{ padding: '20px 0', color: 'var(--text-secondary)' }}>
+            No essentials yet. {proposal.status === 'open' ? 'Add one to define deliverables for this proposal.' : ''}
+          </div>
+        ) : (
+          <div className="milestone-grid">
+            {essentials.map((e) => (
+              <div key={e.id} className="milestone-card">
+                <div className="milestone-card-header" style={{ display: 'flex', alignItems: 'center', gap: 8, flexWrap: 'wrap' }}>
+                  <span className="badge">{e.type}</span>
+                  {e.essential_code && <span className="badge"><CopyableCode code={e.essential_code} /></span>}
+                  <h4 style={{ margin: 0, flex: 1 }}>{e.title}</h4>
+                  {proposal.status === 'open' && (
+                    <div style={{ display: 'flex', gap: 4 }}>
+                      <button
+                        className="btn-transition"
+                        style={{ padding: '4px 8px', fontSize: '0.8rem' }}
+                        onClick={() => openEssentialModal(e)}
+                      >
+                        Edit
+                      </button>
+                      <button
+                        className="btn-danger"
+                        style={{ padding: '4px 8px', fontSize: '0.8rem' }}
+                        onClick={() => handleDeleteEssential(e.essential_code)}
+                      >
+                        Delete
+                      </button>
+                    </div>
+                  )}
+                </div>
+                {e.description && (
+                  <p style={{ marginTop: 8, color: 'var(--text-secondary)', whiteSpace: 'pre-wrap' }}>{e.description}</p>
+                )}
+              </div>
+            ))}
+          </div>
+        )}
+      </div>
+
+      {/* Generated tasks (shown when accepted) */}
+      {proposal.status === 'accepted' && proposal.generated_tasks && proposal.generated_tasks.length > 0 && (
+        <div className="section">
+          <h3>Generated Tasks</h3>
+          <div className="milestone-grid">
+            {proposal.generated_tasks.map((gt) => (
+              <div
+                key={gt.task_id}
+                className="milestone-card"
+                onClick={() => gt.task_code && navigate(`/tasks/${gt.task_code}`)}
+                style={{ cursor: 'pointer' }}
+              >
+                <div className="milestone-card-header">
+                  <span className="badge">{gt.task_type}/{gt.task_subtype}</span>
+                  {gt.task_code && <span className="badge">{gt.task_code}</span>}
+                  <h3>{gt.title}</h3>
+                </div>
+              </div>
+            ))}
+          </div>
+        </div>
+      )}
+
+      {/* Action buttons */}
+      <div className="section" style={{ display: 'flex', gap: 8, flexWrap: 'wrap' }}>
+        {proposal.status === 'open' && (
+          <>
+            <button
+              className="btn-transition"
+              onClick={openEditModal}
+            >
+              ✏️ Edit
+            </button>
+            <button
+              className="btn-primary"
+              disabled={actionLoading}
+              onClick={() => { loadMilestones(); setShowAccept(true) }}
+            >
+              ✅ Accept
+            </button>
+            <button
+              className="btn-danger"
+              disabled={actionLoading}
+              onClick={handleReject}
+            >
+              ❌ Reject
+            </button>
+          </>
+        )}
+        {proposal.status === 'rejected' && (
+          <button
+            className="btn-transition"
+            disabled={actionLoading}
+            onClick={handleReopen}
+          >
+            🔄 Reopen
+          </button>
+        )}
+      </div>
+
+      {/* Edit modal */}
+      {showEdit && (
+        <div className="modal-overlay" onClick={() => setShowEdit(false)}>
+          <div className="modal" onClick={(e) => e.stopPropagation()}>
+            <h3>Edit Proposal</h3>
+            <label style={{ display: 'block', marginBottom: 8 }}>
+              <strong>Title</strong>
+              <input
+                type="text"
+                value={editTitle}
+                onChange={(e) => setEditTitle(e.target.value)}
+                style={{ width: '100%', marginTop: 4 }}
+              />
+            </label>
+            <label style={{ display: 'block', marginBottom: 8 }}>
+              <strong>Description</strong>
+              <textarea
+                value={editDescription}
+                onChange={(e) => setEditDescription(e.target.value)}
+                rows={6}
+                style={{ width: '100%', marginTop: 4 }}
+              />
+            </label>
+            <div style={{ marginTop: 12, display: 'flex', gap: 8 }}>
+              <button
+                className="btn-primary"
+                onClick={handleEdit}
+                disabled={!editTitle.trim() || editLoading}
+              >
+                {editLoading ? 'Saving...' : 'Save'}
+              </button>
+              <button className="btn-back" onClick={() => setShowEdit(false)}>Cancel</button>
+            </div>
+          </div>
+        </div>
+      )}
+
+      {/* Accept modal with milestone selector */}
+      {showAccept && (
+        <div className="modal-overlay" onClick={() => setShowAccept(false)}>
+          <div className="modal" onClick={(e) => e.stopPropagation()}>
+            <h3>Accept Proposal</h3>
+            <p>Select an <strong>open</strong> milestone to generate story tasks in:</p>
+            <select
+              value={selectedMilestone}
+              onChange={(e) => setSelectedMilestone(e.target.value)}
+            >
+              <option value="">— Select milestone —</option>
+              {milestones.map((ms) => (
+                <option key={ms.id} value={ms.milestone_code || ''}>{ms.title}</option>
+              ))}
+            </select>
+            {milestones.length === 0 && (
+              <p style={{ color: 'var(--danger)', marginTop: 8 }}>No open milestones available.</p>
+            )}
+            <div style={{ marginTop: 12, display: 'flex', gap: 8 }}>
+              <button
+                className="btn-primary"
+                onClick={handleAccept}
+                disabled={!selectedMilestone || actionLoading}
+              >
+                {actionLoading ? 'Accepting...' : 'Confirm Accept'}
+              </button>
+              <button className="btn-back" onClick={() => setShowAccept(false)}>Cancel</button>
+            </div>
+          </div>
+        </div>
+      )}
+      {/* Essential create/edit modal */}
+      {showEssentialModal && (
+        <div className="modal-overlay" onClick={() => setShowEssentialModal(false)}>
+          <div className="modal" onClick={(e) => e.stopPropagation()}>
+            <h3>{editingEssential ? 'Edit Essential' : 'New Essential'}</h3>
+            <label style={{ display: 'block', marginBottom: 8 }}>
+              <strong>Title</strong>
+              <input
+                type="text"
+                value={essentialTitle}
+                onChange={(e) => setEssentialTitle(e.target.value)}
+                style={{ width: '100%', marginTop: 4 }}
+                placeholder="Essential title"
+              />
+            </label>
+            <label style={{ display: 'block', marginBottom: 8 }}>
+              <strong>Type</strong>
+              <select
+                value={essentialType}
+                onChange={(e) => setEssentialType(e.target.value as EssentialType)}
+                style={{ width: '100%', marginTop: 4 }}
+              >
+                <option value="feature">Feature</option>
+                <option value="improvement">Improvement</option>
+                <option value="refactor">Refactor</option>
+              </select>
+            </label>
+            <label style={{ display: 'block', marginBottom: 8 }}>
+              <strong>Description</strong>
+              <textarea
+                value={essentialDesc}
+                onChange={(e) => setEssentialDesc(e.target.value)}
+                rows={4}
+                style={{ width: '100%', marginTop: 4 }}
+                placeholder="Description (optional)"
+              />
+            </label>
+            <div style={{ marginTop: 12, display: 'flex', gap: 8 }}>
+              <button
+                className="btn-primary"
+                onClick={handleSaveEssential}
+                disabled={!essentialTitle.trim() || essentialLoading}
+              >
+                {essentialLoading ? 'Saving...' : 'Save'}
+              </button>
+              <button className="btn-back" onClick={() => setShowEssentialModal(false)}>Cancel</button>
+            </div>
+          </div>
+        </div>
+      )}
+    </div>
+  )
+}

src/pages/ProposalsPage.tsx

@@ -1,11 +1,11 @@
 import { useState, useEffect } from 'react'
 import { useNavigate } from 'react-router-dom'
 import api from '@/services/api'
-import type { Propose, Project } from '@/types'
+import type { Proposal, Project } from '@/types'
 import dayjs from 'dayjs'
 
-export default function ProposesPage() {
+export default function ProposalsPage() {
-  const [proposes, setProposes] = useState<Propose[]>([])
+  const [proposals, setProposals] = useState<Proposal[]>([])
   const [projects, setProjects] = useState<Project[]>([])
   const [projectFilter, setProjectFilter] = useState('')
   const [showCreate, setShowCreate] = useState(false)
@@ -14,32 +14,32 @@ export default function ProposesPage() {
   const [creating, setCreating] = useState(false)
   const navigate = useNavigate()
 
-  const fetchProposes = () => {
+  const fetchProposals = () => {
     if (!projectFilter) {
-      setProposes([])
+      setProposals([])
       return
     }
-    api.get<Propose[]>(`/projects/${projectFilter}/proposes`).then(({ data }) => setProposes(data))
+    api.get<Proposal[]>(`/projects/${projectFilter}/proposals`).then(({ data }) => setProposals(data))
   }
 
   useEffect(() => {
     api.get<Project[]>('/projects').then(({ data }) => setProjects(data))
   }, [])
 
-  useEffect(() => { fetchProposes() }, [projectFilter])
+  useEffect(() => { fetchProposals() }, [projectFilter])
 
   const handleCreate = async () => {
     if (!newTitle.trim() || !projectFilter) return
     setCreating(true)
     try {
-      await api.post(`/projects/${projectFilter}/proposes`, {
+      await api.post(`/projects/${projectFilter}/proposals`, {
         title: newTitle.trim(),
         description: newDesc.trim() || null,
       })
       setNewTitle('')
       setNewDesc('')
       setShowCreate(false)
-      fetchProposes()
+      fetchProposals()
     } finally {
       setCreating(false)
     }
@@ -55,45 +55,44 @@ export default function ProposesPage() {
   return (
     <div className="milestones-page">
       <div className="page-header">
-        <h2>💡 Proposes ({proposes.length})</h2>
+        <h2>💡 Proposals ({proposals.length})</h2>
         <button className="btn-primary" disabled={!projectFilter} onClick={() => setShowCreate(true)}>
-          + New Propose
+          + New Proposal
         </button>
       </div>
 
       <div className="filters">
         <select value={projectFilter} onChange={(e) => setProjectFilter(e.target.value)}>
           <option value="">Select a project</option>
-          {projects.map((p) => <option key={p.id} value={p.id}>{p.name}</option>)}
+          {projects.map((p) => <option key={p.id} value={p.project_code || ''}>{p.name}</option>)}
         </select>
       </div>
 
-      {!projectFilter && <p className="empty">Please select a project to view proposes.</p>}
+      {!projectFilter && <p className="empty">Please select a project to view proposals.</p>}
 
       <div className="milestone-grid">
-        {proposes.map((pr) => (
+        {proposals.map((pr) => (
-          <div key={pr.id} className="milestone-card" onClick={() => navigate(`/proposes/${pr.propose_code || pr.id}?project_id=${pr.project_id}`)}>
+          <div key={pr.id} className="milestone-card" onClick={() => pr.proposal_code && pr.project_code && navigate(`/proposals/${pr.proposal_code}?project_code=${pr.project_code}`)}>
             <div className="milestone-card-header">
               <span className={`badge ${statusBadgeClass(pr.status)}`}>{pr.status}</span>
-              {pr.propose_code && <span className="badge">{pr.propose_code}</span>}
+              {pr.proposal_code && <span className="badge">{pr.proposal_code}</span>}
               <h3>{pr.title}</h3>
             </div>
             <p className="project-desc">{pr.description || 'No description'}</p>
             <div className="project-meta">
-              {pr.feat_task_id && <span>Task: {pr.feat_task_id}</span>}
               <span>Created {dayjs(pr.created_at).format('YYYY-MM-DD')}</span>
             </div>
           </div>
         ))}
-        {projectFilter && proposes.length === 0 && <p className="empty">No proposes</p>}
+        {projectFilter && proposals.length === 0 && <p className="empty">No proposals</p>}
       </div>
 
       {showCreate && (
         <div className="modal-overlay" onClick={() => setShowCreate(false)}>
           <div className="modal" onClick={(e) => e.stopPropagation()}>
-            <h3>New Propose</h3>
+            <h3>New Proposal</h3>
             <label>Title</label>
-            <input value={newTitle} onChange={(e) => setNewTitle(e.target.value)} placeholder="Propose title" />
+            <input value={newTitle} onChange={(e) => setNewTitle(e.target.value)} placeholder="Proposal title" />
             <label>Description</label>
             <textarea value={newDesc} onChange={(e) => setNewDesc(e.target.value)} placeholder="Description (optional)" rows={4} />
             <div style={{ marginTop: 12, display: 'flex', gap: 8 }}>

src/pages/ProposeDetailPage.tsx

@@ -1,266 +0,0 @@
-import { useState, useEffect } from 'react'
-import { useParams, useNavigate, useSearchParams } from 'react-router-dom'
-import api from '@/services/api'
-import type { Propose, Milestone } from '@/types'
-import dayjs from 'dayjs'
-import CopyableCode from '@/components/CopyableCode'
-
-export default function ProposeDetailPage() {
-  const { id } = useParams()
-  const [searchParams] = useSearchParams()
-  const projectId = searchParams.get('project_id')
-  const navigate = useNavigate()
-
-  const [propose, setPropose] = useState<Propose | null>(null)
-  const [milestones, setMilestones] = useState<Milestone[]>([])
-  const [showAccept, setShowAccept] = useState(false)
-  const [selectedMilestone, setSelectedMilestone] = useState<number | ''>('')
-  const [actionLoading, setActionLoading] = useState(false)
-  const [error, setError] = useState('')
-
-  // Edit state (P10.7)
-  const [showEdit, setShowEdit] = useState(false)
-  const [editTitle, setEditTitle] = useState('')
-  const [editDescription, setEditDescription] = useState('')
-  const [editLoading, setEditLoading] = useState(false)
-
-  const fetchPropose = () => {
-    if (!projectId) return
-    api.get<Propose>(`/projects/${projectId}/proposes/${id}`).then(({ data }) => setPropose(data))
-  }
-
-  useEffect(() => {
-    fetchPropose()
-  }, [id, projectId])
-
-  const loadMilestones = () => {
-    if (!projectId) return
-    api.get<Milestone[]>(`/milestones?project_id=${projectId}`)
-      .then(({ data }) => setMilestones(data.filter((m) => m.status === 'open')))
-  }
-
-  const handleAccept = async () => {
-    if (!selectedMilestone || !projectId) return
-    setActionLoading(true)
-    setError('')
-    try {
-      await api.post(`/projects/${projectId}/proposes/${id}/accept`, { milestone_id: selectedMilestone })
-      setShowAccept(false)
-      fetchPropose()
-    } catch (err: any) {
-      setError(err.response?.data?.detail || 'Accept failed')
-    } finally {
-      setActionLoading(false)
-    }
-  }
-
-  const handleReject = async () => {
-    if (!projectId) return
-    const reason = prompt('Reject reason (optional):')
-    setActionLoading(true)
-    setError('')
-    try {
-      await api.post(`/projects/${projectId}/proposes/${id}/reject`, { reason: reason || undefined })
-      fetchPropose()
-    } catch (err: any) {
-      setError(err.response?.data?.detail || 'Reject failed')
-    } finally {
-      setActionLoading(false)
-    }
-  }
-
-  const openEditModal = () => {
-    if (!propose) return
-    setEditTitle(propose.title)
-    setEditDescription(propose.description || '')
-    setError('')
-    setShowEdit(true)
-  }
-
-  const handleEdit = async () => {
-    if (!projectId) return
-    setEditLoading(true)
-    setError('')
-    try {
-      await api.patch(`/projects/${projectId}/proposes/${id}`, {
-        title: editTitle,
-        description: editDescription,
-      })
-      setShowEdit(false)
-      fetchPropose()
-    } catch (err: any) {
-      setError(err.response?.data?.detail || 'Update failed')
-    } finally {
-      setEditLoading(false)
-    }
-  }
-
-  const handleReopen = async () => {
-    if (!projectId) return
-    setActionLoading(true)
-    setError('')
-    try {
-      await api.post(`/projects/${projectId}/proposes/${id}/reopen`)
-      fetchPropose()
-    } catch (err: any) {
-      setError(err.response?.data?.detail || 'Reopen failed')
-    } finally {
-      setActionLoading(false)
-    }
-  }
-
-  if (!propose) return <div className="loading">Loading...</div>
-
-  const statusBadgeClass = (s: string) => {
-    if (s === 'open') return 'status-open'
-    if (s === 'accepted') return 'status-completed'
-    if (s === 'rejected') return 'status-closed'
-    return ''
-  }
-
-  return (
-    <div className="task-detail">
-      <button className="btn-back" onClick={() => navigate(-1)}>← Back</button>
-
-      <div className="task-header">
-        <h2>
-          💡 {propose.title}
-          {propose.propose_code && <span style={{ marginLeft: 8 }}><CopyableCode code={propose.propose_code} /></span>}
-        </h2>
-        <span className={`badge ${statusBadgeClass(propose.status)}`} style={{ fontSize: '1rem' }}>
-          {propose.status}
-        </span>
-      </div>
-
-      {error && <div className="error-message" style={{ color: 'var(--danger)', marginBottom: 12 }}>{error}</div>}
-
-      <div className="section">
-        <h3>Details</h3>
-        <div className="detail-grid">
-          <div><strong>Propose Code:</strong> {propose.propose_code ? <CopyableCode code={propose.propose_code} /> : '—'}</div>
-          <div><strong>Status:</strong> {propose.status}</div>
-          <div><strong>Created By:</strong> {propose.created_by_username || (propose.created_by_id ? `User #${propose.created_by_id}` : '—')}</div>
-          <div><strong>Created:</strong> {dayjs(propose.created_at).format('YYYY-MM-DD HH:mm')}</div>
-          <div><strong>Updated:</strong> {propose.updated_at ? dayjs(propose.updated_at).format('YYYY-MM-DD HH:mm') : '—'}</div>
-          <div><strong>Feature Task:</strong> {propose.feat_task_id || '—'}</div>
-        </div>
-      </div>
-
-      <div className="section">
-        <h3>Description</h3>
-        <p style={{ whiteSpace: 'pre-wrap' }}>{propose.description || 'No description'}</p>
-      </div>
-
-      {/* Action buttons */}
-      <div className="section" style={{ display: 'flex', gap: 8, flexWrap: 'wrap' }}>
-        {propose.status === 'open' && (
-          <>
-            <button
-              className="btn-transition"
-              onClick={openEditModal}
-            >
-              ✏️ Edit
-            </button>
-            <button
-              className="btn-primary"
-              disabled={actionLoading}
-              onClick={() => { loadMilestones(); setShowAccept(true) }}
-            >
-              ✅ Accept
-            </button>
-            <button
-              className="btn-danger"
-              disabled={actionLoading}
-              onClick={handleReject}
-            >
-              ❌ Reject
-            </button>
-          </>
-        )}
-        {propose.status === 'accepted' && propose.feat_task_id && (
-          <button className="btn-transition" onClick={() => navigate(`/tasks/${propose.feat_task_id}`)}>
-            📋 View Generated Task
-          </button>
-        )}
-        {propose.status === 'rejected' && (
-          <button
-            className="btn-transition"
-            disabled={actionLoading}
-            onClick={handleReopen}
-          >
-            🔄 Reopen
-          </button>
-        )}
-      </div>
-
-      {/* Edit modal (P10.7 — only reachable when open) */}
-      {showEdit && (
-        <div className="modal-overlay" onClick={() => setShowEdit(false)}>
-          <div className="modal" onClick={(e) => e.stopPropagation()}>
-            <h3>Edit Propose</h3>
-            <label style={{ display: 'block', marginBottom: 8 }}>
-              <strong>Title</strong>
-              <input
-                type="text"
-                value={editTitle}
-                onChange={(e) => setEditTitle(e.target.value)}
-                style={{ width: '100%', marginTop: 4 }}
-              />
-            </label>
-            <label style={{ display: 'block', marginBottom: 8 }}>
-              <strong>Description</strong>
-              <textarea
-                value={editDescription}
-                onChange={(e) => setEditDescription(e.target.value)}
-                rows={6}
-                style={{ width: '100%', marginTop: 4 }}
-              />
-            </label>
-            <div style={{ marginTop: 12, display: 'flex', gap: 8 }}>
-              <button
-                className="btn-primary"
-                onClick={handleEdit}
-                disabled={!editTitle.trim() || editLoading}
-              >
-                {editLoading ? 'Saving...' : 'Save'}
-              </button>
-              <button className="btn-back" onClick={() => setShowEdit(false)}>Cancel</button>
-            </div>
-          </div>
-        </div>
-      )}
-
-      {/* Accept modal with milestone selector */}
-      {showAccept && (
-        <div className="modal-overlay" onClick={() => setShowAccept(false)}>
-          <div className="modal" onClick={(e) => e.stopPropagation()}>
-            <h3>Accept Propose</h3>
-            <p>Select an <strong>open</strong> milestone to create a feature story task in:</p>
-            <select
-              value={selectedMilestone}
-              onChange={(e) => setSelectedMilestone(Number(e.target.value))}
-            >
-              <option value="">— Select milestone —</option>
-              {milestones.map((ms) => (
-                <option key={ms.id} value={ms.id}>{ms.title}</option>
-              ))}
-            </select>
-            {milestones.length === 0 && (
-              <p style={{ color: 'var(--danger)', marginTop: 8 }}>No open milestones available.</p>
-            )}
-            <div style={{ marginTop: 12, display: 'flex', gap: 8 }}>
-              <button
-                className="btn-primary"
-                onClick={handleAccept}
-                disabled={!selectedMilestone || actionLoading}
-              >
-                {actionLoading ? 'Accepting...' : 'Confirm Accept'}
-              </button>
-              <button className="btn-back" onClick={() => setShowAccept(false)}>Cancel</button>
-            </div>
-          </div>
-        </div>
-      )}
-    </div>
-  )
-}

src/pages/RoleEditorPage.tsx

@@ -25,22 +25,22 @@ export default function RoleEditorPage() {
   const [loading, setLoading] = useState(true)
   const [saving, setSaving] = useState(false)
   const [message, setMessage] = useState('')
+  const [messageOk, setMessageOk] = useState(true)
   const [showCreateForm, setShowCreateForm] = useState(false)
   const [newRoleName, setNewRoleName] = useState('')
   const [newRoleDesc, setNewRoleDesc] = useState('')
   const [creating, setCreating] = useState(false)
+  const [templateRoleId, setTemplateRoleId] = useState<string>('')
 
   const isAdmin = user?.is_admin === true
 
-  useEffect(() => {
+  useEffect(() => { fetchData() }, [])
-    fetchData()
-  }, [])
 
   const fetchData = async () => {
     try {
       const [rolesRes, permsRes] = await Promise.all([
         api.get('/roles'),
-        api.get('/roles/permissions')
+        api.get('/roles/permissions'),
       ])
       setRoles(rolesRes.data)
       setPermissions(permsRes.data)
@@ -54,63 +54,81 @@ export default function RoleEditorPage() {
   const handlePermissionToggle = (permId: number) => {
     if (!selectedRole) return
     const newPermIds = selectedRole.permission_ids.includes(permId)
-      ? selectedRole.permission_ids.filter(id => id !== permId)
+      ? selectedRole.permission_ids.filter((id) => id !== permId)
       : [...selectedRole.permission_ids, permId]
     setSelectedRole({ ...selectedRole, permission_ids: newPermIds })
   }
 
+  // Copy a source role's permission_ids over the current selection.
+  // Replaces (not merges) — the user explicitly clicked "use as template".
+  // Local-only: nothing persists until they hit "Save changes".
+  const handleApplyTemplate = () => {
+    if (!selectedRole || !templateRoleId) return
+    const src = roles.find((r) => String(r.id) === templateRoleId)
+    if (!src) return
+    setSelectedRole({ ...selectedRole, permission_ids: [...src.permission_ids] })
+    flashMessage(
+      `Loaded ${src.permission_ids.length} permissions from "${src.name}" — not saved yet`,
+      true,
+    )
+  }
+
+  const flashMessage = (msg: string, ok: boolean) => {
+    setMessage(msg); setMessageOk(ok)
+  }
+
   const handleSave = async () => {
     if (!selectedRole) return
-    setSaving(true)
+    setSaving(true); setMessage('')
-    setMessage('')
     try {
       await api.post(`/roles/${selectedRole.id}/permissions`, {
-        permission_ids: selectedRole.permission_ids
+        permission_ids: selectedRole.permission_ids,
       })
-      setMessage('Saved successfully!')
+      flashMessage('Saved successfully', true)
       fetchData()
     } catch (err: any) {
-      setMessage(err.response?.data?.detail || 'Failed to save')
+      flashMessage(err.response?.data?.detail || 'Failed to save', false)
     } finally {
       setSaving(false)
     }
   }
 
   const handleDeleteRole = async () => {
-    if (!selectedRole || !confirm(`Are you sure you want to delete the "${selectedRole.name}" role?`)) return
+    if (!selectedRole) return
-    setSaving(true)
+    if (!confirm(`Delete the "${selectedRole.name}" role?`)) return
-    setMessage('')
+    setSaving(true); setMessage('')
     try {
       await api.delete(`/roles/${selectedRole.id}`)
-      setMessage('Role deleted successfully!')
+      flashMessage('Role deleted', true)
       setSelectedRole(null)
       fetchData()
     } catch (err: any) {
-      setMessage(err.response?.data?.detail || 'Failed to delete role')
+      flashMessage(err.response?.data?.detail || 'Failed to delete role', false)
     } finally {
       setSaving(false)
     }
   }
 
-  const canDeleteRole = selectedRole && !['admin', 'guest', 'account-manager'].includes(selectedRole.name) && isAdmin
+  const canDeleteRole =
+    selectedRole &&
+    !['admin', 'guest', 'account-manager'].includes(selectedRole.name) &&
+    isAdmin
 
   const handleCreateRole = async () => {
     if (!newRoleName.trim()) return
-    setCreating(true)
+    setCreating(true); setMessage('')
-    setMessage('')
     try {
       await api.post('/roles', {
         name: newRoleName.trim(),
         description: newRoleDesc.trim() || null,
-        is_global: false
+        is_global: false,
       })
-      setMessage('Role created successfully!')
+      flashMessage('Role created', true)
       setShowCreateForm(false)
-      setNewRoleName('')
+      setNewRoleName(''); setNewRoleDesc('')
-      setNewRoleDesc('')
       fetchData()
     } catch (err: any) {
-      setMessage(err.response?.data?.detail || 'Failed to create role')
+      flashMessage(err.response?.data?.detail || 'Failed to create role', false)
     } finally {
       setCreating(false)
     }
@@ -122,195 +140,156 @@ export default function RoleEditorPage() {
     return acc
   }, {} as Record<string, Permission[]>)
 
-  if (loading) return <div className="p-4">Loading...</div>
+  if (loading) return <div className="loading">Loading roles…</div>
 
   return (
-    <div className="role-editor-page" style={{ padding: '20px' }}>
+    <div className="role-editor-page">
       <h2>🔐 Role Editor</h2>
-      <p style={{ color: '#888', marginBottom: '20px' }}>
+      <p className="lead">Configure permissions for each role. Only admins can edit roles.</p>
-        Configure permissions for each role. Only admins can edit roles.
-      </p>
 
       {isAdmin && !showCreateForm && (
-        <button
+        <button className="btn-primary" onClick={() => setShowCreateForm(true)}
-          onClick={() => setShowCreateForm(true)}
+                style={{ marginBottom: 18 }}>
-          className="btn-primary"
-          style={{ marginBottom: '20px' }}
-        >
           + Create New Role
         </button>
       )}
 
       {showCreateForm && (
-        <div style={{ 
+        <div className="role-editor-create">
-          border: '2px solid #007bff', 
+          <h3>Create new role</h3>
-          borderRadius: '8px', 
+          <label>Role name *</label>
-          padding: '20px',
+          <input
-          marginBottom: '20px',
+            type="text"
-          backgroundColor: '#f8f9fa'
+            value={newRoleName}
-        }}>
+            onChange={(e) => setNewRoleName(e.target.value)}
-          <h3 style={{ marginTop: 0 }}>Create New Role</h3>
+            placeholder="e.g. developer, manager"
-          <div style={{ display: 'flex', flexDirection: 'column', gap: '12px', maxWidth: '400px' }}>
+          />
-            <div>
+          <label>Description</label>
-              <label style={{ display: 'block', marginBottom: '4px', fontWeight: 500 }}>
+          <input
-                Role Name *
+            type="text"
-              </label>
+            value={newRoleDesc}
-              <input
+            onChange={(e) => setNewRoleDesc(e.target.value)}
-                type="text"
+            placeholder="(optional) short description"
-                value={newRoleName}
+          />
-                onChange={(e) => setNewRoleName(e.target.value)}
+          <div className="actions">
-                placeholder="e.g., developer, manager"
+            <button className="btn-primary" disabled={creating || !newRoleName.trim()}
-                style={{ width: '100%', padding: '8px', borderRadius: '4px', border: '1px solid #ddd' }}
+                    onClick={handleCreateRole}>
-              />
+              {creating ? 'Creating…' : 'Create'}
-            </div>
+            </button>
-            <div>
+            <button className="btn-secondary"
-              <label style={{ display: 'block', marginBottom: '4px', fontWeight: 500 }}>
+                    onClick={() => { setShowCreateForm(false); setNewRoleName(''); setNewRoleDesc('') }}>
-                Description
+              Cancel
-              </label>
+            </button>
-              <input
-                type="text"
-                value={newRoleDesc}
-                onChange={(e) => setNewRoleDesc(e.target.value)}
-                placeholder="Role description"
-                style={{ width: '100%', padding: '8px', borderRadius: '4px', border: '1px solid #ddd' }}
-              />
-            </div>
-            <div style={{ display: 'flex', gap: '8px' }}>
-              <button
-                onClick={handleCreateRole}
-                disabled={creating || !newRoleName.trim()}
-                className="btn-primary"
-              >
-                {creating ? 'Creating...' : 'Create'}
-              </button>
-              <button
-                onClick={() => {
-                  setShowCreateForm(false)
-                  setNewRoleName('')
-                  setNewRoleDesc('')
-                }}
-                className="btn-secondary"
-                style={{ padding: '8px 16px', borderRadius: '4px', border: '1px solid #ddd', background: '#fff' }}
-              >
-                Cancel
-              </button>
-            </div>
           </div>
         </div>
       )}
 
       {message && (
-        <div style={{ 
+        <div className={`role-editor-banner ${messageOk ? 'ok' : 'err'}`}>
-          padding: '10px', 
+          <span>{messageOk ? '✓' : '✗'}</span>
-          marginBottom: '20px',
+          <span>{message}</span>
-          backgroundColor: message.includes('success') ? '#d4edda' : '#f8d7da',
-          borderRadius: '4px'
-        }}>
-          {message}
         </div>
       )}
 
-      <div style={{ display: 'flex', gap: '20px' }}>
+      <div className="role-editor-grid">
-        {/* Role List */}
+        {/* Roles sidebar */}
-        <div style={{ width: '250px' }}>
+        <aside className="role-editor-sidebar">
           <h3>Roles</h3>
-          <div style={{ display: 'flex', flexDirection: 'column', gap: '8px' }}>
+          <div className="role-list">
-            {roles.map(role => (
+            {roles.map((role) => {
-              <div
+              const active = selectedRole?.id === role.id
-                key={role.id}
+              return (
-                onClick={() => setSelectedRole({ ...role })}
+                <div
-                style={{
+                  key={role.id}
-                  padding: '12px',
+                  className={`role-card${active ? ' active' : ''}`}
-                  border: selectedRole?.id === role.id ? '2px solid #007bff' : '1px solid #ddd',
+                  onClick={() => setSelectedRole({ ...role })}
-                  borderRadius: '6px',
+                >
-                  cursor: 'pointer',
+                  <div className="role-name">
-                  backgroundColor: selectedRole?.id === role.id ? '#f0f8ff' : 'white'
+                    {role.name}
-                }}
+                    {role.is_global && <span className="role-badge-global" title="global">★</span>}
-              >
+                  </div>
-                <strong>{role.name}</strong>
+                  {role.description && <div className="role-desc">{role.description}</div>}
-                {role.is_global && <span style={{ fontSize: '12px', marginLeft: '8px', color: '#ff6b6b' }}>🌟</span>}
+                  <div className="role-meta">{role.permission_ids.length} permissions</div>
-                <div style={{ fontSize: '12px', color: '#666' }}>{role.description}</div>
-                <div style={{ fontSize: '11px', color: '#999', marginTop: '4px' }}>
-                  {role.permission_ids.length} permissions
                 </div>
-              </div>
+              )
-            ))}
+            })}
           </div>
-        </div>
+        </aside>
 
-        {/* Permission Editor */}
+        {/* Permission editor */}
-        <div style={{ flex: 1 }}>
+        <section className="role-editor-detail">
           {selectedRole ? (
             <>
-              <h3>Permissions for: {selectedRole.name}</h3>
+              <h3>Permissions for <span className="name">{selectedRole.name}</span></h3>
-              <div style={{ display: 'flex', flexDirection: 'column', gap: '20px' }}>
+
-                {Object.entries(groupedPermissions).map(([category, perms]) => (
+              {isAdmin && roles.length > 1 && (
-                  <div key={category} style={{ 
+                <div className="role-editor-template">
-                    border: '1px solid #eee', 
+                  <label htmlFor="tpl-select">Copy from template:</label>
-                    borderRadius: '8px', 
+                  <select
-                    padding: '12px' 
+                    id="tpl-select"
-                  }}>
+                    value={templateRoleId}
-                    <h4 style={{ margin: '0 0 10px 0', textTransform: 'capitalize' }}>
+                    onChange={(e) => setTemplateRoleId(e.target.value)}
-                      {category}
+                  >
-                    </h4>
+                    <option value="">— select a role —</option>
-                    <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fill, minmax(200px, 1fr))', gap: '8px' }}>
+                    {roles
-                      {perms.map(perm => (
+                      .filter((r) => r.id !== selectedRole.id)
-                        <label key={perm.id} style={{ 
+                      .map((r) => (
-                          display: 'flex', 
+                        <option key={r.id} value={r.id}>
-                          alignItems: 'center', 
+                          {r.name} ({r.permission_ids.length} perms)
-                          gap: '8px',
+                        </option>
-                          cursor: 'pointer',
+                      ))}
-                          padding: '6px',
+                  </select>
-                          borderRadius: '4px',
+                  <button
-                          backgroundColor: selectedRole.permission_ids.includes(perm.id) ? '#e8f5e9' : 'transparent'
+                    className="btn-secondary"
-                        }}>
+                    disabled={!templateRoleId}
+                    onClick={handleApplyTemplate}
+                    title="Replace current checkboxes with the template role's permission set (local; not saved until you click Save changes)"
+                  >
+                    Use as template
+                  </button>
+                </div>
+              )}
+
+              {Object.entries(groupedPermissions).map(([category, perms]) => (
+                <div key={category} className="perm-group">
+                  <div className="perm-group-header">{category}</div>
+                  <div className="perm-grid">
+                    {perms.map((perm) => {
+                      const checked = selectedRole.permission_ids.includes(perm.id)
+                      return (
+                        <label key={perm.id} className={`perm-item${checked ? ' checked' : ''}`}>
                           <input
                             type="checkbox"
-                            checked={selectedRole.permission_ids.includes(perm.id)}
+                            checked={checked}
                             onChange={() => handlePermissionToggle(perm.id)}
                           />
-                          <div>
+                          <div className="perm-body">
-                            <div style={{ fontWeight: 500 }}>{perm.name}</div>
+                            <div className="perm-name">{perm.name}</div>
-                            <div style={{ fontSize: '11px', color: '#666' }}>{perm.description}</div>
+                            <div className="perm-desc">{perm.description}</div>
                           </div>
                         </label>
-                      ))}
+                      )
-                    </div>
+                    })}
                   </div>
-                ))}
+                </div>
-              </div>
+              ))}
-              <button
+              <div className="role-editor-actions">
-                onClick={handleSave}
+                <button className="btn-primary" disabled={saving} onClick={handleSave}>
-                disabled={saving}
+                  {saving ? 'Saving…' : 'Save changes'}
-                className="btn-primary"
-                style={{ marginTop: '20px', marginRight: '10px' }}
-              >
-                {saving ? 'Saving...' : 'Save Changes'}
-              </button>
-              {canDeleteRole && (
-                <button
-                  onClick={handleDeleteRole}
-                  disabled={saving}
-                  style={{ 
-                    marginTop: '20px', 
-                    padding: '10px 20px',
-                    borderRadius: '4px',
-                    border: '1px solid #dc3545',
-                    backgroundColor: '#dc3545',
-                    color: 'white',
-                    cursor: 'pointer'
-                  }}
-                >
-                  Delete Role
                 </button>
-              )}
+                {canDeleteRole && (
+                  <button className="btn-danger" disabled={saving} onClick={handleDeleteRole}>
+                    Delete role
+                  </button>
+                )}
+              </div>
             </>
           ) : (
-            <div style={{ color: '#888', textAlign: 'center', marginTop: '40px' }}>
+            <div className="role-editor-empty">
-              Select a role to edit its permissions
+              ◆ Select a role on the left to edit its permissions
             </div>
           )}
-        </div>
+        </section>
       </div>
     </div>
   )

src/pages/SetupWizardPage.tsx

@@ -1,217 +0,0 @@
-import { useState } from 'react'
-import axios from 'axios'
-
-interface Props {
-  wizardBase: string
-  onComplete: () => void
-}
-
-interface SetupForm {
-  admin_username: string
-  admin_password: string
-  admin_email: string
-  admin_full_name: string
-  db_host: string
-  db_port: number
-  db_user: string
-  db_password: string
-  db_database: string
-  backend_base_url: string
-  project_name: string
-  project_description: string
-}
-
-const STEPS = ['Welcome', 'Database', 'Admin', 'Backend', 'Finish']
-
-export default function SetupWizardPage({ wizardBase, onComplete }: Props) {
-  const [step, setStep] = useState(0)
-  const [error, setError] = useState('')
-  const [saving, setSaving] = useState(false)
-  const [wizardOk, setWizardOk] = useState<boolean | null>(null)
-  const [form, setForm] = useState<SetupForm>({
-    admin_username: 'admin',
-    admin_password: '',
-    admin_email: '',
-    admin_full_name: 'Admin',
-    db_host: 'mysql',
-    db_port: 3306,
-    db_user: 'harborforge',
-    db_password: 'harborforge_pass',
-    db_database: 'harborforge',
-    backend_base_url: 'http://backend:8000',
-    project_name: '',
-    project_description: '',
-  })
-
-  const wizardApi = axios.create({
-    baseURL: wizardBase,
-    timeout: 5000,
-  })
-
-  const set = (key: keyof SetupForm, value: string | number) =>
-    setForm((f) => ({ ...f, [key]: value }))
-
-  const checkWizard = async () => {
-    setError('')
-    try {
-      await wizardApi.get('/health')
-      setWizardOk(true)
-      setStep(1)
-    } catch {
-      setWizardOk(false)
-      setError(`Unable to connect to AbstractWizard (${wizardBase}).\nPlease ensure the SSH tunnel is configured:\nssh -L <wizard_port>:127.0.0.1:<wizard_port> user@server`)
-    }
-  }
-
-  const saveConfig = async () => {
-    setError('')
-    setSaving(true)
-    try {
-      const config = {
-        initialized: true,
-        admin: {
-          username: form.admin_username,
-          password: form.admin_password,
-          email: form.admin_email,
-          full_name: form.admin_full_name,
-        },
-        database: {
-          host: form.db_host,
-          port: form.db_port,
-          user: form.db_user,
-          password: form.db_password,
-          database: form.db_database,
-        },
-        backend_url: form.backend_base_url || undefined,
-      }
-
-      await wizardApi.put('/api/v1/config/harborforge.json', config, {
-        headers: { 'Content-Type': 'application/json' },
-      })
-
-      if (form.backend_base_url) {
-        localStorage.setItem('HF_BACKEND_BASE_URL', form.backend_base_url)
-      }
-
-      setStep(4)
-    } catch (err: any) {
-      setError(`Failed to save configuration: ${err.message}`)
-    } finally {
-      setSaving(false)
-    }
-  }
-
-  return (
-    <div className="setup-wizard">
-      <div className="setup-container">
-        <div className="setup-header">
-          <h1>⚓ HarborForge Setup Wizard</h1>
-          <div className="setup-steps">
-            {STEPS.map((s, i) => (
-              <span key={i} className={`setup-step ${i === step ? 'active' : i < step ? 'done' : ''}`}>
-                {i < step ? '✓' : i + 1}. {s}
-              </span>
-            ))}
-          </div>
-        </div>
-
-        {error && <div className="setup-error">{error}</div>}
-
-        {/* Step 0: Welcome */}
-        {step === 0 && (
-          <div className="setup-step-content">
-            <h2>Welcome to HarborForge</h2>
-            <p>Agent/Human collaborative task management platform</p>
-            <div className="setup-info">
-              <p>⚠️ The setup wizard connects to AbstractWizard via SSH tunnel. Ensure the port is forwarded:</p>
-              <code>ssh -L &lt;wizard_port&gt;:127.0.0.1:&lt;wizard_port&gt; user@your-server</code>
-            </div>
-            <button className="btn-primary" onClick={checkWizard}>
-              Connect to Wizard
-            </button>
-            {wizardOk === false && (
-              <p className="setup-hint">Connection failed. Check the SSH tunnel.</p>
-            )}
-          </div>
-        )}
-
-        {/* Step 1: Database */}
-        {step === 1 && (
-          <div className="setup-step-content">
-            <h2>Database configuration</h2>
-            <p className="text-dim">Configure MySQL connection (docker-compose defaults are fine if using the bundled MySQL).</p>
-            <div className="setup-form">
-              <label>Host <input value={form.db_host} onChange={(e) => set('db_host', e.target.value)} /></label>
-              <label>Port <input type="number" value={form.db_port} onChange={(e) => set('db_port', Number(e.target.value))} /></label>
-              <label>Username <input value={form.db_user} onChange={(e) => set('db_user', e.target.value)} /></label>
-              <label>Password <input type="password" value={form.db_password} onChange={(e) => set('db_password', e.target.value)} /></label>
-              <label>Database <input value={form.db_database} onChange={(e) => set('db_database', e.target.value)} /></label>
-            </div>
-            <div className="setup-nav">
-              <button className="btn-back" onClick={() => setStep(0)}>Back</button>
-              <button className="btn-primary" onClick={() => setStep(2)}>Next</button>
-            </div>
-          </div>
-        )}
-
-        {/* Step 2: Admin */}
-        {step === 2 && (
-          <div className="setup-step-content">
-            <h2>Admin account</h2>
-            <p className="text-dim">Create the first admin user</p>
-            <div className="setup-form">
-              <label>Username <input value={form.admin_username} onChange={(e) => set('admin_username', e.target.value)} required /></label>
-              <label>Password <input type="password" value={form.admin_password} onChange={(e) => set('admin_password', e.target.value)} required placeholder="Set admin password" /></label>
-              <label>Email <input type="email" value={form.admin_email} onChange={(e) => set('admin_email', e.target.value)} placeholder="admin@example.com" /></label>
-              <label>Full name <input value={form.admin_full_name} onChange={(e) => set('admin_full_name', e.target.value)} /></label>
-            </div>
-            <div className="setup-nav">
-              <button className="btn-back" onClick={() => setStep(1)}>Back</button>
-              <button className="btn-primary" onClick={() => {
-                if (!form.admin_password) { setError('Please set an admin password'); return }
-                setError('')
-                setStep(3)
-              }}>Next</button>
-            </div>
-          </div>
-        )}
-
-        {/* Step 3: Backend */}
-        {step === 3 && (
-          <div className="setup-step-content">
-            <h2>Backend URL</h2>
-            <p className="text-dim">Configure the HarborForge backend API URL</p>
-            <div className="setup-form">
-              <label>Backend Base URL <input value={form.backend_base_url} onChange={(e) => set('backend_base_url', e.target.value)} placeholder="http://backend:8000" /></label>
-            </div>
-            <div className="setup-nav">
-              <button className="btn-back" onClick={() => setStep(2)}>Back</button>
-              <button className="btn-primary" onClick={saveConfig} disabled={saving}>
-                {saving ? 'Saving...' : 'Finish setup'}
-              </button>
-            </div>
-          </div>
-        )}
-
-        {/* Step 4: Done */}
-        {step === 4 && (
-          <div className="setup-step-content">
-            <div className="setup-done">
-              <h2>✅ Setup complete!</h2>
-              <p>Configuration saved to AbstractWizard.</p>
-              <div className="setup-info">
-                <p>Restart services on the server:</p>
-                <code>docker compose restart</code>
-                <p style={{ marginTop: '1rem' }}>After the backend starts, refresh this page to go to login.</p>
-                <p>Admin account: <strong>{form.admin_username}</strong></p>
-              </div>
-              <button className="btn-primary" onClick={onComplete}>
-                Refresh to check
-              </button>
-            </div>
-          </div>
-        )}
-      </div>
-    </div>
-  )
-}

src/pages/SupportDetailPage.tsx

@@ -27,7 +27,7 @@ const STATUS_OPTIONS = ['open', 'in_progress', 'resolved', 'closed']
 const PRIORITY_OPTIONS = ['low', 'medium', 'high', 'critical']
 
 export default function SupportDetailPage() {
-  const { supportId } = useParams()
+  const { supportCode } = useParams()
   const navigate = useNavigate()
   const { user } = useAuth()
   const [support, setSupport] = useState<SupportItem | null>(null)
@@ -40,7 +40,7 @@ export default function SupportDetailPage() {
 
   const fetchSupport = async () => {
     try {
-      const { data } = await api.get<SupportItem>(`/supports/${supportId}`)
+      const { data } = await api.get<SupportItem>(`/supports/${supportCode}`)
       setSupport(data)
       setEditForm({
         title: data.title,
@@ -56,14 +56,14 @@ export default function SupportDetailPage() {
 
   useEffect(() => {
     fetchSupport()
-  }, [supportId])
+  }, [supportCode])
 
   const handleTake = async () => {
     if (!support) return
     setSaving(true)
     setMessage('')
     try {
-      const { data } = await api.post<SupportItem>(`/supports/${supportId}/take`)
+      const { data } = await api.post<SupportItem>(`/supports/${supportCode}/take`)
       setSupport(data)
       setMessage('You have taken this support ticket')
     } catch (err: any) {
@@ -78,7 +78,7 @@ export default function SupportDetailPage() {
     setSaving(true)
     setMessage('')
     try {
-      const { data } = await api.post<SupportItem>(`/supports/${supportId}/transition`, {
+      const { data } = await api.post<SupportItem>(`/supports/${supportCode}/transition`, {
         status: transitionStatus,
       })
       setSupport(data)
@@ -106,7 +106,7 @@ export default function SupportDetailPage() {
         return
       }
 
-      const { data } = await api.patch<SupportItem>(`/supports/${supportId}`, payload)
+      const { data } = await api.patch<SupportItem>(`/supports/${supportCode}`, payload)
       setSupport(data)
       setEditMode(false)
       setMessage('Support ticket updated')
@@ -122,7 +122,7 @@ export default function SupportDetailPage() {
     if (!confirm(`Delete support ticket ${support.support_code || support.id}? This cannot be undone.`)) return
     setSaving(true)
     try {
-      await api.delete(`/supports/${supportId}`)
+      await api.delete(`/supports/${supportCode}`)
       navigate(-1)
     } catch (err: any) {
       setMessage(err.response?.data?.detail || 'Failed to delete support ticket')

src/pages/TaskDetailPage.tsx

@@ -8,7 +8,7 @@ import CreateTaskModal from '@/components/CreateTaskModal'
 import CopyableCode from '@/components/CopyableCode'
 
 export default function TaskDetailPage() {
-  const { id } = useParams()
+  const { taskCode } = useParams()
   const navigate = useNavigate()
   const { user } = useAuth()
   const [task, setTask] = useState<Task | null>(null)
@@ -26,27 +26,30 @@ export default function TaskDetailPage() {
   const [closeReason, setCloseReason] = useState('')
 
   const refreshTask = async () => {
-    const { data } = await api.get<Task>(`/tasks/${id}`)
+    if (!taskCode) return
+    const { data } = await api.get<Task>(`/tasks/${taskCode}`)
     setTask(data)
     if (data.project_id) {
       api.get<Project>(`/projects/${data.project_id}`).then(({ data }) => setProject(data)).catch(() => {})
       api.get<ProjectMember[]>(`/projects/${data.project_id}/members`).then(({ data }) => setMembers(data)).catch(() => {})
     }
-    if (data.milestone_id) {
+    if (data.milestone_code) {
-      api.get<Milestone>(`/milestones/${data.milestone_id}`).then(({ data }) => setMilestone(data)).catch(() => {})
+      api.get<Milestone>(`/milestones/${data.milestone_code}`).then(({ data }) => setMilestone(data)).catch(() => {})
     }
   }
 
   useEffect(() => {
     refreshTask().catch(console.error)
-    api.get<Comment[]>(`/tasks/${id}/comments`).then(({ data }) => setComments(data))
+    if (taskCode) {
-  }, [id])
+      api.get<Comment[]>(`/tasks/${taskCode}/comments`).then(({ data }) => setComments(data))
+    }
+  }, [taskCode])
 
   const addComment = async () => {
     if (!newComment.trim() || !task) return
     await api.post('/comments', { content: newComment, task_id: task.id, author_id: 1 })
     setNewComment('')
-    const { data } = await api.get<Comment[]>(`/tasks/${id}/comments`)
+    const { data } = await api.get<Comment[]>(`/tasks/${taskCode}/comments`)
     setComments(data)
   }
 
@@ -54,10 +57,10 @@ export default function TaskDetailPage() {
     setActionLoading(actionName)
     setActionError(null)
     try {
-      await api.post(`/tasks/${id}/transition?new_status=${newStatus}`, body || {})
+      await api.post(`/tasks/${taskCode}/transition?new_status=${newStatus}`, body || {})
       await refreshTask()
       // refresh comments too (finish adds one via backend)
-      const { data } = await api.get<Comment[]>(`/tasks/${id}/comments`)
+      const { data } = await api.get<Comment[]>(`/tasks/${taskCode}/comments`)
       setComments(data)
     } catch (err: any) {
       setActionError(err?.response?.data?.detail || err?.message || 'Action failed')

src/pages/TasksPage.tsx

@@ -64,8 +64,8 @@ export default function TasksPage() {
         </thead>
         <tbody>
           {tasks.map((t) => (
-            <tr key={t.id} onClick={() => navigate(`/tasks/${t.task_code || t.id}`)} className="clickable">
+            <tr key={t.id} onClick={() => t.task_code && navigate(`/tasks/${t.task_code}`)} className={t.task_code ? 'clickable' : ''}>
-              <td>{t.task_code || t.id}</td>
+              <td>{t.task_code || '—'}</td>
               <td className="task-title">{t.title}</td>
               <td><span className="badge" style={{ backgroundColor: statusColors[t.status] || '#ccc' }}>{t.status}</span></td>
               <td><span className={`badge priority-${t.priority}`}>{t.priority}</span></td>

src/pages/UsersPage.tsx

@@ -1,6 +1,7 @@
 import { useEffect, useMemo, useState } from 'react'
 import api from '@/services/api'
 import { useAuth } from '@/hooks/useAuth'
+import { useAuthConfig } from '@/hooks/useAuthConfig'
 import type { User } from '@/types'
 
 interface RoleOption {
@@ -16,8 +17,13 @@ interface ApiKeyPerms {
 
 export default function UsersPage() {
   const { user } = useAuth()
+  const { config: authCfg } = useAuthConfig()
+  const oidcOnly = authCfg.oidcOnly
+  const oidcEnabled = authCfg.oidcEnabled
   const isAdmin = user?.is_admin === true
 
+  const [bindForm, setBindForm] = useState({ issuer: '', subject: '' })
+
   const [users, setUsers] = useState<User[]>([])
   const [roles, setRoles] = useState<RoleOption[]>([])
   const [loading, setLoading] = useState(true)
@@ -105,17 +111,20 @@ export default function UsersPage() {
   }
 
   const handleCreateUser = async () => {
-    if (!createForm.username.trim() || !createForm.email.trim() || !createForm.password.trim()) return
+    if (!createForm.username.trim() || !createForm.email.trim()) return
+    if (!oidcOnly && !createForm.password.trim()) return
     setSaving(true)
     setMessage('')
     try {
-      const payload = {
+      const payload: Record<string, any> = {
         username: createForm.username.trim(),
         email: createForm.email.trim(),
         full_name: createForm.full_name.trim() || null,
-        password: createForm.password,
         role_id: createForm.role_id ? Number(createForm.role_id) : undefined,
       }
+      if (!oidcOnly) {
+        payload.password = createForm.password
+      }
       const { data } = await api.post<User>('/users', payload)
       const guestRole = roles.find((r) => r.name === 'guest') ?? roles[0]
       setCreateForm({
@@ -201,6 +210,42 @@ export default function UsersPage() {
     }
   }
 
+  const handleBindOidc = async () => {
+    if (!selectedUser) return
+    if (!bindForm.issuer.trim() || !bindForm.subject.trim()) return
+    setSaving(true)
+    setMessage('')
+    try {
+      await api.put(`/users/${selectedUser.id}/oidc-binding`, {
+        issuer: bindForm.issuer.trim(),
+        subject: bindForm.subject.trim(),
+      })
+      setBindForm({ issuer: '', subject: '' })
+      setMessage('OIDC identity bound successfully')
+      await fetchData()
+    } catch (err: any) {
+      setMessage(err.response?.data?.detail || 'Failed to bind OIDC identity')
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  const handleUnbindOidc = async () => {
+    if (!selectedUser) return
+    if (!confirm(`Remove the OIDC binding for ${selectedUser.username}?`)) return
+    setSaving(true)
+    setMessage('')
+    try {
+      await api.delete(`/users/${selectedUser.id}/oidc-binding`)
+      setMessage('OIDC binding removed')
+      await fetchData()
+    } catch (err: any) {
+      setMessage(err.response?.data?.detail || 'Failed to remove OIDC binding')
+    } finally {
+      setSaving(false)
+    }
+  }
+
   if (loading) return <div className="loading">Loading users...</div>
 
   if (!isAdmin) {
@@ -251,10 +296,15 @@ export default function UsersPage() {
               Full Name
               <input value={createForm.full_name} onChange={(e) => setCreateForm({ ...createForm, full_name: e.target.value })} />
             </label>
-            <label>
+            {!oidcOnly && (
-              Password
+              <label>
-              <input type="password" value={createForm.password} onChange={(e) => setCreateForm({ ...createForm, password: e.target.value })} />
+                Password
-            </label>
+                <input type="password" value={createForm.password} onChange={(e) => setCreateForm({ ...createForm, password: e.target.value })} />
+              </label>
+            )}
+            {oidcOnly && (
+              <p className="text-dim">OIDC-only mode: users are created without a password and sign in via a bound OIDC identity.</p>
+            )}
             <label>
               Role
               <select value={createForm.role_id} onChange={(e) => setCreateForm({ ...createForm, role_id: e.target.value })}>
@@ -264,7 +314,7 @@ export default function UsersPage() {
                 ))}
               </select>
             </label>
-            <button className="btn-primary" disabled={saving || !createForm.username.trim() || !createForm.email.trim() || !createForm.password.trim() || !createForm.role_id} onClick={handleCreateUser}>
+            <button className="btn-primary" disabled={saving || !createForm.username.trim() || !createForm.email.trim() || (!oidcOnly && !createForm.password.trim()) || !createForm.role_id} onClick={handleCreateUser}>
               {saving ? 'Saving...' : 'Create User'}
             </button>
           </div>
@@ -326,10 +376,12 @@ export default function UsersPage() {
                   Full Name
                   <input value={editForm.full_name} onChange={(e) => setEditForm({ ...editForm, full_name: e.target.value })} />
                 </label>
-                <label>
+                {!oidcOnly && (
-                  Reset Password
+                  <label>
-                  <input type="password" placeholder="Leave blank to keep current password" value={editForm.password} onChange={(e) => setEditForm({ ...editForm, password: e.target.value })} />
+                    Reset Password
-                </label>
+                    <input type="password" placeholder="Leave blank to keep current password" value={editForm.password} onChange={(e) => setEditForm({ ...editForm, password: e.target.value })} />
+                  </label>
+                )}
 
                 <div style={{ marginTop: '8px', padding: '12px', border: '1px solid var(--border)', borderRadius: '8px' }}>
                   <div style={{ fontWeight: 600, marginBottom: '10px' }}>Role</div>
@@ -381,6 +433,36 @@ export default function UsersPage() {
                     )}
                   </div>
                 )}
+
+                {oidcEnabled && (
+                  <div style={{ marginTop: '8px', padding: '12px', border: '1px solid var(--border)', borderRadius: '8px' }}>
+                    <div style={{ fontWeight: 600, marginBottom: '10px' }}>OIDC Binding</div>
+                    {selectedUser.oidc_subject ? (
+                      <div style={{ marginBottom: 10 }}>
+                        <div className="text-dim" style={{ fontFamily: 'monospace', wordBreak: 'break-all' }}>
+                          issuer: {selectedUser.oidc_issuer || '—'}<br />
+                          subject: {selectedUser.oidc_subject}
+                        </div>
+                        <button className="btn-danger" style={{ marginTop: 10 }} disabled={saving} onClick={handleUnbindOidc}>
+                          Unbind OIDC identity
+                        </button>
+                      </div>
+                    ) : (
+                      <div className="text-dim" style={{ marginBottom: 10 }}>No OIDC identity bound.</div>
+                    )}
+                    <label>
+                      Issuer
+                      <input value={bindForm.issuer} placeholder="https://idp.example.com" onChange={(e) => setBindForm({ ...bindForm, issuer: e.target.value })} />
+                    </label>
+                    <label>
+                      Subject (sub)
+                      <input value={bindForm.subject} placeholder="OIDC subject claim" onChange={(e) => setBindForm({ ...bindForm, subject: e.target.value })} />
+                    </label>
+                    <button className="btn-secondary" style={{ marginTop: 10 }} disabled={saving || !bindForm.issuer.trim() || !bindForm.subject.trim()} onClick={handleBindOidc}>
+                      {selectedUser.oidc_subject ? 'Rebind OIDC identity' : 'Bind OIDC identity'}
+                    </button>
+                  </div>
+                )}
               </div>
             </>
           ) : (

src/runtime.ts

@@ -0,0 +1,23 @@
+// Runtime config injected by the container entrypoint into
+// /runtime-config.js (from the deploy-time HARBORFORGE_OIDC_ONLY env).
+// Available before the backend exists — used by the setup wizard.
+declare global {
+  interface Window {
+    __HF_RUNTIME__?: { oidc_only?: boolean; logo_url?: string }
+  }
+}
+
+/** true/false from the injected runtime config, or null when unknown. */
+export function getRuntimeOidcOnly(): boolean | null {
+  const v = typeof window !== 'undefined' ? window.__HF_RUNTIME__?.oidc_only : undefined
+  return typeof v === 'boolean' ? v : null
+}
+
+/** Brand logo URL: deploy-time override (HARBORFORGE_LOGO_URL) or the
+ *  bundled default at /logo.svg. */
+export function getLogoUrl(): string {
+  const u = typeof window !== 'undefined' ? window.__HF_RUNTIME__?.logo_url : undefined
+  return (typeof u === 'string' && u) ? u : '/logo.svg'
+}
+
+export {}

src/services/api.ts

@@ -1,15 +1,15 @@
 import axios from 'axios'
 
-const getApiBase = () => {
+// Backend URL is the build-time VITE_HF_BACKEND_BASE_URL baked into the
-  return localStorage.getItem('HF_BACKEND_BASE_URL') || import.meta.env.VITE_API_BASE || 'http://127.0.0.1:8000'
+// bundle by docker build --build-arg. Empty → axios uses same-origin
-}
+// (only works in dev with the Vite proxy).
+const API_BASE = import.meta.env.VITE_HF_BACKEND_BASE_URL || undefined
 
 const api = axios.create({
-  baseURL: getApiBase(),
+  baseURL: API_BASE,
 })
 
 api.interceptors.request.use((config) => {
-  config.baseURL = getApiBase()
   const token = localStorage.getItem('token')
   if (token) {
     config.headers.Authorization = `Bearer ${token}`

src/test/calendar.test.tsx

@@ -0,0 +1,317 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
+import { render, screen, waitFor, fireEvent, cleanup } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import CalendarPage from '@/pages/CalendarPage'
+
+const mockGet = vi.fn()
+const mockPost = vi.fn()
+
+vi.mock('@/services/api', () => ({
+  default: {
+    get: (...args: any[]) => mockGet(...args),
+    post: (...args: any[]) => mockPost(...args),
+  },
+}))
+
+type Slot = {
+  slot_id: string
+  date: string
+  slot_type: 'work' | 'on_call' | 'entertainment' | 'system'
+  estimated_duration: number
+  scheduled_at: string
+  started_at: string | null
+  attended: boolean
+  actual_duration: number | null
+  event_type: 'job' | 'entertainment' | 'system_event' | null
+  event_data: Record<string, any> | null
+  priority: number
+  status: 'not_started' | 'ongoing' | 'deferred' | 'skipped' | 'paused' | 'finished' | 'aborted'
+  plan_id: number | null
+  is_virtual: boolean
+  created_at: string | null
+  updated_at: string | null
+}
+
+type Plan = {
+  id: number
+  slot_type: 'work' | 'on_call' | 'entertainment' | 'system'
+  estimated_duration: number
+  event_type: string | null
+  event_data: Record<string, any> | null
+  at_time: string
+  on_day: string | null
+  on_week: number | null
+  on_month: string | null
+  is_active: boolean
+  created_at: string
+  updated_at: string | null
+}
+
+const slots: Slot[] = [
+  {
+    slot_id: '1',
+    date: '2026-04-01',
+    slot_type: 'work',
+    estimated_duration: 25,
+    scheduled_at: '09:00',
+    started_at: null,
+    attended: false,
+    actual_duration: null,
+    event_type: 'job',
+    event_data: { type: 'Task', code: 'TASK-1' },
+    priority: 50,
+    status: 'not_started',
+    plan_id: null,
+    is_virtual: false,
+    created_at: '2026-04-01T00:00:00Z',
+    updated_at: '2026-04-01T00:00:00Z',
+  },
+  {
+    slot_id: 'plan-5-2026-04-01',
+    date: '2026-04-01',
+    slot_type: 'on_call',
+    estimated_duration: 30,
+    scheduled_at: '14:00',
+    started_at: null,
+    attended: false,
+    actual_duration: null,
+    event_type: null,
+    event_data: null,
+    priority: 70,
+    status: 'deferred',
+    plan_id: 5,
+    is_virtual: true,
+    created_at: null,
+    updated_at: null,
+  },
+]
+
+const plans: Plan[] = [
+  {
+    id: 5,
+    slot_type: 'on_call',
+    estimated_duration: 30,
+    event_type: null,
+    event_data: null,
+    at_time: '14:00',
+    on_day: 'Mon',
+    on_week: null,
+    on_month: null,
+    is_active: true,
+    created_at: '2026-03-01T00:00:00Z',
+    updated_at: null,
+  },
+  {
+    id: 6,
+    slot_type: 'work',
+    estimated_duration: 50,
+    event_type: 'system_event',
+    event_data: { event: 'ScheduleToday' },
+    at_time: '08:00',
+    on_day: 'Tue',
+    on_week: 1,
+    on_month: null,
+    is_active: false,
+    created_at: '2026-03-01T00:00:00Z',
+    updated_at: null,
+  },
+]
+
+function setupApi(options?: {
+  slots?: Slot[]
+  plans?: Plan[]
+  dayError?: string
+  postImpl?: (url: string, payload?: any) => any
+}) {
+  const currentSlots = options?.slots ?? slots
+  const currentPlans = options?.plans ?? plans
+
+  mockGet.mockImplementation((url: string) => {
+    if (url.startsWith('/calendar/day')) {
+      if (options?.dayError) {
+        return Promise.reject({ response: { data: { detail: options.dayError } } })
+      }
+      return Promise.resolve({ data: currentSlots })
+    }
+    if (url === '/calendar/plans') {
+      return Promise.resolve({ data: currentPlans })
+    }
+    return Promise.reject(new Error(`Unhandled GET ${url}`))
+  })
+
+  mockPost.mockImplementation((url: string, payload?: any) => {
+    if (options?.postImpl) return options.postImpl(url, payload)
+    return Promise.resolve({ data: {} })
+  })
+}
+
+describe('CalendarPage', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    setupApi()
+    vi.spyOn(window, 'confirm').mockReturnValue(true)
+  })
+
+  afterEach(() => {
+    cleanup()
+    vi.restoreAllMocks()
+  })
+
+  it('renders daily slots, deferred notice, and virtual-plan badge', async () => {
+    render(<CalendarPage />)
+
+    expect(await screen.findByText('09:00')).toBeInTheDocument()
+    expect(screen.getByText('14:00')).toBeInTheDocument()
+    expect(screen.getAllByText(/deferred/i).length).toBeGreaterThan(0)
+    expect(screen.getByText(/agent unavailability/i)).toBeInTheDocument()
+    expect(screen.getByText(/TASK-1/i)).toBeInTheDocument()
+    expect(screen.getByText(/^plan$/i)).toBeInTheDocument()
+    expect(screen.getByText(/Priority: 50/i)).toBeInTheDocument()
+  })
+
+  it('renders plans tab content', async () => {
+    render(<CalendarPage />)
+
+    await screen.findByText('09:00')
+    await userEvent.click(screen.getByRole('button', { name: /Plans \(2\)/i }))
+
+    expect(await screen.findByText(/Plan #5/i)).toBeInTheDocument()
+    expect(screen.getByText(/Plan #6/i)).toBeInTheDocument()
+    expect(screen.getByText(/at 14:00 · on Mon/i)).toBeInTheDocument()
+    expect(screen.getByText(/inactive/i)).toBeInTheDocument()
+  })
+
+  it('opens create modal and toggles event-specific fields', async () => {
+    render(<CalendarPage />)
+
+    await screen.findByText('09:00')
+    await userEvent.click(screen.getByRole('button', { name: /\+ New Slot/i }))
+
+    expect(screen.getByRole('heading', { name: /New Slot/i })).toBeInTheDocument()
+
+    const selects = screen.getAllByRole('combobox')
+    const eventTypeSelect = selects[1]
+
+    fireEvent.change(eventTypeSelect, { target: { value: 'job' } })
+    expect(screen.getByLabelText(/Job Code/i)).toBeInTheDocument()
+
+    fireEvent.change(eventTypeSelect, { target: { value: 'system_event' } })
+    expect(screen.getByLabelText(/System Event/i)).toBeInTheDocument()
+  })
+
+  it('submits new slot and displays workload warnings', async () => {
+    setupApi({
+      postImpl: (url: string) => {
+        if (url === '/calendar/schedule') {
+          return Promise.resolve({
+            data: {
+              slot: slots[0],
+              warnings: [
+                {
+                  period: 'daily',
+                  slot_type: 'work',
+                  current: 25,
+                  minimum: 120,
+                  message: 'Daily work minimum not met',
+                },
+              ],
+            },
+          })
+        }
+        return Promise.resolve({ data: {} })
+      },
+    })
+
+    render(<CalendarPage />)
+
+    await screen.findByText('09:00')
+    await userEvent.click(screen.getByRole('button', { name: /\+ New Slot/i }))
+    await userEvent.click(screen.getByRole('button', { name: /^Save$/i }))
+
+    await waitFor(() => {
+      expect(mockPost).toHaveBeenCalledWith(
+        '/calendar/schedule',
+        expect.objectContaining({
+          slot_type: 'work',
+          scheduled_at: '09:00',
+          estimated_duration: 25,
+          priority: 50,
+          date: '2026-04-01',
+        }),
+      )
+    })
+
+    expect(await screen.findByText(/Workload Warnings/i)).toBeInTheDocument()
+    expect(screen.getByText(/Daily work minimum not met/i)).toBeInTheDocument()
+  })
+
+  it('shows overlap error when save fails with overlap detail', async () => {
+    setupApi({
+      postImpl: (url: string) => {
+        if (url === '/calendar/schedule') {
+          return Promise.reject({
+            response: { data: { detail: 'Slot overlap with existing slot at 09:00' } },
+          })
+        }
+        return Promise.resolve({ data: {} })
+      },
+    })
+
+    render(<CalendarPage />)
+
+    await screen.findByText('09:00')
+    await userEvent.click(screen.getByRole('button', { name: /\+ New Slot/i }))
+    await userEvent.click(screen.getByRole('button', { name: /^Save$/i }))
+
+    expect(await screen.findByText(/Overlap conflict/i)).toBeInTheDocument()
+  })
+
+  it('opens edit modal with existing slot values and submits edit request', async () => {
+    setupApi({
+      postImpl: (url: string) => {
+        if (url.startsWith('/calendar/edit')) {
+          return Promise.resolve({ data: { slot: slots[0], warnings: [] } })
+        }
+        return Promise.resolve({ data: {} })
+      },
+    })
+
+    render(<CalendarPage />)
+
+    await screen.findByText('09:00')
+    await userEvent.click(screen.getAllByRole('button', { name: /✏️ Edit/i })[0])
+
+    expect(screen.getByRole('heading', { name: /Edit Slot/i })).toBeInTheDocument()
+    expect((screen.getAllByRole('combobox')[0] as HTMLSelectElement).value).toBe('work')
+    expect((document.querySelector('input[type="time"]') as HTMLInputElement).value).toBe('09:00')
+
+    await userEvent.click(screen.getByRole('button', { name: /^Save$/i }))
+
+    await waitFor(() => {
+      expect(mockPost).toHaveBeenCalledWith(
+        expect.stringContaining('/calendar/edit?date=2026-04-01&slot_id=1'),
+        expect.objectContaining({ slot_type: 'work' }),
+      )
+    })
+  })
+
+  it('cancels a slot after confirmation', async () => {
+    render(<CalendarPage />)
+
+    await screen.findByText('09:00')
+    await userEvent.click(screen.getAllByRole('button', { name: /❌ Cancel/i })[0])
+
+    await waitFor(() => {
+      expect(window.confirm).toHaveBeenCalled()
+      expect(mockPost).toHaveBeenCalledWith('/calendar/cancel?date=2026-04-01&slot_id=1')
+    })
+  })
+
+  it('shows fetch error banner when day loading fails', async () => {
+    setupApi({ dayError: 'Failed to load calendar' })
+
+    render(<CalendarPage />)
+
+    expect(await screen.findByText(/Failed to load calendar/i)).toBeInTheDocument()
+  })
+})

src/test/proposal-essential.test.tsx

@@ -0,0 +1,525 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
+import { render, screen, waitFor, fireEvent, cleanup } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import ProposalDetailPage from '@/pages/ProposalDetailPage'
+import { MemoryRouter, Routes, Route } from 'react-router-dom'
+
+const mockGet = vi.fn()
+const mockPost = vi.fn()
+const mockPatch = vi.fn()
+const mockDelete = vi.fn()
+
+vi.mock('@/services/api', () => ({
+  default: {
+    get: (...args: any[]) => mockGet(...args),
+    post: (...args: any[]) => mockPost(...args),
+    patch: (...args: any[]) => mockPatch(...args),
+    delete: (...args: any[]) => mockDelete(...args),
+  },
+}))
+
+const mockNavigate = vi.fn()
+vi.mock('react-router-dom', async () => {
+  const actual = await vi.importActual('react-router-dom')
+  return {
+    ...actual,
+    useNavigate: () => mockNavigate,
+    useParams: () => ({ id: '1' }),
+    useSearchParams: () => [new URLSearchParams('?project_id=1'), vi.fn()],
+  }
+})
+
+type Essential = {
+  id: number
+  essential_code: string
+  proposal_id: number
+  type: 'feature' | 'improvement' | 'refactor'
+  title: string
+  description: string | null
+  created_by_id: number | null
+  created_at: string
+  updated_at: string | null
+}
+
+type Proposal = {
+  id: number
+  proposal_code: string | null
+  title: string
+  description: string | null
+  status: 'open' | 'accepted' | 'rejected'
+  project_id: number
+  created_by_id: number | null
+  created_by_username: string | null
+  feat_task_id: string | null
+  essentials: Essential[] | null
+  generated_tasks: any[] | null
+  created_at: string
+  updated_at: string | null
+}
+
+type Milestone = {
+  id: number
+  title: string
+  status: 'open' | 'freeze' | 'undergoing' | 'completed' | 'closed'
+}
+
+const mockProposal: Proposal = {
+  id: 1,
+  proposal_code: 'PROP-001',
+  title: 'Test Proposal',
+  description: 'Test description',
+  status: 'open',
+  project_id: 1,
+  created_by_id: 1,
+  created_by_username: 'admin',
+  feat_task_id: null,
+  essentials: [],
+  generated_tasks: null,
+  created_at: '2026-03-01T00:00:00Z',
+  updated_at: null,
+}
+
+const mockEssentials: Essential[] = [
+  {
+    id: 1,
+    essential_code: 'ESS-001',
+    proposal_id: 1,
+    type: 'feature',
+    title: 'Feature Essential',
+    description: 'A feature essential',
+    created_by_id: 1,
+    created_at: '2026-03-01T00:00:00Z',
+    updated_at: null,
+  },
+  {
+    id: 2,
+    essential_code: 'ESS-002',
+    proposal_id: 1,
+    type: 'improvement',
+    title: 'Improvement Essential',
+    description: null,
+    created_by_id: 1,
+    created_at: '2026-03-01T00:00:00Z',
+    updated_at: null,
+  },
+]
+
+const mockMilestones: Milestone[] = [
+  { id: 1, title: 'Milestone 1', status: 'open' },
+  { id: 2, title: 'Milestone 2', status: 'open' },
+]
+
+function setupApi(options?: {
+  proposal?: Proposal
+  essentials?: Essential[]
+  milestones?: Milestone[]
+  error?: string
+}) {
+  const proposal = options?.proposal ?? mockProposal
+  const essentials = options?.essentials ?? mockEssentials
+  const milestones = options?.milestones ?? mockMilestones
+
+  mockGet.mockImplementation((url: string) => {
+    if (url.includes('/proposals/1') && !url.includes('/essentials')) {
+      if (options?.error) {
+        return Promise.reject({ response: { data: { detail: options.error } } })
+      }
+      return Promise.resolve({ data: proposal })
+    }
+    if (url.includes('/essentials')) {
+      return Promise.resolve({ data: essentials })
+    }
+    if (url.includes('/milestones')) {
+      return Promise.resolve({ data: milestones })
+    }
+    return Promise.reject(new Error(`Unhandled GET ${url}`))
+  })
+
+  mockPost.mockResolvedValue({ data: {} })
+  mockPatch.mockResolvedValue({ data: {} })
+  mockDelete.mockResolvedValue({ data: {} })
+}
+
+describe('ProposalDetailPage', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    setupApi()
+    vi.spyOn(window, 'confirm').mockReturnValue(true)
+  })
+
+  afterEach(() => {
+    cleanup()
+    vi.restoreAllMocks()
+  })
+
+  describe('Essential List Display', () => {
+    it('renders essentials section with count', async () => {
+      render(<ProposalDetailPage />)
+
+      await waitFor(() => {
+        expect(screen.getByText('Essentials (2)')).toBeInTheDocument()
+      })
+    })
+
+    it('displays essential cards with type badges', async () => {
+      render(<ProposalDetailPage />)
+
+      await waitFor(() => {
+        expect(screen.getByText('Feature Essential')).toBeInTheDocument()
+      })
+
+      expect(screen.getByText('Improvement Essential')).toBeInTheDocument()
+      expect(screen.getByText('feature')).toBeInTheDocument()
+      expect(screen.getByText('improvement')).toBeInTheDocument()
+    })
+
+    it('displays essential codes', async () => {
+      render(<ProposalDetailPage />)
+
+      await waitFor(() => {
+        expect(screen.getByText('ESS-001')).toBeInTheDocument()
+      })
+
+      expect(screen.getByText('ESS-002')).toBeInTheDocument()
+    })
+
+    it('displays essential descriptions when available', async () => {
+      render(<ProposalDetailPage />)
+
+      await waitFor(() => {
+        expect(screen.getByText('A feature essential')).toBeInTheDocument()
+      })
+    })
+
+    it('shows empty state when no essentials', async () => {
+      setupApi({ essentials: [] })
+      render(<ProposalDetailPage />)
+
+      await waitFor(() => {
+        expect(screen.getByText('Essentials (0)')).toBeInTheDocument()
+      })
+
+      expect(screen.getByText(/No essentials yet/)).toBeInTheDocument()
+      expect(screen.getByText(/Add one to define deliverables/)).toBeInTheDocument()
+    })
+
+    it('shows loading state for essentials', async () => {
+      mockGet.mockImplementation((url: string) => {
+        if (url.includes('/proposals/1') && !url.includes('/essentials')) {
+          return Promise.resolve({ data: mockProposal })
+        }
+        if (url.includes('/essentials')) {
+          return new Promise(() => {}) // Never resolve
+        }
+        return Promise.reject(new Error(`Unhandled GET ${url}`))
+      })
+
+      render(<ProposalDetailPage />)
+
+      await waitFor(() => {
+        expect(screen.getByText(/Loading/i)).toBeInTheDocument()
+      })
+    })
+  })
+
+  describe('Essential Create/Edit Forms', () => {
+    it('opens create essential modal', async () => {
+      render(<ProposalDetailPage />)
+
+      await waitFor(() => {
+        expect(screen.getByText('+ New Essential')).toBeInTheDocument()
+      })
+
+      await userEvent.click(screen.getByText('+ New Essential'))
+
+      expect(screen.getByRole('heading', { name: 'New Essential' })).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('Essential title')).toBeInTheDocument()
+      expect(screen.getByText('Feature')).toBeInTheDocument()
+      expect(screen.getByText('Improvement')).toBeInTheDocument()
+      expect(screen.getByText('Refactor')).toBeInTheDocument()
+    })
+
+    it('creates new essential', async () => {
+      render(<ProposalDetailPage />)
+
+      await waitFor(() => {
+        expect(screen.getByText('+ New Essential')).toBeInTheDocument()
+      })
+
+      await userEvent.click(screen.getByText('+ New Essential'))
+
+      await userEvent.type(screen.getByPlaceholderText('Essential title'), 'New Test Essential')
+      fireEvent.change(screen.getAllByRole('combobox')[0], { target: { value: 'refactor' } })
+      await userEvent.type(screen.getByPlaceholderText('Description (optional)'), 'Test description')
+
+      await userEvent.click(screen.getByRole('button', { name: 'Save' }))
+
+      await waitFor(() => {
+        expect(mockPost).toHaveBeenCalledWith(
+          '/projects/1/proposals/1/essentials',
+          expect.objectContaining({
+            title: 'New Test Essential',
+            type: 'refactor',
+            description: 'Test description',
+          })
+        )
+      })
+    })
+
+    it('opens edit essential modal with pre-filled data', async () => {
+      render(<ProposalDetailPage />)
+
+      await waitFor(() => {
+        expect(screen.getByText('Feature Essential')).toBeInTheDocument()
+      })
+
+      const editButtons = screen.getAllByRole('button', { name: 'Edit' })
+      await userEvent.click(editButtons[0])
+
+      expect(screen.getByRole('heading', { name: 'Edit Essential' })).toBeInTheDocument()
+
+      const titleInput = screen.getByDisplayValue('Feature Essential')
+      expect(titleInput).toBeInTheDocument()
+
+      const descriptionInput = screen.getByDisplayValue('A feature essential')
+      expect(descriptionInput).toBeInTheDocument()
+    })
+
+    it('updates essential', async () => {
+      render(<ProposalDetailPage />)
+
+      await waitFor(() => {
+        expect(screen.getByText('Feature Essential')).toBeInTheDocument()
+      })
+
+      const editButtons = screen.getAllByRole('button', { name: 'Edit' })
+      await userEvent.click(editButtons[0])
+
+      const titleInput = screen.getByDisplayValue('Feature Essential')
+      await userEvent.clear(titleInput)
+      await userEvent.type(titleInput, 'Updated Essential Title')
+
+      await userEvent.click(screen.getByRole('button', { name: 'Save' }))
+
+      await waitFor(() => {
+        expect(mockPatch).toHaveBeenCalledWith(
+          '/projects/1/proposals/1/essentials/1',
+          expect.objectContaining({
+            title: 'Updated Essential Title',
+            type: 'feature',
+            description: 'A feature essential',
+          })
+        )
+      })
+    })
+
+    it('deletes essential after confirmation', async () => {
+      render(<ProposalDetailPage />)
+
+      await waitFor(() => {
+        expect(screen.getByText('Feature Essential')).toBeInTheDocument()
+      })
+
+      const deleteButtons = screen.getAllByRole('button', { name: 'Delete' })
+      await userEvent.click(deleteButtons[0])
+
+      await waitFor(() => {
+        expect(window.confirm).toHaveBeenCalledWith('Are you sure you want to delete this Essential?')
+      })
+
+      await waitFor(() => {
+        expect(mockDelete).toHaveBeenCalledWith('/projects/1/proposals/1/essentials/1')
+      })
+    })
+
+    it('disables save button when title is empty', async () => {
+      render(<ProposalDetailPage />)
+
+      await waitFor(() => {
+        expect(screen.getByText('+ New Essential')).toBeInTheDocument()
+      })
+
+      await userEvent.click(screen.getByText('+ New Essential'))
+
+      const saveButton = screen.getByRole('button', { name: 'Save' })
+      expect(saveButton).toBeDisabled()
+
+      await userEvent.type(screen.getByPlaceholderText('Essential title'), 'Some Title')
+      expect(saveButton).toBeEnabled()
+
+      await userEvent.clear(screen.getByPlaceholderText('Essential title'))
+      expect(saveButton).toBeDisabled()
+    })
+  })
+
+  describe('Accept with Milestone Selection', () => {
+    it('opens accept modal with milestone selector', async () => {
+      render(<ProposalDetailPage />)
+
+      const acceptButton = await screen.findByRole('button', { name: /accept/i })
+      await userEvent.click(acceptButton)
+
+      expect(screen.getByRole('heading', { name: 'Accept Proposal' })).toBeInTheDocument()
+      expect(screen.getByText(/milestone to generate story tasks/i)).toBeInTheDocument()
+      expect(screen.getByRole('combobox')).toBeInTheDocument()
+    })
+
+    it('disables confirm button without milestone selection', async () => {
+      render(<ProposalDetailPage />)
+
+      const acceptButton = await screen.findByRole('button', { name: /accept/i })
+      await userEvent.click(acceptButton)
+
+      const confirmButton = screen.getByRole('button', { name: 'Confirm Accept' })
+      expect(confirmButton).toBeDisabled()
+    })
+
+    it('enables confirm button after milestone selection', async () => {
+      render(<ProposalDetailPage />)
+
+      const acceptButton = await screen.findByRole('button', { name: /accept/i })
+      await userEvent.click(acceptButton)
+
+      const select = screen.getByRole('combobox')
+      fireEvent.change(select, { target: { value: '1' } })
+
+      const confirmButton = screen.getByRole('button', { name: 'Confirm Accept' })
+      expect(confirmButton).toBeEnabled()
+    })
+
+    it('calls accept API with selected milestone', async () => {
+      render(<ProposalDetailPage />)
+
+      const acceptButton = await screen.findByRole('button', { name: /accept/i })
+      await userEvent.click(acceptButton)
+
+      const select = screen.getByRole('combobox')
+      fireEvent.change(select, { target: { value: '1' } })
+
+      await userEvent.click(screen.getByRole('button', { name: 'Confirm Accept' }))
+
+      await waitFor(() => {
+        expect(mockPost).toHaveBeenCalledWith(
+          '/projects/1/proposals/1/accept',
+          { milestone_id: 1 }
+        )
+      })
+    })
+
+    it('shows warning when no open milestones available', async () => {
+      setupApi({ milestones: [] })
+      render(<ProposalDetailPage />)
+
+      const acceptButton = await screen.findByRole('button', { name: /accept/i })
+      await userEvent.click(acceptButton)
+
+      expect(screen.getByText('No open milestones available.')).toBeInTheDocument()
+    })
+
+    it('displays generated tasks after accept', async () => {
+      const acceptedProposal: Proposal = {
+        ...mockProposal,
+        status: 'accepted',
+        generated_tasks: [
+          { task_id: 1, task_code: 'TASK-001', title: 'Story Task 1', task_type: 'story', task_subtype: 'feature' },
+          { task_id: 2, task_code: 'TASK-002', title: 'Story Task 2', task_type: 'story', task_subtype: 'improvement' },
+        ],
+      }
+      setupApi({ proposal: acceptedProposal })
+
+      render(<ProposalDetailPage />)
+
+      await waitFor(() => {
+        expect(screen.getByText('Generated Tasks')).toBeInTheDocument()
+      })
+
+      expect(screen.getByText('Story Task 1')).toBeInTheDocument()
+      expect(screen.getByText('Story Task 2')).toBeInTheDocument()
+      expect(screen.getByText('story/feature')).toBeInTheDocument()
+      expect(screen.getByText('story/improvement')).toBeInTheDocument()
+    })
+  })
+
+  describe('Story Creation Restriction UI', () => {
+    it('hides essential controls for accepted proposal', async () => {
+      const acceptedProposal: Proposal = {
+        ...mockProposal,
+        status: 'accepted',
+        essentials: mockEssentials,
+      }
+      setupApi({ proposal: acceptedProposal })
+
+      render(<ProposalDetailPage />)
+
+      await screen.findByText('Feature Essential')
+      expect(screen.queryByText('+ New Essential')).not.toBeInTheDocument()
+    })
+
+    it('hides edit/delete buttons for essentials when proposal is accepted', async () => {
+      const acceptedProposal: Proposal = {
+        ...mockProposal,
+        status: 'accepted',
+        essentials: mockEssentials,
+      }
+      setupApi({ proposal: acceptedProposal })
+
+      render(<ProposalDetailPage />)
+
+      await waitFor(() => {
+        expect(screen.getByText('Feature Essential')).toBeInTheDocument()
+      })
+
+      const deleteButtons = screen.queryAllByRole('button', { name: 'Delete' })
+      expect(deleteButtons.length).toBe(0)
+    })
+
+    it('hides edit/delete buttons for rejected proposal', async () => {
+      const rejectedProposal: Proposal = {
+        ...mockProposal,
+        status: 'rejected',
+        essentials: mockEssentials,
+      }
+      setupApi({ proposal: rejectedProposal })
+
+      render(<ProposalDetailPage />)
+
+      await screen.findByRole('button', { name: /reopen/i })
+      expect(screen.queryByText('+ New Essential')).not.toBeInTheDocument()
+    })
+  })
+
+  describe('Error Handling', () => {
+    it('displays error message on essential create failure', async () => {
+      mockPost.mockRejectedValue({ response: { data: { detail: 'Failed to create essential' } } })
+
+      render(<ProposalDetailPage />)
+
+      await waitFor(() => {
+        expect(screen.getByText('+ New Essential')).toBeInTheDocument()
+      })
+
+      await userEvent.click(screen.getByText('+ New Essential'))
+      await userEvent.type(screen.getByPlaceholderText('Essential title'), 'Test')
+      await userEvent.click(screen.getByRole('button', { name: 'Save' }))
+
+      await waitFor(() => {
+        expect(screen.getByText('Failed to create essential')).toBeInTheDocument()
+      })
+    })
+
+    it('displays error message on accept failure', async () => {
+      mockPost.mockRejectedValue({ response: { data: { detail: 'Accept failed: milestone required' } } })
+
+      render(<ProposalDetailPage />)
+
+      const acceptButton = await screen.findByRole('button', { name: /accept/i })
+      await userEvent.click(acceptButton)
+      fireEvent.change(screen.getByRole('combobox'), { target: { value: '1' } })
+      await userEvent.click(screen.getByRole('button', { name: 'Confirm Accept' }))
+
+      await waitFor(() => {
+        expect(screen.getByText('Accept failed: milestone required')).toBeInTheDocument()
+      })
+    })
+  })
+})

src/test/setup.ts

@@ -0,0 +1,64 @@
+import '@testing-library/jest-dom'
+import { vi } from 'vitest'
+
+// VITE_HF_BACKEND_BASE_URL is the build-time backend URL; in tests we
+// stub it via import.meta.env (api.ts + useAuthConfig + App read it).
+;(import.meta as any).env = {
+  ...(import.meta as any).env,
+  VITE_HF_BACKEND_BASE_URL: 'http://localhost:8000',
+}
+
+// Mock localStorage
+const localStorageMock = {
+  getItem: vi.fn((key: string) => {
+    if (key === 'token') return 'mock-token'
+    return null
+  }),
+  setItem: vi.fn(),
+  removeItem: vi.fn(),
+  clear: vi.fn(),
+}
+vi.stubGlobal('localStorage', localStorageMock)
+
+// Mock window.location
+Object.defineProperty(window, 'location', {
+  configurable: true,
+  value: Object.defineProperties({}, {
+  pathname: { value: '/calendar', writable: true },
+  href: { value: 'http://localhost/calendar', writable: true },
+  assign: { value: vi.fn(), writable: true },
+  replace: { value: vi.fn(), writable: true },
+  }) as any,
+})
+
+// Mock matchMedia
+Object.defineProperty(window, 'matchMedia', {
+  writable: true,
+  value: vi.fn().mockImplementation((query: string) => ({
+    matches: false,
+    media: query,
+    onchange: null,
+    addListener: vi.fn(),
+    removeListener: vi.fn(),
+    addEventListener: vi.fn(),
+    removeEventListener: vi.fn(),
+    dispatchEvent: vi.fn(),
+  })),
+})
+
+// Mock ResizeObserver
+class ResizeObserverMock {
+  observe() {}
+  unobserve() {}
+  disconnect() {}
+}
+vi.stubGlobal('ResizeObserver', ResizeObserverMock)
+
+// Mock IntersectionObserver
+class IntersectionObserverMock {
+  constructor() {}
+  observe() {}
+  unobserve() {}
+  disconnect() {}
+}
+vi.stubGlobal('IntersectionObserver', IntersectionObserverMock)

src/types/index.ts

@@ -7,6 +7,8 @@ export interface User {
   is_active: boolean
   role_id: number | null
   role_name: string | null
+  oidc_issuer?: string | null
+  oidc_subject?: string | null
   created_at: string
 }
 
@@ -24,6 +26,51 @@ export interface Project {
   created_at: string
 }
 
+export interface KnowledgeBase {
+  id: number
+  knowledge_base_code: string | null
+  title: string
+  description: string | null
+  created_by: number
+  created_at: string | null
+  last_updated_at: string | null
+}
+
+export interface KnowledgeFact {
+  id: number
+  category_id: number | null
+  topic_id: number
+  fact: string
+  last_updated_at: string | null
+}
+
+export interface KnowledgeCategoryNode {
+  id: number
+  name: string
+  parent: number | null
+  topic_id: number
+  description: string | null
+  categories: KnowledgeCategoryNode[]
+  facts: KnowledgeFact[]
+}
+
+export interface KnowledgeTopicNode {
+  id: number
+  topic: string
+  knowledge_base_id: number
+  description: string | null
+  categories: KnowledgeCategoryNode[]
+  facts: KnowledgeFact[]
+}
+
+export interface KnowledgeBaseTree {
+  id: number
+  knowledge_base_code: string | null
+  title: string
+  description: string | null
+  topics: KnowledgeTopicNode[]
+}
+
 export interface ProjectMember {
   id: number
   user_id: number
@@ -36,6 +83,8 @@ export interface ProjectMember {
 export interface Task {
   id: number
   task_code: string | null
+  project_code?: string | null
+  milestone_code?: string | null
   title: string
   description: string | null
   task_type: 'issue' | 'maintenance' | 'research' | 'review' | 'story' | 'test' | 'resolution'  // P7.1: 'task' removed
@@ -69,6 +118,7 @@ export interface Comment {
 export interface Milestone {
   id: number
   milestone_code: string | null
+  project_code?: string | null
   title: string
   description: string | null
   status: 'open' | 'freeze' | 'undergoing' | 'completed' | 'closed'
@@ -106,6 +156,7 @@ export interface Notification {
   message: string
   is_read: boolean
   task_id: number | null
+  task_code?: string | null
   created_at: string
 }
 
@@ -127,16 +178,44 @@ export interface DashboardStats {
   recent_tasks: Task[]
 }
 
-export interface Propose {
+export interface Proposal {
   id: number
-  propose_code: string | null
+  proposal_code: string | null
   title: string
   description: string | null
   status: 'open' | 'accepted' | 'rejected'
   project_id: number
+  project_code?: string | null
   created_by_id: number | null
   created_by_username: string | null
   feat_task_id: string | null
+  essentials: Essential[] | null
+  generated_tasks: GeneratedTask[] | null
+  created_at: string
+  updated_at: string | null
+}
+
+/** @deprecated Use Proposal instead */
+export type Propose = Proposal
+
+export interface GeneratedTask {
+  task_id: number
+  task_code: string | null
+  title: string
+  task_type: string
+  task_subtype: string | null
+}
+
+export type EssentialType = 'feature' | 'improvement' | 'refactor'
+
+export interface Essential {
+  id: number
+  essential_code: string
+  proposal_id: number
+  type: EssentialType
+  title: string
+  description: string | null
+  created_by_id: number | null
   created_at: string
   updated_at: string | null
 }

src/vite-env.d.ts

@@ -2,7 +2,14 @@
 
 interface ImportMetaEnv {
   readonly VITE_API_BASE: string
-  readonly VITE_WIZARD_PORT: string
+  /**
+   * Backend base URL baked in at build time (e.g.
+   * https://hf-api.example.com). Frontend uses this for all API calls.
+   * Passed to the Dockerfile as an ARG and forwarded to `npm run build`.
+   * Empty string falls back to same-origin (only useful in dev with the
+   * Vite proxy).
+   */
+  readonly VITE_HF_BACKEND_BASE_URL: string
 }
 
 interface ImportMeta {

vite.config.ts

@@ -19,4 +19,11 @@ export default defineConfig({
       },
     },
   },
+  test: {
+    globals: true,
+    environment: 'jsdom',
+    setupFiles: './src/test/setup.ts',
+    css: true,
+    include: ['src/test/**/*.test.{ts,tsx}'],
+  },
 })