tix

# Tix Use Tix for history mutations and Git for inspection and staging. User instructions control scope, signing, QA, and pushing; this skill grants no additional authorization. ## Inspect and Choose Read `git status --porcelain=v1 --branch` and `tix show`. Record the starting branch, hash, and change ID. Refresh before mutations; other agents may be working here, so wait for their operations to settle when necessary. Tix displays a Git hash followed by a change ID. Prefer the change ID for later travel because hashes change during edits and replay. Resolve ambiguous IDs instead of guessing. Check the installed `tix <command> --help` for supported arguments. After an ancestor is edited, Tix may defer reapplying descendant commits' changes onto the edited history until `tix travel` reaches them. This is **pending replay**. Determine the requested operation and target commit from the user's instructions and current history. For ancestor content edits, travel to the target and refresh `tix show` before choosing whether to amend or create a fixup: pending replay can temporarily hide review marks. At the intended `HEAD`, inspect there without unnecessary travel. | Task | Default action | | --- | --- | | Add independent work | Create a new commit. | | Change only a message | Reword the requested target directly. | | Change a commit's contents without `✨` | Amend it directly; do not create a fixup, regardless of other enrichments. | | Change a commit's contents with `✨` | Preserve it; insert a `fixup!` immediately above it. | Conflict resolution is an exception to the fixup rule: after resolving and staging rebase or replay conflicts, you may amend the conflicted commit directly with `tix amend --index`, even if it has `✨`. Keep the amendment limited to the resolution and adaptations needed to preserve both commit intents; do not create a fixup just for conflict resolution. `✨` is patch review/refactoring approval by the human reviewer within a Tix change (`tix enrich patch refackiewed`). Only the human reviewer may explicitly set or clear this mark. Agents must not invoke this command, including `--clear`; agent review, passing checks, positive feedback, or requests to wrap up do not authorize it. `✔️` records checks passing for an exact tree. Neither implies the other. Do not fabricate marks after changes or treat a focused test as a complete QA profile. Explicit user instructions override the table; do not squash fixups unless requested. ## Edit Commands For a bug or CI fix, locate the introducing commit from the failure, tested revision, diff, and history. CI can refer to an older PR head. When changing checkout for content edits, travel from a clean index and worktree, confirm `HEAD`, edit, and run focused validation at that commit: ```bash tix travel "$target_change" ``` At the correct `HEAD`, other agents' unstaged changes do not require travel or cleanup: stage only owned paths/hunks, including new files explicitly. Use `--index`: otherwise `amend` and `new` can fall back to tracked worktree changes when the index is unchanged. Untracked files are not implicitly included. `--index` consumes the entire index; coordinate if unrelated staged changes are present. ```bash tix amend --index ``` For a fixup, generate its exact first line after traveling to the target: ```bash git show -s --format='fixup! %s' HEAD > "$message_file" ``` Append a blank line and explain the failure, correction, and validation. Do not copy the subject from `tix show`, which renders Markdown and can omit literal backticks. There is no `tix new --fixup` flag. For a fixup or independent commit, use a complete message file and the responsible agent's actual name/email in `agent_author`: ```bash tix new --index --author "$agent_author" --file "$message_file" ``` After creating a fixup, record its new change ID as `fixup_change` and add a Tix note containing only the single-line title this fixup would have if it were a normal commit. Keep the explanation in the commit body and the exact `fixup! <original subject>` as the commit subject. Write only that title to `note_file` outside the checkout, then save it noninteractively through Git's editor: ```bash TIX_FIXUP_NOTE_FILE="$note_file" GIT_EDITOR='cp "$TIX_FIXUP_NOTE_FILE"' \ tix enrich commit note "$fixup_change" ``` The note command has no `--message` or `--file` flag. Require enrichment to succeed before continuing; if it fails, finish the note on the existing fixup instead of creating another commit. For a message-only request, inspect the target's contents and supply its complete replacement message: ```bash tix reword "$target_change" --file "$message_file" ``` Honor explicit targets even when `HEAD` moves. File-based messages preserve enrichments. Wording polish alone does not transfer authorship; use `--author` when responsibility for the contents changes. Follow scoped `AGENTS.md` rules: the provisional-commit rule under `gix-tix/` applies to edits there, not every Tix operation. When signing is disabled, existing workflows use this command-local prefix, also applicable to `new` and `reword`: ```bash GIT_CONFIG_COUNT=1 GIT_CONFIG_KEY_0=commit.gpgSign GIT_CONFIG_VALUE_0=false tix amend --index ``` Preserve any existing configuration overrides instead of overwriting them or changing persistent Git configuration. ## `tix rebase-update [FILE]` Treat `tix rebase-update` in a user request as a skill-level command, not a literal installed Tix subcommand. It updates the current visible stack onto the newer hidden local branch tip by using `tix rebase todo --update-base`. An optional `FILE` is the todo path to retain; without one, create a task-owned temporary file outside the checkout and remove it after success. Refresh `git status --porcelain=v1 --branch`, `tix show`, and the installed `tix rebase todo --help` before starting. Do not begin with unmerged entries or an unrelated dirty index or worktree: a rebase can need both for conflict recovery. Do not stash, discard, or absorb another agent's changes merely to make the checkout clean. Generate the plan without applying it immediately: ```bash tix rebase todo --update-base > "$todo_file" ``` Require generation to succeed and read the complete plan. Preserve every visible commit, fork, ref, and the generated `@` checkout unless the user explicitly requested additional history edits. Do not hand-build the updated base or replace `--update-base` with a guessed `--onto`. Apply the reviewed file while opting into recoverable conflicts: ```bash tix rebase apply --materialize-conflicts "$todo_file" ``` A successful apply completes the update. A conflict is accepted only when Tix reports a saved operation and the index contains unmerged entries. Inspect `tix rebase status`, `git diff --cc`, and index stages `:1:`, `:2:`, and `:3:`; resolve both commit intents and stage only the resolution. Once all conflicts are resolved and staged, you may run `tix amend --index` before continuing. This is also a valid recovery when continuation refuses to check out over staged resolution changes. Resume the saved operation with: ```bash tix rebase continue --materialize-conflicts ``` Repeat inspection and continuation for each later conflict. Never rerun the original todo after an operation was saved, and do not call `tix rebase stop` unless the user asks to preserve the partial result and abandon the remaining operation. After completion, verify that `tix rebase status` reports no saved operation, then inspect `git status --porcelain=v1 --branch` and `tix show`. Confirm that the updated hidden base is in the ancestry, the intended checkout and refs are restored, all original visible changes remain represented, and no unrelated files entered rewritten commits. If `FILE` was supplied, leave it in place; otherwise remove only the task-owned temporary todo. ## Replay and Recovery Edits can advance refs before descendant changes have been reapplied to the edited ancestry. After this task travels for an ancestor edit, use `tix travel "$return_branch"` to replay its ancestry and restore attachment. If initially detached, return through the saved change ID, not a stale hash. Honor subsequent user checkout changes: direct-target rewording does not require traveling back merely because an ancestor was rewritten. Leave pin management to Tix's normal commands. If travel reports a replay conflict without changing files, use `tix travel --materialize-conflicts "$target_change"`. Its deliberate nonzero exit must correspond to an unmerged index. Inspect `git diff --cc` and stages `:1:`, `:2:`, `:3:`; preserve both commit intents. Stage the resolution, `tix amend --index`, then retry travel. Staging alone is incomplete. Inspect state after other failures. Correct environmental problems before retrying, and never repeat an already successful mutation or substitute a reset for diagnosis. Do not automatically stash or absorb another agent's work. Finish authorized task-owned changes before travel or retain verified patches/copies, including untracked files. `tix stash` and `travel --stash` are optional. After failed application, preserve the recovery commit and inspect what applied before restoring anything. Keep messages and recovery material outside the checkout: files can disappear at older commits. ## Validate and Finish Keep commits self-contained. For CI fixes, run focused checks and distinguish cancellation fallout from actual failures. Use [tix-qa-sweep](../tix-qa-sweep/SKILL.md) for a requested sweep, retaining user exclusions, review-preservation rules, and QA level. Do not launch full QA automatically after each fix. Reuse build caches; do not delete them, disable incremental compilation, or override authorized growth as incidental cleanup. Return to the requested checkout and verify status, placement, diff, and fresh `tix show`. Preserve untouched review marks without recreating invalidated ones. With concurrent work, verify only intended changes were committed rather than forcing everything clean. Report final hashes/change IDs, validation, and push status, including when remote CI still tests an older head. Remove only task-owned scratch files after success; retain recovery material when interrupted.