pi-task-tracker 0.1.1 → 0.1.2

package/README.md

@@ -7,7 +7,7 @@ Task workflow tracking for the [pi coding agent](https://www.npmjs.com/package/@
 - **TODO.md tracking** — each prompt is recorded as a task entry in `TODO.md` and checked off when the agent settles.
 - **README.md maintenance** — the project structure section stays up to date with agent-created files.
 - **Per-task git auto-commit** — when a task completes, only the files the agent actually touched are staged and committed with the task as the message. Nothing else is swept in.
-- **`/rollback`** — pick any prior commit interactively and the working tree is restored to that point. Worktree-only, nothing is committed, fully reversible (`git diff` to review, commit when satisfied).
+- **`/rollback`** — pick any prior commit interactively and the working tree is restored to that point **while the conversation rewinds to the turn that produced it** (one checkpoint for files *and* context). Worktree-only, nothing is committed, fully reversible (`git diff` to review, commit when satisfied). Old session branches are preserved — `/tree` can navigate back.
 
 ### What makes it different
 
@@ -26,7 +26,7 @@ Task workflow tracking for the [pi coding agent](https://www.npmjs.com/package/@
   → confirm → working tree restored to that commit
 ```
 
-Conservative by design: the index is untouched, the rollback itself is never auto-committed, and untracked files are out of scope (they were never committed, so their provenance is unknown).
+Conservative by design: the index is untouched, the rollback itself is never auto-committed, and untracked files are out of scope (they were never committed, so their provenance is unknown). Conversation rewind reuses pi's session-tree navigation, so nothing is ever deleted from the session file.
 
 ## Configuration
 
@@ -60,7 +60,7 @@ Optional `taskTracker` key in `~/.pi/agent/settings.json` (all default to `true`
 
 ## 本简介（中文）
 
-`pi-task-tracker` 为 pi coding agent 提供任务级工作流跟踪：每次任务完成时，agent 实际改动的文件被自动提交到你的分支（提交信息即任务名），这些提交同时构成检查点；`/rollback` 可交互式地把工作区回滚到任意历史提交（仅工作区、不自动提交、可逆）。支持 hashline 编辑工具、bash/powershell 产物捕获、嵌套仓库归属最内层、自动排除 `.pi-subagents/` 会话数据。配置项见上方 `taskTracker`。
+`pi-task-tracker` 为 pi coding agent 提供任务级工作流跟踪：每次任务完成时，agent 实际改动的文件被自动提交到你的分支（提交信息即任务名），这些提交同时构成检查点；`/rollback` 可交互式地把工作区回滚到任意历史提交，**同时把对话上下文回退到产生该提交的任务轮次**（文件与上下文同一检查点；仅工作区、不自动提交、可逆，旧会话分支保留可 /tree 回访）。支持 hashline 编辑工具、bash/powershell 产物捕获、嵌套仓库归属最内层、自动排除 `.pi-subagents/` 会话数据。配置项见上方 `taskTracker`。
 
 ## License
 

package/index.ts

@@ -212,6 +212,20 @@ function normalizeReadme(readmePath: string, name: string): void {
   } catch {}
 }
 
+// ---- Session helpers ----
+// Flatten an AgentMessage's content to plain text (string or content blocks).
+function messageText(m: { content?: unknown }): string {
+  const c = (m as { content?: unknown }).content;
+  if (typeof c === "string") return c;
+  if (Array.isArray(c)) {
+    return c
+      .filter((b) => b && typeof b === "object" && (b as { type?: string }).type === "text")
+      .map((b) => String((b as { text?: string }).text ?? ""))
+      .join(" ");
+  }
+  return "";
+}
+
 // ---- Configuration ----
 // Optional `taskTracker` key in ~/.pi/agent/settings.json (env
 // PI_CODING_AGENT_DIR respected). All flags default to true.
@@ -555,7 +569,50 @@ export default function (pi: ExtensionAPI) {
       createdFiles.length = 0;
       editedFiles.length = 0;
       beforeStatus.clear();
-      ctx.ui.notify(`Rolled back to ${target.sha} - worktree updated, nothing committed. Review with git diff, then commit when satisfied.`, "info");
+
+      // 6. rewind the conversation to the turn that produced this commit, so
+      // context and files land on the same checkpoint. The task commit's
+      // subject is the (normalized) user prompt, so match the last user
+      // message starting with it, then the end of that turn. Old entries stay
+      // in the session tree — /tree can navigate back at any time.
+      let conversationNote = "";
+      try {
+        const subject = git(["show", "-s", "--format=%s", target.sha], cwd);
+        if (subject && ctx.sessionManager) {
+          const norm = (t: string) => t.replace(/\s+/g, " ").trim();
+          const branch = ctx.sessionManager.getBranch();
+          let userIdx = -1;
+          for (let i = branch.length - 1; i >= 0; i--) {
+            const e = branch[i] as { type?: string; message?: { role?: string; content?: unknown } };
+            if (e.type !== "message" || e.message?.role !== "user") continue;
+            if (norm(messageText(e.message as { content?: unknown })).startsWith(norm(subject))) {
+              userIdx = i;
+              break;
+            }
+          }
+          if (userIdx !== -1) {
+            // end of that turn = last entry before the next user message
+            let end = userIdx;
+            for (let j = userIdx + 1; j < branch.length; j++) {
+              const e = branch[j] as { type?: string; message?: { role?: string } };
+              if (e.type === "message" && e.message?.role === "user") break;
+              end = j;
+            }
+            const targetId = branch[end].id;
+            const nav = ctx.navigateTree
+              ? await ctx.navigateTree(targetId, { label: `rollback → ${target.sha}` })
+              : { cancelled: false };
+            if (!nav.cancelled) {
+              conversationNote = " Conversation rewound to that point (/tree can navigate back).";
+            }
+          } else {
+            conversationNote = " (No matching conversation entry found - context unchanged.)";
+          }
+        }
+      } catch {
+        conversationNote = " (Conversation rewind failed - files were rolled back.)";
+      }
+      ctx.ui.notify(`Rolled back to ${target.sha} - worktree updated, nothing committed. Review with git diff, then commit when satisfied.${conversationNote}`, "info");
     },
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-task-tracker",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Task workflow tracking for the pi coding agent: TODO/README maintenance, per-task git auto-commits as checkpoints, and an interactive /rollback. Hashline-aware, nested-repo aware, subagent-artifact-safe.",
   "keywords": [
     "pi-package",