fg-devkit 1.24.1 → 1.24.2

package/README.md

@@ -98,8 +98,8 @@ pnpm exec fgd setup-ai-rules
 It enables the `fg-core` and `fg-frontend` plugins in `.claude/settings.json`, adds the `fg` marketplace
 to Claude Code if it is missing, and installs the plugins once for the user, disabled at user scope. The
 repo's `.claude/settings.json` then switches them on, so every repo that commits that file gets the rules
-and other repos don't. Each developer runs it once on their machine; commit `.claude/settings.json` in
-each repo. Needs Claude Code and SSH access to `feelgood/fg-ai-rules`.
+and other repos don't. When `.claude/settings.json` changed it commits that file on its own
+(`chore(repo): enable fg-ai-rules Claude Code plugins`). Each developer runs it once on their machine. Needs Claude Code and SSH access to `feelgood/fg-ai-rules`.
 
 Run full consumer setup in one command:
 
@@ -108,7 +108,7 @@ pnpm exec fgd full-consumer-setup
 ```
 
 It syncs the consumer scripts, Lefthook, configs and dependency policy, runs `pnpm install`, and finishes with
-`setup-ai-rules`. Without Claude Code that last step only prints a warning.
+`setup-ai-rules`, which commits `.claude/settings.json`. Without Claude Code that last step only prints a warning.
 
 ## Dependency policy update workflow
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fg-devkit",
-  "version": "1.24.1",
+  "version": "1.24.2",
   "description": "Shared configs, scripts, and DX tooling for Vue / TypeScript frontend repos",
   "type": "module",
   "license": "UNLICENSED",

package/scaffold/vue/package.json

@@ -32,7 +32,7 @@
     "@intlify/unplugin-vue-i18n": "11.2.6",
     "@tanstack/vue-query-devtools": "6.3.3",
     "@types/node": "22.16.5",
-    "fg-devkit": "1.24.1",
+    "fg-devkit": "1.24.2",
     "@vitejs/plugin-vue": "6.0.10",
     "tailwindcss": "4.3.3",
     "tsx": "4.23.15",

package/scripts/fg-devkit.mjs

@@ -577,7 +577,7 @@ Commands:
   sync-vite-plugin-vue-inspector  Add/pin vite-plugin-vue-inspector, wire vite.config, install, commit
   sync-consumer-scripts           Enforce standard fgd scripts in consumer package.json
   setup-lefthook                  Write lefthook.yml and install the git hooks
-  setup-ai-rules                  Enable the fg-ai-rules Claude Code plugins in this repo, install them once per machine
+  setup-ai-rules                  Enable the fg-ai-rules Claude Code plugins in this repo, install them once per machine, commit
   full-consumer-setup             Run: scripts -> lefthook -> step 3 -> step 2 -> pnpm install -> AI rules
   create-release [release|candidate] [patch|minor|major] [--skip-release-notes]
                                  Stable release or candidate (X.Y.Z-rc.N); omit = interactive menu
@@ -1091,14 +1091,14 @@ async function runInteractiveMenu() {
             description: 'Write lefthook.yml and install the git hooks',
           },
           {
-            name: 'AI rules',
+            name: autoCommit('AI rules'),
             value: 'ai-rules',
-            description: 'Enable the fg-ai-rules plugins in .claude/settings.json and install them for Claude Code',
+            description: 'Enable the fg-ai-rules plugins in .claude/settings.json, install them for Claude Code and commit the file',
           },
           {
             name: 'Full setup',
             value: 'full-consumer-setup',
-            description: 'Sync scripts, Lefthook, configs and dependency policy, pnpm install, then set up AI rules',
+            description: 'Sync scripts, Lefthook, configs and dependency policy, pnpm install, then set up AI rules (commits .claude/settings.json)',
           },
           { name: 'Cancel', value: 'cancel' },
         ],

package/scripts/setup-ai-rules.mjs

@@ -10,6 +10,8 @@
  *      project-scope install only covers one repo. A user-scope install covers every repo, and
  *      disabling it at user scope leaves the repo's .claude/settings.json to switch it on.
  *
+ *   4. Commit .claude/settings.json when it changed (only that file).
+ *
  * Safe to run again: it only changes what is missing. Once a developer has run it in any repo,
  * every other repo that commits the same .claude/settings.json works without running it again.
  *
@@ -21,13 +23,18 @@ import { spawnSync } from 'node:child_process'
 import fs from 'node:fs'
 import path from 'node:path'
 
+import { fileDiffersFromHead, runGit } from './lib/common.mjs'
+
 const TAG = '[setup-ai-rules]'
 const MARKETPLACE = 'fg'
 const MARKETPLACE_REPO = 'feelgood/fg-ai-rules'
 const PLUGINS = ['fg-core', 'fg-frontend']
 
 const projectRoot = fs.realpathSync(process.cwd())
-const settingsPath = path.join(projectRoot, '.claude', 'settings.json')
+const SETTINGS_FILE = '.claude/settings.json'
+const COMMIT_MESSAGE = 'chore(repo): enable fg-ai-rules Claude Code plugins'
+const settingsPath = path.join(projectRoot, SETTINGS_FILE)
+const GIT = { cwd: projectRoot, tag: TAG }
 
 function claude(args, { capture = false } = {}) {
   const result = spawnSync('claude', args, {
@@ -85,6 +92,20 @@ function updateSettings() {
   return true
 }
 
+/** Commit .claude/settings.json on its own when it differs from HEAD. */
+function commitSettings() {
+  if (runGit(['rev-parse', '--is-inside-work-tree'], { ...GIT, capture: true }).status !== 0) {
+    console.log(`${TAG} Not a git repository; commit ${SETTINGS_FILE} yourself.`)
+    return 0
+  }
+  if (!fileDiffersFromHead(SETTINGS_FILE, GIT)) return 0
+  const status =
+    runGit(['add', '--', SETTINGS_FILE], GIT).status ||
+    runGit(['commit', '-m', COMMIT_MESSAGE, '--', SETTINGS_FILE], GIT).status
+  if (status !== 0) console.error(`${TAG} Could not commit ${SETTINGS_FILE}.`)
+  return status
+}
+
 function printManualSteps() {
   console.log(`${TAG} Run these from the repo root, then restart Claude Code:`)
   console.log(`  claude plugin marketplace add ${MARKETPLACE_REPO}`)
@@ -144,8 +165,8 @@ function main() {
     return 1
   }
 
+  if (commitSettings() !== 0) return 1
   console.log(`${TAG} Done. Restart Claude Code to load the rules.`)
-  if (settingsChanged) console.log(`${TAG} Commit .claude/settings.json so other repos and teammates get the same plugins.`)
   return 0
 }