forge-workflow 0.1.0-beta.4 → 0.1.0-beta.5

package/lib/commands/setup.js

@@ -28,6 +28,7 @@ const VERSION = packageJson.version;
 // packaged-ASSET read below goes through `getPackageRoot(packageDir)`; the
 // module-`require` paths above keep `packageDir` (bundler handles those).
 const { getPackageRoot } = require('../package-root');
+const { cleanupDeprecatedSyncFiles } = require('../deprecated-sync-cleanup');
 
 // Load PluginManager for discoverable agent architecture
 const PluginManager = require('../plugin-manager');
@@ -53,9 +54,8 @@ const { askYesNo: _askYesNoBase } = require('../ui-utils');
 const contextMerge = require('../context-merge');
 const projectDiscovery = require('../project-discovery');
 
-// Load lib modules for symlink, beads, and PAT setup
+// Load lib modules for symlink setup
 const { createSymlinkOrCopy: libCreateSymlinkOrCopy } = require('../symlink-utils');
-const { scaffoldBeadsSync } = require('../beads-sync-scaffold');
 const { resolveSyncBackend } = require('../sync-backend');
 const { buildMigratedKernelIssueDeps } = require('../kernel/cli-broker-factory');
 
@@ -69,11 +69,13 @@ const { smartMergeAgentsMd } = require('../smart-merge');
 const { checkLefthookStatus } = require('../lefthook-check');
 const {
   FORGE_USER_LEFTHOOK_YML,
+  FORGE_USER_LEFTHOOK_YML_NO_TDD,
   forgeShouldWriteLefthookConfig,
   installNativeGitHooks,
   verifyHooksActive,
   resolveGitHooksDir,
 } = require('../lefthook-wiring');
+const { detectExistingTddGate, describeExistingGateDeferral } = require('../existing-tdd-gate');
 const { resolveShellRuntime } = require('../runtime-health');
 const {
   buildCodexSkillInstallPlan,
@@ -99,7 +101,6 @@ let FORCE_MODE = false;
 let VERBOSE_MODE = false;
 let NON_INTERACTIVE = false;
 let SYMLINK_ONLY = false;
-let SYNC_ENABLED = false;
 let actionLog = new SetupActionLog();
 let PKG_MANAGER = 'npm';
 let SETUP_NOTES = [];
@@ -174,7 +175,6 @@ function detectPackageManager() {
 
 
 const WORKFLOW_RUNTIME_ASSETS = Object.freeze([
-  'scripts/beads-context.sh',
   'scripts/conflict-detect.sh',
   'scripts/dep-guard-analyze.js',
   'scripts/dep-guard.sh',
@@ -218,7 +218,6 @@ function validateAgents(agentList) {
 // Prerequisite check function
 function checkPrerequisites(options = {}) {
   const requireGithubCli = options.requireGithubCli !== false;
-  const requireBeadsCli = options.requireBeadsCli === true;
   const requireJq = options.requireJq === true;
   const commandRunner = options.commandRunner || safeExec;
   const errors = [];
@@ -255,15 +254,13 @@ function checkPrerequisites(options = {}) {
     }
   }
 
-  if (requireBeadsCli) {
-    // Issue tracking runs on the local Forge Kernel store, which auto-provisions
-    // on first use — there is no external CLI to install. Surface only whether
-    // team sync is wired up yet.
-    if (resolveSyncBackend({ projectRoot, env: options.env }) === 'local-noop') {
-      console.log('  ✓ Kernel issue store (local-noop sync: single-machine until a sync server is configured)');
-    } else {
-      console.log('  ✓ Kernel issue store');
-    }
+  // Issue tracking runs on the local Forge Kernel store, which auto-provisions
+  // on first use — there is no external CLI to install. Surface only whether
+  // team sync is wired up yet.
+  if (resolveSyncBackend({ projectRoot, env: options.env }) === 'local-noop') {
+    console.log('  ✓ Kernel issue store (local-noop sync: single-machine until a sync server is configured)');
+  } else {
+    console.log('  ✓ Kernel issue store');
   }
 
   // Check Node.js version
@@ -800,9 +797,7 @@ async function detectProjectStatus() {
     claudeMdLines: 0,
     // Project tools status — the Kernel issue store is always present (it
     // auto-provisions on first use), so issue tracking needs no install probe.
-    hasBeads: true,
     hasSkills: isSkillsInitialized(),
-    beadsInstallType: 'kernel',
     skillsInstallType: checkForSkills(),
     // Enhanced: Auto-detected project context
     autoDetected: null
@@ -2063,7 +2058,8 @@ function createAgentLinkFile(agent, symlinkOnly = false) {
 
   const result = createSymlinkOrCopy('AGENTS.md', agent.linkFile, { symlinkOnly });
   if (result) {
-    console.log(`  ${result === 'linked' ? 'Linked' : 'Copied'}: ${agent.linkFile}`);
+    const action = result === 'linked' ? 'Linked' : result === 'copied' ? 'Copied' : 'Preserved import';
+    console.log(`  ${action}: ${agent.linkFile}`);
   }
 }
 
@@ -2071,7 +2067,7 @@ function createAgentLinkFile(agent, symlinkOnly = false) {
 
 
 // Setup specific agent
-async function setupAgent(agentKey, skipFiles = {}) {
+async function setupAgent(agentKey, skipFiles = {}, options = {}) {
   const agent = AGENTS[agentKey];
   if (!agent) return;
 
@@ -2111,11 +2107,13 @@ async function setupAgent(agentKey, skipFiles = {}) {
   // Projects Forge's TDD-gate + protected-path enforcement onto each harness's
   // native hook surface. Codex hooks are GLOBAL-config scope and intentionally
   // not written at project setup (see lib/hook-renderer.js).
-  if (agentKey === 'claude') {
-    setupClaudeHooksConfig();
-  }
-  if (agent.customSetup === 'cursor') {
-    setupCursorHooksConfig();
+  if (!options.skillsOnly) {
+    if (agentKey === 'claude') {
+      setupClaudeHooksConfig();
+    }
+    if (agent.customSetup === 'cursor') {
+      setupCursorHooksConfig();
+    }
   }
 
   // Create link file (SYMLINK_ONLY = --symlink flag disables copy fallback)
@@ -2756,6 +2754,48 @@ function resolveHookEnforcementState(root = projectRoot) {
   }
 }
 
+// True when .forge/config.yaml already states a rail.tdd_intent choice EXPLICITLY (either
+// config shape the resolver accepts). Setup must never overwrite that: otherwise the
+// `forge gate enable rail.tdd_intent` we advertise would be undone by the next `forge setup`.
+function hasExplicitTddRailChoice(root) {
+  try {
+    const { loadRawConfig } = require('../config-writer');
+    const config = loadRawConfig(root) || {};
+    const viaGates = config.workflow && config.workflow.gates && config.workflow.gates['rail.tdd_intent'];
+    const viaRails = config.rails && config.rails['rail.tdd_intent'];
+    return Boolean(
+      (viaGates && viaGates.enabled !== undefined) || (viaRails && viaRails.enabled !== undefined)
+    );
+  } catch {
+    return false; // unreadable config → treat as unset; setConfigOverride reports any real failure
+  }
+}
+
+/**
+ * Defer Forge's TDD gate to a pre-existing one: turn `rail.tdd_intent` off in
+ * .forge/config.yaml so the installed hook scripts are genuinely inert, instead of stacking a
+ * second gate on the same commit (kernel 5b425a85 / 2699b234). No-op when nothing was detected
+ * (a repo with no gate keeps the default-ON rail) or when the user already chose explicitly.
+ *
+ * @returns {{ deferred: boolean, reason?: string }}
+ */
+function applyExistingGateDeferral(root, detection) {
+  if (!detection || !detection.found) return { deferred: false, reason: 'no-existing-gate' };
+  if (hasExplicitTddRailChoice(root)) return { deferred: false, reason: 'explicit-user-choice' };
+
+  const { setConfigOverride } = require('../config-writer');
+  try {
+    setConfigOverride(root, ['workflow', 'gates', 'rail.tdd_intent', 'enabled'], false);
+  } catch (error) {
+    // An unreadable/malformed .forge/config.yaml must not make `forge setup` fail outright
+    // just because a pre-existing gate was detected. Report and DON'T defer: the caller keys
+    // hook wiring off `deferred`, so falling back to the normal install keeps config and
+    // wiring agreeing, instead of turning the gate off in neither place or in only one.
+    return { deferred: false, reason: 'config-write-failed', error: error.message };
+  }
+  return { deferred: true };
+}
+
 function describeHookEnforcement(root = projectRoot) {
   const state = resolveHookEnforcementState(root);
   if (!state.resolved) {
@@ -2837,6 +2877,32 @@ function installGitHooks(options = {}) { // NOSONAR — Extracted as-is from bin
   // init deliberately degrades to a warning rather than failing, and repair runs inside
   // another command's flow.
   const loud = options.loud === true;
+
+  // BEFORE wiring anything: does this repo already enforce TDD/source-test coupling on
+  // pre-commit? If so, defer to it rather than silently stacking a second gate on the same
+  // commit — the in-the-wild beta.3 report (kernel 5b425a85 / 2699b234). The deferral is
+  // VISIBLE (report below) and reversible with one command.
+  const existingGate = detectExistingTddGate(projectRoot);
+  const deferral = applyExistingGateDeferral(projectRoot, existingGate);
+  // Only claim a deferral when one actually happened. describeExistingGateDeferral() states
+  // that Forge did NOT install its gate and that rail.tdd_intent is off — both false when we
+  // declined to defer, so printing it unconditionally would misreport the installed state.
+  if (deferral.deferred) {
+    console.warn(describeExistingGateDeferral(existingGate));
+    addSetupNote(`Deferred Forge's TDD gate to the existing pre-commit gate in ${existingGate.source}.`);
+  } else if (existingGate.found) {
+    const why = deferral.reason === 'explicit-user-choice'
+      ? 'rail.tdd_intent is set explicitly in .forge/config.yaml, so your choice stands'
+      : `Forge could not update .forge/config.yaml (${deferral.error})`;
+    console.warn(
+      `  ⚠ Detected an existing pre-commit TDD/coupling gate in ${existingGate.source}, but did NOT defer to it:\n` +
+      `    ${why}.\n` +
+      '    Forge\'s own TDD gate is installed as usual, so BOTH gates run on the same commit.\n' +
+      '    Want only yours? Run: forge gate disable rail.tdd_intent'
+    );
+    addSetupNote(`Existing pre-commit gate in ${existingGate.source} detected; Forge's TDD gate installed anyway (${deferral.reason}).`);
+  }
+
   // Honest header: when the TDD gate is disabled in config the hooks install but are inert,
   // so don't announce "(TDD enforcement)" for a state the user turned off (issue eda6d866).
   console.log(
@@ -2876,7 +2942,18 @@ function installGitHooks(options = {}) { // NOSONAR — Extracted as-is from bin
     // clobber a config that already has active jobs (kernel c713fce7).
     const lefthookTarget = path.join(projectRoot, 'lefthook.yml');
     if (forgeShouldWriteLefthookConfig(lefthookTarget)) {
-      fs.writeFileSync(lefthookTarget, FORGE_USER_LEFTHOOK_YML, 'utf8');
+      // When we actually DEFERRED, write the variant WITHOUT Forge's forge-tdd job so the
+      // commit is never blocked by two gates. Key this off `deferral.deferred`, not off
+      // `existingGate.found`: applyExistingGateDeferral declines to defer when the user has
+      // an explicit rail.tdd_intent choice, and suppressing the wiring anyway would leave
+      // config saying "enabled" while the hook was never installed — making
+      // `forge gate enable rail.tdd_intent` silently ineffective in exactly the repos this
+      // feature targets.
+      fs.writeFileSync(
+        lefthookTarget,
+        deferral.deferred ? FORGE_USER_LEFTHOOK_YML_NO_TDD : FORGE_USER_LEFTHOOK_YML,
+        'utf8'
+      );
       actionLog.add('lefthook.yml', 'created');
       console.log('  ✓ Created lefthook.yml');
     }
@@ -2924,7 +3001,12 @@ function installGitHooks(options = {}) { // NOSONAR — Extracted as-is from bin
   // inert (B3). This repair path only warns (never sets a failure exit code) since it can
   // run mid-stage under enforce-stage's repairWorkflowRuntimeAssets().
   if (!lefthookInstalled) {
-    const native = installNativeGitHooks(projectRoot);
+    // Skip the native pre-commit hook when the repo already has its own TDD/coupling gate —
+    // pre-push is still wired, so only the double-gated surface is given up.
+    const native = installNativeGitHooks(
+      projectRoot,
+      existingGate.found ? { skipHooks: ['pre-commit'] } : {}
+    );
     if (native.installed) {
       console.log(`  ✓ Native git hooks installed (${native.written.join(', ')}) - lefthook fallback`);
     } else if (native.skipped && native.skipped.length > 0) {
@@ -3093,7 +3175,7 @@ function initializeSkills(installType) {
 
 // Ensure the issue store during interactive setup. No prompt: the Forge Kernel
 // ships with Forge and auto-provisions, so there is nothing to install or pick.
-async function promptBeadsSetup(_question) {
+async function promptIssueStoreSetup(_question) {
   console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
   console.log('Issue Store (Forge Kernel)');
   console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
@@ -3219,17 +3301,14 @@ async function promptSkillsSetup(question) {
   console.log('');
 }
 
-// Interactive setup for Beads and Skills
-
-
-// Interactive setup for Beads and Skills
+// Interactive setup for the issue store and Skills
 async function setupProjectTools(rl, question) {
   console.log('');
   console.log('═══════════════════════════════════════════════════════════');
   console.log('  STEP 2: Project Tools (Recommended)');
   console.log('═══════════════════════════════════════════════════════════');
   console.log('');
-  console.log('Forge recommends three tools for enhanced workflows:');
+  console.log('Forge recommends these tools for enhanced workflows:');
   console.log('');
   console.log('• Issue tracking (Forge Kernel) - zero-install, git-backed');
   console.log('  Persists tasks across sessions, tracks dependencies.');
@@ -3241,7 +3320,7 @@ async function setupProjectTools(rl, question) {
   console.log('');
 
   // Use helper functions to reduce complexity
-  await promptBeadsSetup(question);
+  await promptIssueStoreSetup(question);
   await promptSkillsSetup(question);
 }
 
@@ -3395,7 +3474,8 @@ async function ensureGitHooksInstalled(targetRoot = projectRoot) {
 
 
 // Quick setup with defaults
-async function quickSetup(selectedAgents, skipExternal) {
+async function quickSetup(selectedAgents, skipExternal, options = {}) {
+  const skillsOnly = options.skillsOnly === true;
   showBanner('Quick Setup');
   console.log('');
   console.log('Quick mode: Using defaults...');
@@ -3403,7 +3483,6 @@ async function quickSetup(selectedAgents, skipExternal) {
 
   // Check prerequisites
   checkPrerequisites({
-    requireBeadsCli: true,
     requireGithubCli: true,
     requireJq: true,
   });
@@ -3423,41 +3502,46 @@ async function quickSetup(selectedAgents, skipExternal) {
 
   ensureWorkflowShellPolicy(selectedAgents);
 
-  // Auto-install lefthook if missing
-  autoInstallLefthook();
+  // Auto-install lefthook if missing unless the caller explicitly requested skills only.
+  if (!skillsOnly) {
+    autoInstallLefthook();
+  }
 
   // Auto-setup project tools (Kernel issue store, Skills)
   await autoSetupToolsInQuickMode();
 
   // Setup Claude first if selected, then setup remaining agents
   if (selectedAgents.includes('claude')) {
-    await setupAgent('claude');
+    await setupAgent('claude', {}, { skillsOnly });
   }
-  await setupSelectedAgents(selectedAgents);
+  await setupSelectedAgents(selectedAgents, undefined, { skillsOnly });
   ensureWorkflowRuntimeAssets(selectedAgents);
 
   // Detect Husky and migrate before installing Lefthook hooks
-  await handleHuskyMigration();
+  if (!skillsOnly) {
+    await handleHuskyMigration();
+  }
 
   // Install git hooks for TDD enforcement. LOUD: this is the `forge setup` handler,
   // so an inert-hooks result must fail non-zero (B3), not end green.
   console.log('');
-  installGitHooks({ loud: true });
+  if (skillsOnly) {
+    console.log('Skipping git and harness hooks (--skills-only).');
+  } else {
+    installGitHooks({ loud: true });
+  }
 
   // Configure external services with defaults (unless skipped)
   configureDefaultExternalServices(skipExternal);
 
-  // --sync flag: scaffold Beads GitHub sync workflows without prompting
-  if (SYNC_ENABLED) {
-    await handleSyncScaffold();
-  }
+  removeDeprecatedSyncFiles();
 
   // Progressive setup summary
   console.log('');
   console.log(renderSetupSummary(actionLog, selectedAgents, VERBOSE_MODE, { status: getSetupSummaryStatus() }));
   printSetupNotes();
   // One-step onboarding: run `forge init` when config is still absent (ac0b38c7).
-  // Hooks + Beads already handled above, so init skips those side effects.
+  // Hooks + issue store already handled above, so init skips those side effects.
   await finalizeWorkflowConfig({ hooksAlreadyInstalled: true });
   console.log('');
 }
@@ -3617,13 +3701,13 @@ async function promptForOverwriteDecisions(question, projectStatus, flags = {})
 
 
 // Helper: Setup all selected agents - extracted to reduce cognitive complexity
-async function setupSelectedAgents(selectedAgents, skipFiles) {
+async function setupSelectedAgents(selectedAgents, skipFiles, options = {}) {
   const totalAgents = selectedAgents.length;
   for (const [index, agentKey] of selectedAgents.entries()) {
     const agent = AGENTS[agentKey];
     console.log(`\n[${index + 1}/${totalAgents}] Setting up ${agent.name}...`);
     if (agentKey !== 'claude') { // Claude already done above
-      await setupAgent(agentKey, skipFiles);
+      await setupAgent(agentKey, skipFiles, options);
     }
   }
 
@@ -3691,7 +3775,6 @@ async function interactiveSetupWithFlags(flags) {
 
   // Check agent-independent prerequisites first
   checkPrerequisites({
-    requireBeadsCli: true,
     requireGithubCli: false,
     requireJq: true,
   });
@@ -3740,11 +3823,11 @@ async function interactiveSetupWithFlags(flags) {
 
   // Setup Claude first if selected (delegated to helper), then remaining agents
   if (selectedAgents.includes('claude')) {
-    await setupAgent('claude', skipFiles);
+    await setupAgent('claude', skipFiles, flags);
   }
 
   // Setup each selected agent with progress indication (delegated to helper)
-  await setupSelectedAgents(selectedAgents, skipFiles);
+  await setupSelectedAgents(selectedAgents, skipFiles, flags);
   ensureWorkflowRuntimeAssets(selectedAgents);
 
   // Handle external services step (delegated to helper)
@@ -3758,7 +3841,7 @@ async function interactiveSetupWithFlags(flags) {
 
   // One-step onboarding: this path never writes .forge/config.yaml itself, so
   // run `forge init` when the config is still absent (ac0b38c7).
-  await finalizeWorkflowConfig();
+  await finalizeWorkflowConfig({ hooksAlreadyInstalled: flags.skillsOnly === true });
 }
 
 // Main
@@ -3831,7 +3914,7 @@ function determineSelectedAgents(flags) {
 // Shared setup executor — used by handleSetupCommand
 
 // Dry-run setup — enumerate planned actions without writing files
-function dryRunSetup(agents) { // NOSONAR — Extracted as-is from bin/forge.js; complexity reduction deferred
+function dryRunSetup(agents, options = {}) { // NOSONAR — Extracted as-is from bin/forge.js; complexity reduction deferred
   const collector = new ActionCollector();
 
   // Helper: add create or skip based on whether file exists
@@ -3901,10 +3984,12 @@ function dryRunSetup(agents) { // NOSONAR — Extracted as-is from bin/forge.js;
     }
   }
 
-  // Git hooks
-  addFileAction('lefthook.yml', 'Git hook configuration');
-  addFileAction('.forge/hooks/check-tdd.js', 'TDD enforcement hook');
-  addFileAction('.forge/hooks/forge-native-hook.js', 'Native-hook enforcement adapter (Claude/Cursor)');
+  // Git and harness hooks are opt-out for skills-only setup.
+  if (options.skillsOnly !== true) {
+    addFileAction('lefthook.yml', 'Git hook configuration');
+    addFileAction('.forge/hooks/check-tdd.js', 'TDD enforcement hook');
+    addFileAction('.forge/hooks/forge-native-hook.js', 'Native-hook enforcement adapter (Claude/Cursor)');
+  }
 
   // Print dry-run summary
   console.log('');
@@ -3919,14 +4004,19 @@ function dryRunSetup(agents) { // NOSONAR — Extracted as-is from bin/forge.js;
 
 
 async function executeSetup(config) {
-  const { agents, skipExternal, keepExisting = false, commandRunner } = config;
+  const {
+    agents,
+    skipExternal,
+    keepExisting = false,
+    commandRunner,
+    skillsOnly = false,
+  } = config;
 
   showBanner('Installing for specified agents...');
   console.log('');
 
   // Check prerequisites
   checkPrerequisites({
-    requireBeadsCli: true,
     requireGithubCli: requiresGithubCliForSetup(agents),
     requireJq: true,
     commandRunner,
@@ -3953,60 +4043,62 @@ async function executeSetup(config) {
 
   // Setup Claude first if selected, then remaining agents
   if (agents.includes('claude')) {
-    await setupAgent('claude', skipFiles);
+    await setupAgent('claude', skipFiles, { skillsOnly });
   }
-  await setupSelectedAgents(agents, skipFiles);
+  await setupSelectedAgents(agents, skipFiles, { skillsOnly });
   ensureWorkflowRuntimeAssets(agents);
   ensureWorkflowShellPolicy(agents);
-  repairDeclaredLefthookDependency(agents);
+  if (!skillsOnly) {
+    repairDeclaredLefthookDependency(agents);
+  }
 
   // Detect Husky and migrate before installing Lefthook hooks
-  await handleHuskyMigration();
+  if (!skillsOnly) {
+    await handleHuskyMigration();
+  }
 
   // Install git hooks for TDD enforcement. LOUD: this is the `forge setup` handler,
   // so an inert-hooks result must fail non-zero (B3), not end green.
   console.log('');
-  installGitHooks({ loud: true });
+  if (skillsOnly) {
+    console.log('Skipping git and harness hooks (--skills-only).');
+  } else {
+    installGitHooks({ loud: true });
+  }
 
   // External services (unless skipped)
   await handleExternalServices(skipExternal, agents);
 
-  // --sync flag: scaffold Beads GitHub sync workflows without prompting
-  if (SYNC_ENABLED) {
-    await handleSyncScaffold();
-  }
+  removeDeprecatedSyncFiles();
 
   // Progressive setup summary
   console.log('');
   console.log(renderSetupSummary(actionLog, agents, VERBOSE_MODE, { status: getSetupSummaryStatus() }));
   printSetupNotes();
   // One-step onboarding: run `forge init` when config is still absent (ac0b38c7).
-  // Hooks + Beads already handled above, so init skips those side effects.
+  // Hooks + issue store already handled above, so init skips those side effects.
   await finalizeWorkflowConfig({ hooksAlreadyInstalled: true });
   console.log('');
 }
 
-// Helper: Scaffold Beads GitHub sync when --sync flag is provided
-
-
-// Helper: Scaffold Beads GitHub sync when --sync flag is provided
-async function handleSyncScaffold() {
-  console.log('');
-  console.log('Beads GitHub sync scaffolding is deprecated (--sync).');
+/**
+ * Remove generated Beads/GitHub sync files left behind by older installs.
+ *
+ * Runs on every setup — there is no longer a flag for it. Only files whose
+ * content matches a known generated template are removed, so user-owned files
+ * at the same paths are preserved.
+ */
+function removeDeprecatedSyncFiles() {
   try {
-    const result = scaffoldBeadsSync(projectRoot, getPackageRoot(packageDir));
-    console.log(`  ${result.message}`);
-    for (const f of result.filesRemoved || []) {
-      console.log(`  Removed deprecated sync file: ${f}`);
+    const result = cleanupDeprecatedSyncFiles(projectRoot, { packageDir: getPackageRoot(packageDir) });
+    for (const file of result.removed || []) {
+      console.log(`  Removed deprecated sync file: ${file}`);
     }
   } catch (err) {
-    console.error(`  Error scaffolding GitHub-Beads sync: ${err.message}`);
+    console.error(`  Error removing deprecated sync files: ${err.message}`);
   }
 }
 
-// Helper: Handle setup command in non-quick mode
-
-
 // Helper: Handle setup command in non-quick mode
 async function handleSetupCommand(selectedAgents, flags) {
   if (!Array.isArray(selectedAgents) || selectedAgents.length === 0) {
@@ -4024,6 +4116,7 @@ async function handleSetupCommand(selectedAgents, flags) {
       skipExternal: flags.skipExternal,
       keepExisting: flags.keep,
       commandRunner: flags.commandRunner,
+      skillsOnly: flags.skillsOnly,
     });
   } finally {
     projectRoot = savedRoot;
@@ -4168,6 +4261,7 @@ const SETUP_FLAG_DEFAULTS = Object.freeze({
   sync: false,
   symlink: false,
   nonInteractive: false,
+  skillsOnly: false,
 });
 
 const SIMPLE_SETUP_FLAG_UPDATES = Object.freeze({
@@ -4186,6 +4280,8 @@ const SIMPLE_SETUP_FLAG_UPDATES = Object.freeze({
   '--symlink': { symlink: true },
   '--yes': { yes: true, nonInteractive: true },
   '-y': { yes: true, nonInteractive: true },
+  '--skills-only': { skillsOnly: true },
+  '--no-hooks': { skillsOnly: true },
 });
 
 function parseAgentFlag(argv, currentIndex, isFlagToken) {
@@ -4262,9 +4358,9 @@ function mergeSetupFlags(flags, argv) {
     standard: Boolean(flags.standard || setupFlags.standard),
     full: Boolean(flags.full || setupFlags.full),
     skipExternal: Boolean(flags.skipExternal || setupFlags.skipExternal),
-    sync: Boolean(flags.sync || setupFlags.sync),
     symlink: Boolean(flags.symlink || setupFlags.symlink),
     nonInteractive: Boolean(flags.nonInteractive || setupFlags.nonInteractive),
+    skillsOnly: Boolean(flags.skillsOnly || setupFlags.skillsOnly),
   };
 }
 
@@ -4309,7 +4405,6 @@ module.exports = {
     if (flags.verbose) VERBOSE_MODE = true;
     if (flags.nonInteractive || flags.yes) NON_INTERACTIVE = true;
     if (flags.symlink) SYMLINK_ONLY = true;
-    if (flags.sync) SYNC_ENABLED = true;
     actionLog = new SetupActionLog();
     resetSetupNotes();
     PKG_MANAGER = detectPackageManager();
@@ -4327,6 +4422,12 @@ module.exports = {
       }
 
       const [profile] = selectedProfiles;
+      if (flags.skillsOnly) {
+        return {
+          success: false,
+          error: `--skills-only cannot be combined with --${profile}.`,
+        };
+      }
       return initCommand.handler([`--profile=${profile}`, '--yes', ...(flags.force ? ['--force'] : [])], flags, projectRoot);
     }
 
@@ -4351,7 +4452,7 @@ module.exports = {
 
     if (flags.dryRun) {
       if (selectedAgents.length === 0) selectedAgents = ['claude'];
-      dryRunSetup(selectedAgents);
+      dryRunSetup(selectedAgents, { skillsOnly: flags.skillsOnly });
       return { success: true };
     }
 
@@ -4360,12 +4461,7 @@ module.exports = {
       if (selectedAgents.length === 0 || (flags.yes && !flags.agents)) {
         selectedAgents = Object.keys(AGENTS);
       }
-      await quickSetup(selectedAgents, flags.skipExternal);
-      return { success: true };
-    }
-
-    if (flags.sync && selectedAgents.length === 0) {
-      await handleSyncScaffold();
+      await quickSetup(selectedAgents, flags.skipExternal, { skillsOnly: flags.skillsOnly });
       return { success: true };
     }
 
@@ -4406,6 +4502,8 @@ module.exports = {
   ensureGitHooksInstalled,
   forgeShouldWriteLefthookConfig,
   FORGE_USER_LEFTHOOK_YML,
+  applyExistingGateDeferral,
+  installGitHooks,
   setupClaudeMcpConfig,
   setupCursorMcpConfig,
   setupClaudePermissions,
@@ -4430,14 +4528,13 @@ module.exports = {
   backupAndRemoveLegacyCursorRules,
 
   // State accessors for testing
-  _getState: () => ({ projectRoot, FORCE_MODE, VERBOSE_MODE, NON_INTERACTIVE, SYMLINK_ONLY, SYNC_ENABLED, PKG_MANAGER }),
+  _getState: () => ({ projectRoot, FORCE_MODE, VERBOSE_MODE, NON_INTERACTIVE, SYMLINK_ONLY, PKG_MANAGER }),
   _setState: (state) => {
     if (state.projectRoot !== undefined) projectRoot = state.projectRoot;
     if (state.FORCE_MODE !== undefined) FORCE_MODE = state.FORCE_MODE;
     if (state.VERBOSE_MODE !== undefined) VERBOSE_MODE = state.VERBOSE_MODE;
     if (state.NON_INTERACTIVE !== undefined) NON_INTERACTIVE = state.NON_INTERACTIVE;
     if (state.SYMLINK_ONLY !== undefined) SYMLINK_ONLY = state.SYMLINK_ONLY;
-    if (state.SYNC_ENABLED !== undefined) SYNC_ENABLED = state.SYNC_ENABLED;
     if (state.PKG_MANAGER !== undefined) PKG_MANAGER = state.PKG_MANAGER;
   },
 };

package/lib/commands/shepherd.js

@@ -39,6 +39,7 @@ const { watchLoop } = require('../pr-monitor/watch');
 const { startPrWatcherDetached } = require('../pr-monitor/watch-lifecycle');
 const reconcileExecutor = require('../pr-monitor/reconcile-executor');
 const monitorJournal = require('../pr-monitor/journal');
+const brokerMod = require('../kernel/broker');
 const { EVENT_TYPES: T } = require('../pr-monitor/events');
 const { autoShepherdRailEnabled } = require('./ship');
 
@@ -197,7 +198,18 @@ async function buildMonitorContext(pr, projectRoot, deps) {
     if (!validation.valid) {
       return { error: `Invalid pr-state adapter: ${validation.errors.join('; ')}` };
     }
-    dir = dir || monitorJournal.journalDir({ root: projectRoot || process.cwd(), repo: ctx.repo, pr: ctx.pr });
+    let gitCommonDir = deps.gitCommonDir;
+    if (!gitCommonDir) {
+      try {
+        const resolveGitCommonDir = deps.resolveGitCommonDir || brokerMod.resolveGitCommonDir;
+        gitCommonDir = resolveGitCommonDir(projectRoot || process.cwd(), { warn: () => {} });
+      } catch {
+        /* unavailable common-dir keeps the legacy per-root journal fallback */
+      }
+    }
+    dir = dir || monitorJournal.journalDir({
+      root: projectRoot || process.cwd(), gitCommonDir, repo: ctx.repo, pr: ctx.pr,
+    });
     gather = gather || (() => gatherMonitorSnapshot({ ...ctx, adapter, self: deps.self }));
     enrich = enrich || makeCheckFailureEnricher({
       ...ctx,