@@ -219,21 +219,41 @@ public HTTPRestResponse listTasks(@Nullable String contextId, @Nullable String s
219219 paramsBuilder .contextId (contextId );
220220 }
221221 if (status != null ) {
222+ TaskState taskState = null ;
223+
224+ // Try JSON format first (e.g., "working", "completed")
222225 try {
223- paramsBuilder . status ( TaskState .fromString (status ) );
226+ taskState = TaskState .fromString (status );
224227 } catch (IllegalArgumentException e ) {
225- try {
226- paramsBuilder .status (TaskState .valueOf (status ));
227- } catch (IllegalArgumentException valueOfError ) {
228- String validStates = Arrays .stream (TaskState .values ())
229- .map (TaskState ::asString )
230- .collect (Collectors .joining (", " ));
231- Map <String , Object > errorData = new HashMap <>();
232- errorData .put ("parameter" , "status" );
233- errorData .put ("reason" , "Must be one of: " + validStates );
234- throw new InvalidParamsError (null , "Invalid params" , errorData );
228+ // Try protobuf enum format (e.g., "TASK_STATE_WORKING")
229+ if (status .startsWith ("TASK_STATE_" )) {
230+ String enumName = status .substring ("TASK_STATE_" .length ());
231+ try {
232+ taskState = TaskState .valueOf (enumName );
233+ } catch (IllegalArgumentException protoError ) {
234+ // Fall through to error handling below
235+ }
236+ } else {
237+ // Try enum constant name directly (e.g., "WORKING")
238+ try {
239+ taskState = TaskState .valueOf (status );
240+ } catch (IllegalArgumentException valueOfError ) {
241+ // Fall through to error handling below
242+ }
235243 }
236244 }
245+
246+ if (taskState == null ) {
247+ String validStates = Arrays .stream (TaskState .values ())
248+ .map (TaskState ::asString )
249+ .collect (Collectors .joining (", " ));
250+ Map <String , Object > errorData = new HashMap <>();
251+ errorData .put ("parameter" , "status" );
252+ errorData .put ("reason" , "Must be one of: " + validStates );
253+ throw new InvalidParamsError (null , "Invalid params" , errorData );
254+ }
255+
256+ paramsBuilder .status (taskState );
237257 }
238258 if (pageSize != null ) {
239259 paramsBuilder .pageSize (pageSize );
@@ -247,12 +267,25 @@ public HTTPRestResponse listTasks(@Nullable String contextId, @Nullable String s
247267 paramsBuilder .tenant (tenant );
248268 if (lastUpdatedAfter != null ) {
249269 try {
250- paramsBuilder .lastUpdatedAfter (Instant .parse (lastUpdatedAfter ));
251- } catch (DateTimeParseException e ) {
252- Map <String , Object > errorData = new HashMap <>();
253- errorData .put ("parameter" , "lastUpdatedAfter" );
254- errorData .put ("reason" , "Must be valid ISO-8601 timestamp" );
255- throw new InvalidParamsError (null , "Invalid params" , errorData );
270+ // Try parsing as Unix milliseconds first (integer)
271+ long millis = Long .parseLong (lastUpdatedAfter );
272+ if (millis < 0L ) {
273+ Map <String , Object > errorData = new HashMap <>();
274+ errorData .put ("parameter" , "lastUpdatedAfter" );
275+ errorData .put ("reason" , "Must be a non-negative timestamp value, got: " + millis );
276+ throw new InvalidParamsError (null , "Invalid params" , errorData );
277+ }
278+ paramsBuilder .lastUpdatedAfter (Instant .ofEpochMilli (millis ));
279+ } catch (NumberFormatException nfe ) {
280+ // Fall back to ISO-8601 format
281+ try {
282+ paramsBuilder .lastUpdatedAfter (Instant .parse (lastUpdatedAfter ));
283+ } catch (DateTimeParseException e ) {
284+ Map <String , Object > errorData = new HashMap <>();
285+ errorData .put ("parameter" , "lastUpdatedAfter" );
286+ errorData .put ("reason" , "Must be valid Unix milliseconds or ISO-8601 timestamp" );
287+ throw new InvalidParamsError (null , "Invalid params" , errorData );
288+ }
256289 }
257290 }
258291 if (includeArtifacts != null ) {
@@ -338,7 +371,8 @@ private void validate(String json) {
338371
339372 private HTTPRestResponse createSuccessResponse (int statusCode , com .google .protobuf .Message .Builder builder ) {
340373 try {
341- String jsonBody = JsonFormat .printer ().print (builder );
374+ // Include default value fields to ensure empty arrays, zeros, etc. are present in JSON
375+ String jsonBody = JsonFormat .printer ().includingDefaultValueFields ().print (builder );
342376 return new HTTPRestResponse (statusCode , "application/json" , jsonBody );
343377 } catch (InvalidProtocolBufferException e ) {
344378 return createErrorResponse (new InternalError ("Failed to serialize response: " + e .getMessage ()));
0 commit comments