Skip to content

fix(cli): extend SQUAD_TEAM_ROOT to all resolveSquad() call sites #841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tamirdresher merged 5 commits into from
Apr 5, 2026
Merged

fix(cli): extend SQUAD_TEAM_ROOT to all resolveSquad() call sites #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f25c8b9
fix(cli): extend SQUAD_TEAM_ROOT to all resolveSquad() call sites
diberry Apr 4, 2026
700a671
Merge branch 'dev' into squad/835-team-root-all-commands
tamirdresher Apr 5, 2026
994813b
Merge branch 'dev' into squad/835-team-root-all-commands
tamirdresher Apr 5, 2026
3fbe5c9
Merge branch 'dev' into squad/835-team-root-all-commands
tamirdresher Apr 5, 2026
288c02e
Merge branch 'dev' into squad/835-team-root-all-commands
tamirdresher Apr 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fix-team-root-all-commands.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@bradygaster/squad-cli': patch
---

Extend SQUAD_TEAM_ROOT to all resolveSquad() call sites for subprocess compatibility
46 changes: 23 additions & 23 deletions packages/squad-cli/src/cli-entry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ async function main(): Promise<void> {
const selfUpgrade = args.includes('--self');
const forceUpgrade = args.includes('--force');
const insider = args.includes('--insider');
const dest = hasGlobal ? (await lazySquadSdk()).resolveGlobalSquadPath() : process.cwd();
const dest = hasGlobal ? (await lazySquadSdk()).resolveGlobalSquadPath() : getSquadStartDir();

// Warn when --insider is used without --self (it has no effect on project upgrades)
if (insider && !selfUpgrade) {
Expand Down Expand Up @@ -361,14 +361,14 @@ async function main(): Promise<void> {
const fromIdx = args.indexOf('--from');
const from = (fromIdx !== -1 && args[fromIdx + 1]) ? args[fromIdx + 1] : undefined;
const dryRun = args.includes('--dry-run');
await runMigrate(process.cwd(), { to, from: from as 'ai-team' | undefined, dryRun });
await runMigrate(getSquadStartDir(), { to, from: from as 'ai-team' | undefined, dryRun });
return;
Comment on lines 361 to 365
Copy link

Copilot AI Apr 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are currently regression tests for --team-root/SQUAD_TEAM_ROOT only for nap (see test/cli/nap-subprocess.test.ts). This PR updates many additional command entrypoints to use getSquadStartDir(), but there’s no test coverage to ensure those commands still resolve/operate correctly when process.cwd() differs from the squad root (the subprocess scenario this change targets). Consider adding at least one CLI-level integration test (similar to the nap subprocess test) that runs another updated command (e.g., export, watch --health, loop --init, etc.) with SQUAD_TEAM_ROOT set to a different directory than the command’s cwd.

Copilot uses AI. Check for mistakes.
}

// --health flag: show watch instance status and exit
if (cmd === 'watch' && args.includes('--health')) {
const { getWatchHealth } = await import('./cli/commands/watch/health.js');
console.log(getWatchHealth(process.cwd()));
console.log(getWatchHealth(getSquadStartDir()));
return;
}

Expand Down Expand Up @@ -445,7 +445,7 @@ async function main(): Promise<void> {
}

// Load config: .squad/config.json merged with CLI overrides
const config = loadWatchConfig(process.cwd(), {
const config = loadWatchConfig(getSquadStartDir(), {
interval,
execute,
maxConcurrent,
Expand Down Expand Up @@ -477,7 +477,7 @@ async function main(): Promise<void> {
console.log(`[verbose] ⚠️ Positional args ignored by watch: "${positionalArgs.join(' ')}". Use --execute to process issues.`);
}

await runWatch(process.cwd(), config);
await runWatch(getSquadStartDir(), config);
return;
}

Expand Down Expand Up @@ -522,7 +522,7 @@ async function main(): Promise<void> {
const { FSStorageProvider } = await import('@bradygaster/squad-sdk');
const storage = new FSStorageProvider();
const pathMod = await import('node:path');
const absPath = pathMod.default.resolve(process.cwd(), filePath);
const absPath = pathMod.default.resolve(getSquadStartDir(), filePath);
if (storage.existsSync(absPath)) {
console.log(`⚠️ ${filePath} already exists. Remove it first to regenerate.`);
} else {
Expand Down Expand Up @@ -565,7 +565,7 @@ async function main(): Promise<void> {
if (args.includes(`--no-${cap.name}`)) capabilities[cap.name] = false;
}

await runLoop(process.cwd(), {
await runLoop(getSquadStartDir(), {
filePath,
interval,
timeout,
Expand Down Expand Up @@ -595,7 +595,7 @@ async function main(): Promise<void> {
const { runExport } = await import('./cli/commands/export.js');
const outIdx = args.indexOf('--out');
const outPath = (outIdx !== -1 && args[outIdx + 1]) ? args[outIdx + 1] : undefined;
await runExport(process.cwd(), outPath);
await runExport(getSquadStartDir(), outPath);
return;
}

Expand All @@ -606,21 +606,21 @@ async function main(): Promise<void> {
fatal('Usage: squad import <file> [--force]');
}
const hasForce = args.includes('--force');
await runImport(process.cwd(), importFile, hasForce);
await runImport(getSquadStartDir(), importFile, hasForce);
return;
}

if (cmd === 'plugin') {
const { runPlugin } = await import('./cli/commands/plugin.js');
await runPlugin(process.cwd(), args.slice(1));
await runPlugin(getSquadStartDir(), args.slice(1));
return;
}

if (cmd === 'copilot') {
const { runCopilot } = await import('./cli/commands/copilot.js');
const isOff = args.includes('--off');
const autoAssign = args.includes('--auto-assign');
await runCopilot(process.cwd(), { off: isOff, autoAssign });
await runCopilot(getSquadStartDir(), { off: isOff, autoAssign });
return;
}

Expand Down Expand Up @@ -697,13 +697,13 @@ async function main(): Promise<void> {
const hasCheck = args.includes('--check');
const hasDryRun = args.includes('--dry-run');
const hasWatch = args.includes('--watch');
await runBuild(process.cwd(), { check: hasCheck, dryRun: hasDryRun, watch: hasWatch });
await runBuild(getSquadStartDir(), { check: hasCheck, dryRun: hasDryRun, watch: hasWatch });
return;
}

if (cmd === 'subsquads' || cmd === 'workstreams' || cmd === 'streams') {
const { runSubSquads } = await import('./cli/commands/streams.js');
await runSubSquads(process.cwd(), args.slice(1));
await runSubSquads(getSquadStartDir(), args.slice(1));
return;
}

Expand All @@ -717,7 +717,7 @@ async function main(): Promise<void> {
const customCmd = (cmdIdx !== -1 && args[cmdIdx + 1]) ? args[cmdIdx + 1] : undefined;
const squadFlags = ['start', '--tunnel', '--port', port.toString(), '--command', customCmd || ''].filter(Boolean);
const copilotArgs = args.slice(1).filter(a => !squadFlags.includes(a));
await runStart(process.cwd(), { tunnel: hasTunnel, port, copilotArgs, command: customCmd });
await runStart(getSquadStartDir(), { tunnel: hasTunnel, port, copilotArgs, command: customCmd });
return;
}

Expand Down Expand Up @@ -745,13 +745,13 @@ async function main(): Promise<void> {

if (cmd === 'consult') {
const { runConsult } = await import('./cli/commands/consult.js');
await runConsult(process.cwd(), args.slice(1));
await runConsult(getSquadStartDir(), args.slice(1));
return;
}

if (cmd === 'extract') {
const { runExtract } = await import('./cli/commands/extract.js');
await runExtract(process.cwd(), args.slice(1));
await runExtract(getSquadStartDir(), args.slice(1));
return;
}

Expand All @@ -770,7 +770,7 @@ async function main(): Promise<void> {
if (!teamPath) {
fatal('Usage: squad link <team-repo-path>');
}
runLink(process.cwd(), teamPath);
runLink(getSquadStartDir(), teamPath);
return;
}

Expand All @@ -781,7 +781,7 @@ async function main(): Promise<void> {
const port = (portIdx !== -1 && args[portIdx + 1]) ? parseInt(args[portIdx + 1]!, 10) : 0;
const pathIdx = args.indexOf('--path');
const rcPath = (pathIdx !== -1 && args[pathIdx + 1]) ? args[pathIdx + 1] : undefined;
await runRC(rcPath || process.cwd(), { tunnel: hasTunnel, port });
await runRC(rcPath || getSquadStartDir(), { tunnel: hasTunnel, port });
return;
}

Expand Down Expand Up @@ -821,20 +821,20 @@ async function main(): Promise<void> {
if (cmd === 'schedule') {
const { runSchedule } = await import('./cli/commands/schedule.js');
const subcommand = args[1] || 'list';
await runSchedule(process.cwd(), subcommand, args.slice(2));
await runSchedule(getSquadStartDir(), subcommand, args.slice(2));
return;
}

if (cmd === 'personal') {
const { runPersonal } = await import('./cli/commands/personal.js');
const subcommand = args[1] || 'list';
await runPersonal(process.cwd(), subcommand, args.slice(2));
await runPersonal(getSquadStartDir(), subcommand, args.slice(2));
return;
}

if (cmd === 'cast') {
const { runCast } = await import('./cli/commands/cast.js');
await runCast(process.cwd());
await runCast(getSquadStartDir());
return;
}

Expand All @@ -858,13 +858,13 @@ async function main(): Promise<void> {

if (cmd === 'economy') {
const { runEconomy } = await import('./cli/commands/economy.js');
await runEconomy(process.cwd(), args.slice(1));
await runEconomy(getSquadStartDir(), args.slice(1));
return;
}

if (cmd === 'config') {
const { runConfig } = await import('./cli/commands/config.js');
await runConfig(process.cwd(), args.slice(1));
await runConfig(getSquadStartDir(), args.slice(1));
return;
}

Expand Down
Loading