Add HTML5 authoring rollback form

services/api-server/src/api_server/html5.py

@@ -365,6 +365,7 @@ def render_html5_authoring_change_detail(project_id: str, preview: object | None
     apply_available = bool(getattr(preview, "apply_available", False))
     diff_rows = "".join(_authoring_diff_item(line) for line in diff[:12]) or '<p class="muted padded">Diff пустой</p>'
     check_rows = "".join(_authoring_check_item(check) for check in checks[:8])
+    apply_form = _authoring_rollback_form(project_id, change_id, rollback_version_id) if apply_available else ""
     return f"""
     <div
       class="authoring-detail"
@@ -379,6 +380,40 @@ def render_html5_authoring_change_detail(project_id: str, preview: object | None
       </article>
       <div class="check-list">{check_rows}</div>
       <div class="diff-list">{diff_rows}</div>
+      {apply_form}
+    </div>
+    """
+
+
+def render_html5_authoring_rollback_result(project_id: str, result: object | None = None, error: str | None = None) -> str:
+    if result is None and error is None:
+        return '<div class="authoring-result" data-html5-authoring-result></div>'
+    if error:
+        return f"""
+        <div class="authoring-result" data-html5-authoring-result>
+          <div class="panel-title">Rollback apply</div>
+          <p class="muted padded">{escape(error)}</p>
+        </div>
+        """
+    status = str(getattr(result, "status", "UNKNOWN"))
+    change_id = str(getattr(result, "change_id", ""))
+    rollback_change_id = str(getattr(result, "rollback_change_id", ""))
+    version = getattr(result, "version", None)
+    version_id = str(getattr(version, "version_id", ""))
+    return f"""
+    <div
+      class="authoring-result"
+      data-html5-authoring-result
+      data-html5-authoring-change="{escape(change_id)}"
+      data-html5-version-id="{escape(version_id)}"
+    >
+      <div class="panel-title">Rollback apply</div>
+      <article class="authoring-change">
+        <strong>{escape(status)}</strong>
+        <span>{escape(rollback_change_id)}</span>
+        <small>{escape(version_id)}</small>
+      </article>
+      <p class="muted padded">Rollback применен в workspace для проекта {escape(project_id)}.</p>
     </div>
     """
 
@@ -1003,6 +1038,28 @@ def _authoring_check_item(check: object) -> str:
     """
 
 
+def _authoring_rollback_form(project_id: str, change_id: str, rollback_version_id: str) -> str:
+    return f"""
+    <form
+      class="rollback-form"
+      data-html5-authoring-rollback-form
+      method="post"
+      action="/html5/projects/{quote(project_id)}/authoring/changes/{quote(change_id, safe="")}/apply-rollback"
+      hx-post="/html5/projects/{quote(project_id)}/authoring/changes/{quote(change_id, safe="")}/apply-rollback"
+      hx-target="[data-html5-authoring-result]"
+      hx-swap="outerHTML"
+    >
+      <input type="hidden" name="expected_rollback_version_id" value="{escape(rollback_version_id)}" />
+      <input name="approved_by" placeholder="approved_by" required />
+      <input name="task_id" placeholder="task_id" />
+      <input name="session_id" placeholder="session_id" />
+      <input name="approval_note" placeholder="Комментарий" />
+      <button type="submit">Apply rollback</button>
+    </form>
+    {render_html5_authoring_rollback_result(project_id)}
+    """
+
+
 def _node_source_text(node: object | None) -> str:
     if node is None:
         return "// Модуль не найден в snapshot.\n// HTML5 IDE показывает серверный fallback без клиентского JS."
@@ -1024,7 +1081,7 @@ def _css() -> str:
 .layout{display:grid;grid-template-columns:280px minmax(0,1fr)320px;height:calc(100vh - 88px)}.panel{overflow:auto}.panel-title{padding:12px;border-bottom:1px solid var(--line);font-size:12px;font-weight:900;text-transform:uppercase;color:var(--muted)}.tree-item{display:block;padding:10px 12px;border-bottom:1px solid var(--line);text-decoration:none}.tree-item span{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tree-item small{color:var(--muted)}
 .editor{min-width:0;overflow:hidden;border-top:0;border-bottom:0}.editor-head{height:72px;border-bottom:1px solid var(--line);padding:0 14px}.editor-head h1{margin:0;font-size:18px}.search{display:flex;gap:6px}.search input{height:32px;width:260px;border:1px solid var(--line);padding:0 10px}.source-panel{height:calc(100% - 72px);display:grid;grid-template-rows:auto minmax(0,1fr);overflow:hidden}.source-head{display:flex;justify-content:space-between;gap:12px;align-items:center;min-height:54px;padding:10px 14px;border-bottom:1px solid var(--line);background:#fff}.source-head strong,.source-head small{display:block}.source-head small{color:var(--muted)}.source-head dl{display:flex;gap:12px;margin:0}.source-head div div{padding:0}.source-head dt{font-size:11px;color:var(--muted)}.source-head dd{margin:0;font-weight:800}.code{height:100%;margin:0;overflow:auto;padding:16px;background:#fbfaf7;font:13px/1.55 ui-monospace,SFMono-Regular,Consolas,monospace;white-space:pre-wrap}
 .metrics{display:grid;grid-template-columns:1fr 1fr;margin:0}.metrics div{padding:12px;border-bottom:1px solid var(--line)}.metrics dt{color:var(--muted);font-size:12px}.metrics dd{margin:2px 0 0;font-size:22px;font-weight:800}.compact{list-style:none;margin:0;padding:0}.compact li{display:flex;justify-content:space-between;padding:8px 12px;border-bottom:1px solid var(--line)}.symbol{display:grid;gap:3px;padding:10px 12px;border-bottom:1px solid var(--line);cursor:pointer}.symbol:hover{background:#f8fbff}.symbol span,.symbol small{color:var(--muted)}.symbol-focus,.symbol-reference{display:grid;gap:3px;padding:10px 12px;border-bottom:1px solid var(--line)}.symbol-focus small,.symbol-reference span,.symbol-reference small{color:var(--muted)}.report-grid{display:grid;grid-template-columns:1fr 1fr;margin:0}.report-grid div{padding:10px 12px;border-bottom:1px solid var(--line)}.report-grid dt{color:var(--muted);font-size:12px}.report-grid dd{margin:2px 0 0;font-size:20px;font-weight:900}.review-item,.authoring-change{display:grid;gap:3px;padding:10px 12px;border-bottom:1px solid var(--line)}.authoring-change[hx-get]{cursor:pointer}.authoring-change[hx-get]:hover{background:#f8fbff}.review-item span,.review-item small,.authoring-change span,.authoring-change small{color:var(--muted)}.diff-item{display:grid;grid-template-columns:72px minmax(0,1fr);gap:8px;padding:8px 12px;border-bottom:1px solid var(--line)}.diff-item span{color:var(--muted);font-weight:800}.diff-item code{white-space:pre-wrap;font-family:ui-monospace,SFMono-Regular,Consolas,monospace;font-size:12px}.status{position:fixed;bottom:0;left:0;right:0;display:flex;gap:18px;overflow:auto;height:34px;align-items:center;border-top:1px solid var(--line);background:#fff;padding:0 12px;color:var(--muted);font-size:12px}.empty-state{max-width:720px;margin:80px auto;background:#fff;border:1px solid var(--line);padding:28px}
-.setup-layout{display:grid;grid-template-columns:340px minmax(0,1fr);gap:16px;max-width:1180px;margin:18px auto;padding:0 16px}.setup-workspace{background:#f3f6fb}.setup-card{padding:16px;border-bottom:1px solid var(--line)}.setup-card h1{margin:0;font-size:24px}.setup-actions{display:flex;gap:8px;flex-wrap:wrap;margin-top:14px}.setup-main{min-height:620px}.settings-form{display:grid;grid-template-columns:2fr 1fr 1fr auto;gap:8px;align-items:end;padding:12px 16px;border-bottom:1px solid var(--line);background:#fff}.settings-form label{display:grid;gap:4px;font-size:12px;font-weight:800;color:var(--muted);text-transform:uppercase}.settings-form input{height:32px;border:1px solid var(--line);padding:0 8px}.saved{float:right;color:var(--ok);font-weight:900}.setup-actions-panel{display:flex;gap:8px;flex-wrap:wrap;align-items:end;padding:12px 16px;border-bottom:1px solid var(--line);background:#fbfcfe}.inline-form{display:flex;gap:8px;align-items:end}.inline-form label{display:grid;gap:4px;font-size:12px;font-weight:800;color:var(--muted);text-transform:uppercase}.inline-form select{height:32px;min-width:240px;border:1px solid var(--line);background:#fff;padding:0 8px}.setup-summary{display:grid;gap:0}.compact-lead{margin:0;padding:0 16px 16px}.setup-metrics,.ops-summary{display:grid;grid-template-columns:repeat(4,1fr);margin:0;border-top:1px solid var(--line)}.ops-summary{grid-template-columns:repeat(5,1fr);margin:12px 0}.setup-metrics div,.ops-summary div{padding:16px;border-right:1px solid var(--line);border-bottom:1px solid var(--line);background:#fff}.setup-metrics div:last-child,.ops-summary div:last-child{border-right:0}.setup-metrics dt,.ops-summary dt{font-size:12px;color:var(--muted)}.setup-metrics dd,.ops-summary dd{margin:4px 0 0;font-size:28px;font-weight:900}.status-pill{border:1px solid var(--line);padding:6px 10px;background:#eef6f1;color:var(--ok);font-weight:800}.flush{border-top:1px solid var(--line)}.padded{padding:12px 16px;margin:0}.setup-detail,.history-item,.source-card,.check-item{display:grid;gap:3px;padding:12px 16px;border-bottom:1px solid var(--line)}.setup-detail span,.setup-detail small,.history-item span,.history-item small,.source-card span,.source-card small,.check-item span,.check-item small,.check-head span,.check-head small{color:var(--muted)}.source-list,.history-list,.check-list{display:grid}.check-head{display:flex;gap:10px;align-items:center;padding:12px 16px;border-bottom:1px solid var(--line);background:#fff}.job-log{margin:0;padding:0;list-style:none}.job-log li{padding:8px 16px;border-bottom:1px solid var(--line);color:var(--muted);font-family:ui-monospace,SFMono-Regular,Consolas,monospace;font-size:12px}
+.setup-layout{display:grid;grid-template-columns:340px minmax(0,1fr);gap:16px;max-width:1180px;margin:18px auto;padding:0 16px}.setup-workspace{background:#f3f6fb}.setup-card{padding:16px;border-bottom:1px solid var(--line)}.setup-card h1{margin:0;font-size:24px}.setup-actions{display:flex;gap:8px;flex-wrap:wrap;margin-top:14px}.setup-main{min-height:620px}.settings-form{display:grid;grid-template-columns:2fr 1fr 1fr auto;gap:8px;align-items:end;padding:12px 16px;border-bottom:1px solid var(--line);background:#fff}.settings-form label{display:grid;gap:4px;font-size:12px;font-weight:800;color:var(--muted);text-transform:uppercase}.settings-form input{height:32px;border:1px solid var(--line);padding:0 8px}.saved{float:right;color:var(--ok);font-weight:900}.setup-actions-panel{display:flex;gap:8px;flex-wrap:wrap;align-items:end;padding:12px 16px;border-bottom:1px solid var(--line);background:#fbfcfe}.inline-form{display:flex;gap:8px;align-items:end}.inline-form label{display:grid;gap:4px;font-size:12px;font-weight:800;color:var(--muted);text-transform:uppercase}.inline-form select{height:32px;min-width:240px;border:1px solid var(--line);background:#fff;padding:0 8px}.rollback-form{display:grid;grid-template-columns:1fr 1fr;gap:8px;padding:12px;border-bottom:1px solid var(--line);background:#fbfcfe}.rollback-form input{height:32px;min-width:0;border:1px solid var(--line);padding:0 8px}.rollback-form button{grid-column:1/-1}.setup-summary{display:grid;gap:0}.compact-lead{margin:0;padding:0 16px 16px}.setup-metrics,.ops-summary{display:grid;grid-template-columns:repeat(4,1fr);margin:0;border-top:1px solid var(--line)}.ops-summary{grid-template-columns:repeat(5,1fr);margin:12px 0}.setup-metrics div,.ops-summary div{padding:16px;border-right:1px solid var(--line);border-bottom:1px solid var(--line);background:#fff}.setup-metrics div:last-child,.ops-summary div:last-child{border-right:0}.setup-metrics dt,.ops-summary dt{font-size:12px;color:var(--muted)}.setup-metrics dd,.ops-summary dd{margin:4px 0 0;font-size:28px;font-weight:900}.status-pill{border:1px solid var(--line);padding:6px 10px;background:#eef6f1;color:var(--ok);font-weight:800}.flush{border-top:1px solid var(--line)}.padded{padding:12px 16px;margin:0}.setup-detail,.history-item,.source-card,.check-item{display:grid;gap:3px;padding:12px 16px;border-bottom:1px solid var(--line)}.setup-detail span,.setup-detail small,.history-item span,.history-item small,.source-card span,.source-card small,.check-item span,.check-item small,.check-head span,.check-head small{color:var(--muted)}.source-list,.history-list,.check-list{display:grid}.check-head{display:flex;gap:10px;align-items:center;padding:12px 16px;border-bottom:1px solid var(--line);background:#fff}.job-log{margin:0;padding:0;list-style:none}.job-log li{padding:8px 16px;border-bottom:1px solid var(--line);color:var(--muted);font-family:ui-monospace,SFMono-Regular,Consolas,monospace;font-size:12px}
 @media(max-width:980px){.layout{grid-template-columns:1fr;height:auto}.tree,.inspector{max-height:320px}.editor{min-height:520px}.hero{display:block}.shell{padding:16px}}
 @media(max-width:980px){.setup-layout{grid-template-columns:1fr}.setup-metrics{grid-template-columns:1fr 1fr}.settings-form{grid-template-columns:1fr}}
 """

services/api-server/src/api_server/main.py

@@ -38,6 +38,7 @@ from pydantic import BaseModel, Field
 from api_server.html5 import (
     render_html5_authoring_changes,
     render_html5_authoring_change_detail,
+    render_html5_authoring_rollback_result,
     render_html5_editor,
     render_html5_index,
     render_html5_project_setup,
@@ -1750,6 +1751,24 @@ async def html5_project_authoring_change_detail(project_id: str, change_id: str)
     )
 
 
+@app.post("/html5/projects/{project_id}/authoring/changes/{change_id}/apply-rollback")
+async def html5_project_authoring_apply_rollback(project_id: str, change_id: str, request: Request) -> Response:
+    form = await _html5_form_data(request)
+    payload = AuthoringApplyRollbackRequest(
+        expected_rollback_version_id=_form_value(form, "expected_rollback_version_id") or "",
+        approved_by=_form_value(form, "approved_by") or "",
+        approval_note=_form_value(form, "approval_note"),
+        task_id=_form_value(form, "task_id"),
+        session_id=_form_value(form, "session_id"),
+    )
+    try:
+        result = await authoring_apply_rollback(project_id, change_id, payload)
+        html = render_html5_authoring_rollback_result(project_id, result)
+    except HTTPException as error:
+        html = render_html5_authoring_rollback_result(project_id, error=str(error.detail))
+    return Response(html, media_type="text/html; charset=utf-8")
+
+
 @app.get("/html5/projects/{project_id}/setup")
 async def html5_project_setup(project_id: str) -> Response:
     setup = _project_setup_response(project_id)

services/api-server/tests/test_api.py

@@ -2361,11 +2361,27 @@ def test_authoring_context_and_completion_preview(tmp_path: Path):
     assert "text/html" in html5_detail.headers["content-type"]
     assert "data-html5-authoring-detail" in html5_detail.text
     assert "Rollback preview" in html5_detail.text
+    assert "data-html5-authoring-rollback-form" in html5_detail.text
+    assert f'hx-post="/html5/projects/{project_id}/authoring/changes/{apply_payload["change_id"]}/apply-rollback"' in html5_detail.text
+    assert "data-html5-authoring-result" in html5_detail.text
     assert "READY" in html5_detail.text
     assert "REMOVE" in html5_detail.text
     assert apply_payload["change_id"] in html5_detail.text
     assert "<html" not in html5_detail.text
 
+    html5_blocked_apply = client.post(
+        f"/html5/projects/{project_id}/authoring/changes/{apply_payload['change_id']}/apply-rollback",
+        data={
+            "expected_rollback_version_id": rollback_payload["rollback_version_id"],
+            "approved_by": "dev.ivan",
+        },
+    )
+    assert html5_blocked_apply.status_code == 200
+    assert "text/html" in html5_blocked_apply.headers["content-type"]
+    assert "data-html5-authoring-result" in html5_blocked_apply.text
+    assert "Task id is required" in html5_blocked_apply.text
+    assert "<html" not in html5_blocked_apply.text
+
     rollback_apply = client.post(
         f"/projects/{project_id}/authoring/changes/{apply_payload['change_id']}/apply-rollback",
         json={