Merge pull request 'fix(users): admin-gated /users routes accept api-key auth' (#23) from fix/users-require-admin-accept-apikey into main

Local `require_admin` in users.py depended on `get_current_user`, which
is OAuth2 JWT only. That made every admin-gated /users route (list, get,
patch update, bind-agent, etc.) reject api-key clients with 401 even when
the api-key resolves to an is_admin=True user.

Switch to `get_current_user_or_apikey` (the one in deps.py) so X-API-Key
and Bearer-as-apikey fallback both work. The admin gate itself still
reads User.is_admin — only the auth carrier broadens. Matches the auth
pattern schedule_type.py and other admin routes already use.

Surfaced when sherlock (agent-resource-director) tried `hf user list` for
the recruitment workflow Step 3 verify and got 401 "Could not validate
credentials" despite a valid provisioned api-key.

.env.example

@@ -1,11 +1,34 @@
-# HarborForge Environment Variables
+# HarborForge Backend Environment Variables (v0.4.0+ — wizard removed)
 
-# Database
+# --- Database (used by both the mysql container and the backend) -----------
 MYSQL_ROOT_PASSWORD=harborforge_root
 MYSQL_DATABASE=harborforge
 MYSQL_USER=harborforge
 MYSQL_PASSWORD=harborforge_pass
+# Full DSN used by the backend container. Default points to a service
+# named "mysql" on the same docker network. Override if your DB is elsewhere.
+DATABASE_URL=mysql+pymysql://harborforge:harborforge_pass@mysql:3306/harborforge
 
-# Application
+# --- Application ----------------------------------------------------------
+# Must be 32+ chars and not a placeholder; use: openssl rand -hex 32
 SECRET_KEY=change-me-use-openssl-rand-hex-32
 LOG_LEVEL=INFO
+
+# When true: password login is disabled, all sign-in goes through OIDC,
+# user creation ignores any password (passwordless users that can only
+# authenticate via OIDC binding or API keys). Frontend hides password UI.
+HARBORFORGE_OIDC_ONLY=false
+
+# --- Discord wakeup (optional; previously in wizard config) ---------------
+# Used by /agents/{id}/wakeup to spin a private Discord channel + DM.
+HARBORFORGE_DISCORD_GUILD_ID=
+HARBORFORGE_DISCORD_BOT_TOKEN=
+
+# --- OIDC issuer / client_id / client_secret / redirect_uri ---------------
+# NOT env vars in v0.4.0+. Configure via:
+#   docker exec hf-backend hf-cli config oidc \
+#     --issuer https://login.example.com/realms/foo \
+#     --client-id harborforge --client-secret <s> \
+#     --redirect-uri https://hf-api.example.com/auth/oidc/callback \
+#     --post-login-redirect https://hf.example.com/oidc/callback \
+#     --enabled true

Dockerfile

@@ -42,6 +42,12 @@ COPY requirements.txt ./
 COPY entrypoint.sh .
 RUN chmod +x entrypoint.sh
 
+# Install hf-cli as a /usr/local/bin shim that re-enters the app package
+# (so `docker exec hf-backend hf-cli admin create-user ...` works). The
+# CLI reads the same DATABASE_URL / SECRET_KEY env as the backend.
+RUN printf '#!/bin/sh\nexec python -m app.cli "$@"\n' > /usr/local/bin/hf-cli && \
+    chmod +x /usr/local/bin/hf-cli
+
 # OIDC-only mode: when "true", password login is rejected, user creation
 # ignores passwords (passwordless users that sign in via a bound OIDC
 # identity / API keys). Overridable at runtime via the same env var.

app/api/deps.py

@@ -59,22 +59,43 @@ async def get_current_user(token: str = Depends(oauth2_scheme), db: Session = De
     return user
 
 
+def _lookup_api_key(db: Session, key: str) -> models.User | None:
+    """Resolve an API key string to a User; mark last_used_at on hit."""
+    if not key:
+        return None
+    key_obj = db.query(APIKey).filter(APIKey.key == key, APIKey.is_active == True).first()  # noqa: E712
+    if not key_obj:
+        return None
+    key_obj.last_used_at = datetime.utcnow()
+    db.commit()
+    return db.query(models.User).filter(models.User.id == key_obj.user_id).first()
+
+
 async def get_current_user_or_apikey(
     token: str = Depends(oauth2_scheme),
     api_key: str = Depends(apikey_header),
     db: Session = Depends(get_db)
 ):
-    """Authenticate via JWT token OR API key."""
+    """Authenticate via JWT token (Authorization: Bearer <jwt>) OR API key
+    (X-API-Key: <key>, OR — as a convenience for CLI clients that only know
+    Bearer — Authorization: Bearer <api-key>; falls back when JWT decode fails).
+    """
+    # Native X-API-Key header
     if api_key:
-        key_obj = db.query(APIKey).filter(APIKey.key == api_key, APIKey.is_active == True).first()
-        if key_obj:
-            key_obj.last_used_at = datetime.utcnow()
-            db.commit()
-            user = db.query(models.User).filter(models.User.id == key_obj.user_id).first()
+        user = _lookup_api_key(db, api_key)
+        if user:
+            return user
+
+    # Bearer header — try JWT first, then API key on decode failure
+    if token:
+        try:
+            return await get_current_user(token=token, db=db)
+        except HTTPException:
+            user = _lookup_api_key(db, token)
             if user:
                 return user
-    if token:
-        return await get_current_user(token=token, db=db)
+            raise
+
     raise HTTPException(status_code=401, detail="Not authenticated")
 
 

app/api/routers/auth.py

@@ -11,7 +11,7 @@ from app.core.config import get_db, settings
 from app.models import models
 from app.models.role_permission import Permission, Role, RolePermission
 from app.schemas import schemas
-from app.api.deps import Token, verify_password, create_access_token, get_current_user
+from app.api.deps import Token, verify_password, create_access_token, get_current_user, get_current_user_or_apikey
 
 router = APIRouter(prefix="/auth", tags=["Auth"])
 
@@ -80,7 +80,7 @@ class PermissionIntrospectionResponse(BaseModel):
 
 @router.get("/me/permissions", response_model=PermissionIntrospectionResponse)
 async def get_my_permissions(
-    current_user: models.User = Depends(get_current_user),
+    current_user: models.User = Depends(get_current_user_or_apikey),
     db: Session = Depends(get_db),
 ):
     """Return the current user's effective permissions for CLI help introspection."""

app/api/routers/calendar.py

@@ -52,6 +52,7 @@ from app.schemas.calendar import (
 )
 from app.services.agent_heartbeat import get_pending_slots_for_agent
 from app.services.agent_status import (
+    AgentStatusError,
     record_heartbeat,
     transition_to_busy,
     transition_to_idle,
@@ -205,12 +206,14 @@ def create_slot(
             st.maintenance_from,
             st.maintenance_to,
         ):
+            mf_h, mf_m = divmod(st.maintenance_from, 60)
+            mt_h, mt_m = divmod(st.maintenance_to, 60)
             raise HTTPException(
                 status_code=422,
                 detail=(
                     f"slot at {payload.scheduled_at} duration {payload.estimated_duration}min "
                     f"intersects the maintenance window "
-                    f"{st.maintenance_from:02d}:00-{st.maintenance_to:02d}:00 UTC of "
+                    f"{mf_h:02d}:{mf_m:02d}-{mt_h:02d}:{mt_m:02d} UTC of "
                     f"schedule_type '{st.name}' — that window is admin-reserved"
                 ),
             )
@@ -341,22 +344,21 @@ def _require_agent(db: Session, agent_id: str, claw_identifier: str) -> Agent:
 def _scheduled_inside_window(
     scheduled_at,
     estimated_duration_minutes: int,
-    window_from_hour: int,
-    window_to_hour: int,
+    window_from_min: int,
+    window_to_min: int,
 ) -> bool:
-    """True if [scheduled_at, scheduled_at+duration] intersects [from:00, to:00].
+    """True if [scheduled_at, scheduled_at+duration] intersects [from, to).
 
-    Handles the 23→0 wrap case (window straddles UTC midnight).
+    Window bounds are minutes-since-UTC-midnight (0-1439). Handles the
+    case where the window crosses UTC midnight (e.g. 23:30→01:00).
     """
     start_min = scheduled_at.hour * 60 + scheduled_at.minute
     end_min = start_min + max(estimated_duration_minutes, 1)
-    win_start_min = window_from_hour * 60
-    win_end_min = window_to_hour * 60
-    if win_end_min > win_start_min:
+    if window_to_min > window_from_min:
         # normal same-day window
-        return start_min < win_end_min and end_min > win_start_min
-    # wrap-around: window = [from..24:00) ∪ [00:00..to)
-    return (start_min < 24 * 60 and end_min > win_start_min) or end_min > win_end_min
+        return start_min < window_to_min and end_min > window_from_min
+    # wrap-around: window = [from..1440) ∪ [0..to)
+    return (start_min < 1440 and end_min > window_from_min) or end_min > window_to_min
 
 
 # Admin-locked special slots accept only these agent-driven status
@@ -560,6 +562,29 @@ def agent_update_virtual_slot(
     return TimeSlotEditResponse(slot=_slot_to_response(slot), warnings=[])
 
 
+@router.get(
+    "/agent/status",
+    summary="Read an agent's current runtime status (no side effects)",
+)
+def get_agent_status(
+    agent_id: str = Query(..., description="Target agent_id"),
+    x_claw_identifier: str = Header(..., alias="X-Claw-Identifier"),
+    db: Session = Depends(get_db),
+):
+    """Return `{agent_id, status}` so callers (Fabric.OpenclawPlugin's
+    triage on-call gate, etc.) can decide whether the agent is currently
+    eligible without flipping their state.
+
+    No-op for unknown agents — returns 404 with `{detail: 'Agent not
+    found'}` so the caller can decide whether to fail-open or fail-closed.
+    """
+    agent = _require_agent(db, agent_id, x_claw_identifier)
+    return {
+        "agent_id": agent.agent_id,
+        "status": agent.status.value if hasattr(agent.status, 'value') else str(agent.status),
+    }
+
+
 @router.post(
     "/agent/status",
     summary="Update agent runtime status from plugin",
@@ -570,19 +595,31 @@ def update_agent_status(
 ):
     agent = _require_agent(db, payload.agent_id, payload.claw_identifier)
     target = (payload.status or '').lower().strip()
-    if target == AgentStatus.IDLE.value:
-        transition_to_idle(db, agent)
-    elif target == AgentStatus.BUSY.value:
-        transition_to_busy(db, agent, slot_type=SlotType.WORK)
-    elif target == AgentStatus.ON_CALL.value:
-        transition_to_busy(db, agent, slot_type=SlotType.ON_CALL)
-    elif target == AgentStatus.OFFLINE.value:
-        transition_to_offline(db, agent)
-    elif target == AgentStatus.EXHAUSTED.value:
-        reason = ExhaustReason.BILLING if payload.exhaust_reason == 'billing' else ExhaustReason.RATE_LIMIT
-        transition_to_exhausted(db, agent, reason=reason, recovery_at=payload.recovery_at)
-    else:
-        raise HTTPException(status_code=400, detail="Unsupported agent status")
+    # Idempotent same-state transition: a 'busy → busy' request is a
+    # no-op rather than a 500. Lets plugin status gates / cli `--set`
+    # be safe to fire-and-forget without first reading current state.
+    current = agent.status.value if hasattr(agent.status, 'value') else str(agent.status)
+    if current == target:
+        return {"ok": True, "agent_id": agent.agent_id, "status": current, "no_change": True}
+    try:
+        if target == AgentStatus.IDLE.value:
+            transition_to_idle(db, agent)
+        elif target == AgentStatus.BUSY.value:
+            transition_to_busy(db, agent, slot_type=SlotType.WORK)
+        elif target == AgentStatus.ON_CALL.value:
+            transition_to_busy(db, agent, slot_type=SlotType.ON_CALL)
+        elif target == AgentStatus.OFFLINE.value:
+            transition_to_offline(db, agent)
+        elif target == AgentStatus.EXHAUSTED.value:
+            reason = ExhaustReason.BILLING if payload.exhaust_reason == 'billing' else ExhaustReason.RATE_LIMIT
+            transition_to_exhausted(db, agent, reason=reason, recovery_at=payload.recovery_at)
+        else:
+            raise HTTPException(status_code=400, detail="Unsupported agent status")
+    except AgentStatusError as e:
+        # State-machine violation (e.g. busy → busy via wrong precondition)
+        # → 409 with the rejected transition explained, instead of a 500.
+        db.rollback()
+        raise HTTPException(status_code=409, detail=str(e))
     db.commit()
     return {"ok": True, "agent_id": agent.agent_id, "status": agent.status.value if hasattr(agent.status, 'value') else str(agent.status)}
 

app/api/routers/oidc.py

@@ -1,8 +1,11 @@
 """OIDC (OpenID Connect) login + admin-configurable provider settings.
 
-The OIDC provider can be configured at runtime from the admin UI
-(persisted in the oidc_settings table). A stored row's non-empty fields
-override the OIDC_* env vars; env values act as bootstrap defaults.
+Provider config (issuer / client_id / client_secret / redirect_uri /
+scopes / post_login_redirect / admin_role / enabled) lives entirely in
+the `oidc_settings` DB table (single row, id=1) and is set via either
+the admin UI or `docker exec hf-backend hf-cli config oidc ...`.
+HARBORFORGE_OIDC_ONLY is the only OIDC-related env var (deploy-time
+policy: when true, password login is disabled).
 
 Sign-in policy: an OIDC identity must already be bound to an hf user
 (see PUT /users/{id}/oidc-binding). Unbound identities are rejected.
@@ -51,27 +54,20 @@ class EffectiveOidc:
 
 
 def get_effective_oidc(db: Session) -> EffectiveOidc:
+    """DB row is the only source of truth — no env fallback. If the row is
+    absent OIDC is treated as unconfigured (login attempts will 503)."""
     row = db.query(OidcSettings).filter(OidcSettings.id == 1).first()
-
-    def pick(db_val, env_val):
-        return db_val if (db_val is not None and db_val != "") else env_val
-
     if row is None:
-        return EffectiveOidc(
-            settings.OIDC_ENABLED, settings.OIDC_ISSUER, settings.OIDC_CLIENT_ID,
-            settings.OIDC_CLIENT_SECRET, settings.OIDC_REDIRECT_URI,
-            settings.OIDC_SCOPES, settings.OIDC_POST_LOGIN_REDIRECT,
-            settings.OIDC_ADMIN_ROLE,
-        )
+        return EffectiveOidc(False, "", "", "", "", "", "", "admin")
     return EffectiveOidc(
         bool(row.enabled),
-        pick(row.issuer, settings.OIDC_ISSUER),
-        pick(row.client_id, settings.OIDC_CLIENT_ID),
-        pick(row.client_secret, settings.OIDC_CLIENT_SECRET),
-        pick(row.redirect_uri, settings.OIDC_REDIRECT_URI),
-        pick(row.scopes, settings.OIDC_SCOPES),
-        pick(row.post_login_redirect, settings.OIDC_POST_LOGIN_REDIRECT),
-        pick(getattr(row, "admin_role", None), settings.OIDC_ADMIN_ROLE),
+        row.issuer or "",
+        row.client_id or "",
+        row.client_secret or "",
+        row.redirect_uri or "",
+        row.scopes or "",
+        row.post_login_redirect or "",
+        getattr(row, "admin_role", None) or "admin",
     )
 
 
@@ -305,17 +301,17 @@ def get_oidc_settings(db: Session = Depends(get_db), _: models.User = Depends(_r
     row = db.query(OidcSettings).filter(OidcSettings.id == 1).first()
     cfg = get_effective_oidc(db)
     return OidcSettingsOut(
-        enabled=bool(row.enabled) if row else bool(settings.OIDC_ENABLED),
-        issuer=(row.issuer if row else None) or settings.OIDC_ISSUER or None,
-        client_id=(row.client_id if row else None) or settings.OIDC_CLIENT_ID or None,
-        has_client_secret=bool((row.client_secret if row else None) or settings.OIDC_CLIENT_SECRET),
-        redirect_uri=(row.redirect_uri if row else None) or settings.OIDC_REDIRECT_URI or None,
-        scopes=(row.scopes if row else None) or settings.OIDC_SCOPES or None,
-        post_login_redirect=(row.post_login_redirect if row else None) or settings.OIDC_POST_LOGIN_REDIRECT or None,
+        enabled=bool(row.enabled) if row else False,
+        issuer=(row.issuer if row else None) or None,
+        client_id=(row.client_id if row else None) or None,
+        has_client_secret=bool(row.client_secret if row else None),
+        redirect_uri=(row.redirect_uri if row else None) or None,
+        scopes=(row.scopes if row else None) or None,
+        post_login_redirect=(row.post_login_redirect if row else None) or None,
         admin_role=cfg.admin_role,
         oidc_only=bool(settings.HARBORFORGE_OIDC_ONLY),
         effective_enabled=cfg.configured,
-        source="db" if row else "env",
+        source="db",
     )
 
 

app/api/routers/projects.py

@@ -153,9 +153,27 @@ def _generate_project_code(db, name: str) -> str:
 
 @router.post("", response_model=schemas.ProjectResponse, status_code=status.HTTP_201_CREATED)
 def create_project(project: schemas.ProjectCreate, db: Session = Depends(get_db), current_user: models.User = Depends(get_current_user_or_apikey)):
-    # Check if user is admin
+    # Project creation is gated by the `project.create` global permission
+    # (admin auto-grants by virtue of is_admin). Any role granted that perm
+    # via the Role Editor can create projects.
     if not current_user.is_admin:
-        raise HTTPException(status_code=403, detail="Only admins can create projects")
+        from app.models.role_permission import Permission, RolePermission
+        has = (
+            db.query(Permission.id)
+            .join(RolePermission, RolePermission.permission_id == Permission.id)
+            .filter(
+                RolePermission.role_id == current_user.role_id,
+                Permission.name == "project.create",
+            )
+            .first()
+            if current_user.role_id
+            else None
+        )
+        if not has:
+            raise HTTPException(
+                status_code=403,
+                detail="Permission denied: project.create required",
+            )
     # Auto-fill owner_name from owner_id
     user = db.query(models.User).filter(models.User.id == project.owner_id).first()
     if not user:

app/api/routers/schedule_type.py

@@ -57,6 +57,18 @@ def _require_schedule_manage(db: Session, user: User) -> User:
     return user
 
 
+def _attach_derived(st: ScheduleType) -> ScheduleType:
+    """Attach derived fields (maintenance_duration_minutes) so the
+    pydantic ScheduleTypeResponse picks them up via from_attributes.
+
+    Pydantic with from_attributes reads attributes off the ORM object;
+    setting a transient attr here avoids having to convert through dict.
+    """
+    if st is not None:
+        st.maintenance_duration_minutes = st.compute_maintenance_duration()
+    return st
+
+
 # ---------------------------------------------------------------------------
 # Schedule Type CRUD
 # ---------------------------------------------------------------------------
@@ -71,7 +83,7 @@ def list_schedule_types(
     current_user: User = Depends(get_current_user_or_apikey),
 ):
     _require_schedule_read(db, current_user)
-    return db.query(ScheduleType).all()
+    return [_attach_derived(st) for st in db.query(ScheduleType).all()]
 
 
 @router.post(
@@ -96,11 +108,13 @@ def create_schedule_type(
         work_to=payload.work_to,
         entertainment_from=payload.entertainment_from,
         entertainment_to=payload.entertainment_to,
+        maintenance_from=payload.maintenance_from,
+        maintenance_to=payload.maintenance_to,
     )
     db.add(st)
     db.commit()
     db.refresh(st)
-    return st
+    return _attach_derived(st)
 
 
 @router.patch(
@@ -120,12 +134,23 @@ def update_schedule_type(
     if not st:
         raise HTTPException(404, "Schedule type not found")
 
-    for field, value in payload.model_dump(exclude_unset=True).items():
+    update_fields = payload.model_dump(exclude_unset=True)
+    for field, value in update_fields.items():
         setattr(st, field, value)
 
+    # Re-validate maintenance after merge (partial updates can put the row
+    # into an invalid window combo that the pydantic schema couldn't catch
+    # because it only saw one field).
+    from app.schemas.schedule_type import _validate_maintenance_window
+    try:
+        _validate_maintenance_window(st.maintenance_from, st.maintenance_to)
+    except ValueError as e:
+        db.rollback()
+        raise HTTPException(422, str(e))
+
     db.commit()
     db.refresh(st)
-    return st
+    return _attach_derived(st)
 
 
 @router.delete(
@@ -181,7 +206,8 @@ def get_my_schedule_type(
     if not agent.schedule_type_id:
         return None
 
-    return db.query(ScheduleType).filter(ScheduleType.id == agent.schedule_type_id).first()
+    st = db.query(ScheduleType).filter(ScheduleType.id == agent.schedule_type_id).first()
+    return _attach_derived(st) if st else None
 
 
 @router.put(

app/api/routers/schedule_type_special_slot.py

@@ -75,15 +75,17 @@ def _fetch_schedule_type(db: Session, schedule_type_id: int) -> ScheduleType:
 def _validate_fits_window(
     minute_in_window: int,
     estimated_duration: int,
+    maintenance_duration_minutes: int,
 ) -> None:
-    """Reject special slots that wouldn't fit inside the 1-hour window."""
-    if minute_in_window + estimated_duration > 60:
+    """Reject special slots that wouldn't fit inside the parent's maintenance window."""
+    if minute_in_window + estimated_duration > maintenance_duration_minutes:
         raise HTTPException(
             422,
             (
                 f"special slot does not fit in maintenance window: "
                 f"minute_in_window={minute_in_window} + "
-                f"estimated_duration={estimated_duration} > 60"
+                f"estimated_duration={estimated_duration} > "
+                f"maintenance window {maintenance_duration_minutes}min"
             ),
         )
 
@@ -127,8 +129,8 @@ def create_special_slot(
     current_user: User = Depends(get_current_user_or_apikey),
 ):
     _require_schedule_manage(db, current_user)
-    _fetch_schedule_type(db, schedule_type_id)
-    _validate_fits_window(payload.minute_in_window, payload.estimated_duration)
+    st = _fetch_schedule_type(db, schedule_type_id)
+    _validate_fits_window(payload.minute_in_window, payload.estimated_duration, st.compute_maintenance_duration())
 
     dup = (
         db.query(ScheduleTypeSpecialSlot)
@@ -188,7 +190,8 @@ def update_special_slot(
     update_fields = payload.model_dump(exclude_unset=True)
     next_min = update_fields.get("minute_in_window", slot.minute_in_window)
     next_dur = update_fields.get("estimated_duration", slot.estimated_duration)
-    _validate_fits_window(next_min, next_dur)
+    parent = _fetch_schedule_type(db, schedule_type_id)
+    _validate_fits_window(next_min, next_dur, parent.compute_maintenance_duration())
 
     for field, value in update_fields.items():
         setattr(slot, field, value)

app/api/routers/users.py

@@ -9,7 +9,7 @@ from sqlalchemy.orm import Session
 
 from app.api.deps import get_current_user, get_current_user_or_apikey, get_password_hash
 from app.core.config import get_db, settings
-from app.init_wizard import DELETED_USER_USERNAME
+from app.init_bootstrap import DELETED_USER_USERNAME
 from app.models import models
 from app.models.agent import Agent
 from app.models.role_permission import Permission, Role, RolePermission
@@ -39,7 +39,11 @@ def _user_response(user: models.User) -> dict:
     return data
 
 
-def require_admin(current_user: models.User = Depends(get_current_user)):
+def require_admin(current_user: models.User = Depends(get_current_user_or_apikey)):
+    # Accept either OAuth2 JWT or X-API-Key (incl. Bearer-as-apikey fallback)
+    # so CLI clients using their provisioned api-key can hit admin-gated user
+    # routes (list / get / update / patch). The admin gate still reads
+    # User.is_admin — only the auth carrier broadens.
     if not current_user.is_admin:
         raise HTTPException(status_code=403, detail="Admin required")
     return current_user
@@ -68,11 +72,29 @@ def require_account_creator(
     raise HTTPException(status_code=403, detail="Account creation permission required")
 
 
-def _resolve_user_role(db: Session, role_id: int | None) -> Role:
+def _resolve_user_role(db: Session, role_id: int | None, *, is_agent: bool = False) -> Role:
+    """Resolve target role for user creation.
+
+    Default policy when caller didn't pin role_id:
+      - is_agent (i.e. payload had agent_id/claw_identifier) → general-agent
+      - human user                                            → guest
+
+    general-agent ≈ guest + user.reset-self-apikey so agents can rotate
+    their own API key without admin intervention. Created in
+    init_bootstrap.py on every startup; falls back to guest if absent
+    (e.g. very old DB that hasn't been re-seeded yet).
+    """
     if role_id is None:
-        role = db.query(Role).filter(Role.name == "guest").first()
+        default_name = "general-agent" if is_agent else "guest"
+        role = db.query(Role).filter(Role.name == default_name).first()
+        if not role and is_agent:
+            # general-agent missing from this DB → fall back to guest, log warn
+            role = db.query(Role).filter(Role.name == "guest").first()
         if not role:
-            raise HTTPException(status_code=500, detail="Default guest role is missing")
+            raise HTTPException(
+                status_code=500,
+                detail=f"Default role '{default_name}' is missing (DB not seeded)",
+            )
         return role
 
     role = db.query(Role).filter(Role.id == role_id).first()
@@ -112,7 +134,7 @@ def create_user(
         if existing_agent:
             raise HTTPException(status_code=400, detail="agent_id already in use")
 
-    assigned_role = _resolve_user_role(db, user.role_id)
+    assigned_role = _resolve_user_role(db, user.role_id, is_agent=has_agent_id)
     # In OIDC-only mode, ignore any supplied password: the user is created
     # passwordless (cannot password-login) and is expected to sign in via a
     # bound OIDC identity. API keys still work for such users.
@@ -391,7 +413,7 @@ def delete_user(
     if not deleted_user:
         raise HTTPException(
             status_code=500,
-            detail="Built-in deleted-user account not found. Run init_wizard first.",
+            detail="Built-in deleted-user account not found. Backend startup failed to seed it; restart the container.",
         )
 
     _reassign_user_references(db, user.id, deleted_user.id)

app/cli/__init__.py

@@ -0,0 +1,10 @@
+"""hf-cli — operator commands run inside the backend container.
+
+Subjects:
+  admin   — bootstrap / manage the initial admin user
+  config  — runtime config (OIDC, etc.)
+
+Invoked via the shim at /usr/local/bin/hf-cli (Dockerfile-installed):
+  docker exec hf-backend hf-cli admin create-user --email me@example.com --password '...'
+  docker exec hf-backend hf-cli config oidc --issuer ... --client-id ... --enabled true
+"""

app/cli/__main__.py

@@ -0,0 +1,68 @@
+"""hf-cli entry point. Dispatches to subject-specific modules."""
+import sys
+
+
+def _load_all_models() -> None:
+    """Import every model module so SQLAlchemy's declarative registry
+    resolves cross-table relationships (e.g. User.role, User.agent).
+
+    main.py's startup() does the same thing for the web server; the CLI
+    skips startup() but still queries User → would otherwise hit
+    `KeyError: 'Agent'` when SA tries to resolve relationship targets.
+    Keep this list in sync with main.py's startup import list.
+    """
+    from app.models import (  # noqa: F401
+        models, webhook, apikey, activity, milestone, notification, worklog,
+        monitor, role_permission, task, support, meeting, proposal, propose,
+        essential, agent, calendar, minimum_workload, schedule_type,
+        schedule_type_special_slot, oidc_settings,
+    )
+
+
+_load_all_models()
+
+
+USAGE = """Usage:
+  hf-cli admin create-user --email <e> [--username <u>] [--full-name <n>]
+                           [--password <p>] [--oidc-issuer <url> --oidc-subject <sub>]
+  hf-cli admin list
+  hf-cli admin set-role  --username <u> --role <admin|mgr|dev|guest|account-manager>
+  hf-cli admin reset-password --username <u> --password <p>
+  hf-cli admin bind-oidc      --username <u> --oidc-issuer <url> --oidc-subject <sub>
+
+  hf-cli config oidc [--issuer <url>] [--client-id <id>] [--client-secret <s>]
+                     [--redirect-uri <url>] [--post-login-redirect <url>]
+                     [--scopes "openid email profile"] [--admin-role <role>]
+                     [--enabled true|false] [--show-secret]
+
+Reads DATABASE_URL + SECRET_KEY from the same env as the backend. Run
+inside the backend container: `docker exec hf-backend hf-cli ...`.
+"""
+
+
+def main() -> int:
+    args = sys.argv[1:]
+    if len(args) < 1:
+        sys.stderr.write(USAGE)
+        return 1
+
+    subject = args[0]
+    rest = args[1:]
+
+    if subject == "admin":
+        from app.cli import admin
+        return admin.dispatch(rest)
+    if subject == "config":
+        from app.cli import config
+        return config.dispatch(rest)
+    if subject in ("-h", "--help", "help"):
+        sys.stdout.write(USAGE)
+        return 0
+
+    sys.stderr.write(f"unknown subject: {subject}\n\n")
+    sys.stderr.write(USAGE)
+    return 1
+
+
+if __name__ == "__main__":
+    sys.exit(main())

app/cli/admin.py

@@ -0,0 +1,269 @@
+"""hf-cli admin … — bootstrap and manage the deployment's admin user."""
+import argparse
+import json
+import sys
+
+from sqlalchemy.exc import IntegrityError
+
+from app.api.deps import get_password_hash
+from app.core.config import SessionLocal, settings
+from app.models import models
+from app.models.role_permission import Role
+
+
+def _open_db():
+    return SessionLocal()
+
+
+def _emit(payload: dict) -> None:
+    sys.stdout.write(json.dumps(payload, indent=2) + "\n")
+
+
+# ---------------------------------------------------------------------------
+# create-user
+# ---------------------------------------------------------------------------
+def _cmd_create_user(argv: list[str]) -> int:
+    p = argparse.ArgumentParser(prog="hf-cli admin create-user")
+    p.add_argument("--email", required=True)
+    p.add_argument("--username", default=None,
+                   help="Defaults to email's local-part if omitted.")
+    p.add_argument("--full-name", default="Admin")
+    p.add_argument("--password", default=None,
+                   help="Required when HARBORFORGE_OIDC_ONLY=false. Ignored "
+                        "when OIDC_ONLY=true (use --oidc-issuer/--oidc-subject).")
+    p.add_argument("--oidc-issuer", default=None,
+                   help="Bind the new admin to this OIDC issuer at creation. "
+                        "Required in OIDC_ONLY mode for the bootstrap admin.")
+    p.add_argument("--oidc-subject", default=None,
+                   help="OIDC subject claim (sub) to bind the new admin to.")
+    args = p.parse_args(argv)
+
+    username = args.username or args.email.split("@", 1)[0]
+    oidc_only = bool(settings.HARBORFORGE_OIDC_ONLY)
+
+    if oidc_only:
+        if not (args.oidc_issuer and args.oidc_subject):
+            sys.stderr.write(
+                "HARBORFORGE_OIDC_ONLY=true: must pass --oidc-issuer and "
+                "--oidc-subject so the new admin can sign in.\n"
+            )
+            return 2
+        hashed_password = None
+    else:
+        if not args.password:
+            sys.stderr.write("--password is required when OIDC_ONLY is false.\n")
+            return 2
+        hashed_password = get_password_hash(args.password)
+
+    if (args.oidc_issuer and not args.oidc_subject) or (args.oidc_subject and not args.oidc_issuer):
+        sys.stderr.write("--oidc-issuer and --oidc-subject must be passed together.\n")
+        return 2
+
+    db = _open_db()
+    try:
+        existing = db.query(models.User).filter(models.User.username == username).first()
+        if existing:
+            sys.stderr.write(f"user '{username}' already exists (id={existing.id})\n")
+            return 3
+
+        admin_role = db.query(Role).filter(Role.name == "admin").first()
+        if not admin_role:
+            sys.stderr.write(
+                "admin role not found — backend startup seed should create it. "
+                "Restart the container then retry.\n"
+            )
+            return 4
+
+        user = models.User(
+            username=username,
+            email=args.email,
+            full_name=args.full_name,
+            hashed_password=hashed_password,
+            is_admin=True,
+            is_active=True,
+            role_id=admin_role.id,
+            oidc_issuer=(args.oidc_issuer or None),
+            oidc_subject=(args.oidc_subject or None),
+        )
+        db.add(user)
+        try:
+            db.commit()
+        except IntegrityError as e:
+            db.rollback()
+            sys.stderr.write(f"DB integrity error: {e.orig}\n")
+            return 5
+        db.refresh(user)
+
+        _emit({
+            "ok": True,
+            "created": True,
+            "user": {
+                "id": user.id,
+                "username": user.username,
+                "email": user.email,
+                "full_name": user.full_name,
+                "is_admin": user.is_admin,
+                "role_id": user.role_id,
+                "oidc_issuer": user.oidc_issuer,
+                "oidc_subject": user.oidc_subject,
+                "has_password": user.hashed_password is not None,
+            },
+        })
+        return 0
+    finally:
+        db.close()
+
+
+# ---------------------------------------------------------------------------
+# list
+# ---------------------------------------------------------------------------
+def _cmd_list(_argv: list[str]) -> int:
+    db = _open_db()
+    try:
+        admins = (
+            db.query(models.User)
+            .filter(models.User.is_admin == True)  # noqa: E712
+            .order_by(models.User.id.asc())
+            .all()
+        )
+        _emit({
+            "ok": True,
+            "count": len(admins),
+            "admins": [
+                {
+                    "id": u.id,
+                    "username": u.username,
+                    "email": u.email,
+                    "is_active": u.is_active,
+                    "oidc_bound": bool(u.oidc_issuer and u.oidc_subject),
+                    "has_password": u.hashed_password is not None,
+                }
+                for u in admins
+            ],
+        })
+        return 0
+    finally:
+        db.close()
+
+
+# ---------------------------------------------------------------------------
+# set-role
+# ---------------------------------------------------------------------------
+def _cmd_set_role(argv: list[str]) -> int:
+    p = argparse.ArgumentParser(prog="hf-cli admin set-role")
+    p.add_argument("--username", required=True)
+    p.add_argument("--role", required=True)
+    args = p.parse_args(argv)
+
+    db = _open_db()
+    try:
+        user = db.query(models.User).filter(models.User.username == args.username).first()
+        if not user:
+            sys.stderr.write(f"user '{args.username}' not found\n")
+            return 3
+        role = db.query(Role).filter(Role.name == args.role).first()
+        if not role:
+            sys.stderr.write(f"role '{args.role}' not found\n")
+            return 4
+        user.role_id = role.id
+        user.is_admin = (args.role == "admin")
+        db.commit()
+        _emit({
+            "ok": True,
+            "user": {"id": user.id, "username": user.username, "role": role.name, "is_admin": user.is_admin},
+        })
+        return 0
+    finally:
+        db.close()
+
+
+# ---------------------------------------------------------------------------
+# reset-password
+# ---------------------------------------------------------------------------
+def _cmd_reset_password(argv: list[str]) -> int:
+    p = argparse.ArgumentParser(prog="hf-cli admin reset-password")
+    p.add_argument("--username", required=True)
+    p.add_argument("--password", required=True)
+    args = p.parse_args(argv)
+
+    if settings.HARBORFORGE_OIDC_ONLY:
+        sys.stderr.write("HARBORFORGE_OIDC_ONLY=true: password login is disabled.\n")
+        return 2
+
+    db = _open_db()
+    try:
+        user = db.query(models.User).filter(models.User.username == args.username).first()
+        if not user:
+            sys.stderr.write(f"user '{args.username}' not found\n")
+            return 3
+        user.hashed_password = get_password_hash(args.password)
+        db.commit()
+        _emit({"ok": True, "user": {"id": user.id, "username": user.username, "password_reset": True}})
+        return 0
+    finally:
+        db.close()
+
+
+# ---------------------------------------------------------------------------
+# bind-oidc — attach an OIDC identity to an existing admin
+# ---------------------------------------------------------------------------
+def _cmd_bind_oidc(argv: list[str]) -> int:
+    p = argparse.ArgumentParser(prog="hf-cli admin bind-oidc")
+    p.add_argument("--username", required=True)
+    p.add_argument("--oidc-issuer", required=True)
+    p.add_argument("--oidc-subject", required=True)
+    args = p.parse_args(argv)
+
+    db = _open_db()
+    try:
+        user = db.query(models.User).filter(models.User.username == args.username).first()
+        if not user:
+            sys.stderr.write(f"user '{args.username}' not found\n")
+            return 3
+        clash = db.query(models.User).filter(
+            models.User.oidc_issuer == args.oidc_issuer,
+            models.User.oidc_subject == args.oidc_subject,
+            models.User.id != user.id,
+        ).first()
+        if clash:
+            sys.stderr.write(f"OIDC subject already bound to '{clash.username}' (id={clash.id})\n")
+            return 4
+        user.oidc_issuer = args.oidc_issuer
+        user.oidc_subject = args.oidc_subject
+        db.commit()
+        _emit({
+            "ok": True,
+            "user": {
+                "id": user.id,
+                "username": user.username,
+                "oidc_issuer": user.oidc_issuer,
+                "oidc_subject": user.oidc_subject,
+            },
+        })
+        return 0
+    finally:
+        db.close()
+
+
+# ---------------------------------------------------------------------------
+# dispatcher
+# ---------------------------------------------------------------------------
+ACTIONS = {
+    "create-user": _cmd_create_user,
+    "list": _cmd_list,
+    "set-role": _cmd_set_role,
+    "reset-password": _cmd_reset_password,
+    "bind-oidc": _cmd_bind_oidc,
+}
+
+
+def dispatch(argv: list[str]) -> int:
+    if not argv:
+        sys.stderr.write("admin: missing action; one of: " + ", ".join(ACTIONS) + "\n")
+        return 1
+    action, rest = argv[0], argv[1:]
+    fn = ACTIONS.get(action)
+    if not fn:
+        sys.stderr.write(f"admin: unknown action '{action}'; valid: {', '.join(ACTIONS)}\n")
+        return 1
+    return fn(rest)

app/cli/config.py

@@ -0,0 +1,108 @@
+"""hf-cli config … — runtime configuration stored in DB.
+
+Currently only the OIDC provider config has a CLI surface (it used to
+live in the AbstractWizard config). Mirrors dialectic-cli's
+`config oidc` shape: only the flags you pass are mutated, the rest stays
+unchanged. Prints the post-update row with client_secret masked unless
+--show-secret is given.
+"""
+import argparse
+import json
+import sys
+
+from app.core.config import SessionLocal
+from app.models.oidc_settings import OidcSettings
+
+
+def _emit(payload: dict) -> None:
+    sys.stdout.write(json.dumps(payload, indent=2) + "\n")
+
+
+def _bool(v: str) -> bool:
+    return v.lower() in ("1", "true", "yes", "on")
+
+
+def _cmd_oidc(argv: list[str]) -> int:
+    p = argparse.ArgumentParser(prog="hf-cli config oidc")
+    p.add_argument("--issuer", default=None)
+    p.add_argument("--client-id", default=None)
+    p.add_argument("--client-secret", default=None)
+    p.add_argument("--redirect-uri", default=None)
+    p.add_argument("--post-login-redirect", default=None)
+    p.add_argument("--scopes", default=None,
+                   help='Default: "openid email profile"')
+    p.add_argument("--admin-role", default=None,
+                   help="OIDC role name that bootstraps an unbound hf admin "
+                        "on first OIDC-only login. Default: admin.")
+    p.add_argument("--enabled", default=None,
+                   help="true|false. Without this flag the row's existing "
+                        "value is preserved.")
+    p.add_argument("--show-secret", action="store_true",
+                   help="Reveal client_secret in the output (local audit "
+                        "only — never paste into chat).")
+    args = p.parse_args(argv)
+
+    db = SessionLocal()
+    try:
+        row = db.query(OidcSettings).filter(OidcSettings.id == 1).first()
+        if row is None:
+            row = OidcSettings(id=1, enabled=False)
+            db.add(row)
+
+        if args.issuer is not None:
+            row.issuer = args.issuer.strip() or None
+        if args.client_id is not None:
+            row.client_id = args.client_id.strip() or None
+        if args.client_secret is not None:
+            row.client_secret = args.client_secret or None
+        if args.redirect_uri is not None:
+            row.redirect_uri = args.redirect_uri.strip() or None
+        if args.post_login_redirect is not None:
+            row.post_login_redirect = args.post_login_redirect.strip() or None
+        if args.scopes is not None:
+            row.scopes = args.scopes.strip() or None
+        if args.admin_role is not None:
+            row.admin_role = args.admin_role.strip() or None
+        if args.enabled is not None:
+            row.enabled = _bool(args.enabled)
+
+        db.commit()
+        db.refresh(row)
+
+        out: dict = {
+            "enabled": bool(row.enabled),
+            "issuer": row.issuer,
+            "client_id": row.client_id,
+            "redirect_uri": row.redirect_uri,
+            "post_login_redirect": row.post_login_redirect,
+            "scopes": row.scopes,
+            "admin_role": row.admin_role,
+        }
+        if args.show_secret:
+            out["client_secret"] = row.client_secret
+        elif row.client_secret:
+            out["client_secret"] = "***set***"
+        else:
+            out["client_secret"] = None
+
+        _emit({"ok": True, "config": out})
+        return 0
+    finally:
+        db.close()
+
+
+ACTIONS = {
+    "oidc": _cmd_oidc,
+}
+
+
+def dispatch(argv: list[str]) -> int:
+    if not argv:
+        sys.stderr.write("config: missing action; one of: " + ", ".join(ACTIONS) + "\n")
+        return 1
+    action, rest = argv[0], argv[1:]
+    fn = ACTIONS.get(action)
+    if not fn:
+        sys.stderr.write(f"config: unknown action '{action}'; valid: {', '.join(ACTIONS)}\n")
+        return 1
+    return fn(rest)

app/core/config.py

@@ -1,34 +1,13 @@
-import os
-import json
+"""Backend runtime settings — env-only (no wizard / no config volume).
+
+OIDC issuer/client_id/etc. live in the `oidc_settings` DB table set
+via `hf-cli config oidc ...`. The OIDC_ONLY flag remains env-driven
+because it's a deploy-time policy, not a per-tenant runtime config.
+"""
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
 from pydantic_settings import BaseSettings
-from typing import Optional
-
-
-def _resolve_db_url(env_url: str) -> str:
-    """Read DB config from wizard config volume if available, else use env."""
-    config_dir = os.getenv("CONFIG_DIR", "/config")
-    config_file = os.getenv("CONFIG_FILE", "harborforge.json")
-    config_path = os.path.join(config_dir, config_file)
-
-    if os.path.exists(config_path):
-        try:
-            with open(config_path, "r") as f:
-                cfg = json.load(f)
-            db_cfg = cfg.get("database")
-            if db_cfg:
-                host = db_cfg.get("host", "mysql")
-                port = db_cfg.get("port", 3306)
-                user = db_cfg.get("user", "harborforge")
-                password = db_cfg.get("password", "harborforge_pass")
-                database = db_cfg.get("database", "harborforge")
-                return f"mysql+pymysql://{user}:{password}@{host}:{port}/{database}"
-        except Exception:
-            pass
-
-    return env_url
 
 
 class Settings(BaseSettings):
@@ -38,19 +17,9 @@ class Settings(BaseSettings):
     ALGORITHM: str = "HS256"
     ACCESS_TOKEN_EXPIRE_MINUTES: int = 30
 
-    # --- OIDC (generic, OpenID Connect discovery) ---
-    OIDC_ENABLED: bool = False
-    OIDC_ISSUER: str = ""            # e.g. https://idp.example.com (we use {issuer}/.well-known/openid-configuration)
-    OIDC_CLIENT_ID: str = ""
-    OIDC_CLIENT_SECRET: str = ""
-    OIDC_REDIRECT_URI: str = ""      # backend callback, e.g. https://hf-api.example.com/auth/oidc/callback
-    OIDC_SCOPES: str = "openid email profile"
-    OIDC_POST_LOGIN_REDIRECT: str = ""   # frontend URL to return to (token in fragment). Falls back to "/"
-    OIDC_ADMIN_ROLE: str = "admin"       # OIDC role name that bootstraps the unbound hf admin (OIDC-only)
-
     # When true: no password login at all. Password login endpoint rejects,
-    # user creation ignores any password (passwordless user that can only use
-    # API keys / OIDC), and the frontend hides all password UI.
+    # user creation ignores any password (passwordless users that only sign
+    # in via a bound OIDC identity / API keys), frontend hides password UI.
     HARBORFORGE_OIDC_ONLY: bool = False
 
     class Config:
@@ -75,9 +44,7 @@ if settings.SECRET_KEY in _WEAK_SECRETS or len(settings.SECRET_KEY) < 32:
         "Refusing to start with a default/short key."
     )
 
-# Resolve DB URL: wizard config volume > env > default
-_db_url = _resolve_db_url(settings.DATABASE_URL)
-engine = create_engine(_db_url, pool_pre_ping=True)
+engine = create_engine(settings.DATABASE_URL, pool_pre_ping=True)
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 Base = declarative_base()
 

app/init_bootstrap.py

@@ -0,0 +1,278 @@
+"""
+HarborForge unconditional startup seeds — runs every time backend boots.
+
+Seeds default permissions, default roles, the `acc-mgr` built-in (account
+provisioning agent), and the `deleted-user` foreign-key sink. Idempotent;
+existing rows are left alone.
+
+Wizard/.json config bootstrap has been removed entirely as of v0.4.0.
+First-deploy admin user, OIDC settings, and discord webhook config all
+moved to operator-driven flows:
+
+  docker exec hf-backend hf-cli admin create-user --email ... --password ...
+  docker exec hf-backend hf-cli config oidc --issuer ... --client-id ...
+
+Builtin accounts created here:
+  - acc-mgr (account-manager role) — cannot log in, used by the
+    account-creation API as a system principal
+  - deleted-user — FK sink so user delete doesn't cascade
+
+The bootstrap admin user is NOT created here — that's CLI-driven so
+operators pick the email/password themselves.
+"""
+import logging
+from sqlalchemy.orm import Session
+
+from app.models import models
+from app.models.role_permission import Role, Permission, RolePermission
+
+logger = logging.getLogger("harborforge.bootstrap")
+
+
+# ---------------------------------------------------------------------------
+# Permissions catalog (canonical; new perms get added on every release)
+# ---------------------------------------------------------------------------
+DEFAULT_PERMISSIONS = [
+    # Project permissions
+    ("project.read", "View project", "project"),
+    ("project.write", "Edit project", "project"),
+    ("project.create", "Create a project", "project"),
+    ("project.delete", "Delete project", "project"),
+    ("project.manage_members", "Manage project members", "project"),
+    # Task/Milestone permissions
+    ("task.create", "Create tasks", "task"),
+    ("task.read", "View tasks", "task"),
+    ("task.write", "Edit tasks", "task"),
+    ("task.delete", "Delete tasks", "task"),
+    ("milestone.create", "Create milestones", "milestone"),
+    ("milestone.read", "View milestones", "milestone"),
+    ("milestone.write", "Edit milestones", "milestone"),
+    ("milestone.delete", "Delete milestones", "milestone"),
+    # Milestone actions
+    ("milestone.freeze", "Freeze milestone scope", "milestone"),
+    ("milestone.start", "Start milestone execution", "milestone"),
+    ("milestone.close", "Close / abort milestone", "milestone"),
+    # Task actions
+    ("task.close", "Close / cancel a task", "task"),
+    ("task.reopen_closed", "Reopen a closed task", "task"),
+    ("task.reopen_completed", "Reopen a completed task", "task"),
+    # Proposal actions (permission names kept as propose.* for DB compat)
+    ("propose.accept", "Accept a proposal into a milestone", "propose"),
+    ("propose.reject", "Reject a proposal", "propose"),
+    ("propose.reopen", "Reopen a rejected proposal", "propose"),
+    # Role/Permission management
+    ("role.manage", "Manage roles and permissions", "admin"),
+    ("account.create", "Create HarborForge accounts", "account"),
+    # User management
+    ("user.manage", "Manage users", "admin"),
+    # API key management
+    ("user.reset-self-apikey", "Reset own API key", "user"),
+    ("user.reset-apikey", "Reset any user's API key", "admin"),
+    # Monitor
+    ("monitor.read", "View monitor", "monitor"),
+    ("monitor.manage", "Manage monitor", "monitor"),
+    # Calendar
+    ("calendar.read", "View calendar slots and plans", "calendar"),
+    ("calendar.write", "Create and edit calendar slots and plans", "calendar"),
+    ("calendar.manage", "Manage calendar settings and workload policies", "calendar"),
+    # Webhook
+    ("webhook.manage", "Manage webhooks", "admin"),
+    # Project member management (used by DELETE /projects/{id}/members/{user_id})
+    ("member.remove", "Remove a project member", "project"),
+    # Schedule type (calendar templates) — read covers list+detail, manage covers
+    # create/edit/delete on schedule_types AND their special slots.
+    ("schedule_type.read",   "View schedule types and special slots",            "calendar"),
+    ("schedule_type.manage", "Create / edit / delete schedule types and slots", "calendar"),
+]
+
+
+def init_default_permissions(db: Session) -> list[Permission]:
+    """Insert any missing perms from DEFAULT_PERMISSIONS. Returns all rows."""
+    created = []
+    for name, description, category in DEFAULT_PERMISSIONS:
+        existing = db.query(Permission).filter(Permission.name == name).first()
+        if not existing:
+            perm = Permission(name=name, description=description, category=category)
+            db.add(perm)
+            created.append(perm)
+            logger.info("Created permission '%s'", name)
+    if created:
+        db.commit()
+    return db.query(Permission).all()
+
+
+# ---------------------------------------------------------------------------
+# Default roles + permission set per role
+# ---------------------------------------------------------------------------
+_MGR_PERMISSIONS = {
+    "project.read", "project.write", "project.create", "project.manage_members",
+    "task.create", "task.read", "task.write", "task.delete",
+    "milestone.create", "milestone.read", "milestone.write", "milestone.delete",
+    "milestone.freeze", "milestone.start", "milestone.close",
+    "task.close", "task.reopen_closed", "task.reopen_completed",
+    "propose.accept", "propose.reject", "propose.reopen",
+    "monitor.read",
+    "calendar.read", "calendar.write", "calendar.manage",
+    "user.reset-self-apikey",
+}
+
+_DEV_PERMISSIONS = {
+    "project.read",
+    "task.create", "task.read", "task.write",
+    "milestone.read",
+    "task.close", "task.reopen_closed", "task.reopen_completed",
+    "monitor.read",
+    "calendar.read", "calendar.write",
+    "user.reset-self-apikey",
+}
+
+_ACCOUNT_MANAGER_PERMISSIONS = {
+    "account.create",
+    "user.reset-apikey",
+}
+
+# Default role for agents (assigned automatically by POST /users when
+# the create-user payload carries agent_id/claw_identifier — see
+# app/api/routers/users.py:_resolve_user_role). Guest-tier reads +
+# self-service API-key rotation so agents can manage their own creds
+# without admin intervention.
+_GENERAL_AGENT_PERMISSIONS = {
+    "project.read",
+    "task.read",
+    "milestone.read",
+    "monitor.read",
+    "calendar.read",
+    "user.reset-self-apikey",
+}
+
+_DEFAULT_ROLES = [
+    ("admin", "Administrator - full access to all features", None),     # None ⇒ all perms
+    ("account-manager", "Account manager - can only create accounts", _ACCOUNT_MANAGER_PERMISSIONS),
+    ("mgr",   "Manager - project & milestone management",    _MGR_PERMISSIONS),
+    ("dev",   "Developer - task execution & daily work",     _DEV_PERMISSIONS),
+    ("general-agent", "General agent - read-only + self API key rotation", _GENERAL_AGENT_PERMISSIONS),
+    ("guest", "Guest - read-only access",                    None),     # special: *.read only
+]
+
+
+def _ensure_role(db: Session, name: str, description: str, is_global: bool = True) -> Role:
+    role = db.query(Role).filter(Role.name == name).first()
+    if not role:
+        role = Role(name=name, description=description, is_global=is_global)
+        db.add(role)
+        db.commit()
+        db.refresh(role)
+        logger.info("Created role '%s' (id=%d)", name, role.id)
+    return role
+
+
+def _sync_role_permissions(db: Session, role: Role, target_perm_names: set[str] | None) -> None:
+    """Additive: grants missing perms, never revokes manually-granted ones.
+    ``target_perm_names is None`` means **all** perms (admin)."""
+    all_perms = db.query(Permission).all()
+    perm_by_name = {p.name: p for p in all_perms}
+
+    if target_perm_names is None:
+        wanted_ids = {p.id for p in all_perms}
+    else:
+        wanted_ids = {perm_by_name[n].id for n in target_perm_names if n in perm_by_name}
+
+    existing_ids = {rp.permission_id for rp in role.permissions}
+    added = 0
+    for pid in wanted_ids - existing_ids:
+        db.add(RolePermission(role_id=role.id, permission_id=pid))
+        added += 1
+    if added:
+        db.commit()
+        logger.info("Assigned %d new permissions to role '%s'", added, role.name)
+
+
+def init_default_roles(db: Session) -> None:
+    """Create default roles (admin/account-manager/mgr/dev/guest) + permissions."""
+    all_perms = db.query(Permission).all()
+    read_perm_names = {p.name for p in all_perms if p.name.endswith(".read")}
+
+    for name, description, perm_set in _DEFAULT_ROLES:
+        role = _ensure_role(db, name, description)
+        if name == "guest":
+            _sync_role_permissions(db, role, read_perm_names)
+        else:
+            _sync_role_permissions(db, role, perm_set)
+    logger.info("Default roles ready (admin / account-manager / mgr / dev / guest)")
+
+
+# ---------------------------------------------------------------------------
+# Built-in user accounts (system principals, cannot log in)
+# ---------------------------------------------------------------------------
+DELETED_USER_USERNAME = "deleted-user"
+
+
+def init_acc_mgr_user(db: Session) -> models.User | None:
+    """The account-manager system principal. Holds the `account-manager`
+    role so the account-creation API can attribute new users to it. No
+    password, no OIDC binding — cannot log in."""
+    username = "acc-mgr"
+    existing = db.query(models.User).filter(models.User.username == username).first()
+    if existing:
+        return existing
+
+    acc_mgr_role = db.query(Role).filter(Role.name == "account-manager").first()
+    if not acc_mgr_role:
+        logger.warning("account-manager role not found, skipping acc-mgr user creation")
+        return None
+
+    user = models.User(
+        username=username,
+        email="acc-mgr@harborforge.internal",
+        full_name="Account Manager",
+        hashed_password=None,
+        is_admin=False,
+        is_active=True,
+        role_id=acc_mgr_role.id,
+    )
+    db.add(user)
+    db.commit()
+    db.refresh(user)
+    logger.info("Created acc-mgr user (id=%d) with account-manager role", user.id)
+    return user
+
+
+def init_deleted_user(db: Session) -> models.User | None:
+    """FK sink for deleted users — when a real user is deleted, all FK
+    references reassign here instead of cascading."""
+    existing = db.query(models.User).filter(
+        models.User.username == DELETED_USER_USERNAME
+    ).first()
+    if existing:
+        return existing
+
+    user = models.User(
+        username=DELETED_USER_USERNAME,
+        email="deleted-user@harborforge.internal",
+        full_name="Deleted User",
+        hashed_password=None,
+        is_admin=False,
+        is_active=False,
+        role_id=None,
+    )
+    db.add(user)
+    db.commit()
+    db.refresh(user)
+    logger.info("Created deleted-user (id=%d)", user.id)
+    return user
+
+
+# ---------------------------------------------------------------------------
+# Top-level bootstrap entry point — called from main.py startup
+# ---------------------------------------------------------------------------
+def run_bootstrap(db: Session) -> None:
+    """Idempotent startup seed. Safe to call on every boot.
+
+    Does NOT create the admin user — that's CLI-driven (see hf-cli admin
+    create-user) so operators pick credentials.
+    """
+    init_default_permissions(db)
+    init_default_roles(db)
+    init_acc_mgr_user(db)
+    init_deleted_user(db)
+    logger.info("Bootstrap seeds complete")

app/init_wizard.py

@@ -1,411 +0,0 @@
-"""
-HarborForge initialization from AbstractWizard config volume.
-
-Reads config from shared volume (written by AbstractWizard).
-On startup, creates admin user and default project if not exists.
-"""
-import os
-import json
-import logging
-from sqlalchemy.orm import Session
-
-from app.models import models
-from app.models.role_permission import Role, Permission, RolePermission
-from app.models.oidc_settings import OidcSettings
-from app.api.deps import get_password_hash
-
-logger = logging.getLogger("harborforge.init")
-
-CONFIG_DIR = os.getenv("CONFIG_DIR", "/config")
-CONFIG_FILE = os.getenv("CONFIG_FILE", "harborforge.json")
-
-
-def load_config() -> dict | None:
-    """Load initialization config from shared volume."""
-    config_path = os.path.join(CONFIG_DIR, CONFIG_FILE)
-    if not os.path.exists(config_path):
-        logger.info("No config file at %s, skipping initialization", config_path)
-        return None
-    try:
-        with open(config_path, "r") as f:
-            return json.load(f)
-    except Exception as e:
-        logger.warning("Failed to read config %s: %s", config_path, e)
-        return None
-
-
-def get_db_url(config: dict) -> str | None:
-    """Build DATABASE_URL from wizard config, or fall back to env."""
-    db_cfg = config.get("database")
-    if not db_cfg:
-        return os.getenv("DATABASE_URL")
-
-    host = db_cfg.get("host", "mysql")
-    port = db_cfg.get("port", 3306)
-    user = db_cfg.get("user", "harborforge")
-    password = db_cfg.get("password", "harborforge_pass")
-    database = db_cfg.get("database", "harborforge")
-    return f"mysql+pymysql://{user}:{password}@{host}:{port}/{database}"
-
-
-def init_admin_user(db: Session, admin_cfg: dict) -> models.User | None:
-    """Create admin user if not exists."""
-    username = admin_cfg.get("username", "admin")
-    existing = db.query(models.User).filter(models.User.username == username).first()
-    if existing:
-        logger.info("Admin user '%s' already exists (id=%d), skipping", username, existing.id)
-        return existing
-
-    password = admin_cfg.get("password", "changeme")
-    user = models.User(
-        username=username,
-        email=admin_cfg.get("email", f"{username}@harborforge.local"),
-        full_name=admin_cfg.get("full_name", "Admin"),
-        hashed_password=get_password_hash(password),
-        is_admin=True,
-        is_active=True,
-    )
-    db.add(user)
-    db.commit()
-    db.refresh(user)
-    logger.info("Created admin user '%s' (id=%d)", username, user.id)
-    return user
-
-
-def init_default_project(db: Session, project_cfg: dict, owner_id: int, owner_name: str = "") -> None:
-    """Create default project if configured and not exists."""
-    name = project_cfg.get("name")
-    if not name:
-        return
-    existing = db.query(models.Project).filter(models.Project.name == name).first()
-    if existing:
-        logger.info("Project '%s' already exists (id=%d), skipping", name, existing.id)
-        return
-
-    project = models.Project(
-        name=name,
-        description=project_cfg.get("description", ""),
-        owner_name=project_cfg.get("owner") or owner_name or "",
-        owner_id=owner_id,
-    )
-    db.add(project)
-    db.commit()
-    db.refresh(project)
-    logger.info("Created default project '%s' (id=%d)", name, project.id)
-
-
-# Default permissions that will be created if not exist
-DEFAULT_PERMISSIONS = [
-    # Project permissions
-    ("project.read", "View project", "project"),
-    ("project.write", "Edit project", "project"),
-    ("project.delete", "Delete project", "project"),
-    ("project.manage_members", "Manage project members", "project"),
-    # Task/Milestone permissions
-    ("task.create", "Create tasks", "task"),
-    ("task.read", "View tasks", "task"),
-    ("task.write", "Edit tasks", "task"),
-    ("task.delete", "Delete tasks", "task"),
-    ("milestone.create", "Create milestones", "milestone"),
-    ("milestone.read", "View milestones", "milestone"),
-    ("milestone.write", "Edit milestones", "milestone"),
-    ("milestone.delete", "Delete milestones", "milestone"),
-    # Milestone actions
-    ("milestone.freeze", "Freeze milestone scope", "milestone"),
-    ("milestone.start", "Start milestone execution", "milestone"),
-    ("milestone.close", "Close / abort milestone", "milestone"),
-    # Task actions
-    ("task.close", "Close / cancel a task", "task"),
-    ("task.reopen_closed", "Reopen a closed task", "task"),
-    ("task.reopen_completed", "Reopen a completed task", "task"),
-    # Proposal actions (permission names kept as propose.* for DB compat)
-    ("propose.accept", "Accept a proposal into a milestone", "propose"),
-    ("propose.reject", "Reject a proposal", "propose"),
-    ("propose.reopen", "Reopen a rejected proposal", "propose"),
-    # Role/Permission management
-    ("role.manage", "Manage roles and permissions", "admin"),
-    ("account.create", "Create HarborForge accounts", "account"),
-    # User management
-    ("user.manage", "Manage users", "admin"),
-    # API key management
-    ("user.reset-self-apikey", "Reset own API key", "user"),
-    ("user.reset-apikey", "Reset any user's API key", "admin"),
-    # Monitor
-    ("monitor.read", "View monitor", "monitor"),
-    ("monitor.manage", "Manage monitor", "monitor"),
-    # Calendar
-    ("calendar.read", "View calendar slots and plans", "calendar"),
-    ("calendar.write", "Create and edit calendar slots and plans", "calendar"),
-    ("calendar.manage", "Manage calendar settings and workload policies", "calendar"),
-    # Webhook
-    ("webhook.manage", "Manage webhooks", "admin"),
-]
-
-
-def init_default_permissions(db: Session) -> list[Permission]:
-    """Create default permissions if they don't exist. Returns all permissions."""
-    created = []
-    for name, description, category in DEFAULT_PERMISSIONS:
-        existing = db.query(Permission).filter(Permission.name == name).first()
-        if not existing:
-            perm = Permission(name=name, description=description, category=category)
-            db.add(perm)
-            created.append(perm)
-            logger.info("Created permission '%s'", name)
-    
-    if created:
-        db.commit()
-    
-    # Return all permissions
-    return db.query(Permission).all()
-
-
-# ---------------------------------------------------------------------------
-# Default role → permission mapping
-# ---------------------------------------------------------------------------
-
-# mgr: project management + all milestone/task/proposal actions
-_MGR_PERMISSIONS = {
-    "project.read", "project.write", "project.manage_members",
-    "task.create", "task.read", "task.write", "task.delete",
-    "milestone.create", "milestone.read", "milestone.write", "milestone.delete",
-    "milestone.freeze", "milestone.start", "milestone.close",
-    "task.close", "task.reopen_closed", "task.reopen_completed",
-    "propose.accept", "propose.reject", "propose.reopen",
-    "monitor.read",
-    "calendar.read", "calendar.write", "calendar.manage",
-    "user.reset-self-apikey",
-}
-
-# dev: day-to-day development work — no freeze/start/close milestone, no accept/reject proposal
-_DEV_PERMISSIONS = {
-    "project.read",
-    "task.create", "task.read", "task.write",
-    "milestone.read",
-    "task.close", "task.reopen_closed", "task.reopen_completed",
-    "monitor.read",
-    "calendar.read", "calendar.write",
-    "user.reset-self-apikey",
-}
-
-_ACCOUNT_MANAGER_PERMISSIONS = {
-    "account.create",
-    "user.reset-apikey",
-}
-
-# Role definitions: (name, description, permission_set)
-_DEFAULT_ROLES = [
-    ("admin", "Administrator - full access to all features", None),       # None ⇒ all perms
-    ("account-manager", "Account manager - can only create accounts", _ACCOUNT_MANAGER_PERMISSIONS),
-    ("mgr",   "Manager - project & milestone management",    _MGR_PERMISSIONS),
-    ("dev",   "Developer - task execution & daily work",     _DEV_PERMISSIONS),
-    ("guest", "Guest - read-only access",                    None),       # special: *.read only
-]
-
-
-def _ensure_role(db: Session, name: str, description: str, is_global: bool = True) -> Role:
-    """Get or create a role by name."""
-    role = db.query(Role).filter(Role.name == name).first()
-    if not role:
-        role = Role(name=name, description=description, is_global=is_global)
-        db.add(role)
-        db.commit()
-        db.refresh(role)
-        logger.info("Created role '%s' (id=%d)", name, role.id)
-    return role
-
-
-def _sync_role_permissions(db: Session, role: Role, target_perm_names: set[str] | None) -> None:
-    """Ensure *role* has exactly the permissions in *target_perm_names*.
-
-    * ``None`` means **all** permissions (admin).
-    * The special sentinel ``"__read_only__"`` is handled by the caller passing
-      just the ``*.read`` names.
-    Only adds missing permissions; never removes manually-granted ones (additive).
-    """
-    all_perms = db.query(Permission).all()
-    perm_by_name = {p.name: p for p in all_perms}
-
-    if target_perm_names is None:
-        wanted_ids = {p.id for p in all_perms}
-    else:
-        wanted_ids = {perm_by_name[n].id for n in target_perm_names if n in perm_by_name}
-
-    existing_ids = {rp.permission_id for rp in role.permissions}
-    added = 0
-    for pid in wanted_ids - existing_ids:
-        db.add(RolePermission(role_id=role.id, permission_id=pid))
-        added += 1
-
-    if added:
-        db.commit()
-        logger.info("Assigned %d new permissions to role '%s'", added, role.name)
-
-
-def init_admin_role(db: Session, admin_user: models.User) -> None:
-    """Create default roles (admin / mgr / dev / guest) with preset permissions."""
-
-    all_perms = db.query(Permission).all()
-    read_perm_names = {p.name for p in all_perms if p.name.endswith(".read")}
-
-    for name, description, perm_set in _DEFAULT_ROLES:
-        role = _ensure_role(db, name, description)
-
-        if name == "guest":
-            _sync_role_permissions(db, role, read_perm_names)
-        else:
-            _sync_role_permissions(db, role, perm_set)
-
-    logger.info("Default roles setup complete (admin, mgr, dev, guest)")
-
-
-def init_acc_mgr_user(db: Session) -> models.User | None:
-    """Create the built-in acc-mgr user if not exists.
-
-    This user:
-    - Has role 'account-manager' (can only create accounts)
-    - Cannot log in (no password, hashed_password=None)
-    - Cannot be deleted (enforced in delete endpoint)
-    - Is created automatically after wizard initialization
-    """
-    username = "acc-mgr"
-    existing = db.query(models.User).filter(models.User.username == username).first()
-    if existing:
-        logger.info("acc-mgr user already exists (id=%d), skipping", existing.id)
-        return existing
-
-    # Find account-manager role
-    acc_mgr_role = db.query(Role).filter(Role.name == "account-manager").first()
-    if not acc_mgr_role:
-        logger.warning("account-manager role not found, skipping acc-mgr user creation")
-        return None
-
-    user = models.User(
-        username=username,
-        email="acc-mgr@harborforge.internal",
-        full_name="Account Manager",
-        hashed_password=None,  # Cannot log in — no password
-        is_admin=False,
-        is_active=True,
-        role_id=acc_mgr_role.id,
-    )
-    db.add(user)
-    db.commit()
-    db.refresh(user)
-    logger.info("Created acc-mgr user (id=%d) with account-manager role", user.id)
-    return user
-
-
-DELETED_USER_USERNAME = "deleted-user"
-
-
-def init_deleted_user(db: Session) -> models.User | None:
-    """Create the built-in deleted-user if not exists.
-
-    This user serves as a foreign key sink: when a real user is deleted,
-    all references are reassigned here instead of cascading deletes.
-    It has no role (no permissions) and cannot log in.
-    """
-    existing = db.query(models.User).filter(
-        models.User.username == DELETED_USER_USERNAME
-    ).first()
-    if existing:
-        logger.info("deleted-user already exists (id=%d), skipping", existing.id)
-        return existing
-
-    user = models.User(
-        username=DELETED_USER_USERNAME,
-        email="deleted-user@harborforge.internal",
-        full_name="Deleted User",
-        hashed_password=None,
-        is_admin=False,
-        is_active=False,
-        role_id=None,
-    )
-    db.add(user)
-    db.commit()
-    db.refresh(user)
-    logger.info("Created deleted-user (id=%d)", user.id)
-    return user
-
-
-def init_oidc_settings(db: Session, oidc_cfg: dict, admin_user: models.User | None) -> None:
-    """Bootstrap OIDC from the wizard config (first init only).
-
-    Creates the single oidc_settings row if absent so the deployment comes
-    up with OIDC configured. If admin_subject is given, binds the bootstrap
-    admin so it can sign in (critical in OIDC-only mode). Idempotent: an
-    existing row / existing admin binding is left untouched so later admin
-    edits via the API are not clobbered on restart."""
-    if not oidc_cfg:
-        return
-
-    existing = db.query(OidcSettings).filter(OidcSettings.id == 1).first()
-    if existing is None:
-        db.add(OidcSettings(
-            id=1,
-            enabled=bool(oidc_cfg.get("enabled", True)),
-            issuer=(oidc_cfg.get("issuer") or "").strip() or None,
-            client_id=(oidc_cfg.get("client_id") or "").strip() or None,
-            client_secret=oidc_cfg.get("client_secret") or None,
-            redirect_uri=(oidc_cfg.get("redirect_uri") or "").strip() or None,
-            scopes=(oidc_cfg.get("scopes") or "").strip() or None,
-            post_login_redirect=(oidc_cfg.get("post_login_redirect") or "").strip() or None,
-            admin_role=(oidc_cfg.get("admin_role") or "").strip() or None,
-        ))
-        db.commit()
-        logger.info("OIDC settings bootstrapped from wizard config")
-
-    admin_subject = (oidc_cfg.get("admin_subject") or "").strip()
-    issuer = (oidc_cfg.get("issuer") or "").strip()
-    if admin_user and admin_subject and issuer and not admin_user.oidc_subject:
-        clash = db.query(models.User).filter(
-            models.User.oidc_issuer == issuer,
-            models.User.oidc_subject == admin_subject,
-            models.User.id != admin_user.id,
-        ).first()
-        if clash:
-            logger.warning("Admin OIDC subject already bound to '%s'; skipping admin bind", clash.username)
-        else:
-            admin_user.oidc_issuer = issuer
-            admin_user.oidc_subject = admin_subject
-            db.commit()
-            logger.info("Bootstrap admin '%s' bound to OIDC subject", admin_user.username)
-
-
-def run_init(db: Session) -> None:
-    """Main initialization entry point. Reads config from shared volume."""
-    config = load_config()
-    if not config:
-        return
-
-    logger.info("Running HarborForge initialization from wizard config")
-
-    # Initialize default permissions and admin role (always run)
-    all_perms = init_default_permissions(db)
-    logger.info("Default permissions initialized: %d total", len(all_perms))
-
-    # Admin user
-    admin_cfg = config.get("admin")
-    admin_user = None
-    if admin_cfg:
-        admin_user = init_admin_user(db, admin_cfg)
-        # Create admin role and assign to admin user
-        if admin_user:
-            init_admin_role(db, admin_user)
-
-    # Built-in acc-mgr user (after roles are created)
-    init_acc_mgr_user(db)
-
-    # Built-in deleted-user (foreign key sink for deleted accounts)
-    init_deleted_user(db)
-
-    # Default project
-    project_cfg = config.get("default_project")
-    if project_cfg and admin_user:
-        init_default_project(db, project_cfg, admin_user.id, admin_user.username)
-
-    # OIDC bootstrap (provider config + optional bootstrap-admin binding)
-    init_oidc_settings(db, config.get("oidc") or {}, admin_user)
-
-    logger.info("Initialization complete")

app/main.py

@@ -42,24 +42,22 @@ def version():
 
 @app.get("/config/status", tags=["System"])
 def config_status():
-    """Check if HarborForge has been initialized (reads from config volume).
-    Frontend uses this instead of contacting the wizard directly."""
-    import os, json
-    config_dir = os.getenv("CONFIG_DIR", "/config")
-    config_file = os.getenv("CONFIG_FILE", "harborforge.json")
-    config_path = os.path.join(config_dir, config_file)
-    if not os.path.exists(config_path):
-        return {"initialized": False}
+    """Has the deployment been bootstrapped (admin user exists)?
+
+    Frontend hits this on mount to decide whether to show login or a
+    "no admin yet, run hf-cli admin create-user" placeholder. With the
+    wizard removed in v0.4.0 the only deploy-time bootstrap step is the
+    operator running `docker exec hf-backend hf-cli admin create-user ...`
+    once; this endpoint just reports whether that has happened.
+    """
+    from app.core.config import SessionLocal
+    from app.models import models
+    db = SessionLocal()
     try:
-        with open(config_path, "r") as f:
-            cfg = json.load(f)
-        return {
-            "initialized": cfg.get("initialized", False),
-            "backend_url": cfg.get("backend_url"),
-            "discord": cfg.get("discord") or {},
-        }
-    except Exception:
-        return {"initialized": False}
+        admin_count = db.query(models.User).filter(models.User.is_admin == True).count()  # noqa: E712
+        return {"initialized": admin_count > 0}
+    finally:
+        db.close()
 
 # Register routers
 from app.api.routers.auth import router as auth_router
@@ -400,9 +398,9 @@ def _migrate_schema():
             db.execute(text("ALTER TABLE agents ADD COLUMN schedule_type_id INTEGER NULL"))
 
         # --- schedule_types: add maintenance_from / maintenance_to ---
-        # Default 8:00–9:00 UTC for existing rows; the 1-hour-window
-        # invariant is enforced at the schema level for any NEW rows by
-        # the pydantic ScheduleTypeCreate validator.
+        # Default 8:00–9:00 UTC for existing rows; the maintenance
+        # duration invariant (1-180min) is enforced at the schema
+        # level for any NEW rows by ScheduleTypeCreate validator.
         if _has_table(db, "schedule_types"):
             if not _has_column(db, "schedule_types", "maintenance_from"):
                 db.execute(text(
@@ -413,6 +411,29 @@ def _migrate_schema():
                     "ALTER TABLE schedule_types ADD COLUMN maintenance_to INT NOT NULL DEFAULT 9"
                 ))
 
+            # --- minutes-since-midnight migration (PR #21+) ---
+            # The 6 schedule_type window columns used to hold *hours*
+            # (0-23). PR #21 changed semantics to *minutes since UTC
+            # midnight* (0-1439). Detect the legacy regime by checking
+            # if ANY row has all 6 values ≤ 23 — if so, multiply each
+            # by 60 to convert. Idempotent: post-conversion values are
+            # all ≥ 0 and usually well above 23, so guard never fires
+            # twice.
+            row = db.execute(text(
+                "SELECT MAX(GREATEST(work_from, work_to, entertainment_from, entertainment_to, maintenance_from, maintenance_to)) AS m "
+                "FROM schedule_types"
+            )).fetchone()
+            if row is not None and row.m is not None and row.m <= 23:
+                db.execute(text(
+                    "UPDATE schedule_types SET "
+                    "  work_from = work_from * 60, "
+                    "  work_to = work_to * 60, "
+                    "  entertainment_from = entertainment_from * 60, "
+                    "  entertainment_to = entertainment_to * 60, "
+                    "  maintenance_from = maintenance_from * 60, "
+                    "  maintenance_to = maintenance_to * 60"
+                ))
+
         # --- time_slots: admin-locked + special_slot pointer ---
         if _has_table(db, "time_slots"):
             if not _has_column(db, "time_slots", "is_admin_locked"):
@@ -471,11 +492,13 @@ def startup():
     Base.metadata.create_all(bind=engine)
     _migrate_schema()
 
-    # Initialize from AbstractWizard (admin user, default project, etc.)
-    from app.init_wizard import run_init
+    # Idempotent startup seed: permissions, default roles, built-in
+    # accounts (acc-mgr, deleted-user). The admin user + OIDC config are
+    # NOT created here — they're operator-driven via hf-cli.
+    from app.init_bootstrap import run_bootstrap
     db = SessionLocal()
     try:
-        run_init(db)
+        run_bootstrap(db)
         _sync_default_user_roles(db)
     finally:
         db.close()

app/models/schedule_type.py

@@ -1,9 +1,17 @@
 """ScheduleType model — defines work/entertainment/maintenance time periods.
 
 Each ScheduleType defines the daily work, entertainment, and maintenance
-windows. Agents reference a schedule_type to know when they should be
-working, when they can engage in entertainment, and when the system
-requires them to surrender control for admin-scheduled special slots.
+windows for agents who reference this type. All bounds are stored as
+**minutes-since-UTC-midnight** (0-1439 inclusive) so half-hour and other
+sub-hour boundaries are exact.
+
+Maintenance window length is variable (1-180 minutes) and admin-owned;
+agent slots cannot intersect it (see `app/api/routers/calendar.py`).
+
+Historical note: pre-PR #21 the columns held *hours* (0-23) and the
+maintenance window was hard-fixed at exactly 1 hour. The additive
+migration in `_migrate_schema()` multiplies legacy values by 60 so
+existing rows convert transparently.
 """
 
 from sqlalchemy import Column, Integer, String, DateTime
@@ -26,52 +34,26 @@ class ScheduleType(Base):
         comment="Human-readable schedule type name (e.g., 'standard', 'night-shift')",
     )
 
-    work_from = Column(
-        Integer,
-        nullable=False,
-        comment="Work period start hour (0-23, UTC)",
-    )
+    # Minutes since UTC midnight, 0-1439 inclusive.
+    work_from = Column(Integer, nullable=False, comment="Work period start (minutes since UTC midnight)")
+    work_to = Column(Integer, nullable=False, comment="Work period end (minutes since UTC midnight)")
 
-    work_to = Column(
-        Integer,
-        nullable=False,
-        comment="Work period end hour (0-23, UTC)",
-    )
+    entertainment_from = Column(Integer, nullable=False, comment="Entertainment start (minutes since UTC midnight)")
+    entertainment_to = Column(Integer, nullable=False, comment="Entertainment end (minutes since UTC midnight)")
 
-    entertainment_from = Column(
-        Integer,
-        nullable=False,
-        comment="Entertainment period start hour (0-23, UTC)",
-    )
-
-    entertainment_to = Column(
-        Integer,
-        nullable=False,
-        comment="Entertainment period end hour (0-23, UTC)",
-    )
-
-    # -----------------------------------------------------------------
-    # Maintenance window — every agent on this schedule_type must
-    # surrender work/entertainment slots during this hour. Admin-created
-    # special slots tied to this schedule_type can only be scheduled
-    # inside this window. The window is always exactly 1 hour.
-    #
-    # Default (when columns are added via additive migration to existing
-    # rows) is 8:00–9:00 UTC so deployments stay sane until an operator
-    # picks proper hours per schedule_type.
-    # -----------------------------------------------------------------
+    # Maintenance window — admin-owned, variable length (1-180 min).
+    # Default 8:00–9:00 UTC = 480–540 minutes for existing rows.
     maintenance_from = Column(
         Integer,
         nullable=False,
-        server_default="8",
-        comment="Maintenance window start hour (0-23, UTC). Window is exactly 1h.",
+        server_default="480",
+        comment="Maintenance start (minutes since UTC midnight, default 480 = 8:00 UTC).",
     )
-
     maintenance_to = Column(
         Integer,
         nullable=False,
-        server_default="9",
-        comment="Maintenance window end hour (0-23, UTC). Must equal (maintenance_from + 1) % 24.",
+        server_default="540",
+        comment="Maintenance end (minutes since UTC midnight, default 540 = 9:00 UTC). Duration ((to-from) mod 1440) must be in [1, 180].",
     )
 
     created_at = Column(DateTime(timezone=True), server_default=func.now())
@@ -83,3 +65,19 @@ class ScheduleType(Base):
         back_populates="schedule_type",
         cascade="all, delete-orphan",
     )
+
+    # ---------------------------------------------------------------
+    # Convenience methods used by the API layer + materialiser.
+    # ---------------------------------------------------------------
+
+    def compute_maintenance_duration(self) -> int:
+        """Maintenance window length in minutes (handles 23→0 wrap)."""
+        return (self.maintenance_to - self.maintenance_from) % 1440 or 1440
+
+    def window_contains(self, start_min: int, end_min: int, win_from: int, win_to: int) -> bool:
+        """True if [start_min, end_min) intersects [win_from, win_to) (handles wrap)."""
+        # Normalise into [0, 1440) — same logic as the helper in calendar.py.
+        if win_to > win_from:
+            return start_min < win_to and end_min > win_from
+        # wrap window crosses midnight: [win_from..1440) ∪ [0..win_to)
+        return start_min < win_to or end_min > win_from

app/schemas/schedule_type.py

@@ -1,27 +1,44 @@
-"""Schemas for ScheduleType CRUD."""
+"""Schemas for ScheduleType CRUD.
+
+All `*_from` / `*_to` values are **minutes since UTC midnight** (0-1439).
+A maintenance window of variable length is allowed (1-180 minutes,
+handles 23→0 wrap).
+"""
 
 from pydantic import BaseModel, Field, model_validator
 from typing import Optional
 
 
-def _validate_maintenance_window(maintenance_from: int, maintenance_to: int) -> None:
-    """Maintenance window must be exactly 1 hour (handles 23→0 wrap)."""
-    expected_to = (maintenance_from + 1) % 24
-    if maintenance_to != expected_to:
+_MAX_MIN = 1440  # 24 * 60 — exclusive upper bound
+
+
+def _maintenance_duration(maint_from: int, maint_to: int) -> int:
+    """Maintenance window length in minutes; treats from==to as 24h (invalid)."""
+    return (maint_to - maint_from) % _MAX_MIN or _MAX_MIN
+
+
+def _validate_maintenance_window(maint_from: int, maint_to: int) -> None:
+    dur = _maintenance_duration(maint_from, maint_to)
+    if dur < 1 or dur > 180:
         raise ValueError(
-            f"maintenance window must be exactly 1 hour: "
-            f"expected maintenance_to={expected_to}, got {maintenance_to}"
+            f"maintenance window duration must be in [1, 180] minutes; "
+            f"got {dur} (from={maint_from}, to={maint_to})"
         )
 
 
+def _validate_minute_field(name: str, value: int) -> None:
+    if value < 0 or value >= _MAX_MIN:
+        raise ValueError(f"{name} must be in [0, {_MAX_MIN}); got {value}")
+
+
 class ScheduleTypeCreate(BaseModel):
     name: str = Field(..., min_length=1, max_length=64)
-    work_from: int = Field(..., ge=0, le=23)
-    work_to: int = Field(..., ge=0, le=23)
-    entertainment_from: int = Field(..., ge=0, le=23)
-    entertainment_to: int = Field(..., ge=0, le=23)
-    maintenance_from: int = Field(8, ge=0, le=23, description="Maintenance window start hour UTC (default 8)")
-    maintenance_to: int = Field(9, ge=0, le=23, description="Maintenance window end hour UTC; must equal (maintenance_from+1) % 24")
+    work_from: int = Field(..., ge=0, lt=_MAX_MIN, description="Work start (minutes since UTC midnight, 0-1439)")
+    work_to: int = Field(..., ge=0, lt=_MAX_MIN)
+    entertainment_from: int = Field(..., ge=0, lt=_MAX_MIN)
+    entertainment_to: int = Field(..., ge=0, lt=_MAX_MIN)
+    maintenance_from: int = Field(480, ge=0, lt=_MAX_MIN, description="Maintenance start (default 480 = 8:00 UTC)")
+    maintenance_to: int = Field(540, ge=0, lt=_MAX_MIN, description="Maintenance end; (to-from) mod 1440 in [1,180]")
 
     @model_validator(mode="after")
     def _check_maintenance(self):
@@ -31,12 +48,12 @@ class ScheduleTypeCreate(BaseModel):
 
 class ScheduleTypeUpdate(BaseModel):
     name: Optional[str] = Field(None, min_length=1, max_length=64)
-    work_from: Optional[int] = Field(None, ge=0, le=23)
-    work_to: Optional[int] = Field(None, ge=0, le=23)
-    entertainment_from: Optional[int] = Field(None, ge=0, le=23)
-    entertainment_to: Optional[int] = Field(None, ge=0, le=23)
-    maintenance_from: Optional[int] = Field(None, ge=0, le=23)
-    maintenance_to: Optional[int] = Field(None, ge=0, le=23)
+    work_from: Optional[int] = Field(None, ge=0, lt=_MAX_MIN)
+    work_to: Optional[int] = Field(None, ge=0, lt=_MAX_MIN)
+    entertainment_from: Optional[int] = Field(None, ge=0, lt=_MAX_MIN)
+    entertainment_to: Optional[int] = Field(None, ge=0, lt=_MAX_MIN)
+    maintenance_from: Optional[int] = Field(None, ge=0, lt=_MAX_MIN)
+    maintenance_to: Optional[int] = Field(None, ge=0, lt=_MAX_MIN)
 
     @model_validator(mode="after")
     def _check_maintenance(self):
@@ -56,6 +73,7 @@ class ScheduleTypeResponse(BaseModel):
     entertainment_to: int
     maintenance_from: int
     maintenance_to: int
+    maintenance_duration_minutes: Optional[int] = None  # derived; populated by router
 
     class Config:
         from_attributes = True

app/schemas/schedule_type_special_slot.py

@@ -9,8 +9,8 @@ from pydantic import BaseModel, Field
 class SpecialSlotCreate(BaseModel):
     name: str = Field(..., min_length=1, max_length=64)
     description: Optional[str] = Field(None, max_length=512)
-    minute_in_window: int = Field(0, ge=0, le=59, description="Minute offset (0-59) inside the schedule_type maintenance window")
-    estimated_duration: int = Field(15, ge=1, le=60, description="Duration in minutes; must fit inside the 1-hour maintenance window")
+    minute_in_window: int = Field(0, ge=0, le=179, description="Minute offset (0-179) inside the schedule_type maintenance window")
+    estimated_duration: int = Field(15, ge=1, le=180, description="Duration in minutes; must fit inside the maintenance window (1-180min)")
     priority: int = Field(50, ge=0, le=99)
     event_data: Optional[dict[str, Any]] = Field(None, description="JSON payload merged into every materialised slot's event_data")
     is_active: bool = True
@@ -19,8 +19,8 @@ class SpecialSlotCreate(BaseModel):
 class SpecialSlotUpdate(BaseModel):
     name: Optional[str] = Field(None, min_length=1, max_length=64)
     description: Optional[str] = Field(None, max_length=512)
-    minute_in_window: Optional[int] = Field(None, ge=0, le=59)
-    estimated_duration: Optional[int] = Field(None, ge=1, le=60)
+    minute_in_window: Optional[int] = Field(None, ge=0, le=179)
+    estimated_duration: Optional[int] = Field(None, ge=1, le=180)
     priority: Optional[int] = Field(None, ge=0, le=99)
     event_data: Optional[dict[str, Any]] = None
     is_active: Optional[bool] = None

app/services/discord_wakeup.py

@@ -1,17 +1,25 @@
 from __future__ import annotations
 
+import os
 from datetime import datetime, timezone
 from typing import Any
 
 import requests
 from fastapi import HTTPException
 
-from app.services.harborforge_config import get_discord_wakeup_config
-
 DISCORD_API_BASE = "https://discord.com/api/v10"
 WAKEUP_CATEGORY_NAME = "HarborForge Wakeup"
 
 
+def _discord_config() -> dict[str, str | None]:
+    """Discord wakeup is configured via env vars (previously read from the
+    AbstractWizard config file). Returns guild_id+bot_token or Nones."""
+    return {
+        "guild_id": os.getenv("HARBORFORGE_DISCORD_GUILD_ID") or None,
+        "bot_token": os.getenv("HARBORFORGE_DISCORD_BOT_TOKEN") or None,
+    }
+
+
 def _headers(bot_token: str) -> dict[str, str]:
     return {
         "Authorization": f"Bot {bot_token}",
@@ -34,7 +42,7 @@ def _ensure_category(guild_id: str, bot_token: str) -> str | None:
 
 
 def create_private_wakeup_channel(discord_user_id: str, title: str, message: str) -> dict[str, Any]:
-    cfg = get_discord_wakeup_config()
+    cfg = _discord_config()
     guild_id = cfg.get("guild_id")
     bot_token = cfg.get("bot_token")
     if not guild_id or not bot_token:

app/services/harborforge_config.py

@@ -1,26 +0,0 @@
-import json
-import os
-from typing import Any
-
-CONFIG_DIR = os.getenv("CONFIG_DIR", "/config")
-CONFIG_FILE = os.getenv("CONFIG_FILE", "harborforge.json")
-
-
-def load_runtime_config() -> dict[str, Any]:
-    config_path = os.path.join(CONFIG_DIR, CONFIG_FILE)
-    if not os.path.exists(config_path):
-        return {}
-    try:
-        with open(config_path, "r") as f:
-            return json.load(f)
-    except Exception:
-        return {}
-
-
-def get_discord_wakeup_config() -> dict[str, str | None]:
-    cfg = load_runtime_config()
-    discord_cfg = cfg.get("discord") or {}
-    return {
-        "guild_id": discord_cfg.get("guild_id"),
-        "bot_token": discord_cfg.get("bot_token"),
-    }

app/services/special_slot_materialiser.py

@@ -145,11 +145,11 @@ def _build_time_slot_from_template(
     schedule_type: ScheduleType,
     template: ScheduleTypeSpecialSlot,
 ) -> TimeSlot:
-    scheduled_at = time_type(
-        hour=schedule_type.maintenance_from,
-        minute=template.minute_in_window,
-        second=0,
-    )
+    # schedule_type.maintenance_from is minutes-since-UTC-midnight; the
+    # template's minute_in_window is an offset inside that window. Combined
+    # offset must fit in [0, 1440) and produce a wall-clock time_type.
+    total_min = (schedule_type.maintenance_from + template.minute_in_window) % 1440
+    scheduled_at = time_type(hour=total_min // 60, minute=total_min % 60, second=0)
     # Merge admin-supplied event_data with bookkeeping pointers so the
     # agent (and ARD) can identify the template at wake time.
     merged_event_data = dict(template.event_data or {})

entrypoint.sh

@@ -1,19 +1,5 @@
 #!/bin/sh
-# Wait for wizard config before starting uvicorn
-CONFIG_DIR="${CONFIG_DIR:-/config}"
-CONFIG_FILE="${CONFIG_FILE:-harborforge.json}"
-CONFIG_PATH="$CONFIG_DIR/$CONFIG_FILE"
-
-echo "HarborForge Backend - waiting for config..."
-echo "  Config path: $CONFIG_PATH"
-
-while true; do
-  if [ -f "$CONFIG_PATH" ]; then
-    echo "  Config found! Starting backend..."
-    break
-  fi
-  echo "  Config not ready, waiting 5s... (run setup wizard via SSH tunnel)"
-  sleep 5
-done
-
+# HarborForge backend entrypoint. All config comes from env vars (DATABASE_URL,
+# SECRET_KEY, HARBORFORGE_OIDC_ONLY, etc.). First-deploy admin user + OIDC
+# issuer config are operator-driven via `docker exec hf-backend hf-cli ...`.
 exec uvicorn app.main:app --host 0.0.0.0 --port 8000

tests/conftest.py

@@ -15,7 +15,7 @@ from fastapi.testclient import TestClient
 
 # ---------------------------------------------------------------------------
 # Patch the production engine/SessionLocal BEFORE importing app so that
-# startup events (Base.metadata.create_all, init_wizard, etc.) use the
+# startup events (Base.metadata.create_all, init_bootstrap, etc.) use the
 # in-memory SQLite database instead of trying to connect to MySQL.
 # ---------------------------------------------------------------------------