Gitinbox/OpenOPC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ui): preserve durable org identity for runtime approvals

Browse Source
This commit is contained in:
cgycorey
2026-08-01 23:00:32 +01:00
parent 34770373c2
commit 734a2d5969
11 changed files with 719 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opc/engine.py
+56 -1
View File
@@ -3563,6 +3563,33 @@ class OPCEngine:
return False
return bool(dict(getattr(task, "metadata", {}) or {}).get("shared_role_session", False))
@staticmethod
def _runtime_org_id_for_identity(
decision: RouterDecision | None,
metadata: dict[str, Any] | None,
org_config: Any | None,
) -> str | None:
"""Return the durable custom-org ID for a company runtime task."""
task_metadata = dict(metadata or {})
profile = str(
getattr(decision, "company_profile", "")
or task_metadata.get("company_profile", "")
or getattr(org_config, "company_profile", "")
or ""
).strip().lower()
if profile != "custom":
return None
for candidate in (
getattr(decision, "org_id", None),
task_metadata.get("org_id"),
task_metadata.get("organization_id"),
getattr(org_config, "organization_id", None),
):
normalized = str(candidate or "").strip()
if normalized:
return normalized
return None
@staticmethod
def _shared_company_role_session_id(
parent_session_id: str,
@@ -3601,6 +3628,11 @@ class OPCEngine:
root_session: bool = False,
) -> Task:
assert self.store and self.memory
runtime_org_id = self._runtime_org_id_for_identity(
decision,
getattr(work_item, "metadata", None),
getattr(getattr(self, "config", None), "org", None),
)
role_id = str(work_item.role_id or "").strip()
seat_id = str((work_item.metadata or {}).get("seat_id", "") or "").strip()
team_id = str((work_item.metadata or {}).get("team_id", "") or work_item.cell_id or "").strip()
@@ -3653,6 +3685,10 @@ class OPCEngine:
set_linked_work_item_id(existing, work_item.work_item_id)
existing.session_id = session_id
existing.metadata = dict(existing.metadata or {})
if runtime_org_id:
existing.org_id = runtime_org_id
existing.metadata["org_id"] = runtime_org_id
existing.metadata["organization_id"] = runtime_org_id
existing.metadata["shared_role_session"] = True
existing.metadata["shared_role_id"] = role_id
existing.metadata["company_runtime_root_session_id"] = parent_session_id
@@ -3744,6 +3780,24 @@ class OPCEngine:
owner_execution_copy = build_work_item_owner_execution_copy(work_item)
owner_execution_copy.setdefault("delegation_role_session_id", role_session_id)
owner_execution_copy["work_kind"] = work_item_turn_type
runtime_company_profile = str(
getattr(decision, "company_profile", "")
or (work_item.metadata or {}).get("company_profile", "")
or getattr(getattr(self.config, "org", None), "company_profile", "")
or ""
).strip().lower()
runtime_identity_metadata = (
{
"org_id": runtime_org_id or "",
"organization_id": runtime_org_id or "",
}
if runtime_company_profile == "custom"
else {
"organization_id": str(
getattr(getattr(self.config, "org", None), "organization_id", "") or ""
).strip(),
}
)
task = Task(
title=str(work_item.title or work_item_projection_ref or "Runtime Work Item").strip(),
description=(
@@ -3757,6 +3811,7 @@ class OPCEngine:
session_id=session_id,
parent_session_id=parent_session_id,
assigned_external_agent=assigned_external_agent,
org_id=runtime_org_id,
metadata=mark_work_item_projection(mark_work_item_runtime({
"mode": "company",
"execution_mode": decision.mode.value,
@@ -3765,7 +3820,6 @@ class OPCEngine:
"original_message": original_message,
"router_preferred_agent": decision.preferred_agent,
"company_profile": decision.company_profile or getattr(self.config.org, "company_profile", "corporate"),
"organization_id": getattr(self.config.org, "organization_id", ""),
"organization_name": getattr(self.config.org, "organization_name", ""),
"organization_config_file": getattr(self.config.org, "organization_config_file", ""),
"delegation_playbook": dict(delegation_playbook),
@@ -3780,6 +3834,7 @@ class OPCEngine:
),
"runtime_topology": copy.deepcopy(runtime_topology),
**owner_execution_copy,
**runtime_identity_metadata,
"work_item_projection_ref": work_item_projection_ref,
"seat_manager_role_id": str(topology_seat.get("manager_role_id", "") or "").strip(),
"manager_role_id": str(topology_seat.get("manager_role_id", "") or "").strip(),
opc/layer2_organization/company_mode.py
+41 -1
View File
@@ -4247,7 +4247,21 @@ class CompanyWorkItemExecutor:
existing_task_ids = {str(task.id or "").strip() for task in existing_tasks if str(task.id or "").strip()}
existing_work_item_ids = set(task_by_linked_work_item_id(existing_tasks))
root_task = sorted(existing_tasks, key=lambda item: (item.created_at, item.id))[0]
runtime_topology = dict((root_task.metadata or {}).get("runtime_topology", {}) or {})
root_metadata = dict(root_task.metadata or {})
custom_runtime = str(root_metadata.get("company_profile", "") or "").strip().lower() == "custom"
runtime_org_id = str(
getattr(root_task, "org_id", "")
or root_metadata.get("org_id")
or root_metadata.get("organization_id")
or ""
).strip() or None
if not custom_runtime:
runtime_org_id = None
if runtime_org_id:
for existing_task in existing_tasks:
if self._sync_runtime_org_identity(existing_task, runtime_org_id):
await self.store.save_task(existing_task)
runtime_topology = dict(root_metadata.get("runtime_topology", {}) or {})
root_parent_session_id = str(
root_task.parent_session_id
or root_task.session_id
@@ -4283,6 +4297,8 @@ class CompanyWorkItemExecutor:
persisted = await get_runtime_task(work_item_id)
if persisted is not None:
set_linked_work_item_id(persisted, work_item_id)
if self._sync_runtime_org_identity(persisted, runtime_org_id):
await self.store.save_task(persisted)
self._raise_for_runtime_projection_issues(persisted, work_item, work_item_by_id)
if persisted.id not in existing_task_ids:
existing_tasks.append(persisted)
@@ -4413,6 +4429,9 @@ class CompanyWorkItemExecutor:
task_metadata.update(copy_work_item_execution_metadata(work_item))
task_metadata.update(owner_execution_copy)
task_metadata[WORK_ITEM_TURN_TYPE_KEY] = turn_type
if custom_runtime:
task_metadata["org_id"] = runtime_org_id or ""
task_metadata["organization_id"] = runtime_org_id or ""
temp_task = Task(
id=str(uuid.uuid4()),
title=str(getattr(work_item, "title", "") or projection_id or "Runtime Work Item").strip(),
@@ -4423,6 +4442,7 @@ class CompanyWorkItemExecutor:
session_id=session_id,
parent_session_id=root_parent_session_id,
assigned_external_agent=assigned_external_agent,
org_id=runtime_org_id,
metadata=task_metadata,
)
dependency_projection_ids: list[str] = []
@@ -4454,6 +4474,7 @@ class CompanyWorkItemExecutor:
parent_session_id=temp_task.parent_session_id,
assigned_external_agent=temp_task.assigned_external_agent,
dependencies=dependency_projection_ids,
org_id=runtime_org_id,
metadata=task_metadata,
)
set_linked_work_item_id(task, work_item_id)
@@ -4471,6 +4492,8 @@ class CompanyWorkItemExecutor:
"failed to link new runtime Task "
f"{task.id} for WorkItem {work_item_id}"
)
if self._sync_runtime_org_identity(task, runtime_org_id):
await self.store.save_task(task)
set_linked_work_item_id(task, work_item_id)
self._raise_for_runtime_projection_issues(task, work_item, work_item_by_id)
if self.memory is not None and task.session_id:
@@ -4510,6 +4533,23 @@ class CompanyWorkItemExecutor:
await self.save_task(task)
return existing_tasks
@staticmethod
def _sync_runtime_org_identity(task: Task, org_id: str | None) -> bool:
normalized_org_id = str(org_id or "").strip()
if not normalized_org_id:
return False
metadata = dict(task.metadata or {})
changed = str(getattr(task, "org_id", "") or "").strip() != normalized_org_id
changed = changed or metadata.get("org_id") != normalized_org_id
changed = changed or metadata.get("organization_id") != normalized_org_id
if not changed:
return False
task.org_id = normalized_org_id
metadata["org_id"] = normalized_org_id
metadata["organization_id"] = normalized_org_id
task.metadata = metadata
return True
@staticmethod
def _runtime_work_kind_to_work_item_turn_type(work_kind: str) -> str:
return canonical_work_item_turn_type_for_kind(work_kind)
opc/plugins/office_ui/execution_identity.py
+13 -2
View File
@@ -17,6 +17,7 @@ from dataclasses import dataclass
from typing import Any
from opc.core.config import validate_organization_id
from opc.layer2_organization.company_runtime_identity import is_company_runtime_task
PREFERRED_AGENTS: frozenset[str] = frozenset({
"native",
@@ -154,11 +155,12 @@ def execution_identity_from_task(
company_profile = metadata.get("company_profile")
metadata_profile = str(company_profile or "").strip().lower()
metadata_org_id = (
metadata.get("org_id")
getattr(task, "org_id", None)
or metadata.get("org_id")
or metadata.get("organization_id")
or getattr(task, "org_id", None)
or ""
)
mode_hint = str(metadata.get("mode", "") or "").strip().lower()
if raw_exec_mode:
exec_mode = raw_exec_mode
@@ -169,6 +171,15 @@ def execution_identity_from_task(
elif execution_mode == "company_mode" or metadata_profile:
exec_mode = "company"
explicit = True
elif (
mode_hint in {"company", "org", "custom"}
or is_company_runtime_task(task)
):
# Older company/runtime rows may only retain a mode marker or the
# runtime marker itself. Treat those rows as explicit company
# identity so they cannot fall through to task-mode/global defaults.
exec_mode = "org" if metadata_org_id else "company"
explicit = True
elif metadata_org_id:
exec_mode = "org"
explicit = True
opc/plugins/office_ui/services/session.py
+6 -19
View File
@@ -618,25 +618,6 @@ class SessionService:
default_preferred_agent=self.context.mode_state.task_preferred_agent,
explicit_exec_mode=True,
)
if identity.is_custom_org and not identity.org_id:
# Role-task rows may lack org_id; mirror create()'s active-org fallback
fallback_org_id = ""
if self.context.get_active_saved_org_name is not None:
try:
fallback_org_id = await self.context.get_active_saved_org_name()
except Exception:
logger.opt(exception=True).debug(
"persist_session_config: failed to resolve active saved org"
)
if fallback_org_id:
identity = canonicalize_execution_identity(
exec_mode=exec_mode,
company_profile=company_profile,
preferred_agent=preferred_agent,
org_id=fallback_org_id,
default_preferred_agent=self.context.mode_state.task_preferred_agent,
explicit_exec_mode=True,
)
if identity.is_custom_org and not identity.org_id:
raise ServiceError("org_id_required", "org_id_required", {
"task_id": str(getattr(task, "id", "") or ""),
@@ -1182,6 +1163,12 @@ class SessionService:
else:
checkpoint = None
org_id = self.resolve_task_org_id(config_task) if engine_mode == "org" else ""
if engine_mode == "org" and not org_id:
raise ServiceError(
"org_id_required",
"org_id_required",
{"project_id": project_id, "task_id": resolved_task_id},
)
message_metadata: dict[str, Any] = {"ui_force_resume": True}
if checkpoint is not None:
message_metadata.update({
opc/plugins/office_ui/ws_handler.py
+109 -20
View File
@@ -4978,16 +4978,38 @@ class WSHandler:
if task is None:
return None
exec_mode, _ = self._resolve_task_session_config(task)
if not self._is_company_session_exec_mode(exec_mode):
runtime_bound = is_company_runtime_task(task)
if not runtime_bound and not self._is_company_session_exec_mode(exec_mode):
return task
try:
target = await self._resolve_company_runtime_target(task_id, engine=engine)
except Exception:
except ServiceError:
if runtime_bound:
raise
logger.opt(exception=True).debug(
"failed to resolve durable session config task"
)
return task
return (target or {}).get("config_task") or task
except Exception as exc:
if runtime_bound:
raise ServiceError(
"company_runtime_identity_mismatch",
"Company runtime identity could not be resolved",
{"task_id": str(task_id or "").strip()},
) from exc
logger.opt(exception=True).debug(
"failed to resolve durable session config task"
)
return task
if target is not None:
return target.get("config_task") or task
if runtime_bound:
raise ServiceError(
"company_runtime_identity_mismatch",
"Company runtime identity could not be resolved",
{"task_id": str(task_id or "").strip()},
)
return task
@staticmethod
def _is_company_session_exec_mode(exec_mode: Any) -> bool:
@@ -5059,14 +5081,24 @@ class WSHandler:
# Look up session_id from task
session_id: str | None = None
task = None
config_task = None
preferred_agent = self._task_preferred_agent
session_org_id = self._normalize_session_org_id(org_id)
if task_id and getattr(engine, "store", None):
task = await engine.store.get_task(task_id)
if task:
session_id = task.session_id
identity = self._resolve_task_identity(
company_runtime_target: dict[str, Any] | None = None
try:
if task is not None:
config_task = await self._resolve_session_runtime_config_task(
task_id,
task,
engine=engine,
)
identity = self._resolve_task_identity(
config_task,
default_exec_mode=mode,
default_company_profile=profile,
default_preferred_agent=preferred_agent,
@@ -5076,9 +5108,12 @@ class WSHandler:
profile = identity.company_profile
session_org_id = identity.org_id
preferred_agent = identity.preferred_agent
company_runtime_target: dict[str, Any] | None = None
try:
if identity.is_custom_org and not identity.org_id:
raise ServiceError(
"org_id_required",
"org_id_required",
{"project_id": pid, "task_id": task_id},
)
content = f"{title}\n{description}".strip()
engine_mode, company_profile = self._resolve_engine_mode(mode, profile)
engine_preferred_agent = preferred_agent if engine_mode == "project" else None
@@ -8124,17 +8159,6 @@ class WSHandler:
pid = self._normalize_project_id(run_project_id or getattr(run_engine, "project_id", None))
async with lock:
try:
try:
await self._set_company_runtime_control(
target,
state="resuming",
checkpoint_id=str(
getattr(checkpoint, "checkpoint_id", "") or ""
).strip(),
)
except Exception:
logger.opt(exception=True).debug("failed to broadcast company suspend reply routing state")
config_task = target.get("config_task")
session_exec_mode = self._normalize_session_exec_mode(self._exec_mode)
session_company_profile = self._normalize_session_company_profile(self._company_profile)
@@ -8146,6 +8170,27 @@ class WSHandler:
session_exec_mode,
session_company_profile,
)
if engine_mode == "org" and not session_org_id:
raise ServiceError(
"org_id_required",
"org_id_required",
{
"project_id": pid,
"task_id": str(target.get("config_source_task_id", "") or "").strip(),
},
)
try:
await self._set_company_runtime_control(
target,
state="resuming",
checkpoint_id=str(
getattr(checkpoint, "checkpoint_id", "") or ""
).strip(),
)
except Exception:
logger.opt(exception=True).debug("failed to broadcast company suspend reply routing state")
engine_message_metadata = dict(message_metadata or {})
engine_message_metadata.update({
"response_to_checkpoint_id": str(getattr(checkpoint, "checkpoint_id", "") or ""),
@@ -8612,13 +8657,37 @@ class WSHandler:
item
for item in pending or []
if str(getattr(item, "checkpoint_id", "") or "").strip() == checkpoint_id
and str(getattr(item, "checkpoint_type", "") or "").strip()
in self._LOCK_FREE_CHECKPOINT_ANSWER_TYPES
and str(getattr(item, "checkpoint_type", "") or "").strip() == checkpoint_type
),
None,
)
if checkpoint is None:
return False
checkpoint_payload = dict(getattr(checkpoint, "payload", {}) or {})
checkpoint_task_id = str(
getattr(checkpoint, "task_id", "")
or checkpoint_payload.get("waiting_task_id")
or checkpoint_payload.get("task_id")
or ""
).strip()
checkpoint_session_id = str(
getattr(checkpoint, "session_id", "")
or checkpoint_payload.get("session_id")
or ""
).strip()
payload_task_ids = {
str(item).strip()
for item in list(checkpoint_payload.get("task_ids", []) or [])
if str(item).strip()
}
if (
not checkpoint_task_id
or checkpoint_task_id != str(task_id or "").strip()
or not checkpoint_session_id
or checkpoint_session_id != str(session_id or "").strip()
or (payload_task_ids and str(task_id or "").strip() not in payload_task_ids)
):
return False
logger.info(
f"Lock-free checkpoint answer: task lock for {task_id} is held by a "
f"live turn; delivering reply to pending checkpoint {checkpoint_id} "
@@ -8732,6 +8801,16 @@ class WSHandler:
)
session_org_id = self._resolve_task_org_id(config_task)
session_preferred_agent = self._resolve_task_preferred_agent(config_task)
if (
session_exec_mode in {"org", "custom"}
and not session_org_id
and is_company_runtime_task(task)
):
raise ServiceError(
"org_id_required",
"org_id_required",
{"project_id": pid, "task_id": task_id},
)
if await self._try_lock_free_parked_checkpoint_answer(
task_id=task_id,
@@ -8769,6 +8848,16 @@ class WSHandler:
)
session_org_id = self._resolve_task_org_id(config_task)
session_preferred_agent = self._resolve_task_preferred_agent(config_task)
if (
session_exec_mode in {"org", "custom"}
and not session_org_id
and is_company_runtime_task(task)
):
raise ServiceError(
"org_id_required",
"org_id_required",
{"project_id": pid, "task_id": task_id},
)
if task.status == TaskStatus.DONE and self._is_company_session_exec_mode(session_exec_mode):
task.status = TaskStatus.IDLE
task.metadata = dict(getattr(task, "metadata", {}) or {})