🩹 Gremlins MVP: rebase template says resume, not fork

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,

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.