RubyGems - gitflash - Versions diffs - 0.5.1 → 0.7.0.beta1 - Mend

gitflash 0.5.1 → 0.7.0.beta1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (63) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +25 -0
data/README.md +69 -2
data/bin/gitflash +10 -0
data/command_descriptions.yml +99 -0
data/lib/gitflash/branch.rb +14 -2
data/lib/gitflash/cherry_pick.rb +128 -0
data/lib/gitflash/cleanup.rb +70 -0
data/lib/gitflash/cli.rb +72 -21
data/lib/gitflash/command_runner.rb +23 -0
data/lib/gitflash/commands/base.rb +15 -0
data/lib/gitflash/commands/branches.rb +1 -0
data/lib/gitflash/commands/checkout.rb +2 -1
data/lib/gitflash/commands/clean.rb +51 -0
data/lib/gitflash/commands/clean_criteria.rb +29 -0
data/lib/gitflash/commands/delete.rb +23 -8
data/lib/gitflash/commands/gc.rb +41 -0
data/lib/gitflash/commands/hook_install.rb +77 -0
data/lib/gitflash/commands/hook_status.rb +80 -0
data/lib/gitflash/commands/mark.rb +85 -0
data/lib/gitflash/commands/pick.rb +131 -0
data/lib/gitflash/commands/pick_control.rb +67 -0
data/lib/gitflash/commands/pick_outcome.rb +52 -0
data/lib/gitflash/commands/removal_report.rb +65 -0
data/lib/gitflash/commands/reset.rb +7 -1
data/lib/gitflash/commands/snapshot_create.rb +30 -0
data/lib/gitflash/commands/snapshot_list.rb +20 -0
data/lib/gitflash/commands/undo.rb +131 -0
data/lib/gitflash/commands/worktree_add.rb +98 -0
data/lib/gitflash/commands/worktree_clean.rb +49 -0
data/lib/gitflash/commands/worktree_command.rb +28 -0
data/lib/gitflash/commands/worktree_list.rb +48 -0
data/lib/gitflash/commands/worktree_lock.rb +54 -0
data/lib/gitflash/commands/worktree_move.rb +47 -0
data/lib/gitflash/commands/worktree_prune.rb +41 -0
data/lib/gitflash/commands/worktree_remove.rb +119 -0
data/lib/gitflash/commands/worktree_unlock.rb +12 -0
data/lib/gitflash/config.rb +95 -0
data/lib/gitflash/config_keys.rb +19 -0
data/lib/gitflash/git/bash_command.rb +5 -4
data/lib/gitflash/git/in_directory.rb +29 -0
data/lib/gitflash/hook/branch_marker.rb +52 -0
data/lib/gitflash/hook/claude.rb +126 -0
data/lib/gitflash/hook/command_parser.rb +121 -0
data/lib/gitflash/hook/creations.rb +85 -0
data/lib/gitflash/hook/rules.rb +108 -0
data/lib/gitflash/hook/settings.rb +73 -0
data/lib/gitflash/hook_cli.rb +77 -0
data/lib/gitflash/ownership.rb +59 -0
data/lib/gitflash/protection.rb +19 -0
data/lib/gitflash/repo.rb +12 -3
data/lib/gitflash/restore.rb +141 -0
data/lib/gitflash/snapshot.rb +47 -0
data/lib/gitflash/snapshots.rb +70 -0
data/lib/gitflash/state_capture.rb +129 -0
data/lib/gitflash/ui.rb +7 -5
data/lib/gitflash/version.rb +1 -1
data/lib/gitflash/worktree.rb +32 -0
data/lib/gitflash/worktree_cli.rb +115 -0
data/lib/gitflash/worktree_revival.rb +55 -0
data/lib/gitflash/worktrees.rb +147 -0
data/schema/v1.json +1885 -102
metadata +46 -1

data/schema/v1.json CHANGED Viewed

@@ -4,168 +4,1951 @@
   "title": "gitflash --json output, schema version 1",
   "description": "Every gitflash command run with --json prints exactly one object in this envelope. `ok` is true for the statuses done, planned, noop and cancelled. Fields may be added in later releases of version 1; existing fields keep their meaning.",
   "type": "object",
-  "required": ["schema", "command", "ok", "status", "dry_run"],
+  "required": [
+    "schema",
+    "command",
+    "ok",
+    "status",
+    "dry_run"
+  ],
   "properties": {
-    "schema": { "const": 1 },
-    "command": { "enum": ["branches", "checkout", "delete", "reset"] },
-    "ok": { "type": "boolean" },
+    "schema": {
+      "const": 1
+    },
+    "command": {
+      "enum": [
+        "branches",
+        "checkout",
+        "delete",
+        "reset",
+        "undo",
+        "snapshots",
+        "snapshot",
+        "gc",
+        "hook install",
+        "hook status",
+        "worktree list",
+        "worktree add",
+        "worktree remove",
+        "worktree prune",
+        "worktree lock",
+        "worktree unlock",
+        "worktree move",
+        "clean",
+        "worktree clean",
+        "pick",
+        "mark"
+      ]
+    },
+    "ok": {
+      "type": "boolean"
+    },
     "status": {
       "description": "done: the change was made. planned: --dry-run, nothing changed. noop: nothing to do. cancelled: the user declined. failed: git refused part of the change. confirmation_required: re-run with --yes after reviewing `plan`. error: invalid input or environment.",
-      "enum": ["done", "planned", "noop", "cancelled", "failed", "confirmation_required", "error"]
+      "enum": [
+        "done",
+        "planned",
+        "noop",
+        "cancelled",
+        "failed",
+        "confirmation_required",
+        "error"
+      ]
+    },
+    "dry_run": {
+      "type": "boolean"
+    },
+    "plan": {
+      "type": "object",
+      "description": "The change that will be, would be or was made."
+    },
+    "result": {
+      "type": "object",
+      "description": "What happened, including what is needed to revert it."
+    },
+    "error": {
+      "$ref": "#/$defs/error"
+    },
+    "undo": {
+      "type": "object",
+      "description": "The snapshot saved before the change. Run `command` to revert it.",
+      "required": [
+        "snapshot",
+        "command"
+      ],
+      "properties": {
+        "snapshot": {
+          "type": "string"
+        },
+        "command": {
+          "type": "string"
+        }
+      }
+    }
+  },
+  "allOf": [
+    {
+      "if": {
+        "properties": {
+          "status": {
+            "enum": [
+              "done",
+              "planned",
+              "noop",
+              "cancelled"
+            ]
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "ok": {
+            "const": true
+          }
+        },
+        "not": {
+          "required": [
+            "error"
+          ]
+        }
+      },
+      "else": {
+        "properties": {
+          "ok": {
+            "const": false
+          }
+        },
+        "required": [
+          "error"
+        ]
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "status": {
+            "const": "confirmation_required"
+          }
+        }
+      },
+      "then": {
+        "required": [
+          "plan"
+        ]
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "branches"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "result": {
+            "$ref": "#/$defs/branches_result"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "checkout"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "plan": {
+            "$ref": "#/$defs/checkout_plan"
+          },
+          "result": {
+            "$ref": "#/$defs/checkout_result"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "delete"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "plan": {
+            "$ref": "#/$defs/delete_plan"
+          },
+          "result": {
+            "$ref": "#/$defs/delete_result"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "reset"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "plan": {
+            "$ref": "#/$defs/reset_plan"
+          },
+          "result": {
+            "$ref": "#/$defs/reset_result"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "undo"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "plan": {
+            "$ref": "#/$defs/undo_plan"
+          },
+          "result": {
+            "$ref": "#/$defs/undo_result"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "snapshots"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "result": {
+            "$ref": "#/$defs/snapshots_result"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "snapshot"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "result": {
+            "$ref": "#/$defs/snapshot_result"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "gc"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "plan": {
+            "$ref": "#/$defs/gc_plan"
+          },
+          "result": {
+            "$ref": "#/$defs/gc_result"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "hook install"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "plan": {
+            "$ref": "#/$defs/hook_install"
+          },
+          "result": {
+            "$ref": "#/$defs/hook_install"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "hook status"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "result": {
+            "$ref": "#/$defs/hook_status"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "worktree list"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "result": {
+            "$ref": "#/$defs/worktree_list_result"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "worktree add"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "plan": {
+            "$ref": "#/$defs/worktree_add_plan"
+          },
+          "result": {
+            "$ref": "#/$defs/worktree_add_result"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "worktree remove"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "plan": {
+            "$ref": "#/$defs/worktree_remove_plan"
+          },
+          "result": {
+            "$ref": "#/$defs/worktree_remove_result"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "worktree prune"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "plan": {
+            "$ref": "#/$defs/worktree_prune_plan"
+          },
+          "result": {
+            "$ref": "#/$defs/worktree_prune_result"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "worktree lock"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "plan": {
+            "$ref": "#/$defs/worktree_lock_plan"
+          },
+          "result": {
+            "$ref": "#/$defs/worktree_lock_result"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "worktree unlock"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "plan": {
+            "$ref": "#/$defs/worktree_unlock_plan"
+          },
+          "result": {
+            "$ref": "#/$defs/worktree_unlock_result"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "worktree move"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "plan": {
+            "$ref": "#/$defs/worktree_move_plan"
+          },
+          "result": {
+            "$ref": "#/$defs/worktree_move_result"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "clean"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "plan": {
+            "$ref": "#/$defs/clean_plan"
+          },
+          "result": {
+            "$ref": "#/$defs/delete_result"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "worktree clean"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "plan": {
+            "$ref": "#/$defs/worktree_clean_plan"
+          },
+          "result": {
+            "$ref": "#/$defs/worktree_remove_result"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "pick"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "plan": {
+            "$ref": "#/$defs/pick_plan"
+          },
+          "result": {
+            "if": {
+              "required": [
+                "commits"
+              ]
+            },
+            "then": {
+              "$ref": "#/$defs/pick_list_result"
+            },
+            "else": {
+              "$ref": "#/$defs/pick_result"
+            }
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "command": {
+            "const": "mark"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "plan": {
+            "$ref": "#/$defs/mark_plan"
+          },
+          "result": {
+            "$ref": "#/$defs/mark_result"
+          }
+        }
+      }
+    }
+  ],
+  "$defs": {
+    "sha": {
+      "type": "string",
+      "pattern": "^[0-9a-f]{4,64}$"
+    },
+    "error": {
+      "type": "object",
+      "required": [
+        "code",
+        "message",
+        "exit_code"
+      ],
+      "properties": {
+        "code": {
+          "description": "Stable identifier to branch on; the message is for humans.",
+          "enum": [
+            "not_a_repository",
+            "input_required",
+            "invalid_usage",
+            "invalid_options",
+            "unknown_branch",
+            "unknown_commit",
+            "protected_branch",
+            "confirmation_required",
+            "git_failed",
+            "failed",
+            "unknown_snapshot",
+            "wrong_worktree",
+            "invalid_settings",
+            "invalid_config",
+            "unknown_worktree",
+            "protected_worktree",
+            "conflict"
+          ]
+        },
+        "message": {
+          "type": "string"
+        },
+        "exit_code": {
+          "enum": [
+            1,
+            2
+          ]
+        }
+      }
+    },
+    "branch": {
+      "type": "object",
+      "required": [
+        "name",
+        "sha",
+        "current",
+        "default",
+        "upstream",
+        "upstream_gone",
+        "ahead",
+        "behind",
+        "merged",
+        "last_commit_at",
+        "last_commit_author",
+        "last_commit_subject"
+      ],
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "sha": {
+          "$ref": "#/$defs/sha"
+        },
+        "current": {
+          "type": "boolean"
+        },
+        "default": {
+          "type": "boolean",
+          "description": "The branch origin/HEAD points to, else main or master."
+        },
+        "upstream": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "upstream_gone": {
+          "type": "boolean",
+          "description": "The upstream branch was deleted on the remote."
+        },
+        "ahead": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "behind": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "merged": {
+          "type": [
+            "boolean",
+            "null"
+          ],
+          "description": "Merged into the default branch; null when there is no default branch."
+        },
+        "last_commit_at": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "last_commit_author": {
+          "type": "string"
+        },
+        "last_commit_subject": {
+          "type": "string"
+        },
+        "owner": {
+          "enum": [
+            "agent",
+            "human",
+            null
+          ],
+          "description": "Who created the branch; null when unmarked (treated as human)."
+        }
+      }
+    },
+    "branches_result": {
+      "type": "object",
+      "required": [
+        "default_branch",
+        "branches"
+      ],
+      "properties": {
+        "default_branch": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "branches": {
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/branch"
+          }
+        }
+      }
+    },
+    "checkout_plan": {
+      "type": "object",
+      "required": [
+        "branch"
+      ],
+      "properties": {
+        "branch": {
+          "type": "string"
+        }
+      }
+    },
+    "checkout_result": {
+      "type": "object",
+      "required": [
+        "branch",
+        "previous_branch"
+      ],
+      "properties": {
+        "branch": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "previous_branch": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "description": "Check this out to go back; null on a detached HEAD."
+        }
+      }
+    },
+    "delete_plan": {
+      "type": "object",
+      "required": [
+        "branches",
+        "force"
+      ],
+      "properties": {
+        "branches": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "force": {
+          "type": "boolean"
+        }
+      }
+    },
+    "delete_result": {
+      "type": "object",
+      "required": [
+        "deleted",
+        "failed"
+      ],
+      "properties": {
+        "deleted": {
+          "type": "array",
+          "description": "Recreate a branch with: git branch NAME SHA",
+          "items": {
+            "type": "object",
+            "required": [
+              "branch",
+              "sha"
+            ],
+            "properties": {
+              "branch": {
+                "type": "string"
+              },
+              "sha": {
+                "$ref": "#/$defs/sha"
+              }
+            }
+          }
+        },
+        "failed": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": [
+              "branch",
+              "error"
+            ],
+            "properties": {
+              "branch": {
+                "type": "string"
+              },
+              "error": {
+                "type": "string"
+              }
+            }
+          }
+        }
+      }
+    },
+    "reset_plan": {
+      "type": "object",
+      "required": [
+        "commit",
+        "mode"
+      ],
+      "properties": {
+        "commit": {
+          "$ref": "#/$defs/sha"
+        },
+        "mode": {
+          "enum": [
+            "soft",
+            "mixed",
+            "hard"
+          ]
+        }
+      }
+    },
+    "reset_result": {
+      "type": "object",
+      "required": [
+        "commit",
+        "mode",
+        "previous_commit"
+      ],
+      "properties": {
+        "commit": {
+          "$ref": "#/$defs/sha"
+        },
+        "mode": {
+          "enum": [
+            "soft",
+            "mixed",
+            "hard"
+          ]
+        },
+        "previous_commit": {
+          "$ref": "#/$defs/sha",
+          "description": "Reset to this commit to go back. Uncommitted changes lost by a hard reset cannot be restored this way."
+        }
+      }
+    },
+    "snapshot": {
+      "type": "object",
+      "required": [
+        "id",
+        "created_at",
+        "reason",
+        "scope",
+        "worktree_path",
+        "head",
+        "branches",
+        "stashes",
+        "index",
+        "worktree",
+        "skipped_files"
+      ],
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "created_at": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "reason": {
+          "type": "string"
+        },
+        "scope": {
+          "type": "array",
+          "items": {
+            "enum": [
+              "branches",
+              "head",
+              "worktree",
+              "stashes"
+            ]
+          }
+        },
+        "worktree_path": {
+          "type": "string"
+        },
+        "head": {
+          "type": "object",
+          "required": [
+            "branch",
+            "sha"
+          ],
+          "properties": {
+            "branch": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "sha": {
+              "type": [
+                "string",
+                "null"
+              ],
+              "pattern": "^[0-9a-f]{4,64}$"
+            }
+          }
+        },
+        "branches": {
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/$defs/sha"
+          }
+        },
+        "stashes": {
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/sha"
+          }
+        },
+        "index": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "pattern": "^[0-9a-f]{4,64}$"
+        },
+        "worktree": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "pattern": "^[0-9a-f]{4,64}$"
+        },
+        "skipped_files": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Untracked files not saved because they are larger than 50 MB."
+        }
+      }
+    },
+    "undo_plan": {
+      "type": "object",
+      "required": [
+        "snapshot",
+        "branches",
+        "head",
+        "worktree",
+        "stashes"
+      ],
+      "properties": {
+        "snapshot": {
+          "type": "string"
+        },
+        "branches": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": [
+              "branch",
+              "from",
+              "to"
+            ],
+            "properties": {
+              "branch": {
+                "type": "string"
+              },
+              "from": {
+                "type": [
+                  "string",
+                  "null"
+                ],
+                "pattern": "^[0-9a-f]{4,64}$"
+              },
+              "to": {
+                "$ref": "#/$defs/sha"
+              }
+            }
+          }
+        },
+        "head": {
+          "type": [
+            "object",
+            "null"
+          ],
+          "required": [
+            "from",
+            "to"
+          ],
+          "properties": {
+            "from": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "to": {
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          }
+        },
+        "worktree": {
+          "type": "boolean",
+          "description": "Tracked, staged and untracked files are restored."
+        },
+        "stashes": {
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/sha"
+          }
+        },
+        "recreate_worktree": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "description": "Directory of a removed worktree that undo adds again before restoring it."
+        }
+      }
+    },
+    "undo_result": {
+      "type": "object",
+      "required": [
+        "snapshot"
+      ],
+      "properties": {
+        "snapshot": {
+          "type": [
+            "string",
+            "null"
+          ]
+        }
+      }
+    },
+    "snapshots_result": {
+      "type": "object",
+      "required": [
+        "snapshots"
+      ],
+      "properties": {
+        "snapshots": {
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/snapshot"
+          }
+        }
+      }
+    },
+    "snapshot_result": {
+      "type": "object",
+      "required": [
+        "snapshot"
+      ],
+      "properties": {
+        "snapshot": {
+          "$ref": "#/$defs/snapshot"
+        }
+      }
+    },
+    "gc_plan": {
+      "type": "object",
+      "required": [
+        "older_than_days",
+        "snapshots"
+      ],
+      "properties": {
+        "older_than_days": {
+          "type": "number"
+        },
+        "snapshots": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "gc_result": {
+      "type": "object",
+      "required": [
+        "deleted"
+      ],
+      "properties": {
+        "deleted": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "hook_install": {
+      "type": "object",
+      "required": [
+        "scope",
+        "file",
+        "command",
+        "applies_to"
+      ],
+      "properties": {
+        "scope": {
+          "enum": [
+            "local",
+            "project",
+            "user"
+          ]
+        },
+        "file": {
+          "type": "string"
+        },
+        "command": {
+          "type": "string"
+        },
+        "applies_to": {
+          "type": "string",
+          "description": "Which Claude Code sessions read this file. Running sessions reload it."
+        },
+        "marking_command": {
+          "type": "string",
+          "description": "The PostToolUse command that marks branches an agent creates as agent work."
+        }
+      }
+    },
+    "hook_status": {
+      "type": "object",
+      "required": [
+        "active",
+        "executable",
+        "files"
+      ],
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "description": "The hook is in at least one settings file that applies here and the gitflash executable is on PATH."
+        },
+        "executable": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "files": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": [
+              "scope",
+              "file",
+              "installed",
+              "command",
+              "applies_to"
+            ],
+            "properties": {
+              "scope": {
+                "enum": [
+                  "local",
+                  "project",
+                  "user"
+                ]
+              },
+              "file": {
+                "type": "string"
+              },
+              "installed": {
+                "type": "boolean"
+              },
+              "command": {
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
+              "applies_to": {
+                "type": "string"
+              },
+              "marking": {
+                "type": "boolean",
+                "description": "This file has the PostToolUse hook."
+              }
+            }
+          }
+        },
+        "marking": {
+          "type": "boolean",
+          "description": "A settings file that applies here also has the PostToolUse hook that marks agent branches."
+        }
+      }
+    },
+    "worktree": {
+      "type": "object",
+      "required": [
+        "path",
+        "head",
+        "branch",
+        "main",
+        "bare",
+        "locked",
+        "lock_reason",
+        "missing",
+        "dirty",
+        "ahead",
+        "behind",
+        "merged"
+      ],
+      "properties": {
+        "path": {
+          "type": "string",
+          "description": "Absolute path of the worktree directory."
+        },
+        "head": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "branch": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "description": "null for a detached HEAD."
+        },
+        "main": {
+          "type": "boolean"
+        },
+        "bare": {
+          "type": "boolean"
+        },
+        "locked": {
+          "type": "boolean"
+        },
+        "lock_reason": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "missing": {
+          "type": "boolean",
+          "description": "The directory no longer exists."
+        },
+        "dirty": {
+          "type": [
+            "boolean",
+            "null"
+          ],
+          "description": "Uncommitted or untracked files; null when unknown."
+        },
+        "ahead": {
+          "type": [
+            "integer",
+            "null"
+          ],
+          "minimum": 0
+        },
+        "behind": {
+          "type": [
+            "integer",
+            "null"
+          ],
+          "minimum": 0
+        },
+        "merged": {
+          "type": [
+            "boolean",
+            "null"
+          ],
+          "description": "Branch merged into the default branch; null without a branch."
+        },
+        "owner": {
+          "enum": [
+            "agent",
+            "human",
+            null
+          ],
+          "description": "Who created the branch; null when unmarked (treated as human)."
+        }
+      }
     },
-    "dry_run": { "type": "boolean" },
-    "plan": { "type": "object", "description": "The change that will be, would be or was made." },
-    "result": { "type": "object", "description": "What happened, including what is needed to revert it." },
-    "error": { "$ref": "#/$defs/error" }
-  },
-  "allOf": [
-    {
-      "if": { "properties": { "status": { "enum": ["done", "planned", "noop", "cancelled"] } } },
-      "then": { "properties": { "ok": { "const": true } }, "not": { "required": ["error"] } },
-      "else": { "properties": { "ok": { "const": false } }, "required": ["error"] }
+    "worktree_list_result": {
+      "type": "object",
+      "required": [
+        "worktrees"
+      ],
+      "properties": {
+        "worktrees": {
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/worktree"
+          }
+        }
+      }
     },
-    {
-      "if": { "properties": { "status": { "const": "confirmation_required" } } },
-      "then": { "required": ["plan"] }
+    "worktree_add_plan": {
+      "type": "object",
+      "required": [
+        "branch",
+        "path",
+        "source",
+        "from",
+        "owner"
+      ],
+      "properties": {
+        "branch": {
+          "type": "string"
+        },
+        "path": {
+          "type": "string"
+        },
+        "source": {
+          "enum": [
+            "existing",
+            "remote",
+            "new"
+          ]
+        },
+        "from": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "owner": {
+          "enum": [
+            "agent",
+            "human",
+            null
+          ],
+          "description": "Mark given to a branch created here; null for an existing branch."
+        }
+      }
     },
-    {
-      "if": { "properties": { "command": { "const": "branches" } } },
-      "then": { "properties": { "result": { "$ref": "#/$defs/branches_result" } } }
+    "worktree_add_result": {
+      "type": "object",
+      "required": [
+        "branch",
+        "path",
+        "source",
+        "owner",
+        "head"
+      ],
+      "properties": {
+        "branch": {
+          "type": "string"
+        },
+        "path": {
+          "type": "string"
+        },
+        "source": {
+          "enum": [
+            "existing",
+            "remote",
+            "new"
+          ]
+        },
+        "owner": {
+          "enum": [
+            "agent",
+            "human",
+            null
+          ]
+        },
+        "head": {
+          "$ref": "#/$defs/sha"
+        }
+      }
     },
-    {
-      "if": { "properties": { "command": { "const": "checkout" } } },
-      "then": {
-        "properties": {
-          "plan": { "$ref": "#/$defs/checkout_plan" },
-          "result": { "$ref": "#/$defs/checkout_result" }
+    "worktree_remove_plan": {
+      "type": "object",
+      "required": [
+        "worktrees",
+        "force"
+      ],
+      "properties": {
+        "worktrees": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": [
+              "path",
+              "branch",
+              "dirty",
+              "locked"
+            ],
+            "properties": {
+              "path": {
+                "type": "string"
+              },
+              "branch": {
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
+              "dirty": {
+                "type": [
+                  "boolean",
+                  "null"
+                ]
+              },
+              "locked": {
+                "type": "boolean"
+              },
+              "ignored_count": {
+                "type": "integer",
+                "minimum": 0,
+                "description": "Ignored files and directories that snapshots do not save and removal deletes for good."
+              },
+              "ignored": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                },
+                "description": "The first few of them."
+              }
+            }
+          }
+        },
+        "force": {
+          "type": "boolean"
         }
       }
     },
-    {
-      "if": { "properties": { "command": { "const": "delete" } } },
-      "then": {
-        "properties": {
-          "plan": { "$ref": "#/$defs/delete_plan" },
-          "result": { "$ref": "#/$defs/delete_result" }
+    "worktree_remove_result": {
+      "type": "object",
+      "required": [
+        "removed",
+        "failed"
+      ],
+      "properties": {
+        "removed": {
+          "type": "array",
+          "description": "Bring one back with the undo command in its row.",
+          "items": {
+            "type": "object",
+            "required": [
+              "path",
+              "branch",
+              "head",
+              "snapshot",
+              "undo"
+            ],
+            "properties": {
+              "path": {
+                "type": "string"
+              },
+              "branch": {
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
+              "head": {
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
+              "snapshot": {
+                "type": "string"
+              },
+              "undo": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "failed": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": [
+              "path",
+              "error"
+            ],
+            "properties": {
+              "path": {
+                "type": "string"
+              },
+              "error": {
+                "type": "string"
+              }
+            }
+          }
         }
       }
     },
-    {
-      "if": { "properties": { "command": { "const": "reset" } } },
-      "then": {
-        "properties": {
-          "plan": { "$ref": "#/$defs/reset_plan" },
-          "result": { "$ref": "#/$defs/reset_result" }
+    "worktree_prune_plan": {
+      "type": "object",
+      "required": [
+        "worktrees"
+      ],
+      "properties": {
+        "worktrees": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
         }
       }
-    }
-  ],
-  "$defs": {
-    "sha": { "type": "string", "pattern": "^[0-9a-f]{4,64}$" },
-    "error": {
+    },
+    "worktree_prune_result": {
       "type": "object",
-      "required": ["code", "message", "exit_code"],
+      "required": [
+        "pruned"
+      ],
       "properties": {
-        "code": {
-          "description": "Stable identifier to branch on; the message is for humans.",
-          "enum": [
-            "not_a_repository", "input_required", "invalid_usage", "invalid_options",
-            "unknown_branch", "unknown_commit", "protected_branch",
-            "confirmation_required", "git_failed", "failed"
-          ]
+        "pruned": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "worktree_lock_plan": {
+      "type": "object",
+      "required": [
+        "path"
+      ],
+      "properties": {
+        "path": {
+          "type": "string"
         },
-        "message": { "type": "string" },
-        "exit_code": { "enum": [1, 2] }
+        "reason": {
+          "type": "string"
+        }
       }
     },
-    "branch": {
+    "worktree_unlock_plan": {
       "type": "object",
       "required": [
-        "name", "sha", "current", "default", "upstream", "upstream_gone", "ahead", "behind",
-        "merged", "last_commit_at", "last_commit_author", "last_commit_subject"
+        "path"
       ],
       "properties": {
-        "name": { "type": "string" },
-        "sha": { "$ref": "#/$defs/sha" },
-        "current": { "type": "boolean" },
-        "default": { "type": "boolean", "description": "The branch origin/HEAD points to, else main or master." },
-        "upstream": { "type": ["string", "null"] },
-        "upstream_gone": { "type": "boolean", "description": "The upstream branch was deleted on the remote." },
-        "ahead": { "type": "integer", "minimum": 0 },
-        "behind": { "type": "integer", "minimum": 0 },
-        "merged": { "type": ["boolean", "null"], "description": "Merged into the default branch; null when there is no default branch." },
-        "last_commit_at": { "type": "string", "format": "date-time" },
-        "last_commit_author": { "type": "string" },
-        "last_commit_subject": { "type": "string" }
+        "path": {
+          "type": "string"
+        }
       }
     },
-    "branches_result": {
+    "worktree_lock_result": {
       "type": "object",
-      "required": ["default_branch", "branches"],
+      "required": [
+        "path",
+        "locked"
+      ],
       "properties": {
-        "default_branch": { "type": ["string", "null"] },
-        "branches": { "type": "array", "items": { "$ref": "#/$defs/branch" } }
+        "path": {
+          "type": "string"
+        },
+        "reason": {
+          "type": "string"
+        },
+        "locked": {
+          "type": "boolean"
+        }
       }
     },
-    "checkout_plan": {
+    "worktree_unlock_result": {
       "type": "object",
-      "required": ["branch"],
-      "properties": { "branch": { "type": "string" } }
+      "required": [
+        "path",
+        "locked"
+      ],
+      "properties": {
+        "path": {
+          "type": "string"
+        },
+        "reason": {
+          "type": "string"
+        },
+        "locked": {
+          "type": "boolean"
+        }
+      }
     },
-    "checkout_result": {
+    "worktree_move_plan": {
+      "type": "object",
+      "required": [
+        "from",
+        "to",
+        "force"
+      ],
+      "properties": {
+        "from": {
+          "type": "string"
+        },
+        "to": {
+          "type": "string"
+        },
+        "force": {
+          "type": "boolean"
+        }
+      }
+    },
+    "worktree_move_result": {
       "type": "object",
-      "required": ["branch", "previous_branch"],
+      "required": [
+        "from",
+        "to"
+      ],
       "properties": {
-        "branch": { "type": ["string", "null"] },
-        "previous_branch": { "type": ["string", "null"], "description": "Check this out to go back; null on a detached HEAD." }
+        "from": {
+          "type": "string"
+        },
+        "to": {
+          "type": "string"
+        }
       }
     },
-    "delete_plan": {
+    "clean_plan": {
       "type": "object",
-      "required": ["branches", "force"],
+      "required": [
+        "branches",
+        "force",
+        "reasons",
+        "skipped"
+      ],
       "properties": {
-        "branches": { "type": "array", "items": { "type": "string" } },
-        "force": { "type": "boolean" }
+        "branches": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "force": {
+          "type": "boolean"
+        },
+        "reasons": {
+          "type": "object",
+          "description": "Why each branch was chosen, by branch name.",
+          "additionalProperties": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        },
+        "skipped": {
+          "type": "array",
+          "description": "Matching branches that were kept.",
+          "items": {
+            "type": "object",
+            "required": [
+              "branch",
+              "reason"
+            ],
+            "properties": {
+              "branch": {
+                "type": "string"
+              },
+              "reason": {
+                "type": "string"
+              }
+            }
+          }
+        }
       }
     },
-    "delete_result": {
+    "worktree_clean_plan": {
       "type": "object",
-      "required": ["deleted", "failed"],
+      "required": [
+        "worktrees",
+        "force",
+        "skipped"
+      ],
       "properties": {
-        "deleted": {
+        "worktrees": {
           "type": "array",
-          "description": "Recreate a branch with: git branch NAME SHA",
           "items": {
             "type": "object",
-            "required": ["branch", "sha"],
-            "properties": { "branch": { "type": "string" }, "sha": { "$ref": "#/$defs/sha" } }
+            "required": [
+              "path",
+              "branch",
+              "dirty",
+              "locked"
+            ],
+            "properties": {
+              "path": {
+                "type": "string"
+              },
+              "branch": {
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
+              "dirty": {
+                "type": [
+                  "boolean",
+                  "null"
+                ]
+              },
+              "locked": {
+                "type": "boolean"
+              },
+              "reasons": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "ignored_count": {
+                "type": "integer",
+                "minimum": 0
+              },
+              "ignored": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            }
           }
         },
-        "failed": {
+        "force": {
+          "type": "boolean"
+        },
+        "skipped": {
           "type": "array",
+          "description": "Matching worktrees that were kept, with the reason.",
           "items": {
             "type": "object",
-            "required": ["branch", "error"],
-            "properties": { "branch": { "type": "string" }, "error": { "type": "string" } }
+            "required": [
+              "path",
+              "branch",
+              "reason"
+            ],
+            "properties": {
+              "path": {
+                "type": "string"
+              },
+              "branch": {
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
+              "reason": {
+                "type": "string"
+              }
+            }
           }
         }
       }
     },
-    "reset_plan": {
+    "pick_candidate": {
       "type": "object",
-      "required": ["commit", "mode"],
+      "required": [
+        "sha",
+        "short_sha",
+        "subject",
+        "author",
+        "date",
+        "status",
+        "files",
+        "insertions",
+        "deletions"
+      ],
       "properties": {
-        "commit": { "$ref": "#/$defs/sha" },
-        "mode": { "enum": ["soft", "mixed", "hard"] }
+        "sha": {
+          "$ref": "#/$defs/sha"
+        },
+        "short_sha": {
+          "type": "string"
+        },
+        "subject": {
+          "type": "string"
+        },
+        "author": {
+          "type": "string"
+        },
+        "date": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "status": {
+          "enum": [
+            "new",
+            "applied"
+          ],
+          "description": "applied: an equivalent change is already on the current branch."
+        },
+        "files": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "insertions": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "deletions": {
+          "type": "integer",
+          "minimum": 0
+        }
       }
     },
-    "reset_result": {
+    "pick_list_result": {
+      "type": "object",
+      "required": [
+        "source",
+        "commits"
+      ],
+      "properties": {
+        "source": {
+          "type": "string"
+        },
+        "commits": {
+          "type": "array",
+          "description": "Oldest first.",
+          "items": {
+            "$ref": "#/$defs/pick_candidate"
+          }
+        }
+      }
+    },
+    "pick_plan": {
+      "type": "object",
+      "description": "A new pick, or --continue / --skip / --abort of one in progress.",
+      "properties": {
+        "source": {
+          "type": "string"
+        },
+        "commits": {
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/sha"
+          }
+        },
+        "skipped": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": [
+              "sha",
+              "reason"
+            ],
+            "properties": {
+              "sha": {
+                "$ref": "#/$defs/sha"
+              },
+              "reason": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "commit": {
+          "type": "boolean"
+        },
+        "action": {
+          "enum": [
+            "continue",
+            "skip",
+            "abort"
+          ]
+        },
+        "current": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "conflicted": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "remaining": {
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/sha"
+          }
+        }
+      }
+    },
+    "pick_result": {
+      "type": "object",
+      "description": "done or noop: applied and head (or action and head); failed on conflicts: applied, current, conflicted, remaining.",
+      "properties": {
+        "applied": {
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/sha"
+          }
+        },
+        "head": {
+          "$ref": "#/$defs/sha"
+        },
+        "action": {
+          "enum": [
+            "continue",
+            "skip",
+            "abort"
+          ]
+        },
+        "current": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "conflicted": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "remaining": {
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/sha"
+          }
+        }
+      }
+    },
+    "mark_plan": {
+      "type": "object",
+      "required": [
+        "branches",
+        "owner"
+      ],
+      "properties": {
+        "branches": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "owner": {
+          "enum": [
+            "agent",
+            "human",
+            null
+          ],
+          "description": "The owner to set; null clears the mark."
+        }
+      }
+    },
+    "mark_result": {
       "type": "object",
-      "required": ["commit", "mode", "previous_commit"],
+      "required": [
+        "branches"
+      ],
       "properties": {
-        "commit": { "$ref": "#/$defs/sha" },
-        "mode": { "enum": ["soft", "mixed", "hard"] },
-        "previous_commit": { "$ref": "#/$defs/sha", "description": "Reset to this commit to go back. Uncommitted changes lost by a hard reset cannot be restored this way." }
+        "branches": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": [
+              "branch",
+              "owner",
+              "previous"
+            ],
+            "properties": {
+              "branch": {
+                "type": "string"
+              },
+              "owner": {
+                "enum": [
+                  "agent",
+                  "human",
+                  null
+                ]
+              },
+              "previous": {
+                "enum": [
+                  "agent",
+                  "human",
+                  null
+                ]
+              }
+            }
+          }
+        }
       }
     }
   }