diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt index a0a07e91e0..b29a21d710 100644 --- a/backend/ee-repo-ref.txt +++ b/backend/ee-repo-ref.txt @@ -1 +1 @@ -747336910e5c7498544613ad7863cea59f4db6a1 +77703cf32e58964906d87ee83ddda44b5b8d1b7e diff --git a/docs/feature-telemetry.md b/docs/feature-telemetry.md index 0862453020..af0dd55942 100644 --- a/docs/feature-telemetry.md +++ b/docs/feature-telemetry.md @@ -4,12 +4,13 @@ anonymous usage-stats payload. It answers "does anyone use this, and which variant do they pick" without any identifying data leaving the instance. -It currently carries 78 registered actions across twenty-nine features (`ai_session`, `ai_chat`, +It currently carries 86 registered actions across thirty-three features (`ai_session`, `ai_chat`, `ai_fix`, `ai_agent`, `ai_decision`, `ai_agent_eval`, `app_sandbox`, `datatable`, `db_manager`, `flow_editor`, `flow_run`, `flow_step`, `home`, `header_nav`, `run_form`, `debugger`, `trigger`, `command_script`, -`hub_script`, `usage_meter`, `sso_groups_claim`, `cloud_trial_offer`, `job_token_scopes`, -`worker_draining`, `worker_group`, `worker_resource_stats`, `dev_workspace_isolation`, -`slack_agent`, `variable_expiration`). Nearly all of the +`mcp`, `mcp_workspace`, `hub_script`, `usage_meter`, `sso_groups_claim`, `cloud_trial_offer`, +`job_token_scopes`, `worker_draining`, `worker_group`, `worker_resource_stats`, +`dev_workspace_isolation`, `slack_agent`, `variable_expiration`, `anthropic_federation`, +`deployment_request`). Nearly all of the product is uninstrumented, so new user-facing work is the opportunity to change that. ## When to instrument diff --git a/frontend/src/lib/components/CompareWorkspaces.svelte b/frontend/src/lib/components/CompareWorkspaces.svelte index 096bc290c4..083437f8f7 100644 --- a/frontend/src/lib/components/CompareWorkspaces.svelte +++ b/frontend/src/lib/components/CompareWorkspaces.svelte @@ -65,6 +65,8 @@ import { deepEqual } from 'fast-equals' import WorkspaceDeployLayout from './WorkspaceDeployLayout.svelte' import DeploymentRequestPanel from './deploymentRequest/DeploymentRequestPanel.svelte' + import AiReview from './deploymentRequest/AiReview.svelte' + import { copilotInfo } from '$lib/aiStore' import { userStore } from '$lib/stores' import CompareModeToggle, { type CompareMode } from './CompareModeToggle.svelte' import CompareTargetPicker from './CompareTargetPicker.svelte' @@ -430,6 +432,7 @@ ) let selectedItems = $state([]) + let selectedDiffs = $derived(selectableDiffs.filter((d) => selectedItems.includes(getItemKey(d)))) // Selected items that carry a pending draft. They're opt-in (excluded from the // default selection), so a non-empty list means the user explicitly picked an @@ -1807,8 +1810,18 @@ {#snippet footer()} {#if !nothingToAct} -
-
+
+
+ + {#if mergeIntoParent && $copilotInfo.enabled && !hasOpenDeploymentRequest && !deploymentRequestPanel?.isDialogOpen()} + + {/if} +