Pantograph.lean

@@ -193,7 +193,7 @@ def execute (command: Protocol.Command): MainM Lean.Json := do
           pure $ target.resume goals
         | _, _ => return .error <| errorI "arguments" "Exactly one of {branch, goals} must be supplied"
       match nextState? with
-      | .error error => return .ok { error? := .some error }
+      | .error error => return .error <| errorI "structure" error
       | .ok nextGoalState =>
         let nextStateId := state.nextId
         set { state with
@@ -202,8 +202,8 @@ def execute (command: Protocol.Command): MainM Lean.Json := do
         }
         let goals ← nextGoalState.serializeGoals (parent := .none) (options := state.options)
         return .ok {
-          nextStateId? := .some nextStateId,
+          nextStateId,
-          goals? := .some goals,
+          goals,
         }
   goal_delete (args: Protocol.GoalDelete): MainM (CR Protocol.GoalDeleteResult) := do
     let state ← get

Pantograph/Protocol.lean

@@ -176,9 +176,8 @@ structure GoalContinue where
   goals?: Option (List String) := .none
   deriving Lean.FromJson
 structure GoalContinueResult where
-  error?: Option String := .none
+  nextStateId: Nat
-  nextStateId?: Option Nat := .none
+  goals: (Array Goal)
-  goals?: Option (Array Goal) := .none
   deriving Lean.ToJson
 
 -- Remove goal states