datasecops-cli 0.5.9__tar.gz → 0.6.0__tar.gz

{datasecops_cli-0.5.9 → datasecops_cli-0.6.0}/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 All notable changes to the DataSecOps CLI are documented in this file.
 
+## [0.6.0] - 2026-07-24
+
+### Added
+
+- **GitHub Copilot skill target** — skills can now be installed as `.github/instructions/<id>.instructions.md` files with `applyTo` frontmatter for GitHub Copilot custom instructions.
+- **Multi-tool skill download** — the skill install menu now prompts users to select target tools: CoCo, Cursor, Copilot, and/or Claude Code. Each format is automatically generated from the same source skill.
+- **Snowflake query instructions** — Cursor, Copilot, and Claude skill files automatically include instructions on how to query Snowflake via the `snow` CLI when the skill contains SQL blocks.
+
+### Changed
+
+- **Skill target renamed** — "Cortex Code" target label renamed to "CoCo" to match the native app UI naming convention.
+- **Downloads menu label** — "Cortex Code skills" renamed to "AI coding skills".
+- **Shared conversion helpers** — extracted `_strip_frontmatter()` and `_prepare_body()` to eliminate duplication across format converters.
+- **Robust frontmatter stripping** — uses line-boundary matching (`\n---`) instead of simple `split('---', 2)` to avoid false matches in skill body content.
+- **Cursor description quoting** — `.mdc` description values are now properly quoted and sanitized (newlines removed, quotes escaped).
+
+## [0.5.10] - 2026-06-26
+
+### Changed
+
+- **Lint modified includes all uncommitted files** — "lint modified" and "fix modified" now detect staged changes, unstaged changes, and untracked files (previously only caught unstaged modifications).
+- **Lint specific file accepts model names** — the "specific" lint option now accepts a model name (e.g. `stg_orders`) and resolves it to the SQL file path by searching the models directory recursively.
+- **Reset branch from main** — new git menu option (10) to force-reset an environment branch (e.g. `test`) to match `origin/main`, removing all existing commits on that branch.
+- **Deploy excludes main branch** — the deploy-to-environment menu no longer lists `main` as a target, preventing accidental force-pushes to the primary branch.
+
 ## [0.5.9] - 2026-06-22
 
 ### Fixed

{datasecops_cli-0.5.9 → datasecops_cli-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datasecops-cli
-Version: 0.5.9
+Version: 0.6.0
 Summary: DataSecOps Framework CLI for Snowflake Native App
 License-Expression: MIT
 License-File: LICENSE
@@ -81,7 +81,7 @@ datasecops
 | Menu | Capabilities |
 |------|-------------|
 | **Development** | dbt run, build, test, lint (SQLFluff), deps, seed, compile, snapshot, freshness, docs |
-| **Git** | Branch create/checkout/delete, commit & push, rebase, squash, deploy to environment branches, cherry-pick |
+| **Git** | Branch create/checkout/delete, commit & push, rebase, squash, deploy to environment branches, cherry-pick, reset branch from main |
 | **Downloads** | SQLFluff config, CI/CD pipelines (GitHub Actions / Azure DevOps), dbt packages, Cortex Code skills |
 
 ## Non-Interactive Mode (CI/CD)

{datasecops_cli-0.5.9 → datasecops_cli-0.6.0}/README.md

@@ -62,7 +62,7 @@ datasecops
 | Menu | Capabilities |
 |------|-------------|
 | **Development** | dbt run, build, test, lint (SQLFluff), deps, seed, compile, snapshot, freshness, docs |
-| **Git** | Branch create/checkout/delete, commit & push, rebase, squash, deploy to environment branches, cherry-pick |
+| **Git** | Branch create/checkout/delete, commit & push, rebase, squash, deploy to environment branches, cherry-pick, reset branch from main |
 | **Downloads** | SQLFluff config, CI/CD pipelines (GitHub Actions / Azure DevOps), dbt packages, Cortex Code skills |
 
 ## Non-Interactive Mode (CI/CD)

{datasecops_cli-0.5.9 → datasecops_cli-0.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "datasecops-cli"
-version = "0.5.9"
+version = "0.6.0"
 description = "DataSecOps Framework CLI for Snowflake Native App"
 readme = "README.md"
 requires-python = ">=3.10"

datasecops_cli-0.6.0/src/datasecops_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.6.0"

{datasecops_cli-0.5.9 → datasecops_cli-0.6.0}/src/datasecops_cli/menus/development.py

@@ -204,19 +204,23 @@ class DevelopmentMenu:
             complete_action()
             return
         if option == 1:
-            changed = [f.file for f in self.git.get_changed_files()] if self.git else []
+            changed = self.git.get_all_modified_files() if self.git else []
             self.linting.lint_modified(fix=False, changed_files=changed)
         elif option == 2:
-            changed = [f.file for f in self.git.get_changed_files()] if self.git else []
+            changed = self.git.get_all_modified_files() if self.git else []
             self.linting.lint_modified(fix=True, changed_files=changed)
         elif option == 3:
             self.linting.lint_file(fix=False)
         elif option == 4:
             self.linting.lint_file(fix=True)
         elif option == 5:
-            path = get_input_string("Enter SQL file path (e.g. models/staging/stg_orders.sql): ")
-            if path != "0":
-                self.linting.lint_file(file_path=path, fix=False)
+            name = get_input_string("Enter model name or file path (e.g. stg_orders): ")
+            if name != "0":
+                path = name if name.endswith(".sql") else self.linting.resolve_model_path(name)
+                if path:
+                    self.linting.lint_file(file_path=path, fix=False)
+                else:
+                    error_line(f"Could not find model '{name}' in models/ directory")
         elif option == 6:
             if not self.downloads:
                 error_line("Download service not available")

{datasecops_cli-0.5.9 → datasecops_cli-0.6.0}/src/datasecops_cli/menus/downloads.py

@@ -70,7 +70,7 @@ class DownloadsMenu:
         menu_option(2, "pipelines     - Download CI/CD pipeline files")
         menu_option(3, "dbt packages  - Download dbt package versions")
         menu_option(4, "macros        - Download default macros for this profile")
-        menu_option(5, "skills        - Cortex Code skills")
+        menu_option(5, "skills        - AI coding skills")
         menu_option(0, "back          - Return to main menu")
     
     def _skills_menu(self) -> None:

{datasecops_cli-0.5.9 → datasecops_cli-0.6.0}/src/datasecops_cli/menus/git_operations.py

@@ -42,6 +42,8 @@ class GitOperationsMenu:
                 self._cherry_pick_test()
             elif option == 9:
                 self._deploy_prod()
+            elif option == 10:
+                self._reset_branch_from_main()
             self._menu()
             option = get_input_number("Choose an option: ")
 
@@ -57,6 +59,7 @@ class GitOperationsMenu:
         menu_option(7, "squash to test    - Squash merge into test")
         menu_option(8, "remove from test  - Remove a branch from test")
         menu_option(9, "deploy to prod    - Deploy main to production")
+        menu_option(10, "reset branch      - Force reset a branch from main")
         menu_option(0, "back              - Return to main menu")
 
     def _branch_menu(self) -> None:
@@ -190,7 +193,7 @@ class GitOperationsMenu:
         display_action_header("Deploy to Environment")
         
         # Build environment list from framework config, filtering non-deployable environments
-        excluded = {"unit-test", "ci", "local-dev", "prod", "test"}
+        excluded = {"unit-test", "ci", "local-dev", "prod", "test", "main"}
         environments = {}
         if self.source_control.environments:
             for env in self.source_control.environments:
@@ -289,3 +292,39 @@ class GitOperationsMenu:
             selected = commits[choice-1]
             self.git.revert_from_test(selected["sha"], selected["branch"])
         complete_action()
+
+    def _reset_branch_from_main(self) -> None:
+        display_action_header("Reset Branch from Main")
+
+        # Build list of resettable branches from environments + deployment_branches
+        excluded = {"main", "prod"}
+        branches = {}
+        if self.source_control.environments:
+            for env in self.source_control.environments:
+                if env.branch_name and env.branch_name.lower() not in excluded:
+                    branches[env.branch_name] = env.branch_name
+
+        if not branches:
+            branches = {
+                k: v for k, v in self.deployment_branches.items()
+                if k.lower() not in excluded
+            }
+
+        # Always include test if not already present
+        if "test" not in branches:
+            branches["test"] = "test"
+
+        if not branches:
+            error_line("No branches available to reset")
+            complete_action()
+            return
+
+        selected = select_from_dict(branches, "branch to reset")
+        if selected == "back":
+            return
+
+        warning_line(f"This will FORCE RESET '{selected}' to match origin/main")
+        warning_line("All existing commits on that branch will be lost")
+        if get_input_true_false("Are you sure?", "n"):
+            self.git.reset_branch_from_main(selected)
+        complete_action()

{datasecops_cli-0.5.9 → datasecops_cli-0.6.0}/src/datasecops_cli/services/git_service.py

@@ -30,6 +30,22 @@ class GitService:
     def get_new_files(self) -> list[GitCommitHelper]:
         return [GitCommitHelper(file=f) for f in self.repo.untracked_files]
     
+    def get_all_modified_files(self) -> list[str]:
+        """Get all files that differ from the last commit: unstaged, staged, and untracked."""
+        paths = set()
+        # Staged changes (index vs HEAD)
+        for d in self.repo.index.diff("HEAD"):
+            if d.change_type != "D" and d.a_path:
+                paths.add(d.a_path)
+        # Unstaged changes (working tree vs index)
+        for d in self.repo.index.diff(None):
+            if d.change_type != "D" and d.a_path:
+                paths.add(d.a_path)
+        # Untracked files
+        for f in self.repo.untracked_files:
+            paths.add(f)
+        return sorted(paths)
+    
     def get_local_branches(self) -> dict[str, str]:
         return {b.name: b.name for b in self.repo.branches}
     
@@ -397,3 +413,13 @@ class GitService:
             if branch.name not in ("main", "test"):
                 self.repo.delete_head(branch, force=True)
         success_line("Reset to main completed")
+    
+    def reset_branch_from_main(self, branch_name: str) -> None:
+        """Force reset a remote branch to match origin/main."""
+        try:
+            self.repo.remotes.origin.fetch()
+            main_sha = self.repo.commit("origin/main").hexsha
+            self.repo.remotes.origin.push(refspec=f"{main_sha}:refs/heads/{branch_name}", force=True)
+            success_line(f"Reset '{branch_name}' to match main ({main_sha[:8]})")
+        except GitCommandError as e:
+            error_line(f"Failed to reset '{branch_name}': {e}")

{datasecops_cli-0.5.9 → datasecops_cli-0.6.0}/src/datasecops_cli/services/linting_service.py

@@ -88,6 +88,21 @@ class LintingService:
         warning_line(f"Missing packages: {', '.join(missing)}")
         return self.install_requirements(missing)
     
+    def resolve_model_path(self, name: str) -> str | None:
+        """Resolve a model name (e.g. 'stg_orders') to its SQL file path under models/."""
+        models_dir = self.project_dir / "models"
+        if not models_dir.exists():
+            return None
+        matches = list(models_dir.rglob(f"{name}.sql"))
+        if len(matches) == 1:
+            return str(matches[0].relative_to(self.project_dir))
+        if len(matches) > 1:
+            warning_line(f"Multiple matches for '{name}':")
+            for m in matches:
+                info_line(f"  {m.relative_to(self.project_dir)}")
+            return None
+        return None
+
     def lint_file(self, file_path: str = None, fix: bool = False) -> subprocess.CompletedProcess:
         action = "fix" if fix else "lint"
         cmd = ["sqlfluff", action]

{datasecops_cli-0.5.9 → datasecops_cli-0.6.0}/src/datasecops_cli/services/skill_service.py

@@ -7,14 +7,26 @@ from datasecops_cli.models.project_config import CortexSkill, CortexSkillFile
 from datasecops_cli.utilities.display import info_line, success_line, error_line, warning_line
 from datasecops_cli.utilities.file_utils import (
     write_file, ensure_dir, get_cortex_skills_dir,
-    get_cursor_rules_dir, get_claude_commands_dir,
+    get_cursor_rules_dir, get_claude_commands_dir, get_copilot_instructions_dir,
 )
 
+_SNOWFLAKE_QUERY_INSTRUCTIONS = """## Querying Snowflake
+
+This skill requires running SQL queries against Snowflake to retrieve configuration.
+Use the Snowflake CLI (`snow`) to execute queries:
+
+```bash
+snow sql -q "YOUR SQL QUERY HERE" -c <connection_name>
+```
+
+Alternatively, if an MCP server for Snowflake is configured, use it to execute queries directly.
+"""
+
 
 class SkillService:
     """Manages skill installation for Cortex Code, Cursor, and Claude Code."""
 
-    TARGETS = ["Cortex Code", "Cursor", "Claude Code"]
+    TARGETS = ["CoCo", "Cursor", "Copilot", "Claude Code"]
     
     def __init__(self, snowflake_service: SnowflakeService):
         self.sf = snowflake_service
@@ -68,15 +80,15 @@ class SkillService:
             targets = self.TARGETS
         targets_installed: list[str] = []
 
-        # 1. Cortex Code: .cortex/skills/{skill_id}/SKILL.md + extra files
-        if "Cortex Code" in targets:
+        # 1. CoCo: .cortex/skills/{skill_id}/SKILL.md + extra files
+        if "CoCo" in targets:
             cortex_dir = target_dir or get_cortex_skills_dir()
             skill_dir = cortex_dir / skill.skill_id
             ensure_dir(skill_dir)
             for f in skill.files:
                 if f.filename and f.content:
                     write_file(skill_dir / f.filename, f.content)
-            targets_installed.append("Cortex Code")
+            targets_installed.append("CoCo")
 
         # Extract SKILL.md content for Cursor and Claude Code
         skill_md = self._get_skill_md_content(skill)
@@ -97,11 +109,23 @@ class SkillService:
             try:
                 claude_dir = get_claude_commands_dir()
                 ensure_dir(claude_dir)
-                write_file(claude_dir / f"{skill.skill_id}.md", skill_md)
+                claude_content = self._to_claude_command(skill, skill_md)
+                write_file(claude_dir / f"{skill.skill_id}.md", claude_content)
                 targets_installed.append("Claude Code")
             except OSError as e:
                 warning_line(f"  Claude Code install failed: {e}")
 
+        # 4. GitHub Copilot: .github/instructions/{skill_id}.instructions.md
+        if "Copilot" in targets and skill_md:
+            try:
+                copilot_dir = get_copilot_instructions_dir()
+                ensure_dir(copilot_dir)
+                copilot_content = self._to_copilot_instructions(skill, skill_md)
+                write_file(copilot_dir / f"{skill.skill_id}.instructions.md", copilot_content)
+                targets_installed.append("Copilot")
+            except OSError as e:
+                warning_line(f"  Copilot install failed: {e}")
+
         success_line(f"Installed skill: {skill.name} v{skill.version} -> {', '.join(targets_installed)}")
         return True
     
@@ -113,7 +137,7 @@ class SkillService:
         for skill in skills:
             if self.install_skill(skill, targets=targets, target_dir=target_dir):
                 count += 1
-        if "Cortex Code" in targets:
+        if "CoCo" in targets:
             self._register_cortex_skills_dir(target_dir)
         success_line(f"Installed {count} skill(s) to {', '.join(targets)}")
         return count
@@ -128,7 +152,7 @@ class SkillService:
             if self._is_installed(skill.skill_id, target):
                 self.install_skill(skill, targets=targets, target_dir=target_dir)
                 count += 1
-        if "Cortex Code" in targets:
+        if "CoCo" in targets:
             self._register_cortex_skills_dir(target_dir)
         success_line(f"Updated {count} skill(s)")
         return count
@@ -146,23 +170,32 @@ class SkillService:
         return ""
 
     @staticmethod
-    def _to_cursor_rule(skill: CortexSkill, skill_md_content: str) -> str:
-        """Convert SKILL.md content to Cursor .mdc rule format.
-        
-        Cursor rules use the same markdown format but with optional
-        frontmatter for description and globs.
-        """
-        # Strip the existing YAML frontmatter if present
-        content = skill_md_content
-        if content.startswith("---"):
-            end = content.find("---", 3)
-            if end != -1:
-                content = content[end + 3:].lstrip("\n")
-
-        # Add Cursor-style frontmatter
+    def _strip_frontmatter(content: str) -> str:
+        """Remove leading YAML frontmatter (---...---) from markdown content."""
+        if not content.startswith("---"):
+            return content
+        end = content.find("\n---", 3)
+        if end == -1:
+            return content
+        return content[end + 4:].lstrip("\n")
+
+    @classmethod
+    def _prepare_body(cls, skill_md_content: str) -> str:
+        """Strip frontmatter and prepend Snowflake query instructions if needed."""
+        body = cls._strip_frontmatter(skill_md_content)
+        if "```sql" in body:
+            body = _SNOWFLAKE_QUERY_INSTRUCTIONS + "\n" + body
+        return body
+
+    @classmethod
+    def _to_cursor_rule(cls, skill: CortexSkill, skill_md_content: str) -> str:
+        """Convert SKILL.md content to Cursor .mdc rule format."""
+        content = cls._prepare_body(skill_md_content)
+        # Sanitize description for single-line YAML value
+        description = (skill.description or "").replace("\n", " ").replace('"', '\\"')
         lines = [
             "---",
-            f"description: {skill.description}",
+            f'description: "{description}"',
             "globs: []",
             "alwaysApply: false",
             "---",
@@ -171,6 +204,17 @@ class SkillService:
         ]
         return "\n".join(lines)
 
+    @classmethod
+    def _to_claude_command(cls, skill: CortexSkill, skill_md_content: str) -> str:
+        """Convert SKILL.md content to Claude Code command format."""
+        return cls._prepare_body(skill_md_content)
+
+    @classmethod
+    def _to_copilot_instructions(cls, skill: CortexSkill, skill_md_content: str) -> str:
+        """Convert SKILL.md content to GitHub Copilot instructions format."""
+        content = cls._prepare_body(skill_md_content)
+        return f'---\napplyTo: "**"\n---\n\n{content}'
+
     @staticmethod
     def _register_cortex_skills_dir(target_dir: Path = None) -> None:
         """Register the skills directory with Cortex Code CLI so skills are discoverable."""

{datasecops_cli-0.5.9 → datasecops_cli-0.6.0}/src/datasecops_cli/utilities/file_utils.py

@@ -39,3 +39,7 @@ def get_cursor_rules_dir() -> Path:
 
 def get_claude_commands_dir() -> Path:
     return Path.cwd() / ".claude" / "commands"
+
+
+def get_copilot_instructions_dir() -> Path:
+    return Path.cwd() / ".github" / "instructions"

datasecops_cli-0.5.9/src/datasecops_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.5.3"