pidriver 0.2.0__tar.gz → 0.3.0__tar.gz

{pidriver-0.2.0 → pidriver-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pidriver
-Version: 0.2.0
+Version: 0.3.0
 Summary: Async Python driver for the pi coding agent (pi --mode rpc), built for isolated, headless project work.
 Project-URL: Homepage, https://github.com/bobuk/pidriver
 Project-URL: Repository, https://github.com/bobuk/pidriver

{pidriver-0.2.0 → pidriver-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pidriver"
-version = "0.2.0"
+version = "0.3.0"
 description = "Async Python driver for the pi coding agent (pi --mode rpc), built for isolated, headless project work."
 readme = "README.md"
 license = { text = "MIT" }

{pidriver-0.2.0 → pidriver-0.3.0}/src/pidriver/__init__.py

@@ -56,6 +56,7 @@ from .config import (
     PiConfig,
 )
 from .errors import (
+    MergeConflict,
     PiCommandError,
     PiDriverError,
     PiInstallError,
@@ -65,6 +66,7 @@ from .errors import (
     PiTimeoutError,
     ProjectError,
     SessionNotFoundError,
+    StagingError,
     TransportClosedError,
 )
 from .events import (
@@ -99,10 +101,17 @@ from .interaction import (
 from .manager import ManagedSession, PiSessionManager
 from .models import ModelInfo, list_models, parse_models
 from .session import PiSession
+from .staging import (
+    DEFAULT_COPY_EXCLUDES,
+    DEFAULT_MAX_COPY_BYTES,
+    MergeResult,
+    StagedWorkspace,
+    stage_workspace,
+)
 from .usage import UsageTotals
 from .workspace import ProjectDir, list_candidate_projects, list_projects, resolve_project
 
-__version__ = "0.2.0"
+__version__ = "0.3.0"
 
 __all__ = [
     "__version__",
@@ -161,6 +170,12 @@ __all__ = [
     "list_projects",
     "list_candidate_projects",
     "ProjectDir",
+    # staging
+    "stage_workspace",
+    "StagedWorkspace",
+    "MergeResult",
+    "DEFAULT_COPY_EXCLUDES",
+    "DEFAULT_MAX_COPY_BYTES",
     # models
     "ModelInfo",
     "parse_models",
@@ -180,4 +195,6 @@ __all__ = [
     "TransportClosedError",
     "SessionNotFoundError",
     "ProjectError",
+    "StagingError",
+    "MergeConflict",
 ]

{pidriver-0.2.0 → pidriver-0.3.0}/src/pidriver/errors.py

@@ -19,6 +19,8 @@ __all__ = [
     "TransportClosedError",
     "SessionNotFoundError",
     "ProjectError",
+    "StagingError",
+    "MergeConflict",
 ]
 
 
@@ -35,6 +37,43 @@ class ProjectError(PiDriverError, ValueError):
     """
 
 
+class StagingError(PiDriverError):
+    """A staging operation (stage/diff/merge/discard/cleanup) failed structurally.
+
+    Raised by :mod:`pidriver.staging` when a ``git`` command exits non-zero, the
+    staging root is unusable, the source/stage path is invalid, the source repo is
+    in a state that cannot be merged into (dirty working tree, detached HEAD), or a
+    non-git copy exceeds the size cap. Carries the failing git ``argv`` + ``stderr``
+    when the cause was a git invocation.
+    """
+
+    def __init__(
+        self,
+        message: str,
+        *,
+        argv: tuple[str, ...] | None = None,
+        stderr: str | None = None,
+    ) -> None:
+        self.argv = argv
+        self.stderr = stderr
+        super().__init__(message)
+
+
+class MergeConflict(StagingError):
+    """A staged change could not be landed into the source cleanly.
+
+    The ``pi/<job>`` branch (git) or the staged tree (non-git) is preserved
+    untouched and the source is left pristine, so the user can resolve by hand.
+    ``conflicts`` lists the conflicting paths; ``diff`` is the unified diff to
+    reconcile.
+    """
+
+    def __init__(self, message: str, *, conflicts: tuple[str, ...], diff: str) -> None:
+        self.conflicts = conflicts
+        self.diff = diff
+        super().__init__(message)
+
+
 class PiNotFoundError(PiDriverError):
     """The pi/omp executable could not be located or is not runnable."""