indent 0.1.10__py3-none-any.whl → 0.1.12__py3-none-any.whl

exponent/core/graphql/subscriptions.py

@@ -14,452 +14,3 @@ AUTHENTICATED_USER_SUBSCRIPTION = """
             }
         }
 """
-
-INDENT_EVENTS_SUBSCRIPTION = """
-  subscription ChatEvents(
-    $prompt: Prompt
-    $chatUuid: String!
-    $parentUuid: String
-    $model: ModelName!
-    $strategyNameOverride: StrategyName
-    $depthLimit: Int!
-    $requireConfirmation: Boolean
-    $readOnly: Boolean
-    $enableThinking: Boolean
-  ) {
-    indentChat(
-      chatInput: {
-        prompt: $prompt
-      }
-      parentUuid: $parentUuid
-      chatConfig: {
-        chatUuid: $chatUuid
-        model: $model
-        requireConfirmation: $requireConfirmation
-        readOnly: $readOnly
-        strategyNameOverride: $strategyNameOverride
-        depthLimit: $depthLimit
-        enableThinking: $enableThinking
-      }
-    ) {
-      __typename
-      ...on Error {
-        message
-      }
-      ...on UnauthenticatedError {
-        message
-      }
-      ...on UserEvent {
-        uuid
-        parentUuid
-        chatId
-        isSidechain
-        version
-        createdAt
-        sidechainRootUuid
-        synthetic
-        messageData: message {
-          __typename
-          ... on TextMessage {
-            text
-          }
-          ... on ToolResultMessage {
-            messageId
-            toolUseId
-            text
-            resultData {
-              ... on BashToolResult {
-                shellOutput
-                exitCode
-              }
-              ... on ReadToolResult {
-                content
-              }
-            }
-          }
-           ... on ToolCallMessage {
-            messageId
-            toolUseId
-            toolName
-            toolInput {
-              ... on BashToolInput {
-                command
-              }
-              ... on ReadToolInput {
-                filePath
-              }
-            }
-          }
-          ... on PartialToolResultMessage {
-            messageId
-            toolUseId
-            text
-            resultData {
-              ... on PartialToolResult {
-                __typename
-              }
-            }
-          }
-        }
-      }
-      ...on AssistantEvent {
-        uuid
-        parentUuid
-        chatId
-        isSidechain
-        version
-        createdAt
-        sidechainRootUuid
-        synthetic
-        messageData: message {
-          __typename
-          ... on TextMessage {
-            text
-          }
-          ... on ToolCallMessage {
-            messageId
-            toolUseId
-            toolName
-            toolInput {
-              ... on BashToolInput {
-                command
-              }
-              ... on ReadToolInput {
-                filePath
-              }
-            }
-          }
-        }
-      }
-      ...on SystemEvent {
-        uuid
-        parentUuid
-        chatId
-        isSidechain
-        version
-        createdAt
-        sidechainRootUuid
-        messageData: message {
-          __typename
-          ... on ToolCallMessage {
-            messageId
-            toolUseId
-            toolName
-            toolInput {
-              ... on BashToolInput {
-                command
-              }
-              ... on ReadToolInput {
-                filePath
-              }
-            }
-          }
-          ... on ToolResultMessage {
-            messageId
-            toolUseId
-            text
-            resultData {
-              ... on BashToolResult {
-                shellOutput
-                exitCode
-              }
-              ... on ReadToolResult {
-                content
-              }
-            }
-          }
-          ... on ToolExecutionStatusMessage {
-            executionStatus: status
-          }
-          ... on ToolPermissionStatusMessage {
-            permissionStatus: status
-          }
-        }
-      }
-    }
-  }
-"""
-
-
-CONFIRM_AND_CONTINUE_SUBSCRIPTION = """
-  subscription ChatEvents(
-    $requestUuid: String!
-    $chatUuid: String!
-    $model: ModelName!
-    $strategyNameOverride: StrategyName
-    $depthLimit: Int!
-    $requireConfirmation: Boolean
-    $readOnly: Boolean
-    $enableThinking: Boolean
-  ) {
-    confirmAndContinue(
-      requestEventUuid: $requestUuid
-      chatConfig: {
-        chatUuid: $chatUuid
-        model: $model
-        requireConfirmation: $requireConfirmation
-        readOnly: $readOnly
-        strategyNameOverride: $strategyNameOverride
-        depthLimit: $depthLimit
-        enableThinking: $enableThinking
-      }
-    ) {
-      __typename
-      ...on Error {
-        message
-      }
-      ...on UnauthenticatedError {
-        message
-      }
-      ...on UserEvent {
-        uuid
-        parentUuid
-        chatId
-        isSidechain
-        version
-        createdAt
-        sidechainRootUuid
-        synthetic
-        messageData: message {
-          __typename
-          ... on TextMessage {
-            text
-          }
-          ... on ToolResultMessage {
-            messageId
-            toolUseId
-            text
-            resultData {
-              ... on BashToolResult {
-                shellOutput
-                exitCode
-              }
-              ... on ReadToolResult {
-                content
-              }
-            }
-          }
-          ... on PartialToolResultMessage {
-            messageId
-            toolUseId
-            text
-            resultData {
-              ... on PartialToolResult {
-                __typename
-              }
-            }
-          }
-        }
-      }
-      ...on AssistantEvent {
-        uuid
-        parentUuid
-        chatId
-        isSidechain
-        version
-        createdAt
-        sidechainRootUuid
-        synthetic
-        messageData: message {
-          __typename
-          ... on TextMessage {
-            text
-          }
-          ... on ToolCallMessage {
-            messageId
-            toolUseId
-            toolName
-            toolInput {
-              ... on BashToolInput {
-                command
-              }
-              ... on ReadToolInput {
-                filePath
-              }
-            }
-          }
-        }
-      }
-      ...on SystemEvent {
-        uuid
-        parentUuid
-        chatId
-        isSidechain
-        version
-        createdAt
-        sidechainRootUuid
-        messageData: message {
-          __typename
-          ... on ToolCallMessage {
-            messageId
-            toolUseId
-            toolName
-            toolInput {
-              ... on BashToolInput {
-                command
-              }
-              ... on ReadToolInput {
-                filePath
-              }
-            }
-          }
-          ... on ToolResultMessage {
-            messageId
-            toolUseId
-            text
-            resultData {
-              ... on BashToolResult {
-                shellOutput
-                exitCode
-              }
-              ... on ReadToolResult {
-                content
-              }
-            }
-          }
-          ... on ToolExecutionStatusMessage {
-            executionStatus: status
-          }
-          ... on ToolPermissionStatusMessage {
-            permissionStatus: status
-          }
-        }
-      }
-    }
-  }
-"""
-
-
-INDENT_CHAT_EVENT_STREAM_SUBSCRIPTION = """
-  subscription IndentChatEventStream(
-    $chatUuid: String!
-    $lastKnownFullEventUuid: String
-  ) {
-    indentChatEventStream(
-      chatUuid: $chatUuid
-      lastKnownFullEventUuid: $lastKnownFullEventUuid
-    ) {
-      __typename
-      ...on Error {
-        message
-      }
-      ...on UnauthenticatedError {
-        message
-      }
-      ...on UserEvent {
-        uuid
-        parentUuid
-        chatId
-        isSidechain
-        version
-        createdAt
-        sidechainRootUuid
-        synthetic
-        messageData: message {
-          __typename
-          ... on TextMessage {
-            text
-          }
-          ... on ToolResultMessage {
-            messageId
-            toolUseId
-            text
-            resultData {
-              ... on BashToolResult {
-                shellOutput
-                exitCode
-              }
-              ... on ReadToolResult {
-                content
-              }
-            }
-          }
-          ... on PartialToolResultMessage {
-            messageId
-            toolUseId
-            text
-            resultData {
-              ... on PartialToolResult {
-                __typename
-              }
-            }
-          }
-        }
-      }
-      ...on AssistantEvent {
-        uuid
-        parentUuid
-        chatId
-        isSidechain
-        version
-        createdAt
-        sidechainRootUuid
-        synthetic
-        messageData: message {
-          __typename
-          ... on TextMessage {
-            text
-          }
-          ... on ToolCallMessage {
-            messageId
-            toolUseId
-            toolName
-            toolInput {
-              ... on BashToolInput {
-                command
-              }
-              ... on ReadToolInput {
-                filePath
-              }
-            }
-          }
-        }
-      }
-      ...on SystemEvent {
-        uuid
-        parentUuid
-        chatId
-        isSidechain
-        version
-        createdAt
-        sidechainRootUuid
-        messageData: message {
-          __typename
-          ... on ToolCallMessage {
-            messageId
-            toolUseId
-            toolName
-            toolInput {
-              ... on BashToolInput {
-                command
-              }
-              ... on ReadToolInput {
-                filePath
-              }
-            }
-          }
-          ... on ToolResultMessage {
-            messageId
-            toolUseId
-            text
-            resultData {
-              ... on BashToolResult {
-                shellOutput
-                exitCode
-              }
-              ... on ReadToolResult {
-                content
-              }
-            }
-          }
-          ... on ToolExecutionStatusMessage {
-            executionStatus: status
-          }
-          ... on ToolPermissionStatusMessage {
-            permissionStatus: status
-          }
-        }
-      }
-    }
-  }
-"""

exponent/core/remote_execution/cli_rpc_types.py

@@ -1,6 +1,12 @@
+from typing import TYPE_CHECKING, Any
+
 import msgspec
 import yaml
-from typing import Any
+
+if TYPE_CHECKING:
+    from exponent_server.core.tools.edit_tool import (
+        EditToolInput as ServerSideEditToolInput,
+    )
 
 
 class PartialToolResult(msgspec.Struct, tag_field="tool_name", omit_defaults=True):
@@ -21,6 +27,11 @@ class ToolInput(msgspec.Struct, tag_field="tool_name", omit_defaults=True):
         """
         return msgspec.to_builtins(self)  # type: ignore[no-any-return]
 
+    def to_text(self) -> str:
+        d = msgspec.to_builtins(self)
+        del d["tool_name"]
+        return yaml.dump(d)
+
 
 class ToolResult(msgspec.Struct, tag_field="tool_name", omit_defaults=True):
     """Concrete subclasses return data from a tool execution."""
@@ -46,11 +57,17 @@ class ReadToolInput(ToolInput, tag=READ_TOOL_NAME):
     limit: int | None = None
 
 
+class FileMetadata(msgspec.Struct):
+    modified_timestamp: float
+    file_mode: str
+
+
 class ReadToolResult(ToolResult, tag=READ_TOOL_NAME):
     content: str
     num_lines: int
     start_line: int
     total_lines: int
+    metadata: FileMetadata | None = None
 
     def to_text(self) -> str:
         lines = self.content.splitlines()
@@ -99,6 +116,7 @@ class WriteToolInput(ToolInput, tag=WRITE_TOOL_NAME):
 
 class WriteToolResult(ToolResult, tag=WRITE_TOOL_NAME):
     message: str
+    metadata: FileMetadata | None = None
 
 
 GREP_TOOL_NAME = "grep"
@@ -125,10 +143,27 @@ class EditToolInput(ToolInput, tag=EDIT_TOOL_NAME):
     old_string: str
     new_string: str
     replace_all: bool = False
+    # The last retrieved modified timestamp. This is used to check if the file has been modified since the last read/write that we are aware of (in which case we should re-read the file before editing).
+    last_known_modified_timestamp: float | None = None
+
+    @classmethod
+    def from_server_side_input(
+        cls,
+        server_side_input: "ServerSideEditToolInput",
+        last_known_modified_timestamp: float | None,
+    ) -> "EditToolInput":
+        return cls(
+            file_path=server_side_input.file_path,
+            old_string=server_side_input.old_string,
+            new_string=server_side_input.new_string,
+            replace_all=server_side_input.replace_all,
+            last_known_modified_timestamp=last_known_modified_timestamp,
+        )
 
 
 class EditToolResult(ToolResult, tag=EDIT_TOOL_NAME):
     message: str
+    metadata: FileMetadata | None = None
 
 
 BASH_TOOL_NAME = "bash"
@@ -206,6 +241,12 @@ class SwitchCLIChatRequest(msgspec.Struct, tag="switch_cli_chat"):
     new_chat_uuid: str
 
 
+# This message is sent periodically from the client to keep the connection alive while the chat is turning.
+# This synergizes with CLI-side timeouts to avoid disconnecting during long operations.
+class KeepAliveCliChatRequest(msgspec.Struct, tag="keep_alive_cli_chat"):
+    pass
+
+
 class BatchToolExecutionRequest(msgspec.Struct, tag="batch_tool_execution"):
     tool_inputs: list[ToolInputType]
 
@@ -226,6 +267,10 @@ class SwitchCLIChatResponse(msgspec.Struct, tag="switch_cli_chat"):
     pass
 
 
+class KeepAliveCliChatResponse(msgspec.Struct, tag="keep_alive_cli_chat"):
+    pass
+
+
 class CliRpcRequest(msgspec.Struct):
     request_id: str
     request: (
@@ -235,6 +280,7 @@ class CliRpcRequest(msgspec.Struct):
         | HttpRequest
         | BatchToolExecutionRequest
         | SwitchCLIChatRequest
+        | KeepAliveCliChatRequest
     )
 
 
@@ -256,4 +302,5 @@ class CliRpcResponse(msgspec.Struct):
         | BatchToolExecutionResponse
         | HttpResponse
         | SwitchCLIChatResponse
+        | KeepAliveCliChatResponse
     )