okstra 0.186.1 → 0.186.3

package/runtime/python/okstra_ctl/design_surfaces.py

@@ -181,6 +181,84 @@ def _stage_rows(planning: Mapping[str, Any]) -> dict[int, Mapping[str, Any]]:
 
 
 _LINE_RANGE_SUFFIX = re.compile(r":\d+(?:-\d+)?$")
+_PAREN_SUFFIX = re.compile(r"\s*\([^)]*\)\s*$")
+
+
+def _split_declared_paths(raw: str) -> list[str]:
+    """쉼표·줄바꿈으로 이어진 경로를 파일 단위로 나눈다. `{a,b}` 안 쉼표는 유지.
+
+    `fileStructure.path` 는 원래 열 수 있는 경로 하나인데, 계획이 여러 파일을
+    한 칸에 이어 쓰면 추출기가 그 문자열 전체를 한 경로로 보고 스테이지 매핑에
+    실패한다.
+    """
+    parts: list[str] = []
+    buf: list[str] = []
+    depth = 0
+    for char in raw:
+        if char == "{":
+            depth += 1
+            buf.append(char)
+        elif char == "}":
+            depth = max(0, depth - 1)
+            buf.append(char)
+        elif char in ",\n" and depth == 0:
+            token = "".join(buf).strip()
+            if token:
+                parts.append(token)
+            buf = []
+        else:
+            buf.append(char)
+    token = "".join(buf).strip()
+    if token:
+        parts.append(token)
+    return parts
+
+
+def _step_files_cells(step: Mapping[str, Any]) -> list[str]:
+    raw = step.get("files")
+    if isinstance(raw, list):
+        return [_normalise(item) for item in raw if item]
+    text = _normalise(raw)
+    return [text] if text else []
+
+
+def _files_cell_tokens(cell: str) -> list[str]:
+    tokens: list[str] = []
+    for part in _split_declared_paths(cell) or [cell]:
+        token = _LINE_RANGE_SUFFIX.sub("", part)
+        token = _PAREN_SUFFIX.sub("", token).strip()
+        if token:
+            tokens.append(token)
+    return tokens
+
+
+def _cell_covers_path(cell: str, path: str) -> bool:
+    path_pattern = rf"(?<![\w./@-]){re.escape(path)}(?![\w./@-])"
+    if re.search(path_pattern, cell) is not None:
+        return True
+    for token in _files_cell_tokens(cell):
+        if token == path:
+            return True
+        if "*" in token and fnmatch.fnmatch(path, token):
+            return True
+    return False
+
+
+def _stages_touching_path(
+    path: str,
+    stages: Mapping[int, Mapping[str, Any]],
+) -> list[int]:
+    hits: list[int] = []
+    for stage_number, stage in stages.items():
+        cells = [
+            cell
+            for step in stage.get("stepwiseExecution") or []
+            if isinstance(step, Mapping)
+            for cell in _step_files_cells(step)
+        ]
+        if any(_cell_covers_path(cell, path) for cell in cells):
+            hits.append(stage_number)
+    return hits
 
 
 def _stages_for_selected_path(
@@ -200,21 +278,27 @@ def _stages_for_selected_path(
     Zero stages is still an error: the recommended option declares a file that
     no step creates or edits.
     """
-    normalised = _LINE_RANGE_SUFFIX.sub("", _normalise(path))
-    path_pattern = rf"(?<![\w./@-]){re.escape(normalised)}(?![\w./@-])"
-    matched = []
-    for stage_number, stage in stages.items():
-        files = [
-            _normalise(step.get("files"))
-            for step in stage.get("stepwiseExecution") or []
-            if isinstance(step, Mapping)
-        ]
-        if any(re.search(path_pattern, cell) is not None for cell in files):
-            matched.append(stage_number)
-    if not matched:
+    declared = [
+        _LINE_RANGE_SUFFIX.sub("", _normalise(part))
+        for part in (_split_declared_paths(path) or [path])
+    ]
+    declared = [part for part in declared if part]
+    if not declared:
         raise DesignSurfaceError(
             f"selected option path {path!r} is not mapped to a stage"
         )
+    matched: list[int] = []
+    seen: set[int] = set()
+    for part in declared:
+        hits = _stages_touching_path(part, stages)
+        if not hits:
+            raise DesignSurfaceError(
+                f"selected option path {part!r} is not mapped to a stage"
+            )
+        for stage_number in hits:
+            if stage_number not in seen:
+                seen.add(stage_number)
+                matched.append(stage_number)
     return matched
 
 
@@ -243,12 +327,13 @@ def detect_design_surfaces(
             continue
         path = str(row.get("path") or "")
         for stage_number in _stages_for_selected_path(path, stages):
-            for kind, evidence in _matching_rule_evidence(
-                step=None,
-                field="files",
-                value=path,
-            ):
-                grouped.setdefault((stage_number, kind), []).append(evidence)
+            for declared in _split_declared_paths(path) or [path]:
+                for kind, evidence in _matching_rule_evidence(
+                    step=None,
+                    field="files",
+                    value=declared,
+                ):
+                    grouped.setdefault((stage_number, kind), []).append(evidence)
     rule_order = {rule.kind: index for index, rule in enumerate(RULES)}
     return [
         DesignSurfaceTrigger(stage, kind, tuple(grouped[(stage, kind)]))

package/runtime/python/okstra_ctl/implementation_direction.py

@@ -13,6 +13,7 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, Mapping
 
+from .clarification_items import USER_INPUT_BLOCKS, progress_blocking_ids
 from .final_report_paths import final_report_data_path
 from .exact_coverage import ExactCoverageError, calculate_plan_exact_coverage
 from .final_report_schema import (
@@ -309,15 +310,13 @@ def _selected_option(
 def _validate_no_blockers(data: Mapping[str, Any], option: Mapping[str, Any]) -> None:
     if option.get("safetyBlockers") or option.get("unresolvedFeasibilityFacts"):
         raise DirectionSelectionError("selected candidate has a safety blocker")
-    for row in data.get("clarificationItems") or ():
-        if (
-            isinstance(row, Mapping)
-            and row.get("blocks") == "next-phase"
-            and row.get("status") not in {"resolved", "obsolete"}
-        ):
-            raise DirectionSelectionError(
-                "selection report has an unresolved next-phase blocker"
-            )
+    blockers = progress_blocking_ids(
+        data.get("clarificationItems"), USER_INPUT_BLOCKS
+    )
+    if blockers:
+        raise DirectionSelectionError(
+            "selection report has an unresolved next-phase blocker"
+        )
 
 
 def _direction_payload(option: Mapping[str, Any]) -> dict[str, Any]:

package/runtime/python/okstra_ctl/next_phase.py

@@ -9,7 +9,10 @@ from __future__ import annotations
 
 from typing import Any, Mapping
 
-from okstra_ctl.clarification_items import APPROVAL_BLOCKS, UNRESOLVED_STATUSES
+from okstra_ctl.clarification_items import (
+    APPROVAL_BLOCKS,
+    progress_blocking_ids,
+)
 
 STATUS_READY = "ready"
 STATUS_PENDING = "pending"
@@ -219,24 +222,9 @@ def _from_option_selection(report_data: Mapping[str, Any]) -> dict[str, str]:
 
 
 def _unresolved_approval_ids(report_data: Mapping[str, Any]) -> list[str]:
-    rows = report_data.get("clarificationItems")
-    if not isinstance(rows, list):
-        return []
-    ids: list[str] = []
-    for row in rows:
-        if not isinstance(row, Mapping):
-            continue
-        blocks = str(row.get("blocks") or "").strip().lower()
-        status = str(row.get("status") or "").strip().lower()
-        row_id = row.get("id")
-        if (
-            blocks in APPROVAL_BLOCKS
-            and status in UNRESOLVED_STATUSES
-            and isinstance(row_id, str)
-            and row_id
-        ):
-            ids.append(row_id)
-    return ids
+    return progress_blocking_ids(
+        report_data.get("clarificationItems"), APPROVAL_BLOCKS
+    )
 
 
 def _planning_approval_block_reason(
@@ -245,8 +233,10 @@ def _planning_approval_block_reason(
     """plan-ready 인데 승인할 수 없으면 근거, 아니면 빈 문자열.
 
     자문 게이트(`passed-with-dissent`)와 재현 실패 `has-dissent` 는 여기 안
-    들어온다. 차단은 `blocked-by-disagreement` / `aborted-non-result` 와
-    `Status` 가 open/answered 인 `Blocks=approval` 행뿐이다.
+    들어온다. 차단은 `aborted-non-result` 와, 사용자가 아직 진행 처분을
+    고르지 않은 `Blocks=approval` 행이다. `blocked-by-disagreement` 는 그
+    행들이 전부 `accept-risk` / `select` / `answer` 이면 증거가 된 뒤라
+    포인터를 막지 않는다.
     """
     ids = _unresolved_approval_ids(report_data)
     if ids:
@@ -261,11 +251,23 @@ def _planning_approval_block_reason(
     gate = ""
     if isinstance(verification, Mapping):
         gate = str(verification.get("gateResult") or "").strip().lower()
-    if gate in _BLOCKING_PLAN_GATES:
+    if gate == "aborted-non-result":
         return (
             f"계획 본문 게이트가 `{gate}` 이라 승인할 수 없습니다. "
             "구현을 시작하거나 계획 단계를 바로 다시 돌리지 마세요."
         )
+    if gate == "blocked-by-disagreement":
+        approval_rows = [
+            row
+            for row in (report_data.get("clarificationItems") or [])
+            if isinstance(row, Mapping)
+            and str(row.get("blocks") or "").strip().lower() in APPROVAL_BLOCKS
+        ]
+        if not approval_rows:
+            return (
+                f"계획 본문 게이트가 `{gate}` 이라 승인할 수 없습니다. "
+                "구현을 시작하거나 계획 단계를 바로 다시 돌리지 마세요."
+            )
     return ""
 
 

package/runtime/python/okstra_ctl/render_final_report.py

@@ -44,6 +44,7 @@ from typing import Any
 import okstra_vendor  # noqa: F401 — side effect: sys.modules aliases
 from jinja2 import ChainableUndefined, Environment, FileSystemLoader
 
+from okstra_ctl.clarification_items import USER_INPUT_BLOCKS, progress_blocking_ids
 from okstra_ctl.final_report_schema import (
     SchemaError,
     load_schema_for_data,
@@ -555,14 +556,9 @@ def _ai_markdown_context(data: dict, schema: dict | None) -> dict:
     )
     context["aiTaskProperty"] = TASK_TYPE_DATA_PROPERTY.get(task_type, "")
     context["aiTaskTemplate"] = _markdown_task_template(task_type)
-    context["aiBlockingIds"] = [
-        row.get("id")
-        for row in data.get("clarificationItems", [])
-        if isinstance(row, dict)
-        and row.get("status") in {"open", "answered"}
-        and row.get("blocks") in {"approval", "next-phase"}
-        and isinstance(row.get("id"), str)
-    ]
+    context["aiBlockingIds"] = progress_blocking_ids(
+        data.get("clarificationItems", []), USER_INPUT_BLOCKS
+    )
     sections = ReportSections(data, schema or {})
     context["md"] = sections.section
     context["md_rest"] = sections.rest

package/runtime/python/okstra_ctl/report_assembly.py

@@ -9,6 +9,7 @@ from pathlib import Path
 from typing import Any, Callable, Mapping, Sequence
 
 from .agent_activity import agent_activity_rows
+from .clarification_items import clarification_disposition, row_blocks_progress
 from .final_report_schema import load_schema_version, validate
 from .report_inputs import ReportInputPath, report_input_paths, uses_report_contract_v3
 from .json_boundary import JsonBoundaryError, load_owned_object, serialize_owned_object
@@ -330,7 +331,10 @@ def _attach_metadata(data: dict[str, Any], manifest: Mapping[str, Any]) -> None:
     data["meta"] = {"reportLanguage": str(manifest.get("reportLanguage") or "en")}
     clarifications = data.get("clarificationItems") or []
     blocked = any(
-        isinstance(row, Mapping) and row.get("status") in {"open", "answered"}
+        isinstance(row, Mapping)
+        and row_blocks_progress(
+            str(row.get("status") or ""), clarification_disposition(row)
+        )
         for row in clarifications
     )
     frontmatter = {

package/runtime/python/okstra_ctl/run.py

@@ -49,8 +49,10 @@ from .analysis_inputs import (
 )
 from .stage_fix_carry import derive_stage_fix_carry
 from .clarification_items import (
+    APPROVAL_BLOCKS,
     attached_user_responses_section,
     clarification_response_with_sidecars,
+    progress_blocking_ids,
     scan_approval_gate,
 )
 from .error_report import prior_run_error_digest
@@ -283,6 +285,29 @@ def _data_json_gate_result(data: dict) -> str:
     return str(verification.get("gateResult") or "").strip().lower()
 
 
+def _blocking_gate_survives_user_decision(data: dict, gate: str) -> bool:
+    """사용자가 진행 처분을 골라도 이 게이트 값이 승인을 막는가.
+
+    `aborted-non-result` 는 투표가 없어 사용자 판단의 대상이 아니다.
+    `blocked-by-disagreement` 는 승인 행이 있고 그 행이 전부 진행 처분이면
+    DISAGREE 를 증거로 남긴 채 막지 않는다. 승인 행이 없으면 판단 기록이
+    없으므로 막는다.
+    """
+    if gate != "blocked-by-disagreement":
+        return True
+    rows = data.get("clarificationItems")
+    if not isinstance(rows, list):
+        return True
+    has_approval_row = any(
+        isinstance(row, dict)
+        and str(row.get("blocks") or "").strip().lower() in APPROVAL_BLOCKS
+        for row in rows
+    )
+    return (not has_approval_row) or bool(
+        progress_blocking_ids(rows, APPROVAL_BLOCKS)
+    )
+
+
 def _record_approved_flag(path: Path) -> bool | None:
     """정본 `frontmatter.approved`. 정본이 없으면(schema-v1) None."""
     loaded = _load_final_report_data_if_present(path)
@@ -317,7 +342,10 @@ def _reject_blocking_plan_body_gate(path: Path, body: str, *, action: str) -> No
     if loaded is not None:
         data_path, data = loaded
         data_gate = _data_json_gate_result(data)
-        if data_gate in BLOCKING_PLAN_BODY_GATES:
+        if (
+            data_gate in BLOCKING_PLAN_BODY_GATES
+            and _blocking_gate_survives_user_decision(data, data_gate)
+        ):
             raise PrepareError(
                 f"{action} rejected because approved plan data.json Gate result is "
                 f"`{data_gate}`: {data_path}\n"
@@ -421,7 +449,10 @@ def _set_data_json_approved_true_if_present(path: Path) -> bool:
         return False
     data_path, data = loaded
     data_gate = _data_json_gate_result(data)
-    if data_gate in BLOCKING_PLAN_BODY_GATES:
+    if (
+        data_gate in BLOCKING_PLAN_BODY_GATES
+        and _blocking_gate_survives_user_decision(data, data_gate)
+    ):
         raise PrepareError(
             f"--approve rejected because approved plan data.json Gate result is "
             f"`{data_gate}`: {data_path}"
@@ -555,7 +586,7 @@ def _validate_approved_plan(path: str) -> None:
     _reject_blocking_plan_body_gate(p, "", action="approved plan validation")
     _validate_approved_plan_conformance(p)
     # frontmatter approved == true 상태. §1 Clarification Items 의
-    # Blocks=approval 행이 아직 open/answered 면 승인을 무효화한다.
+    # Blocks=approval 행이 아직 진행 처분 없이 열려 있으면 승인을 무효화한다.
     scan = scan_approval_gate(p)
     if scan.unreadable_reason:
         raise PrepareError(

package/runtime/python/okstra_ctl/user_response.py

@@ -57,6 +57,7 @@ from okstra_ctl.paths import resolve_under_root
 from okstra_ctl.run_context import dir_flock
 from okstra_ctl.clarification_items import (
     ClarificationItem,
+    UNRESOLVED_STATUSES,
     read_clarification_rows,
     sidecar_answers,
     _section_1_slice,
@@ -885,7 +886,7 @@ def _open_blocker_rows(report_path: Path) -> list[dict[str, Any]]:
         row
         for row in rows
         if row["item"].blocks in {"approval", "next-phase"}
-        and row["item"].status in {"open", "answered"}
+        and row["item"].status in UNRESOLVED_STATUSES
         and row["item"].row_id not in answered
     ]
 

package/runtime/python/okstra_ctl/worker_prompt_body.py

@@ -6,25 +6,14 @@ from typing import Any, Mapping, Sequence
 from .worker_prompt_policy import PromptPlan
 
 
-_ANALYSIS_WORKER_LABELS = {
-    "claude": "Claude worker",
-    "codex": "Codex worker",
-    "antigravity": "Antigravity worker",
-}
-
-
 def analysis_worker_label(worker_id: str) -> str:
     """The role label this worker's prompt body is titled with.
 
-    The map above only supplies display capitalization for the three providers
-    that predate it; every other worker id (`grok`, `kimi`, a user-installed
-    adapter) takes the id itself. Both branches are identity deltas the equality
-    group must normalize away, so `worker_prompt_contract` erases exactly what
-    this function returns rather than restating the map — an enumeration that
-    covered only the map's keys let `# grok worker Dispatch` through and failed
-    every roster carrying grok or kimi before publication.
+    The label is `{worker_id} worker` for every id. A three-provider display
+    map made grok/kimi a second branch, and any consumer that restated the map
+    treated those ids as unnamed.
     """
-    return _ANALYSIS_WORKER_LABELS.get(worker_id, f"{worker_id} worker")
+    return f"{worker_id} worker"
 
 
 def analysis_prompt_body(

package/runtime/python/okstra_ctl/worker_prompt_contract.py

@@ -159,11 +159,8 @@ def _worker_label_pattern(worker_ids: Iterable[str]) -> re.Pattern[str] | None:
     """Match the role label the body renderer titled each compared worker with.
 
     Built from `analysis_worker_label`, the same function that writes the label,
-    so a provider outside its display map (`grok`, `kimi`) is covered as it
-    comes. Restating the map here is what forked the roster: the enumeration
-    named only Claude / Codex / Antigravity, `# grok worker Dispatch` survived
-    normalization, and every run rostering grok or kimi failed the equality group
-    before publication with no prompt defect to fix.
+    so every worker id in the comparison group is covered. Restating a
+    three-provider list here is what forked the roster.
     """
     labels = sorted(
         {

package/runtime/skills/okstra-run/SKILL.md

@@ -390,4 +390,4 @@ Do not read the wizard state file directly. `okstra wizard outcome` exposes any
 
 - Echo each captured answer (`result.echo`) on one short line so the user sees what was registered.
 - Never invent identity; if a `text` prompt returns an empty answer where the wizard rejects it, the user must retry.
-- After Step 6, begin the lead workflow without re-summarizing the skill itself. For a single run, the end of Step 6 is the end of the run — but in an unattended chain where `orchestration.chainStages` has 2+ elements, repeat Step 6 per stage until Step 7's queue is empty (or it stops at a "not ready" / exception gate), then finish. After an `implementation-planning` run, read `workflow.awaitingApproval` and the next-phase pointer from the task manifest. If awaiting approval, the next sentence to the user is to approve the plan (`okstra-run` → `implementation`, or `--approve`). Do not start another planning run. If the pointer is `blocked`, name the rationale and send the user to `okstra-user-response`; do not re-run planning until those answers exist.
+- After Step 6, begin the lead workflow without re-summarizing the skill itself. For a single run, the end of Step 6 is the end of the run — but in an unattended chain where `orchestration.chainStages` has 2+ elements, repeat Step 6 per stage until Step 7's queue is empty (or it stops at a "not ready" / exception gate), then finish. When the lead (or this skill, after the lead returns) reports the run over, close with the user's next action — one command they can run now. A prohibition is not a next action. After `implementation-planning`, read `workflow.awaitingApproval` and the next-phase pointer from the task manifest. Open `blocks: approval` rows → `/okstra-user-response`. A recorded `accept-risk` / `select` / `answer` is not an open blocker. Awaiting approval → `/okstra-run` → `implementation` or `--approve` (do not start another planning run). Phase 7 `validate-run` failed → one-line cause, then `/okstra-run` to re-run this phase with the sidecar, or `/okstra-inspect recap`. Pointer `status: ready` → `/okstra-run` for that phase. Otherwise `/okstra-inspect status`.

package/runtime/skills/okstra-user-response/SKILL.md

@@ -59,6 +59,8 @@ Read the absolute path in the fixed `Relay contract` line. In that file, take th
 - When `native-single` is available and the option count fits `nativeLimits` (unique labels, within min/max): call `interactions.native-single.function` once with one question and every option as `{label, description}` in original order. Do not print a numbered list in chat while the native tool is available. Claude Code's function is `AskUserQuestion`, Grok's is `ask_user_question`, Codex's is `request_user_input` — copy the relay field; do not substitute one name for another.
 - Otherwise render a 1-based numbered Markdown list and wait for the next message. Do not drop options to force the native tool.
 
+Pass only the choices this step already owns — the `list-view` rows, the report `options[]`, or the two confirmation labels. Do not append `Enter directly`. Claude Other, Grok `z`, and Codex's free-form row already collect a custom answer; that row is `Enters an answer`. When native-single is unavailable, a next message that is not a listed label or its 1-based number is the same `Enters an answer`. Do not ask a second question for the custom value.
+
 Never invent a picker function. Never ask the user to type a number when the native tool is available.
 
 ## Step 1: Select a task from the fixed list view
@@ -69,7 +71,7 @@ okstra user-response list-view --home <resolved-home> --project <projectId> --li
 
 The view gives `Task key`, `Task type`, `Report`, open-item counts, and readability status. If the count is zero, answer `No task has open clarification items.` and stop. Do not continue with an unreadable entry.
 
-Present up to three task choices through the host picker. The final picker option is `Enter directly`, where the user may provide a report path or task key.
+Present up to three task choices through the host picker. A host free-text row or unmatched next message is the report path or task key.
 
 ## Step 2: Read the fixed report view
 
@@ -79,7 +81,7 @@ okstra user-response show-view --report <reportPath> --project-root <projectRoot
 
 The view contains the report identity, contract version, every open clarification question, its expected form, its current response and disposition, its options, approval context, plan option candidates, current plan decision, resolved context, why the row is asked, linked plan items, and cited artifacts. Question text and `options[]` come only from this view. Do not open a report record to select fields.
 
-Each entry in `options[]` corresponds to `{role, answer, rationale, scopeImpact, addedWork, directionChange, disposition}`. Put the `recommended` option first and suffix its label with `(Recommended)`. Then put the alternatives in view order and finish with `Enter directly`.
+Each entry in `options[]` corresponds to `{role, answer, rationale, scopeImpact, addedWork, directionChange, disposition}`. Put the `recommended` option first and suffix its label with `(Recommended)`. Then put the alternatives in view order.
 
 Contract 3.0 options also expose `reach` and `scopeEffects`. Contract 3.0 approval-blocking rows expose `approvalContext`.
 

package/runtime/templates/reports/html/assets/base.css

@@ -133,27 +133,34 @@ button[data-action="export-user-response"]:hover { background: color-mix(in srgb
   display: flex;
   flex-direction: column;
   align-items: flex-end;
+  gap: .4rem;
 }
-.back-to-top {
+.back-to-top-actions { display: flex; gap: .4rem; }
+.back-to-top,
+.back-to-top-toggle {
   padding: .55rem .9rem;
   border-radius: 8px;
-  border: 1px solid color-mix(in srgb, CanvasText 28%, transparent);
-  background: color-mix(in srgb, Canvas 92%, CanvasText 8%);
+  border: 1px solid color-mix(in srgb, CanvasText 40%, transparent);
+  background: Canvas;
   color: CanvasText;
   text-decoration: none;
   font: inherit;
   font-size: .9rem;
-  box-shadow: 0 2px 8px color-mix(in srgb, CanvasText 18%, transparent);
+  font-weight: 600;
+  cursor: pointer;
+  box-shadow: 0 2px 10px color-mix(in srgb, CanvasText 28%, transparent);
 }
-.back-to-top:hover { background: color-mix(in srgb, CanvasText 12%, Canvas); }
-.back-to-top:focus-visible { outline: 2px solid Highlight; outline-offset: 2px; }
+.back-to-top:hover,
+.back-to-top-toggle:hover { background: color-mix(in srgb, CanvasText 12%, Canvas); }
+.back-to-top:focus-visible,
+.back-to-top-toggle:focus-visible { outline: 2px solid Highlight; outline-offset: 2px; }
 .back-to-top-index {
   display: none;
   box-sizing: border-box;
   width: min(22rem, calc(100vw - 2.4rem));
   max-height: min(70vh, 32rem);
   overflow: auto;
-  margin: 0 0 .4rem;
+  margin: 0;
   padding: .8rem 1rem;
   border-radius: 12px;
   border: 1px solid color-mix(in srgb, CanvasText 14%, transparent);
@@ -163,10 +170,13 @@ button[data-action="export-user-response"]:hover { background: color-mix(in srgb
 .back-to-top-index ol { margin: 0; padding-left: 1.2rem; }
 .back-to-top-index li { margin: .25em 0; }
 .back-to-top-index a { color: inherit; }
+.back-to-top-wrap.is-open .back-to-top-index { display: block; }
 @media (hover: hover) {
-  .back-to-top-wrap:hover .back-to-top-index,
-  .back-to-top-wrap:focus-within .back-to-top-index { display: block; }
+  .back-to-top-wrap:hover .back-to-top-index { display: block; }
 }
+.clarification-option { cursor: pointer; border-radius: 10px; padding: .6rem .7rem; }
+.clarification-option.is-selected { background: color-mix(in srgb, Highlight 12%, Canvas); }
+.clarification-item.is-closed .clarification-option { cursor: default; }
 /* A seven-column table needs 42em of floor, more than a phone can give. */
 @media (max-width: 640px) { section { padding: 1rem; } .visualization { display: none; } th, td { min-width: 4.5em; } nav.report-index ol { columns: 1; } }
 @media print { .skip-link, .back-to-top-wrap, script { display: none !important; } body { color: #000; background: #fff; } section { break-inside: avoid; border-color: #bbb; } .visualization-fallback { display: table; } }

package/runtime/templates/reports/html/assets/base.js

@@ -2,4 +2,25 @@
   "use strict";
 
   document.documentElement.classList.add("js-enabled");
+
+  // 목차는 hover 만으로는 안 열린다. 클릭으로 연다.
+  var wrap = document.querySelector(".back-to-top-wrap");
+  var toggle = wrap && wrap.querySelector(".back-to-top-toggle");
+  if (!wrap || !toggle) return;
+
+  function setOpen(open) {
+    wrap.classList.toggle("is-open", open);
+    toggle.setAttribute("aria-expanded", open ? "true" : "false");
+  }
+
+  toggle.addEventListener("click", function (event) {
+    event.stopPropagation();
+    setOpen(!wrap.classList.contains("is-open"));
+  });
+  document.addEventListener("click", function (event) {
+    if (!wrap.contains(event.target)) setOpen(false);
+  });
+  document.addEventListener("keydown", function (event) {
+    if (event.key === "Escape") setOpen(false);
+  });
 })();

package/runtime/templates/reports/html/base.template.html

@@ -115,8 +115,11 @@
     <pre id="user-response-output" aria-live="polite"></pre>
   </footer>{% endif %}
   <div class="back-to-top-wrap">
-    <nav class="back-to-top-index" aria-label="{{ t('base.contents') }}"><!--report-index-items--></nav>
-    <a class="back-to-top" href="#top">{{ t('base.back-to-top') }}</a>
+    <nav class="back-to-top-index" id="back-to-top-index" aria-label="{{ t('base.contents') }}"><!--report-index-items--></nav>
+    <div class="back-to-top-actions">
+      <button type="button" class="back-to-top-toggle" aria-expanded="false" aria-controls="back-to-top-index">{{ t('base.contents') }}</button>
+      <a class="back-to-top" href="#top">{{ t('base.back-to-top') }}</a>
+    </div>
   </div>
   <script id="run-meta" type="application/json">{{ {
     "task-key": runMeta.task_key,

package/runtime/templates/reports/html/i18n/en.json

@@ -159,6 +159,7 @@
       "count-answered-questions": "{count} answered questions",
       "your-answer-to-id": "Your answer to {id}",
       "choose-one": "Choose one",
+      "other-answer": "Other (type your own)",
       "recommended": "Recommended",
       "scope-impact": "Scope",
       "added-work": "Added work",

package/runtime/templates/reports/html/i18n/ko.json

@@ -159,6 +159,7 @@
       "count-answered-questions": "답한 질문 {count}건",
       "your-answer-to-id": "{id}에 대한 답변",
       "choose-one": "하나를 선택하세요",
+      "other-answer": "기타 (직접 입력)",
       "recommended": "권장",
       "scope-impact": "범위",
       "added-work": "추가 작업",

package/runtime/templates/reports/html/macros/forms.html

@@ -78,7 +78,7 @@
   {% if options %}
   <ol class="clarification-options">
     {% for option in options %}
-    <li class="clarification-option{% if option.role == 'recommended' %} is-recommended{% endif %}">
+    <li class="clarification-option{% if option.role == 'recommended' %} is-recommended{% endif %}" data-option-value="{{ option.answer }}">
       <p class="clarification-option-answer">{{ option.answer }}{% if option.role == 'recommended' %} <span class="badge">{{ t('macros.forms.recommended') }}</span>{% endif %}</p>
       {% if option.disposition | default(None) %}<p class="clarification-option-disposition"><code>{{ option.disposition }}</code></p>{% endif %}
       <p class="clarification-option-rationale">{{ option.rationale }}</p>
@@ -92,11 +92,16 @@
   </ol>
   {% endif %}
   <label for="response-{{ row.id }}">{{ t('macros.forms.your-answer-to-id') | replace('{id}', row.id) }}</label>
-  {% if row.kind == 'decision' and approval_context and options %}
+  {% if options %}
+  {% set pick = namespace(has_other=false, current=row.userInput | default('')) %}
+  {% for option in options %}{% if option.answer == '__other__' %}{% set pick.has_other = true %}{% endif %}{% endfor %}
+  {% set is_custom = pick.current and pick.current not in (options | map(attribute='answer') | list) %}
   <select id="response-{{ row.id }}" data-response-id="{{ row.id }}"{% if is_closed %} disabled{% endif %}>
     <option value="">{{ t('macros.forms.choose-one') }}</option>
-    {% for option in options %}<option value="{{ option.answer }}" data-disposition="{{ option.disposition | default('') }}"{% if option.role == 'recommended' %} data-recommended="true"{% endif %}{% if row.userInput | default('') == option.answer %} selected{% endif %}>{{ option.answer }}</option>{% endfor %}
+    {% for option in options %}<option value="{{ option.answer }}" data-disposition="{{ option.disposition | default('') }}"{% if option.role == 'recommended' %} data-recommended="true"{% endif %}{% if pick.current == option.answer %} selected{% endif %}>{{ option.answer }}</option>{% endfor %}
+    {% if not pick.has_other %}<option value="__other__"{% if is_custom %} selected{% endif %}>{{ t('macros.forms.other-answer') }}</option>{% endif %}
   </select>
+  {% if not pick.has_other %}<textarea data-other-for="{{ row.id }}" rows="2"{% if is_closed %} disabled{% endif %}{% if not is_custom %} hidden{% endif %}>{% if is_custom %}{{ pick.current }}{% endif %}</textarea>{% endif %}
   {% else %}
   <textarea id="response-{{ row.id }}" data-response-id="{{ row.id }}" rows="4"{% if is_closed %} disabled{% endif %}>{{ row.userInput | default('') }}</textarea>
   {% endif %}