Skip to content

Automate browser based workflows with AI

Record base fingerprints for Copilot proposals (#8886)

Aaron Perez84c5086f621f
diff --git a/skyvern-frontend/src/store/PageSlots.ts b/skyvern-frontend/src/store/PageSlots.ts
index b60493367..9a9d0df9f 100644
--- a/skyvern-frontend/src/store/PageSlots.ts
+++ b/skyvern-frontend/src/store/PageSlots.ts
@@ -12,6 +12,27 @@ export type FirstRunWaitCardProps = Readonly<{
phase: "run_provisioning" | "debug_browser_warming";
}>;
+export type PermissionCapability = Readonly<{
+ capability: string;
+ allowed: boolean;
+ reason: "role";
+}>;
+
+export type PermissionsResponse = Readonly<{
+ organization_id: string;
+ user_id: string | null;
+ auth_kind: string | null;
+ org_role: string | null;
+ role: "admin" | "member" | null;
+ capabilities: ReadonlyArray<PermissionCapability>;
+}>;
+
+export type PermissionsState =
+ | Readonly<{ status: "unavailable"; data?: undefined }>
+ | Readonly<{ status: "loading"; data?: undefined }>
+ | Readonly<{ status: "error"; data?: undefined }>
+ | Readonly<{ status: "ready"; data: PermissionsResponse }>;
+
export type PageSlots = {
workflowAnalyticsPanel?: React.ComponentType<WorkflowAnalyticsPanelProps>;
workflowRunsFilterControls?: React.ComponentType;
@@ -20,6 +41,7 @@ export type PageSlots = {
workflowCreatorDirectory?: React.ComponentType<{
children: React.ReactNode;
}>;
+ permissions?: PermissionsState;
};
const PageSlotsContext = createContext<PageSlots>({});
diff --git a/skyvern/forge/sdk/routes/workflow_copilot.py b/skyvern/forge/sdk/routes/workflow_copilot.py
index e87fc1c34..91b1d0ab8 100644
--- a/skyvern/forge/sdk/routes/workflow_copilot.py
+++ b/skyvern/forge/sdk/routes/workflow_copilot.py
@@ -103,6 +103,7 @@ from skyvern.forge.sdk.copilot.tools.workflow_update import (
_validated_pending_workflow_proposal,
private_workflow_settings_from_proposal,
proposal_is_displayable,
+ proposal_workflow_fingerprint,
proposal_workflow_fingerprint_matches,
strip_copilot_yaml_headers,
)
@@ -1093,7 +1094,11 @@ def _discard_superseded_proposal(agent_result: AgentResult) -> None:
async def _persist_proposed_workflow_state(
- chat: Any, agent_result: AgentResult, restored: bool, keep_pending_proposal: bool = False
+ chat: Any,
+ agent_result: AgentResult,
+ restored: bool,
+ keep_pending_proposal: bool = False,
+ opening_workflow_title: str | None = None,
) -> None:
updated_workflow = agent_result.updated_workflow
if agent_result.proposal_adopted or not await _proposal_ownership_is_current(chat, agent_result):
@@ -1184,19 +1189,71 @@ async def _persist_proposed_workflow_state(
proposed_workflow_data = stored_proposal
else:
try:
- await app.DATABASE.workflow_params.update_workflow_copilot_chat(
+ canonical = await app.DATABASE.workflows.get_workflow_by_permanent_id(
+ workflow_permanent_id=chat.workflow_permanent_id,
+ organization_id=chat.organization_id,
+ )
+ if canonical is None:
+ LOG.warning(
+ "copilot_candidate_publication_skipped_missing_canonical_workflow",
+ workflow_copilot_chat_id=chat.workflow_copilot_chat_id,
+ workflow_permanent_id=chat.workflow_permanent_id,
+ )
+ _discard_superseded_proposal(agent_result)
+ notice = "This draft was not saved because the workflow no longer exists."
+ agent_result.user_response = (
+ f"{agent_result.user_response.rstrip()}\n\n{notice}"
+ if agent_result.user_response.strip()
+ else notice
+ )
+ agent_result.narrative_summary = agent_result.user_response
+ if agent_result.narrative_payload is not None:
+ agent_result.narrative_payload = {
+ **agent_result.narrative_payload,
+ "terminalMessage": agent_result.user_response,
+ "narrativeSummary": agent_result.user_response,
+ }
+ return
+ if opening_workflow_title is not None and canonical.title and canonical.title != opening_workflow_title:
+ proposed_workflow_data["title"] = canonical.title
+ stored_yaml = proposed_workflow_data.get("_copilot_yaml")
+ if isinstance(stored_yaml, str):
+ proposed_workflow_data["_copilot_yaml"] = strip_copilot_yaml_headers(
+ with_workflow_yaml_title(stored_yaml, canonical.title)
+ )
+ updated_workflow.title = canonical.title
+ if isinstance(agent_result.workflow_yaml, str):
+ agent_result.workflow_yaml = with_workflow_yaml_title(
+ agent_result.workflow_yaml, canonical.title
+ )
+ updated_chat = await app.DATABASE.workflow_params.publish_workflow_copilot_candidate(
organization_id=chat.organization_id,
workflow_copilot_chat_id=chat.workflow_copilot_chat_id,
- proposed_workflow=proposed_workflow_data,
+ proposal=proposed_workflow_data,
+ owner_turn_id=agent_result.turn_id or uuid.uuid4().hex,
+ canonical_fingerprint=proposal_workflow_fingerprint(canonical),
+ canonical_title=canonical.title,
+ disposition=_proposal_disposition(agent_result),
+ expected_owner_turn_id=None,
+ expected_revision=None,
)
except CopilotProposalConflictError:
LOG.info(
- "copilot_candidate_enrich_conflict",
+ "copilot_candidate_publication_conflict",
workflow_copilot_chat_id=chat.workflow_copilot_chat_id,
- branch="untyped",
)
_discard_superseded_proposal(agent_result)
return
+ published_proposal = updated_chat.proposed_workflow
+ if published_proposal is None:
+ raise RuntimeError("Candidate publication returned no proposal")
+ metadata = copilot_proposal_metadata(published_proposal)
+ if metadata is None:
+ raise RuntimeError("Candidate publication returned no ownership token")
+ agent_result.proposal_owner_turn_id = metadata.owner_turn_id
+ agent_result.proposal_revision = metadata.revision
+ agent_result.proposal_workflow_run_id = metadata.workflow_run_id
+ proposed_workflow_data = published_proposal
# Keep the in-memory chat in sync — a same-turn recovery retry reads
# chat.proposed_workflow again and must not see the pre-write value.
chat.proposed_workflow = proposed_workflow_data
@@ -1608,7 +1665,11 @@ async def _persist_cancel_turn(
else:
await asyncio.shield(
_persist_proposed_workflow_state(
- chat, agent_result, restored, keep_pending_proposal=effective_keep_pending_proposal
+ chat,
+ agent_result,
+ restored,
+ keep_pending_proposal=effective_keep_pending_proposal,
+ opening_workflow_title=getattr(original_workflow, "title", None),
)
)
user_response = agent_result.user_response
@@ -1842,7 +1903,8 @@ async def _finalise_normal_turn(
"copilot.auto_accept_deferred_reason", "workflow_run_group_running"
)
agent_result.proposal_disposition = "review_tested"
- user_response = f"{user_response}\n\n{_AUTO_ACCEPT_DEFERRED_FOR_RUN_GROUP}"
+ agent_result.user_response = f"{user_response}\n\n{_AUTO_ACCEPT_DEFERRED_FOR_RUN_GROUP}"
+ user_response = agent_result.user_response
except Exception:
# Undo any mid-turn degraded write so a failed commit fails the turn
# atomically instead of leaving canonical on a partial intermediate.
@@ -1858,7 +1920,10 @@ async def _finalise_normal_turn(
# A failed rollback means canonical may still hold the mid-turn write —
# don't honor keep_pending_proposal against an unverified "nothing changed" state.
keep_pending_proposal=chat_request.keep_pending_proposal and not restore_failed,
+ opening_workflow_title=getattr(original_workflow, "title", None),
)
+ # Proposal persistence can add a reason when no safe candidate could be published.
+ user_response = agent_result.user_response
# Read after persisting, never before: persisting drops this turn's proposal when a newer
# candidate owns the row, and the frame below must not pair a dropped draft with that
# candidate's token.
diff --git a/skyvern/forge/sdk/services/org_auth_service.py b/skyvern/forge/sdk/services/org_auth_service.py
index 202ef253c..11fe0925b 100644
--- a/skyvern/forge/sdk/services/org_auth_service.py
+++ b/skyvern/forge/sdk/services/org_auth_service.py
@@ -21,7 +21,7 @@ from skyvern.forge.sdk.core.organization_age_cache import remember_organization_
from skyvern.forge.sdk.db.agent_db import AgentDB
from skyvern.forge.sdk.models import TokenPayload
from skyvern.forge.sdk.schemas.organizations import Organization, OrganizationAuthToken, OrganizationAuthTokenType
-from skyvern.forge.sdk.services.request_principal import resolve_request_principal
+from skyvern.forge.sdk.services.request_principal import resolve_request_principal, synthetic_user_id
from skyvern.forge.sdk.workflow.models.tags import CallerType
LOG = structlog.get_logger()
@@ -429,7 +429,7 @@ async def get_current_user_id(
authorization=authorization,
)
if organization:
- return f"{organization.organization_id}_user"
+ return synthetic_user_id(organization.organization_id)
raise HTTPException(
status_code=status.HTTP_403_FORBIDDEN,
@@ -834,7 +834,7 @@ async def get_current_caller_context(
if x_user_agent == SKYVERN_UI_USER_AGENT:
return CallerContext(
organization=organization,
- caller_id=f"{organization.organization_id}_user",
+ caller_id=synthetic_user_id(organization.organization_id),
caller_type=CallerType.USER,
)
return CallerContext(
diff --git a/skyvern/forge/sdk/services/request_principal.py b/skyvern/forge/sdk/services/request_principal.py
index 7408a20b1..8dc807bff 100644
--- a/skyvern/forge/sdk/services/request_principal.py
+++ b/skyvern/forge/sdk/services/request_principal.py
@@ -61,6 +61,10 @@ class RequestPrincipal:
token_has_organization_claim: bool | None = None
+def synthetic_user_id(organization_id: str) -> str:
+ return f"{organization_id}_user"
+
+
_ResolutionKey = tuple[str, str | None, bytes | None]
_request_principal: ContextVar[tuple[_ResolutionKey, RequestPrincipal, BearerIdentityStatus] | None] = ContextVar(
"request_principal", default=None
diff --git a/tests/unit/copilot_route_test_support.py b/tests/unit/copilot_route_test_support.py
index 89a56bafb..f3da0a810 100644
--- a/tests/unit/copilot_route_test_support.py
+++ b/tests/unit/copilot_route_test_support.py
@@ -8,7 +8,7 @@ from __future__ import annotations
from collections.abc import AsyncIterator
from contextlib import asynccontextmanager
-from datetime import datetime, timezone
+from datetime import UTC, datetime, timezone
from types import SimpleNamespace
from typing import Any
from unittest.mock import AsyncMock, MagicMock
@@ -17,6 +17,8 @@ import pytest
from skyvern.forge import app
from skyvern.forge.sdk.copilot.config import BlockAuthoringPolicy, CopilotConfig
+from skyvern.forge.sdk.db.exceptions import CopilotProposalConflictError
+from skyvern.forge.sdk.schemas.workflow_copilot import COPILOT_PROPOSAL_METADATA_KEY, copilot_proposal_metadata
def terminal_narrative_payload() -> dict[str, Any]:
@@ -115,8 +117,12 @@ def setup_new_copilot_mocks(
agent_result.proposal_revision = None
if not hasattr(agent_result, "proposal_workflow_run_id"):
agent_result.proposal_workflow_run_id = None
+ if not hasattr(chat, "workflow_permanent_id"):
+ chat.workflow_permanent_id = getattr(original_workflow, "workflow_permanent_id", "wpid-1")
if not hasattr(original_workflow, "modified_at"):
original_workflow.modified_at = datetime(2026, 4, 14, tzinfo=timezone.utc)
+ if not hasattr(original_workflow, "title"):
+ original_workflow.title = "Original"
if not hasattr(original_workflow, "model_dump"):
original_workflow.model_dump = MagicMock(return_value={"workflow_id": original_workflow.workflow_id})
@@ -135,6 +141,58 @@ def setup_new_copilot_mocks(
restore_mock,
)
+ async def publish_workflow_copilot_candidate(**kwargs: Any) -> SimpleNamespace:
+ current = copilot_proposal_metadata(chat.proposed_workflow)
+ expected = (kwargs["expected_owner_turn_id"], kwargs["expected_revision"])
+ if (current is None and expected != (None, None)) or (
+ current is not None and expected != (current.owner_turn_id, current.revision)
+ ):
+ raise CopilotProposalConflictError("Copilot proposal changed")
+ owner_turn_id = kwargs["owner_turn_id"]
+ metadata = {
+ "owner_turn_id": owner_turn_id,
+ "revision": current.revision + 1 if current is not None and current.owner_turn_id == owner_turn_id else 1,
+ "canonical_fingerprint": kwargs["canonical_fingerprint"],
+ "canonical_title": kwargs["canonical_title"],
+ "disposition": kwargs["disposition"],
+ }
+ proposal = {**kwargs["proposal"], COPILOT_PROPOSAL_METADATA_KEY: metadata}
+ chat.proposed_workflow = proposal
+ return SimpleNamespace(proposed_workflow=proposal)
+
+ async def clear_workflow_copilot_candidate(**kwargs: Any) -> None:
+ current = copilot_proposal_metadata(chat.proposed_workflow)
+ expected = (kwargs["expected_owner_turn_id"], kwargs["expected_revision"])
+ if (current is None and expected != (None, None)) or (
+ current is not None and expected != (current.owner_turn_id, current.revision)
+ ):
+ raise CopilotProposalConflictError("Copilot proposal changed")
+ chat.proposed_workflow = None
+
+ async def enrich_workflow_copilot_candidate(**kwargs: Any) -> SimpleNamespace:
+ current = copilot_proposal_metadata(chat.proposed_workflow)
+ if current is None or (current.owner_turn_id, current.revision) != (
+ kwargs["expected_owner_turn_id"],
+ kwargs["expected_revision"],
+ ):
+ raise CopilotProposalConflictError("Copilot proposal changed")
+ metadata = current.model_copy(update={"disposition": kwargs["disposition"]})
+ proposal = {**kwargs["proposal"], COPILOT_PROPOSAL_METADATA_KEY: metadata.model_dump(mode="json")}
+ chat.proposed_workflow = proposal
+ return SimpleNamespace(proposed_workflow=proposal)
+
+ async def claim_workflow_copilot_candidate(**kwargs: Any) -> SimpleNamespace:
+ current = copilot_proposal_metadata(chat.proposed_workflow)
+ if current is None or (current.owner_turn_id, current.revision) != (
+ kwargs["expected_owner_turn_id"],
+ kwargs["expected_revision"],
+ ):
+ raise CopilotProposalConflictError("Copilot proposal changed")
+ metadata = current.model_copy(update={"disposition": "accepting", "claimed_at": datetime.now(UTC)})
+ proposal = {**chat.proposed_workflow, COPILOT_PROPOSAL_METADATA_KEY: metadata.model_dump(mode="json")}
+ chat.proposed_workflow = proposal
+ return SimpleNamespace(proposed_workflow=proposal)
+
monkeypatch.setattr(
"skyvern.forge.sdk.routes.workflow_copilot.run_copilot_agent",
AsyncMock(return_value=agent_result),
@@ -144,6 +202,10 @@ def setup_new_copilot_mocks(
get_workflow_copilot_chat_by_id=AsyncMock(return_value=chat),
get_workflow_copilot_chat_messages=AsyncMock(return_value=[]),
update_workflow_copilot_chat=AsyncMock(),
+ publish_workflow_copilot_candidate=AsyncMock(side_effect=publish_workflow_copilot_candidate),
+ enrich_workflow_copilot_candidate=AsyncMock(side_effect=enrich_workflow_copilot_candidate),
+ clear_workflow_copilot_candidate=AsyncMock(side_effect=clear_workflow_copilot_candidate),
+ claim_workflow_copilot_candidate=AsyncMock(side_effect=claim_workflow_copilot_candidate),
create_workflow_copilot_chat_message=AsyncMock(
return_value=SimpleNamespace(created_at=datetime(2026, 4, 14, tzinfo=timezone.utc))
),
diff --git a/tests/unit/test_copilot_work_plan.py b/tests/unit/test_copilot_work_plan.py
index ed8a1ff9d..e4a0abc84 100644
--- a/tests/unit/test_copilot_work_plan.py
+++ b/tests/unit/test_copilot_work_plan.py
@@ -360,6 +360,7 @@ def _unfinished_plan_agent_result(work_plan: list[str] | None) -> AgentResult:
global_llm_context=None,
response_type="REPLY",
proposal_disposition="review_untested",
+ turn_id="turn-plan",
narrative_payload=terminal_narrative_payload(),
)
result.work_plan = work_plan
@@ -405,7 +406,7 @@ async def test_an_unfinished_plan_naming_the_requested_output_still_leaves_the_r
with_plan, params = await _finalise_with_plan(monkeypatch, plan)
without_plan, _ = await _finalise_with_plan(monkeypatch, None)
- assert params.update_workflow_copilot_chat.await_args.kwargs["proposed_workflow"]["workflow_id"] == "wf-draft"
+ assert params.publish_workflow_copilot_candidate.await_args.kwargs["proposal"]["workflow_id"] == "wf-draft"
assert with_plan.message == "Saved a draft; I have not run it yet."
assert (
params.create_workflow_copilot_chat_message.await_args_list[-1].kwargs["content"]
diff --git a/tests/unit/test_workflow_copilot_cancel.py b/tests/unit/test_workflow_copilot_cancel.py
index c1bdcabab..c45d2b09e 100644
--- a/tests/unit/test_workflow_copilot_cancel.py
+++ b/tests/unit/test_workflow_copilot_cancel.py
@@ -221,9 +221,9 @@ def _make_original_workflow() -> SimpleNamespace:
@pytest.mark.asyncio
-async def test_timeout_wip_persists_proposed_workflow_with_yaml_when_canonical_restored() -> None:
- workflow_params = SimpleNamespace(update_workflow_copilot_chat=AsyncMock())
- app.DATABASE.workflow_params = workflow_params
+async def test_timeout_wip_persists_proposed_workflow_with_yaml_when_canonical_restored(
+ monkeypatch: pytest.MonkeyPatch,
+) -> None:
chat = _make_chat(auto_accept=False)
updated_workflow = MagicMock()
updated_workflow.model_dump.return_value = {
@@ -246,11 +246,12 @@ async def test_timeout_wip_persists_proposed_workflow_with_yaml_when_canonical_r
),
proposal_disposition="review_tested",
)
+ _, workflow_params = setup_new_copilot_mocks(monkeypatch, chat, _make_original_workflow(), agent_result)
await _persist_proposed_workflow_state(chat, agent_result, restored=True)
- workflow_params.update_workflow_copilot_chat.assert_awaited_once()
- proposed_workflow = workflow_params.update_workflow_copilot_chat.await_args.kwargs["proposed_workflow"]
+ workflow_params.publish_workflow_copilot_candidate.assert_awaited_once()
+ proposed_workflow = workflow_params.publish_workflow_copilot_candidate.await_args.kwargs["proposal"]
assert proposed_workflow["workflow_definition"]["blocks"][0]["label"] == "extract_record_status_info"
assert proposed_workflow["_copilot_yaml"].startswith("title: Record lookup")
assert "_copilot_unvalidated" not in proposed_workflow
@@ -569,8 +570,8 @@ async def test_route_cancel_wip_persists_proposal_and_response_frame(
restore_mock.assert_awaited_once()
- workflow_params.update_workflow_copilot_chat.assert_awaited_once()
- proposed_workflow = workflow_params.update_workflow_copilot_chat.await_args.kwargs["proposed_workflow"]
+ workflow_params.publish_workflow_copilot_candidate.assert_awaited_once()
+ proposed_workflow = workflow_params.publish_workflow_copilot_candidate.await_args.kwargs["proposal"]
expected_proposed: dict[str, object] = {
"workflow_id": "wf-canonical",
"title": title,
@@ -1038,7 +1039,7 @@ async def test_timeout_wip_result_streams_normal_response_frame(
await handler(stream)
restore_mock.assert_awaited_once()
- proposal = workflow_params.update_workflow_copilot_chat.await_args.kwargs["proposed_workflow"]
+ proposal = workflow_params.publish_workflow_copilot_candidate.await_args.kwargs["proposal"]
assert proposal["_copilot_yaml"] == "version: '1.0'"
assert proposal["_copilot_unvalidated"] is True
@@ -1057,9 +1058,9 @@ async def test_timeout_wip_result_streams_normal_response_frame(
@pytest.mark.asyncio
-async def test_verified_terminal_timeout_result_persists_proposed_workflow_with_blocks_and_params() -> None:
- workflow_params = SimpleNamespace(update_workflow_copilot_chat=AsyncMock())
- app.DATABASE.workflow_params = workflow_params
+async def test_verified_terminal_timeout_result_persists_proposed_workflow_with_blocks_and_params(
+ monkeypatch: pytest.MonkeyPatch,
+) -> None:
chat = _make_chat(proposed_workflow=None, auto_accept=False)
blocks = [
{"block_type": "code", "label": "open_search_search_page"},
@@ -1093,10 +1094,11 @@ async def test_verified_terminal_timeout_result_persists_proposed_workflow_with_
workflow_was_persisted=True,
proposal_disposition="auto_applicable",
)
+ _, workflow_params = setup_new_copilot_mocks(monkeypatch, chat, _make_original_workflow(), agent_result)
await _persist_proposed_workflow_state(chat, agent_result, restored=False)
- proposal = workflow_params.update_workflow_copilot_chat.await_args.kwargs["proposed_workflow"]
+ proposal = workflow_params.publish_workflow_copilot_candidate.await_args.kwargs["proposal"]
assert proposal["_copilot_yaml"].startswith("title: Record Status Draft")
assert [block["label"] for block in proposal["workflow_definition"]["blocks"]] == [
"open_search_search_page",
@@ -1168,7 +1170,7 @@ async def test_timeout_wip_review_tested_propagates_to_response_frame(
await handler(stream)
restore_mock.assert_awaited_once()
- proposal = workflow_params.update_workflow_copilot_chat.await_args.kwargs["proposed_workflow"]
+ proposal = workflow_params.publish_workflow_copilot_candidate.await_args.kwargs["proposal"]
assert proposal["_copilot_yaml"] == "title: Last Good"
assert "_copilot_unvalidated" not in proposal
diff --git a/tests/unit/test_workflow_copilot_route.py b/tests/unit/test_workflow_copilot_route.py
index ad02b6249..8db3b3338 100644
--- a/tests/unit/test_workflow_copilot_route.py
+++ b/tests/unit/test_workflow_copilot_route.py
@@ -508,11 +508,7 @@ async def test_review_untested_draft_and_terminal_fact_survive_persistence_and_h
agent_result=agent_result,
)
- proposal_write = next(
- call.kwargs["proposed_workflow"]
- for call in workflow_params.update_workflow_copilot_chat.await_args_list
- if call.kwargs.get("proposed_workflow") is not None
- )
+ proposal_write = workflow_params.publish_workflow_copilot_candidate.await_args.kwargs["proposal"]
hydrated_proposal = json.loads(json.dumps(proposal_write))
assert hydrated_proposal["workflow_id"] == "wf-draft"
assert hydrated_proposal["_copilot_unvalidated"] is True
@@ -702,12 +698,10 @@ async def test_auto_accept_refused_by_a_running_group_leaves_the_draft_pending(
assert response_frame.proposal_disposition == "review_tested"
assert workflow_copilot_route._AUTO_ACCEPT_DEFERRED_FOR_RUN_GROUP in response_frame.message
restore.assert_not_awaited()
- pending = [
- call.kwargs["proposed_workflow"]
- for call in workflow_params.update_workflow_copilot_chat.await_args_list
- if "proposed_workflow" in call.kwargs
- ]
- assert pending and pending[-1] is not None
+ publication = workflow_params.publish_workflow_copilot_candidate.await_args
+ assert publication is not None
+ assert publication.kwargs["proposal"] is not None
+ assert copilot_proposal_metadata(chat.proposed_workflow) is not None
@pytest.mark.asyncio
@@ -3794,12 +3788,11 @@ async def test_route_error_after_real_fresh_write_clears_it_even_with_no_prior_p
assert callable(handler)
await handler(copilot_stream)
- update_calls = workflow_params.update_workflow_copilot_chat.await_args_list
- write_calls = [c for c in update_calls if c.kwargs.get("proposed_workflow") is not None]
- clear_calls = [c for c in update_calls if c.kwargs.get("proposed_workflow") is None]
- assert write_calls, "the first attempt must have genuinely persisted the fresh draft"
- assert clear_calls, (
- f"the orphaned fresh draft must clear on retry even though chat had no prior proposal, got {update_calls!r}"
+ assert workflow_params.publish_workflow_copilot_candidate.await_count == 1, (
+ "the first attempt must have genuinely persisted the fresh draft"
+ )
+ assert workflow_params.clear_workflow_copilot_candidate.await_count == 1, (
+ "the orphaned fresh draft must clear on retry even though chat had no prior proposal"
)
@@ -4003,10 +3996,11 @@ async def test_verified_code_only_fix_stays_pending_without_auto_accept(
restore_mock.assert_not_awaited()
workflow_service.update_workflow_definition.assert_not_awaited()
- update_calls = app.DATABASE.workflow_params.update_workflow_copilot_chat.await_args_list
- proposed_writes = [c.kwargs["proposed_workflow"] for c in update_calls if "proposed_workflow" in c.kwargs]
+ proposed_writes = app.DATABASE.workflow_params.publish_workflow_copilot_candidate.await_args_list
assert proposed_writes, "expected the pending proposal to be persisted"
- assert all(w is not None for w in proposed_writes), "verified fix must stay pending, not be cleared"
+ proposal = proposed_writes[0].kwargs["proposal"]
+ assert proposal.get("_copilot_yaml") == "title: Applied"
+ assert copilot_proposal_metadata(chat.proposed_workflow) is not None
response_frames = [
call.args[0]
@@ -4160,10 +4154,9 @@ async def test_unvalidated_timeout_wip_overrides_auto_accept(
restore_mock.assert_awaited_once()
- update_calls = app.DATABASE.workflow_params.update_workflow_copilot_chat.await_args_list
- proposal_writes = [c for c in update_calls if c.kwargs.get("proposed_workflow") is not None]
+ proposal_writes = app.DATABASE.workflow_params.publish_workflow_copilot_candidate.await_args_list
assert len(proposal_writes) == 1
- proposed_data = proposal_writes[0].kwargs["proposed_workflow"]
+ proposed_data = proposal_writes[0].kwargs["proposal"]
assert proposed_data.get("_copilot_unvalidated") is True
assert proposed_data.get("_copilot_yaml") == "title: WIP"
@@ -4185,11 +4178,6 @@ async def test_persist_state_keeps_verified_review_tested_proposal(monkeypatch:
auto_accept=False,
proposed_workflow={"existing": True},
)
- monkeypatch.setattr(
- app.DATABASE,
- "workflow_params",
- SimpleNamespace(update_workflow_copilot_chat=AsyncMock()),
- )
agent_result = SimpleNamespace(
updated_workflow=SimpleNamespace(title="built", model_dump=lambda mode: {"title": "built"}),
workflow_yaml="title: built\n",
@@ -4208,12 +4196,15 @@ async def test_persist_state_keeps_verified_review_tested_proposal(monkeypatch:
proposal_adopted=False,
proposal_workflow_run_id=None,
)
+ _, workflow_params = setup_new_copilot_mocks(
+ monkeypatch, chat, fake_workflow(workflow_id="wf-canonical", title="Original"), agent_result
+ )
await workflow_copilot_route._persist_proposed_workflow_state(chat, agent_result, restored=False)
- calls = app.DATABASE.workflow_params.update_workflow_copilot_chat.await_args_list
- assert len(calls) == 1
- persisted = calls[0].kwargs["proposed_workflow"]
+ call = workflow_params.publish_workflow_copilot_candidate.await_args
+ assert call is not None
+ persisted = call.kwargs["proposal"]
assert persisted is not None
assert persisted.get("_copilot_unvalidated") is not True
@@ -4327,23 +4318,21 @@ async def test_persist_state_keep_pending_proposal_does_not_block_new_proposal_o
auto_accept=False,
proposed_workflow={"existing": True},
)
- monkeypatch.setattr(
- app.DATABASE,
- "workflow_params",
- SimpleNamespace(update_workflow_copilot_chat=AsyncMock()),
- )
agent_result = _make_bypassed_proposal_agent_result(
updated_workflow=SimpleNamespace(title="new draft", model_dump=lambda mode: {"title": "new draft"}),
workflow_yaml="title: new draft\n",
)
+ _, workflow_params = setup_new_copilot_mocks(
+ monkeypatch, chat, fake_workflow(workflow_id="wf-canonical", title="Original"), agent_result
+ )
await workflow_copilot_route._persist_proposed_workflow_state(
chat, agent_result, restored=True, keep_pending_proposal=True
)
- calls = app.DATABASE.workflow_params.update_workflow_copilot_chat.await_args_list
- assert len(calls) == 1
- persisted = calls[0].kwargs["proposed_workflow"]
+ call = workflow_params.publish_workflow_copilot_candidate.await_args
+ assert call is not None
+ persisted = call.kwargs["proposal"]
assert persisted is not None
assert persisted.get("title") == "new draft"
@@ -5032,6 +5021,9 @@ async def test_proposal_header_secrets_stay_server_side_across_endpoints(
workflow_yaml=workflow_yaml,
global_llm_context=None,
private_workflow_settings=ctx.authored_private_workflow_settings,
+ proposal_owner_turn_id=ctx.proposal_owner_turn_id,
+ proposal_revision=ctx.proposal_revision,
+ proposal_workflow_run_id=ctx.proposal_workflow_run_id,
)
monkeypatch.setattr(workflow_copilot_route, "run_copilot_agent", agent)
@@ -5281,6 +5273,199 @@ async def _accept(chat_id: str, tokened: bool = True) -> Workflow:
)
+async def test_untyped_proposal_publication_records_base_and_rejects_a_save_before_accept(
+ sqlite_engine: AsyncEngine, monkeypatch: pytest.MonkeyPatch
+) -> None:
+ workflow_params = WorkflowParametersRepository(BaseAlchemyDB(sqlite_engine).Session)
+ workflows = WorkflowsRepository(BaseAlchemyDB(sqlite_engine).Session)
+ monkeypatch.setattr(app.DATABASE, "workflow_params", workflow_params)
+ monkeypatch.setattr(app.DATABASE, "workflows", workflows)
+ canonical = await workflows.create_workflow(
+ title="Canonical",
+ workflow_definition={"parameters": [], "blocks": []},
+ organization_id="org-1",
+ workflow_permanent_id="wpid-1",
+ version=1,
+ )
+ chat = await workflow_params.create_workflow_copilot_chat(organization_id="org-1", workflow_permanent_id="wpid-1")
+ candidate = _make_copilot_workflow("Candidate", _NOW + timedelta(seconds=1))
+ agent_result = AgentResult(
+ user_response="Here is the draft.",
+ updated_workflow=candidate,
+ global_llm_context=None,
+ workflow_yaml=_CANDIDATE_YAML,
+ proposal_disposition="review_tested",
+ turn_id="turn-save-before-claim",
+ )
+
+ await workflow_copilot_route._persist_proposed_workflow_state(chat, agent_result, restored=False)
+
+ stored = await workflow_params.get_workflow_copilot_chat_by_id("org-1", chat.workflow_copilot_chat_id)
+ assert stored is not None
+ metadata = copilot_proposal_metadata(stored.proposed_workflow)
+ assert metadata is not None
+ assert metadata.owner_turn_id == agent_result.turn_id
+ assert metadata.canonical_fingerprint == workflow_update.proposal_workflow_fingerprint(canonical)
+ assert metadata.canonical_title == canonical.title
+
+ await workflows.create_workflow(
+ title="Canonical",
+ description="Saved after the proposal was shown",
+ workflow_definition={"parameters": [], "blocks": []},
+ organization_id="org-1",
+ workflow_permanent_id="wpid-1",
+ version=2,
+ )
+ create_workflow = AsyncMock()
+ monkeypatch.setattr(app, "WORKFLOW_SERVICE", SimpleNamespace(create_workflow_from_request=create_workflow))
+
+ with pytest.raises(HTTPException) as exc_info:
+ await workflow_copilot_route.workflow_copilot_apply_proposed_workflow(
+ WorkflowCopilotApplyProposedWorkflowRequest(
+ workflow_copilot_chat_id=chat.workflow_copilot_chat_id,
+ owner_turn_id=metadata.owner_turn_id,
+ revision=metadata.revision,
+ ),
+ SimpleNamespace(organization_id="org-1"),
+ )
+
+ assert exc_info.value.status_code == 409
+ create_workflow.assert_not_awaited()
+
+
+async def test_untyped_proposal_is_discarded_if_canonical_workflow_disappears(
+ monkeypatch: pytest.MonkeyPatch,
+) -> None:
+ chat = SimpleNamespace(
+ organization_id="org-1",
+ workflow_copilot_chat_id="chat-1",
+ workflow_permanent_id="wpid-1",
+ proposed_workflow=None,
+ auto_accept=False,
+ )
+ original_workflow = _make_copilot_workflow("Original", _NOW)
+ agent_result = AgentResult(
+ user_response="Here is the draft.",
+ updated_workflow=_make_copilot_workflow("Candidate", _NOW + timedelta(seconds=1)),
+ global_llm_context=None,
+ workflow_yaml=_CANDIDATE_YAML,
+ proposal_disposition="review_tested",
+ narrative_payload=terminal_narrative_payload(),
+ )
+ _, workflow_params = setup_new_copilot_mocks(monkeypatch, chat, original_workflow, agent_result)
+ app.DATABASE.workflows.get_workflow_by_permanent_id = AsyncMock(return_value=None)
+ stream = MagicMock(send=AsyncMock(return_value=True))
+
+ await workflow_copilot_route._finalise_normal_turn(
+ stream=stream,
+ chat=chat,
+ organization_id="org-1",
+ original_workflow=original_workflow,
+ chat_request=_make_chat_request(),
+ agent_result=agent_result,
+ )
+
+ expected_response = "Here is the draft.\n\nThis draft was not saved because the workflow no longer exists."
+ assert agent_result.updated_workflow is None
+ assert agent_result.proposal_disposition == "no_proposal"
+ assert agent_result.user_response == expected_response
+ assert agent_result.narrative_summary == agent_result.user_response
+ assert agent_result.narrative_payload is not None
+ assert agent_result.narrative_payload["terminalMessage"] == agent_result.user_response
+ response = stream.send.await_args.args[0]
+ assert response.message == expected_response
+ assert response.updated_workflow is None
+ assert response.narrative_payload["terminalMessage"] == expected_response
+ workflow_params.publish_workflow_copilot_candidate.assert_not_awaited()
+
+
+async def test_chat_history_still_returns_an_existing_pre_metadata_proposal(
+ sqlite_engine: AsyncEngine, monkeypatch: pytest.MonkeyPatch
+) -> None:
+ workflow_params = WorkflowParametersRepository(BaseAlchemyDB(sqlite_engine).Session)
+ workflows = WorkflowsRepository(BaseAlchemyDB(sqlite_engine).Session)
+ monkeypatch.setattr(app.DATABASE, "workflow_params", workflow_params)
+ monkeypatch.setattr(app.DATABASE, "workflows", workflows)
+ await workflows.create_workflow(
+ title="Canonical",
+ workflow_definition={"parameters": [], "blocks": []},
+ organization_id="org-1",
+ workflow_permanent_id="wpid-1",
+ version=1,
+ )
+ chat = await workflow_params.create_workflow_copilot_chat(organization_id="org-1", workflow_permanent_id="wpid-1")
+ legacy_proposal = {"_copilot_yaml": _CANDIDATE_YAML}
+ await workflow_params.update_workflow_copilot_chat(
+ "org-1", chat.workflow_copilot_chat_id, proposed_workflow=legacy_proposal
+ )
+
+ history = await workflow_copilot_chat_history(
+ credential_recovery_token=None,
+ workflow_copilot_chat_id=chat.workflow_copilot_chat_id,
+ organization=SimpleNamespace(organization_id="org-1"),
+ )
+
+ assert history.proposed_workflow is not None
+ assert history.proposed_workflow["_copilot_yaml"] == _CANDIDATE_YAML
+ assert history.proposed_workflow_metadata is None
+
+
+async def test_untyped_proposal_persistence_reconciles_a_rename_since_turn_start(
+ monkeypatch: pytest.MonkeyPatch,
+) -> None:
+ chat = SimpleNamespace(
+ organization_id="org-1",
+ workflow_copilot_chat_id="chat-1",
+ workflow_permanent_id="wpid-1",
+ proposed_workflow=None,
+ auto_accept=False,
+ )
+ original_workflow = fake_workflow(workflow_id="wf-canonical", title="New Agent")
+ renamed_workflow = fake_workflow(
+ workflow_id="wf-canonical",
+ title="Download Vendor Invoices",
+ model_dump=MagicMock(return_value={"workflow_id": "wf-canonical", "title": "Download Vendor Invoices"}),
+ )
+ updated_workflow = MagicMock()
+ updated_workflow.title = "New Agent"
+ updated_workflow.model_dump.side_effect = lambda **_: {
+ "workflow_id": "wf-canonical",
+ "title": updated_workflow.title,
+ }
+ agent_result = AgentResult(
+ user_response="Here is the draft.",
+ updated_workflow=updated_workflow,
+ global_llm_context=None,
+ workflow_yaml="title: New Agent\n",
+ )
+ _, workflow_params = setup_new_copilot_mocks(monkeypatch, chat, original_workflow, agent_result)
+ app.DATABASE.workflows.get_workflow_by_permanent_id = AsyncMock(return_value=renamed_workflow)
+ stream = MagicMock(send=AsyncMock(return_value=True))
+
+ await workflow_copilot_route._finalise_normal_turn(
+ stream=stream,
+ chat=chat,
+ organization_id="org-1",
+ original_workflow=original_workflow,
+ chat_request=_make_chat_request(),
+ agent_result=agent_result,
+ )
+
+ proposal = workflow_params.publish_workflow_copilot_candidate.await_args.kwargs["proposal"]
+ metadata = copilot_proposal_metadata(chat.proposed_workflow)
+ assert proposal["title"] == renamed_workflow.title
+ assert yaml.safe_load(proposal["_copilot_yaml"])["title"] == renamed_workflow.title
+ assert stream.send.await_args.args[0].updated_workflow["title"] == renamed_workflow.title
+ assert metadata is not None
+ assert workflow_copilot_route._accepted_workflow_title(proposal["title"], renamed_workflow, metadata) == (
+ renamed_workflow.title
+ )
+
+
@pytest.mark.asyncio
@pytest.mark.parametrize("tokened", [True, False], ids=["tokened", "tokenless"])
async def test_a_history_read_that_overtakes_an_accept_already_sees_its_claim(