pi-task-tracker 0.1.4 → 0.1.5

package/README.md

@@ -14,6 +14,7 @@ Task workflow tracking for the [pi coding agent](https://www.npmjs.com/package/@
 - **Hashline-aware** — records edits made through `pi-hashline-edit-pro`'s `replace`/`insert` tools, not just the native `edit` tool (most setups that replace native edit would otherwise go completely untracked).
 - **Shell-aware** — captures files created/modified by `bash` **and** `powershell` tool calls via before/after `git status` diffing.
 - **Nested-repo aware** — changes inside a sub-repository (a `.git` below your session root) are committed *there* — the innermost repo wins — and never pollute the outer repo. The outer task commit records anchors (`Nested: <repo>@<sha>`), so `/rollback` restores nested repos to their exact matching commit.
+- **Pre-existing double tracking respected** — if a file is already tracked by both an outer repo and a nested repo, changes go to the nested repo (innermost wins), pi never untracks the outer copy, and `/rollback` never lets the outer repo restore its stale copy over the inner worktree.
 - **Subdirectory start** — start pi in a subdirectory of an existing repo and no fresh `.git` is created there: all session changes (including TODO.md / README.md) are recorded in the enclosing repository, and `/rollback` restores the enclosing repo scoped to the session subtree.
 - **Subagent-safe** — `.pi-subagents/` session artifacts are never recorded, listed, or committed.
 - **~zero per-turn cost** — one incremental `git add` of touched files per task; no full-worktree scans, no background snapshot daemons.

package/index.ts

@@ -263,6 +263,10 @@ function repoDiffActions(root: string, sha: string, subtreeRel?: string): { rest
     if (!file || file.includes("->")) continue;
     // when operating on a repo subdirectory, only touch paths inside it
     if (subtreeRel !== undefined && !(file === subtreeRel || file.startsWith(subtreeRel + "/"))) continue;
+    // Pre-existing double-tracked files (tracked by both this repo and a
+    // nested repo) stay under the nested repo's authority: this repo's
+    // rollback must never restore/remove them over the inner worktree.
+    if (ownerRepoRoot(path.join(root, file), root) !== root) continue;
     if (isSubagentPath(file)) continue;
     if (status === "A") removes.push(file);
     else if (status === "M" || status === "D") restores.push(file);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-task-tracker",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "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",