From 79df026d8c9b922ec5a068ef07162c210e4fe12e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabor=20K=C3=B6rber?= <gab@g4b.org>
Date: Fri, 16 Oct 2026 23:33:02 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20Gremlins=20MVP:=20rebase=20templ?=
 =?UTF-8?q?ate=20says=20resume,=20not=20fork?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/spire/skills/gremlins/grm/cli.py          | 2 +-
 plugins/spire/skills/gremlins/templates/rebase.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/spire/skills/gremlins/grm/cli.py b/plugins/spire/skills/gremlins/grm/cli.py
index 4d01c93..5052421 100644
--- a/plugins/spire/skills/gremlins/grm/cli.py
+++ b/plugins/spire/skills/gremlins/grm/cli.py
@@ -281,7 +281,7 @@ def cmd_rebase(args) -> dict:
     job = "%s-rebase%d" % (b, len(base.get("rebases") or []) + 1)
     cwd = r["fingerprint"]["cwd"]
     prompt = render_template("rebase.md", {
-        "base": b, "new_base": b, "phase": "n/a", "run": r["run"], "notes_dir": str(state / "notes"),
+        "base": b, "run": r["run"], "notes_dir": str(state / "notes"),
         "delta": delta_header(cwd, base.get("commit")), "brief": brief})
     rec, ss, u, line = _execute(args.run, state, r, job=job, kind="rebase", base=b, sid=None,
                                 argv=launch.resume_argv(r, base["session_id"]), prompt=prompt,
diff --git a/plugins/spire/skills/gremlins/templates/rebase.md b/plugins/spire/skills/gremlins/templates/rebase.md
index 4076b82..21ed206 100644
--- a/plugins/spire/skills/gremlins/templates/rebase.md
+++ b/plugins/spire/skills/gremlins/templates/rebase.md
@@ -1,6 +1,6 @@
 # Rebase (spire:gremlins)
 
-This session is a fork of base `${base}` (run log `${run}`). When you finish, this session becomes the new base `${new_base}` (phase ${phase}): every later gremlin of this build starts from what you know at the end of it. Your job is to absorb what changed since `${base}` was trained or last rebased.
+This session is base `${base}` itself, resumed (run log `${run}`). When you finish, every later gremlin of this build starts from what you know at the end of it. Your job is to absorb what changed since `${base}` was trained or last rebased.
 
 Your system prompt was snapshotted when the base was trained: the git status, the CLAUDE.md files and the environment it shows are **stale**. The delta header below lists what changed in the repository since then. Trust it and the files on disk over the snapshot and over what you remember.