@mindfoldhq/trellis 0.5.13 → 0.5.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (43) hide show
  1. package/README.md +49 -49
  2. package/dist/commands/init.d.ts.map +1 -1
  3. package/dist/commands/init.js +70 -41
  4. package/dist/commands/init.js.map +1 -1
  5. package/dist/commands/uninstall.d.ts.map +1 -1
  6. package/dist/commands/uninstall.js +28 -2
  7. package/dist/commands/uninstall.js.map +1 -1
  8. package/dist/commands/update.d.ts.map +1 -1
  9. package/dist/commands/update.js +21 -1
  10. package/dist/commands/update.js.map +1 -1
  11. package/dist/configurators/claude.d.ts.map +1 -1
  12. package/dist/configurators/claude.js +1 -0
  13. package/dist/configurators/claude.js.map +1 -1
  14. package/dist/migrations/manifests/0.5.14.json +9 -0
  15. package/dist/migrations/manifests/0.5.15.json +9 -0
  16. package/dist/migrations/manifests/0.6.0-beta.10.json +9 -0
  17. package/dist/migrations/manifests/0.6.0-beta.9.json +9 -0
  18. package/dist/templates/codex/hooks/session-start.py +22 -0
  19. package/dist/templates/codex/hooks.json +1 -1
  20. package/dist/templates/copilot/hooks/session-start.py +24 -0
  21. package/dist/templates/shared-hooks/inject-workflow-state.py +22 -0
  22. package/dist/templates/shared-hooks/session-start.py +19 -6
  23. package/dist/templates/trellis/scripts/common/cli_adapter.py +0 -0
  24. package/dist/templates/trellis/scripts/common/safe_commit.py +49 -19
  25. package/dist/templates/trellis/scripts/common/task_store.py +42 -12
  26. package/dist/templates/trellis/scripts/task.py +0 -0
  27. package/dist/utils/cwd-guard.d.ts +38 -0
  28. package/dist/utils/cwd-guard.d.ts.map +1 -0
  29. package/dist/utils/cwd-guard.js +62 -0
  30. package/dist/utils/cwd-guard.js.map +1 -0
  31. package/dist/utils/file-writer.d.ts +13 -0
  32. package/dist/utils/file-writer.d.ts.map +1 -1
  33. package/dist/utils/file-writer.js +59 -1
  34. package/dist/utils/file-writer.js.map +1 -1
  35. package/dist/utils/manifest-prune.d.ts +61 -0
  36. package/dist/utils/manifest-prune.d.ts.map +1 -0
  37. package/dist/utils/manifest-prune.js +136 -0
  38. package/dist/utils/manifest-prune.js.map +1 -0
  39. package/dist/utils/template-hash.d.ts +32 -6
  40. package/dist/utils/template-hash.d.ts.map +1 -1
  41. package/dist/utils/template-hash.js +53 -31
  42. package/dist/utils/template-hash.js.map +1 -1
  43. package/package.json +27 -26
@@ -111,31 +111,61 @@ def safe_trellis_paths_to_add(repo_root: Path) -> list[str]:
111
111
  return paths
112
112
 
113
113
 
114
- def safe_archive_paths_to_add(repo_root: Path) -> list[str]:
114
+ def safe_archive_paths_to_add(
115
+ repo_root: Path,
116
+ task_name: str | None = None,
117
+ modified_children: list[str] | None = None,
118
+ ) -> list[str]:
115
119
  """Return paths to stage after `task.py archive`.
116
120
 
117
- Limited to the archive subtree (where the freshly-moved task lives) plus
118
- the source task directory's parent area to capture the deletion in the
119
- same commit. We pass the whole `.trellis/tasks/` path so deletions of the
120
- pre-move path are tracked, but only as a SPECIFIC subpath — not the whole
121
- `.trellis/` tree.
121
+ Scoped to ONLY the paths the archive operation actually touched:
122
+
123
+ - the archive subtree (where the freshly-moved task lives)
124
+ - the source task directory (for source-side deletes; caller pairs
125
+ this with `git rm --cached` since `git add` won't stage deletes
126
+ for a path that no longer exists in the working tree)
127
+ - any child task directories whose `task.json` was edited to drop
128
+ the archived parent (parent-children relationship update)
129
+
130
+ This narrow scope avoids "scope creep" — dirty changes in OTHER
131
+ active task dirs (parallel-window edits) are NOT bundled into the
132
+ archive commit. Callers handle each kind of change in its own
133
+ commit boundary.
134
+
135
+ Backwards-compat: with no arguments, the function walks the whole
136
+ `.trellis/tasks/` subtree the old way (active tasks + archive). New
137
+ callers should always pass `task_name`.
122
138
  """
123
139
  paths: list[str] = []
124
140
  tasks_dir = repo_root / DIR_WORKFLOW / DIR_TASKS
125
- if tasks_dir.is_dir():
126
- # The archive copy.
127
- archive_dir = tasks_dir / DIR_ARCHIVE
141
+ if not tasks_dir.is_dir():
142
+ return paths
143
+
144
+ archive_dir = tasks_dir / DIR_ARCHIVE
145
+
146
+ if task_name is not None:
147
+ # Narrow scope — only paths that still exist on disk (so
148
+ # `git add` doesn't choke on the moved-away source). The caller
149
+ # handles the source-side deletes via `git rm --cached`
150
+ # explicitly.
128
151
  if archive_dir.is_dir():
129
- paths.append(f"{DIR_WORKFLOW}/{DIR_TASKS}/{DIR_ARCHIVE}")
130
- # Active tasks (some may have been re-touched, e.g. parent's
131
- # children list). This captures the source-path deletion too because
132
- # `git add` on a directory records removals.
133
- for child in sorted(tasks_dir.iterdir()):
134
- if not child.is_dir():
135
- continue
136
- if child.name == DIR_ARCHIVE:
137
- continue
138
- paths.append(f"{DIR_WORKFLOW}/{DIR_TASKS}/{child.name}")
152
+ paths.append(
153
+ f"{DIR_WORKFLOW}/{DIR_TASKS}/{DIR_ARCHIVE}"
154
+ )
155
+ for child_name in modified_children or []:
156
+ paths.append(f"{DIR_WORKFLOW}/{DIR_TASKS}/{child_name}")
157
+ return paths
158
+
159
+ # Legacy wide scope (no task_name): preserve old behavior so callers
160
+ # that have not been updated keep working.
161
+ if archive_dir.is_dir():
162
+ paths.append(f"{DIR_WORKFLOW}/{DIR_TASKS}/{DIR_ARCHIVE}")
163
+ for child in sorted(tasks_dir.iterdir()):
164
+ if not child.is_dir():
165
+ continue
166
+ if child.name == DIR_ARCHIVE:
167
+ continue
168
+ paths.append(f"{DIR_WORKFLOW}/{DIR_TASKS}/{child.name}")
139
169
  return paths
140
170
 
141
171
 
@@ -337,6 +337,9 @@ def cmd_archive(args: argparse.Namespace) -> int:
337
337
 
338
338
  # Update status before archiving
339
339
  today = datetime.now().strftime("%Y-%m-%d")
340
+ # Names of child task dirs whose task.json gets modified below; passed
341
+ # into safe_archive_paths_to_add so they're staged in this commit.
342
+ modified_children: list[str] = []
340
343
  if task_json_path.is_file():
341
344
  data = read_json(task_json_path)
342
345
  if data:
@@ -361,6 +364,7 @@ def cmd_archive(args: argparse.Namespace) -> int:
361
364
  if child_data:
362
365
  child_data["parent"] = None
363
366
  write_json(child_json, child_data)
367
+ modified_children.append(child_dir_path.name)
364
368
 
365
369
  # Clear any session that still points at this task before the path moves.
366
370
  from .active_task import clear_task_from_sessions
@@ -375,7 +379,7 @@ def cmd_archive(args: argparse.Namespace) -> int:
375
379
 
376
380
  # Auto-commit unless --no-commit
377
381
  if not getattr(args, "no_commit", False):
378
- _auto_commit_archive(dir_name, repo_root)
382
+ _auto_commit_archive(dir_name, repo_root, modified_children)
379
383
 
380
384
  # Return the archive path
381
385
  print(f"{DIR_WORKFLOW}/{DIR_TASKS}/{DIR_ARCHIVE}/{year_month}/{dir_name}")
@@ -388,18 +392,26 @@ def cmd_archive(args: argparse.Namespace) -> int:
388
392
  return 1
389
393
 
390
394
 
391
- def _auto_commit_archive(task_name: str, repo_root: Path) -> None:
395
+ def _auto_commit_archive(
396
+ task_name: str,
397
+ repo_root: Path,
398
+ modified_children: list[str] | None = None,
399
+ ) -> None:
392
400
  """Stage Trellis-owned task paths and commit after archive.
393
401
 
394
- Only stages specific subpaths (the archive subtree and active task dirs),
395
- never the whole ``.trellis/`` tree. If ``.gitignore`` blocks the paths,
396
- we warn + skip we do NOT retry with ``git add -f``. The warning
397
- explicitly forbids ``git add -f .trellis/`` (which would fan out to
398
- caches/backups) and points users at ``session_auto_commit: false``.
402
+ Scoped narrowly to the archived task's source + destination paths
403
+ plus any child task dirs whose ``task.json`` was edited (parent →
404
+ children relationship update). Dirty changes in OTHER active task
405
+ dirs are NOT bundled into the archive commit.
399
406
 
400
- Honors ``session_auto_commit`` in ``.trellis/config.yaml``: when set to
401
- ``false``, this function returns immediately without touching git
402
- (the archive directory move on disk is unaffected).
407
+ If ``.gitignore`` blocks the paths, we warn + skip — we do NOT
408
+ retry with ``git add -f``. The warning explicitly forbids
409
+ ``git add -f .trellis/`` (which would fan out to caches/backups)
410
+ and points users at ``session_auto_commit: false``.
411
+
412
+ Honors ``session_auto_commit`` in ``.trellis/config.yaml``: when
413
+ set to ``false``, this function returns immediately without
414
+ touching git (the archive directory move on disk is unaffected).
403
415
  """
404
416
  if not get_session_auto_commit(repo_root):
405
417
  print(
@@ -408,7 +420,9 @@ def _auto_commit_archive(task_name: str, repo_root: Path) -> None:
408
420
  )
409
421
  return
410
422
 
411
- paths = safe_archive_paths_to_add(repo_root)
423
+ paths = safe_archive_paths_to_add(
424
+ repo_root, task_name=task_name, modified_children=modified_children
425
+ )
412
426
  if not paths:
413
427
  print("[OK] No task changes to commit.", file=sys.stderr)
414
428
  return
@@ -424,8 +438,24 @@ def _auto_commit_archive(task_name: str, repo_root: Path) -> None:
424
438
  )
425
439
  return
426
440
 
441
+ # Belt-and-suspenders for the phantom-delete bug: `safe_git_add` uses
442
+ # `git add` (no -A) which only stages additions/modifications. The
443
+ # source task directory was moved away by `shutil.move`, so its files
444
+ # need an explicit `git rm --cached` to stage the deletions in this
445
+ # same commit — otherwise they sit as uncommitted "phantom deletes"
446
+ # against HEAD until something later picks them up.
447
+ #
448
+ # `--ignore-unmatch` makes this a no-op when the task was never tracked
449
+ # (e.g. archiving a task that lived only in working tree).
450
+ source_rel = f"{DIR_WORKFLOW}/{DIR_TASKS}/{task_name}"
451
+ run_git(
452
+ ["rm", "-r", "--cached", "--ignore-unmatch", "--", source_rel],
453
+ cwd=repo_root,
454
+ )
455
+
427
456
  rc, _, _ = run_git(
428
- ["diff", "--cached", "--quiet", "--", *paths], cwd=repo_root
457
+ ["diff", "--cached", "--quiet", "--", *paths, source_rel],
458
+ cwd=repo_root,
429
459
  )
430
460
  if rc == 0:
431
461
  print("[OK] No task changes to commit.", file=sys.stderr)
File without changes
@@ -0,0 +1,38 @@
1
+ /**
2
+ * Homedir guard for destructive commands (init, uninstall).
3
+ *
4
+ * Running `trellis init` / `trellis uninstall` in `$HOME` is catastrophic:
5
+ * platforms like Claude Code, Codex, OpenCode all store global runtime data
6
+ * (`.claude/projects/<sanitized-cwd>/*.jsonl` chat history, `.codex/sessions/`,
7
+ * `.opencode/` caches, etc.) directly in the user's home directory. If
8
+ * trellis manages the same `.{platform}/` config dirs and the hash manifest
9
+ * picks up runtime data, uninstall would later unlink it.
10
+ *
11
+ * Subdirectories of home (`~/Documents/projects/foo/`) are NOT blocked — only
12
+ * exact-home match.
13
+ *
14
+ * Bypass: `TRELLIS_ALLOW_HOMEDIR=1`.
15
+ */
16
+ /**
17
+ * Returns true if `process.cwd()` is exactly the user's home directory.
18
+ *
19
+ * Uses `realpathSync.native()` on both sides so symlinks, `..` segments, and
20
+ * case differences (Windows) don't confuse the comparison. On Windows the
21
+ * comparison is also case-insensitive — `C:\Users\Alice` matches
22
+ * `c:\users\alice`.
23
+ *
24
+ * Permissive on lookup failure: if realpath fails for any reason (broken
25
+ * symlink, EACCES, etc.) we return false so a safety check doesn't crash
26
+ * the command.
27
+ */
28
+ export declare function isCwdHomedir(): boolean;
29
+ /**
30
+ * Error message printed by both `trellis init` and `trellis uninstall` when
31
+ * the homedir guard trips.
32
+ */
33
+ export declare function homedirGuardMessage(commandName: "init" | "uninstall"): string;
34
+ /**
35
+ * Returns true when the bypass env var is set.
36
+ */
37
+ export declare function homedirBypassEnabled(): boolean;
38
+ //# sourceMappingURL=cwd-guard.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cwd-guard.d.ts","sourceRoot":"","sources":["../../src/utils/cwd-guard.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAKH;;;;;;;;;;;GAWG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAYtC;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,WAAW,GAAG,MAAM,CAS7E;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,OAAO,CAE9C"}
@@ -0,0 +1,62 @@
1
+ /**
2
+ * Homedir guard for destructive commands (init, uninstall).
3
+ *
4
+ * Running `trellis init` / `trellis uninstall` in `$HOME` is catastrophic:
5
+ * platforms like Claude Code, Codex, OpenCode all store global runtime data
6
+ * (`.claude/projects/<sanitized-cwd>/*.jsonl` chat history, `.codex/sessions/`,
7
+ * `.opencode/` caches, etc.) directly in the user's home directory. If
8
+ * trellis manages the same `.{platform}/` config dirs and the hash manifest
9
+ * picks up runtime data, uninstall would later unlink it.
10
+ *
11
+ * Subdirectories of home (`~/Documents/projects/foo/`) are NOT blocked — only
12
+ * exact-home match.
13
+ *
14
+ * Bypass: `TRELLIS_ALLOW_HOMEDIR=1`.
15
+ */
16
+ import { realpathSync } from "node:fs";
17
+ import * as os from "node:os";
18
+ /**
19
+ * Returns true if `process.cwd()` is exactly the user's home directory.
20
+ *
21
+ * Uses `realpathSync.native()` on both sides so symlinks, `..` segments, and
22
+ * case differences (Windows) don't confuse the comparison. On Windows the
23
+ * comparison is also case-insensitive — `C:\Users\Alice` matches
24
+ * `c:\users\alice`.
25
+ *
26
+ * Permissive on lookup failure: if realpath fails for any reason (broken
27
+ * symlink, EACCES, etc.) we return false so a safety check doesn't crash
28
+ * the command.
29
+ */
30
+ export function isCwdHomedir() {
31
+ try {
32
+ let cwd = realpathSync.native(process.cwd());
33
+ let home = realpathSync.native(os.homedir());
34
+ if (process.platform === "win32") {
35
+ cwd = cwd.toLowerCase();
36
+ home = home.toLowerCase();
37
+ }
38
+ return cwd === home;
39
+ }
40
+ catch {
41
+ return false;
42
+ }
43
+ }
44
+ /**
45
+ * Error message printed by both `trellis init` and `trellis uninstall` when
46
+ * the homedir guard trips.
47
+ */
48
+ export function homedirGuardMessage(commandName) {
49
+ return (`✗ Refusing to run \`trellis ${commandName}\` in your home directory.\n\n` +
50
+ `Trellis manages platform config dirs like .claude/, .codex/, .opencode/, which\n` +
51
+ `in your home directory also contain runtime data from those CLIs (chat history,\n` +
52
+ `session JSONLs, caches). Running here can wipe that data.\n\n` +
53
+ `Run trellis from your project directory instead. If you really want to run in\n` +
54
+ `$HOME, set TRELLIS_ALLOW_HOMEDIR=1.`);
55
+ }
56
+ /**
57
+ * Returns true when the bypass env var is set.
58
+ */
59
+ export function homedirBypassEnabled() {
60
+ return process.env.TRELLIS_ALLOW_HOMEDIR === "1";
61
+ }
62
+ //# sourceMappingURL=cwd-guard.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cwd-guard.js","sourceRoot":"","sources":["../../src/utils/cwd-guard.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAE9B;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,YAAY;IAC1B,IAAI,CAAC;QACH,IAAI,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAC7C,IAAI,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7C,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YACjC,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;YACxB,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAC5B,CAAC;QACD,OAAO,GAAG,KAAK,IAAI,CAAC;IACtB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,WAAiC;IACnE,OAAO,CACL,+BAA+B,WAAW,gCAAgC;QAC1E,kFAAkF;QAClF,mFAAmF;QACnF,+DAA+D;QAC/D,iFAAiF;QACjF,qCAAqC,CACtC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB;IAClC,OAAO,OAAO,CAAC,GAAG,CAAC,qBAAqB,KAAK,GAAG,CAAC;AACnD,CAAC"}
@@ -4,6 +4,19 @@ export interface WriteOptions {
4
4
  }
5
5
  export declare function setWriteMode(mode: WriteMode): void;
6
6
  export declare function getWriteMode(): WriteMode;
7
+ /**
8
+ * Begin recording every write into the returned Set. Calls accumulate into the
9
+ * same set until `stopRecordingWrites` runs. POSIX relative paths (relative to
10
+ * `cwd`) are stored, matching `.template-hashes.json` keys.
11
+ *
12
+ * Nested recording sessions are NOT supported — the caller must ensure
13
+ * `stopRecordingWrites` runs before the next `startRecordingWrites`. Failure
14
+ * is silent (the second `start` replaces the first set), so callers should
15
+ * always pair start/stop in try/finally.
16
+ */
17
+ export declare function startRecordingWrites(cwd: string): Set<string>;
18
+ /** End recording. Subsequent writes are not captured until `start` is called again. */
19
+ export declare function stopRecordingWrites(): void;
7
20
  /**
8
21
  * Write file with conflict handling
9
22
  * - If file doesn't exist: write directly
@@ -1 +1 @@
1
- {"version":3,"file":"file-writer.d.ts","sourceRoot":"","sources":["../../src/utils/file-writer.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,QAAQ,CAAC;AAE5D,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,SAAS,CAAC;CACjB;AASD,wBAAgB,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI,CAElD;AAED,wBAAgB,YAAY,IAAI,SAAS,CAExC;AA6BD;;;;;;;;GAQG;AACH,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,GACjC,OAAO,CAAC,OAAO,CAAC,CA8GlB;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAE/C"}
1
+ {"version":3,"file":"file-writer.d.ts","sourceRoot":"","sources":["../../src/utils/file-writer.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,QAAQ,CAAC;AAE5D,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,SAAS,CAAC;CACjB;AASD,wBAAgB,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI,CAElD;AAED,wBAAgB,YAAY,IAAI,SAAS,CAExC;AAkBD;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAK7D;AAED,uFAAuF;AACvF,wBAAgB,mBAAmB,IAAI,IAAI,CAG1C;AAsCD;;;;;;;;GAQG;AACH,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,GACjC,OAAO,CAAC,OAAO,CAAC,CA0HlB;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAE/C"}
@@ -2,6 +2,7 @@ import fs from "node:fs";
2
2
  import path from "node:path";
3
3
  import chalk from "chalk";
4
4
  import inquirer from "inquirer";
5
+ import { toPosix } from "./posix.js";
5
6
  // Global write mode (set from CLI options)
6
7
  let globalWriteMode = "ask";
7
8
  export function setWriteMode(mode) {
@@ -10,6 +11,51 @@ export function setWriteMode(mode) {
10
11
  export function getWriteMode() {
11
12
  return globalWriteMode;
12
13
  }
14
+ // ---------------------------------------------------------------------------
15
+ // Write recording
16
+ //
17
+ // `trellis init` uses recording to capture exactly which files were actually
18
+ // written this run (vs skipped because they already existed). The captured
19
+ // set is what `.template-hashes.json` should contain — NOT a blind directory
20
+ // walk of `.codex/` / `.claude/` / etc, which would include user-owned files
21
+ // that pre-dated init. See `pruneOrphanManifestKeys` for the self-heal side
22
+ // of the same contract.
23
+ // ---------------------------------------------------------------------------
24
+ /** When recording is active, every actual `writeFile` disk write appends here. */
25
+ let writeRecorder = null;
26
+ /** Project root used to convert absolute write paths to POSIX-relative keys. */
27
+ let writeRecorderRoot = null;
28
+ /**
29
+ * Begin recording every write into the returned Set. Calls accumulate into the
30
+ * same set until `stopRecordingWrites` runs. POSIX relative paths (relative to
31
+ * `cwd`) are stored, matching `.template-hashes.json` keys.
32
+ *
33
+ * Nested recording sessions are NOT supported — the caller must ensure
34
+ * `stopRecordingWrites` runs before the next `startRecordingWrites`. Failure
35
+ * is silent (the second `start` replaces the first set), so callers should
36
+ * always pair start/stop in try/finally.
37
+ */
38
+ export function startRecordingWrites(cwd) {
39
+ const sink = new Set();
40
+ writeRecorder = sink;
41
+ writeRecorderRoot = cwd;
42
+ return sink;
43
+ }
44
+ /** End recording. Subsequent writes are not captured until `start` is called again. */
45
+ export function stopRecordingWrites() {
46
+ writeRecorder = null;
47
+ writeRecorderRoot = null;
48
+ }
49
+ /** Record a successful write. Called internally by `writeFile`. */
50
+ function recordWrite(absPath) {
51
+ if (!writeRecorder || !writeRecorderRoot)
52
+ return;
53
+ const rel = path.relative(writeRecorderRoot, absPath);
54
+ // Defensive: skip writes outside cwd (no meaningful manifest key).
55
+ if (rel.startsWith("..") || path.isAbsolute(rel))
56
+ return;
57
+ writeRecorder.add(toPosix(rel));
58
+ }
13
59
  /**
14
60
  * Get relative path from cwd for display
15
61
  */
@@ -49,12 +95,15 @@ export async function writeFile(filePath, content, options) {
49
95
  if (options?.executable) {
50
96
  fs.chmodSync(filePath, "755");
51
97
  }
98
+ recordWrite(filePath);
52
99
  return true;
53
100
  }
54
101
  // File exists, check if content is identical
55
102
  const existingContent = fs.readFileSync(filePath, "utf-8");
56
103
  if (existingContent === content) {
57
- // Content identical, skip silently (no output)
104
+ // Content identical, but no disk write happened. Do not record it for
105
+ // init-time manifests: pre-existing user files can legitimately be
106
+ // byte-identical to a Trellis template and still not be Trellis-owned.
58
107
  return false;
59
108
  }
60
109
  // File exists with different content, handle based on mode.
@@ -70,15 +119,22 @@ export async function writeFile(filePath, content, options) {
70
119
  fs.chmodSync(filePath, "755");
71
120
  }
72
121
  console.log(chalk.yellow(` ↻ Overwritten: ${displayPath}`));
122
+ recordWrite(filePath);
73
123
  return true;
74
124
  }
75
125
  if (mode === "skip") {
76
126
  console.log(chalk.gray(` ○ Skipped: ${displayPath} (already exists)`));
127
+ // Skipped: trellis did NOT write this file — caller should not track it
128
+ // in the manifest. This is the AGENTS.md skip-existing case.
77
129
  return false;
78
130
  }
79
131
  if (mode === "append") {
80
132
  appendToFile(filePath, content, options);
81
133
  console.log(chalk.blue(` + Appended: ${displayPath}`));
134
+ // Append: trellis added trellis content to a user-owned file. Tracking
135
+ // is risky here (uninstall would unlink the whole file), so we do NOT
136
+ // record appended files. Users on `--append` get a fresh manifest miss
137
+ // on next update; that's the safer default.
82
138
  return true;
83
139
  }
84
140
  // mode === 'ask': Interactive prompt
@@ -107,6 +163,7 @@ export async function writeFile(filePath, content, options) {
107
163
  fs.chmodSync(filePath, "755");
108
164
  }
109
165
  console.log(chalk.yellow(` ↻ Overwritten: ${displayPath}`));
166
+ recordWrite(filePath);
110
167
  return true;
111
168
  }
112
169
  if (action === "append") {
@@ -126,6 +183,7 @@ export async function writeFile(filePath, content, options) {
126
183
  fs.chmodSync(filePath, "755");
127
184
  }
128
185
  console.log(chalk.yellow(` ↻ Overwritten: ${displayPath}`));
186
+ recordWrite(filePath);
129
187
  return true;
130
188
  }
131
189
  if (action === "append-all") {
@@ -1 +1 @@
1
- {"version":3,"file":"file-writer.js","sourceRoot":"","sources":["../../src/utils/file-writer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"file-writer.js","sourceRoot":"","sources":["../../src/utils/file-writer.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,61 @@
1
+ /**
2
+ * Self-heal poisoned `.template-hashes.json` manifests.
3
+ *
4
+ * Versions before this fix walked `.codex/`, `.claude/`, etc. with a blind
5
+ * recursive scan when computing the manifest, so they hashed user-owned
6
+ * runtime data (`.codex/sessions/*`, `.claude/projects/*.jsonl`, pre-existing
7
+ * `AGENTS.md`, user-added `.codex/skills/<custom>/`, …). On uninstall, every
8
+ * manifest entry is unlinked, which silently deletes user data.
9
+ *
10
+ * `pruneOrphanManifestKeys` removes any manifest entry that no current
11
+ * platform configurator owns. The two entry points that consume it are
12
+ * `trellis update` (before migration classification) and `trellis uninstall`
13
+ * (before plan building). Together they ensure existing poisoned manifests
14
+ * self-correct on the next routine command.
15
+ *
16
+ * Rules:
17
+ * - `.trellis/*` entries are ALWAYS kept. `trellis uninstall` removes
18
+ * `.trellis/` wholesale via `fs.rmSync(..., { recursive: true })`, so
19
+ * manifest accuracy there doesn't affect uninstall data-loss. `update`
20
+ * also relies on these entries to detect user-modified workflow files.
21
+ * - Root-level `AGENTS.md` is kept only when it still looks Trellis-managed
22
+ * (contains the managed block markers) or is missing on disk. This
23
+ * self-heals old poisoned manifests for user-owned AGENTS.md files that
24
+ * predated init and were skipped.
25
+ * - Paths referenced by `from`/`to` of any migration manifest entry
26
+ * (rename, rename-dir, delete, safe-file-delete) are preserved. Pruning
27
+ * them would prevent legitimate pending migrations from finding their
28
+ * source/target.
29
+ * - Everything else: if the path is not in the union of
30
+ * `collectPlatformTemplates()` for currently-configured platforms, it is
31
+ * pruned. This matches "files trellis actually wrote during init/update".
32
+ */
33
+ import type { AITool } from "../types/ai-tools.js";
34
+ import type { TemplateHashes } from "../types/migration.js";
35
+ export interface PruneResult {
36
+ /** Manifest keys removed (POSIX-style relative paths). */
37
+ pruned: string[];
38
+ /** The post-prune manifest (saved to disk only when `pruned.length > 0`). */
39
+ hashes: TemplateHashes;
40
+ }
41
+ export interface PruneOptions {
42
+ /**
43
+ * Save the pruned manifest to `.template-hashes.json`. Defaults to true.
44
+ * Callers can pass `false` to compute the prune without mutating disk
45
+ * (dry-run, change-analysis passes).
46
+ */
47
+ persist?: boolean;
48
+ }
49
+ /**
50
+ * Walk the manifest and split it into kept vs pruned entries.
51
+ *
52
+ * @param cwd Project root — used to save the rewritten manifest.
53
+ * @param configuredPlatforms Output of `getConfiguredPlatforms(cwd)` — caller
54
+ * resolves this so we don't have to re-walk the filesystem.
55
+ * @param hashes Already-loaded manifest contents. Passing it in (vs reading
56
+ * from disk) lets the caller chain `loadHashes` → prune → use the result.
57
+ * @param options.persist When true (default), saves the pruned manifest to
58
+ * disk. Pass `false` for dry-run flows.
59
+ */
60
+ export declare function pruneOrphanManifestKeys(cwd: string, configuredPlatforms: readonly AITool[], hashes: TemplateHashes, options?: PruneOptions): PruneResult;
61
+ //# sourceMappingURL=manifest-prune.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"manifest-prune.d.ts","sourceRoot":"","sources":["../../src/utils/manifest-prune.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAUH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAK5D,MAAM,WAAW,WAAW;IAC1B,0DAA0D;IAC1D,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,6EAA6E;IAC7E,MAAM,EAAE,cAAc,CAAC;CACxB;AAoDD,MAAM,WAAW,YAAY;IAC3B;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,EACX,mBAAmB,EAAE,SAAS,MAAM,EAAE,EACtC,MAAM,EAAE,cAAc,EACtB,OAAO,GAAE,YAAiB,GACzB,WAAW,CAmCb"}