Checkpoints and rewind - Features - Docs - Kiro Loading image... Product * About Kiro * IDE * CLI * Web * Mobile * Crew * Pricing * Downloads For * Enterprise * Startups * Students Community * Overview * Ambassadors * Discord * Events * Powers * Shop * Showcase Resources * Docs * Blog * Changelog * FAQs * Report a bug * Suggest an idea * Billing support Social * * * * * * * English Site Terms License Responsible AI Policy Legal Privacy Policy Cookie Preferences English Loading image... * Apps * CLI * Web * Enterprise * Pricing * Docs * Community * Resources SIGN IN DOWNLOADS Loading image... Get Started Installation Authentication Your first project Models Overview Available models Reasoning effort Features How Kiro works Specs Steering Hooks MCP Permissions Custom agents Agent Skills Powers Cloud sessions Compaction Kiroignore Checkpoints and rewind Built-in tools Configuration scopes IDE 1.x What's new in 1.0 Setup & First Run Editor Chat Experimental Troubleshooting 0.x reference CLI What's new in 3.0 Setup & First Run Terminal UI Chat Voice mode Headless mode ACP Auto complete Experimental 2.x reference Crew Quick start Installation Running 24/7 Chat Agent Capabilities Features Interfaces Apps System & storage Configuration Security Troubleshooting Web Setup & First Run Identity Center Connect your repositories Working with the agent Autonomous mode Automations Memory Configuration Sync Sandbox Mobile - Preview Overview Commands and Reference CLI commands Slash commands Built-in tools Exit codes Settings Billing Overview Managing your subscription Upgrading your plan Downgrading your plan Cancelling your plan Purchasing add-on credits Managing your payments Managing usage notifications Managing your taxes Contacting billing support Deleting your account Related questions Enterprise Concepts Onboarding quickstart Connecting your identity provider Deployment options Subscribe your team Manage subscriptions Governance Monitor and track Settings Managed updates Billing IAM Supported regions Privacy and Security Overview Data protection Code references Compliance validation Infrastructure security IAM permissions Firewalls, proxies, and data perimeters VPC endpoints (AWS PrivateLink) Guides Overview Language support Learn by playing Migration Migrating from Q Developer Migrating from VSCode Upgrading from Q CLI * Docs * * Features * * Checkpoints and rewind Copy page View as Markdown Checkpoints and rewind Copy page View as Markdown Agent sessions are exploratory. Sometimes the agent heads down the wrong path, or you want to try a different approach without losing what you have. Kiro gives you two distinct ways to go back: checkpoints restore your files to an earlier point in the session, and rewind forks your conversation at an earlier turn. Capability IDE CLI Web Mobile Checkpoints - restore files to an earlier point ✓ Experimental (v2) — — Rewind - fork the conversation at an earlier turn — ✓ — — Revert the last turn's file changes ✓ — — — Checkpoints vs. rewind The two mechanics solve different problems: * Checkpoints snapshot your files as the agent modifies them. Restoring a checkpoint rolls your workspace back to that point - and rewinds the conversation context along with it, so the agent's understanding matches the restored file state. * Rewind never touches your files. It forks the conversation at an earlier turn into a new session, leaving the original session and your files on disk exactly as they are. Reach for a checkpoint when you want to undo the agent's work . Reach for rewind when you want to redirect the conversation - for example, to try a different prompt from the same starting point - while keeping the file changes made so far. Using checkpoints and rewind IDE CLI Each time you send a prompt to Kiro, it creates a checkpoint. Checkpoints appear as markers in your chat history. Select Restore on a checkpoint marker to rewind both your codebase and Kiro's context back to that point in time. Any changes made to your codebase by Kiro after that checkpoint are reverted, and any context additions (chat interactions) after that point are discarded as well. Checkpoints act as a safety net that enables you to confidently explore multiple approaches to a problem, try different models for a given task, and recover from mistakes or misunderstandings by the agent. What checkpoints track Checkpoints work by snapshotting the contents of a file each time the Kiro agent modifies it using one of its built-in file modification tools, and then restoring that snapshot when you revert to that checkpoint. Kiro does not track changes to a file made outside of the Kiro agent. If Kiro snapshots a file and you then manually edit that same file or run a code formatting tool on it, your changes will be lost when you revert to that checkpoint. Kiro also does not track file changes made by MCP tools or bash commands that it runs as part of its execution. Reverts vs. checkpoints Whenever the Kiro agent modifies one or more files and then completes its turn, you will see an option to Revert the changes made by the agent immediately above the chat input box. Reverts are similar to checkpoints, but differ in two key aspects. First, reverts only undo changes made by the latest turn of the agent, whereas checkpoints can undo changes made over multiple turns. Second, reverts only revert file changes, whereas checkpoints undo file changes as well as discard context additions past the checkpoint. Related * Session management - saving, loading, and resuming CLI sessions * Compaction - how Kiro summarizes older history to keep long sessions productive * Permissions - control what the agent can do before changes happen, rather than undoing them after Page updated: August 4, 2026 Kiroignore Built-in tools