@@ -15,7 +15,6 @@ Current baseline from audit:
 - Largest hotspots:
   - `src/worktree/index.ts` (22)
   - `src/installation/index.ts` (20)
-  - `src/snapshot/index.ts` (18)
 
 ## Decisions
 
@@ -78,7 +77,6 @@ Migrate these first:
 
 - `src/worktree/index.ts`
 - `src/installation/index.ts`
-- `src/snapshot/index.ts`
 
 Within each file, migrate git paths first where applicable.
 
@@ -89,7 +87,6 @@ Migrate git-centric call sites to `Process.git*` helpers:
 - `src/file/index.ts`
 - `src/project/vcs.ts`
 - `src/file/watcher.ts`
-- `src/storage/storage.ts`
 
 ### Phase 3: Remaining non-git files
 
@@ -110,7 +107,7 @@ Migrate residual non-git usages:
 
 - Unit tests for new `Process` methods and options.
 - Integration tests on hotspot modules.
-- Smoke tests for install, snapshot, and worktree flows.
+- Smoke tests for install and worktree flows.
 - Regression checks for output parsing behavior.
 
 ## Risk mitigation
 
@@ -104,13 +104,6 @@ the agent to keep one in a file.
 
 Aictrl reads config from `.aictrl/` (project) or `~/.config/aictrl/` (global).
 
-### Snapshots
-
-Sessions snapshot the git worktree at each model step, which backs patches, session
-diffs and revert. `aictrl run` (without `--attach`) skips them, because nothing in a
-headless run reads them and each one stages the whole worktree. Set `"snapshot": true`
-in config to keep them in a run, or `"snapshot": false` to turn them off everywhere.
-
 ### Models
 
 | Provider | Env Var |
 
@@ -6,7 +6,6 @@ import { FileCommand } from "./file"
 import { RipgrepCommand } from "./ripgrep"
 import { ScrapCommand } from "./scrap"
 import { SkillCommand } from "./skill"
-import { SnapshotCommand } from "./snapshot"
 import { AgentCommand } from "./agent"
 
 export const DebugCommand = cmd({
@@ -19,7 +18,6 @@ export const DebugCommand = cmd({
       .command(FileCommand)
       .command(ScrapCommand)
       .command(SkillCommand)
-      .command(SnapshotCommand)
       .command(AgentCommand)
       .command(PathsCommand)
       .command({
 
@@ -15,7 +15,6 @@ export type ShareData =
   | { type: "session"; data: SDKSession }
   | { type: "message"; data: Message }
   | { type: "part"; data: Part }
-  | { type: "session_diff"; data: unknown }
   | { type: "model"; data: unknown }
 
 /** Extract share ID from a share URL like https://opncd.ai/share/abc123 */
 
@@ -23,7 +23,6 @@ import { PermissionNext } from "../../permission/next"
 import { Session } from "../../session"
 import type { MessageV2 } from "../../session/message-v2"
 import { SessionPrompt } from "../../session/prompt"
-import { Snapshot } from "../../snapshot"
 import { Config } from "../../config/config"
 import { GlobalBus } from "../../bus/global"
 import { Instance } from "../../project/instance"
@@ -1120,10 +1119,6 @@ export const RunCommand = cmd({
       await Shutdown.flush()
     }
 
-    // Nothing in a run reads snapshots, patches or session diffs, so local sessions skip
-    // them unless config sets `snapshot: true` (#146).
-    // consolidate with HeadlessRun (#152)
-    Snapshot.setDefault(false)
     invocation.phase("bootstrap")
     if (args.attach) {
       return await invocation.run(() => execute(createAictrlClient({ baseUrl: args.attach, directory })))
 
@@ -36,7 +36,7 @@ export const UninstallCommand = {
       .option("keep-data", {
         alias: "d",
         type: "boolean",
-        describe: "keep session data and snapshots",
+        describe: "keep session data",
         default: false,
       })
       .option("dry-run", {
 
@@ -217,6 +217,9 @@ export namespace Config {
 
     if (!result.username) result.username = os.userInfo().username
 
+    // `snapshot` toggled the removed worktree snapshots (#181). It stays valid so old configs still load.
+    if (result.snapshot !== undefined) log.warn("config key `snapshot` is deprecated and ignored")
+
     // Handle migration from autoshare to share field
     if (result.autoshare === true && !result.share) {
       result.share = "auto"
@@ -998,7 +1001,10 @@ export namespace Config {
         })
         .optional(),
       plugin: z.string().array().optional(),
-      snapshot: z.boolean().optional(),
+      snapshot: z
+        .boolean()
+        .optional()
+        .describe("@deprecated Worktree snapshots were removed; this key is accepted and ignored."),
       share: z
         .enum(["manual", "auto", "disabled"])
         .optional()
 
@@ -9,7 +9,6 @@ import { Instance } from "./instance"
 import { Vcs } from "./vcs"
 import { Log } from "@/util/log"
 import { ShareNext } from "@/share/share-next"
-import { Snapshot } from "../snapshot"
 import { Truncate } from "../tool/truncation"
 
 export async function InstanceBootstrap() {
@@ -20,7 +19,6 @@ export async function InstanceBootstrap() {
   FileWatcher.init()
   File.init()
   Vcs.init()
-  Snapshot.init()
   Truncate.init()
 
   Bus.subscribe(Command.Event.Executed, async (payload) => {
 
@@ -15,14 +15,12 @@ import { Database, NotFoundError, eq, and, or, gte, isNull, desc, like, inArray,
 import type { SQL } from "../storage/db"
 import { SessionTable, MessageTable, PartTable } from "./session.sql"
 import { ProjectTable } from "../project/project.sql"
-import { Storage } from "@/storage/storage"
 import { Log } from "../util/log"
 import { MessageV2 } from "./message-v2"
 import { Instance } from "../project/instance"
 import { SessionPrompt } from "./prompt"
 import { fn } from "@/util/fn"
 import { Command } from "../command"
-import { Snapshot } from "@/snapshot"
 
 import type { Provider } from "@/provider/provider"
 import { PermissionNext } from "@/permission/next"
@@ -49,17 +47,7 @@ export namespace Session {
   type SessionRow = typeof SessionTable.$inferSelect
 
   export function fromRow(row: SessionRow): Info {
-    const summary =
-      row.summary_additions !== null || row.summary_deletions !== null || row.summary_files !== null
-        ? {
-            additions: row.summary_additions ?? 0,
-            deletions: row.summary_deletions ?? 0,
-            files: row.summary_files ?? 0,
-            diffs: row.summary_diffs ?? undefined,
-          }
-        : undefined
     const share = row.share_url ? { url: row.share_url } : undefined
-    const revert = row.revert ?? undefined
     return {
       id: row.id,
       slug: row.slug,
@@ -69,9 +57,7 @@ export namespace Session {
       parentID: row.parent_id ?? undefined,
       title: row.title,
       version: row.version,
-      summary,
       share,
-      revert,
       permission: row.permission ?? undefined,
       time: {
         created: row.time_created,
@@ -93,11 +79,6 @@ export namespace Session {
       title: info.title,
       version: info.version,
       share_url: info.share?.url,
-      summary_additions: info.summary?.additions,
-      summary_deletions: info.summary?.deletions,
-      summary_files: info.summary?.files,
-      summary_diffs: info.summary?.diffs,
-      revert: info.revert ?? null,
       permission: info.permission,
       time_created: info.time.created,
       time_updated: info.time.updated,
@@ -124,14 +105,6 @@ export namespace Session {
       workspaceID: z.string().optional(),
       directory: z.string(),
       parentID: Identifier.schema("session").optional(),
-      summary: z
-        .object({
-          additions: z.number(),
-          deletions: z.number(),
-          files: z.number(),
-          diffs: Snapshot.FileDiff.array().optional(),
-        })
-        .optional(),
       share: z
         .object({
           url: z.string(),
@@ -146,14 +119,6 @@ export namespace Session {
         archived: z.number().optional(),
       }),
       permission: PermissionNext.Ruleset.optional(),
-      revert: z
-        .object({
-          messageID: z.string(),
-          partID: z.string().optional(),
-          snapshot: z.string().optional(),
-          diff: z.string().optional(),
-        })
-        .optional(),
     })
     .meta({
       ref: "Session",
@@ -210,13 +175,6 @@ export namespace Session {
         info: Info,
       }),
     ),
-    Diff: BusEvent.define(
-      "session.diff",
-      z.object({
-        sessionID: z.string(),
-        diff: Snapshot.FileDiff.array(),
-      }),
-    ),
     Error: BusEvent.define(
       "session.error",
       z.object({
@@ -471,86 +429,6 @@ export namespace Session {
     },
   )
 
-  export const setRevert = fn(
-    z.object({
-      sessionID: Identifier.schema("session"),
-      revert: Info.shape.revert,
-      summary: Info.shape.summary,
-    }),
-    async (input) => {
-      return Database.use((db) => {
-        const row = db
-          .update(SessionTable)
-          .set({
-            revert: input.revert ?? null,
-            summary_additions: input.summary?.additions,
-            summary_deletions: input.summary?.deletions,
-            summary_files: input.summary?.files,
-            time_updated: Date.now(),
-          })
-          .where(eq(SessionTable.id, input.sessionID))
-          .returning()
-          .get()
-        if (!row) throw new NotFoundError({ message: `Session not found: ${input.sessionID}` })
-        const info = fromRow(row)
-        Database.effect(() => Bus.publish(Event.Updated, { info }))
-        return info
-      })
-    },
-  )
-
-  export const clearRevert = fn(Identifier.schema("session"), async (sessionID) => {
-    return Database.use((db) => {
-      const row = db
-        .update(SessionTable)
-        .set({
-          revert: null,
-          time_updated: Date.now(),
-        })
-        .where(eq(SessionTable.id, sessionID))
-        .returning()
-        .get()
-      if (!row) throw new NotFoundError({ message: `Session not found: ${sessionID}` })
-      const info = fromRow(row)
-      Database.effect(() => Bus.publish(Event.Updated, { info }))
-      return info
-    })
-  })
-
-  export const setSummary = fn(
-    z.object({
-      sessionID: Identifier.schema("session"),
-      summary: Info.shape.summary,
-    }),
-    async (input) => {
-      return Database.use((db) => {
-        const row = db
-          .update(SessionTable)
-          .set({
-            summary_additions: input.summary?.additions,
-            summary_deletions: input.summary?.deletions,
-            summary_files: input.summary?.files,
-            time_updated: Date.now(),
-          })
-          .where(eq(SessionTable.id, input.sessionID))
-          .returning()
-          .get()
-        if (!row) throw new NotFoundError({ message: `Session not found: ${input.sessionID}` })
-        const info = fromRow(row)
-        Database.effect(() => Bus.publish(Event.Updated, { info }))
-        return info
-      })
-    },
-  )
-
-  export const diff = fn(Identifier.schema("session"), async (sessionID) => {
-    try {
-      return await Storage.read<Snapshot.FileDiff[]>(["session_diff", sessionID])
-    } catch {
-      return []
-    }
-  })
-
   export const messages = fn(
     z.object({
       sessionID: Identifier.schema("session"),