flake updates

.github/workflows/validate.yml

@@ -34,11 +34,3 @@ jobs:
 
       - name: Run tests
         run: pytest tests/ -v
-
-      - name: Build deepwork package
-        run: nix build
-
-      - name: Verify package output
-        run: |
-          ls -la result/bin/deepwork
-          ./result/bin/deepwork --version

flake.nix

@@ -6,58 +6,12 @@
 
     # Claude Code with pre-built native binaries (hourly updates)
     claude-code-nix.url = "github:sadjow/claude-code-nix";
-
-    pyproject-nix = {
-      url = "github:pyproject-nix/pyproject.nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    uv2nix = {
-      url = "github:pyproject-nix/uv2nix";
-      inputs.pyproject-nix.follows = "pyproject-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    pyproject-build-systems = {
-      url = "github:pyproject-nix/build-system-pkgs";
-      inputs.pyproject-nix.follows = "pyproject-nix";
-      inputs.uv2nix.follows = "uv2nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
-  outputs = { self, nixpkgs, claude-code-nix, pyproject-nix, uv2nix, pyproject-build-systems, ... }:
+  outputs = { self, nixpkgs, claude-code-nix, ... }:
     let
       inherit (nixpkgs) lib;
-
-      # Systems to support
       forAllSystems = lib.genAttrs [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
-
-      # Load the uv workspace from uv.lock
-      workspace = uv2nix.lib.workspace.loadWorkspace { workspaceRoot = ./.; };
-
-      # Create overlay from uv.lock - prefer wheels for faster builds
-      overlay = workspace.mkPyprojectOverlay { sourcePreference = "wheel"; };
-
-      # Editable overlay for development (live-reload from src/)
-      editableOverlay = workspace.mkEditablePyprojectOverlay { root = "$REPO_ROOT"; };
-
-      # Build Python package sets for each system
-      pythonSets = forAllSystems (system:
-        let
-          pkgs = import nixpkgs {
-            inherit system;
-            config.allowUnfree = true;
-          };
-          python = pkgs.python311;
-        in
-        (pkgs.callPackage pyproject-nix.build.packages { inherit python; }).overrideScope
-          (lib.composeManyExtensions [
-            pyproject-build-systems.overlays.default
-            overlay
-          ])
-      );
-
     in
     {
       devShells = forAllSystems (system:
@@ -66,17 +20,11 @@
             inherit system;
             config.allowUnfree = true;
           };
-
-          # Python set with editable overlay for development
-          pythonSet = pythonSets.${system}.overrideScope editableOverlay;
-
-          # Virtual environment with all dependencies (including dev extras)
-          virtualenv = pythonSet.mkVirtualEnv "deepwork-dev-env" workspace.deps.all;
         in
         {
           default = pkgs.mkShell {
             packages = [
-              virtualenv
+              pkgs.python311
               pkgs.uv
               pkgs.git
               pkgs.jq
@@ -85,27 +33,25 @@
             ];
 
             env = {
-              # Prevent uv from managing packages (Nix handles it)
-              UV_NO_SYNC = "1";
-              UV_PYTHON = "${pythonSet.python}/bin/python";
               UV_PYTHON_DOWNLOADS = "never";
               DEEPWORK_DEV = "1";
             };
 
             shellHook = ''
-              # Required for editable overlay
-              unset PYTHONPATH
               export REPO_ROOT=$(git rev-parse --show-toplevel)
 
-              # Install deepwork as a uv tool (editable) so uvx picks up local source
-              # This makes the MCP config ("uvx deepwork serve") use the dev version
+              # Create project venv with deepwork + all dev deps (pytest, ruff, mypy, etc.)
+              uv sync --extra dev --quiet 2>/dev/null || true
+              export PATH="$REPO_ROOT/.venv/bin:$PATH"
+
+              # Also register as a uv tool so `uvx deepwork serve` uses local source
               uv tool install -e "$REPO_ROOT" --quiet 2>/dev/null || true
 
               # Only show welcome message in interactive shells
               if [[ $- == *i* ]]; then
                 echo ""
-                echo "DeepWork Development Environment (uv2nix)"
-                echo "=========================================="
+                echo "DeepWork Development Environment"
+                echo "================================"
                 echo ""
                 echo "Python: $(python --version) | uv: $(uv --version)"
                 echo ""
@@ -122,39 +68,5 @@
           };
         }
       );
-
-      # Package output - wrapped deepwork binary with isolated Python environment
-      # When consumed as a dependency in other flakes, the consuming devShell may
-      # include Python packages for a different version (e.g. python3.13 from
-      # azure-cli, awscli2). These pollute PYTHONPATH and cause symbol errors
-      # when deepwork's python3.11 tries to load python3.13 native extensions.
-      # Wrapping with --unset PYTHONPATH isolates deepwork from the host environment.
-      packages = forAllSystems (system:
-        let
-          pkgs = import nixpkgs {
-            inherit system;
-            config.allowUnfree = true;
-          };
-          venv = pythonSets.${system}.mkVirtualEnv "deepwork-env" workspace.deps.default;
-          wrapped = pkgs.runCommand "deepwork-wrapped" {
-            nativeBuildInputs = [ pkgs.makeWrapper ];
-          } ''
-            mkdir -p $out/bin
-            makeWrapper ${venv}/bin/deepwork $out/bin/deepwork \
-              --unset PYTHONPATH
-          '';
-        in {
-          default = wrapped;
-          deepwork = wrapped;  # Alias for backwards compatibility
-        }
-      );
-
-      # Make deepwork runnable with 'nix run'
-      apps = forAllSystems (system: {
-        default = {
-          type = "app";
-          program = "${self.packages.${system}.default}/bin/deepwork";
-        };
-      });
     };
 }

pyproject.toml

@@ -39,6 +39,7 @@ dev = [
     "mypy>=1.0",
     "types-PyYAML",
     "types-aiofiles",
+    "types-jsonschema",
 ]
 
 [project.scripts]

src/deepwork/mcp/claude_cli.py

@@ -106,7 +106,7 @@ def _parse_wrapper(self, response_text: str) -> dict[str, Any]:
                     f"Claude CLI returned error: {wrapper.get('result', 'Unknown error')}"
                 )
 
-            data = wrapper.get("structured_output")
+            data: dict[str, Any] = wrapper.get("structured_output")
             if data is None:
                 raise ClaudeCLIError(
                     "Claude CLI response missing 'structured_output' field. "

src/deepwork/schemas/job_schema.py

@@ -19,7 +19,8 @@
 def _load_schema() -> dict[str, Any]:
     """Load the JSON schema from file."""
     with open(_SCHEMA_FILE) as f:
-        return json.load(f)
+        result: dict[str, Any] = json.load(f)
+        return result
 
 
 # Load the schema at module import time

src/deepwork/utils/git.py

@@ -61,6 +61,8 @@ def get_repo_root(path: Path | str) -> Path:
         GitError: If path is not in a Git repository
     """
     repo = get_repo(path)
+    if repo.working_tree_dir is None:
+        raise GitError(f"Repository at {path} has no working tree (bare repo?)")
     return Path(repo.working_tree_dir)