mini-trellis 0.1.0 → 0.1.1

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.
package/README.md CHANGED
@@ -1,15 +1,49 @@
1
1
  # mini-trellis
2
2
 
3
- A memory layer for AI coding agents. A trimmed fork of [Trellis](https://github.com/mindfold-ai/Trellis) 0.6.17.
3
+ **A memory layer for AI coding agents.** A trimmed fork of [Trellis](https://github.com/mindfold-ai/Trellis) 0.6.17 that keeps spec, research, journal and cross-session recall, and drops everything else.
4
+
5
+ English | [简体中文](./README_CN.md)
6
+
7
+ <p>
8
+ <a href="https://www.npmjs.com/package/mini-trellis"><img src="https://img.shields.io/npm/v/mini-trellis.svg?style=flat-square&color=2563eb" alt="npm version" /></a>
9
+ <a href="https://www.npmjs.com/package/mini-trellis"><img src="https://img.shields.io/npm/dm/mini-trellis?style=flat-square&color=cb3837&label=downloads" alt="npm downloads" /></a>
10
+ <a href="https://github.com/Tiger-zzZ/mini-trellis/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-AGPL--3.0-16a34a.svg?style=flat-square" alt="license" /></a>
11
+ <a href="https://github.com/Tiger-zzZ/mini-trellis/stargazers"><img src="https://img.shields.io/github/stars/Tiger-zzZ/mini-trellis?style=flat-square&color=f59e0b" alt="GitHub stars" /></a>
12
+ <a href="https://github.com/Tiger-zzZ/mini-trellis/issues"><img src="https://img.shields.io/github/issues/Tiger-zzZ/mini-trellis?style=flat-square" alt="GitHub issues" /></a>
13
+ <a href="https://github.com/Tiger-zzZ/mini-trellis/pulls"><img src="https://img.shields.io/github/issues-pr/Tiger-zzZ/mini-trellis?style=flat-square" alt="GitHub pull requests" /></a>
14
+ </p>
4
15
 
5
16
  ## Why this fork exists
6
17
 
7
- Trellis gave me four things I rely on every day: spec, research notes, session journals, and a way to search past AI conversations. It also shipped a full four-phase task workflow: task.py, PRD gates, sub-agent review. Over time I noticed I was routing around the workflow and only ever using the memory parts.
18
+ Trellis gave me four things I rely on every day: spec, research notes, session journals, and a way to search past AI conversations. It also shipped a full four-phase task workflow: `task.py`, PRD gates, sub-agent review, a per-turn breadcrumb telling the model which phase it is in. Over time I noticed I was routing around the workflow and only ever using the memory parts.
19
+
20
+ Models have moved on too. A GPT 6 / Fable 5 class agent does not need a script telling it when to plan and when to verify. What it still cannot do is remember what we decided last week, or find the conversation where we already solved this bug. That gap is what this fork keeps.
8
21
 
9
- So this fork cuts the workflow and keeps the memory. The "mini" is the point.
22
+ So mini-trellis cuts the workflow and keeps the memory. The "mini" is the point.
10
23
 
11
24
  Credit where due: the heavy lifting is all Trellis. Standing on the shoulders of giants, my main contribution was deleting code.
12
25
 
26
+ ## Trellis vs mini-trellis
27
+
28
+ Trellis is an engineering framework: it decides how a task moves from PRD to implementation to review, and it drives that with hooks on every turn, sub-agents, and a task state machine. mini-trellis is only the memory underneath that framework. It never creates a task, never tells the model what phase it is in, and never dispatches a sub-agent. It injects a short orientation at session start, lets the model read spec and research on demand, and gives it two verbs: `remember` to write the journal, and `mem` to search past dialogue. Everything Trellis does *around* memory is left to the model and to you.
29
+
30
+ | | Trellis 0.6.17 | mini-trellis 0.1.1 |
31
+ |---|---|---|
32
+ | Purpose | Engineering framework: spec + task workflow + memory | Memory layer only |
33
+ | Hosts | 22 AI coding tools | Claude Code, Codex, OpenCode, Pi |
34
+ | Hooks | SessionStart + per-turn breadcrumb + PreToolUse sub-agent injection | SessionStart only |
35
+ | Task system | `task.py`, `tasks/`, PRD / jsonl gates, `workflow.md`, archive | None |
36
+ | Sub-agents | `trellis-research` / `implement` / `check` | None |
37
+ | Skills & commands shipped | ~10 skills, 3 commands, 3 agents | `remember`, `session-insight`, `update-spec` |
38
+ | CLI | init, update, workflow, channel, ablate, restore, mem, upgrade, uninstall, platforms | init, migrate, mem, upgrade, uninstall, platforms |
39
+ | Spec | 7-section templates per layer, generated at init | One short seed; you write short markdown |
40
+ | Research | Lives inside a task directory | First-class `.trellis/research/` inbox with a cold `archive/` |
41
+ | Journal trigger | Task archive, then `finish-work` | `remember`, plus a reminder after compact |
42
+ | Code shipped | ~110k lines across `packages/` | ~31k lines |
43
+ | License | AGPL-3.0 | AGPL-3.0 (unchanged) |
44
+
45
+ If you want an opinionated workflow with guard rails, use Trellis. If you want your agent to remember and stay out of the way, use this.
46
+
13
47
  ## What's kept
14
48
 
15
49
  | Path | What it is |
@@ -19,6 +53,12 @@ Credit where due: the heavy lifting is all Trellis. Standing on the shoulders of
19
53
  | `.trellis/workspace/<you>/journal-*.md` | Session notes, auto-committed by remember |
20
54
  | `mini-trellis mem search <kw>` | Past chat from Claude / Codex / OpenCode / Pi |
21
55
 
56
+ ## How a session goes
57
+
58
+ 1. **SessionStart** injects a few lines: your journal path, the spec index paths, the hot research topics. Paths only, never bodies. Nothing about tasks or phases.
59
+ 2. **During the session** the model reads spec or research on demand, and reaches for `mini-trellis mem` when a question sounds like "didn't we already discuss this".
60
+ 3. **At the end, or after a compact,** ask the agent to run `remember` to append a journal entry (auto-commit follows `session_auto_commit`). Reusable research can go into `.trellis/research/<topic>.md`; lasting boundaries go into spec via `mini-trellis-update-spec`. The hook supplies context and reminders; closing a session does not automatically save notes.
61
+
22
62
  ## Install
23
63
 
24
64
  ```bash
@@ -29,7 +69,27 @@ mini-trellis init -u your-name --claude
29
69
 
30
70
  Python ≥ 3.9 is required for the journal scripts and SessionStart hooks. Codex SessionStart needs `[features].hooks = true` in `~/.codex/config.toml`, then a one-time `/hooks` approval.
31
71
 
32
- Upgrade the CLI with `mini-trellis upgrade`. There is no `update` command that rewrites project files.
72
+ | Command | What it does |
73
+ |---|---|
74
+ | `mini-trellis init` | Write the memory skeleton and the host surfaces for the flags you pass |
75
+ | `mini-trellis mem list\|search\|context\|extract\|projects` | Search local session logs of the four hosts; nothing is uploaded |
76
+ | `mini-trellis migrate` | Convert a Trellis project (see below) |
77
+ | `mini-trellis upgrade` | Upgrade the global CLI via npm |
78
+ | `mini-trellis uninstall` | Remove the host files and `.trellis/` from a project |
79
+ | `mini-trellis platforms` | Show which hosts are configured here |
80
+
81
+ There is no `update` command that rewrites project files.
82
+
83
+ ### Upgrading an existing mini-trellis project
84
+
85
+ `mini-trellis upgrade` updates the global CLI only. To refresh a 0.1.0 project's installed scripts and host templates:
86
+
87
+ 1. Commit or back up `.trellis/`, `AGENTS.md`, and the configured host directories, including ignored files.
88
+ 2. Run `mini-trellis init` in an interactive terminal **without flags**, choose **Full re-initialize**, then select your existing hosts.
89
+ 3. Choose **Overwrite** for the scripts, hooks, and mini-trellis commands/skills you want to refresh. Keep your custom config, workspace index, spec guides, and host settings; merge any necessary template changes into customized files. Avoid **Overwrite all** and `--force`, which also reset those files.
90
+ 4. Review the diff and developer identity, then open a new host session to load the refreshed context.
91
+
92
+ `--skip-existing` does not refresh existing templates. Use `migrate` for Trellis projects or leftover `.trellis/tasks/`; it is not a general template updater.
33
93
 
34
94
  ## Coming from Trellis?
35
95
 
@@ -44,13 +104,22 @@ mini-trellis migrate # asks first, defaults to no
44
104
 
45
105
  It rewrites the four host surfaces with mini-trellis's versions, deletes the Trellis-only instruction files (skills, commands, agents, per-turn injectors, `workflow.md`, `task.py`), replaces the Trellis block in `AGENTS.md`, and drops `.trellis/.version` so the Trellis CLI stops offering to update the project back to the four-phase workflow.
46
106
 
107
+ It also converges `.trellis/tasks/` into the memory layer, because with `task.py` gone nothing reads that tree any more:
108
+
109
+ - Each task directory becomes one research topic: `.trellis/tasks/<name>/` → `.trellis/research/<name>/`, and archived ones go to `.trellis/research/archive/YYYY-MM/<name>/`. Date prefixes and directory names are kept, preserving relative links within the retained task content. Links to departing files such as `../prd.md` are not repaired.
110
+ - Each topic keeps its `research/` subtree and `design.md` exactly where they are. Everything else at the task root — `task.json`, `prd.md`, `implement*`, `check.jsonl`, `drafts/`, and any file migrate does not recognise — leaves the topic. You choose once, up front: archive it to `.trellis/research/<topic>/legacy/`, or delete it. Archive is the default, `--yes` included.
111
+ - Repo-relative `.trellis/tasks/…` mentions inside the notes that stay are repointed by their full source paths. Stale pre-archive paths are repaired only when the task name is unique. Ambiguous or unsupported references are left unchanged and counted; references to other repositories are not rewritten.
112
+ - The `current_task` pointer in `.trellis/.runtime/sessions/*.json` is cleared, and `.trellis/tasks/` is removed once it is empty.
113
+
114
+ If a topic destination already exists under `.trellis/research/`, or a task root already contains `legacy`, migrate stops before touching anything and lists the collisions. Move or rename those entries before retrying. Migration directories must be real directories, not symlinks. Unprocessed entries, including dangling symlinks, keep `tasks/` from being removed and are reported. Note symlinks are never followed for rewriting.
115
+
47
116
  **There is no backup.** Deleting is permanent, so commit or copy anything you might want back first.
48
117
 
49
118
  ### What you get afterwards
50
119
 
51
- - `.trellis/spec/`, `research/`, `workspace/`, and `tasks/` are left alone. Your spec content survives, including any `backend/`/`frontend/` docs Trellis wrote — those still show up in the SessionStart spec list.
120
+ - `.trellis/spec/`, `research/`, and `workspace/` are left alone. Your spec content survives, including any `backend/`/`frontend/` docs Trellis wrote — those still show up in the SessionStart spec list.
52
121
  - `.trellis/config.yaml` and `.trellis/scripts/` get overwritten with mini-trellis's versions. Re-apply any local edits.
53
- - Old task directories stay on disk, but with `task.py` gone nothing reads them. Delete them by hand when you're ready.
122
+ - Migrated task directories are topics under `.trellis/research/` now; hot topics are listed by SessionStart. `.trellis/tasks/` is removed only if no unprocessed entries remain.
54
123
  - `.trellis/.version` is removed and mini-trellis never writes one, so the Trellis CLI stays quiet in that project.
55
124
 
56
125
  ## Record a session
@@ -61,6 +130,14 @@ It rewrites the four host surfaces with mini-trellis's versions, deletes the Tre
61
130
 
62
131
  Promote a lasting boundary into spec with the `mini-trellis-update-spec` skill.
63
132
 
133
+ ## Feedback
134
+
135
+ This was cut in a hurry. Please try it, complain freely in [issues](https://github.com/Tiger-zzZ/mini-trellis/issues), and send pull requests; see [CONTRIBUTING](./CONTRIBUTING.md) for the local setup. Thanks to the Trellis team, and to everyone on the forum who pushed for a smaller Trellis.
136
+
64
137
  ## License
65
138
 
66
139
  AGPL-3.0. Original copyright Mindfold LLC; this fork's modification notice is in `COPYRIGHT`.
140
+
141
+ ## Community Support
142
+
143
+ [Linuxdo](https://linux.do/)
package/dist/cli/index.js CHANGED
@@ -39,9 +39,9 @@ program
39
39
  });
40
40
  program
41
41
  .command("migrate")
42
- .description("Switch a project set up by Trellis over to mini-trellis (deletes Trellis skills, commands, and agents)")
43
- .option("-y, --yes", "Skip confirmation prompt")
44
- .option("--dry-run", "List what would be removed without changing anything")
42
+ .description("Switch a project set up by Trellis over to mini-trellis (removes the Trellis instruction surface and converges .trellis/tasks/ into research topics)")
43
+ .option("-y, --yes", "Skip both prompts; task files are archived to <topic>/legacy/")
44
+ .option("--dry-run", "List what would change, including the task convergence, without changing anything")
45
45
  .action(async (options) => {
46
46
  try {
47
47
  await migrate({
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,64 @@
1
+ /**
2
+ * Task-directory convergence, the second half of `mini-trellis migrate`.
3
+ *
4
+ * Trellis kept every task under `.trellis/tasks/`, and with `task.py` gone
5
+ * nothing reads that tree any more. This module folds it into the memory layer:
6
+ * each task directory becomes one research topic under `.trellis/research/`,
7
+ * keeping its date prefix and — the point of moving directories rather than
8
+ * files — its own `research/` subtree and `design.md` in place, so the relative
9
+ * links the notes carry keep resolving.
10
+ *
11
+ * The Trellis workflow files at the task root (`task.json`, `prd.md`,
12
+ * `implement*`, `check.jsonl`, `drafts/`, and anything else unrecognised) leave
13
+ * the topic: into `<topic>/legacy/`, or gone.
14
+ */
15
+ /** Where converged task directories land. */
16
+ export declare const RESEARCH_REL: string;
17
+ /** How the task-root leftovers leave the topic. */
18
+ export type TasksDisposition = "archive" | "delete";
19
+ export interface TaskEviction {
20
+ name: string;
21
+ /** Directories render with a trailing slash. */
22
+ dir: boolean;
23
+ bytes: number;
24
+ }
25
+ export interface ConvergeTask {
26
+ /** Directory name, kept verbatim so the date prefix survives. */
27
+ name: string;
28
+ /** `""` for an active task, `archive/YYYY-MM` for an archived one. */
29
+ group: string;
30
+ /** Topic directory this task becomes, relative to the project root. */
31
+ dest: string;
32
+ /** Task-root entries that leave the topic. */
33
+ evictions: TaskEviction[];
34
+ }
35
+ export interface TasksConvergePlan {
36
+ tasks: ConvergeTask[];
37
+ /** Existing topic destinations or task-root legacy entries that block a move. */
38
+ conflicts: string[];
39
+ /** Bytes leaving the topic directories: what the archive/delete choice weighs. */
40
+ evictionBytes: number;
41
+ /** Repo-relative `.trellis/tasks/` mentions inside the notes that stay put. */
42
+ mentions: {
43
+ repoint: number;
44
+ keep: number;
45
+ };
46
+ }
47
+ export interface ConvergeReport {
48
+ moved: number;
49
+ archived: number;
50
+ deleted: number;
51
+ bytes: number;
52
+ mentions: {
53
+ repoint: number;
54
+ keep: number;
55
+ };
56
+ /** Session runtime files whose `current_task` pointer was dropped. */
57
+ pointers: number;
58
+ /** Files still under `.trellis/tasks/`, which is then kept and reported. */
59
+ residue: string[];
60
+ }
61
+ export declare function buildTasksConvergePlan(cwd: string): TasksConvergePlan;
62
+ export declare function renderTasksConvergePlan(plan: TasksConvergePlan): void;
63
+ export declare function convergeTasks(cwd: string, plan: TasksConvergePlan, disposition: TasksDisposition): ConvergeReport;
64
+ //# sourceMappingURL=migrate-tasks.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"migrate-tasks.d.ts","sourceRoot":"","sources":["../../src/commands/migrate-tasks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAYH,6CAA6C;AAC7C,eAAO,MAAM,YAAY,QAA0C,CAAC;AAcpE,mDAAmD;AACnD,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,QAAQ,CAAC;AAEpD,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,gDAAgD;IAChD,GAAG,EAAE,OAAO,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,YAAY;IAC3B,iEAAiE;IACjE,IAAI,EAAE,MAAM,CAAC;IACb,sEAAsE;IACtE,KAAK,EAAE,MAAM,CAAC;IACd,uEAAuE;IACvE,IAAI,EAAE,MAAM,CAAC;IACb,8CAA8C;IAC9C,SAAS,EAAE,YAAY,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,iFAAiF;IACjF,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,kFAAkF;IAClF,aAAa,EAAE,MAAM,CAAC;IACtB,+EAA+E;IAC/E,QAAQ,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAC7C;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,sEAAsE;IACtE,QAAQ,EAAE,MAAM,CAAC;IACjB,4EAA4E;IAC5E,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAoKD,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAsDrE;AAoCD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,iBAAiB,GAAG,IAAI,CAkDrE;AAED,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,iBAAiB,EACvB,WAAW,EAAE,gBAAgB,GAC5B,cAAc,CA2DhB"}
@@ -0,0 +1,349 @@
1
+ /**
2
+ * Task-directory convergence, the second half of `mini-trellis migrate`.
3
+ *
4
+ * Trellis kept every task under `.trellis/tasks/`, and with `task.py` gone
5
+ * nothing reads that tree any more. This module folds it into the memory layer:
6
+ * each task directory becomes one research topic under `.trellis/research/`,
7
+ * keeping its date prefix and — the point of moving directories rather than
8
+ * files — its own `research/` subtree and `design.md` in place, so the relative
9
+ * links the notes carry keep resolving.
10
+ *
11
+ * The Trellis workflow files at the task root (`task.json`, `prd.md`,
12
+ * `implement*`, `check.jsonl`, `drafts/`, and anything else unrecognised) leave
13
+ * the topic: into `<topic>/legacy/`, or gone.
14
+ */
15
+ import fs from "node:fs";
16
+ import path from "node:path";
17
+ import chalk from "chalk";
18
+ import { DIR_NAMES, PATHS } from "../constants/paths.js";
19
+ import { ensureDir } from "../utils/file-writer.js";
20
+ /** The memory-layer inbox converged task directories land in. */
21
+ const RESEARCH_DIR = "research";
22
+ /** Where converged task directories land. */
23
+ export const RESEARCH_REL = `${DIR_NAMES.WORKFLOW}/${RESEARCH_DIR}`;
24
+ /** Task-root directories a converged topic keeps, by name. */
25
+ const KEPT_DIRS = new Set([RESEARCH_DIR]);
26
+ /** Task-root files a converged topic keeps, by name. */
27
+ const KEPT_FILES = new Set(["design.md"]);
28
+ /** Where task-root leftovers go when the user archives them. */
29
+ const LEGACY_DIR = "legacy";
30
+ /** Session runtime files whose `current_task` pointer dies with the tasks tree. */
31
+ const SESSIONS_REL = `${DIR_NAMES.WORKFLOW}/.runtime/sessions`;
32
+ function readdirSafe(abs) {
33
+ try {
34
+ return fs.readdirSync(abs, { withFileTypes: true });
35
+ }
36
+ catch (error) {
37
+ if (error.code === "ENOENT")
38
+ return [];
39
+ throw error;
40
+ }
41
+ }
42
+ function treeSize(abs) {
43
+ const stat = fs.lstatSync(abs);
44
+ if (!stat.isDirectory())
45
+ return stat.size;
46
+ let total = 0;
47
+ for (const entry of readdirSafe(abs)) {
48
+ total += treeSize(path.join(abs, entry.name));
49
+ }
50
+ return total;
51
+ }
52
+ function checkMigrationDirectory(abs) {
53
+ const stat = fs.lstatSync(abs, { throwIfNoEntry: false });
54
+ if (stat && !stat.isDirectory()) {
55
+ throw new Error(`Cannot converge through a symlink or non-directory: ${abs}`);
56
+ }
57
+ }
58
+ /** Every file under `abs`, as paths relative to `abs`. */
59
+ function filesUnder(abs) {
60
+ const found = [];
61
+ for (const entry of readdirSafe(abs)) {
62
+ const child = path.join(abs, entry.name);
63
+ if (entry.isDirectory()) {
64
+ found.push(...filesUnder(child).map((p) => `${entry.name}/${p}`));
65
+ }
66
+ else {
67
+ found.push(entry.name);
68
+ }
69
+ }
70
+ return found;
71
+ }
72
+ /** Markdown under `abs`, recursively. */
73
+ function markdownUnder(abs) {
74
+ const found = [];
75
+ for (const entry of readdirSafe(abs)) {
76
+ const child = path.join(abs, entry.name);
77
+ if (entry.isDirectory()) {
78
+ found.push(...markdownUnder(child));
79
+ }
80
+ else if (entry.isFile() && entry.name.toLowerCase().endsWith(".md")) {
81
+ found.push(child);
82
+ }
83
+ }
84
+ return found;
85
+ }
86
+ /** Notes a topic keeps in place: its `research/` subtree plus `design.md`. */
87
+ function keptNotes(topicAbs) {
88
+ const entries = readdirSafe(topicAbs);
89
+ const notes = entries.some((e) => e.name === RESEARCH_DIR && e.isDirectory())
90
+ ? markdownUnder(path.join(topicAbs, RESEARCH_DIR))
91
+ : [];
92
+ if (entries.some((e) => e.name === "design.md" && e.isFile())) {
93
+ notes.push(path.join(topicAbs, "design.md"));
94
+ }
95
+ return notes;
96
+ }
97
+ /**
98
+ * Repo-relative `.trellis/tasks/` mentions. The lookbehind rejects the long tail
99
+ * of cross-repo pointers (`/Users/anno/workspace/.trellis/tasks/…`,
100
+ * `opc_memento_s-x/.trellis/tasks/…`), which must survive byte-identical.
101
+ */
102
+ const TASK_MENTION = /(?<![A-Za-z0-9_\-/.])\.trellis\/tasks\/([^\s`)\]"'>|,;:]*)/g;
103
+ /**
104
+ * Only mentions of content that stays inside the topic can be repointed. The
105
+ * workflow files leave it, so a pointer at one is better left dangling (and
106
+ * reported) than turned into a second wrong path.
107
+ */
108
+ function staysInTopic(rest) {
109
+ return (rest === "" ||
110
+ rest === "design.md" ||
111
+ rest === RESEARCH_DIR ||
112
+ rest.startsWith(`${RESEARCH_DIR}/`));
113
+ }
114
+ /** Split a mention into the task name it names and whatever follows. */
115
+ function parseMention(ref) {
116
+ const parts = ref.split("/");
117
+ if (parts[0] === DIR_NAMES.ARCHIVE && parts.length > 2) {
118
+ return {
119
+ key: parts.slice(0, 3).join("/"),
120
+ name: parts[2],
121
+ rest: parts.slice(3).join("/"),
122
+ };
123
+ }
124
+ if (parts[0])
125
+ return { key: parts[0], name: parts[0], rest: parts.slice(1).join("/") };
126
+ return null;
127
+ }
128
+ function topicLookup(tasks) {
129
+ const exact = new Map();
130
+ const unique = new Map();
131
+ for (const task of tasks) {
132
+ exact.set(task.group ? `${task.group}/${task.name}` : task.name, task.dest);
133
+ unique.set(task.name, unique.has(task.name) ? null : task.dest);
134
+ }
135
+ return { exact, unique };
136
+ }
137
+ function repointMentions(text, topics, counts) {
138
+ return text.replace(TASK_MENTION, (match, rawRef) => {
139
+ const ref = rawRef.replace(/[.,;:]+$/, "");
140
+ const trailing = rawRef.slice(ref.length);
141
+ const parsed = ref ? parseMention(ref) : null;
142
+ // Old notes may still use a pre-archive path. Only repair that stale path
143
+ // when the task name is unique; an exact source path always takes priority.
144
+ const dest = parsed
145
+ ? (topics.exact.get(parsed.key) ?? topics.unique.get(parsed.name))
146
+ : undefined;
147
+ if (!parsed || !dest || !staysInTopic(parsed.rest)) {
148
+ counts.keep += 1;
149
+ return match;
150
+ }
151
+ counts.repoint += 1;
152
+ return `${dest}${parsed.rest ? `/${parsed.rest}` : ""}${trailing}`;
153
+ });
154
+ }
155
+ /** `.trellis/research/<name>`, or `.trellis/research/archive/YYYY-MM/<name>`. */
156
+ function topicRel(group, name) {
157
+ return group ? `${RESEARCH_REL}/${group}/${name}` : `${RESEARCH_REL}/${name}`;
158
+ }
159
+ function describeTask(group, name, abs) {
160
+ const evictions = [];
161
+ for (const entry of readdirSafe(abs)) {
162
+ const dir = entry.isDirectory();
163
+ if (dir ? KEPT_DIRS.has(entry.name) : KEPT_FILES.has(entry.name))
164
+ continue;
165
+ evictions.push({
166
+ name: entry.name,
167
+ dir,
168
+ bytes: treeSize(path.join(abs, entry.name)),
169
+ });
170
+ }
171
+ return { name, group, dest: topicRel(group, name), evictions };
172
+ }
173
+ export function buildTasksConvergePlan(cwd) {
174
+ const tasksRoot = path.join(cwd, PATHS.TASKS);
175
+ const archiveRoot = path.join(tasksRoot, DIR_NAMES.ARCHIVE);
176
+ checkMigrationDirectory(tasksRoot);
177
+ checkMigrationDirectory(archiveRoot);
178
+ checkMigrationDirectory(path.join(cwd, RESEARCH_REL));
179
+ const tasks = [];
180
+ const collect = (group, dir) => {
181
+ for (const entry of readdirSafe(dir)) {
182
+ if (entry.name.startsWith(".") || entry.name === DIR_NAMES.ARCHIVE)
183
+ continue;
184
+ if (!entry.isDirectory())
185
+ continue;
186
+ tasks.push(describeTask(group, entry.name, path.join(dir, entry.name)));
187
+ }
188
+ };
189
+ collect("", tasksRoot);
190
+ for (const month of readdirSafe(archiveRoot)) {
191
+ if (month.name.startsWith(".") || !month.isDirectory())
192
+ continue;
193
+ collect(`${DIR_NAMES.ARCHIVE}/${month.name}`, path.join(archiveRoot, month.name));
194
+ }
195
+ tasks.sort((a, b) => topicRel(a.group, a.name).localeCompare(topicRel(b.group, b.name)));
196
+ const topics = topicLookup(tasks);
197
+ const mentions = { repoint: 0, keep: 0 };
198
+ const conflicts = [];
199
+ let evictionBytes = 0;
200
+ for (const task of tasks) {
201
+ if (task.group) {
202
+ checkMigrationDirectory(path.join(cwd, RESEARCH_REL, DIR_NAMES.ARCHIVE));
203
+ checkMigrationDirectory(path.join(cwd, RESEARCH_REL, task.group));
204
+ }
205
+ evictionBytes += task.evictions.reduce((sum, e) => sum + e.bytes, 0);
206
+ if (fs.lstatSync(path.join(cwd, task.dest), { throwIfNoEntry: false })) {
207
+ conflicts.push(task.dest);
208
+ }
209
+ if (task.evictions.some((entry) => entry.name === LEGACY_DIR)) {
210
+ conflicts.push(path.posix.join(PATHS.TASKS, task.group, task.name, LEGACY_DIR));
211
+ }
212
+ for (const note of keptNotes(path.join(tasksRoot, task.group, task.name))) {
213
+ repointMentions(fs.readFileSync(note, "utf-8"), topics, mentions);
214
+ }
215
+ }
216
+ return { tasks, conflicts, evictionBytes, mentions };
217
+ }
218
+ function formatBytes(n) {
219
+ if (n < 1024)
220
+ return `${n} B`;
221
+ const units = ["KB", "MB", "GB"];
222
+ let value = n / 1024;
223
+ let unit = 0;
224
+ while (value >= 1024 && unit < units.length - 1) {
225
+ value /= 1024;
226
+ unit += 1;
227
+ }
228
+ return `${value < 10 ? value.toFixed(1) : Math.round(value)} ${units[unit]}`;
229
+ }
230
+ /** One line per distinct leftover name: most common first, then by weight. */
231
+ function summarizeEvictions(tasks) {
232
+ const tally = new Map();
233
+ for (const task of tasks) {
234
+ for (const e of task.evictions) {
235
+ const label = e.dir ? `${e.name}/` : e.name;
236
+ const seen = tally.get(label) ?? { count: 0, bytes: 0 };
237
+ tally.set(label, { count: seen.count + 1, bytes: seen.bytes + e.bytes });
238
+ }
239
+ }
240
+ return [...tally]
241
+ .map(([label, seen]) => ({ label, ...seen }))
242
+ .sort((a, b) => b.count - a.count ||
243
+ b.bytes - a.bytes ||
244
+ a.label.localeCompare(b.label));
245
+ }
246
+ export function renderTasksConvergePlan(plan) {
247
+ if (plan.tasks.length === 0)
248
+ return;
249
+ const active = plan.tasks.filter((t) => !t.group).length;
250
+ const archived = plan.tasks.length - active;
251
+ const leftovers = summarizeEvictions(plan.tasks);
252
+ const leftoverCount = leftovers.reduce((sum, e) => sum + e.count, 0);
253
+ const shown = leftovers.slice(0, 8);
254
+ console.log();
255
+ console.log(chalk.green.bold(`Will be converged into ${RESEARCH_REL}/ ` +
256
+ `(${plan.tasks.length} task(s): ${active} active, ${archived} archived):`));
257
+ console.log(` ${chalk.green("→")} ${PATHS.TASKS}/<name>/ ` +
258
+ chalk.gray(`becomes ${RESEARCH_REL}/<name>/`));
259
+ console.log(` ${chalk.green("→")} ${PATHS.TASKS}/${DIR_NAMES.ARCHIVE}/YYYY-MM/<name>/ ` +
260
+ chalk.gray(`becomes ${RESEARCH_REL}/${DIR_NAMES.ARCHIVE}/YYYY-MM/<name>/`));
261
+ console.log(` ${chalk.green("=")} research/ and design.md ` +
262
+ chalk.gray("(every topic keeps them; relative links between notes survive)"));
263
+ console.log(` ${chalk.yellow("-")} ${leftoverCount} item(s), ${formatBytes(plan.evictionBytes)} ` +
264
+ chalk.gray("leave the topics:"));
265
+ console.log(` ${shown.map((e) => `${e.label} ×${e.count}`).join(", ")}` +
266
+ (leftovers.length > shown.length
267
+ ? chalk.gray(`, +${leftovers.length - shown.length} more`)
268
+ : ""));
269
+ console.log(chalk.gray(` Repointing ${plan.mentions.repoint} \`.trellis/tasks/\` mention(s) in the notes ` +
270
+ `that stay; ${plan.mentions.keep} left alone (they point at files that leave ` +
271
+ "the topic, cannot be resolved uniquely, or are otherwise unsupported)."));
272
+ }
273
+ export function convergeTasks(cwd, plan, disposition) {
274
+ ensureDir(path.join(cwd, RESEARCH_REL));
275
+ let archived = 0;
276
+ let deleted = 0;
277
+ let bytes = 0;
278
+ for (const task of plan.tasks) {
279
+ const from = path.join(cwd, PATHS.TASKS, task.group, task.name);
280
+ const to = path.join(cwd, RESEARCH_REL, task.group, task.name);
281
+ ensureDir(path.dirname(to));
282
+ fs.renameSync(from, to);
283
+ if (task.evictions.length === 0)
284
+ continue;
285
+ bytes += task.evictions.reduce((sum, e) => sum + e.bytes, 0);
286
+ if (disposition === "delete") {
287
+ for (const e of task.evictions) {
288
+ fs.rmSync(path.join(to, e.name), { recursive: true, force: true });
289
+ deleted += 1;
290
+ }
291
+ continue;
292
+ }
293
+ const legacy = path.join(to, LEGACY_DIR);
294
+ ensureDir(legacy);
295
+ for (const e of task.evictions) {
296
+ fs.renameSync(path.join(to, e.name), path.join(legacy, e.name));
297
+ archived += 1;
298
+ }
299
+ }
300
+ const topics = topicLookup(plan.tasks);
301
+ const mentions = { repoint: 0, keep: 0 };
302
+ for (const task of plan.tasks) {
303
+ for (const note of keptNotes(path.join(cwd, RESEARCH_REL, task.group, task.name))) {
304
+ const before = fs.readFileSync(note, "utf-8");
305
+ const after = repointMentions(before, topics, mentions);
306
+ if (after !== before)
307
+ fs.writeFileSync(note, after);
308
+ }
309
+ }
310
+ const pointers = clearSessionTaskPointers(cwd);
311
+ const tasksRoot = path.join(cwd, PATHS.TASKS);
312
+ const residue = filesUnder(tasksRoot);
313
+ if (residue.length === 0) {
314
+ fs.rmSync(tasksRoot, { recursive: true, force: true });
315
+ }
316
+ return {
317
+ moved: plan.tasks.length,
318
+ archived,
319
+ deleted,
320
+ bytes,
321
+ mentions,
322
+ pointers,
323
+ residue,
324
+ };
325
+ }
326
+ /** The tasks tree is gone, so the active-task pointer can only go stale. */
327
+ function clearSessionTaskPointers(cwd) {
328
+ const sessions = path.join(cwd, SESSIONS_REL);
329
+ let cleared = 0;
330
+ for (const entry of readdirSafe(sessions)) {
331
+ if (!entry.isFile() || !entry.name.endsWith(".json"))
332
+ continue;
333
+ const file = path.join(sessions, entry.name);
334
+ let data;
335
+ try {
336
+ data = JSON.parse(fs.readFileSync(file, "utf-8"));
337
+ }
338
+ catch {
339
+ continue; // Not a session file we can read; not ours to repair.
340
+ }
341
+ if (!data.current_task)
342
+ continue;
343
+ data.current_task = null;
344
+ fs.writeFileSync(file, `${JSON.stringify(data, null, 2)}\n`);
345
+ cleared += 1;
346
+ }
347
+ return cleared;
348
+ }
349
+ //# sourceMappingURL=migrate-tasks.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"migrate-tasks.js","sourceRoot":"","sources":["../../src/commands/migrate-tasks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,iEAAiE;AACjE,MAAM,YAAY,GAAG,UAAU,CAAC;AAEhC,6CAA6C;AAC7C,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,SAAS,CAAC,QAAQ,IAAI,YAAY,EAAE,CAAC;AAEpE,8DAA8D;AAC9D,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;AAE1C,wDAAwD;AACxD,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;AAE1C,gEAAgE;AAChE,MAAM,UAAU,GAAG,QAAQ,CAAC;AAE5B,mFAAmF;AACnF,MAAM,YAAY,GAAG,GAAG,SAAS,CAAC,QAAQ,oBAAoB,CAAC;AA6C/D,SAAS,WAAW,CAAC,GAAW;IAC9B,IAAI,CAAC;QACH,OAAO,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,EAAE,CAAC;QAClE,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW;IAC3B,MAAM,IAAI,GAAG,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC/B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;QAAE,OAAO,IAAI,CAAC,IAAI,CAAC;IAC1C,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;QACrC,KAAK,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,uBAAuB,CAAC,GAAW;IAC1C,MAAM,IAAI,GAAG,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1D,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CACb,uDAAuD,GAAG,EAAE,CAC7D,CAAC;IACJ,CAAC;AACH,CAAC;AAED,0DAA0D;AAC1D,SAAS,UAAU,CAAC,GAAW;IAC7B,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;QACrC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,KAAK,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACpE,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,yCAAyC;AACzC,SAAS,aAAa,CAAC,GAAW;IAChC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;QACrC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;QACtC,CAAC;aAAM,IAAI,KAAK,CAAC,MAAM,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACtE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,8EAA8E;AAC9E,SAAS,SAAS,CAAC,QAAgB;IACjC,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;IACtC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;QAC3E,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAClD,CAAC,CAAC,EAAE,CAAC;IACP,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QAC9D,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,MAAM,YAAY,GAChB,6DAA6D,CAAC;AAEhE;;;;GAIG;AACH,SAAS,YAAY,CAAC,IAAY;IAChC,OAAO,CACL,IAAI,KAAK,EAAE;QACX,IAAI,KAAK,WAAW;QACpB,IAAI,KAAK,YAAY;QACrB,IAAI,CAAC,UAAU,CAAC,GAAG,YAAY,GAAG,CAAC,CACpC,CAAC;AACJ,CAAC;AAED,wEAAwE;AACxE,SAAS,YAAY,CACnB,GAAW;IAEX,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,OAAO,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvD,OAAO;YACL,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;YAChC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;YACd,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;SAC/B,CAAC;IACJ,CAAC;IACD,IAAI,KAAK,CAAC,CAAC,CAAC;QACV,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAC3E,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,WAAW,CAAC,KAAqB;IAIxC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;IACxC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAyB,CAAC;IAChD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5E,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClE,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;AAC3B,CAAC;AAED,SAAS,eAAe,CACtB,IAAY,EACZ,MAAsC,EACtC,MAAyC;IAEzC,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,KAAK,EAAE,MAAc,EAAE,EAAE;QAC1D,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC9C,0EAA0E;QAC1E,4EAA4E;QAC5E,MAAM,IAAI,GAAG,MAAM;YACjB,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAClE,CAAC,CAAC,SAAS,CAAC;QACd,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YACnD,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC;YACjB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;QACpB,OAAO,GAAG,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,EAAE,CAAC;IACrE,CAAC,CAAC,CAAC;AACL,CAAC;AAED,iFAAiF;AACjF,SAAS,QAAQ,CAAC,KAAa,EAAE,IAAY;IAC3C,OAAO,KAAK,CAAC,CAAC,CAAC,GAAG,YAAY,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,YAAY,IAAI,IAAI,EAAE,CAAC;AAChF,CAAC;AAED,SAAS,YAAY,CAAC,KAAa,EAAE,IAAY,EAAE,GAAW;IAC5D,MAAM,SAAS,GAAmB,EAAE,CAAC;IACrC,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;QACrC,MAAM,GAAG,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QAChC,IAAI,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;YAAE,SAAS;QAC3E,SAAS,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,GAAG;YACH,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;SAC5C,CAAC,CAAC;IACL,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,GAAW;IAChD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAC5D,uBAAuB,CAAC,SAAS,CAAC,CAAC;IACnC,uBAAuB,CAAC,WAAW,CAAC,CAAC;IACrC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC;IACtD,MAAM,KAAK,GAAmB,EAAE,CAAC;IAEjC,MAAM,OAAO,GAAG,CAAC,KAAa,EAAE,GAAW,EAAQ,EAAE;QACnD,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;YACrC,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,OAAO;gBAChE,SAAS;YACX,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;gBAAE,SAAS;YACnC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IACvB,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC;QAC7C,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;YAAE,SAAS;QACjE,OAAO,CACL,GAAG,SAAS,CAAC,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE,EACpC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CACnC,CAAC;IACJ,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAClB,QAAQ,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CACnE,CAAC;IAEF,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAClC,MAAM,QAAQ,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IACzC,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,IAAI,aAAa,GAAG,CAAC,CAAC;IAEtB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;YACzE,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QACpE,CAAC;QACD,aAAa,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACrE,IAAI,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;YACvE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;QACD,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,EAAE,CAAC;YAC9D,SAAS,CAAC,IAAI,CACZ,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAChE,CAAC;QACJ,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YAC1E,eAAe,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC;AACvD,CAAC;AAED,SAAS,WAAW,CAAC,CAAS;IAC5B,IAAI,CAAC,GAAG,IAAI;QAAE,OAAO,GAAG,CAAC,IAAI,CAAC;IAC9B,MAAM,KAAK,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACjC,IAAI,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC;IACrB,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,OAAO,KAAK,IAAI,IAAI,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChD,KAAK,IAAI,IAAI,CAAC;QACd,IAAI,IAAI,CAAC,CAAC;IACZ,CAAC;IACD,OAAO,GAAG,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;AAC/E,CAAC;AAED,8EAA8E;AAC9E,SAAS,kBAAkB,CACzB,KAAqB;IAErB,MAAM,KAAK,GAAG,IAAI,GAAG,EAA4C,CAAC;IAClE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAC5C,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;YACxD,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IACD,OAAO,CAAC,GAAG,KAAK,CAAC;SACd,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;SAC5C,IAAI,CACH,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACP,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK;QACjB,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK;QACjB,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CACjC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,IAAuB;IAC7D,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAEpC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;IACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;IAC5C,MAAM,SAAS,GAAG,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjD,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACrE,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAEpC,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,KAAK,CAAC,IAAI,CACd,0BAA0B,YAAY,IAAI;QACxC,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,aAAa,MAAM,YAAY,QAAQ,aAAa,CAC5E,CACF,CAAC;IACF,OAAO,CAAC,GAAG,CACT,KAAK,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,KAAK,YAAY;QAC9C,KAAK,CAAC,IAAI,CAAC,WAAW,YAAY,UAAU,CAAC,CAChD,CAAC;IACF,OAAO,CAAC,GAAG,CACT,KAAK,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,KAAK,IAAI,SAAS,CAAC,OAAO,oBAAoB;QAC3E,KAAK,CAAC,IAAI,CACR,WAAW,YAAY,IAAI,SAAS,CAAC,OAAO,kBAAkB,CAC/D,CACJ,CAAC;IACF,OAAO,CAAC,GAAG,CACT,KAAK,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,4BAA4B;QAC/C,KAAK,CAAC,IAAI,CACR,gEAAgE,CACjE,CACJ,CAAC;IACF,OAAO,CAAC,GAAG,CACT,KAAK,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,aAAa,aAAa,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG;QACpF,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAClC,CAAC;IACF,OAAO,CAAC,GAAG,CACT,SAAS,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC9D,CAAC,SAAS,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM;YAC9B,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,SAAS,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,OAAO,CAAC;YAC1D,CAAC,CAAC,EAAE,CAAC,CACV,CAAC;IAEF,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,IAAI,CACR,gBAAgB,IAAI,CAAC,QAAQ,CAAC,OAAO,+CAA+C;QAClF,cAAc,IAAI,CAAC,QAAQ,CAAC,IAAI,8CAA8C;QAC9E,wEAAwE,CAC3E,CACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,GAAW,EACX,IAAuB,EACvB,WAA6B;IAE7B,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC;IAExC,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAChE,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/D,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5B,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAExB,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAC1C,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC7D,IAAI,WAAW,KAAK,QAAQ,EAAE,CAAC;YAC7B,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC/B,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBACnE,OAAO,IAAI,CAAC,CAAC;YACf,CAAC;YACD,SAAS;QACX,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;QACzC,SAAS,CAAC,MAAM,CAAC,CAAC;QAClB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAC/B,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YAChE,QAAQ,IAAI,CAAC,CAAC;QAChB,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,QAAQ,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IACzC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QAC9B,KAAK,MAAM,IAAI,IAAI,SAAS,CAC1B,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CACpD,EAAE,CAAC;YACF,MAAM,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC9C,MAAM,KAAK,GAAG,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YACxD,IAAI,KAAK,KAAK,MAAM;gBAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;IAE/C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;IACtC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM;QACxB,QAAQ;QACR,OAAO;QACP,KAAK;QACL,QAAQ;QACR,QAAQ;QACR,OAAO;KACR,CAAC;AACJ,CAAC;AAED,4EAA4E;AAC5E,SAAS,wBAAwB,CAAC,GAAW;IAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC9C,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1C,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;YAAE,SAAS;QAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,IAA6B,CAAC;QAClC,IAAI,CAAC;YACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAG/C,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,SAAS,CAAC,sDAAsD;QAClE,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,YAAY;YAAE,SAAS;QACjC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC,CAAC;IACf,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
@@ -9,10 +9,12 @@
9
9
  * mini-trellis's versions, deletes the Trellis-only instruction files,
10
10
  * replaces the Trellis block in AGENTS.md, and drops `.trellis/.version` so
11
11
  * the Trellis CLI stops offering to "update" the project back to the
12
- * four-phase workflow.
12
+ * four-phase workflow. It then converges `.trellis/tasks/` into the memory
13
+ * layer — see migrate-tasks.ts — because with `task.py` gone nothing reads
14
+ * that tree any more.
13
15
  *
14
- * Memory data is never touched: `.trellis/spec/`, `research/`, `workspace/`,
15
- * and `tasks/` survive as-is. `.trellis/scripts/` IS overwritten, because the
16
+ * Memory data is never touched: `.trellis/spec/`, `research/`, and
17
+ * `workspace/` survive as-is. `.trellis/scripts/` IS overwritten, because the
16
18
  * SessionStart hook and `add_session.py` are read from there.
17
19
  */
18
20
  import { type AITool } from "../types/ai-tools.js";
@@ -31,8 +33,6 @@ export interface MigratePlan {
31
33
  dropsVersion: boolean;
32
34
  /** AGENTS.md carries a Trellis-managed block that will be replaced. */
33
35
  rewritesAgents: boolean;
34
- /** `.trellis/tasks/` holds content the user should review. */
35
- tasksHasContent: boolean;
36
36
  }
37
37
  export declare function collectTrellisResidue(cwd: string): string[];
38
38
  export declare function buildMigratePlan(cwd: string): MigratePlan;
@@ -1 +1 @@
1
- {"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../src/commands/migrate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AA4BH,OAAO,EAAY,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE7D,MAAM,WAAW,cAAc;IAC7B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,kEAAkE;IAClE,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,wDAAwD;IACxD,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,qEAAqE;IACrE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,sDAAsD;IACtD,YAAY,EAAE,OAAO,CAAC;IACtB,uEAAuE;IACvE,cAAc,EAAE,OAAO,CAAC;IACxB,8DAA8D;IAC9D,eAAe,EAAE,OAAO,CAAC;CAC1B;AA6CD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAqB3D;AAwBD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAUzD;AA2ID,wBAAsB,OAAO,CAAC,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CA4EzE"}
1
+ {"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../src/commands/migrate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AA4BH,OAAO,EAAY,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAU7D,MAAM,WAAW,cAAc;IAC7B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,kEAAkE;IAClE,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,wDAAwD;IACxD,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,qEAAqE;IACrE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,sDAAsD;IACtD,YAAY,EAAE,OAAO,CAAC;IACtB,uEAAuE;IACvE,cAAc,EAAE,OAAO,CAAC;CACzB;AA4CD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAqB3D;AAgBD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CASzD;AA6KD,wBAAsB,OAAO,CAAC,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuIzE"}
@@ -9,10 +9,12 @@
9
9
  * mini-trellis's versions, deletes the Trellis-only instruction files,
10
10
  * replaces the Trellis block in AGENTS.md, and drops `.trellis/.version` so
11
11
  * the Trellis CLI stops offering to "update" the project back to the
12
- * four-phase workflow.
12
+ * four-phase workflow. It then converges `.trellis/tasks/` into the memory
13
+ * layer — see migrate-tasks.ts — because with `task.py` gone nothing reads
14
+ * that tree any more.
13
15
  *
14
- * Memory data is never touched: `.trellis/spec/`, `research/`, `workspace/`,
15
- * and `tasks/` survive as-is. `.trellis/scripts/` IS overwritten, because the
16
+ * Memory data is never touched: `.trellis/spec/`, `research/`, and
17
+ * `workspace/` survive as-is. `.trellis/scripts/` IS overwritten, because the
16
18
  * SessionStart hook and `add_session.py` are read from there.
17
19
  */
18
20
  import fs from "node:fs";
@@ -29,6 +31,7 @@ import { configurePlatform } from "../configurators/index.js";
29
31
  import { scrubManagedMarkdownBlock } from "../utils/uninstall-scrubbers.js";
30
32
  import { TRELLIS_BLOCK_END, TRELLIS_BLOCK_START, } from "../utils/managed-paths.js";
31
33
  import { AI_TOOLS } from "../types/ai-tools.js";
34
+ import { RESEARCH_REL, buildTasksConvergePlan, convergeTasks, renderTasksConvergePlan, } from "./migrate-tasks.js";
32
35
  /**
33
36
  * Trellis entry names that mini-trellis does not ship. Each rule is scoped to
34
37
  * one directory so a stray user file elsewhere can never match. Note that
@@ -63,9 +66,8 @@ const REWRITES = [`${DIR_NAMES.WORKFLOW}/config.yaml`, `${PATHS.SCRIPTS}/`];
63
66
  /** Residue that survives the migration on purpose; printed after the run. */
64
67
  const PRESERVED = [
65
68
  `${PATHS.SPEC}/`,
66
- `${DIR_NAMES.WORKFLOW}/research/`,
69
+ `${RESEARCH_REL}/`,
67
70
  `${PATHS.WORKSPACE}/`,
68
- `${PATHS.TASKS}/`,
69
71
  `${PATHS.SCRIPTS}/common/`,
70
72
  ];
71
73
  export function collectTrellisResidue(cwd) {
@@ -105,14 +107,6 @@ function platformsToReconfigure(cwd, deletions) {
105
107
  }
106
108
  return [...ids].sort();
107
109
  }
108
- function dirHasContent(abs) {
109
- try {
110
- return fs.readdirSync(abs).length > 0;
111
- }
112
- catch {
113
- return false;
114
- }
115
- }
116
110
  export function buildMigratePlan(cwd) {
117
111
  const deletions = collectTrellisResidue(cwd);
118
112
  return {
@@ -121,7 +115,6 @@ export function buildMigratePlan(cwd) {
121
115
  rewrites: REWRITES,
122
116
  dropsVersion: fs.existsSync(path.join(cwd, DIR_NAMES.WORKFLOW, ".version")),
123
117
  rewritesAgents: agentsHasManagedBlock(cwd),
124
- tasksHasContent: dirHasContent(path.join(cwd, PATHS.TASKS)),
125
118
  };
126
119
  }
127
120
  function agentsHasManagedBlock(cwd) {
@@ -146,16 +139,18 @@ function rewriteAgentsMd(cwd) {
146
139
  const rest = scrubbed.fullyEmpty ? "" : `\n${scrubbed.content.trimStart()}`;
147
140
  fs.writeFileSync(abs, `${block}\n${rest}`);
148
141
  }
149
- function renderPlan(cwd, plan) {
142
+ function renderPlan(cwd, plan, converge) {
150
143
  console.log(chalk.bold("\nmini-trellis migrate plan\n"));
151
- console.log(chalk.red.bold(`Will be deleted (${plan.deletions.length}):`));
152
- for (const p of plan.deletions) {
153
- console.log(` ${chalk.red("-")} ${p}`);
154
- }
155
- if (plan.dropsVersion) {
156
- console.log(` ${chalk.red("-")} ${DIR_NAMES.WORKFLOW}/.version ${chalk.gray("(stops the Trellis CLI offering to update this project back)")}`);
144
+ if (plan.deletions.length > 0 || plan.dropsVersion) {
145
+ console.log(chalk.red.bold(`Will be deleted (${plan.deletions.length + (plan.dropsVersion ? 1 : 0)}):`));
146
+ for (const p of plan.deletions) {
147
+ console.log(` ${chalk.red("-")} ${p}`);
148
+ }
149
+ if (plan.dropsVersion) {
150
+ console.log(` ${chalk.red("-")} ${DIR_NAMES.WORKFLOW}/.version ${chalk.gray("(stops the Trellis CLI offering to update this project back)")}`);
151
+ }
152
+ console.log();
157
153
  }
158
- console.log();
159
154
  console.log(chalk.yellow.bold("Will be overwritten:"));
160
155
  for (const p of plan.rewrites) {
161
156
  console.log(` ${chalk.yellow("~")} ${p} ${chalk.gray("(re-apply any local edits after migrating)")}`);
@@ -173,23 +168,46 @@ function renderPlan(cwd, plan) {
173
168
  console.log(` ${chalk.green("=")} ${p}`);
174
169
  }
175
170
  }
176
- if (plan.tasksHasContent) {
177
- console.log();
178
- console.log(chalk.yellow(`Note: ${PATHS.TASKS}/ still holds Trellis task directories. ` +
179
- "They are not touched, but with task.py gone nothing reads them " +
180
- "any more. Review and remove them by hand if you no longer need them."));
181
- }
171
+ renderTasksConvergePlan(converge);
182
172
  }
183
- async function promptContinue() {
184
- const { proceed } = await inquirer.prompt([
173
+ /** The tasks tree is the only thing left to act on in a re-run project. */
174
+ function promptContinue(converge) {
175
+ const message = converge.tasks.length > 0
176
+ ? "Delete this Trellis instruction surface and converge its tasks?"
177
+ : "Delete this Trellis instruction surface?";
178
+ return inquirer
179
+ .prompt([
185
180
  {
186
181
  type: "confirm",
187
182
  name: "proceed",
188
- message: "Delete this Trellis instruction surface?",
183
+ message,
189
184
  default: false,
190
185
  },
186
+ ])
187
+ .then((answer) => answer.proceed);
188
+ }
189
+ /**
190
+ * Asked once per run, and only when there is something to decide. Deleting is
191
+ * irreversible — the tasks tree is not necessarily under version control — so
192
+ * archive is the default everywhere, `--yes` included.
193
+ */
194
+ async function promptTasksDisposition() {
195
+ const { disposition } = await inquirer.prompt([
196
+ {
197
+ type: "list",
198
+ name: "disposition",
199
+ message: "What should happen to the Trellis workflow files leaving each topic?",
200
+ default: "archive",
201
+ choices: [
202
+ {
203
+ name: `Archive to ${RESEARCH_REL}/<topic>/legacy/ (reversible)`,
204
+ value: "archive",
205
+ },
206
+ { name: "Delete permanently (not reversible)", value: "delete" },
207
+ ],
208
+ },
191
209
  ]);
192
- return proceed;
210
+ return disposition;
193
211
  }
194
212
  /** Write the files a fresh mini-trellis project would have. */
195
213
  async function installMemoryLayer(cwd) {
@@ -225,14 +243,25 @@ export async function migrate(options = {}) {
225
243
  }
226
244
  const cwd = process.cwd();
227
245
  const plan = buildMigratePlan(cwd);
228
- // `.trellis/.version` alone is not evidence of Trellis: mini-trellis's own
229
- // init writes it too, so only treat the project as migratable when real
230
- // Trellis paths are present.
231
- if (plan.deletions.length === 0) {
246
+ const converge = buildTasksConvergePlan(cwd);
247
+ // A converged project has no Trellis residue left, so the tasks tree on its
248
+ // own still means there is something to do. `.trellis/.version` alone is not
249
+ // enough to distinguish an old mini-trellis install from Trellis.
250
+ if (plan.deletions.length === 0 && converge.tasks.length === 0) {
232
251
  console.log(chalk.gray("No Trellis installation detected — nothing to migrate."));
233
252
  return;
234
253
  }
235
- renderPlan(cwd, plan);
254
+ // Renaming nothing is the only safe answer to a collision: merging a task
255
+ // directory into a note the user already wrote would silently mix them.
256
+ if (converge.conflicts.length > 0) {
257
+ console.error(chalk.red(`Cannot converge: ${converge.conflicts.length} path conflict(s). ` +
258
+ "Move or rename existing topic destinations or task-root legacy entries " +
259
+ "first — migrate never merges:"));
260
+ for (const dest of converge.conflicts)
261
+ console.error(` ${chalk.red("!")} ${dest}`);
262
+ process.exit(1);
263
+ }
264
+ renderPlan(cwd, plan, converge);
236
265
  console.log(chalk.red.bold("\n⚠ Deletion is permanent: migrate makes no backup. " +
237
266
  "Commit or copy anything you may want back first."));
238
267
  console.log();
@@ -240,17 +269,20 @@ export async function migrate(options = {}) {
240
269
  console.log(chalk.gray("Dry run — no files were modified."));
241
270
  return;
242
271
  }
272
+ let disposition = "archive";
243
273
  if (!options.yes) {
244
274
  if (!process.stdin.isTTY) {
245
275
  console.error(chalk.red("Refusing to prompt for confirmation in a non-interactive shell. " +
246
276
  "Pass --yes/-y to confirm or --dry-run to preview."));
247
277
  process.exit(1);
248
278
  }
249
- const ok = await promptContinue();
279
+ const ok = await promptContinue(converge);
250
280
  if (!ok) {
251
281
  console.log(chalk.yellow("Migration cancelled. No files modified."));
252
282
  return;
253
283
  }
284
+ if (converge.tasks.length > 0)
285
+ disposition = await promptTasksDisposition();
254
286
  }
255
287
  // Delete first so the install pass never writes a file this plan removes.
256
288
  executePlan(cwd, plan);
@@ -261,12 +293,33 @@ export async function migrate(options = {}) {
261
293
  setWriteMode("force");
262
294
  await configurePlatform(id, cwd);
263
295
  }
296
+ const report = convergeTasks(cwd, converge, disposition);
264
297
  console.log();
265
298
  console.log(chalk.green(`Migrated to mini-trellis: ${plan.deletions.length} Trellis path(s) ` +
266
299
  `removed, ${plan.reconfigure.length +
267
300
  plan.rewrites.length +
268
301
  (plan.rewritesAgents ? 1 : 0)} surface(s) rewritten.`));
269
- console.log(chalk.gray(`Kept: ${PRESERVED.join(", ")}. Review ${PATHS.SPEC}/ and ${PATHS.TASKS}/ ` +
270
- "for anything the four-phase workflow left behind."));
302
+ if (report.moved > 0) {
303
+ const handled = disposition === "delete"
304
+ ? `${report.deleted} item(s) deleted`
305
+ : `${report.archived} item(s) moved into ${RESEARCH_REL}/<topic>/legacy/`;
306
+ console.log(chalk.green(`Converged ${report.moved} task director${report.moved === 1 ? "y" : "ies"} into ${RESEARCH_REL}/: ${handled} (${report.bytes / 1024 < 1024
307
+ ? `${Math.round(report.bytes / 1024)} KB`
308
+ : `${(report.bytes / 1024 / 1024).toFixed(1)} MB`}), ${report.mentions.repoint} reference(s) repointed, ` +
309
+ `${report.pointers} session pointer(s) cleared.`));
310
+ if (report.mentions.keep > 0) {
311
+ console.log(chalk.gray(` ${report.mentions.keep} reference(s) left alone — they point at the ` +
312
+ "workflow files that left each topic, cannot be resolved uniquely, " +
313
+ "or are otherwise unsupported."));
314
+ }
315
+ if (report.residue.length > 0) {
316
+ console.log(chalk.yellow(` ${PATHS.TASKS}/ was not empty after the move and is kept as-is: ` +
317
+ `${report.residue.slice(0, 5).join(", ")}${report.residue.length > 5
318
+ ? ` and ${report.residue.length - 5} more`
319
+ : ""}.`));
320
+ }
321
+ }
322
+ console.log(chalk.gray(`Kept: ${PRESERVED.join(", ")}. Review ${PATHS.SPEC}/ for anything the ` +
323
+ "four-phase workflow left behind."));
271
324
  }
272
325
  //# sourceMappingURL=migrate.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../src/commands/migrate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../src/commands/migrate.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,9 @@
3
3
  Topic-level research notes.
4
4
 
5
5
  - Write `.trellis/research/<topic>.md` while investigating.
6
+ - A topic may also be a directory: `.trellis/research/<topic>/` for research that
7
+ carries evidence files (captures, CSVs, manifests) next to its notes.
8
+ `mini-trellis migrate` folds each Trellis task into one of these.
6
9
  - Promote durable contracts into `.trellis/spec/` (short markdown).
7
10
  - Move finished or stale topics to `.trellis/research/archive/` with `git mv`. SessionStart does not list `archive/`.
8
11
 
@@ -126,17 +126,18 @@ function collectResearchTopics(directory) {
126
126
  const researchDir = join(directory, ".trellis", "research")
127
127
  if (!existsSync(researchDir)) return []
128
128
  try {
129
- return readdirSync(researchDir)
130
- .filter(name => {
131
- if (name.startsWith(".") || name.toLowerCase() === "readme.md") return false
132
- try {
133
- return statSync(join(researchDir, name)).isFile() && name.toLowerCase().endsWith(".md")
134
- } catch {
135
- return false
136
- }
129
+ return readdirSync(researchDir, { withFileTypes: true })
130
+ .filter(entry => {
131
+ if (entry.name.startsWith(".") || entry.name.toLowerCase() === "readme.md") return false
132
+ if (entry.name === "archive") return false
133
+ // A topic is a note, or a directory: `mini-trellis migrate` folds each
134
+ // Trellis task into one so its evidence sits next to its notes.
135
+ if (entry.isDirectory()) return true
136
+ return entry.isFile() && entry.name.toLowerCase().endsWith(".md")
137
137
  })
138
- .sort()
139
- .map(name => `.trellis/research/${name}`)
138
+ .map(entry => ({ name: entry.name, dir: entry.isDirectory() }))
139
+ .sort((a, b) => a.name.localeCompare(b.name))
140
+ .map(topic => `.trellis/research/${topic.name}${topic.dir ? "/" : ""}`)
140
141
  } catch {
141
142
  return []
142
143
  }
@@ -294,8 +295,9 @@ mini-trellis SessionStart context. Orient from journal, spec, and research.
294
295
  "Memory: journal is git-durable session notes (`/mini-trellis:remember` or " +
295
296
  "`python3 ./.trellis/scripts/add_session.py`). Cross-session dialogue is " +
296
297
  "`mini-trellis mem list|search|context|extract`.\n" +
297
- "Research lives in `.trellis/research/<topic>.md`; promote durable " +
298
- "boundaries into `.trellis/spec/` as short markdown.\n"
298
+ "Research lives in `.trellis/research/<topic>.md`, or in " +
299
+ "`.trellis/research/<topic>/` when a topic brings evidence files with it; " +
300
+ "promote durable boundaries into `.trellis/spec/` as short markdown.\n"
299
301
  )
300
302
 
301
303
  if (paths.length > 0) {
@@ -1,4 +1,4 @@
1
- import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
1
+ import { existsSync, readFileSync, readdirSync } from "node:fs";
2
2
  import { dirname, join } from "node:path";
3
3
  import { homedir } from "node:os";
4
4
 
@@ -33,17 +33,18 @@ function collectResearchTopics(root: string): string[] {
33
33
  const researchDir = join(root, ".trellis", "research");
34
34
  if (!exists(researchDir)) return [];
35
35
  try {
36
- return readdirSync(researchDir)
37
- .filter((name) => {
38
- if (name.startsWith(".") || name.toLowerCase() === "readme.md") return false;
39
- try {
40
- return statSync(join(researchDir, name)).isFile() && name.toLowerCase().endsWith(".md");
41
- } catch {
42
- return false;
43
- }
36
+ return readdirSync(researchDir, { withFileTypes: true })
37
+ .filter((entry) => {
38
+ if (entry.name.startsWith(".") || entry.name.toLowerCase() === "readme.md") return false;
39
+ if (entry.name === "archive") return false;
40
+ // A topic is a note, or a directory: `mini-trellis migrate` folds each
41
+ // Trellis task into one so its evidence sits next to its notes.
42
+ if (entry.isDirectory()) return true;
43
+ return entry.isFile() && entry.name.toLowerCase().endsWith(".md");
44
44
  })
45
- .sort()
46
- .map((name) => `.trellis/research/${name}`);
45
+ .map((entry) => ({ name: entry.name, dir: entry.isDirectory() }))
46
+ .sort((a, b) => a.name.localeCompare(b.name))
47
+ .map((topic) => `.trellis/research/${topic.name}${topic.dir ? "/" : ""}`);
47
48
  } catch {
48
49
  return [];
49
50
  }
@@ -71,7 +72,11 @@ function readDeveloper(root: string): string | null {
71
72
  try {
72
73
  const p = join(root, ".trellis", ".developer");
73
74
  if (!exists(p)) return null;
74
- const name = readFileSync(p, "utf-8").trim();
75
+ const name = readFileSync(p, "utf-8")
76
+ .split(/\r?\n/)
77
+ .find((line) => line.startsWith("name="))
78
+ ?.slice("name=".length)
79
+ .trim();
75
80
  return name || null;
76
81
  } catch {
77
82
  return null;
@@ -118,7 +123,7 @@ function buildStartupContext(root: string): string {
118
123
  lines.push("</current-state>", "", "<guidelines>");
119
124
  lines.push(
120
125
  "Memory: journal is git-durable session notes (`/mini-trellis-remember` or `python3 ./.trellis/scripts/add_session.py`). Cross-session dialogue is `mini-trellis mem list|search|context|extract`.",
121
- "Research lives in `.trellis/research/<topic>.md`; promote durable boundaries into `.trellis/spec/` as short markdown.",
126
+ "Research lives in `.trellis/research/<topic>.md`, or in `.trellis/research/<topic>/` when a topic brings evidence files with it; promote durable boundaries into `.trellis/spec/` as short markdown.",
122
127
  );
123
128
  if (spec.length) {
124
129
  lines.push("", "## Spec indexes (read on demand)");
@@ -498,8 +498,14 @@ def _collect_research_topics(trellis_dir: Path) -> list[str]:
498
498
  for path in sorted(research_dir.iterdir()):
499
499
  if path.name.startswith(".") or path.name.lower() == "readme.md":
500
500
  continue
501
+ if path.name == "archive":
502
+ continue
503
+ # A topic is a note, or a directory: `mini-trellis migrate` folds
504
+ # each Trellis task into one so its evidence sits next to its notes.
501
505
  if path.is_file() and path.suffix.lower() == ".md":
502
506
  topics.append(f".trellis/research/{path.name}")
507
+ elif path.is_dir():
508
+ topics.append(f".trellis/research/{path.name}/")
503
509
  except OSError:
504
510
  return []
505
511
  return topics
@@ -614,8 +620,9 @@ mini-trellis SessionStart context. Orient from journal, spec, and research.
614
620
  "Memory: journal is git-durable session notes (`/mini-trellis:remember` or "
615
621
  "`python3 ./.trellis/scripts/add_session.py`). Cross-session dialogue is "
616
622
  "`mini-trellis mem list|search|context|extract`.\n"
617
- "Research lives in `.trellis/research/<topic>.md`; promote durable "
618
- "boundaries into `.trellis/spec/` as short markdown.\n\n"
623
+ "Research lives in `.trellis/research/<topic>.md`, or in "
624
+ "`.trellis/research/<topic>/` when a topic brings evidence files with it; "
625
+ "promote durable boundaries into `.trellis/spec/` as short markdown.\n\n"
619
626
  )
620
627
 
621
628
  if spec_index_paths:
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mini-trellis",
3
- "version": "0.1.0",
3
+ "version": "0.1.1",
4
4
  "description": "Minimal memory layer for AI coding agents: spec, research, journal, and cross-session recall. Fork of Trellis 0.6.17.",
5
5
  "repository": {
6
6
  "type": "git",