Cog Server Rewrite

.github/workflows/ci.yaml

@@ -25,6 +25,10 @@ jobs:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0 # needed for setuptools_scm version determination
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - name: Install cargo-binstall
+        uses: cargo-bins/cargo-binstall@v1.12.3
       - uses: jdx/mise-action@v2
       # Build main cog package (wheel + sdist)
       - name: Build cog package
@@ -34,16 +38,6 @@ jobs:
         with:
           name: CogPackage
           path: dist/cog-*
-      # Build coglet wheel with embedded Go binary
-      - name: Build coglet-server binary
-        run: script/build-coglet-server
-      - name: Build coglet wheel
-        run: uv build --wheel --out-dir=dist ./coglet
-      - name: Upload coglet wheel
-        uses: actions/upload-artifact@v6
-        with:
-          name: CogletWheel
-          path: dist/coglet-*.whl
       # Build cog-dataclass wheel
       - name: Build cog-dataclass wheel
         run: uv build --wheel --out-dir=dist ./cog-dataclass
@@ -52,6 +46,21 @@ jobs:
         with:
           name: CogDataclassWheel
           path: dist/cog_dataclass-*.whl
+      # Build Rust coglet wheel
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: crates -> target
+      - name: Check Rust formatting
+        run: cargo fmt --manifest-path crates/Cargo.toml --all -- --check
+      - name: Run clippy
+        run: cargo clippy --manifest-path crates/Cargo.toml --workspace -- -D warnings
+      - name: Build Rust coglet wheel (ABI3)
+        run: mise run build:coglet:wheel:linux
+      - name: Upload Rust coglet wheel
+        uses: actions/upload-artifact@v6
+        with:
+          name: CogletRustWheel
+          path: dist/coglet-*-cp310-abi3-*.whl
 
   lint:
     name: Lint
@@ -66,6 +75,10 @@ jobs:
           merge-multiple: true
       - name: Extract source distribution
         run: tar xf dist/*.tar.gz --strip-components=1
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - name: Install cargo-binstall
+        uses: cargo-bins/cargo-binstall@v1.12.3
       - uses: jdx/mise-action@v2
       - name: Lint
         run: make lint
@@ -76,6 +89,7 @@ jobs:
       - test-go
       - test-python
       - test-python-dataclasses
+      - test-coglet-python
       - test-integration
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -102,6 +116,10 @@ jobs:
         with:
           path: dist
           merge-multiple: true
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - name: Install cargo-binstall
+        uses: cargo-bins/cargo-binstall@v1.12.3
       - uses: jdx/mise-action@v2
       - name: Build
         run: make cog
@@ -128,6 +146,10 @@ jobs:
           merge-multiple: true
       - name: Extract source distribution
         run: tar xf dist/*.tar.gz --strip-components=1
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - name: Install cargo-binstall
+        uses: cargo-bins/cargo-binstall@v1.12.3
       - uses: jdx/mise-action@v2
       - name: Compute tox env name
         run: echo TOX_PYTHON=py$(echo "${{ matrix.python-version }}" | tr -d .) >>$GITHUB_ENV
@@ -156,6 +178,10 @@ jobs:
         with:
           path: dist
           merge-multiple: true
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - name: Install cargo-binstall
+        uses: cargo-bins/cargo-binstall@v1.12.3
       - uses: jdx/mise-action@v2
       - name: Create virtual environment and install cog-dataclass wheel with dev dependencies
         run: |
@@ -164,16 +190,52 @@ jobs:
       - name: Test
         run: uv run pytest cog-dataclass/python/tests -v
 
+  test-coglet-python:
+    name: "Test Coglet Python bindings (${{ matrix.runtime }})"
+    needs: build-python
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        runtime: [dataclass, cog]
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - name: Download built wheels
+        uses: actions/download-artifact@v7
+        with:
+          path: dist
+          merge-multiple: true
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+      - uses: astral-sh/setup-uv@v5
+      - name: Create virtual environment
+        run: uv venv
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - name: Install cargo-binstall
+        uses: cargo-bins/cargo-binstall@v1.12.3
+      - uses: jdx/mise-action@v2
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: crates -> target
+      - name: Test coglet Python bindings
+        run: mise test:coglet-python:${{ matrix.runtime }}
+
   # Go-based integration tests using testscript framework
   test-integration:
     name: "Test integration (${{ matrix.runtime }})"
-    needs: build-python
+    needs:
+      - build-python
     runs-on: ubuntu-latest-16-cores
     timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:
-        runtime: [cog, coglet-alpha, cog-dataclass]
+        runtime: [cog, cog-dataclass, coglet-alpha, cog-rust, cog-dataclass-rust]
     steps:
       - uses: actions/checkout@v6
         with:
@@ -199,9 +261,34 @@ jobs:
             integration-tests/go.sum
       - name: Build cog binary
         run: make cog
+      - name: Set wheels for runtime
+        run: |
+          # Set COG_WHEEL and COGLET_RUST_WHEEL based on runtime matrix value
+          case "${{ matrix.runtime }}" in
+            cog)
+              echo "COG_WHEEL=cog" >> $GITHUB_ENV
+              ;;
+            cog-dataclass)
+              echo "COG_WHEEL=cog-dataclass" >> $GITHUB_ENV
+              ;;
+            coglet-alpha)
+              echo "COG_WHEEL=coglet-alpha" >> $GITHUB_ENV
+              ;;
+            cog-rust)
+              RUST_WHEEL=$(ls dist/coglet-*-cp310-abi3-*.whl | head -1)
+              echo "Found Rust coglet wheel: $RUST_WHEEL"
+              echo "COG_WHEEL=cog" >> $GITHUB_ENV
+              echo "COGLET_RUST_WHEEL=${PWD}/${RUST_WHEEL}" >> $GITHUB_ENV
+              ;;
+            cog-dataclass-rust)
+              RUST_WHEEL=$(ls dist/coglet-*-cp310-abi3-*.whl | head -1)
+              echo "Found Rust coglet wheel: $RUST_WHEEL"
+              echo "COG_WHEEL=cog-dataclass" >> $GITHUB_ENV
+              echo "COGLET_RUST_WHEEL=${PWD}/${RUST_WHEEL}" >> $GITHUB_ENV
+              ;;
+          esac
       - name: Run integration tests
         env:
-          COG_WHEEL: ${{ matrix.runtime }}
           COG_BINARY: ./cog
           TEST_PARALLEL: 4
           BUILDKIT_PROGRESS: 'quiet'
@@ -227,6 +314,10 @@ jobs:
         with:
           path: dist
           merge-multiple: true
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - name: Install cargo-binstall
+        uses: cargo-bins/cargo-binstall@v1.12.3
       - uses: jdx/mise-action@v2
       - uses: goreleaser/goreleaser-action@v6
         with:

.github/workflows/rust.yaml

@@ -0,0 +1,129 @@
+name: Rust
+
+on:
+  merge_group:
+  push:
+    branches: [main]
+    paths:
+      - "crates/**"
+      - "Cargo.toml"
+      - "Cargo.lock"
+      - ".github/workflows/rust.yaml"
+  pull_request:
+    paths:
+      - "crates/**"
+      - "Cargo.toml"
+      - "Cargo.lock"
+      - ".github/workflows/rust.yaml"
+  workflow_dispatch:
+
+env:
+  CARGO_TERM_COLOR: always
+  RUST_BACKTRACE: 1
+
+permissions: {}
+
+jobs:
+  # Pure Rust checks (no Python needed)
+  rust:
+    name: Rust checks
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@v4
+
+      # Order matters: Rust -> cargo-binstall -> mise (so mise uses binstall for cargo tools)
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt, clippy
+
+      - name: Install cargo-binstall
+        uses: cargo-bins/cargo-binstall@v1.12.3
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: crates -> target
+
+      - uses: jdx/mise-action@v2
+
+      - name: Check formatting
+        run: mise run fmt:rust:check
+
+      - name: Clippy
+        run: mise run clippy
+
+      - name: Run tests
+        run: mise run test:rust
+
+  # coglet-python checks (requires Python + maturin build)
+  # Builds once with ABI3 (works across Python 3.8+)
+  coglet-python:
+    name: coglet-python
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@v4
+
+      # Order matters: Rust -> cargo-binstall -> mise (so mise uses binstall for cargo tools)
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install cargo-binstall
+        uses: cargo-bins/cargo-binstall@v1.12.3
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: crates -> target
+
+      - uses: jdx/mise-action@v2
+
+      # Setup Python with uv
+      - name: Setup Python with uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true
+          python-version: "3.12"
+
+      - name: Create virtualenv
+        run: uv venv .venv
+
+      - name: Build coglet wheel (ABI3)
+        env:
+          VIRTUAL_ENV: ${{ github.workspace }}/.venv
+        run: |
+          export PATH="${VIRTUAL_ENV}/bin:${PATH}"
+          mise run build:coglet
+
+      - name: Check stubs are up to date
+        env:
+          VIRTUAL_ENV: ${{ github.workspace }}/.venv
+        run: |
+          export PATH="${VIRTUAL_ENV}/bin:${PATH}"
+          mise run stubs:check
+
+      - name: Type-check stubs
+        env:
+          VIRTUAL_ENV: ${{ github.workspace }}/.venv
+        run: |
+          export PATH="${VIRTUAL_ENV}/bin:${PATH}"
+          mise run stubs:typecheck
+
+  # Summary job for branch protection
+  rust-ci:
+    name: Rust CI
+    needs: [rust, coglet-python]
+    runs-on: ubuntu-latest
+    if: always()
+    steps:
+      - name: Check job results
+        run: |
+          if [[ "${{ needs.rust.result }}" != "success" ]]; then
+            echo "Rust checks failed"
+            exit 1
+          fi
+          if [[ "${{ needs.coglet-python.result }}" != "success" ]]; then
+            echo "coglet-python checks failed"
+            exit 1
+          fi
+          echo "All Rust CI checks passed!"

.gitignore

@@ -32,3 +32,11 @@ coglet/python/cog/bin/
 
 # Local planning files
 docs/plans/**
+
+# Local agent files
+AGENTS.local.md
+CLAUDE.local.md
+
+# Local mise files
+mise.local.toml
+mise.local.lock

cog-dataclass/python/cog/_adt.py

@@ -125,10 +125,10 @@ def normalize(self, value: Any) -> Any:
             # URL string or data URI - validate to file-like object
             return File.validate(value)
         elif self is PrimitiveType.PATH:
-            # Convert strings to Path objects
+            # Convert strings/URLs to Path or URLPath objects
             if isinstance(value, Path):
                 return value
-            return Path(value)
+            return Path.validate(value)
         elif self is PrimitiveType.SECRET:
             # Convert strings to Secret objects
             if isinstance(value, Secret):
@@ -175,7 +175,12 @@ def json_encode(self, value: Any) -> Any:
         """Encode a value for JSON serialization."""
         if self is PrimitiveType.FLOAT:
             return float(value)
-        elif self in {PrimitiveType.PATH, PrimitiveType.FILE, PrimitiveType.SECRET}:
+        elif self in {PrimitiveType.PATH, PrimitiveType.FILE}:
+            return value
+        elif self is PrimitiveType.SECRET:
+            # Secret objects need to be unwrapped for JSON serialization
+            if isinstance(value, Secret):
+                return value.get_secret_value()
             return value
         elif self is PrimitiveType.ANY:
             return value