diff --git a/cli/azd/CHANGELOG.md b/cli/azd/CHANGELOG.md
index 212d98f0719..c96e96d1cdd 100644
--- a/cli/azd/CHANGELOG.md
+++ b/cli/azd/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Release History
 
+## 1.24.0-beta.1 (Unreleased)
+
+### Features Added
+
+- [[#7045]](https://github.com/Azure/azure-dev/pull/7045) Add configurable deploy timeout via `--timeout` flag to `azd deploy` and a `deployTimeout` field in `azure.yaml` service configuration. Timeout resolution order: CLI flag > `azure.yaml` service config > default (1200s / 20 min). Thanks @spboyer for the contribution!
+- [[#7162]](https://github.com/Azure/azure-dev/pull/7162) Add git dirty working directory check before `azd init` with agent mode — prompts users to confirm when uncommitted changes are detected to prevent accidental mixing of changes. Add upfront workflow consent support for tool access to MCP servers (`copilot`, `azure`, `azd`) during agent init.
+
+### Breaking Changes
+
+### Bugs Fixed
+
+- [[#7171]](https://github.com/Azure/azure-dev/pull/7171) Fix agent workflow re-execution failing when cobra command tree was not rebuilt between runs.
+
+### Other Changes
+
+- [[#7175]](https://github.com/Azure/azure-dev/pull/7175) Improve input validation, error handling, and path safety across the CLI including hardened path resolution, vault ID validation, WebSocket origin validation, and sensitive data redaction in error paths. Thanks @jongio for the contribution!
+
 ## 1.23.10 (2026-03-16)
 
 ### Bugs Fixed
diff --git a/cli/azd/extensions/azure.ai.agents/CHANGELOG.md b/cli/azd/extensions/azure.ai.agents/CHANGELOG.md
index dae2e1da999..d2ec8ea5981 100644
--- a/cli/azd/extensions/azure.ai.agents/CHANGELOG.md
+++ b/cli/azd/extensions/azure.ai.agents/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Release History
 
+## 0.1.16-preview (2026-03-18)
+
+- [[#7141]](https://github.com/Azure/azure-dev/pull/7141) Add `azd ai agent files` command group with `upload`, `download`, `list`, and `remove` subcommands for managing session-scoped files on hosted agent sandboxes.
+- [[#7175]](https://github.com/Azure/azure-dev/pull/7175) Improve input validation, error handling, and path safety across the extension, including hardened path resolution, sensitive data redaction in error paths, and WebSocket origin validation.
+
+### Breaking Changes
+
+- [[#7181]](https://github.com/Azure/azure-dev/pull/7181) Update `azd ai agent show` and `azd ai agent monitor` commands to read agent name and version from the azd service entry, removing the requirement to pass them as parameters.
+
 ## 0.1.15-preview (2026-03-13)
 
 - [[#7080]](https://github.com/Azure/azure-dev/pull/7080) Fix authentication failures (`AADSTS70043`/`AADSTS700082`) for multi-tenant and guest users by using `UserTenantId` for credential resolution
diff --git a/cli/azd/extensions/azure.ai.agents/extension.yaml b/cli/azd/extensions/azure.ai.agents/extension.yaml
index d2c7d065bde..9d8e232eb18 100644
--- a/cli/azd/extensions/azure.ai.agents/extension.yaml
+++ b/cli/azd/extensions/azure.ai.agents/extension.yaml
@@ -5,7 +5,7 @@ displayName: Foundry agents (Preview)
 description: Extension for the Foundry Agent Service. (Preview)
 usage: azd ai agent <command> [options]
 # NOTE: Make sure version.txt is in sync with this version.
-version: 0.1.15-preview
+version: 0.1.16-preview
 requiredAzdVersion: ">1.23.6"
 language: go
 capabilities:
diff --git a/cli/azd/extensions/azure.ai.agents/version.txt b/cli/azd/extensions/azure.ai.agents/version.txt
index b32f1fe5bba..42ab1a87a26 100644
--- a/cli/azd/extensions/azure.ai.agents/version.txt
+++ b/cli/azd/extensions/azure.ai.agents/version.txt
@@ -1 +1 @@
-0.1.15-preview
+0.1.16-preview
diff --git a/cli/version.txt b/cli/version.txt
index b6773170a5f..33fd5bab588 100644
--- a/cli/version.txt
+++ b/cli/version.txt
@@ -1 +1 @@
-1.23.10
+1.24.0-beta.1