@mindfoldhq/trellis 0.6.0-beta.2 → 0.6.0-beta.21
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 +1 -1
- package/dist/cli/index.d.ts +1 -1
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +58 -2
- package/dist/cli/index.js.map +1 -1
- package/dist/commands/channel/adapters/claude.d.ts +29 -0
- package/dist/commands/channel/adapters/claude.d.ts.map +1 -0
- package/dist/commands/channel/adapters/claude.js +203 -0
- package/dist/commands/channel/adapters/claude.js.map +1 -0
- package/dist/commands/channel/adapters/codex.d.ts +85 -0
- package/dist/commands/channel/adapters/codex.d.ts.map +1 -0
- package/dist/commands/channel/adapters/codex.js +505 -0
- package/dist/commands/channel/adapters/codex.js.map +1 -0
- package/dist/commands/channel/adapters/index.d.ts +84 -0
- package/dist/commands/channel/adapters/index.d.ts.map +1 -0
- package/dist/commands/channel/adapters/index.js +115 -0
- package/dist/commands/channel/adapters/index.js.map +1 -0
- package/dist/commands/channel/adapters/types.d.ts +33 -0
- package/dist/commands/channel/adapters/types.d.ts.map +1 -0
- package/dist/commands/channel/adapters/types.js +2 -0
- package/dist/commands/channel/adapters/types.js.map +1 -0
- package/dist/commands/channel/agent-loader.d.ts +32 -0
- package/dist/commands/channel/agent-loader.d.ts.map +1 -0
- package/dist/commands/channel/agent-loader.js +154 -0
- package/dist/commands/channel/agent-loader.js.map +1 -0
- package/dist/commands/channel/context-loader.d.ts +26 -0
- package/dist/commands/channel/context-loader.d.ts.map +1 -0
- package/dist/commands/channel/context-loader.js +290 -0
- package/dist/commands/channel/context-loader.js.map +1 -0
- package/dist/commands/channel/context.d.ts +16 -0
- package/dist/commands/channel/context.d.ts.map +1 -0
- package/dist/commands/channel/context.js +83 -0
- package/dist/commands/channel/context.js.map +1 -0
- package/dist/commands/channel/create.d.ts +27 -0
- package/dist/commands/channel/create.d.ts.map +1 -0
- package/dist/commands/channel/create.js +39 -0
- package/dist/commands/channel/create.js.map +1 -0
- package/dist/commands/channel/dev-parse-trace.d.ts +14 -0
- package/dist/commands/channel/dev-parse-trace.d.ts.map +1 -0
- package/dist/commands/channel/dev-parse-trace.js +70 -0
- package/dist/commands/channel/dev-parse-trace.js.map +1 -0
- package/dist/commands/channel/guard.d.ts +150 -0
- package/dist/commands/channel/guard.d.ts.map +1 -0
- package/dist/commands/channel/guard.js +474 -0
- package/dist/commands/channel/guard.js.map +1 -0
- package/dist/commands/channel/index.d.ts +3 -0
- package/dist/commands/channel/index.d.ts.map +1 -0
- package/dist/commands/channel/index.js +531 -0
- package/dist/commands/channel/index.js.map +1 -0
- package/dist/commands/channel/interrupt.d.ts +10 -0
- package/dist/commands/channel/interrupt.d.ts.map +1 -0
- package/dist/commands/channel/interrupt.js +22 -0
- package/dist/commands/channel/interrupt.js.map +1 -0
- package/dist/commands/channel/kill.d.ts +7 -0
- package/dist/commands/channel/kill.d.ts.map +1 -0
- package/dist/commands/channel/kill.js +121 -0
- package/dist/commands/channel/kill.js.map +1 -0
- package/dist/commands/channel/list.d.ts +17 -0
- package/dist/commands/channel/list.d.ts.map +1 -0
- package/dist/commands/channel/list.js +233 -0
- package/dist/commands/channel/list.js.map +1 -0
- package/dist/commands/channel/messages.d.ts +15 -0
- package/dist/commands/channel/messages.d.ts.map +1 -0
- package/dist/commands/channel/messages.js +245 -0
- package/dist/commands/channel/messages.js.map +1 -0
- package/dist/commands/channel/rm.d.ts +27 -0
- package/dist/commands/channel/rm.d.ts.map +1 -0
- package/dist/commands/channel/rm.js +216 -0
- package/dist/commands/channel/rm.js.map +1 -0
- package/dist/commands/channel/run.d.ts +30 -0
- package/dist/commands/channel/run.d.ts.map +1 -0
- package/dist/commands/channel/run.js +130 -0
- package/dist/commands/channel/run.js.map +1 -0
- package/dist/commands/channel/send.d.ts +11 -0
- package/dist/commands/channel/send.d.ts.map +1 -0
- package/dist/commands/channel/send.js +24 -0
- package/dist/commands/channel/send.js.map +1 -0
- package/dist/commands/channel/spawn.d.ts +40 -0
- package/dist/commands/channel/spawn.d.ts.map +1 -0
- package/dist/commands/channel/spawn.js +244 -0
- package/dist/commands/channel/spawn.js.map +1 -0
- package/dist/commands/channel/store/events.d.ts +39 -0
- package/dist/commands/channel/store/events.d.ts.map +1 -0
- package/dist/commands/channel/store/events.js +87 -0
- package/dist/commands/channel/store/events.js.map +1 -0
- package/dist/commands/channel/store/filter.d.ts +3 -0
- package/dist/commands/channel/store/filter.d.ts.map +1 -0
- package/dist/commands/channel/store/filter.js +2 -0
- package/dist/commands/channel/store/filter.js.map +1 -0
- package/dist/commands/channel/store/lock.d.ts +23 -0
- package/dist/commands/channel/store/lock.d.ts.map +1 -0
- package/dist/commands/channel/store/lock.js +99 -0
- package/dist/commands/channel/store/lock.js.map +1 -0
- package/dist/commands/channel/store/paths.d.ts +63 -0
- package/dist/commands/channel/store/paths.d.ts.map +1 -0
- package/dist/commands/channel/store/paths.js +246 -0
- package/dist/commands/channel/store/paths.js.map +1 -0
- package/dist/commands/channel/store/schema.d.ts +27 -0
- package/dist/commands/channel/store/schema.d.ts.map +1 -0
- package/dist/commands/channel/store/schema.js +34 -0
- package/dist/commands/channel/store/schema.js.map +1 -0
- package/dist/commands/channel/store/thread-state.d.ts +5 -0
- package/dist/commands/channel/store/thread-state.d.ts.map +1 -0
- package/dist/commands/channel/store/thread-state.js +16 -0
- package/dist/commands/channel/store/thread-state.js.map +1 -0
- package/dist/commands/channel/store/watch.d.ts +19 -0
- package/dist/commands/channel/store/watch.d.ts.map +1 -0
- package/dist/commands/channel/store/watch.js +146 -0
- package/dist/commands/channel/store/watch.js.map +1 -0
- package/dist/commands/channel/supervisor/idle.d.ts +46 -0
- package/dist/commands/channel/supervisor/idle.d.ts.map +1 -0
- package/dist/commands/channel/supervisor/idle.js +72 -0
- package/dist/commands/channel/supervisor/idle.js.map +1 -0
- package/dist/commands/channel/supervisor/inbox.d.ts +30 -0
- package/dist/commands/channel/supervisor/inbox.d.ts.map +1 -0
- package/dist/commands/channel/supervisor/inbox.js +160 -0
- package/dist/commands/channel/supervisor/inbox.js.map +1 -0
- package/dist/commands/channel/supervisor/shutdown.d.ts +68 -0
- package/dist/commands/channel/supervisor/shutdown.d.ts.map +1 -0
- package/dist/commands/channel/supervisor/shutdown.js +146 -0
- package/dist/commands/channel/supervisor/shutdown.js.map +1 -0
- package/dist/commands/channel/supervisor/stdout.d.ts +51 -0
- package/dist/commands/channel/supervisor/stdout.d.ts.map +1 -0
- package/dist/commands/channel/supervisor/stdout.js +121 -0
- package/dist/commands/channel/supervisor/stdout.js.map +1 -0
- package/dist/commands/channel/supervisor/turns.d.ts +31 -0
- package/dist/commands/channel/supervisor/turns.d.ts.map +1 -0
- package/dist/commands/channel/supervisor/turns.js +45 -0
- package/dist/commands/channel/supervisor/turns.js.map +1 -0
- package/dist/commands/channel/supervisor/warning.d.ts +48 -0
- package/dist/commands/channel/supervisor/warning.d.ts.map +1 -0
- package/dist/commands/channel/supervisor/warning.js +77 -0
- package/dist/commands/channel/supervisor/warning.js.map +1 -0
- package/dist/commands/channel/supervisor.d.ts +59 -0
- package/dist/commands/channel/supervisor.d.ts.map +1 -0
- package/dist/commands/channel/supervisor.js +344 -0
- package/dist/commands/channel/supervisor.js.map +1 -0
- package/dist/commands/channel/text-body.d.ts +13 -0
- package/dist/commands/channel/text-body.d.ts.map +1 -0
- package/dist/commands/channel/text-body.js +47 -0
- package/dist/commands/channel/text-body.js.map +1 -0
- package/dist/commands/channel/threads.d.ts +39 -0
- package/dist/commands/channel/threads.d.ts.map +1 -0
- package/dist/commands/channel/threads.js +106 -0
- package/dist/commands/channel/threads.js.map +1 -0
- package/dist/commands/channel/title.d.ts +12 -0
- package/dist/commands/channel/title.d.ts.map +1 -0
- package/dist/commands/channel/title.js +24 -0
- package/dist/commands/channel/title.js.map +1 -0
- package/dist/commands/channel/wait.d.ts +17 -0
- package/dist/commands/channel/wait.d.ts.map +1 -0
- package/dist/commands/channel/wait.js +75 -0
- package/dist/commands/channel/wait.js.map +1 -0
- package/dist/commands/init.d.ts +2 -0
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +97 -42
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/mem.d.ts +13 -117
- package/dist/commands/mem.d.ts.map +1 -1
- package/dist/commands/mem.js +168 -1074
- package/dist/commands/mem.js.map +1 -1
- package/dist/commands/uninstall.d.ts.map +1 -1
- package/dist/commands/uninstall.js +28 -2
- package/dist/commands/uninstall.js.map +1 -1
- package/dist/commands/update.d.ts.map +1 -1
- package/dist/commands/update.js +31 -111
- package/dist/commands/update.js.map +1 -1
- package/dist/commands/upgrade.d.ts +28 -0
- package/dist/commands/upgrade.d.ts.map +1 -0
- package/dist/commands/upgrade.js +84 -0
- package/dist/commands/upgrade.js.map +1 -0
- package/dist/commands/workflow.d.ts +35 -0
- package/dist/commands/workflow.d.ts.map +1 -0
- package/dist/commands/workflow.js +219 -0
- package/dist/commands/workflow.js.map +1 -0
- package/dist/configurators/claude.d.ts.map +1 -1
- package/dist/configurators/claude.js +1 -0
- package/dist/configurators/claude.js.map +1 -1
- package/dist/configurators/codex.d.ts.map +1 -1
- package/dist/configurators/codex.js +5 -3
- package/dist/configurators/codex.js.map +1 -1
- package/dist/configurators/shared.js +4 -4
- package/dist/configurators/shared.js.map +1 -1
- package/dist/configurators/workflow.d.ts +8 -0
- package/dist/configurators/workflow.d.ts.map +1 -1
- package/dist/configurators/workflow.js +3 -2
- package/dist/configurators/workflow.js.map +1 -1
- package/dist/migrations/manifests/0.5.10.json +9 -0
- package/dist/migrations/manifests/0.5.11.json +16 -0
- package/dist/migrations/manifests/0.5.12.json +9 -0
- package/dist/migrations/manifests/0.5.13.json +9 -0
- package/dist/migrations/manifests/0.5.14.json +9 -0
- package/dist/migrations/manifests/0.5.15.json +9 -0
- package/dist/migrations/manifests/0.5.16.json +9 -0
- package/dist/migrations/manifests/0.5.17.json +9 -0
- package/dist/migrations/manifests/0.5.18.json +9 -0
- package/dist/migrations/manifests/0.6.0-beta.10.json +9 -0
- package/dist/migrations/manifests/0.6.0-beta.11.json +9 -0
- package/dist/migrations/manifests/0.6.0-beta.12.json +9 -0
- package/dist/migrations/manifests/0.6.0-beta.13.json +9 -0
- package/dist/migrations/manifests/0.6.0-beta.14.json +9 -0
- package/dist/migrations/manifests/0.6.0-beta.15.json +9 -0
- package/dist/migrations/manifests/0.6.0-beta.16.json +9 -0
- package/dist/migrations/manifests/0.6.0-beta.17.json +9 -0
- package/dist/migrations/manifests/0.6.0-beta.18.json +16 -0
- package/dist/migrations/manifests/0.6.0-beta.19.json +9 -0
- package/dist/migrations/manifests/0.6.0-beta.20.json +9 -0
- package/dist/migrations/manifests/0.6.0-beta.21.json +9 -0
- package/dist/migrations/manifests/0.6.0-beta.3.json +9 -0
- package/dist/migrations/manifests/0.6.0-beta.4.json +9 -0
- package/dist/migrations/manifests/0.6.0-beta.5.json +9 -0
- package/dist/migrations/manifests/0.6.0-beta.6.json +16 -0
- package/dist/migrations/manifests/0.6.0-beta.7.json +9 -0
- package/dist/migrations/manifests/0.6.0-beta.8.json +9 -0
- package/dist/migrations/manifests/0.6.0-beta.9.json +9 -0
- package/dist/templates/claude/agents/trellis-check.md +13 -7
- package/dist/templates/claude/agents/trellis-implement.md +8 -7
- package/dist/templates/claude/settings.json +4 -4
- package/dist/templates/codebuddy/agents/trellis-check.md +13 -7
- package/dist/templates/codebuddy/agents/trellis-implement.md +8 -7
- package/dist/templates/codebuddy/settings.json +4 -4
- package/dist/templates/codex/agents/trellis-check.toml +4 -4
- package/dist/templates/codex/agents/trellis-implement.toml +4 -4
- package/dist/templates/codex/config.toml +9 -16
- package/dist/templates/codex/hooks/session-start.py +205 -119
- package/dist/templates/codex/hooks.json +2 -2
- package/dist/templates/codex/skills/before-dev/SKILL.md +12 -6
- package/dist/templates/codex/skills/brainstorm/SKILL.md +69 -457
- package/dist/templates/codex/skills/check/SKILL.md +86 -18
- package/dist/templates/codex/skills/start/SKILL.md +33 -323
- package/dist/templates/common/bundled-skills/trellis-meta/references/customize-local/change-context-loading.md +7 -4
- package/dist/templates/common/bundled-skills/trellis-meta/references/customize-local/change-spec-structure.md +1 -1
- package/dist/templates/common/bundled-skills/trellis-meta/references/customize-local/change-workflow.md +3 -2
- package/dist/templates/common/bundled-skills/trellis-meta/references/local-architecture/context-injection.md +5 -5
- package/dist/templates/common/bundled-skills/trellis-meta/references/local-architecture/spec-system.md +1 -1
- package/dist/templates/common/bundled-skills/trellis-meta/references/local-architecture/task-system.md +35 -6
- package/dist/templates/common/bundled-skills/trellis-meta/references/platform-files/agents.md +5 -4
- package/dist/templates/common/bundled-skills/trellis-spec-bootstarp/SKILL.md +41 -0
- package/dist/templates/common/bundled-skills/trellis-spec-bootstarp/references/mcp-setup.md +90 -0
- package/dist/templates/common/bundled-skills/trellis-spec-bootstarp/references/repository-analysis.md +59 -0
- package/dist/templates/common/bundled-skills/trellis-spec-bootstarp/references/spec-task-planning.md +61 -0
- package/dist/templates/common/bundled-skills/trellis-spec-bootstarp/references/spec-writing.md +70 -0
- package/dist/templates/common/commands/continue.md +6 -5
- package/dist/templates/common/commands/start.md +9 -6
- package/dist/templates/common/skills/before-dev.md +12 -6
- package/dist/templates/common/skills/brainstorm.md +68 -504
- package/dist/templates/common/skills/check.md +7 -1
- package/dist/templates/copilot/hooks/session-start.py +219 -101
- package/dist/templates/copilot/hooks.json +2 -2
- package/dist/templates/copilot/prompts/before-dev.prompt.md +12 -6
- package/dist/templates/copilot/prompts/brainstorm.prompt.md +69 -457
- package/dist/templates/copilot/prompts/check.prompt.md +86 -18
- package/dist/templates/copilot/prompts/parallel.prompt.md +16 -8
- package/dist/templates/copilot/prompts/start.prompt.md +33 -367
- package/dist/templates/cursor/agents/trellis-check.md +13 -7
- package/dist/templates/cursor/agents/trellis-implement.md +8 -7
- package/dist/templates/cursor/hooks.json +1 -7
- package/dist/templates/droid/droids/trellis-check.md +13 -7
- package/dist/templates/droid/droids/trellis-implement.md +8 -7
- package/dist/templates/droid/settings.json +4 -4
- package/dist/templates/gemini/agents/trellis-check.md +11 -5
- package/dist/templates/gemini/agents/trellis-implement.md +7 -6
- package/dist/templates/gemini/settings.json +2 -2
- package/dist/templates/kiro/agents/trellis-check.json +1 -1
- package/dist/templates/kiro/agents/trellis-implement.json +1 -1
- package/dist/templates/markdown/spec/guides/code-reuse-thinking-guide.md.txt +127 -9
- package/dist/templates/markdown/spec/guides/cross-layer-thinking-guide.md.txt +171 -6
- package/dist/templates/markdown/spec/guides/cross-platform-thinking-guide.md.txt +333 -43
- package/dist/templates/markdown/spec/guides/index.md.txt +18 -0
- package/dist/templates/opencode/agents/trellis-check.md +13 -7
- package/dist/templates/opencode/agents/trellis-implement.md +9 -8
- package/dist/templates/opencode/lib/session-utils.js +212 -123
- package/dist/templates/opencode/lib/trellis-context.js +73 -11
- package/dist/templates/opencode/plugins/inject-subagent-context.js +131 -29
- package/dist/templates/opencode/plugins/inject-workflow-state.js +9 -5
- package/dist/templates/opencode/plugins/session-start.js +9 -1
- package/dist/templates/pi/agents/trellis-check.md +5 -4
- package/dist/templates/pi/agents/trellis-implement.md +5 -4
- package/dist/templates/pi/extensions/trellis/index.ts.txt +1357 -754
- package/dist/templates/qoder/agents/trellis-check.md +11 -5
- package/dist/templates/qoder/agents/trellis-implement.md +7 -6
- package/dist/templates/qoder/settings.json +4 -4
- package/dist/templates/shared-hooks/index.d.ts.map +1 -1
- package/dist/templates/shared-hooks/index.js +0 -1
- package/dist/templates/shared-hooks/index.js.map +1 -1
- package/dist/templates/shared-hooks/inject-subagent-context.py +36 -14
- package/dist/templates/shared-hooks/inject-workflow-state.py +40 -42
- package/dist/templates/shared-hooks/session-start.py +222 -171
- package/dist/templates/trellis/config.yaml +38 -0
- package/dist/templates/trellis/index.d.ts +1 -0
- package/dist/templates/trellis/index.d.ts.map +1 -1
- package/dist/templates/trellis/index.js +2 -0
- package/dist/templates/trellis/index.js.map +1 -1
- package/dist/templates/trellis/scripts/add_session.py +50 -24
- package/dist/templates/trellis/scripts/common/config.py +57 -1
- package/dist/templates/trellis/scripts/common/safe_commit.py +285 -0
- package/dist/templates/trellis/scripts/common/session_context.py +384 -137
- package/dist/templates/trellis/scripts/common/task_context.py +3 -3
- package/dist/templates/trellis/scripts/common/task_store.py +161 -15
- package/dist/templates/trellis/scripts/common/workflow_phase.py +7 -10
- package/dist/templates/trellis/scripts/task.py +3 -3
- package/dist/templates/trellis/workflow.md +119 -98
- package/dist/utils/cwd-guard.d.ts +38 -0
- package/dist/utils/cwd-guard.d.ts.map +1 -0
- package/dist/utils/cwd-guard.js +62 -0
- package/dist/utils/cwd-guard.js.map +1 -0
- package/dist/utils/file-writer.d.ts +13 -0
- package/dist/utils/file-writer.d.ts.map +1 -1
- package/dist/utils/file-writer.js +59 -1
- package/dist/utils/file-writer.js.map +1 -1
- package/dist/utils/manifest-prune.d.ts +61 -0
- package/dist/utils/manifest-prune.d.ts.map +1 -0
- package/dist/utils/manifest-prune.js +136 -0
- package/dist/utils/manifest-prune.js.map +1 -0
- package/dist/utils/task-json.d.ts +9 -42
- package/dist/utils/task-json.d.ts.map +1 -1
- package/dist/utils/task-json.js +8 -45
- package/dist/utils/task-json.js.map +1 -1
- package/dist/utils/template-hash.d.ts +32 -6
- package/dist/utils/template-hash.d.ts.map +1 -1
- package/dist/utils/template-hash.js +53 -31
- package/dist/utils/template-hash.js.map +1 -1
- package/dist/utils/uninstall-scrubbers.d.ts +1 -0
- package/dist/utils/uninstall-scrubbers.d.ts.map +1 -1
- package/dist/utils/uninstall-scrubbers.js +21 -0
- package/dist/utils/uninstall-scrubbers.js.map +1 -1
- package/dist/utils/workflow-resolver.d.ts +86 -0
- package/dist/utils/workflow-resolver.d.ts.map +1 -0
- package/dist/utils/workflow-resolver.js +265 -0
- package/dist/utils/workflow-resolver.js.map +1 -0
- package/package.json +9 -8
|
@@ -2,6 +2,7 @@ import fs from "node:fs";
|
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import chalk from "chalk";
|
|
4
4
|
import inquirer from "inquirer";
|
|
5
|
+
import { toPosix } from "./posix.js";
|
|
5
6
|
// Global write mode (set from CLI options)
|
|
6
7
|
let globalWriteMode = "ask";
|
|
7
8
|
export function setWriteMode(mode) {
|
|
@@ -10,6 +11,51 @@ export function setWriteMode(mode) {
|
|
|
10
11
|
export function getWriteMode() {
|
|
11
12
|
return globalWriteMode;
|
|
12
13
|
}
|
|
14
|
+
// ---------------------------------------------------------------------------
|
|
15
|
+
// Write recording
|
|
16
|
+
//
|
|
17
|
+
// `trellis init` uses recording to capture exactly which files were actually
|
|
18
|
+
// written this run (vs skipped because they already existed). The captured
|
|
19
|
+
// set is what `.template-hashes.json` should contain — NOT a blind directory
|
|
20
|
+
// walk of `.codex/` / `.claude/` / etc, which would include user-owned files
|
|
21
|
+
// that pre-dated init. See `pruneOrphanManifestKeys` for the self-heal side
|
|
22
|
+
// of the same contract.
|
|
23
|
+
// ---------------------------------------------------------------------------
|
|
24
|
+
/** When recording is active, every actual `writeFile` disk write appends here. */
|
|
25
|
+
let writeRecorder = null;
|
|
26
|
+
/** Project root used to convert absolute write paths to POSIX-relative keys. */
|
|
27
|
+
let writeRecorderRoot = null;
|
|
28
|
+
/**
|
|
29
|
+
* Begin recording every write into the returned Set. Calls accumulate into the
|
|
30
|
+
* same set until `stopRecordingWrites` runs. POSIX relative paths (relative to
|
|
31
|
+
* `cwd`) are stored, matching `.template-hashes.json` keys.
|
|
32
|
+
*
|
|
33
|
+
* Nested recording sessions are NOT supported — the caller must ensure
|
|
34
|
+
* `stopRecordingWrites` runs before the next `startRecordingWrites`. Failure
|
|
35
|
+
* is silent (the second `start` replaces the first set), so callers should
|
|
36
|
+
* always pair start/stop in try/finally.
|
|
37
|
+
*/
|
|
38
|
+
export function startRecordingWrites(cwd) {
|
|
39
|
+
const sink = new Set();
|
|
40
|
+
writeRecorder = sink;
|
|
41
|
+
writeRecorderRoot = cwd;
|
|
42
|
+
return sink;
|
|
43
|
+
}
|
|
44
|
+
/** End recording. Subsequent writes are not captured until `start` is called again. */
|
|
45
|
+
export function stopRecordingWrites() {
|
|
46
|
+
writeRecorder = null;
|
|
47
|
+
writeRecorderRoot = null;
|
|
48
|
+
}
|
|
49
|
+
/** Record a successful write. Called internally by `writeFile`. */
|
|
50
|
+
function recordWrite(absPath) {
|
|
51
|
+
if (!writeRecorder || !writeRecorderRoot)
|
|
52
|
+
return;
|
|
53
|
+
const rel = path.relative(writeRecorderRoot, absPath);
|
|
54
|
+
// Defensive: skip writes outside cwd (no meaningful manifest key).
|
|
55
|
+
if (rel.startsWith("..") || path.isAbsolute(rel))
|
|
56
|
+
return;
|
|
57
|
+
writeRecorder.add(toPosix(rel));
|
|
58
|
+
}
|
|
13
59
|
/**
|
|
14
60
|
* Get relative path from cwd for display
|
|
15
61
|
*/
|
|
@@ -49,12 +95,15 @@ export async function writeFile(filePath, content, options) {
|
|
|
49
95
|
if (options?.executable) {
|
|
50
96
|
fs.chmodSync(filePath, "755");
|
|
51
97
|
}
|
|
98
|
+
recordWrite(filePath);
|
|
52
99
|
return true;
|
|
53
100
|
}
|
|
54
101
|
// File exists, check if content is identical
|
|
55
102
|
const existingContent = fs.readFileSync(filePath, "utf-8");
|
|
56
103
|
if (existingContent === content) {
|
|
57
|
-
// Content identical,
|
|
104
|
+
// Content identical, but no disk write happened. Do not record it for
|
|
105
|
+
// init-time manifests: pre-existing user files can legitimately be
|
|
106
|
+
// byte-identical to a Trellis template and still not be Trellis-owned.
|
|
58
107
|
return false;
|
|
59
108
|
}
|
|
60
109
|
// File exists with different content, handle based on mode.
|
|
@@ -70,15 +119,22 @@ export async function writeFile(filePath, content, options) {
|
|
|
70
119
|
fs.chmodSync(filePath, "755");
|
|
71
120
|
}
|
|
72
121
|
console.log(chalk.yellow(` ↻ Overwritten: ${displayPath}`));
|
|
122
|
+
recordWrite(filePath);
|
|
73
123
|
return true;
|
|
74
124
|
}
|
|
75
125
|
if (mode === "skip") {
|
|
76
126
|
console.log(chalk.gray(` ○ Skipped: ${displayPath} (already exists)`));
|
|
127
|
+
// Skipped: trellis did NOT write this file — caller should not track it
|
|
128
|
+
// in the manifest. This is the AGENTS.md skip-existing case.
|
|
77
129
|
return false;
|
|
78
130
|
}
|
|
79
131
|
if (mode === "append") {
|
|
80
132
|
appendToFile(filePath, content, options);
|
|
81
133
|
console.log(chalk.blue(` + Appended: ${displayPath}`));
|
|
134
|
+
// Append: trellis added trellis content to a user-owned file. Tracking
|
|
135
|
+
// is risky here (uninstall would unlink the whole file), so we do NOT
|
|
136
|
+
// record appended files. Users on `--append` get a fresh manifest miss
|
|
137
|
+
// on next update; that's the safer default.
|
|
82
138
|
return true;
|
|
83
139
|
}
|
|
84
140
|
// mode === 'ask': Interactive prompt
|
|
@@ -107,6 +163,7 @@ export async function writeFile(filePath, content, options) {
|
|
|
107
163
|
fs.chmodSync(filePath, "755");
|
|
108
164
|
}
|
|
109
165
|
console.log(chalk.yellow(` ↻ Overwritten: ${displayPath}`));
|
|
166
|
+
recordWrite(filePath);
|
|
110
167
|
return true;
|
|
111
168
|
}
|
|
112
169
|
if (action === "append") {
|
|
@@ -126,6 +183,7 @@ export async function writeFile(filePath, content, options) {
|
|
|
126
183
|
fs.chmodSync(filePath, "755");
|
|
127
184
|
}
|
|
128
185
|
console.log(chalk.yellow(` ↻ Overwritten: ${displayPath}`));
|
|
186
|
+
recordWrite(filePath);
|
|
129
187
|
return true;
|
|
130
188
|
}
|
|
131
189
|
if (action === "append-all") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-writer.js","sourceRoot":"","sources":["../../src/utils/file-writer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,QAAQ,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"file-writer.js","sourceRoot":"","sources":["../../src/utils/file-writer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Self-heal poisoned `.template-hashes.json` manifests.
|
|
3
|
+
*
|
|
4
|
+
* Versions before this fix walked `.codex/`, `.claude/`, etc. with a blind
|
|
5
|
+
* recursive scan when computing the manifest, so they hashed user-owned
|
|
6
|
+
* runtime data (`.codex/sessions/*`, `.claude/projects/*.jsonl`, pre-existing
|
|
7
|
+
* `AGENTS.md`, user-added `.codex/skills/<custom>/`, …). On uninstall, every
|
|
8
|
+
* manifest entry is unlinked, which silently deletes user data.
|
|
9
|
+
*
|
|
10
|
+
* `pruneOrphanManifestKeys` removes any manifest entry that no current
|
|
11
|
+
* platform configurator owns. The two entry points that consume it are
|
|
12
|
+
* `trellis update` (before migration classification) and `trellis uninstall`
|
|
13
|
+
* (before plan building). Together they ensure existing poisoned manifests
|
|
14
|
+
* self-correct on the next routine command.
|
|
15
|
+
*
|
|
16
|
+
* Rules:
|
|
17
|
+
* - `.trellis/*` entries are ALWAYS kept. `trellis uninstall` removes
|
|
18
|
+
* `.trellis/` wholesale via `fs.rmSync(..., { recursive: true })`, so
|
|
19
|
+
* manifest accuracy there doesn't affect uninstall data-loss. `update`
|
|
20
|
+
* also relies on these entries to detect user-modified workflow files.
|
|
21
|
+
* - Root-level `AGENTS.md` is kept only when it still looks Trellis-managed
|
|
22
|
+
* (contains the managed block markers) or is missing on disk. This
|
|
23
|
+
* self-heals old poisoned manifests for user-owned AGENTS.md files that
|
|
24
|
+
* predated init and were skipped.
|
|
25
|
+
* - Paths referenced by `from`/`to` of any migration manifest entry
|
|
26
|
+
* (rename, rename-dir, delete, safe-file-delete) are preserved. Pruning
|
|
27
|
+
* them would prevent legitimate pending migrations from finding their
|
|
28
|
+
* source/target.
|
|
29
|
+
* - Everything else: if the path is not in the union of
|
|
30
|
+
* `collectPlatformTemplates()` for currently-configured platforms, it is
|
|
31
|
+
* pruned. This matches "files trellis actually wrote during init/update".
|
|
32
|
+
*/
|
|
33
|
+
import type { AITool } from "../types/ai-tools.js";
|
|
34
|
+
import type { TemplateHashes } from "../types/migration.js";
|
|
35
|
+
export interface PruneResult {
|
|
36
|
+
/** Manifest keys removed (POSIX-style relative paths). */
|
|
37
|
+
pruned: string[];
|
|
38
|
+
/** The post-prune manifest (saved to disk only when `pruned.length > 0`). */
|
|
39
|
+
hashes: TemplateHashes;
|
|
40
|
+
}
|
|
41
|
+
export interface PruneOptions {
|
|
42
|
+
/**
|
|
43
|
+
* Save the pruned manifest to `.template-hashes.json`. Defaults to true.
|
|
44
|
+
* Callers can pass `false` to compute the prune without mutating disk
|
|
45
|
+
* (dry-run, change-analysis passes).
|
|
46
|
+
*/
|
|
47
|
+
persist?: boolean;
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Walk the manifest and split it into kept vs pruned entries.
|
|
51
|
+
*
|
|
52
|
+
* @param cwd Project root — used to save the rewritten manifest.
|
|
53
|
+
* @param configuredPlatforms Output of `getConfiguredPlatforms(cwd)` — caller
|
|
54
|
+
* resolves this so we don't have to re-walk the filesystem.
|
|
55
|
+
* @param hashes Already-loaded manifest contents. Passing it in (vs reading
|
|
56
|
+
* from disk) lets the caller chain `loadHashes` → prune → use the result.
|
|
57
|
+
* @param options.persist When true (default), saves the pruned manifest to
|
|
58
|
+
* disk. Pass `false` for dry-run flows.
|
|
59
|
+
*/
|
|
60
|
+
export declare function pruneOrphanManifestKeys(cwd: string, configuredPlatforms: readonly AITool[], hashes: TemplateHashes, options?: PruneOptions): PruneResult;
|
|
61
|
+
//# sourceMappingURL=manifest-prune.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"manifest-prune.d.ts","sourceRoot":"","sources":["../../src/utils/manifest-prune.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAUH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAK5D,MAAM,WAAW,WAAW;IAC1B,0DAA0D;IAC1D,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,6EAA6E;IAC7E,MAAM,EAAE,cAAc,CAAC;CACxB;AAoDD,MAAM,WAAW,YAAY;IAC3B;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,EACX,mBAAmB,EAAE,SAAS,MAAM,EAAE,EACtC,MAAM,EAAE,cAAc,EACtB,OAAO,GAAE,YAAiB,GACzB,WAAW,CAmCb"}
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Self-heal poisoned `.template-hashes.json` manifests.
|
|
3
|
+
*
|
|
4
|
+
* Versions before this fix walked `.codex/`, `.claude/`, etc. with a blind
|
|
5
|
+
* recursive scan when computing the manifest, so they hashed user-owned
|
|
6
|
+
* runtime data (`.codex/sessions/*`, `.claude/projects/*.jsonl`, pre-existing
|
|
7
|
+
* `AGENTS.md`, user-added `.codex/skills/<custom>/`, …). On uninstall, every
|
|
8
|
+
* manifest entry is unlinked, which silently deletes user data.
|
|
9
|
+
*
|
|
10
|
+
* `pruneOrphanManifestKeys` removes any manifest entry that no current
|
|
11
|
+
* platform configurator owns. The two entry points that consume it are
|
|
12
|
+
* `trellis update` (before migration classification) and `trellis uninstall`
|
|
13
|
+
* (before plan building). Together they ensure existing poisoned manifests
|
|
14
|
+
* self-correct on the next routine command.
|
|
15
|
+
*
|
|
16
|
+
* Rules:
|
|
17
|
+
* - `.trellis/*` entries are ALWAYS kept. `trellis uninstall` removes
|
|
18
|
+
* `.trellis/` wholesale via `fs.rmSync(..., { recursive: true })`, so
|
|
19
|
+
* manifest accuracy there doesn't affect uninstall data-loss. `update`
|
|
20
|
+
* also relies on these entries to detect user-modified workflow files.
|
|
21
|
+
* - Root-level `AGENTS.md` is kept only when it still looks Trellis-managed
|
|
22
|
+
* (contains the managed block markers) or is missing on disk. This
|
|
23
|
+
* self-heals old poisoned manifests for user-owned AGENTS.md files that
|
|
24
|
+
* predated init and were skipped.
|
|
25
|
+
* - Paths referenced by `from`/`to` of any migration manifest entry
|
|
26
|
+
* (rename, rename-dir, delete, safe-file-delete) are preserved. Pruning
|
|
27
|
+
* them would prevent legitimate pending migrations from finding their
|
|
28
|
+
* source/target.
|
|
29
|
+
* - Everything else: if the path is not in the union of
|
|
30
|
+
* `collectPlatformTemplates()` for currently-configured platforms, it is
|
|
31
|
+
* pruned. This matches "files trellis actually wrote during init/update".
|
|
32
|
+
*/
|
|
33
|
+
import fs from "node:fs";
|
|
34
|
+
import path from "node:path";
|
|
35
|
+
import { collectPlatformTemplates } from "../configurators/index.js";
|
|
36
|
+
import { FILE_NAMES } from "../constants/paths.js";
|
|
37
|
+
import { getAllMigrations } from "../migrations/index.js";
|
|
38
|
+
import { saveHashes } from "./template-hash.js";
|
|
39
|
+
import { toPosix } from "./posix.js";
|
|
40
|
+
const TRELLIS_BLOCK_START = "<!-- TRELLIS:START -->";
|
|
41
|
+
const TRELLIS_BLOCK_END = "<!-- TRELLIS:END -->";
|
|
42
|
+
/**
|
|
43
|
+
* Compute the union of "what trellis writes" across:
|
|
44
|
+
* - every configured platform's collectTemplates() output
|
|
45
|
+
* - root-level AGENTS.md when it still carries Trellis managed-block markers
|
|
46
|
+
* - every migration manifest's from/to path (preserve so legitimate
|
|
47
|
+
* pending migrations can find their source/target)
|
|
48
|
+
*/
|
|
49
|
+
function buildKnownKeys(configuredPlatforms) {
|
|
50
|
+
const known = new Set();
|
|
51
|
+
for (const id of configuredPlatforms) {
|
|
52
|
+
const templates = collectPlatformTemplates(id);
|
|
53
|
+
if (!templates)
|
|
54
|
+
continue;
|
|
55
|
+
for (const key of templates.keys()) {
|
|
56
|
+
known.add(toPosix(key));
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
// Preserve any path referenced by a migration: legitimate pending
|
|
60
|
+
// rename/delete operations need to resolve their `from` (and the target's
|
|
61
|
+
// hash record for `to`) even if the current registry doesn't list it.
|
|
62
|
+
for (const migration of getAllMigrations()) {
|
|
63
|
+
if (migration.from)
|
|
64
|
+
known.add(toPosix(migration.from));
|
|
65
|
+
if (migration.to)
|
|
66
|
+
known.add(toPosix(migration.to));
|
|
67
|
+
}
|
|
68
|
+
return known;
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* Root-level AGENTS.md needs special handling because it has no platform
|
|
72
|
+
* registry owner. New fixed inits record it only when written, but old
|
|
73
|
+
* manifests may contain a user-owned AGENTS.md that init skipped. The
|
|
74
|
+
* managed block markers are the least destructive ownership signal: no
|
|
75
|
+
* markers means preserve the user's file by pruning the stale manifest key.
|
|
76
|
+
*/
|
|
77
|
+
function shouldKeepAgentsMd(cwd) {
|
|
78
|
+
const fullPath = path.join(cwd, FILE_NAMES.AGENTS);
|
|
79
|
+
if (!fs.existsSync(fullPath)) {
|
|
80
|
+
return true;
|
|
81
|
+
}
|
|
82
|
+
try {
|
|
83
|
+
const content = fs.readFileSync(fullPath, "utf-8");
|
|
84
|
+
return (content.includes(TRELLIS_BLOCK_START) &&
|
|
85
|
+
content.includes(TRELLIS_BLOCK_END));
|
|
86
|
+
}
|
|
87
|
+
catch {
|
|
88
|
+
return true;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
/**
|
|
92
|
+
* Walk the manifest and split it into kept vs pruned entries.
|
|
93
|
+
*
|
|
94
|
+
* @param cwd Project root — used to save the rewritten manifest.
|
|
95
|
+
* @param configuredPlatforms Output of `getConfiguredPlatforms(cwd)` — caller
|
|
96
|
+
* resolves this so we don't have to re-walk the filesystem.
|
|
97
|
+
* @param hashes Already-loaded manifest contents. Passing it in (vs reading
|
|
98
|
+
* from disk) lets the caller chain `loadHashes` → prune → use the result.
|
|
99
|
+
* @param options.persist When true (default), saves the pruned manifest to
|
|
100
|
+
* disk. Pass `false` for dry-run flows.
|
|
101
|
+
*/
|
|
102
|
+
export function pruneOrphanManifestKeys(cwd, configuredPlatforms, hashes, options = {}) {
|
|
103
|
+
const persist = options.persist ?? true;
|
|
104
|
+
const known = buildKnownKeys(configuredPlatforms);
|
|
105
|
+
const pruned = [];
|
|
106
|
+
const kept = {};
|
|
107
|
+
for (const [rawKey, value] of Object.entries(hashes)) {
|
|
108
|
+
const key = toPosix(rawKey);
|
|
109
|
+
// Always preserve .trellis/ entries — they're for the workflow tree
|
|
110
|
+
// which uninstall removes wholesale and which update needs for
|
|
111
|
+
// modified-file detection.
|
|
112
|
+
if (key.startsWith(".trellis/") || key === ".trellis") {
|
|
113
|
+
kept[key] = value;
|
|
114
|
+
continue;
|
|
115
|
+
}
|
|
116
|
+
if (key === FILE_NAMES.AGENTS) {
|
|
117
|
+
if (shouldKeepAgentsMd(cwd)) {
|
|
118
|
+
kept[key] = value;
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
pruned.push(key);
|
|
122
|
+
}
|
|
123
|
+
continue;
|
|
124
|
+
}
|
|
125
|
+
if (known.has(key)) {
|
|
126
|
+
kept[key] = value;
|
|
127
|
+
continue;
|
|
128
|
+
}
|
|
129
|
+
pruned.push(key);
|
|
130
|
+
}
|
|
131
|
+
if (persist && pruned.length > 0) {
|
|
132
|
+
saveHashes(cwd, kept);
|
|
133
|
+
}
|
|
134
|
+
return { pruned, hashes: kept };
|
|
135
|
+
}
|
|
136
|
+
//# sourceMappingURL=manifest-prune.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"manifest-prune.js","sourceRoot":"","sources":["../../src/utils/manifest-prune.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,46 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Canonical task.json shape — single source of truth shared by all TS
|
|
2
|
+
* Canonical task.json shape — single source of truth shared by all TS
|
|
3
|
+
* writers. The canonical types and factory now live in the
|
|
4
|
+
* `@mindfoldhq/trellis-core` task API; this module re-exports them under
|
|
5
|
+
* the legacy `TaskJson` / `emptyTaskJson` names for CLI call sites.
|
|
3
6
|
*
|
|
4
|
-
*
|
|
5
|
-
* `
|
|
6
|
-
* so bootstrap tasks (trellis init) and migration tasks (trellis update
|
|
7
|
-
* --migrate) produce structurally identical task.json files.
|
|
8
|
-
*
|
|
9
|
-
* Field names, order, and null defaults match task_store.py exactly.
|
|
10
|
-
*/
|
|
11
|
-
export interface TaskJson {
|
|
12
|
-
id: string;
|
|
13
|
-
name: string;
|
|
14
|
-
title: string;
|
|
15
|
-
description: string;
|
|
16
|
-
status: string;
|
|
17
|
-
dev_type: string | null;
|
|
18
|
-
scope: string | null;
|
|
19
|
-
package: string | null;
|
|
20
|
-
priority: string;
|
|
21
|
-
creator: string;
|
|
22
|
-
assignee: string;
|
|
23
|
-
createdAt: string;
|
|
24
|
-
completedAt: string | null;
|
|
25
|
-
branch: string | null;
|
|
26
|
-
base_branch: string | null;
|
|
27
|
-
worktree_path: string | null;
|
|
28
|
-
commit: string | null;
|
|
29
|
-
pr_url: string | null;
|
|
30
|
-
subtasks: string[];
|
|
31
|
-
children: string[];
|
|
32
|
-
parent: string | null;
|
|
33
|
-
relatedFiles: string[];
|
|
34
|
-
notes: string;
|
|
35
|
-
meta: Record<string, unknown>;
|
|
36
|
-
}
|
|
37
|
-
/**
|
|
38
|
-
* Produce a fully-populated canonical-shape TaskJson.
|
|
39
|
-
*
|
|
40
|
-
* All 24 fields are emitted in canonical order. `overrides` shallow-merges on
|
|
41
|
-
* top — callers should supply the per-task values (id, name, title, assignee,
|
|
42
|
-
* createdAt, etc.) and leave null-default fields untouched unless they have a
|
|
43
|
-
* real value.
|
|
7
|
+
* New code should prefer `TrellisTaskRecord` / `emptyTaskRecord` from
|
|
8
|
+
* `@mindfoldhq/trellis-core/task` directly.
|
|
44
9
|
*/
|
|
45
|
-
|
|
10
|
+
import { emptyTaskRecord, type TrellisTaskRecord } from "@mindfoldhq/trellis-core/task";
|
|
11
|
+
export type TaskJson = TrellisTaskRecord;
|
|
12
|
+
export declare const emptyTaskJson: typeof emptyTaskRecord;
|
|
46
13
|
//# sourceMappingURL=task-json.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-json.d.ts","sourceRoot":"","sources":["../../src/utils/task-json.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"task-json.d.ts","sourceRoot":"","sources":["../../src/utils/task-json.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EACL,eAAe,EACf,KAAK,iBAAiB,EACvB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,MAAM,QAAQ,GAAG,iBAAiB,CAAC;AAEzC,eAAO,MAAM,aAAa,wBAAkB,CAAC"}
|
package/dist/utils/task-json.js
CHANGED
|
@@ -1,49 +1,12 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Canonical task.json shape — single source of truth shared by all TS
|
|
2
|
+
* Canonical task.json shape — single source of truth shared by all TS
|
|
3
|
+
* writers. The canonical types and factory now live in the
|
|
4
|
+
* `@mindfoldhq/trellis-core` task API; this module re-exports them under
|
|
5
|
+
* the legacy `TaskJson` / `emptyTaskJson` names for CLI call sites.
|
|
3
6
|
*
|
|
4
|
-
*
|
|
5
|
-
* `
|
|
6
|
-
* so bootstrap tasks (trellis init) and migration tasks (trellis update
|
|
7
|
-
* --migrate) produce structurally identical task.json files.
|
|
8
|
-
*
|
|
9
|
-
* Field names, order, and null defaults match task_store.py exactly.
|
|
10
|
-
*/
|
|
11
|
-
/**
|
|
12
|
-
* Produce a fully-populated canonical-shape TaskJson.
|
|
13
|
-
*
|
|
14
|
-
* All 24 fields are emitted in canonical order. `overrides` shallow-merges on
|
|
15
|
-
* top — callers should supply the per-task values (id, name, title, assignee,
|
|
16
|
-
* createdAt, etc.) and leave null-default fields untouched unless they have a
|
|
17
|
-
* real value.
|
|
7
|
+
* New code should prefer `TrellisTaskRecord` / `emptyTaskRecord` from
|
|
8
|
+
* `@mindfoldhq/trellis-core/task` directly.
|
|
18
9
|
*/
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
const base = {
|
|
22
|
-
id: "",
|
|
23
|
-
name: "",
|
|
24
|
-
title: "",
|
|
25
|
-
description: "",
|
|
26
|
-
status: "planning",
|
|
27
|
-
dev_type: null,
|
|
28
|
-
scope: null,
|
|
29
|
-
package: null,
|
|
30
|
-
priority: "P2",
|
|
31
|
-
creator: "",
|
|
32
|
-
assignee: "",
|
|
33
|
-
createdAt: today,
|
|
34
|
-
completedAt: null,
|
|
35
|
-
branch: null,
|
|
36
|
-
base_branch: null,
|
|
37
|
-
worktree_path: null,
|
|
38
|
-
commit: null,
|
|
39
|
-
pr_url: null,
|
|
40
|
-
subtasks: [],
|
|
41
|
-
children: [],
|
|
42
|
-
parent: null,
|
|
43
|
-
relatedFiles: [],
|
|
44
|
-
notes: "",
|
|
45
|
-
meta: {},
|
|
46
|
-
};
|
|
47
|
-
return { ...base, ...overrides };
|
|
48
|
-
}
|
|
10
|
+
import { emptyTaskRecord, } from "@mindfoldhq/trellis-core/task";
|
|
11
|
+
export const emptyTaskJson = emptyTaskRecord;
|
|
49
12
|
//# sourceMappingURL=task-json.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-json.js","sourceRoot":"","sources":["../../src/utils/task-json.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"task-json.js","sourceRoot":"","sources":["../../src/utils/task-json.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EACL,eAAe,GAEhB,MAAM,+BAA+B,CAAC;AAIvC,MAAM,CAAC,MAAM,aAAa,GAAG,eAAe,CAAC"}
|
|
@@ -83,15 +83,41 @@ export declare function matchesOriginalTemplate(cwd: string, relativePath: strin
|
|
|
83
83
|
* @returns Map of path to modification status
|
|
84
84
|
*/
|
|
85
85
|
export declare function getModificationStatus(cwd: string, relativePaths: string[], hashes: TemplateHashes): Map<string, boolean>;
|
|
86
|
+
/** Options accepted by {@link initializeHashes}. */
|
|
87
|
+
export interface InitializeHashesOptions {
|
|
88
|
+
/**
|
|
89
|
+
* POSIX-style relative paths trellis actually wrote during the init run
|
|
90
|
+
* (captured via `startRecordingWrites` in `file-writer.ts`). Only these
|
|
91
|
+
* paths are hashed for the platform/root-level coverage; anything else
|
|
92
|
+
* under `.codex/` / `.claude/` / etc. is left alone, even if it exists
|
|
93
|
+
* on disk. Setting this to `undefined` or an empty set means "no
|
|
94
|
+
* platform/root coverage this run" — historical hashes from earlier
|
|
95
|
+
* runs are preserved via `merge`.
|
|
96
|
+
*/
|
|
97
|
+
trackedPaths?: ReadonlySet<string>;
|
|
98
|
+
/**
|
|
99
|
+
* When true, merge `trackedPaths`-derived hashes into the EXISTING manifest
|
|
100
|
+
* instead of replacing it. Used by `handleReinit` "add platform" flow so
|
|
101
|
+
* previously-tracked platforms aren't wiped from the manifest when only
|
|
102
|
+
* a new platform's writes are recorded. Defaults to false (replace).
|
|
103
|
+
*/
|
|
104
|
+
merge?: boolean;
|
|
105
|
+
}
|
|
86
106
|
/**
|
|
87
107
|
* Initialize template hashes after init
|
|
88
108
|
*
|
|
89
|
-
*
|
|
90
|
-
*
|
|
91
|
-
*
|
|
109
|
+
* The platform/root section of the manifest comes from `trackedPaths` —
|
|
110
|
+
* the set of POSIX paths that `writeFile` actually wrote (or owned with
|
|
111
|
+
* byte-identical content) during this init run. Avoids the historical bug
|
|
112
|
+
* where a blind directory walk of `.codex/` / `.claude/` swept up
|
|
113
|
+
* user-owned runtime data (chat history, session JSONLs).
|
|
92
114
|
*
|
|
93
|
-
*
|
|
94
|
-
*
|
|
115
|
+
* `.trellis/` is still walked recursively (with `EXCLUDE_FROM_HASH`) because
|
|
116
|
+
* uninstall removes `.trellis/` wholesale via `rm -rf` regardless of manifest
|
|
117
|
+
* content — accuracy there doesn't affect data-loss, only `trellis update`
|
|
118
|
+
* 3-way-merge fidelity (preserved by the existing walk).
|
|
119
|
+
*
|
|
120
|
+
* @returns Number of files hashed in the final manifest.
|
|
95
121
|
*/
|
|
96
|
-
export declare function initializeHashes(cwd: string): number;
|
|
122
|
+
export declare function initializeHashes(cwd: string, options?: InitializeHashesOptions): number;
|
|
97
123
|
//# sourceMappingURL=template-hash.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template-hash.d.ts","sourceRoot":"","sources":["../../src/utils/template-hash.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;
|
|
1
|
+
{"version":3,"file":"template-hash.d.ts","sourceRoot":"","sources":["../../src/utils/template-hash.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAOH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAe5D;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAGnD;AAoBD;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CA6BtD;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,GAAG,IAAI,CAOpE;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAQ1E;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAU1E;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAKlE;AAED;;GAEG;AACH,wBAAgB,UAAU,CACxB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GACd,IAAI,CASN;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,cAAc,GACrB,OAAO,CAsBT;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,GACtB,OAAO,CAST;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EAAE,EACvB,MAAM,EAAE,cAAc,GACrB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAQtB;AA8DD,oDAAoD;AACpD,MAAM,WAAW,uBAAuB;IACtC;;;;;;;;OAQG;IACH,YAAY,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACnC;;;;;OAKG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,uBAA4B,GACpC,MAAM,CAyDR"}
|