mini-trellis 0.1.0 → 0.2.0
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 +106 -10
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +35 -3
- package/dist/cli/index.js.map +1 -1
- package/dist/commands/doctor.d.ts +18 -0
- package/dist/commands/doctor.d.ts.map +1 -0
- package/dist/commands/doctor.js +122 -0
- package/dist/commands/doctor.js.map +1 -0
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +33 -7
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/migrate-tasks.d.ts +64 -0
- package/dist/commands/migrate-tasks.d.ts.map +1 -0
- package/dist/commands/migrate-tasks.js +349 -0
- package/dist/commands/migrate-tasks.js.map +1 -0
- package/dist/commands/migrate.d.ts +5 -5
- package/dist/commands/migrate.d.ts.map +1 -1
- package/dist/commands/migrate.js +93 -40
- package/dist/commands/migrate.js.map +1 -1
- package/dist/commands/refresh.d.ts +24 -0
- package/dist/commands/refresh.d.ts.map +1 -0
- package/dist/commands/refresh.js +180 -0
- package/dist/commands/refresh.js.map +1 -0
- package/dist/configurators/shared.d.ts.map +1 -1
- package/dist/configurators/shared.js +13 -0
- package/dist/configurators/shared.js.map +1 -1
- package/dist/templates/codex/config.toml +2 -10
- package/dist/templates/extract.d.ts +2 -0
- package/dist/templates/extract.d.ts.map +1 -1
- package/dist/templates/extract.js +21 -0
- package/dist/templates/extract.js.map +1 -1
- package/dist/templates/markdown/agents.md +2 -0
- package/dist/templates/markdown/research-readme.md +3 -0
- package/dist/templates/opencode/lib/session-utils.js +23 -21
- package/dist/templates/opencode/plugins/session-start.js +9 -0
- package/dist/templates/pi/extensions/mini-trellis/index.ts.txt +28 -14
- package/dist/templates/shared-hooks/session-start.py +22 -10
- package/dist/utils/managed-manifest.d.ts +12 -0
- package/dist/utils/managed-manifest.d.ts.map +1 -0
- package/dist/utils/managed-manifest.js +48 -0
- package/dist/utils/managed-manifest.js.map +1 -0
- package/dist/utils/managed-merge.d.ts +17 -0
- package/dist/utils/managed-merge.d.ts.map +1 -0
- package/dist/utils/managed-merge.js +101 -0
- package/dist/utils/managed-merge.js.map +1 -0
- package/package.json +3 -3
|
@@ -71,6 +71,27 @@ export function readTemplate(category, filename) {
|
|
|
71
71
|
export function readScript(relativePath) {
|
|
72
72
|
return readTrellisFile(`scripts/${relativePath}`);
|
|
73
73
|
}
|
|
74
|
+
/** Collect the workflow scripts used by `.trellis/` for narrow refreshes. */
|
|
75
|
+
export function collectTrellisScriptTemplates() {
|
|
76
|
+
const files = new Map();
|
|
77
|
+
const source = path.join(getTrellisTemplatePath(), "scripts");
|
|
78
|
+
function walk(directory) {
|
|
79
|
+
for (const entry of fs.readdirSync(directory, { withFileTypes: true })) {
|
|
80
|
+
const absolute = path.join(directory, entry.name);
|
|
81
|
+
if (entry.isDirectory()) {
|
|
82
|
+
walk(absolute);
|
|
83
|
+
continue;
|
|
84
|
+
}
|
|
85
|
+
const relative = path
|
|
86
|
+
.relative(source, absolute)
|
|
87
|
+
.split(path.sep)
|
|
88
|
+
.join("/");
|
|
89
|
+
files.set(`.trellis/scripts/${relative}`, replacePythonCommandLiterals(fs.readFileSync(absolute, "utf8")));
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
walk(source);
|
|
93
|
+
return files;
|
|
94
|
+
}
|
|
74
95
|
export function readMarkdown(relativePath) {
|
|
75
96
|
return readTrellisFile(relativePath);
|
|
76
97
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../src/templates/extract.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../src/templates/extract.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,8 @@ This project uses mini-trellis as a memory layer. Working knowledge lives under
|
|
|
9
9
|
|
|
10
10
|
Record a session with `/mini-trellis:remember` (Claude/OpenCode), `/mini-trellis-remember` (Pi), or `$mini-trellis-remember` (Codex). Search past dialogue with `mini-trellis mem`. Promote lasting boundaries into spec with `mini-trellis-update-spec`.
|
|
11
11
|
|
|
12
|
+
Record only confirmed decisions, reusable research findings, or the session/compact handoff. Skip ordinary turns and unconfirmed guesses. New installs write notes without an automatic git commit; use `mini-trellis doctor` to check host wiring and `mini-trellis refresh --dry-run` before refreshing assets.
|
|
13
|
+
|
|
12
14
|
mini-trellis does not create or drive tasks.
|
|
13
15
|
|
|
14
16
|
Managed by mini-trellis. Edits outside this block are preserved.
|
|
@@ -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
|
|
|
@@ -7,15 +7,10 @@ import { debugLog } from "./trellis-context.js"
|
|
|
7
7
|
|
|
8
8
|
const PYTHON_CMD = platform() === "win32" ? "python" : "python3"
|
|
9
9
|
|
|
10
|
+
const MAX_CONTEXT_CHARS = 4000
|
|
11
|
+
|
|
10
12
|
const FIRST_REPLY_NOTICE = `<first-reply-notice>
|
|
11
|
-
On the first visible assistant reply
|
|
12
|
-
Choose the acknowledgment language in this order:
|
|
13
|
-
1. Use the language of the user's current request (the user message that triggered this reply).
|
|
14
|
-
2. If that request has no clear natural language, use an explicitly established project communication language.
|
|
15
|
-
3. If neither provides a language, output the language-neutral fallback exactly: \`mini-trellis SessionStart ✓\`.
|
|
16
|
-
Continue directly with the user's request after the acknowledgment.
|
|
17
|
-
The acknowledgment must not alter the language used for the remainder of the response.
|
|
18
|
-
This notice is one-shot: do not repeat it after the first visible assistant reply in this session.
|
|
13
|
+
On the first visible assistant reply, briefly acknowledge that mini-trellis SessionStart context loaded, then continue with the user's request. Use the user's language; otherwise say \`mini-trellis SessionStart ✓\`. This is one-shot and must not be repeated.
|
|
19
14
|
</first-reply-notice>`
|
|
20
15
|
|
|
21
16
|
function loadTrellisConfig(directory, contextKey = null) {
|
|
@@ -126,17 +121,18 @@ function collectResearchTopics(directory) {
|
|
|
126
121
|
const researchDir = join(directory, ".trellis", "research")
|
|
127
122
|
if (!existsSync(researchDir)) return []
|
|
128
123
|
try {
|
|
129
|
-
return readdirSync(researchDir)
|
|
130
|
-
.filter(
|
|
131
|
-
if (name.startsWith(".") || name.toLowerCase() === "readme.md") return false
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
124
|
+
return readdirSync(researchDir, { withFileTypes: true })
|
|
125
|
+
.filter(entry => {
|
|
126
|
+
if (entry.name.startsWith(".") || entry.name.toLowerCase() === "readme.md") return false
|
|
127
|
+
if (entry.name === "archive") return false
|
|
128
|
+
// A topic is a note, or a directory: `mini-trellis migrate` folds each
|
|
129
|
+
// Trellis task into one so its evidence sits next to its notes.
|
|
130
|
+
if (entry.isDirectory()) return true
|
|
131
|
+
return entry.isFile() && entry.name.toLowerCase().endsWith(".md")
|
|
137
132
|
})
|
|
138
|
-
.
|
|
139
|
-
.
|
|
133
|
+
.map(entry => ({ name: entry.name, dir: entry.isDirectory() }))
|
|
134
|
+
.sort((a, b) => a.name.localeCompare(b.name))
|
|
135
|
+
.map(topic => `.trellis/research/${topic.name}${topic.dir ? "/" : ""}`)
|
|
140
136
|
} catch {
|
|
141
137
|
return []
|
|
142
138
|
}
|
|
@@ -294,8 +290,10 @@ mini-trellis SessionStart context. Orient from journal, spec, and research.
|
|
|
294
290
|
"Memory: journal is git-durable session notes (`/mini-trellis:remember` or " +
|
|
295
291
|
"`python3 ./.trellis/scripts/add_session.py`). Cross-session dialogue is " +
|
|
296
292
|
"`mini-trellis mem list|search|context|extract`.\n" +
|
|
297
|
-
"Research lives in `.trellis/research/<topic>.md
|
|
298
|
-
"
|
|
293
|
+
"Research lives in `.trellis/research/<topic>.md`, or in " +
|
|
294
|
+
"`.trellis/research/<topic>/` when a topic brings evidence files with it; " +
|
|
295
|
+
"promote durable boundaries into `.trellis/spec/` as short markdown.\n"
|
|
296
|
+
+ "Record confirmed decisions, useful research findings, and session/compact endings. Do not record every turn or create a git commit unless the user asks.\n"
|
|
299
297
|
)
|
|
300
298
|
|
|
301
299
|
if (paths.length > 0) {
|
|
@@ -320,7 +318,11 @@ mini-trellis SessionStart context. Orient from journal, spec, and research.
|
|
|
320
318
|
Context loaded. Use journal, spec, research, and \`mini-trellis mem\` on demand. Remember at session end or after compact.
|
|
321
319
|
</ready>`)
|
|
322
320
|
|
|
323
|
-
|
|
321
|
+
const context = parts.join("\n\n")
|
|
322
|
+
if (context.length <= MAX_CONTEXT_CHARS) return context
|
|
323
|
+
const tail = context.slice(-300)
|
|
324
|
+
return context.slice(0, MAX_CONTEXT_CHARS - tail.length - 80) +
|
|
325
|
+
"\n[mini-trellis context truncated; read files on demand]\n" + tail
|
|
324
326
|
}
|
|
325
327
|
|
|
326
328
|
function getTrellisMetadata(metadata) {
|
|
@@ -51,6 +51,15 @@ export default async ({ directory }) => {
|
|
|
51
51
|
return
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
+
if (messages?.some(message =>
|
|
55
|
+
message?.parts?.some(part =>
|
|
56
|
+
part?.synthetic === true &&
|
|
57
|
+
typeof part.text === "string" &&
|
|
58
|
+
part.text.includes("<session-context>")))) {
|
|
59
|
+
debugLog("session", "Skipping - SessionStart context already injected")
|
|
60
|
+
return
|
|
61
|
+
}
|
|
62
|
+
|
|
54
63
|
let context = buildSessionContext(ctx, platformInput)
|
|
55
64
|
if (transcriptHasAssistantMessage(messages)) {
|
|
56
65
|
context = stripFirstReplyNotice(context)
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { existsSync, readFileSync, readdirSync
|
|
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((
|
|
38
|
-
if (name.startsWith(".") || name.toLowerCase() === "readme.md") return false;
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
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
|
-
.
|
|
46
|
-
.
|
|
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")
|
|
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;
|
|
@@ -98,6 +103,7 @@ function activeJournal(root: string): string | null {
|
|
|
98
103
|
}
|
|
99
104
|
|
|
100
105
|
function buildStartupContext(root: string): string {
|
|
106
|
+
const MAX_CONTEXT_CHARS = 4000;
|
|
101
107
|
const spec = collectSpecIndexPaths(root);
|
|
102
108
|
const research = collectResearchTopics(root);
|
|
103
109
|
const journal = activeJournal(root);
|
|
@@ -118,7 +124,8 @@ function buildStartupContext(root: string): string {
|
|
|
118
124
|
lines.push("</current-state>", "", "<guidelines>");
|
|
119
125
|
lines.push(
|
|
120
126
|
"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
|
|
127
|
+
"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.",
|
|
128
|
+
"Record confirmed decisions, useful research findings, and session/compact endings. Do not record every turn or create a git commit unless the user asks.",
|
|
122
129
|
);
|
|
123
130
|
if (spec.length) {
|
|
124
131
|
lines.push("", "## Spec indexes (read on demand)");
|
|
@@ -135,7 +142,14 @@ function buildStartupContext(root: string): string {
|
|
|
135
142
|
"Context loaded. Use journal, spec, research, and `mini-trellis mem` on demand. Remember at session end or after compact.",
|
|
136
143
|
"</ready>",
|
|
137
144
|
);
|
|
138
|
-
|
|
145
|
+
const context = lines.join("\n");
|
|
146
|
+
if (context.length <= MAX_CONTEXT_CHARS) return context;
|
|
147
|
+
const tail = context.slice(-300);
|
|
148
|
+
return (
|
|
149
|
+
context.slice(0, MAX_CONTEXT_CHARS - tail.length - 80) +
|
|
150
|
+
"\n[mini-trellis context truncated; read files on demand]\n" +
|
|
151
|
+
tail
|
|
152
|
+
);
|
|
139
153
|
}
|
|
140
154
|
|
|
141
155
|
export default function trellisExtension(pi: {
|
|
@@ -67,15 +67,10 @@ def _normalize_windows_shell_path(path_str: str) -> str:
|
|
|
67
67
|
return path_str
|
|
68
68
|
|
|
69
69
|
|
|
70
|
+
MAX_CONTEXT_CHARS = 4000
|
|
71
|
+
|
|
70
72
|
FIRST_REPLY_NOTICE = """<first-reply-notice>
|
|
71
|
-
On the first visible assistant reply
|
|
72
|
-
Choose the acknowledgment language in this order:
|
|
73
|
-
1. Use the language of the user's current request (the user message that triggered this reply).
|
|
74
|
-
2. If that request has no clear natural language, use an explicitly established project communication language.
|
|
75
|
-
3. If neither provides a language, output the language-neutral fallback exactly: `mini-trellis SessionStart ✓`.
|
|
76
|
-
Continue directly with the user's request after the acknowledgment.
|
|
77
|
-
The acknowledgment must not alter the language used for the remainder of the response.
|
|
78
|
-
This notice is one-shot: do not repeat it after the first visible assistant reply in this session.
|
|
73
|
+
On the first visible assistant reply, briefly acknowledge that mini-trellis SessionStart context loaded, then continue with the user's request. Use the user's language; otherwise say `mini-trellis SessionStart ✓`. This is one-shot and must not be repeated.
|
|
79
74
|
</first-reply-notice>"""
|
|
80
75
|
|
|
81
76
|
|
|
@@ -498,8 +493,14 @@ def _collect_research_topics(trellis_dir: Path) -> list[str]:
|
|
|
498
493
|
for path in sorted(research_dir.iterdir()):
|
|
499
494
|
if path.name.startswith(".") or path.name.lower() == "readme.md":
|
|
500
495
|
continue
|
|
496
|
+
if path.name == "archive":
|
|
497
|
+
continue
|
|
498
|
+
# A topic is a note, or a directory: `mini-trellis migrate` folds
|
|
499
|
+
# each Trellis task into one so its evidence sits next to its notes.
|
|
501
500
|
if path.is_file() and path.suffix.lower() == ".md":
|
|
502
501
|
topics.append(f".trellis/research/{path.name}")
|
|
502
|
+
elif path.is_dir():
|
|
503
|
+
topics.append(f".trellis/research/{path.name}/")
|
|
503
504
|
except OSError:
|
|
504
505
|
return []
|
|
505
506
|
return topics
|
|
@@ -614,8 +615,12 @@ mini-trellis SessionStart context. Orient from journal, spec, and research.
|
|
|
614
615
|
"Memory: journal is git-durable session notes (`/mini-trellis:remember` or "
|
|
615
616
|
"`python3 ./.trellis/scripts/add_session.py`). Cross-session dialogue is "
|
|
616
617
|
"`mini-trellis mem list|search|context|extract`.\n"
|
|
617
|
-
"Research lives in `.trellis/research/<topic>.md
|
|
618
|
-
"
|
|
618
|
+
"Research lives in `.trellis/research/<topic>.md`, or in "
|
|
619
|
+
"`.trellis/research/<topic>/` when a topic brings evidence files with it; "
|
|
620
|
+
"promote durable boundaries into `.trellis/spec/` as short markdown.\n\n"
|
|
621
|
+
"Record when a decision is confirmed, a research finding is worth keeping, "
|
|
622
|
+
"or the session/compact is ending. Do not record every turn, and do not "
|
|
623
|
+
"create a git commit unless the user explicitly asks.\n\n"
|
|
619
624
|
)
|
|
620
625
|
|
|
621
626
|
if spec_index_paths:
|
|
@@ -643,6 +648,13 @@ Context loaded. Use journal, spec, research, and `mini-trellis mem` on demand. R
|
|
|
643
648
|
</ready>""")
|
|
644
649
|
|
|
645
650
|
context_text = output.getvalue()
|
|
651
|
+
if len(context_text) > MAX_CONTEXT_CHARS:
|
|
652
|
+
tail = context_text[-300:]
|
|
653
|
+
context_text = (
|
|
654
|
+
context_text[: MAX_CONTEXT_CHARS - len(tail) - 80]
|
|
655
|
+
+ "\n[mini-trellis context truncated; read files on demand]\n"
|
|
656
|
+
+ tail
|
|
657
|
+
)
|
|
646
658
|
|
|
647
659
|
# Kiro (CLI trellis agent agentSpawn) adds a hook's stdout directly to the
|
|
648
660
|
# conversation context — no JSON envelope. Emit the bare overview text.
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
declare const MANIFEST_PATH = ".trellis/.mini-trellis-manifest.json";
|
|
2
|
+
export interface MiniTrellisManifest {
|
|
3
|
+
version: number;
|
|
4
|
+
files: Record<string, string>;
|
|
5
|
+
}
|
|
6
|
+
export declare function hashContent(content: string): string;
|
|
7
|
+
export declare function hashFile(filePath: string): string | null;
|
|
8
|
+
export declare function readManifest(cwd: string): MiniTrellisManifest;
|
|
9
|
+
export declare function writeManifest(cwd: string, manifest: MiniTrellisManifest): void;
|
|
10
|
+
export declare function updateManifestForTemplates(cwd: string, templates: Map<string, string>): MiniTrellisManifest;
|
|
11
|
+
export { MANIFEST_PATH };
|
|
12
|
+
//# sourceMappingURL=managed-manifest.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"managed-manifest.d.ts","sourceRoot":"","sources":["../../src/utils/managed-manifest.ts"],"names":[],"mappings":"AAKA,QAAA,MAAM,aAAa,yCAAyC,CAAC;AAG7D,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMxD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAgB7D;AAED,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,mBAAmB,GAC5B,IAAI,CAIN;AAED,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7B,mBAAmB,CAQrB;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import crypto from "node:crypto";
|
|
2
|
+
import fs from "node:fs";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import { writeFileAtomic } from "./atomic-write.js";
|
|
5
|
+
const MANIFEST_PATH = ".trellis/.mini-trellis-manifest.json";
|
|
6
|
+
const MANIFEST_VERSION = 1;
|
|
7
|
+
export function hashContent(content) {
|
|
8
|
+
return crypto.createHash("sha256").update(content).digest("hex");
|
|
9
|
+
}
|
|
10
|
+
export function hashFile(filePath) {
|
|
11
|
+
try {
|
|
12
|
+
return hashContent(fs.readFileSync(filePath, "utf8"));
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
return null;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
export function readManifest(cwd) {
|
|
19
|
+
try {
|
|
20
|
+
const parsed = JSON.parse(fs.readFileSync(path.join(cwd, MANIFEST_PATH), "utf8"));
|
|
21
|
+
if (parsed.version === MANIFEST_VERSION &&
|
|
22
|
+
parsed.files &&
|
|
23
|
+
typeof parsed.files === "object") {
|
|
24
|
+
return { version: MANIFEST_VERSION, files: { ...parsed.files } };
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
catch {
|
|
28
|
+
// Missing or malformed manifests are treated as an empty ownership set.
|
|
29
|
+
}
|
|
30
|
+
return { version: MANIFEST_VERSION, files: {} };
|
|
31
|
+
}
|
|
32
|
+
export function writeManifest(cwd, manifest) {
|
|
33
|
+
const filePath = path.join(cwd, MANIFEST_PATH);
|
|
34
|
+
fs.mkdirSync(path.dirname(filePath), { recursive: true });
|
|
35
|
+
writeFileAtomic(filePath, `${JSON.stringify(manifest, null, 2)}\n`);
|
|
36
|
+
}
|
|
37
|
+
export function updateManifestForTemplates(cwd, templates) {
|
|
38
|
+
const manifest = readManifest(cwd);
|
|
39
|
+
for (const [relative, content] of templates) {
|
|
40
|
+
const actual = hashFile(path.join(cwd, ...relative.split("/")));
|
|
41
|
+
if (actual === hashContent(content))
|
|
42
|
+
manifest.files[relative] = actual;
|
|
43
|
+
}
|
|
44
|
+
writeManifest(cwd, manifest);
|
|
45
|
+
return manifest;
|
|
46
|
+
}
|
|
47
|
+
export { MANIFEST_PATH };
|
|
48
|
+
//# sourceMappingURL=managed-manifest.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"managed-manifest.js","sourceRoot":"","sources":["../../src/utils/managed-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,aAAa,GAAG,sCAAsC,CAAC;AAC7D,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAO3B,MAAM,UAAU,WAAW,CAAC,OAAe;IACzC,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,QAAgB;IACvC,IAAI,CAAC;QACH,OAAO,WAAW,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IACxD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,GAAW;IACtC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CACvB,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,CACvB,CAAC;QAClC,IACE,MAAM,CAAC,OAAO,KAAK,gBAAgB;YACnC,MAAM,CAAC,KAAK;YACZ,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,EAChC,CAAC;YACD,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;QACnE,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,wEAAwE;IAC1E,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,GAAW,EACX,QAA6B;IAE7B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IAC/C,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1D,eAAe,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,GAAW,EACX,SAA8B;IAE9B,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IACnC,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,SAAS,EAAE,CAAC;QAC5C,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAChE,IAAI,MAAM,KAAK,WAAW,CAAC,OAAO,CAAC;YAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;IACzE,CAAC;IACD,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC7B,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Replace one managed marker block while preserving all user-authored text
|
|
3
|
+
* around it. If the block is absent, append it to the existing file.
|
|
4
|
+
*/
|
|
5
|
+
export declare function mergeManagedBlock(existing: string, managed: string, startMarker: string, endMarker: string): string;
|
|
6
|
+
/** Merge a managed marker block on disk and report whether bytes changed. */
|
|
7
|
+
export declare function mergeManagedBlockFile(filePath: string, managed: string, startMarker: string, endMarker: string): boolean;
|
|
8
|
+
type JsonValue = unknown;
|
|
9
|
+
/**
|
|
10
|
+
* Add missing template keys and array entries without overwriting user
|
|
11
|
+
* settings. This is intentionally conservative: existing scalar values win.
|
|
12
|
+
*/
|
|
13
|
+
export declare function mergeJsonValues(existing: JsonValue, desired: JsonValue): JsonValue;
|
|
14
|
+
/** Merge a JSON template on disk while preserving existing user values. */
|
|
15
|
+
export declare function mergeJsonFile(filePath: string, desiredContent: string): "written" | "unchanged" | "invalid";
|
|
16
|
+
export {};
|
|
17
|
+
//# sourceMappingURL=managed-merge.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"managed-merge.d.ts","sourceRoot":"","sources":["../../src/utils/managed-merge.ts"],"names":[],"mappings":"AAQA;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,MAAM,CAsBR;AAED,6EAA6E;AAC7E,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAST;AAED,KAAK,SAAS,GAAG,OAAO,CAAC;AAWzB;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,SAAS,EACnB,OAAO,EAAE,SAAS,GACjB,SAAS,CAoBX;AAED,2EAA2E;AAC3E,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,GACrB,SAAS,GAAG,WAAW,GAAG,SAAS,CA0BrC"}
|
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { writeFileAtomic } from "./atomic-write.js";
|
|
4
|
+
function hasOwn(value, key) {
|
|
5
|
+
return Object.prototype.hasOwnProperty.call(value, key);
|
|
6
|
+
}
|
|
7
|
+
/**
|
|
8
|
+
* Replace one managed marker block while preserving all user-authored text
|
|
9
|
+
* around it. If the block is absent, append it to the existing file.
|
|
10
|
+
*/
|
|
11
|
+
export function mergeManagedBlock(existing, managed, startMarker, endMarker) {
|
|
12
|
+
const managedStart = managed.indexOf(startMarker);
|
|
13
|
+
const managedEnd = managed.indexOf(endMarker, managedStart);
|
|
14
|
+
if (managedStart < 0 || managedEnd < 0) {
|
|
15
|
+
throw new Error("Managed content is missing its marker pair");
|
|
16
|
+
}
|
|
17
|
+
const block = managed
|
|
18
|
+
.slice(managedStart, managedEnd + endMarker.length)
|
|
19
|
+
.trimEnd();
|
|
20
|
+
const existingStart = existing.indexOf(startMarker);
|
|
21
|
+
const existingEnd = existingStart >= 0 ? existing.indexOf(endMarker, existingStart) : -1;
|
|
22
|
+
if (existingStart >= 0 && existingEnd >= 0) {
|
|
23
|
+
const before = existing.slice(0, existingStart).trimEnd();
|
|
24
|
+
const after = existing.slice(existingEnd + endMarker.length).trimStart();
|
|
25
|
+
return [before, block, after].filter(Boolean).join("\n\n") + "\n";
|
|
26
|
+
}
|
|
27
|
+
const trimmed = existing.trimEnd();
|
|
28
|
+
return trimmed ? `${trimmed}\n\n${block}\n` : `${block}\n`;
|
|
29
|
+
}
|
|
30
|
+
/** Merge a managed marker block on disk and report whether bytes changed. */
|
|
31
|
+
export function mergeManagedBlockFile(filePath, managed, startMarker, endMarker) {
|
|
32
|
+
const existing = fs.existsSync(filePath)
|
|
33
|
+
? fs.readFileSync(filePath, "utf8")
|
|
34
|
+
: "";
|
|
35
|
+
const merged = mergeManagedBlock(existing, managed, startMarker, endMarker);
|
|
36
|
+
if (merged === existing)
|
|
37
|
+
return false;
|
|
38
|
+
fs.mkdirSync(path.dirname(filePath), { recursive: true });
|
|
39
|
+
writeFileAtomic(filePath, merged);
|
|
40
|
+
return true;
|
|
41
|
+
}
|
|
42
|
+
function isRecord(value) {
|
|
43
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
44
|
+
}
|
|
45
|
+
function jsonEqual(left, right) {
|
|
46
|
+
return JSON.stringify(left) === JSON.stringify(right);
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Add missing template keys and array entries without overwriting user
|
|
50
|
+
* settings. This is intentionally conservative: existing scalar values win.
|
|
51
|
+
*/
|
|
52
|
+
export function mergeJsonValues(existing, desired) {
|
|
53
|
+
if (Array.isArray(existing) && Array.isArray(desired)) {
|
|
54
|
+
const merged = [...existing];
|
|
55
|
+
for (const item of desired) {
|
|
56
|
+
if (!merged.some((candidate) => jsonEqual(candidate, item)))
|
|
57
|
+
merged.push(item);
|
|
58
|
+
}
|
|
59
|
+
return merged;
|
|
60
|
+
}
|
|
61
|
+
if (isRecord(existing) && isRecord(desired)) {
|
|
62
|
+
const merged = { ...existing };
|
|
63
|
+
for (const [key, value] of Object.entries(desired)) {
|
|
64
|
+
if (!hasOwn(existing, key))
|
|
65
|
+
merged[key] = value;
|
|
66
|
+
else
|
|
67
|
+
merged[key] = mergeJsonValues(existing[key], value);
|
|
68
|
+
}
|
|
69
|
+
return merged;
|
|
70
|
+
}
|
|
71
|
+
return existing;
|
|
72
|
+
}
|
|
73
|
+
/** Merge a JSON template on disk while preserving existing user values. */
|
|
74
|
+
export function mergeJsonFile(filePath, desiredContent) {
|
|
75
|
+
let desired;
|
|
76
|
+
try {
|
|
77
|
+
desired = JSON.parse(desiredContent);
|
|
78
|
+
}
|
|
79
|
+
catch {
|
|
80
|
+
return "invalid";
|
|
81
|
+
}
|
|
82
|
+
if (!fs.existsSync(filePath)) {
|
|
83
|
+
fs.mkdirSync(path.dirname(filePath), { recursive: true });
|
|
84
|
+
writeFileAtomic(filePath, `${JSON.stringify(desired, null, 2)}\n`);
|
|
85
|
+
return "written";
|
|
86
|
+
}
|
|
87
|
+
let existing;
|
|
88
|
+
try {
|
|
89
|
+
existing = JSON.parse(fs.readFileSync(filePath, "utf8"));
|
|
90
|
+
}
|
|
91
|
+
catch {
|
|
92
|
+
return "invalid";
|
|
93
|
+
}
|
|
94
|
+
const merged = mergeJsonValues(existing, desired);
|
|
95
|
+
const rendered = `${JSON.stringify(merged, null, 2)}\n`;
|
|
96
|
+
if (rendered === fs.readFileSync(filePath, "utf8"))
|
|
97
|
+
return "unchanged";
|
|
98
|
+
writeFileAtomic(filePath, rendered);
|
|
99
|
+
return "written";
|
|
100
|
+
}
|
|
101
|
+
//# sourceMappingURL=managed-merge.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"managed-merge.js","sourceRoot":"","sources":["../../src/utils/managed-merge.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "mini-trellis",
|
|
3
|
-
"version": "0.
|
|
4
|
-
"description": "Minimal memory layer for AI coding agents: spec, research, journal, and cross-session recall.
|
|
3
|
+
"version": "0.2.0",
|
|
4
|
+
"description": "Minimal memory layer for AI coding agents: spec, research, journal, and cross-session recall.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
7
7
|
"url": "git+https://github.com/Tiger-zzZ/mini-trellis.git"
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"commander": "^12.1.0",
|
|
36
36
|
"figlet": "^1.9.4",
|
|
37
37
|
"inquirer": "^9.3.7",
|
|
38
|
-
"mini-trellis-core": "0.
|
|
38
|
+
"mini-trellis-core": "0.2.0"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
41
|
"@eslint/js": "^9.18.0",
|