fix: make gen all great

Signed-off-by: Chojan Shang <chojan.shang@vesoft.com>

Author: Chojan Shang

scripts/gen_schema.py

@@ -6,6 +6,7 @@
 import shutil
 import subprocess
 import sys
+from collections.abc import Callable
 from pathlib import Path
 
 ROOT = Path(__file__).resolve().parents[1]
@@ -228,18 +229,31 @@ def replace_block(
             _class_name: str = class_name,
         ) -> str:
             header, block = match.group(1), match.group(2)
-            field_pattern = re.compile(
-                rf"(\n\s+{_field_name}:[^\n]*=)\s*[^\n]+",
-                re.MULTILINE,
+            field_patterns: tuple[tuple[re.Pattern[str], Callable[[re.Match[str]], str]], ...] = (
+                (
+                    re.compile(
+                        rf"(\n\s+{_field_name}:.*?\]\s*=\s*)([\s\S]*?)(?=\n\s{{4}}[A-Za-z_]|$)",
+                        re.DOTALL,
+                    ),
+                    lambda m, _rep=_replacement: m.group(1) + _rep,
+                ),
+                (
+                    re.compile(
+                        rf"(\n\s+{_field_name}:[^\n]*=)\s*([^\n]+)",
+                        re.MULTILINE,
+                    ),
+                    lambda m, _rep=_replacement: m.group(1) + " " + _rep,
+                ),
             )
-            new_block, count = field_pattern.subn(rf"\1 {_replacement}", block, count=1)
-            if count == 0:
-                print(
-                    f"Warning: failed to override default for {_class_name}.{_field_name}",
-                    file=sys.stderr,
-                )
-                return match.group(0)
-            return header + new_block
+            for pattern, replacer in field_patterns:
+                new_block, count = pattern.subn(replacer, block, count=1)
+                if count:
+                    return header + new_block
+            print(
+                f"Warning: failed to override default for {_class_name}.{_field_name}",
+                file=sys.stderr,
+            )
+            return match.group(0)
 
         content, count = class_pattern.subn(replace_block, content, count=1)
         if count == 0:

src/acp/schema.py

@@ -8,23 +8,13 @@
 
 from pydantic import BaseModel, Field, RootModel
 
+
 PermissionOptionKind = Literal["allow_once", "allow_always", "reject_once", "reject_always"]
 PlanEntryPriority = Literal["high", "medium", "low"]
 PlanEntryStatus = Literal["pending", "in_progress", "completed"]
 StopReason = Literal["end_turn", "max_tokens", "max_turn_requests", "refusal", "cancelled"]
 ToolCallStatus = Literal["pending", "in_progress", "completed", "failed"]
-ToolKind = Literal[
-    "read",
-    "edit",
-    "delete",
-    "move",
-    "search",
-    "execute",
-    "think",
-    "fetch",
-    "switch_mode",
-    "other",
-]
+ToolKind = Literal["read", "edit", "delete", "move", "search", "execute", "think", "fetch", "switch_mode", "other"]
 
 
 class AuthenticateRequest(BaseModel):
@@ -646,10 +636,7 @@ class PermissionOption(BaseModel):
         Optional[Any],
         Field(alias="_meta", description="Extension point for implementations"),
     ] = None
-    kind: Annotated[
-        PermissionOptionKind,
-        Field(description="Hint about the nature of this permission option."),
-    ]
+    kind: Annotated[PermissionOptionKind, Field(description="Hint about the nature of this permission option.")]
     name: Annotated[str, Field(description="Human-readable label to display to the user.")]
     optionId: Annotated[str, Field(description="Unique identifier for this permission option.")]
 
@@ -669,21 +656,15 @@ class PlanEntry(BaseModel):
             description="The relative importance of this task.\nUsed to indicate which tasks are most critical to the overall goal."
         ),
     ]
-    status: Annotated[
-        PlanEntryStatus,
-        Field(description="Current execution status of this task."),
-    ]
+    status: Annotated[PlanEntryStatus, Field(description="Current execution status of this task.")]
 
 
 class PromptResponse(BaseModel):
     field_meta: Annotated[
         Optional[Any],
         Field(alias="_meta", description="Extension point for implementations"),
     ] = None
-    stopReason: Annotated[
-        StopReason,
-        Field(description="Indicates why the agent stopped processing the turn."),
-    ]
+    stopReason: Annotated[StopReason, Field(description="Indicates why the agent stopped processing the turn.")]
 
 
 class ReadTextFileRequest(BaseModel):
@@ -932,20 +913,14 @@ class ToolCallUpdate(BaseModel):
         Optional[List[Union[ContentToolCallContent, FileEditToolCallContent, TerminalToolCallContent]]],
         Field(description="Replace the content collection."),
     ] = None
-    kind: Annotated[
-        Optional[ToolKind],
-        Field(description="Update the tool kind."),
-    ] = None
+    kind: Annotated[Optional[ToolKind], Field(description="Update the tool kind.")] = None
     locations: Annotated[
         Optional[List[ToolCallLocation]],
         Field(description="Replace the locations collection."),
     ] = None
     rawInput: Annotated[Optional[Any], Field(description="Update the raw input.")] = None
     rawOutput: Annotated[Optional[Any], Field(description="Update the raw output.")] = None
-    status: Annotated[
-        Optional[ToolCallStatus],
-        Field(description="Update the execution status."),
-    ] = None
+    status: Annotated[Optional[ToolCallStatus], Field(description="Update the execution status.")] = None
     title: Annotated[Optional[str], Field(description="Update the human-readable title.")] = None
     toolCallId: Annotated[str, Field(description="The ID of the tool call being updated.")]
 
@@ -988,10 +963,7 @@ class ToolCallStart(BaseModel):
     rawInput: Annotated[Optional[Any], Field(description="Raw input parameters sent to the tool.")] = None
     rawOutput: Annotated[Optional[Any], Field(description="Raw output returned by the tool.")] = None
     sessionUpdate: Literal["tool_call"]
-    status: Annotated[
-        Optional[ToolCallStatus],
-        Field(description="Current execution status of the tool call."),
-    ] = None
+    status: Annotated[Optional[ToolCallStatus], Field(description="Current execution status of the tool call.")] = None
     title: Annotated[
         str,
         Field(description="Human-readable title describing what the tool is doing."),
@@ -1011,21 +983,15 @@ class ToolCallProgress(BaseModel):
         Optional[List[Union[ContentToolCallContent, FileEditToolCallContent, TerminalToolCallContent]]],
         Field(description="Replace the content collection."),
     ] = None
-    kind: Annotated[
-        Optional[ToolKind],
-        Field(description="Update the tool kind."),
-    ] = None
+    kind: Annotated[Optional[ToolKind], Field(description="Update the tool kind.")] = None
     locations: Annotated[
         Optional[List[ToolCallLocation]],
         Field(description="Replace the locations collection."),
     ] = None
     rawInput: Annotated[Optional[Any], Field(description="Update the raw input.")] = None
     rawOutput: Annotated[Optional[Any], Field(description="Update the raw output.")] = None
     sessionUpdate: Literal["tool_call_update"]
-    status: Annotated[
-        Optional[ToolCallStatus],
-        Field(description="Update the execution status."),
-    ] = None
+    status: Annotated[Optional[ToolCallStatus], Field(description="Update the execution status.")] = None
     title: Annotated[Optional[str], Field(description="Update the human-readable title.")] = None
     toolCallId: Annotated[str, Field(description="The ID of the tool call being updated.")]
 
@@ -1051,10 +1017,7 @@ class ToolCall(BaseModel):
     ] = None
     rawInput: Annotated[Optional[Any], Field(description="Raw input parameters sent to the tool.")] = None
     rawOutput: Annotated[Optional[Any], Field(description="Raw output returned by the tool.")] = None
-    status: Annotated[
-        Optional[ToolCallStatus],
-        Field(description="Current execution status of the tool call."),
-    ] = None
+    status: Annotated[Optional[ToolCallStatus], Field(description="Current execution status of the tool call.")] = None
     title: Annotated[
         str,
         Field(description="Human-readable title describing what the tool is doing."),