Self-hosted workflows for coding-agent delivery. Orchestrate CodeBuddy, Codex and Claude Code with scripts and human approval gates. Includes Local workflows for coding assistants.
JavaScript agent-orchestrationagentic-workflowai-agentsai-codingclaude-codecode-reviewcodebuddycodexcoding-agentscursordeveloper-toolshuman-on-the-loopllmmcpmulti-agentsdlcself-hostedsopworkflow-automationworkflow-engine
refactor(httpapi): share JSON fence stripping and object parsing in stream.go (#235)
fx-kurumic4388b47055c
diff --git a/internal/httpapi/stream.go b/internal/httpapi/stream.goindex dfb06c58..dfa445f2 100644--- a/internal/httpapi/stream.go+++ b/internal/httpapi/stream.go@@ -839,11 +839,7 @@ func clarifyStreamEvents(line string) []map[string]string {}func clarifyThoughtShouldHide(s string) bool {- s = strings.TrimSpace(s)- s = strings.TrimPrefix(s, "```json")- s = strings.TrimPrefix(s, "```")- s = strings.TrimSuffix(s, "```")- s = strings.TrimSpace(s)+ s = stripJSONFence(s)if s == "" {return false}@@ -869,11 +865,7 @@ func clarifyThoughtShouldHide(s string) bool {}func extractClarifyProtocolObject(s string) map[string]any {- s = strings.TrimSpace(s)- s = strings.TrimPrefix(s, "```json")- s = strings.TrimPrefix(s, "```")- s = strings.TrimSuffix(s, "```")- s = strings.TrimSpace(s)+ s = stripJSONFence(s)start, end := strings.Index(s, "{"), strings.LastIndex(s, "}")if start < 0 || end <= start {return nil@@ -972,27 +964,35 @@ func (h *streamHandlers) chatClarifyCancel(c *gin.Context) {c.JSON(200, map[string]bool{"cancelled": true})}+// stripJSONFence trims surrounding whitespace and a Markdown code fence+// (```json or ```) that agents often wrap around JSON replies.+func stripJSONFence(s string) string {+ s = strings.TrimSpace(s)+ s = strings.TrimPrefix(s, "```json")+ s = strings.TrimPrefix(s, "```")+ s = strings.TrimSuffix(s, "```")+ return strings.TrimSpace(s)+}++// parseStreamJSONObject decodes the outermost {...} span of s (after removing+// any code fence) and unwraps a stream-json envelope when present.+func parseStreamJSONObject(s string) (any, bool) {+ s = stripJSONFence(s)+ start, end := strings.Index(s, "{"), strings.LastIndex(s, "}")+ if start < 0 || end <= start {+ return nil, false+ }+ var v any+ if json.Unmarshal([]byte(s[start:end+1]), &v) != nil {+ return nil, false+ }+ return unwrapStreamJSONEnvelope(v)+}+func extractClarifyResultJSON(raw string) (any, string) {raw = strings.TrimSpace(raw)- try := func(s string) (any, bool) {- s = strings.TrimSpace(s)- s = strings.TrimPrefix(s, "```json")- s = strings.TrimPrefix(s, "```")- s = strings.TrimSuffix(s, "```")- s = strings.TrimSpace(s)- start, end := strings.Index(s, "{"), strings.LastIndex(s, "}")- if start < 0 || end <= start {- return nil, false- }- s = s[start : end+1]- var v any- if json.Unmarshal([]byte(s), &v) != nil {- return nil, false- }- return unwrapStreamJSONEnvelope(v)- }protocol := func(s string) (any, bool) {- v, ok := try(s)+ v, ok := parseStreamJSONObject(s)if !ok || !isClarifyProtocolObject(v) {return nil, false}@@ -1050,23 +1050,6 @@ func extractClarifyResultJSON(raw string) (any, string) {func extractJSONObject(raw string) (any, string) {raw = strings.TrimSpace(raw)- try := func(s string) (any, bool) {- s = strings.TrimSpace(s)- s = strings.TrimPrefix(s, "```json")- s = strings.TrimPrefix(s, "```")- s = strings.TrimSuffix(s, "```")- s = strings.TrimSpace(s)- start, end := strings.Index(s, "{"), strings.LastIndex(s, "}")- if start < 0 || end <= start {- return nil, false- }- s = s[start : end+1]- var v any- if json.Unmarshal([]byte(s), &v) != nil {- return nil, false- }- return unwrapStreamJSONEnvelope(v)- }var resultVal anyvar resultRaw string@@ -1083,7 +1066,7 @@ func extractJSONObject(raw string) (any, string) {}if fmt.Sprint(event["type"]) == "result" {if msg, ok := event["result"].(string); ok {- if v, ok := try(msg); ok {+ if v, ok := parseStreamJSONObject(msg); ok {resultVal, resultRaw = v, msg} else if strings.TrimSpace(msg) != "" {resultVal = map[string]any{"summary": msg, "questions": []any{}, "ready": false}@@ -1097,18 +1080,18 @@ func extractJSONObject(raw string) (any, string) {continue}if msg, ok := event["message"].(map[string]any); ok {- if v, src, ok := extractClarifyJSONFromEvent(msg, try); ok {+ if v, src, ok := extractClarifyJSONFromEvent(msg, parseStreamJSONObject); ok {fallback, fallbackRaw = v, src}}- if v, src, ok := extractClarifyJSONFromEvent(event, try); ok {+ if v, src, ok := extractClarifyJSONFromEvent(event, parseStreamJSONObject); ok {fallback, fallbackRaw = v, src}}if resultVal != nil {return resultVal, resultRaw}- if v, ok := try(raw); ok {+ if v, ok := parseStreamJSONObject(raw); ok {return v, raw}if fallback != nil {diff --git a/internal/httpapi/stream_json_parse_test.go b/internal/httpapi/stream_json_parse_test.gonew file mode 100644index 00000000..c95af1c3--- /dev/null+++ b/internal/httpapi/stream_json_parse_test.go@@ -0,0 +1,51 @@+package httpapi++import (+ "reflect"+ "testing"+)++func TestStripJSONFence(t *testing.T) {+ cases := map[string]string{+ `{"a":1}`: `{"a":1}`,+ " padded ": "padded",+ "```json\n{}\n```": "{}",+ "```\n{}\n```": "{}",+ " ```json {} ``` ": "{}",+ "": "",+ "no fence ```": "no fence",+ }+ for in, want := range cases {+ if got := stripJSONFence(in); got != want {+ t.Errorf("stripJSONFence(%q) = %q, want %q", in, got, want)+ }+ }+}++func TestParseStreamJSONObject(t *testing.T) {+ cases := []struct {+ name string+ in string+ want any+ ok bool+ }{+ {"plain object", `{"ready":true}`, map[string]any{"ready": true}, true},+ {"fenced object", "```json\n{\"ready\":false}\n```", map[string]any{"ready": false}, true},+ {"surrounding prose", `结论如下 {"summary":"s"} 以上`, map[string]any{"summary": "s"}, true},+ {"result envelope", `{"type":"result","result":"{\"summary\":\"inner\"}"}`, map[string]any{"summary": "inner"}, true},+ {"no object", "just text", nil, false},+ {"reversed braces", "} {", nil, false},+ {"invalid json", `{"a":}`, nil, false},+ }+ for _, tc := range cases {+ t.Run(tc.name, func(t *testing.T) {+ got, ok := parseStreamJSONObject(tc.in)+ if ok != tc.ok {+ t.Fatalf("ok = %v, want %v (value %#v)", ok, tc.ok, got)+ }+ if tc.ok && !reflect.DeepEqual(got, tc.want) {+ t.Fatalf("got %#v, want %#v", got, tc.want)+ }+ })+ }+}