okstra 0.202.0 → 0.204.0

package/runtime/python/okstra_ctl/time_report.py

@@ -265,7 +265,8 @@ _CLI_EPILOG = r"""Usage:
 
 Output: JSON { ok, taskKey, byTaskType[], grandTotal, perWorker{}, perRunWallClock[],
 phaseTimelines[], unavailable[] }. All durations are raw milliseconds — the caller
-formats HH:MM:SS and renders tables. This is read-only; it never mutates task state.
+formats HH:MM:SS and renders tables. Resolving a task may record a finished implementation outcome in its task
+manifest, the task catalog, and consumers.jsonl; nothing else is written.
 """
 
 

package/runtime/python/okstra_ctl/usage_report.py

@@ -274,8 +274,10 @@ def _positive_days(value: str) -> int:
 _CLI_EPILOG = r"""Usage:
   okstra usage-report [--days <positive-int>] [--project-root <dir>] [--cwd <dir>] [--json]
 
-Read-only. Prints JSON containing run coverage, raw and billable-equivalent
+Prints JSON containing run coverage, raw and billable-equivalent
 tokens, known USD cost, CPU-sum time, and wall-clock time grouped by task type.
+Resolving a task may record a finished implementation outcome in its task
+manifest, the task catalog, and consumers.jsonl; nothing else is written.
 The default window is the current project's last 30 days.
 """
 

package/runtime/python/okstra_ctl/wizard/confirmation.py

@@ -354,15 +354,9 @@ def confirmation_block(state: WizardState) -> str:
             lines.append(reverify_line)
     if state.selected_direction_path:
         lines.append(f"  selected-direction: {state.selected_direction_path}")
-    if state.task_type == "release-handoff" and state.handoff_mode:
-        scope = (
-            _msg(state.workspace_root, "confirmation",
-                 "handoff_scope_whole_task")
-            if state.handoff_mode == "whole-task"
-            else _msg(state.workspace_root, "confirmation",
-                      "handoff_scope_stage_group",
-                      stages=state.handoff_stages)
-        )
+    if state.task_type == "release-handoff" and state.handoff_stages:
+        scope = _msg(state.workspace_root, "confirmation",
+                     "handoff_scope_stages", stages=state.handoff_stages)
         lines.append(f"  handoff scope : {scope}")
     if state.task_type == "release-handoff" and state.pr_template_path:
         lines.append(f"  pr-template   : {state.pr_template_path} ({state.pr_template_scope or 'once'})")

package/runtime/python/okstra_ctl/wizard/ids.py

@@ -123,7 +123,7 @@ _BRIEF_PREFIX = "__brief:"
 
 # brief 본문 머리 인용구에 okstra-brief-gen 이 적어 넣는 진입 phase 줄.
 # `templates/reports/brief.template.md` 의 "> - Recommended next phase: <...>" 이고,
-# 값 규칙은 `docs/for-ai/skills/okstra-brief-gen.md` § "Recommended next phase".
+# 값 규칙은 `skills/okstra-brief-gen/SKILL.md` § "Step 6: Recommend next okstra phase".
 # 목록 표시(`- `)는 머리 인용구의 필드를 한 줄씩 렌더링시키려고 붙은 것이라
 # 선택적으로 받는다 — 그 표시가 없던 옛 brief 도 그대로 읽힌다.
 _BRIEF_NEXT_PHASE_RE = re.compile(

package/runtime/python/okstra_ctl/wizard/registry.py

@@ -513,7 +513,7 @@ STEPS: list[Step] = [
                             and bool(s.task_id)
                             and S_HANDOFF_STAGE_PICK not in s.answered),
          build=_build_handoff_stage_pick, submit=_submit_handoff_stage_pick,
-         owns=("handoff_mode", "handoff_stages", "approved_plan_path")),
+         owns=("handoff_stages", "approved_plan_path")),
     Step(S_EXECUTOR,
          applies=lambda s: (s.task_type == "implementation"
                             and not _role_selection_enabled(s)

package/runtime/python/okstra_ctl/wizard/state.py

@@ -103,10 +103,8 @@ class WizardState:
     critic: str = ""
     critic_pending_text: bool = False
 
-    # release-handoff: PR 로 내보낼 범위. mode 는 stages 선택의 파생값이다 —
-    # whole-task = 빈 stages(whole-task 검증 기반 단일 PR), stage-group = csv.
-    handoff_mode: str = ""  # "" | "whole-task" | "stage-group"
-    handoff_stages: str = ""  # csv ("2,3"), whole-task 면 ""
+    # release-handoff: PR 을 열 stage 들. stage 하나가 PR 하나다.
+    handoff_stages: str = ""  # csv ("2,3")
 
     # resume: 직전 run-inputs 재사용 여부 (None=미응답, True=재사용, False=재입력)
     reuse_previous: Optional[bool] = None
@@ -672,7 +670,7 @@ _FIELD_DEFAULTS: dict[str, Any] = {
     "design_prep_notes": "",
     "selected_stage": "auto",
     "selected_stages": "",
-    "handoff_mode": "", "handoff_stages": "",
+    "handoff_stages": "",
     "executor": "", "critic": "", "critic_pending_text": False,
     "execution_identity_version": 1,
     "role_counts": {}, "role_models": {}, "role_selection_order": [],

package/runtime/python/okstra_ctl/wizard/steps_plan.py

@@ -728,30 +728,20 @@ def _handoff_eligibility(state: WizardState) -> list:
     return compute_eligibility(stage_map, rows)
 
 
-def _latest_whole_task_fv_release_ready(state: WizardState) -> str:
-    """accepted whole-task final-verification 보고서 경로 — handoff 모듈 SSOT 위임."""
-    from okstra_ctl.handoff import latest_whole_task_fv_release_ready
-    return latest_whole_task_fv_release_ready(
-        state.project_root, state.project_id, state.task_group, state.task_id)
-
-
 def _build_handoff_stage_pick(state: WizardState) -> Prompt:
     elig = _handoff_eligibility(state)
     eligible = [e for e in elig if e["eligible"]]
     blocked = [e for e in elig if not e["eligible"]]
-    whole_task_report = _latest_whole_task_fv_release_ready(state)
     msgs = _handoff_msgs(state)
     blocked_summary = ("; ".join(
         f"stage {e['stage']} ({', '.join(e['reasons'])})" for e in blocked)
         or msgs["labels"]["blocked_none"])
-    if not eligible and not whole_task_report:
+    if not eligible:
         raise WizardError(
             msgs["errors"]["nothing_eligible"].format(blocked=blocked_summary))
     t = _p(state.workspace_root, "handoff_stage_pick", blocked=blocked_summary)
-    options: list[Option] = []
-    if whole_task_report:
-        options.append(_opt(WHOLE_TASK_STAGE, t["labels"]["whole_task"]))
     stage_label = t["labels"]["stage"]
+    options: list[Option] = []
     for e in eligible:
         deps = ", ".join(str(d) for d in e["depends_on"]) or "-"
         options.append(_opt(str(e["stage"]),
@@ -768,14 +758,6 @@ def _submit_handoff_stage_pick(state: WizardState, value: str) -> Optional[str]:
     picks = [v.strip() for v in (value or "").split(",") if v.strip()]
     if not picks:
         raise WizardError(t["errors"]["none_selected"])
-    if WHOLE_TASK_STAGE in picks:
-        if len(picks) > 1:
-            raise WizardError(t["errors"]["whole_task_exclusive"])
-        if not _latest_whole_task_fv_release_ready(state):
-            raise WizardError(t["errors"]["whole_task_missing"])
-        state.handoff_mode = "whole-task"
-        state.handoff_stages = ""
-        return t["echo_variants"]["whole_task"]
     eligible = {str(e["stage"]) for e in _handoff_eligibility(state)
                 if e["eligible"]}
     bad = [p for p in picks if p not in eligible]
@@ -783,10 +765,8 @@ def _submit_handoff_stage_pick(state: WizardState, value: str) -> Optional[str]:
         raise WizardError(t["errors"]["not_eligible"].format(
             bad=", ".join(bad), eligible=", ".join(sorted(eligible))))
     nums = sorted({int(p) for p in picks})
-    state.handoff_mode = "stage-group"
     state.handoff_stages = ",".join(str(n) for n in nums)
-    return t["echo_variants"]["stage_group"].format(
-        stages=state.handoff_stages)
+    return t["echo_variants"]["stages"].format(stages=state.handoff_stages)
 
 
 def _reverify_scope_step_pending(state: WizardState) -> bool:

package/runtime/python/okstra_ctl/worker_prompt_contract.py

@@ -28,7 +28,10 @@ from .worker_prompt_headers import EVIDENCE_LEDGER_HEADER
 
 
 MAX_FINAL_VERIFICATION_DIRECTIVE_LINES = 40
-MAX_FINAL_VERIFICATION_BODY_LINES = 96
+# 96 → 108: 프롬프트 앞머리에 역할 계약(비어 있지 않은 12줄)이 더해졌다.
+# 상한이 재는 것은 리드가 쓰는 지시문 분량이므로, 고정 서두가 늘어난 만큼
+# 올려 지시문 허용량을 그대로 둔다.
+MAX_FINAL_VERIFICATION_BODY_LINES = 108
 
 PROMPT_DELIVERY_MODE_HEADER = "**Prompt Delivery Mode:**"
 PROMPT_DELIVERY_MODES = frozenset({"eager-include", "lazy-path-reference"})
@@ -60,6 +63,7 @@ _NON_BODY_PREFIXES = (
     "**Audit sidecar path:**",
     "Assigned worker prompt history path:",
     "**Worker Preamble Path:**",
+    "**Host Session Contract Path:**",
     _EVIDENCE_LEDGER_HEADER_PREFIX,
     "**Evidence citations:**",
     *ERRORS_PATH_HEADERS,

package/runtime/python/okstra_ctl/worker_prompt_headers.py

@@ -12,6 +12,7 @@ from .worker_prompt_policy import (
     WORKER_ERROR_CONTRACT_FILENAME,
     WORKER_PREAMBLE_FILENAME_BY_AUDIENCE,
     resolve_prompt_plan_for_manifest,
+    worker_assignment,
 )
 
 
@@ -130,6 +131,9 @@ def worker_prompt_headers(
         f"**Worker Preamble Path:** {_worker_preamble_path(plan, active_context)}",
         f"**Worker Error Contract Path:** {_worker_error_contract_path(active_context)}",
     ]
+    host_session_contract = _host_session_contract_path(manifest, active_context, worker_id)
+    if host_session_contract:
+        headers.append(f"**Host Session Contract Path:** {host_session_contract}")
     if plan.allow_coding_preflight:
         headers.append(
             f"**Coding preflight pack:** {_coding_preflight_pack_path(active_context)}"
@@ -184,13 +188,11 @@ def _worker_provider(manifest: Mapping[str, Any], worker_id: str) -> str:
     로스터 행을 못 찾으면 종전 규칙으로 떨어진다 — 그 자리에선 공급자를 알
     방법이 없고, 헤더를 빼면 계약이 fail-closed 로 막는다.
     """
-    workers = manifest.get("workerAssignments")
-    if isinstance(workers, list):
-        for row in workers:
-            if isinstance(row, Mapping) and row.get("workerId") == worker_id:
-                value = row.get("provider")
-                return value if isinstance(value, str) else ""
-    return worker_id
+    row = worker_assignment(manifest, worker_id)
+    if row is None:
+        return worker_id
+    value = row.get("provider")
+    return value if isinstance(value, str) else ""
 
 
 def _final_verification_target_headers(
@@ -232,6 +234,32 @@ def _worker_preamble_path(
     return okstra_home() / "templates" / filename
 
 
+def _host_session_contract_path(
+    manifest: Mapping[str, Any],
+    active_context: Mapping[str, Any],
+    worker_id: str,
+) -> str:
+    """이 워커가 읽어야 하는 호스트 세션 계약. 해당 없으면 빈 문자열.
+
+    호스트 세션 안에서 도는 워커(`runner=native-session`)에게만 해당한다.
+    cli-wrapper 워커는 자기 공급자 프로세스로 돌기 때문에 이 계약의 전제(리드와
+    같은 셸, 같은 도구 계층)가 성립하지 않는다 — 전달하면 틀린 규칙을 주는 것이다.
+    """
+    if _worker_runner(manifest, worker_id) != "native-session":
+        return ""
+    runtime_resources = active_context.get("runtimeResources")
+    if not isinstance(runtime_resources, Mapping):
+        return ""
+    return _string_value(runtime_resources.get("hostSessionContractPath"))
+
+
+def _worker_runner(manifest: Mapping[str, Any], worker_id: str) -> str:
+    """로스터가 이 워커에 확정한 러너. 행을 못 찾으면 빈 문자열."""
+    row = worker_assignment(manifest, worker_id)
+    value = row.get("runner") if row is not None else None
+    return value if isinstance(value, str) else ""
+
+
 def _worker_error_contract_path(active_context: Mapping[str, Any]) -> Path:
     runtime_resources = active_context.get("runtimeResources")
     if isinstance(runtime_resources, Mapping):

package/runtime/python/okstra_ctl/worker_prompt_policy.py

@@ -78,6 +78,7 @@ WORKER_PREAMBLE_FILENAME_BY_AUDIENCE = {
     "implementation-executor": "implementation-worker-preamble.md",
     "implementation-verifier": "implementation-worker-preamble.md",
     "report-writer": "report-writer-prompt-preamble.md",
+    "translator": "translator-prompt-preamble.md",
 }
 WORKER_ERROR_CONTRACT_FILENAME = "worker-error-contract.md"
 # coverage-critic gap 검증 라운드의 dispatch kind. 번호 라운드(`reverify-r<N>`)와
@@ -167,21 +168,29 @@ class PromptPlan:
 def resolve_prompt_plan(
     *,
     task_type: str,
-    worker_id: str,
-    executor_worker_id: str | None,
+    role: str | None,
     dispatch_kind: str,
 ) -> PromptPlan:
-    """Resolve prompt policy without consulting provider or model identity."""
+    """Resolve prompt policy from the worker's role and the dispatch kind.
+
+    Neither the worker id nor the provider or model identity takes part. The id
+    used to: `report-writer`, `translator`, and "the executor's worker id" were
+    compared by spelling, so a verifier that happened to share the executor's
+    id received the executor's prompt.
+    """
     if task_type not in SUPPORTED_TASK_TYPES:
         raise ValueError(f"unsupported task type: {task_type}")
-    if task_type == "release-handoff":
+    if task_type == "release-handoff" or dispatch_kind == "lead":
+        # 리드는 로스터 행이 없다. 종전에는 `worker_id="lead"` 가 어느 비교에도
+        # 걸리지 않아 분석 계획으로 떨어졌고, 리드 프롬프트가 분석 워커 직무를
+        # 달고 나갔다.
         return _plan("lead-only")
-    if not worker_id.strip():
-        raise ValueError("worker ID is required")
-    if worker_id == "translator" or dispatch_kind == "translator":
-        if worker_id != "translator" or dispatch_kind != "translator":
-            raise ValueError("translator worker and dispatch kind must match")
+    if dispatch_kind == "translator":
+        if role not in (None, "translator"):
+            raise ValueError(f"translator dispatch cannot run role {role}")
         return _plan("translator", duty_audience="translator")
+    if role == "translator":
+        raise ValueError("translator role requires the translator dispatch kind")
     if is_verification_dispatch_kind(dispatch_kind):
         return _plan("reverify")
     # A critic pass keeps the full analysis contract — worker anchor headers, the
@@ -198,23 +207,30 @@ def resolve_prompt_plan(
         if task_type == "final-verification"
         else ANALYSIS_DUTY_BY_TASK_TYPE.get(task_type, "analysis-worker")
     )
-    if task_type == "implementation" and not executor_worker_id:
-        raise ValueError("implementation executor worker ID is required")
-    if worker_id == "report-writer":
-        return _plan("report-writer")
-    if task_type == "implementation" and worker_id == executor_worker_id:
-        return _plan(
-            "implementation-executor",
-            allow_coding_preflight=True,
-            required_headers=IMPLEMENTATION_HEADERS,
-        )
-    if task_type == "implementation":
-        return _plan(
-            "implementation-verifier",
-            equality_group="implementation-verifier-core",
-            allow_coding_preflight=True,
-            required_headers=IMPLEMENTATION_HEADERS,
-        )
+    if dispatch_kind != "critic":
+        # 초기 디스패치는 역할이 audience 를 정한다. critic 은 역할과 무관하게
+        # 아래 분석 분기가 그 phase 의 critic 직무로 정한다.
+        if not role:
+            raise ValueError("worker role is required")
+        if role == "report-writer":
+            return _plan("report-writer")
+        if task_type == "implementation":
+            if role == "implementer":
+                return _plan(
+                    "implementation-executor",
+                    allow_coding_preflight=True,
+                    required_headers=IMPLEMENTATION_HEADERS,
+                )
+            if role == "verifier":
+                return _plan(
+                    "implementation-verifier",
+                    equality_group="implementation-verifier-core",
+                    allow_coding_preflight=True,
+                    required_headers=IMPLEMENTATION_HEADERS,
+                )
+            raise ValueError(f"implementation has no prompt policy for role {role}")
+    elif task_type == "implementation":
+        raise ValueError("implementation runs no critic pass")
     if task_type == "final-verification":
         return _plan(
             "analysis",
@@ -248,16 +264,37 @@ def resolve_prompt_plan_for_manifest(
     worker_id: str,
     dispatch_kind: str,
 ) -> PromptPlan:
-    """Resolve policy from canonical task and executor manifest fields."""
+    """Resolve policy from the manifest's task type and the worker's roster role.
+
+    *worker_id* is the lookup key into `workerAssignments`; its spelling decides
+    nothing. A worker with no roster row — the translator, or a verification
+    pass whose kind alone decides — resolves with no role.
+    """
     task_type = _required_string(manifest, "taskType")
+    if not worker_id.strip():
+        raise ValueError("worker ID is required")
+    row = worker_assignment(manifest, worker_id)
+    role = row.get("role") if row is not None else None
     return resolve_prompt_plan(
         task_type=task_type,
-        worker_id=worker_id,
-        executor_worker_id=_executor_worker_id(manifest),
+        role=role if isinstance(role, str) and role else None,
         dispatch_kind=dispatch_kind,
     )
 
 
+def worker_assignment(
+    manifest: Mapping[str, Any], worker_id: str
+) -> Mapping[str, Any] | None:
+    """The `workerAssignments` row for *worker_id*, or None when absent."""
+    rows = manifest.get("workerAssignments")
+    if not isinstance(rows, list):
+        return None
+    for row in rows:
+        if isinstance(row, Mapping) and row.get("workerId") == worker_id:
+            return row
+    return None
+
+
 def _plan(
     audience: PromptAudience,
     *,
@@ -335,25 +372,6 @@ def critic_assignment_ref(task_type: str) -> str:
     return f"critic/{segment}"
 
 
-def _executor_worker_id(manifest: Mapping[str, Any]) -> str | None:
-    """실행자의 **worker_id**. provider 이름이 아니다.
-
-    한 provider 가 실행자와 검증자를 겸하면 슬롯마다 역할이 붙어 실행자의 id 는
-    `codex-implementer` 가 된다. 여기서 provider(`codex`)를 돌려주면 실행자가
-    자기 자신과 매칭되지 않아 검증자 프롬프트로 실체화되고, 그 사실은
-    `agent invocation duty does not match expected audience` 로 디스패치 단계에서야
-    드러난다.
-    """
-    team_contract = manifest.get("teamContract")
-    if not isinstance(team_contract, Mapping):
-        return None
-    executor = team_contract.get("executor")
-    if not isinstance(executor, Mapping):
-        return None
-    worker_id = executor.get("workerId")
-    return worker_id.strip() if isinstance(worker_id, str) and worker_id.strip() else None
-
-
 def _required_string(payload: Mapping[str, Any], key: str) -> str:
     value = payload.get(key)
     if not isinstance(value, str) or not value.strip():

package/runtime/python/okstra_ctl/workflow.py

@@ -133,7 +133,7 @@ PHASE_RULES: dict[str, dict[str, str]] = {
         "allowed": (
             "  - acceptance verdict with requirement coverage assessment\n"
             "  - residual risk and regression notes\n"
-            "  - routing recommendation as the `routingRecommendation` object `{target, rationale}`: `target` is one of `release-handoff`, `release-handoff(stage-group)`, `error-analysis`, `implementation-option-selection`, `implementation-planning`, `implementation`, `done`, and `rationale` ties that choice to the verdict and the blocker list. Both `release-handoff` forms require a release-ready verdict — `accepted`, or `conditional-accept` with every condition declaring `blocksReleaseHandoff: false` (`okstra_ctl.release_gate.release_handoff_allowed`); plain `release-handoff` additionally requires `whole-task` verification scope. Prose alone does not route the task — Phase 7 projects `workflow.nextRecommendedPhase` from `target`"
+            "  - routing recommendation as the `routingRecommendation` object `{target, rationale}`: `target` is one of `release-handoff`, `release-handoff(stage-group)`, `error-analysis`, `implementation-option-selection`, `implementation-planning`, `implementation`, `done`, and `rationale` ties that choice to the verdict and the blocker list. Both `release-handoff` forms require a release-ready verdict — `accepted`, or `conditional-accept` with every condition declaring `blocksReleaseHandoff: false` (`okstra_ctl.release_gate.release_handoff_allowed`); either verification scope may route there, because release-handoff opens one PR per stage. Prose alone does not route the task — Phase 7 projects `workflow.nextRecommendedPhase` from `target`"
         ),
     },
     "release-handoff": {

package/runtime/python/okstra_ctl/worktree/__init__.py

@@ -61,7 +61,8 @@ from .git_ops import (
     move_worktree,
     remove_worktree_force,
 )
-from .naming import compute_branch_name, compute_worktree_path
+from .naming import (compute_branch_name, compute_worktree_path,
+                     stage_group_id)
 from .provision import (
     WorktreeProvision,
     provision_stage_worktree,
@@ -77,6 +78,7 @@ __all__ = [
     "_resolve_commit_sha",
     "compute_branch_name",
     "compute_worktree_path",
+    "stage_group_id",
     "dirty_entries_excluding_okstra",
     "is_ancestor",
     "is_dirty_excluding_okstra",

package/runtime/python/okstra_ctl/worktree/naming.py

@@ -42,6 +42,15 @@ def _work_category_namespace(work_category: str) -> str:
     return _WORK_CATEGORY_NAMESPACE.get(key, "task")
 
 
+def stage_group_id(stages) -> str:
+    """stage 번호 집합을 브랜치/경로 조각으로 옮긴다 (`{2, 3}` → `g2-3`).
+
+    `compute_branch_name(group_id=...)` 과 `compute_worktree_path(group_id=...)`
+    가 받는 값이고, 여러 stage 의 작업을 한 브랜치에 모을 때 그 집합이 곧 이름이
+    된다 — 같은 집합은 언제나 같은 브랜치다."""
+    return "g" + "-".join(str(n) for n in sorted(set(stages)))
+
+
 def compute_worktree_path(
     *,
     project_id: str,

package/runtime/python/okstra_ctl/worktree_registry.py

@@ -13,8 +13,10 @@ Why a global registry:
     the **same** worktree on the **same** branch. Re-entry from any
     phase must look up the existing entry instead of creating a
     duplicate.
-  - Two different task-keys must never collide on the same branch name.
-    A global branch index makes that detectable cheaply.
+  - Two different task-keys in the same project must never collide on
+    the same branch name. A per-project branch index makes that
+    detectable cheaply. Names in different projects are different
+    repositories' branches and do not collide.
   - Cleanup of stale entries (worktree dir removed manually) needs a
     single source of truth.
 
@@ -94,9 +96,29 @@ def _load() -> dict:
     data = load_registry_json(_registry_path(), lambda: {"tasks": {}, "branches": {}})
     data.setdefault("tasks", {})
     data.setdefault("branches", {})
+    data["branches"] = _by_project(data["branches"])
     return data
 
 
+def _by_project(branches: dict) -> dict:
+    """브랜치 색인을 `{project_id: {branch: task_key}}` 로 정규화한다.
+
+    브랜치 이름은 그 프로젝트의 저장소 안에서만 의미가 있다. 색인이 프로젝트를
+    구분하지 않던 시절의 평면 구조(`{branch: task_key}`)를 읽으면 task-key 의 첫
+    마디가 곧 project_id 라는 점을 이용해 제자리에서 옮긴다 — 옮기지 않으면 옛 행이
+    검사에 걸리지 않아 같은 프로젝트 안의 진짜 충돌을 놓친다.
+    """
+    migrated: dict[str, dict] = {}
+    for key, value in branches.items():
+        if isinstance(value, dict):
+            migrated.setdefault(key, {}).update(value)
+            continue
+        owner = str(value)
+        project = owner.split("/", 1)[0]
+        migrated.setdefault(project, {})[key] = owner
+    return migrated
+
+
 def _save(data: dict) -> None:
     save_registry_json(_registry_path(), data)
 
@@ -145,12 +167,16 @@ def reserve(
                 f"{existing['worktree_path']} (branch {existing['branch']}). "
                 "Use `lookup` to reuse it, or release it before reserving anew."
             )
-        owner = data["branches"].get(branch)
+        # 브랜치 유일성은 프로젝트 안에서만 따진다. 다른 프로젝트의 같은 이름은
+        # 다른 저장소의 다른 브랜치이고, 같은 저장소 안의 진짜 충돌은 provision 의
+        # `_branch_exists` 가 git 에게 먼저 물어 잡는다.
+        project_branches = data["branches"].setdefault(project_id, {})
+        owner = project_branches.get(branch)
         if owner and owner != key:
             raise RuntimeError(
-                f"branch {branch!r} is already registered to a different "
-                f"task-key: {owner}. Choose a different work-category or "
-                "release the conflicting task first."
+                f"branch {branch!r} is already registered in project "
+                f"{project_id!r} to a different task-key: {owner}. Choose a "
+                "different work-category or release the conflicting task first."
             )
         row = {
             "project_id": project_id,
@@ -172,7 +198,7 @@ def reserve(
         if existing and existing.get("implementation_base_commit"):
             row["implementation_base_commit"] = existing["implementation_base_commit"]
         data["tasks"][key] = row
-        data["branches"][branch] = key
+        project_branches[branch] = key
         _save(data)
         return WorktreeEntry(task_key=key, **row)
 
@@ -346,8 +372,11 @@ def free_branch_slot(
         if not row:
             return False
         branch = row.get("branch")
-        if branch and data["branches"].get(branch) == key:
-            del data["branches"][branch]
+        project_branches = data["branches"].get(row.get("project_id") or project_id, {})
+        if branch and project_branches.get(branch) == key:
+            del project_branches[branch]
+            if not project_branches:
+                data["branches"].pop(row.get("project_id") or project_id, None)
             _save(data)
             return True
         return False

package/runtime/python/okstra_token_usage/pricing.py

@@ -139,10 +139,12 @@ GEMINI_PRICING = {
     # forms appear in the wild, so include both for the new 3.x families.
 
     # Gemini 3 series.
-    # 3.7 Flash 와 3.6 Flash 는 2026-12-31 까지 도입 요율 $0.75/$3.75 이고
-    # 2027-01-01 에 표준 요율 $1.50/$7.50 으로 오른다(2026-08-26 확인). 이 표에는
-    # 시점 개념이 없으므로 지금 청구되는 값을 담는다 — 그날 이후 두 계열을
-    # (1.50, 7.50) 으로 갱신해야 한다.
+    # 3.8 Flash·3.7 Flash·3.6 Flash 는 2026-12-31 까지 도입 요율 $0.75/$3.75 이고
+    # 2027-01-01 에 표준 요율 $1.50/$7.50 으로 오른다(ai.google.dev/gemini-api/
+    # docs/pricing, 2026-09-23 확인). 이 표에는 시점 개념이 없으므로 지금 청구되는
+    # 값을 담는다 — 그날 이후 세 계열을 (1.50, 7.50) 으로 갱신해야 한다.
+    "3.8-flash":       (0.75, 3.75),
+    "3-8-flash":       (0.75, 3.75),
     "3.7-flash":       (0.75, 3.75),
     "3-7-flash":       (0.75, 3.75),
     "3.6-flash":       (0.75, 3.75),

package/runtime/schemas/agent-common-v1.schema.json

@@ -0,0 +1,34 @@
+{
+  "type": "object",
+  "required": [
+    "schemaVersion",
+    "id",
+    "assignmentFidelity",
+    "requiredInputs",
+    "evidenceFirst",
+    "authorityAndScope",
+    "collaborationAndIndependence",
+    "instructionPrecedence",
+    "conflictHandling",
+    "completionHonesty"
+  ],
+  "properties": {
+    "schemaVersion": { "const": "1.0" },
+    "id": { "const": "common" },
+    "assignmentFidelity": { "$ref": "#/$defs/stringList" },
+    "requiredInputs": { "$ref": "#/$defs/stringList" },
+    "evidenceFirst": { "$ref": "#/$defs/stringList" },
+    "authorityAndScope": { "$ref": "#/$defs/stringList" },
+    "collaborationAndIndependence": { "$ref": "#/$defs/stringList" },
+    "instructionPrecedence": { "$ref": "#/$defs/stringList" },
+    "conflictHandling": { "$ref": "#/$defs/stringList" },
+    "completionHonesty": { "$ref": "#/$defs/stringList" }
+  },
+  "additionalProperties": false,
+  "$defs": {
+    "stringList": {
+      "type": "array",
+      "items": { "type": "string", "minLength": 1 }
+    }
+  }
+}

package/runtime/schemas/agent-duty-v1.schema.json

@@ -0,0 +1,38 @@
+{
+  "type": "object",
+  "required": [
+    "schemaVersion",
+    "id",
+    "roleId",
+    "responsibilities",
+    "requiredConduct",
+    "decisionPrinciples",
+    "authorityAndBoundaries",
+    "evidenceStandards",
+    "collaborationContract",
+    "completionCriteria",
+    "prohibitions",
+    "blockedStateReporting"
+  ],
+  "properties": {
+    "schemaVersion": { "const": "1.0" },
+    "id": { "type": "string", "minLength": 1 },
+    "roleId": { "type": "string", "minLength": 1 },
+    "responsibilities": { "$ref": "#/$defs/stringList" },
+    "requiredConduct": { "$ref": "#/$defs/stringList" },
+    "decisionPrinciples": { "$ref": "#/$defs/stringList" },
+    "authorityAndBoundaries": { "$ref": "#/$defs/stringList" },
+    "evidenceStandards": { "$ref": "#/$defs/stringList" },
+    "collaborationContract": { "$ref": "#/$defs/stringList" },
+    "completionCriteria": { "$ref": "#/$defs/stringList" },
+    "prohibitions": { "$ref": "#/$defs/stringList" },
+    "blockedStateReporting": { "$ref": "#/$defs/stringList" }
+  },
+  "additionalProperties": false,
+  "$defs": {
+    "stringList": {
+      "type": "array",
+      "items": { "type": "string", "minLength": 1 }
+    }
+  }
+}

package/runtime/schemas/agent-operation-v1.schema.json

@@ -0,0 +1,11 @@
+{
+  "type": "object",
+  "required": ["schemaVersion", "id", "dutyId", "count"],
+  "properties": {
+    "schemaVersion": { "const": "1.0" },
+    "id": { "type": "string", "minLength": 1 },
+    "dutyId": { "type": "string", "minLength": 1 },
+    "count": { "type": "integer", "minimum": 1 }
+  },
+  "additionalProperties": false
+}