kk-git 0.2.6 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae39abac1e3638de958917ebc2fcbbffdace00c23e13fdd53929cec3e416930f
-  data.tar.gz: eb7191f382ae86ff2c25aac1ce6f7af7a1288be5a25c503641416bcb321ba234
+  metadata.gz: cf707ff92a149936ea729095e66789b1af70a80a5519a1b90f262ac9f9bfeaf5
+  data.tar.gz: 16527f8e79675fde491dfad46bc3bf853f43755c837364c905bf7e1839fef542
 SHA512:
-  metadata.gz: df09df41cb4383f3654dc161b33703798e069cd16be48dd160162076eca1d03417c7272bb6dc80cdfb7a06c2a46e8a8029597e94c40e6fe5d79e5be9a2f1c6a4
-  data.tar.gz: a52d189d3bf6606506e9fb06f3ff8289926d9f62864e9a2e3628a0657813a009e32840cfda0b2d4e414f3a8b768e940211566f247c06a998db4c9732d29471a9
+  metadata.gz: 47fe99e7a65c3e9eed0f3e6d2fb56ec47dfe2ab77daf775a8706c598e7ed20b7857adaa6256a122c28924fb677954cbf60d3eb6311f319456c914b93d1f69ce2
+  data.tar.gz: fb76a7efc708d33ec57b9309db3b79a278b146a47df37159f4acdb39ff7f3920fa14996c9c70b24ed7a68e238d6170953ccd9886b5085b0c5d6cef522cc7d01e

data/exe/kk-git

@@ -165,7 +165,7 @@ def main_help
       KK_GIT_SKIP_PUSH=1  skip push step
       KK_GIT_AMEND=1      amend last commit instead of creating new one
       KK_GIT_CONFIRM=1    print message and require KK_GIT_YES=1
-      KK_GIT_ALLOW_SENSITIVE=1  allow committing .env/credentials paths
+      KK_GIT_BLOCK_SENSITIVE=1  block committing .env/credentials paths (off by default)
       KK_GIT_DEFAULT_TYPE  default type for code edits (default: chore)
       KK_GIT_PUSH_URL       push to explicit URL (bypass SSH remote)
       KK_GIT_PULL_URL       pull from explicit URL (bypass SSH remote)

data/lib/kk/git/auto_format.rb

@@ -52,9 +52,18 @@ module KKGit
         ]
       ),
       Language.new(
-        id: :prettier,
+        id: :js,
         label: 'JS/TS/Node',
-        extensions: %w[.js .jsx .mjs .cjs .ts .tsx .json .css .scss .less .html .md .yaml .yml],
+        extensions: %w[.js .jsx .mjs .cjs .ts .tsx .json .jsonc .css],
+        tools: [
+          Tool.new(name: 'biome', bin: 'biome', argv: ['format', '--write', '%{files}']),
+          Tool.new(name: 'prettier', bin: 'prettier', argv: ['--write', '%{files}'])
+        ]
+      ),
+      Language.new(
+        id: :prettier_docs,
+        label: 'Prettier (markup/docs)',
+        extensions: %w[.scss .less .html .md .mdx .yaml .yml],
         tools: [
           Tool.new(name: 'prettier', bin: 'prettier', argv: ['--write', '%{files}'])
         ]

data/lib/kk/git/commit_message.rb

@@ -315,8 +315,8 @@ module KKGit
       return false if path.nil?
       path.start_with?('openspec/') ||
         path.match?(/\AREADME(\..+)?\z/i) ||
-        path.match?(/\.(md|mdx|txt)\z/i)
-    end
+        path.match?(/\.(md|mdx|txt|csv)\z/i)
+      end
 
     def self.ci_path?(path)
       return false if path.nil?

data/lib/kk/git/git_ops.rb

@@ -22,6 +22,12 @@ module KKGit
 
     SAFE_ENV_TEMPLATE_SUFFIXES = %w[example sample template dist].freeze
 
+    # Application source that manages credentials in-repo (not secret payloads).
+    SAFE_CREDENTIALS_CODE_PATTERNS = [
+      %r{(?:^|/)[a-z0-9_]+_credentials\.go\z}i,
+      %r{(?:^|/)[a-z0-9_]+_credentials\.(ts|tsx|js|jsx)\z}i
+    ].freeze
+
     # 仓库同步状态快照
     Status = Struct.new(
       :branch, :remote, :clean, :ahead, :behind,
@@ -261,10 +267,15 @@ module KKGit
 
       def sensitive_path?(path)
         return false if safe_env_template?(path)
+        return false if safe_credentials_code?(path)
 
         SENSITIVE_PATH_PATTERNS.any? { |pattern| path.match?(pattern) }
       end
 
+      def safe_credentials_code?(path)
+        SAFE_CREDENTIALS_CODE_PATTERNS.any? { |pattern| path.match?(pattern) }
+      end
+
       def safe_env_template?(path)
         SAFE_ENV_TEMPLATE_SUFFIXES.any? do |suffix|
           path.match?(/\A\.env\.#{suffix}\z/i)
@@ -279,16 +290,18 @@ module KKGit
       end
 
       def ensure_no_sensitive_staged!(repo_dir: '.')
+        return unless sensitive_check_enabled?
+
         paths = sensitive_staged_paths(repo_dir: repo_dir)
         return if paths.empty?
 
-        if ENV['KK_GIT_ALLOW_SENSITIVE'] == '1'
-          warn "Warning: committing sensitive paths: #{paths.join(', ')}"
-        else
-          raise Error,
-                "Refusing to commit sensitive paths: #{paths.join(', ')}. " \
-                'Set KK_GIT_ALLOW_SENSITIVE=1 to override.'
-        end
+        raise Error,
+              "Refusing to commit sensitive paths: #{paths.join(', ')}. " \
+              'Unset KK_GIT_BLOCK_SENSITIVE or unstage these files.'
+      end
+
+      def sensitive_check_enabled?
+        ENV['KK_GIT_BLOCK_SENSITIVE'] == '1'
       end
 
       def confirm_commit!(message)
@@ -299,6 +312,18 @@ module KKGit
         raise Error, 'Set KK_GIT_YES=1 to confirm this commit'
       end
 
+      def fallback_commit_message(repo_dir: '.')
+        inferred = KKGit::CommitMessage.generate(repo_dir: repo_dir, mode: :all).to_s.strip
+        return inferred unless inferred.empty?
+
+        out, _err, ok = run_cmd('git', 'diff', '--cached', '--name-only', chdir: repo_dir)
+        names = ok ? out.split("\n").reject(&:empty?) : []
+        return 'chore(general): Update project' if names.empty?
+
+        label = File.basename(names.first)
+        names.length == 1 ? "chore(general): Update #{label}" : "chore(general): Update #{names.length} files"
+      end
+
       def commit_with_message!(message, repo_dir: '.')
         commit_args = amend? ? %w[commit --amend -F] : %w[commit -F]
 
@@ -339,6 +364,17 @@ module KKGit
         add_all!(repo_dir: repo_dir)
         ensure_no_sensitive_staged!(repo_dir: repo_dir)
 
+        # add 后可能已干净：假脏（换行归一化等）或 KK_GIT_ADD_PATHS 未覆盖到变更
+        if working_tree_clean?(repo_dir: repo_dir)
+          if status(remote: remote_name, branch: branch_name, repo_dir: repo_dir).needs_sync?
+            sync_with_remote!(remote_name, branch_name, repo_dir: repo_dir)
+            return :synced
+          end
+
+          puts 'No changes to commit or push'
+          return :noop
+        end
+
         message =
           if commit_message_generator
             commit_message_generator.call
@@ -346,6 +382,10 @@ module KKGit
             KKGit::CommitMessage.generate(repo_dir: repo_dir, mode: :all)
           end
         message = message.to_s.strip
+        if message.empty?
+          message = fallback_commit_message(repo_dir: repo_dir)
+          warn "Commit message inference empty; using fallback: #{message}"
+        end
         raise Error, 'Could not generate commit message from staged changes' if message.empty?
 
         confirm_commit!(message)

data/lib/kk/git/rake_tasks.rb

@@ -71,6 +71,20 @@ module KKGit
           warn e.message
           exit 1
         end
+
+        desc 'Auto commit/push, then semver tag (SKIP_TAG=1 or KK_GIT_AUTO_TAG=0 to skip)'
+        task :auto_commit_push_tag do
+          generator = lambda do
+            Rake::Task['git:auto_commit'].reenable
+            Rake::Task['git:auto_commit'].invoke
+            ENV['KK_GIT_COMMIT_MESSAGE'].to_s
+          end
+
+          KKGit::Release.auto_commit_push_and_tag!(commit_message_generator: generator)
+        rescue KKGit::GitOps::Error, ArgumentError => e
+          warn e.message
+          exit 1
+        end
       end
     end
   end

data/lib/kk/git/release.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module KKGit
-  # Semver bump and git tag helpers (maintainer release flow).
+  # Semver bump and git tag helpers (maintainer release flow + consumer auto-tag).
   module Release
     VERSION_PATH = File.join(__dir__, 'version.rb').freeze
 
@@ -48,7 +48,7 @@ module KKGit
     end
 
     def semver_max(*versions)
-      versions.compact.max_by { |v| v }
+      versions.compact.max
     end
 
     def tag_exists?(tag, repo_dir: '.')
@@ -74,6 +74,42 @@ module KKGit
       true
     end
 
+    # Strict repo tags only: vMAJOR.MINOR.PATCH with MAJOR < max_major (skips date tags like v2026.09.23).
+    # @return [Array<Array(Integer)>]
+    def list_repo_semver_versions(prefix: 'v', repo_dir: '.', max_major: 1999)
+      stdout, _stderr, ok = GitOps.run_cmd('git', 'tag', '--list', "#{prefix}*", chdir: repo_dir)
+      return [] unless ok
+
+      stdout.to_s.split("\n").filter_map do |t|
+        t = t.strip
+        next unless t.start_with?(prefix)
+
+        ver = parse_semver(t.delete_prefix(prefix))
+        next unless ver
+        next if ver[0] > max_major
+
+        ver
+      end
+    end
+
+    # Next tag from git history only (no version.rb / gem VERSION). For product repos.
+    # @return [String] e.g. "v1.0.1"
+    def next_repo_semver_tag(prefix: nil, bump: nil, repo_dir: '.', default_base: [1, 0, 0], max_major: 1999)
+      prefix ||= ENV.fetch('KK_GIT_TAG_PREFIX', 'v')
+      bump ||= ENV.fetch('KK_GIT_BUMP', 'patch')
+      raise ArgumentError, "bump must be major|minor|patch (got #{bump})" unless %w[major minor patch].include?(bump)
+
+      base = list_repo_semver_versions(prefix: prefix, repo_dir: repo_dir, max_major: max_major).max || default_base
+      version = base
+      50.times do
+        version = bump_semver(version, bump)
+        candidate = "#{prefix}#{semver_to_s(version)}"
+        return candidate unless tag_exists?(candidate, repo_dir: repo_dir)
+      end
+
+      raise 'Failed to generate next repo semver tag: too many attempts'
+    end
+
     # @return [Array(String, String)] tag, version
     def next_tag_and_version(prefix: nil, bump: nil, repo_dir: '.')
       prefix ||= ENV.fetch('KK_GIT_TAG_PREFIX', 'v')
@@ -81,6 +117,7 @@ module KKGit
 
       latest_tag = latest_semver_tag(prefix: prefix, repo_dir: repo_dir)
       tag_version = latest_tag ? parse_semver(latest_tag.delete_prefix(prefix)) : nil
+      # Prefer strict repo tags when gem/file versions would pollute consumer repos.
       file_version = current_version_in_file || parse_semver(KKGit::VERSION)
 
       # version.rb already ahead of tags and tag not yet created → release that version
@@ -109,5 +146,63 @@ module KKGit
       out, err, ok = GitOps.run_cmd('git', 'push', push_target, tag, chdir: repo_dir)
       GitOps.ensure_ok!(ok, 'git push tag', stdout: out, stderr: err, repo_dir: repo_dir)
     end
+
+    def auto_tag_enabled?
+      return false if ENV['SKIP_TAG'] == '1'
+
+      ENV.fetch('KK_GIT_AUTO_TAG', '1') != '0'
+    end
+
+    # Commit + push, then create/push a semver tag when a new commit was made.
+    #
+    # - Product repos: leave bump_gem_version false (uses next_repo_semver_tag).
+    # - kk-git itself: bump_gem_version true (updates version.rb before commit).
+    #
+    # Env: KK_GIT_AUTO_TAG (default 1), SKIP_TAG=1, KK_GIT_BUMP, KK_GIT_TAG_PREFIX
+    #
+    # @return [Hash] keys :result (Symbol), :tag (String or nil)
+    def auto_commit_push_and_tag!(commit_message_generator: nil, repo_dir: '.', bump_gem_version: false)
+      GitOps.ensure_in_repo!(repo_dir: repo_dir)
+
+      head_before, _err, ok = GitOps.run_cmd('git', 'rev-parse', 'HEAD', chdir: repo_dir)
+      head_before = ok ? head_before.to_s.strip : ''
+
+      prepared_tag = nil
+      if bump_gem_version && auto_tag_enabled? && !GitOps.working_tree_clean?(repo_dir: repo_dir)
+        prepared_tag, new_version = next_tag_and_version(repo_dir: repo_dir)
+        bumped = update_version!(new_version)
+        puts((bumped ? "Version bumped to #{new_version}" : "Version already #{new_version}") +
+             ", preparing tag #{prepared_tag}")
+      end
+
+      result = GitOps.auto_commit_push!(
+        commit_message_generator: commit_message_generator,
+        repo_dir: repo_dir
+      )
+
+      head_after, _err2, ok2 = GitOps.run_cmd('git', 'rev-parse', 'HEAD', chdir: repo_dir)
+      head_after = ok2 ? head_after.to_s.strip : ''
+      new_commit = result == :committed_and_synced || (head_before != head_after && !head_after.empty?)
+
+      unless auto_tag_enabled?
+        puts 'SKIP_TAG/KK_GIT_AUTO_TAG=0 — not tagging' if ENV['SKIP_TAG'] == '1' || ENV['KK_GIT_AUTO_TAG'] == '0'
+        return { result: result, tag: nil }
+      end
+
+      unless new_commit
+        puts "No new commit (#{result}) — skip tag"
+        return { result: result, tag: nil }
+      end
+
+      tag = prepared_tag || next_repo_semver_tag(repo_dir: repo_dir)
+      if tag_exists?(tag, repo_dir: repo_dir)
+        puts "Tag #{tag} already exists — skip"
+        return { result: result, tag: nil }
+      end
+
+      create_and_push_tag!(tag, repo_dir: repo_dir)
+      puts "Tagged and pushed #{tag}"
+      { result: result, tag: tag }
+    end
   end
 end

data/lib/kk/git/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KKGit
-  VERSION = '0.2.6'
+  VERSION = '0.2.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kk-git
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.9
 platform: ruby
 authors:
 - kk
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-07 00:00:00.000000000 Z
+date: 2026-11-11 00:00:00.000000000 Z
 dependencies: []
 description: Generate Conventional Commits commit messages from current git changes
   (staged/worktree), designed for Rake/script usage.