indent 0.1.20__tar.gz → 0.1.21__tar.gz

{indent-0.1.20 → indent-0.1.21}/.gitignore

@@ -15,6 +15,7 @@ workflow_input.json
 CLAUDE.local.md
 indent.local.md
 plan.md
+AGENTS.md
 
 # C extensions
 *.so
@@ -164,8 +165,6 @@ dmypy.json
 # Aider
 .aider*
 
-# Debug logs
-debug/
 
 # Local test scripts
 local_test_scripts/

{indent-0.1.20 → indent-0.1.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: indent
-Version: 0.1.20
+Version: 0.1.21
 Summary: Indent is an AI Pair Programmer
 Author-email: Sashank Thupukari <sashank@exponent.run>
 Requires-Python: <3.13,>=3.10

{indent-0.1.20 → indent-0.1.21}/exponent/__init__.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.1.20'
-__version_tuple__ = version_tuple = (0, 1, 20)
+__version__ = version = '0.1.21'
+__version_tuple__ = version_tuple = (0, 1, 21)
 
 __commit_id__ = commit_id = None

{indent-0.1.20 → indent-0.1.21}/exponent/commands/cloud_commands.py

@@ -23,7 +23,6 @@ from exponent.core.graphql.client import GraphQLClient
 from exponent.core.graphql.mutations import (
     CREATE_CLOUD_CHAT_FROM_REPOSITORY_MUTATION,
     ENABLE_CLOUD_REPOSITORY_MUTATION,
-    INCREMENTAL_BUILD_CLOUD_REPOSITORY_MUTATION,
     REBUILD_CLOUD_REPOSITORY_MUTATION,
     START_CHAT_TURN_MUTATION,
 )
@@ -62,32 +61,6 @@ async def enable_cloud_repository(
     return cast(dict[str, Any], result["enableCloudRepository"])
 
 
-async def incremental_build_cloud_repository(
-    api_key: str,
-    base_api_url: str,
-    base_ws_url: str,
-    org_name: str,
-    repo_name: str,
-) -> dict[str, Any]:
-    graphql_client = GraphQLClient(
-        api_key=api_key, base_api_url=base_api_url, base_ws_url=base_ws_url
-    )
-
-    variables = {
-        "orgName": org_name,
-        "repoName": repo_name,
-    }
-
-    result = await graphql_client.execute(
-        INCREMENTAL_BUILD_CLOUD_REPOSITORY_MUTATION,
-        variables,
-        "IncrementalBuildCloudRepository",
-        timeout=120,
-    )
-
-    return cast(dict[str, Any], result["incrementalBuildCloudRepository"])
-
-
 async def rebuild_cloud_repository(
     api_key: str,
     base_api_url: str,
@@ -243,63 +216,6 @@ def enable_repo(
         sys.exit(1)
 
 
-@cloud_cli.command(hidden=True)
-@click.option(
-    "--org-name",
-    help="GitHub organization name",
-    required=True,
-)
-@click.option(
-    "--repo-name",
-    help="GitHub repository name",
-    required=True,
-)
-@use_settings
-def incremental_build(
-    settings: Settings,
-    org_name: str,
-    repo_name: str,
-) -> None:
-    """Test utility for incremental build of cloud repository."""
-    check_exponent_version_and_upgrade(settings)
-
-    if not settings.api_key:
-        redirect_to_login(settings)
-        return
-
-    loop = asyncio.get_event_loop()
-
-    api_key = settings.api_key
-    base_api_url = settings.get_base_api_url()
-    base_ws_url = settings.get_base_ws_url()
-
-    try:
-        result = loop.run_until_complete(
-            incremental_build_cloud_repository(
-                api_key, base_api_url, base_ws_url, org_name, repo_name
-            )
-        )
-
-        if result["__typename"] == "ContainerImage":
-            click.secho(
-                f"✓ Successfully triggered incremental build for {org_name}/{repo_name}",
-                fg="green",
-            )
-            click.echo(f"  Build ref: {result.get('buildRef', 'N/A')}")
-            click.echo(f"  Created at: {result.get('createdAt', 'N/A')}")
-            click.echo(f"  Updated at: {result.get('updatedAt', 'N/A')}")
-        else:
-            click.secho(
-                f"✗ Failed to trigger incremental build: {result.get('message', 'Unknown error')}",
-                fg="red",
-            )
-            click.echo(f"  Error type: {result['__typename']}")
-
-    except Exception as e:
-        click.secho(f"✗ Error triggering incremental build: {e!s}", fg="red")
-        sys.exit(1)
-
-
 @cloud_cli.command(hidden=True)
 @click.option(
     "--org-name",

{indent-0.1.20 → indent-0.1.21}/exponent/core/graphql/mutations.py

@@ -131,35 +131,6 @@ mutation EnableCloudRepository($orgName: String!, $repoName: String!) {
 """
 
 
-INCREMENTAL_BUILD_CLOUD_REPOSITORY_MUTATION = """
-mutation IncrementalBuildCloudRepository($orgName: String!, $repoName: String!) {
-  incrementalBuildCloudRepository(orgName: $orgName, repoName: $repoName) {
-    __typename
-    ...on ContainerImage {
-      buildRef
-      createdAt
-      updatedAt
-    }
-    ...on UnauthenticatedError {
-      message
-    }
-    ...on CloudConfigNotFoundError {
-      message
-    }
-    ...on GithubConfigNotFoundError {
-      message
-    }
-    ...on CloudSessionError {
-      message
-    }
-    ...on Error {
-      message
-    }
-  }
-}
-"""
-
-
 REBUILD_CLOUD_REPOSITORY_MUTATION = """
 mutation RebuildCloudRepository($orgName: String!, $repoName: String!) {
   rebuildCloudRepository(orgName: $orgName, repoName: $repoName) {

{indent-0.1.20 → indent-0.1.21}/exponent/core/remote_execution/cli_rpc_types.py

@@ -66,14 +66,28 @@ class FileMetadata(msgspec.Struct):
     file_mode: str
 
 
+class ReadToolArtifactResult(ToolResult, tag=READ_TOOL_ARTIFACT_NAME):
+    s3_uri: str
+    file_path: str
+    media_type: str
+
+    def to_text(self) -> str:
+        return f"[Image artifact uploaded to {self.s3_uri}]"
+
+
 class ReadToolResult(ToolResult, tag=READ_TOOL_NAME):
-    content: str
-    num_lines: int
-    start_line: int
-    total_lines: int
+    content: str | None = None
+    num_lines: int | None = None
+    start_line: int | None = None
+    total_lines: int | None = None
     metadata: FileMetadata | None = None
+    artifact: ReadToolArtifactResult | None = None
 
     def to_text(self) -> str:
+        if self.artifact:
+            return self.artifact.to_text()
+        assert self.content is not None
+        assert self.start_line is not None
         lines = self.content.splitlines()
         lines = [
             f"{str(i).rjust(6)}→{line}"
@@ -82,15 +96,6 @@ class ReadToolResult(ToolResult, tag=READ_TOOL_NAME):
         return "\n".join(lines)
 
 
-class ReadToolArtifactResult(ToolResult, tag=READ_TOOL_ARTIFACT_NAME):
-    s3_uri: str
-    file_path: str
-    media_type: str
-
-    def to_text(self) -> str:
-        return f"[Image artifact uploaded to {self.s3_uri}]"
-
-
 LIST_TOOL_NAME = "ls"
 
 
@@ -273,6 +278,10 @@ class TerminateResponse(msgspec.Struct, tag="terminate"):
     pass
 
 
+class TimeoutResponse(msgspec.Struct, tag="timeout"):
+    pass
+
+
 class BatchToolExecutionResponse(msgspec.Struct, tag="batch_tool_execution"):
     tool_results: list[ToolResultType]
 
@@ -324,6 +333,7 @@ class CliRpcResponse(msgspec.Struct):
         | GetAllFilesResponse
         | ErrorResponse
         | TerminateResponse
+        | TimeoutResponse
         | BatchToolExecutionResponse
         | HttpResponse
         | SwitchCLIChatResponse

{indent-0.1.20 → indent-0.1.21}/exponent/core/remote_execution/client.py

@@ -413,6 +413,7 @@ class RemoteExecutionClient:
         results: asyncio.Queue[CliRpcResponse],
     ) -> REMOTE_EXECUTION_CLIENT_EXIT_INFO:
         """Process messages from the websocket connection."""
+        pending: set[asyncio.Task[object]] = set()
         try:
             recv = asyncio.create_task(websocket.recv())
             get_beat = asyncio.create_task(beats.get())
@@ -462,6 +463,9 @@ class RemoteExecutionClient:
         self,
         websocket: ClientConnection,
         connection_tracker: ConnectionTracker | None,
+        beats: asyncio.Queue[HeartbeatInfo],
+        requests: asyncio.Queue[CliRpcRequest],
+        results: asyncio.Queue[CliRpcResponse],
     ) -> REMOTE_EXECUTION_CLIENT_EXIT_INFO | None:
         """Handle a single websocket connection.
         Returns None to continue with reconnection attempts, or an exit info to terminate."""
@@ -470,12 +474,6 @@ class RemoteExecutionClient:
 
         self._websocket = websocket
 
-        beats: asyncio.Queue[HeartbeatInfo] = asyncio.Queue()
-        requests: asyncio.Queue[CliRpcRequest] = asyncio.Queue()
-        results: asyncio.Queue[CliRpcResponse] = asyncio.Queue()
-
-        tasks = await self._setup_tasks(beats, requests, results)
-
         try:
             return await self._process_websocket_messages(
                 websocket, beats, requests, results
@@ -493,15 +491,13 @@ class RemoteExecutionClient:
                     )
                     return WSDisconnected(error_message=error_message)
             # Otherwise, allow reconnection attempt
+            logger.debug("Websocket connection closed by remote.")
             return None
         except TimeoutError:
             # Timeout, allow reconnection attempt
             # TODO: investgate if this is needed, possibly scope it down
             return None
         finally:
-            for task in tasks:
-                task.cancel()
-            await asyncio.gather(*tasks, return_exceptions=True)
             if connection_tracker is not None:
                 await connection_tracker.set_connected(False)
 
@@ -517,33 +513,51 @@ class RemoteExecutionClient:
         # Initialize last request time for timeout monitoring
         self._last_request_time = time.time()
 
-        async for websocket in self.ws_connect(f"/api/ws/chat/{chat_uuid}"):
-            # Always run connection and timeout monitor concurrently
-            # If timeout_seconds is None, timeout monitor will loop indefinitely
-            done, pending = await asyncio.wait(
-                [
-                    asyncio.create_task(
-                        self._handle_websocket_connection(websocket, connection_tracker)
-                    ),
-                    asyncio.create_task(self._timeout_monitor(timeout_seconds)),
-                ],
-                return_when=asyncio.FIRST_COMPLETED,
-            )
+        # Create queues ONCE - persist across reconnections
+        beats: asyncio.Queue[HeartbeatInfo] = asyncio.Queue()
+        requests: asyncio.Queue[CliRpcRequest] = asyncio.Queue()
+        results: asyncio.Queue[CliRpcResponse] = asyncio.Queue()
 
-            # Cancel pending tasks
-            for task in pending:
-                task.cancel()
+        # Create tasks ONCE - persist across reconnections
+        executors = await self._setup_tasks(beats, requests, results)
 
-            # Return result from completed task
-            for task in done:
-                result = await task
-                # If we get None, we'll try to reconnect
-                if result is not None:
-                    return result
+        try:
+            async for websocket in self.ws_connect(f"/api/ws/chat/{chat_uuid}"):
+                # Always run connection and timeout monitor concurrently
+                # If timeout_seconds is None, timeout monitor will loop indefinitely
+                done, pending = await asyncio.wait(
+                    [
+                        asyncio.create_task(
+                            self._handle_websocket_connection(
+                                websocket, connection_tracker, beats, requests, results
+                            )
+                        ),
+                        asyncio.create_task(self._timeout_monitor(timeout_seconds)),
+                    ],
+                    return_when=asyncio.FIRST_COMPLETED,
+                )
 
-        # If we exit the websocket connection loop without returning,
-        # it means we couldn't establish a connection
-        return WSDisconnected(error_message="Could not establish websocket connection")
+                # Cancel pending tasks
+                for task in pending:
+                    task.cancel()
+
+                # Return result from completed task
+                for task in done:
+                    result = await task
+                    # If we get None, we'll try to reconnect
+                    if result is not None:
+                        return result
+
+            # If we exit the websocket connection loop without returning,
+            # it means we couldn't establish a connection
+            return WSDisconnected(
+                error_message="Could not establish websocket connection"
+            )
+        finally:
+            # Cancel all background tasks when exiting
+            for task in executors:
+                task.cancel()
+            await asyncio.gather(*executors, return_exceptions=True)
 
     async def create_chat(self, chat_source: ChatSource) -> CreateChatResponse:
         response = await self.api_client.post(

{indent-0.1.20 → indent-0.1.21}/exponent/core/remote_execution/languages/shell_streaming.py

@@ -53,7 +53,7 @@ async def read_stream(
             data = await stream.read(4096)
             if not data:
                 break
-            chunk = data.decode(encoding=encoding)
+            chunk = data.decode(encoding=encoding, errors="replace")
             output.append((fd, chunk))
             yield StreamedOutputPiece(content=chunk)
         except UnicodeDecodeError:

{indent-0.1.20 → indent-0.1.21}/exponent/core/remote_execution/tool_execution.py

@@ -90,7 +90,7 @@ async def execute_read_file(  # noqa: PLR0911, PLR0915
     tool_input: ReadToolInput,
     working_directory: str,
     upload_client: "RemoteExecutionClient | None" = None,
-) -> ReadToolResult | ReadToolArtifactResult | ErrorToolResult:
+) -> ReadToolResult | ErrorToolResult:
     # Validate absolute path requirement
     if not tool_input.file_path.startswith("/"):
         return ErrorToolResult(
@@ -136,10 +136,12 @@ async def execute_read_file(  # noqa: PLR0911, PLR0915
                 if status != 200:
                     raise RuntimeError(f"Upload failed with status {status}")
 
-            return ReadToolArtifactResult(
-                s3_uri=upload_response.s3_uri,
-                file_path=tool_input.file_path,
-                media_type=media_type,
+            return ReadToolResult(
+                artifact=ReadToolArtifactResult(
+                    s3_uri=upload_response.s3_uri,
+                    file_path=tool_input.file_path,
+                    media_type=media_type,
+                )
             )
         except Exception as e:
             return ErrorToolResult(error_message=f"Failed to upload image to S3: {e!s}")

{indent-0.1.20 → indent-0.1.21}/exponent/core/remote_execution/truncation.py

@@ -11,7 +11,6 @@ from exponent.core.remote_execution.cli_rpc_types import (
     GlobToolResult,
     GrepToolResult,
     ListToolResult,
-    ReadToolArtifactResult,
     ReadToolResult,
     ToolResult,
     WriteToolResult,
@@ -273,7 +272,6 @@ class StringListTruncation(TruncationStrategy):
 
 TRUNCATION_REGISTRY: dict[type[ToolResult], TruncationStrategy] = {
     ReadToolResult: StringFieldTruncation("content"),
-    ReadToolArtifactResult: NoOpTruncation(),
     WriteToolResult: StringFieldTruncation("message"),
     BashToolResult: TailTruncation("shell_output"),
     GrepToolResult: StringListTruncation("matches"),

{indent-0.1.20 → indent-0.1.21}/exponent/core/remote_execution/types.py

@@ -50,6 +50,7 @@ class PrReviewWorkflowInput(BaseModel):
 
 
 class SlackWorkflowInput(BaseModel):
+    discriminator: Literal["slack_workflow"] = "slack_workflow"
     channel_id: str
     thread_ts: str
     slack_url: str | None = None
@@ -57,13 +58,34 @@ class SlackWorkflowInput(BaseModel):
     message_ts: str | None = None
 
 
+class SlackPlanApprovalWorkflowInput(BaseModel):
+    discriminator: Literal["slack_plan_approval"] = "slack_plan_approval"
+    channel_id: str
+    thread_ts: str
+    slack_url: str
+    channel_name: str
+    message_ts: str
+
+
 class SentryWorkflowInput(BaseModel):
     title: str
     issue_id: str
     permalink: str
 
 
-WorkflowInput = PrReviewWorkflowInput | SlackWorkflowInput | SentryWorkflowInput
+class GenericCloudWorkflowInput(BaseModel):
+    initial_prompt: str
+    system_prompt_override: str | None = None
+    reasoning_level: str = "LOW"
+
+
+WorkflowInput = (
+    PrReviewWorkflowInput
+    | SlackWorkflowInput
+    | SentryWorkflowInput
+    | GenericCloudWorkflowInput
+    | SlackPlanApprovalWorkflowInput
+)
 
 
 class WorkflowTriggerRequest(BaseModel):