diff --git a/internal/api/community_instance.go b/internal/api/community_instance.go
index 72fb8276f..235a0f273 100644
--- a/internal/api/community_instance.go
+++ b/internal/api/community_instance.go
@@ -16,7 +16,7 @@ import (
 )
 
 const communityAgentInstancePath = "/api/v1/agent/instances"
-const communityInstanceTemplatePendingCode = "error.AGENT-ERR-22"
+const communityInstanceTemplatePendingCode = "AGENT-ERR-22"
 const communityInstanceDeployRetries = 3
 const communityInstanceDeployRetryDelay = time.Second
 
@@ -30,15 +30,14 @@ type communityAgentInstanceRequest struct {
 }
 
 type communityAgentInstanceResponse struct {
-	Code json.RawMessage `json:"code"`
-	Msg  string          `json:"msg"`
+	Code    string `json:"code"`
+	Msg     string `json:"msg"`
+	Context struct {
+		RepoPath string `json:"repo_path"`
+	} `json:"context"`
 	Data json.RawMessage `json:"data"`
 }
 
-type communityInstanceErrorMessage struct {
-	Other string `json:"other"`
-}
-
 var createCommunityAgentInstance = createCommunityAgentInstanceRequest
 var communityInstanceHTTPClient = &http.Client{Timeout: 30 * time.Second}
 var waitForCommunityInstanceRetry = func(ctx context.Context) error {
@@ -144,9 +143,6 @@ func createCommunityAgentInstanceOnce(req *http.Request) (bool, error) {
 	if err != nil {
 		return false, fmt.Errorf("read community instance response: %w", err)
 	}
-	if message, ok := communityInstanceError(responseBody, communityInstanceTemplatePendingCode); ok {
-		return true, fmt.Errorf("create community instance: %s", message)
-	}
 	var result communityAgentInstanceResponse
 	if err := json.Unmarshal(responseBody, &result); err != nil {
 		if resp.StatusCode != http.StatusOK {
@@ -154,42 +150,18 @@ func createCommunityAgentInstanceOnce(req *http.Request) (bool, error) {
 		}
 		return false, fmt.Errorf("decode community instance response: %w", err)
 	}
-	message := strings.TrimSpace(result.Msg)
-	if message == "" {
-		message = "unknown error"
+	if result.Code == communityInstanceTemplatePendingCode {
+		message := strings.TrimSpace(result.Msg)
+		if message == "" {
+			message = communityInstanceTemplatePendingCode
+		}
+		return true, fmt.Errorf("create community instance: %s", message)
 	}
 	if resp.StatusCode != http.StatusOK {
 		return false, fmt.Errorf("create community instance: HTTP %d: %s", resp.StatusCode, strings.TrimSpace(string(responseBody)))
 	}
-	if code := communityInstanceCode(result.Code); code != "" && code != "0" {
-		return false, fmt.Errorf("create community instance: %s", message)
-	}
 	if len(result.Data) == 0 || string(result.Data) == "null" {
 		return false, fmt.Errorf("create community instance: response data is missing")
 	}
 	return false, nil
 }
-
-func communityInstanceError(body []byte, code string) (string, bool) {
-	var errorsByCode map[string]communityInstanceErrorMessage
-	if json.Unmarshal(body, &errorsByCode) != nil {
-		return "", false
-	}
-	detail, ok := errorsByCode[code]
-	if !ok {
-		return "", false
-	}
-	message := strings.TrimSpace(detail.Other)
-	if message == "" {
-		message = code
-	}
-	return message, true
-}
-
-func communityInstanceCode(raw json.RawMessage) string {
-	var text string
-	if json.Unmarshal(raw, &text) == nil {
-		return strings.TrimSpace(text)
-	}
-	return strings.TrimSpace(string(raw))
-}
diff --git a/internal/api/community_instance_test.go b/internal/api/community_instance_test.go
index 133f63455..1ed1f0c80 100644
--- a/internal/api/community_instance_test.go
+++ b/internal/api/community_instance_test.go
@@ -31,7 +31,7 @@ func TestCreateCommunityAgentInstanceUsesCSGClawType(t *testing.T) {
 			t.Fatalf("decode request: %v", err)
 		}
 		w.Header().Set("Content-Type", "application/json")
-		_, _ = w.Write([]byte(`{"code":0,"data":{"id":"instance-1"}}`))
+		_, _ = w.Write([]byte(`{"msg":"OK","data":{"id":"instance-1"}}`))
 	}))
 	defer server.Close()
 
@@ -96,10 +96,10 @@ func TestCreateCommunityAgentInstanceRetriesTemplatePendingCode(t *testing.T) {
 		w.Header().Set("Content-Type", "application/json")
 		if attempts <= communityInstanceDeployRetries {
 			w.WriteHeader(http.StatusInternalServerError)
-			_, _ = w.Write([]byte(`{"error.AGENT-ERR-22":{"other":"csgclaw template not found for repository path alice/ReviewBot"}}`))
+			_, _ = w.Write([]byte(`{"code":"AGENT-ERR-22","msg":"AGENT-ERR-22: csgclaw template not found for repository path alice/ReviewBot","context":{"repo_path":"alice/ReviewBot"}}`))
 			return
 		}
-		_, _ = w.Write([]byte(`{"code":0,"data":{"id":"instance-1"}}`))
+		_, _ = w.Write([]byte(`{"msg":"OK","data":{"id":"instance-1"}}`))
 	}))
 	defer server.Close()
 
@@ -132,7 +132,7 @@ func TestCreateCommunityAgentInstanceReturnsLastTemplatePendingError(t *testing.
 		attempts++
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusInternalServerError)
-		_, _ = w.Write([]byte(`{"error.AGENT-ERR-22":{"other":"csgclaw template not found for repository path alice/ReviewBot"}}`))
+		_, _ = w.Write([]byte(`{"code":"AGENT-ERR-22","msg":"AGENT-ERR-22: csgclaw template not found for repository path alice/ReviewBot","context":{"repo_path":"alice/ReviewBot"}}`))
 	}))
 	defer server.Close()
 
@@ -165,7 +165,7 @@ func TestCreateCommunityAgentInstanceDoesNotRetryOtherCodes(t *testing.T) {
 		attempts++
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusBadRequest)
-		_, _ = w.Write([]byte(`{"error.AGENT-ERR-21":{"other":"invalid request"}}`))
+		_, _ = w.Write([]byte(`{"code":"AGENT-ERR-21","msg":"invalid request","context":{}}`))
 	}))
 	defer server.Close()