diff --git a/packages/squad-cli/src/cli-entry.ts b/packages/squad-cli/src/cli-entry.ts
index c30760f8a..ac1638e1a 100644
--- a/packages/squad-cli/src/cli-entry.ts
+++ b/packages/squad-cli/src/cli-entry.ts
@@ -901,6 +901,12 @@ async function main(): Promise<void> {
     return;
   }
 
+  if (cmd === 'skill') {
+    const { runSkill } = await import('./cli/commands/skill.js');
+    await runSkill(getSquadStartDir(), args.slice(1));
+    return;
+  }
+
   if (cmd === 'upstream') {
     const { upstreamCommand } = await import('./cli/commands/upstream.js');
     await upstreamCommand(args.slice(1));
diff --git a/test/template-sync.test.ts b/test/template-sync.test.ts
index f4d5e674c..4cab2ea16 100644
--- a/test/template-sync.test.ts
+++ b/test/template-sync.test.ts
@@ -27,7 +27,7 @@ const ROOT = resolve(__dirname, '..');
 // repo root, overwriting .github/agents/squad.agent.md from the CLI
 // template and making it diverge from .squad-templates/squad.agent.md.
 beforeAll(() => {
-  execSync('node scripts/sync-templates.mjs', {
+  execSync('node scripts/sync-templates.mjs --sync', {
     cwd: ROOT,
     encoding: 'utf-8',
     timeout: 60_000,
@@ -162,7 +162,7 @@ describe('dynamic template enumeration (all synced files)', () => {
 describe('sync-templates.mjs script execution', () => {
   it('exits with code 0 (no syntax errors, no crashes)', () => {
     // execSync throws on non-zero exit codes
-    const output = execSync('node scripts/sync-templates.mjs', {
+    const output = execSync('node scripts/sync-templates.mjs --sync', {
       cwd: ROOT,
       encoding: 'utf-8',
       timeout: 60_000,