forge-workflow 0.0.5 → 0.0.6
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/.claude/commands/dev.md +6 -1
- package/.claude/commands/plan.md +59 -14
- package/.claude/commands/premerge.md +10 -0
- package/.claude/commands/review.md +7 -1
- package/.claude/commands/ship.md +95 -47
- package/.claude/commands/status.md +42 -0
- package/.claude/commands/validate.md +7 -1
- package/.claude/commands/verify.md +52 -4
- package/.claude/rules/workflow.md +16 -0
- package/.claude/scripts/greptile-resolve.sh +32 -0
- package/.cline/workflows/dev.md +6 -1
- package/.cline/workflows/plan.md +59 -14
- package/.cline/workflows/premerge.md +10 -0
- package/.cline/workflows/review.md +7 -1
- package/.cline/workflows/ship.md +95 -47
- package/.cline/workflows/status.md +42 -0
- package/.cline/workflows/validate.md +7 -1
- package/.cline/workflows/verify.md +52 -4
- package/.codex/skills/dev/SKILL.md +6 -1
- package/.codex/skills/plan/SKILL.md +59 -14
- package/.codex/skills/premerge/SKILL.md +10 -0
- package/.codex/skills/review/SKILL.md +7 -1
- package/.codex/skills/ship/SKILL.md +95 -47
- package/.codex/skills/status/SKILL.md +42 -0
- package/.codex/skills/validate/SKILL.md +7 -1
- package/.codex/skills/verify/SKILL.md +52 -4
- package/.cursor/commands/dev.md +6 -1
- package/.cursor/commands/plan.md +59 -14
- package/.cursor/commands/premerge.md +10 -0
- package/.cursor/commands/review.md +7 -1
- package/.cursor/commands/ship.md +95 -47
- package/.cursor/commands/status.md +42 -0
- package/.cursor/commands/validate.md +7 -1
- package/.cursor/commands/verify.md +52 -4
- package/.github/prompts/dev.prompt.md +6 -1
- package/.github/prompts/plan.prompt.md +59 -14
- package/.github/prompts/premerge.prompt.md +10 -0
- package/.github/prompts/review.prompt.md +7 -1
- package/.github/prompts/ship.prompt.md +95 -47
- package/.github/prompts/status.prompt.md +42 -0
- package/.github/prompts/validate.prompt.md +7 -1
- package/.github/prompts/verify.prompt.md +52 -4
- package/.kilocode/workflows/dev.md +6 -1
- package/.kilocode/workflows/plan.md +59 -14
- package/.kilocode/workflows/premerge.md +10 -0
- package/.kilocode/workflows/review.md +7 -1
- package/.kilocode/workflows/ship.md +95 -47
- package/.kilocode/workflows/status.md +42 -0
- package/.kilocode/workflows/validate.md +7 -1
- package/.kilocode/workflows/verify.md +52 -4
- package/.opencode/commands/dev.md +6 -1
- package/.opencode/commands/plan.md +59 -14
- package/.opencode/commands/premerge.md +10 -0
- package/.opencode/commands/review.md +7 -1
- package/.opencode/commands/ship.md +95 -47
- package/.opencode/commands/status.md +42 -0
- package/.opencode/commands/validate.md +7 -1
- package/.opencode/commands/verify.md +52 -4
- package/.roo/commands/dev.md +6 -1
- package/.roo/commands/plan.md +59 -14
- package/.roo/commands/premerge.md +10 -0
- package/.roo/commands/review.md +7 -1
- package/.roo/commands/ship.md +95 -47
- package/.roo/commands/status.md +42 -0
- package/.roo/commands/validate.md +7 -1
- package/.roo/commands/verify.md +52 -4
- package/AGENTS.md +97 -0
- package/CLAUDE.md +10 -0
- package/README.md +2 -2
- package/bin/forge-cmd.js +5 -1
- package/bin/forge-preflight.js +15 -2
- package/bin/forge.js +178 -9
- package/docs/ENHANCED_ONBOARDING.md +96 -86
- package/docs/ROADMAP.md +2 -2
- package/docs/TOOLCHAIN.md +23 -0
- package/docs/VALIDATION.md +1 -1
- package/lefthook.yml +11 -0
- package/lib/agents-config.js +2 -2
- package/lib/commands/_registry.js +134 -0
- package/lib/commands/clean.js +181 -0
- package/lib/commands/dev.js +58 -0
- package/lib/commands/push.js +196 -0
- package/lib/commands/recommend.js +1 -1
- package/lib/commands/sync.js +55 -0
- package/lib/commands/team.js +37 -0
- package/lib/commands/test.js +207 -0
- package/lib/commands/worktree.js +310 -0
- package/lib/docs-command.js +51 -0
- package/lib/docs-copy.js +50 -0
- package/lib/freshness-token.js +148 -0
- package/lib/greptile-match.js +80 -0
- package/lib/reset.js +309 -0
- package/lib/task-ownership.js +117 -0
- package/package.json +2 -2
- package/scripts/beads-context.sh +157 -22
- package/scripts/beads-context.test.js +5 -1
- package/scripts/check-forge-token.js +98 -0
- package/scripts/conflict-detect.sh +2 -2
- package/scripts/dep-guard.sh +6 -28
- package/scripts/file-index.sh +117 -23
- package/scripts/forge-team/index.sh +86 -0
- package/scripts/forge-team/lib/agent-prompt.sh +52 -0
- package/scripts/forge-team/lib/claim.sh +256 -0
- package/scripts/forge-team/lib/dashboard.sh +341 -0
- package/scripts/forge-team/lib/epic.sh +332 -0
- package/scripts/forge-team/lib/hooks.sh +253 -0
- package/scripts/forge-team/lib/identity.sh +235 -0
- package/scripts/forge-team/lib/sync-github.sh +317 -0
- package/scripts/forge-team/lib/verify.sh +284 -0
- package/scripts/forge-team/lib/workload.sh +296 -0
- package/scripts/forge-team/tests/agent-prompt.test.sh +72 -0
- package/scripts/forge-team/tests/claim.test.sh +179 -0
- package/scripts/forge-team/tests/dashboard.test.sh +170 -0
- package/scripts/forge-team/tests/dispatcher.test.sh +79 -0
- package/scripts/forge-team/tests/epic.test.sh +176 -0
- package/scripts/forge-team/tests/hooks.test.sh +239 -0
- package/scripts/forge-team/tests/identity.test.sh +176 -0
- package/scripts/forge-team/tests/integration.test.sh +371 -0
- package/scripts/forge-team/tests/sync-github.test.sh +209 -0
- package/scripts/forge-team/tests/verify.test.sh +314 -0
- package/scripts/forge-team/tests/workflow-integration.test.sh +43 -0
- package/scripts/forge-team/tests/workload.test.sh +209 -0
- package/scripts/lib/eval-runner.js +39 -0
- package/scripts/lib/jsonl-lock.sh +48 -0
- package/scripts/lib/sanitize.sh +116 -0
- package/scripts/pr-coordinator.sh +706 -0
- package/scripts/smart-status.sh +37 -10
- package/scripts/sync-utils.sh +24 -29
- package/scripts/test.js +3 -1
|
@@ -0,0 +1,207 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Test Command — Smart Test Runner
|
|
5
|
+
*
|
|
6
|
+
* Wraps test execution with smart defaults:
|
|
7
|
+
* - Auto-detects package manager from lockfiles
|
|
8
|
+
* - Checks Beads (Dolt) connectivity, sets BEADS_SKIP_TESTS if unavailable
|
|
9
|
+
* - Supports --affected flag to run only tests for changed files
|
|
10
|
+
*
|
|
11
|
+
* Security: Uses execFileSync for subprocess calls (OWASP A03)
|
|
12
|
+
*
|
|
13
|
+
* @module commands/test
|
|
14
|
+
*/
|
|
15
|
+
|
|
16
|
+
const { execFileSync: defaultExecFileSync, spawnSync: defaultSpawnSync } = require('node:child_process');
|
|
17
|
+
const defaultFs = require('node:fs');
|
|
18
|
+
const path = require('node:path');
|
|
19
|
+
|
|
20
|
+
/** @type {Array<[string, string]>} Lockfile → package manager mapping (order matters) */
|
|
21
|
+
const LOCKFILE_MAP = [
|
|
22
|
+
['bun.lockb', 'bun'],
|
|
23
|
+
['pnpm-lock.yaml', 'pnpm'],
|
|
24
|
+
['yarn.lock', 'yarn'],
|
|
25
|
+
['package-lock.json', 'npm'],
|
|
26
|
+
];
|
|
27
|
+
|
|
28
|
+
const DEFAULT_TIMEOUT = 120000;
|
|
29
|
+
const BEADS_CHECK_TIMEOUT = 3000;
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* Detect the package manager by checking which lockfile exists.
|
|
33
|
+
*
|
|
34
|
+
* @param {string} projectRoot - Absolute path to project root
|
|
35
|
+
* @param {Object} fs - Injected fs module
|
|
36
|
+
* @returns {string} Package manager command ('bun' | 'pnpm' | 'yarn' | 'npm')
|
|
37
|
+
*/
|
|
38
|
+
function detectPackageManager(projectRoot, fs) {
|
|
39
|
+
for (const [lockfile, manager] of LOCKFILE_MAP) {
|
|
40
|
+
if (fs.existsSync(path.join(projectRoot, lockfile))) {
|
|
41
|
+
return manager;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
return 'npm';
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/**
|
|
48
|
+
* Check if Beads (bd CLI) is reachable.
|
|
49
|
+
*
|
|
50
|
+
* @param {Function} execFileSync - Injected execFileSync
|
|
51
|
+
* @returns {boolean} true if bd is available
|
|
52
|
+
*/
|
|
53
|
+
function checkBeadsConnectivity(execFileSync) {
|
|
54
|
+
try {
|
|
55
|
+
execFileSync('bd', ['list', '--limit=1'], { timeout: BEADS_CHECK_TIMEOUT });
|
|
56
|
+
return true;
|
|
57
|
+
} catch (_e) { // NOSONAR S2486
|
|
58
|
+
/* intentional: bd not installed or unreachable */
|
|
59
|
+
return false;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
/**
|
|
64
|
+
* Get changed files relative to main branch, mapped to test file paths.
|
|
65
|
+
*
|
|
66
|
+
* Falls back to `git diff --name-only HEAD` if merge-base fails.
|
|
67
|
+
*
|
|
68
|
+
* @param {string} _projectRoot - Project root (unused, git uses cwd)
|
|
69
|
+
* @param {Function} execFileSync - Injected execFileSync
|
|
70
|
+
* @returns {string[]} Array of test file paths (e.g. ['test/foo.test.js'])
|
|
71
|
+
*/
|
|
72
|
+
function getAffectedTestFiles(_projectRoot, execFileSync) {
|
|
73
|
+
let diffRef;
|
|
74
|
+
|
|
75
|
+
// Detect default branch, then try merge-base
|
|
76
|
+
let baseBranch = 'main';
|
|
77
|
+
try {
|
|
78
|
+
baseBranch = execFileSync('git', ['rev-parse', '--abbrev-ref', 'origin/HEAD'], {
|
|
79
|
+
encoding: 'utf8', timeout: 3000,
|
|
80
|
+
}).trim().replace('origin/', '');
|
|
81
|
+
} catch (_e) { // NOSONAR S2486
|
|
82
|
+
/* intentional: origin/HEAD not set, detect base branch manually */
|
|
83
|
+
for (const name of ['main', 'master']) {
|
|
84
|
+
try {
|
|
85
|
+
execFileSync('git', ['rev-parse', '--verify', name], { stdio: 'pipe', timeout: 3000 });
|
|
86
|
+
baseBranch = name;
|
|
87
|
+
break;
|
|
88
|
+
} catch (_e2) { /* intentional: branch doesn't exist, try next name */ } // NOSONAR S2486
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
try {
|
|
93
|
+
const mergeBase = execFileSync('git', ['merge-base', 'HEAD', baseBranch], {
|
|
94
|
+
encoding: 'utf8',
|
|
95
|
+
timeout: 5000,
|
|
96
|
+
}).trim();
|
|
97
|
+
diffRef = `${mergeBase}...HEAD`;
|
|
98
|
+
} catch (_e) { /* intentional: merge-base failed, fallback to diff against HEAD */ // NOSONAR S2486
|
|
99
|
+
diffRef = 'HEAD';
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
let output;
|
|
103
|
+
try {
|
|
104
|
+
output = execFileSync('git', ['diff', '--name-only', diffRef], {
|
|
105
|
+
encoding: 'utf8',
|
|
106
|
+
timeout: 5000,
|
|
107
|
+
}).trim();
|
|
108
|
+
} catch (_e) { // NOSONAR S2486
|
|
109
|
+
/* intentional: git diff failed, no affected files to report */
|
|
110
|
+
return [];
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
if (!output) return [];
|
|
114
|
+
|
|
115
|
+
const changedFiles = output.split('\n').filter(Boolean);
|
|
116
|
+
|
|
117
|
+
// Map lib/*.js files to test/*.test.js
|
|
118
|
+
const testFiles = [];
|
|
119
|
+
for (const file of changedFiles) {
|
|
120
|
+
if (file.startsWith('lib/') && file.endsWith('.js')) {
|
|
121
|
+
const relative = file.slice('lib/'.length);
|
|
122
|
+
const testFile = `test/${relative.replace(/\.js$/, '.test.js')}`;
|
|
123
|
+
testFiles.push(testFile);
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
return testFiles;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
module.exports = {
|
|
131
|
+
name: 'test',
|
|
132
|
+
description: 'Run tests with smart defaults (timeout, Beads skip, affected-only)',
|
|
133
|
+
usage: 'forge test [--affected]',
|
|
134
|
+
flags: {
|
|
135
|
+
'--affected': 'Run only tests for changed files',
|
|
136
|
+
},
|
|
137
|
+
|
|
138
|
+
/**
|
|
139
|
+
* Run tests with smart defaults.
|
|
140
|
+
*
|
|
141
|
+
* @param {string[]} _args - Positional arguments (unused)
|
|
142
|
+
* @param {Object} flags - Parsed flags ({ affected?: boolean })
|
|
143
|
+
* @param {string} projectRoot - Absolute path to project root
|
|
144
|
+
* @param {Object} [deps] - Dependency injection for testability
|
|
145
|
+
* @param {Object} [deps.fs] - fs module
|
|
146
|
+
* @param {Function} [deps.execFileSync] - child_process.execFileSync
|
|
147
|
+
* @param {Function} [deps.spawnSync] - child_process.spawnSync
|
|
148
|
+
* @returns {Promise<{ success: boolean, exitCode: number, beadsSkipped: boolean }>}
|
|
149
|
+
*/
|
|
150
|
+
async handler(_args, flags, projectRoot, deps = {}) {
|
|
151
|
+
const fs = deps.fs || defaultFs;
|
|
152
|
+
const execFileSync = deps.execFileSync || defaultExecFileSync;
|
|
153
|
+
const spawnSync = deps.spawnSync || defaultSpawnSync;
|
|
154
|
+
|
|
155
|
+
// 1. Detect package manager
|
|
156
|
+
const pkgManager = detectPackageManager(projectRoot, fs);
|
|
157
|
+
|
|
158
|
+
// 2. Read timeout from package.json or use default
|
|
159
|
+
let timeout = DEFAULT_TIMEOUT;
|
|
160
|
+
try {
|
|
161
|
+
const pkgPath = path.join(projectRoot, 'package.json');
|
|
162
|
+
const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
|
|
163
|
+
const testScript = pkg.scripts?.test || '';
|
|
164
|
+
const timeoutMatch = testScript.match(/--timeout\s+(\d+)/);
|
|
165
|
+
if (timeoutMatch) {
|
|
166
|
+
timeout = Number.parseInt(timeoutMatch[1], 10);
|
|
167
|
+
}
|
|
168
|
+
} catch (_e) { /* intentional: package.json missing or unreadable, use default timeout */ } // NOSONAR S2486
|
|
169
|
+
|
|
170
|
+
// 3. Check Beads connectivity
|
|
171
|
+
const beadsAvailable = checkBeadsConnectivity(execFileSync);
|
|
172
|
+
const beadsSkipped = !beadsAvailable;
|
|
173
|
+
|
|
174
|
+
const extraEnv = {};
|
|
175
|
+
if (beadsSkipped) {
|
|
176
|
+
extraEnv.BEADS_SKIP_TESTS = '1';
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
// 4. Build test command args
|
|
180
|
+
let testArgs = ['run', 'test'];
|
|
181
|
+
|
|
182
|
+
// 5. --affected flag: find changed test files
|
|
183
|
+
if (flags['--affected'] || flags.affected) {
|
|
184
|
+
const affectedTests = getAffectedTestFiles(projectRoot, execFileSync);
|
|
185
|
+
if (affectedTests.length > 0) {
|
|
186
|
+
testArgs = ['run', 'test', ...affectedTests];
|
|
187
|
+
}
|
|
188
|
+
// If no affected tests found, fall back to running all tests
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
// 6. Run tests
|
|
192
|
+
const result = spawnSync(pkgManager, testArgs, {
|
|
193
|
+
env: { ...process.env, ...extraEnv },
|
|
194
|
+
timeout,
|
|
195
|
+
stdio: 'inherit',
|
|
196
|
+
shell: process.platform === 'win32',
|
|
197
|
+
});
|
|
198
|
+
|
|
199
|
+
const exitCode = result.status ?? 1;
|
|
200
|
+
|
|
201
|
+
return {
|
|
202
|
+
success: exitCode === 0,
|
|
203
|
+
exitCode,
|
|
204
|
+
beadsSkipped,
|
|
205
|
+
};
|
|
206
|
+
},
|
|
207
|
+
};
|
|
@@ -0,0 +1,310 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
const { execFileSync, spawnSync } = require('node:child_process');
|
|
4
|
+
const fs = require('node:fs');
|
|
5
|
+
const path = require('node:path');
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Forge Worktree Command
|
|
9
|
+
* Manage isolated worktrees with Beads integration.
|
|
10
|
+
* Uses execFileSync (not execSync) to prevent command injection (OWASP A03).
|
|
11
|
+
*
|
|
12
|
+
* Subcommands:
|
|
13
|
+
* create <slug> — Create worktree at .worktrees/<slug> with branch + beads + install
|
|
14
|
+
* remove <slug> — Remove worktree via git worktree remove
|
|
15
|
+
*
|
|
16
|
+
* @module commands/worktree
|
|
17
|
+
*/
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* Detect the package manager for a project root.
|
|
21
|
+
* @param {string} projectRoot - Path to check for lock files
|
|
22
|
+
* @param {object} fsApi - fs module (for DI)
|
|
23
|
+
* @returns {string|null} Package manager command or null
|
|
24
|
+
*/
|
|
25
|
+
function detectPackageManager(projectRoot, fsApi) {
|
|
26
|
+
if (fsApi.existsSync(path.join(projectRoot, 'bun.lockb'))) return 'bun';
|
|
27
|
+
if (fsApi.existsSync(path.join(projectRoot, 'pnpm-lock.yaml'))) return 'pnpm';
|
|
28
|
+
if (fsApi.existsSync(path.join(projectRoot, 'yarn.lock'))) return 'yarn';
|
|
29
|
+
if (fsApi.existsSync(path.join(projectRoot, 'package-lock.json'))) return 'npm';
|
|
30
|
+
if (fsApi.existsSync(path.join(projectRoot, 'package.json'))) return 'npm';
|
|
31
|
+
return null;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/**
|
|
35
|
+
* Copy .beads/ directory excluding daemon.lock.
|
|
36
|
+
* @param {string} source - Source .beads path
|
|
37
|
+
* @param {string} dest - Destination .beads path
|
|
38
|
+
* @param {object} fsApi - fs module (for DI)
|
|
39
|
+
*/
|
|
40
|
+
function copyBeadsDir(source, dest, fsApi) {
|
|
41
|
+
fsApi.mkdirSync(dest, { recursive: true });
|
|
42
|
+
const entries = fsApi.readdirSync(source);
|
|
43
|
+
for (const entry of entries) {
|
|
44
|
+
if (entry === 'daemon.lock') continue;
|
|
45
|
+
fsApi.cpSync(path.join(source, entry), path.join(dest, entry), { recursive: true });
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
/**
|
|
50
|
+
* Stop a Dolt server running in a worktree to release file locks.
|
|
51
|
+
* Tries graceful `bd dolt stop` first, then falls back to PID-based kill
|
|
52
|
+
* from lock files. Never kills ALL Dolt processes — only the specific PID.
|
|
53
|
+
*
|
|
54
|
+
* @param {string} worktreePath - Absolute path to the worktree
|
|
55
|
+
* @param {object} [opts] - Options for dependency injection
|
|
56
|
+
* @param {Function} [opts._exec] - Override for execFileSync (testing)
|
|
57
|
+
* @param {object} [opts._fs] - Override for fs module (testing)
|
|
58
|
+
* @param {string} [opts._platform] - Override for process.platform (testing)
|
|
59
|
+
* @returns {{ stopped: boolean, method: string, pid?: number }}
|
|
60
|
+
*/
|
|
61
|
+
function stopDolt(worktreePath, opts = {}) {
|
|
62
|
+
const exec = opts._exec || execFileSync;
|
|
63
|
+
const _fs = opts._fs || fs;
|
|
64
|
+
const platform = opts._platform || process.platform;
|
|
65
|
+
|
|
66
|
+
// 1. Try graceful: bd dolt stop
|
|
67
|
+
try {
|
|
68
|
+
exec('bd', ['dolt', 'stop'], { cwd: worktreePath, timeout: 5000, stdio: 'pipe' });
|
|
69
|
+
return { stopped: true, method: 'bd-dolt-stop' };
|
|
70
|
+
} catch (_e) { /* intentional: bd not available, try PID-based kill */ } // NOSONAR S2486
|
|
71
|
+
|
|
72
|
+
// 2. Try PID-based kill from lock file
|
|
73
|
+
const lockPaths = [
|
|
74
|
+
path.join(worktreePath, '.beads', 'dolt-server.lock'),
|
|
75
|
+
path.join(worktreePath, '.beads', 'daemon.lock'),
|
|
76
|
+
];
|
|
77
|
+
for (const lockPath of lockPaths) {
|
|
78
|
+
try {
|
|
79
|
+
const pid = Number.parseInt(_fs.readFileSync(lockPath, 'utf-8').trim(), 10);
|
|
80
|
+
if (!Number.isNaN(pid)) {
|
|
81
|
+
if (platform === 'win32') {
|
|
82
|
+
exec('taskkill', ['/F', '/PID', String(pid)], { stdio: 'pipe' });
|
|
83
|
+
} else {
|
|
84
|
+
process.kill(pid, 'SIGTERM');
|
|
85
|
+
}
|
|
86
|
+
return { stopped: true, method: 'pid-kill', pid };
|
|
87
|
+
}
|
|
88
|
+
} catch (_e) { /* intentional: try next lock file */ } // NOSONAR S2486
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
return { stopped: false, method: 'none' };
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
/**
|
|
95
|
+
* Check if a git branch already exists.
|
|
96
|
+
* @param {string} branchName - Branch name to check
|
|
97
|
+
* @param {Function} runFile - execFileSync function (for DI)
|
|
98
|
+
* @returns {boolean}
|
|
99
|
+
*/
|
|
100
|
+
function branchExists(branchName, runFile) {
|
|
101
|
+
try {
|
|
102
|
+
const output = runFile('git', ['branch', '--list', branchName], { stdio: 'pipe' });
|
|
103
|
+
return output.toString().trim().length > 0;
|
|
104
|
+
} catch (_err) { /* intentional: branch doesn't exist */ // NOSONAR S2486
|
|
105
|
+
return false;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
/**
|
|
110
|
+
* Set up Beads integration for a new worktree (symlink/junction/copy).
|
|
111
|
+
* @param {string} worktreePath - Absolute path to the new worktree
|
|
112
|
+
* @param {string} projectRoot - Absolute path to the project root
|
|
113
|
+
* @param {string} platform - OS platform string (e.g. 'win32')
|
|
114
|
+
* @param {object} fsApi - fs module (for DI)
|
|
115
|
+
* @param {Function} exec - execFileSync-compatible function
|
|
116
|
+
* @returns {string|null} Warning message if beads setup had issues, null otherwise
|
|
117
|
+
*/
|
|
118
|
+
function setupBeads(worktreePath, projectRoot, platform, fsApi, exec) {
|
|
119
|
+
const beadsSource = path.resolve(projectRoot, '.beads');
|
|
120
|
+
const beadsDest = path.resolve(worktreePath, '.beads');
|
|
121
|
+
|
|
122
|
+
if (!fsApi.existsSync(beadsSource)) {
|
|
123
|
+
return 'Beads not installed — skipping .beads setup';
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
// Try symlink first
|
|
127
|
+
try {
|
|
128
|
+
if (platform === 'win32') {
|
|
129
|
+
fsApi.symlinkSync(beadsSource, beadsDest, 'junction');
|
|
130
|
+
} else {
|
|
131
|
+
fsApi.symlinkSync(beadsSource, beadsDest);
|
|
132
|
+
}
|
|
133
|
+
} catch (symlinkErr) {
|
|
134
|
+
if (symlinkErr.code === 'EPERM') {
|
|
135
|
+
copyBeadsDir(beadsSource, beadsDest, fsApi);
|
|
136
|
+
} else {
|
|
137
|
+
throw symlinkErr;
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
// Verify beads accessible (warn if fails, don't block)
|
|
142
|
+
try {
|
|
143
|
+
exec('bd', ['--version'], { cwd: worktreePath, timeout: 5000, stdio: 'pipe' });
|
|
144
|
+
} catch (_bdErr) { /* intentional: bd may not be on PATH */ // NOSONAR S2486
|
|
145
|
+
return 'Beads verification failed — .beads linked but bd may not work';
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
return null;
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
/**
|
|
152
|
+
* Run package install in the new worktree if a package manager is detected.
|
|
153
|
+
* @param {string} worktreePath - Absolute path to the new worktree
|
|
154
|
+
* @param {string} projectRoot - Absolute path to the project root
|
|
155
|
+
* @param {Function} spawnFn - spawnSync-compatible function
|
|
156
|
+
* @param {object} fsApi - fs module (for DI)
|
|
157
|
+
*/
|
|
158
|
+
function runInstall(worktreePath, projectRoot, spawnFn, fsApi) {
|
|
159
|
+
const pkgManager = detectPackageManager(projectRoot, fsApi);
|
|
160
|
+
if (pkgManager) {
|
|
161
|
+
spawnFn(pkgManager, ['install'], { cwd: worktreePath, stdio: 'pipe' });
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
/**
|
|
166
|
+
* Handle the "create" subcommand.
|
|
167
|
+
* @param {string} slug - Worktree slug
|
|
168
|
+
* @param {object} flags - CLI flags
|
|
169
|
+
* @param {string} projectRoot - Project root path
|
|
170
|
+
* @param {object} opts - DI options
|
|
171
|
+
* @returns {Promise<object>} Result object
|
|
172
|
+
*/
|
|
173
|
+
async function handleCreate(slug, flags, projectRoot, opts) {
|
|
174
|
+
const runFile = opts._exec || execFileSync;
|
|
175
|
+
const runSpawn = opts._spawn || spawnSync;
|
|
176
|
+
const fsApi = opts._fs || fs;
|
|
177
|
+
const platform = opts._platform || process.platform;
|
|
178
|
+
|
|
179
|
+
const branchName = flags['--branch'] || flags.branch || `feat/${slug}`;
|
|
180
|
+
const worktreesDir = path.resolve(projectRoot, '.worktrees');
|
|
181
|
+
|
|
182
|
+
// Guard: Detect bare repo state — worktrees created from bare repos produce broken branches
|
|
183
|
+
// git rev-parse --show-toplevel throws in a bare repo (no working tree)
|
|
184
|
+
try {
|
|
185
|
+
runFile('git', ['-C', projectRoot, 'rev-parse', '--show-toplevel'], { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] });
|
|
186
|
+
} catch (_e) { // NOSONAR S2486
|
|
187
|
+
/* intentional: show-toplevel fails in bare repos */
|
|
188
|
+
return { success: false, error: 'Main repo is in bare state (no working tree). Clone fresh instead: git clone <url> /tmp/forge-<slug>' };
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
// Security: Validate slug doesn't contain path traversal (OWASP A01/A03)
|
|
192
|
+
if (slug.includes('..') || slug.includes('/') || slug.includes('\\')) {
|
|
193
|
+
return { success: false, error: String.raw`Invalid slug: must not contain "..", "/", or "\"` };
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
const worktreePath = path.resolve(worktreesDir, slug);
|
|
197
|
+
|
|
198
|
+
// Step 0: Check if worktree already exists
|
|
199
|
+
if (fsApi.existsSync(worktreePath)) {
|
|
200
|
+
return {
|
|
201
|
+
success: true,
|
|
202
|
+
reused: true,
|
|
203
|
+
message: `Worktree already exists at ${worktreePath}`,
|
|
204
|
+
worktreePath,
|
|
205
|
+
};
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
// Step 1: Ensure .worktrees/ dir exists
|
|
209
|
+
fsApi.mkdirSync(worktreesDir, { recursive: true });
|
|
210
|
+
|
|
211
|
+
// Step 2: Create git worktree
|
|
212
|
+
const hasBranch = branchExists(branchName, runFile);
|
|
213
|
+
if (hasBranch) {
|
|
214
|
+
runFile('git', ['worktree', 'add', worktreePath, branchName], { stdio: 'pipe' });
|
|
215
|
+
} else {
|
|
216
|
+
runFile('git', ['worktree', 'add', worktreePath, '-b', branchName], { stdio: 'pipe' });
|
|
217
|
+
}
|
|
218
|
+
|
|
219
|
+
// Step 3: Beads integration
|
|
220
|
+
const beadsWarning = setupBeads(worktreePath, projectRoot, platform, fsApi, runFile);
|
|
221
|
+
|
|
222
|
+
// Step 4: Run package install
|
|
223
|
+
runInstall(worktreePath, projectRoot, runSpawn, fsApi);
|
|
224
|
+
|
|
225
|
+
const result = {
|
|
226
|
+
success: true,
|
|
227
|
+
worktreePath,
|
|
228
|
+
branch: branchName,
|
|
229
|
+
};
|
|
230
|
+
if (beadsWarning) {
|
|
231
|
+
result.beadsWarning = beadsWarning;
|
|
232
|
+
}
|
|
233
|
+
return result;
|
|
234
|
+
}
|
|
235
|
+
|
|
236
|
+
/**
|
|
237
|
+
* Handle the "remove" subcommand.
|
|
238
|
+
* @param {string} slug - Worktree slug
|
|
239
|
+
* @param {string} projectRoot - Project root path
|
|
240
|
+
* @param {object} opts - DI options
|
|
241
|
+
* @returns {Promise<object>} Result object
|
|
242
|
+
*/
|
|
243
|
+
async function handleRemove(slug, projectRoot, opts) {
|
|
244
|
+
// Security: Validate slug doesn't contain path traversal (OWASP A01/A03)
|
|
245
|
+
if (slug.includes('..') || slug.includes('/') || slug.includes('\\')) {
|
|
246
|
+
return { success: false, error: String.raw`Invalid slug: must not contain "..", "/", or "\"` };
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
const runFile = opts._exec || execFileSync;
|
|
250
|
+
const fsModule = opts._fs || fs;
|
|
251
|
+
const worktreePath = path.resolve(projectRoot, '.worktrees', slug);
|
|
252
|
+
|
|
253
|
+
// Stop Dolt server to release file locks
|
|
254
|
+
const stopResult = stopDolt(worktreePath, { _exec: runFile, _fs: fsModule, _platform: opts._platform });
|
|
255
|
+
if (stopResult.stopped) {
|
|
256
|
+
// Brief wait for file locks to release (Windows needs this)
|
|
257
|
+
await new Promise(r => setTimeout(r, 500));
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
runFile('git', ['worktree', 'remove', worktreePath], { stdio: 'pipe' });
|
|
261
|
+
|
|
262
|
+
return { success: true, removed: worktreePath };
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
module.exports = {
|
|
266
|
+
name: 'worktree',
|
|
267
|
+
description: 'Manage isolated worktrees with Beads integration',
|
|
268
|
+
usage: 'forge worktree <create|remove> <slug>',
|
|
269
|
+
flags: {
|
|
270
|
+
'--branch': 'Custom branch name (default: feat/<slug>)',
|
|
271
|
+
},
|
|
272
|
+
stopDolt,
|
|
273
|
+
|
|
274
|
+
/**
|
|
275
|
+
* Main handler for the worktree command.
|
|
276
|
+
* @param {string[]} args - Positional arguments: [subcommand, slug]
|
|
277
|
+
* @param {object} flags - CLI flags
|
|
278
|
+
* @param {string} projectRoot - Project root path
|
|
279
|
+
* @param {object} [opts] - Options for dependency injection
|
|
280
|
+
* @param {Function} [opts._exec] - Override for execFileSync (testing)
|
|
281
|
+
* @param {Function} [opts._spawn] - Override for spawnSync (testing)
|
|
282
|
+
* @param {object} [opts._fs] - Override for fs module (testing)
|
|
283
|
+
* @param {string} [opts._platform] - Override for process.platform (testing)
|
|
284
|
+
* @returns {Promise<object>}
|
|
285
|
+
*/
|
|
286
|
+
handler: async (args, flags, projectRoot, opts = {}) => {
|
|
287
|
+
const subcommand = args[0];
|
|
288
|
+
const slug = args[1];
|
|
289
|
+
|
|
290
|
+
if (!subcommand || !['create', 'remove'].includes(subcommand)) {
|
|
291
|
+
return {
|
|
292
|
+
success: false,
|
|
293
|
+
error: 'Missing or invalid subcommand. Usage: forge worktree <create|remove> <slug>',
|
|
294
|
+
};
|
|
295
|
+
}
|
|
296
|
+
|
|
297
|
+
if (!slug) {
|
|
298
|
+
return {
|
|
299
|
+
success: false,
|
|
300
|
+
error: 'Missing slug. Usage: forge worktree <create|remove> <slug>',
|
|
301
|
+
};
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
if (subcommand === 'create') {
|
|
305
|
+
return handleCreate(slug, flags, projectRoot, opts);
|
|
306
|
+
}
|
|
307
|
+
|
|
308
|
+
return handleRemove(slug, projectRoot, opts);
|
|
309
|
+
},
|
|
310
|
+
};
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
const fs = require('node:fs');
|
|
2
|
+
const path = require('node:path');
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Allowlist mapping topic names to filenames in docs/.
|
|
6
|
+
* Security: Only these exact keys are accepted — prevents path traversal.
|
|
7
|
+
*/
|
|
8
|
+
const TOPICS = {
|
|
9
|
+
toolchain: 'TOOLCHAIN.md',
|
|
10
|
+
validation: 'VALIDATION.md',
|
|
11
|
+
setup: 'SETUP.md',
|
|
12
|
+
examples: 'EXAMPLES.md',
|
|
13
|
+
roadmap: 'ROADMAP.md',
|
|
14
|
+
};
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* List all available topic names.
|
|
18
|
+
* @returns {string[]}
|
|
19
|
+
*/
|
|
20
|
+
function listTopics() {
|
|
21
|
+
return Object.keys(TOPICS);
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* Get the content of a documentation topic.
|
|
26
|
+
* Uses an allowlist to prevent path traversal attacks.
|
|
27
|
+
*
|
|
28
|
+
* @param {string} topic - Topic name (must be in TOPICS allowlist)
|
|
29
|
+
* @param {string} packageDir - Forge package root directory
|
|
30
|
+
* @returns {{ content?: string, error?: string }}
|
|
31
|
+
*/
|
|
32
|
+
function getTopicContent(topic, packageDir) {
|
|
33
|
+
const availableList = listTopics().join(', ');
|
|
34
|
+
|
|
35
|
+
// Validate against allowlist (rejects any path traversal attempt)
|
|
36
|
+
const filename = TOPICS[topic];
|
|
37
|
+
if (!filename) {
|
|
38
|
+
return { error: `Unknown topic: "${topic}". Available topics: ${availableList}` };
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
const filePath = path.join(packageDir, 'docs', filename);
|
|
42
|
+
|
|
43
|
+
try {
|
|
44
|
+
const content = fs.readFileSync(filePath, 'utf-8');
|
|
45
|
+
return { content };
|
|
46
|
+
} catch (_error) {
|
|
47
|
+
return { error: `Documentation file "${filename}" not found at ${filePath}` };
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
module.exports = { listTopics, getTopicContent, TOPICS };
|
package/lib/docs-copy.js
ADDED
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
const fs = require('node:fs');
|
|
2
|
+
const path = require('node:path');
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Essential docs to copy from package's docs/ to consumer's docs/forge/
|
|
6
|
+
*/
|
|
7
|
+
const ESSENTIAL_DOCS = ['TOOLCHAIN.md', 'VALIDATION.md'];
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* Copy essential documentation files from the Forge package to the consumer project.
|
|
11
|
+
* Creates docs/forge/ if missing. Skips files that already exist (idempotent).
|
|
12
|
+
*
|
|
13
|
+
* @param {string} projectRoot - Target project root directory
|
|
14
|
+
* @param {string} packageDir - Forge package directory (source of docs)
|
|
15
|
+
* @returns {{ created: string[], skipped: string[] }}
|
|
16
|
+
*/
|
|
17
|
+
function copyEssentialDocs(projectRoot, packageDir) {
|
|
18
|
+
const created = [];
|
|
19
|
+
const skipped = [];
|
|
20
|
+
|
|
21
|
+
const targetDir = path.join(projectRoot, 'docs', 'forge');
|
|
22
|
+
|
|
23
|
+
for (const docFile of ESSENTIAL_DOCS) {
|
|
24
|
+
const srcPath = path.join(packageDir, 'docs', docFile);
|
|
25
|
+
const destPath = path.join(targetDir, docFile);
|
|
26
|
+
const relPath = ['docs', 'forge', docFile].join('/');
|
|
27
|
+
|
|
28
|
+
// Skip if source doesn't exist
|
|
29
|
+
if (!fs.existsSync(srcPath)) {
|
|
30
|
+
continue;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
// Skip if destination already exists (preserve user customizations)
|
|
34
|
+
if (fs.existsSync(destPath)) {
|
|
35
|
+
skipped.push(relPath);
|
|
36
|
+
continue;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
// Ensure target directory exists
|
|
40
|
+
fs.mkdirSync(targetDir, { recursive: true });
|
|
41
|
+
|
|
42
|
+
// Copy file
|
|
43
|
+
fs.copyFileSync(srcPath, destPath);
|
|
44
|
+
created.push(relPath);
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
return { created, skipped };
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
module.exports = { copyEssentialDocs, ESSENTIAL_DOCS };
|