fix: repair api server merge fallout

server-rs/crates/api-server/src/custom_world_foundation_draft.rs

@@ -2739,13 +2739,19 @@ mod tests {
     fn llm_response(content: &str) -> String {
         json!({
             "id": "resp_01",
-            "choices": [
+            "model": "test-model",
+            "output": [
                 {
-                    "message": {
-                        "content": content,
-                    }
+                    "type": "message",
+                    "content": [
+                        {
+                            "type": "output_text",
+                            "text": content,
+                        }
+                    ],
                 }
-            ]
+            ],
+            "status": "completed"
         })
         .to_string()
     }

server-rs/crates/api-server/src/llm.rs

@@ -7,7 +7,7 @@ use axum::{
         sse::{Event, Sse},
     },
 };
-use platform_llm::{LlmError, LlmMessage, LlmMessageRole, LlmTextProtocol, LlmTextRequest};
+use platform_llm::{LlmMessage, LlmMessageRole, LlmTextProtocol, LlmTextRequest};
 use serde_json::{Value, json};
 use shared_contracts::llm::{
     LlmChatCompletionRequest, LlmChatCompletionResponse, LlmChatMessagePayload, LlmChatMessageRole,

server-rs/crates/api-server/src/puzzle.rs

@@ -1276,6 +1276,58 @@ pub async fn swap_puzzle_pieces(
     ))
 }
 
+pub async fn drag_puzzle_piece_or_group(
+    State(state): State<AppState>,
+    AxumPath(run_id): AxumPath<String>,
+    Extension(request_context): Extension<RequestContext>,
+    Extension(authenticated): Extension<AuthenticatedAccessToken>,
+    payload: Result<Json<DragPuzzlePieceRequest>, JsonRejection>,
+) -> Result<Json<Value>, Response> {
+    let Json(payload) = payload.map_err(|error| {
+        puzzle_error_response(
+            &request_context,
+            PUZZLE_RUNTIME_PROVIDER,
+            AppError::from_status(StatusCode::BAD_REQUEST).with_details(json!({
+                "provider": PUZZLE_RUNTIME_PROVIDER,
+                "message": error.body_text(),
+            })),
+        )
+    })?;
+    ensure_non_empty(&request_context, PUZZLE_RUNTIME_PROVIDER, &run_id, "runId")?;
+    ensure_non_empty(
+        &request_context,
+        PUZZLE_RUNTIME_PROVIDER,
+        &payload.piece_id,
+        "pieceId",
+    )?;
+
+    let run = state
+        .spacetime_client()
+        .drag_puzzle_piece_or_group(PuzzleRunDragRecordInput {
+            run_id,
+            owner_user_id: authenticated.claims().user_id().to_string(),
+            piece_id: payload.piece_id,
+            target_row: payload.target_row,
+            target_col: payload.target_col,
+            dragged_at_micros: current_utc_micros(),
+        })
+        .await
+        .map_err(|error| {
+            puzzle_error_response(
+                &request_context,
+                PUZZLE_RUNTIME_PROVIDER,
+                map_puzzle_client_error(error),
+            )
+        })?;
+
+    Ok(json_success_body(
+        Some(&request_context),
+        PuzzleRunResponse {
+            run: map_puzzle_run_response(enrich_puzzle_run_author_name(&state, run).await),
+        },
+    ))
+}
+
 pub async fn advance_puzzle_next_level(
     State(state): State<AppState>,
     AxumPath(run_id): AxumPath<String>,

server-rs/crates/api-server/src/runtime_chat.rs

@@ -10,7 +10,7 @@ use axum::{
 use platform_llm::{LlmMessage, LlmTextRequest};
 use serde::Deserialize;
 use serde_json::{Value, json};
-use shared_contracts::runtime_story::RuntimeStorySnapshotPayload;
+use shared_contracts::story::StoryRuntimeSnapshotPayload as RuntimeStorySnapshotPayload;
 use std::convert::Infallible;
 
 use module_runtime_story::{

server-rs/crates/api-server/src/runtime_chat_plain.rs

@@ -10,7 +10,7 @@ use axum::{
 use platform_llm::{LlmMessage, LlmTextRequest};
 use serde::Deserialize;
 use serde_json::{Value, json};
-use shared_contracts::runtime_story::RuntimeStorySnapshotPayload;
+use shared_contracts::story::StoryRuntimeSnapshotPayload as RuntimeStorySnapshotPayload;
 use std::convert::Infallible;
 
 use crate::{