Merge remote-tracking branch 'origin/master' into codex/bark-battle

packages/shared/src/contracts/index.ts

@@ -1,6 +1,7 @@
 export type * from './creativeAgent';
 export type * from './creationAudio';
 export type * from './hyper3d';
+export type * from './jumpHop';
 export type * from './puzzleCreativeTemplate';
 export type * from './visualNovel';
 export type * from './barkBattle';

packages/shared/src/contracts/jumpHop.ts

@@ -0,0 +1,262 @@
+export type JumpHopDifficulty = 'easy' | 'standard' | 'advanced' | 'challenge';
+
+export type JumpHopStylePreset =
+  | 'minimal-blocks'
+  | 'paper-toy'
+  | 'neon-glass'
+  | 'forest-stone'
+  | 'future-metal'
+  | 'custom';
+
+export type JumpHopGenerationStatus =
+  | 'draft'
+  | 'generating'
+  | 'ready'
+  | 'failed';
+
+export type JumpHopTileType =
+  | 'start'
+  | 'normal'
+  | 'target'
+  | 'finish'
+  | 'bonus'
+  | 'accent';
+
+export type JumpHopActionType =
+  | 'compile-draft'
+  | 'regenerate-character'
+  | 'regenerate-tiles'
+  | 'update-work-meta'
+  | 'update-difficulty';
+
+export type JumpHopRunStatus = 'playing' | 'failed' | 'cleared';
+
+export type JumpHopJumpResult = 'miss' | 'hit' | 'perfect' | 'finish';
+
+export interface JumpHopWorkspaceCreateRequest {
+  templateId: string;
+  workTitle: string;
+  workDescription: string;
+  themeTags: string[];
+  difficulty: JumpHopDifficulty;
+  stylePreset: JumpHopStylePreset;
+  characterPrompt: string;
+  tilePrompt: string;
+  endMoodPrompt?: string | null;
+}
+
+export interface JumpHopActionRequest {
+  actionType: JumpHopActionType;
+  workTitle?: string | null;
+  workDescription?: string | null;
+  themeTags?: string[] | null;
+  difficulty?: JumpHopDifficulty | null;
+  stylePreset?: JumpHopStylePreset | null;
+  characterPrompt?: string | null;
+  tilePrompt?: string | null;
+  endMoodPrompt?: string | null;
+}
+
+export interface JumpHopCharacterAsset {
+  assetId: string;
+  imageSrc: string;
+  imageObjectKey: string;
+  assetObjectId: string;
+  generationProvider: string;
+  prompt: string;
+  width: number;
+  height: number;
+}
+
+export interface JumpHopTileAsset {
+  tileType: JumpHopTileType;
+  imageSrc: string;
+  imageObjectKey: string;
+  assetObjectId: string;
+  sourceAtlasCell: string;
+  visualWidth: number;
+  visualHeight: number;
+  topSurfaceRadius: number;
+  landingRadius: number;
+}
+
+export interface JumpHopScoring {
+  chargeToDistanceRatio: number;
+  maxChargeMs: number;
+  hitBonus: number;
+  perfectBonus: number;
+}
+
+export interface JumpHopPlatform {
+  platformId: string;
+  tileType: JumpHopTileType;
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+  landingRadius: number;
+  perfectRadius: number;
+  scoreValue: number;
+}
+
+export interface JumpHopPath {
+  seed: string;
+  difficulty: JumpHopDifficulty;
+  platforms: JumpHopPlatform[];
+  finishIndex: number;
+  cameraPreset: string;
+  scoring: JumpHopScoring;
+}
+
+export interface JumpHopLastJump {
+  chargeMs: number;
+  jumpDistance: number;
+  targetPlatformIndex: number;
+  landedX: number;
+  landedY: number;
+  result: JumpHopJumpResult;
+}
+
+export interface JumpHopDraftResponse {
+  templateId: string;
+  templateName: string;
+  profileId: string | null;
+  workTitle: string;
+  workDescription: string;
+  themeTags: string[];
+  difficulty: JumpHopDifficulty;
+  stylePreset: JumpHopStylePreset;
+  characterPrompt: string;
+  tilePrompt: string;
+  endMoodPrompt: string | null;
+  characterAsset: JumpHopCharacterAsset | null;
+  tileAtlasAsset: JumpHopCharacterAsset | null;
+  tileAssets: JumpHopTileAsset[];
+  path: JumpHopPath | null;
+  coverComposite: string | null;
+  generationStatus: JumpHopGenerationStatus;
+}
+
+export interface JumpHopSessionSnapshotResponse {
+  sessionId: string;
+  ownerUserId: string;
+  status: JumpHopGenerationStatus;
+  draft: JumpHopDraftResponse | null;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export interface JumpHopSessionResponse {
+  session: JumpHopSessionSnapshotResponse;
+}
+
+export interface JumpHopActionResponse {
+  actionType: JumpHopActionType;
+  session: JumpHopSessionSnapshotResponse;
+  work: JumpHopWorkProfileResponse | null;
+}
+
+export interface JumpHopWorkSummaryResponse {
+  runtimeKind: 'jump-hop';
+  workId: string;
+  profileId: string;
+  ownerUserId: string;
+  sourceSessionId: string | null;
+  workTitle: string;
+  workDescription: string;
+  themeTags: string[];
+  difficulty: JumpHopDifficulty;
+  stylePreset: JumpHopStylePreset;
+  coverImageSrc: string | null;
+  publicationStatus: string;
+  playCount: number;
+  updatedAt: string;
+  publishedAt: string | null;
+  publishReady: boolean;
+  generationStatus: JumpHopGenerationStatus;
+}
+
+export interface JumpHopWorkProfileResponse {
+  summary: JumpHopWorkSummaryResponse;
+  draft: JumpHopDraftResponse;
+  path: JumpHopPath;
+  characterAsset: JumpHopCharacterAsset;
+  tileAtlasAsset: JumpHopCharacterAsset;
+  tileAssets: JumpHopTileAsset[];
+}
+
+export interface JumpHopWorksResponse {
+  items: JumpHopWorkSummaryResponse[];
+}
+
+export interface JumpHopWorkDetailResponse {
+  item: JumpHopWorkProfileResponse;
+}
+
+export interface JumpHopWorkMutationResponse {
+  item: JumpHopWorkProfileResponse;
+}
+
+export interface JumpHopGalleryCardResponse {
+  publicWorkCode: string;
+  workId: string;
+  profileId: string;
+  ownerUserId: string;
+  authorDisplayName: string;
+  workTitle: string;
+  workDescription: string;
+  coverImageSrc: string | null;
+  themeTags: string[];
+  difficulty: JumpHopDifficulty;
+  stylePreset: JumpHopStylePreset;
+  publicationStatus: string;
+  playCount: number;
+  updatedAt: string;
+  publishedAt: string | null;
+  generationStatus: JumpHopGenerationStatus;
+}
+
+export interface JumpHopGalleryResponse {
+  items: JumpHopGalleryCardResponse[];
+  hasMore: boolean;
+  nextCursor: string | null;
+}
+
+export interface JumpHopGalleryDetailResponse {
+  item: JumpHopWorkProfileResponse;
+}
+
+export interface JumpHopRuntimeRunSnapshotResponse {
+  runId: string;
+  profileId: string;
+  ownerUserId: string;
+  status: JumpHopRunStatus;
+  currentPlatformIndex: number;
+  score: number;
+  combo: number;
+  path: JumpHopPath;
+  lastJump: JumpHopLastJump | null;
+  startedAtMs: number;
+  finishedAtMs: number | null;
+}
+
+export interface JumpHopRunResponse {
+  run: JumpHopRuntimeRunSnapshotResponse;
+}
+
+export interface JumpHopStartRunRequest {
+  profileId: string;
+}
+
+export interface JumpHopJumpRequest {
+  chargeMs: number;
+  clientEventId: string;
+}
+
+export interface JumpHopRestartRunRequest {
+  clientActionId: string;
+}
+
+export interface JumpHopJumpResponse {
+  run: JumpHopRuntimeRunSnapshotResponse;
+}

packages/shared/src/contracts/match3dWorks.ts

@@ -19,8 +19,17 @@ export type Match3DGeneratedItemSize = '大' | '中' | '小' | string;
 
 export interface Match3DGeneratedBackgroundAsset {
   prompt: string;
+  levelScenePrompt?: string | null;
+  levelSceneImageSrc?: string | null;
+  levelSceneImageObjectKey?: string | null;
   imageSrc?: string | null;
   imageObjectKey?: string | null;
+  uiSpritesheetPrompt?: string | null;
+  uiSpritesheetImageSrc?: string | null;
+  uiSpritesheetImageObjectKey?: string | null;
+  itemSpritesheetPrompt?: string | null;
+  itemSpritesheetImageSrc?: string | null;
+  itemSpritesheetImageObjectKey?: string | null;
   containerPrompt?: string | null;
   containerImageSrc?: string | null;
   containerImageObjectKey?: string | null;

packages/shared/src/contracts/puzzleAgentActions.ts

@@ -52,6 +52,8 @@ export type PuzzleAgentActionRequest =
       pictureDescription?: string;
       referenceImageSrc?: string | null;
       referenceImageSrcs?: string[];
+      referenceImageAssetObjectId?: string | null;
+      referenceImageAssetObjectIds?: string[];
       imageModel?: string | null;
       aiRedraw?: boolean;
     }
@@ -63,6 +65,8 @@ export type PuzzleAgentActionRequest =
       pictureDescription?: string;
       referenceImageSrc?: string | null;
       referenceImageSrcs?: string[];
+      referenceImageAssetObjectId?: string | null;
+      referenceImageAssetObjectIds?: string[];
       imageModel?: string | null;
       aiRedraw?: boolean;
       candidateCount?: number;
@@ -73,6 +77,8 @@ export type PuzzleAgentActionRequest =
       promptText?: string | null;
       referenceImageSrc?: string | null;
       referenceImageSrcs?: string[];
+      referenceImageAssetObjectId?: string | null;
+      referenceImageAssetObjectIds?: string[];
       imageModel?: string | null;
       aiRedraw?: boolean;
       candidateCount?: number;

packages/shared/src/contracts/puzzleAgentDraft.ts

@@ -51,6 +51,12 @@ export interface PuzzleDraftLevel {
   uiBackgroundPrompt?: string | null;
   uiBackgroundImageSrc?: string | null;
   uiBackgroundImageObjectKey?: string | null;
+  levelSceneImageSrc?: string | null;
+  levelSceneImageObjectKey?: string | null;
+  uiSpritesheetImageSrc?: string | null;
+  uiSpritesheetImageObjectKey?: string | null;
+  levelBackgroundImageSrc?: string | null;
+  levelBackgroundImageObjectKey?: string | null;
   backgroundMusic?: CreationAudioAsset | null;
   candidates: PuzzleGeneratedImageCandidate[];
   selectedCandidateId: string | null;

packages/shared/src/contracts/puzzleAgentSession.ts

@@ -51,6 +51,8 @@ export interface CreatePuzzleAgentSessionRequest {
   pictureDescription?: string;
   referenceImageSrc?: string | null;
   referenceImageSrcs?: string[];
+  referenceImageAssetObjectId?: string | null;
+  referenceImageAssetObjectIds?: string[];
   imageModel?: string | null;
   aiRedraw?: boolean;
 }

packages/shared/src/contracts/puzzleRuntimeSession.ts

@@ -59,6 +59,10 @@ export interface PuzzleRuntimeLevelSnapshot {
   coverImageSrc: string | null;
   uiBackgroundImageSrc?: string | null;
   uiBackgroundImageObjectKey?: string | null;
+  levelBackgroundImageSrc?: string | null;
+  levelBackgroundImageObjectKey?: string | null;
+  uiSpritesheetImageSrc?: string | null;
+  uiSpritesheetImageObjectKey?: string | null;
   backgroundMusic?: CreationAudioAsset | null;
   board: PuzzleBoardSnapshot;
   status: PuzzleRuntimeLevelStatus;