![](\"/assets/direct-game-background.png\")
",
+ )
+ .expect("index");
+ std::fs::write(root.path().join("game/style.css"), "body {}").expect("style");
+ std::fs::write(
+ root.path().join("game/game.js"),
+ "const player = new Image(); player.src = '/assets/art-spritesheet-slices/player.png'; const target = new Image(); target.src = '/assets/art-spritesheet-slices/blocks-and-targets.png'; const obstacle = new Image(); obstacle.src = '/assets/art-spritesheet-slices/obstacles-and-scene.png'; const feedback = new Image(); feedback.src = '/assets/art-spritesheet-slices/feedback-effects.png'; const ctx = document.querySelector('#game').getContext('2d'); ctx.drawImage(player, 0, 0); ctx.drawImage(target, 1, 1); ctx.drawImage(obstacle, 2, 2); ctx.drawImage(feedback, 3, 3); requestAnimationFrame(()=>{});",
+ )
+ .expect("script");
+
+ let initial_fingerprint = direct_codex_output_fingerprint(root.path());
+ sync_direct_codex_project_outputs_at(root.path(), Some(&initial_fingerprint))
+ .expect("sync outputs");
+
+ let manifest = read_manifest(&root.path().join(".agent/manifest.json")).expect("manifest");
+ assert!(manifest.assets.iter().any(|asset| {
+ asset.local_path == "game/index.html" && asset.media_type == "text/html"
+ }));
+ assert!(manifest.assets.iter().any(|asset| {
+ asset.local_path == "game/style.css" && asset.media_type == "text/css"
+ }));
+ assert!(manifest.assets.iter().any(|asset| {
+ asset.local_path == "game/game.js" && asset.media_type == "text/javascript"
+ }));
+ assert_eq!(
+ manifest
+ .tasks
+ .iter()
+ .find(|task| task.id == "code-prototype")
+ .map(|task| task.status.clone()),
+ Some(GameCreationAppTaskStatus::Completed)
+ );
+ assert_eq!(manifest.versions.len(), 1);
+ assert_eq!(manifest.versions[0].version_id, "initial-1");
+ assert_eq!(manifest.versions[0].project_revision, 1);
+ assert_eq!(manifest.versions[0].resource_bindings.len(), 6);
+ for expected_path in DIRECT_CODEX_ART_ASSET_PATHS {
+ assert!(manifest.versions[0]
+ .resource_bindings
+ .iter()
+ .any(|binding| {
+ manifest
+ .assets
+ .iter()
+ .find(|asset| asset.id == binding.resource_id)
+ .is_some_and(|asset| asset.local_path == expected_path)
+ }));
+ }
+
+ let first_asset_ids = manifest
+ .assets
+ .iter()
+ .map(|asset| asset.id.clone())
+ .collect::",
+ )
+ .expect("index");
+ std::fs::write(root.path().join("game/style.css"), "body {}").expect("style");
+ std::fs::write(
+ root.path().join("game/game.js"),
+ "const sprite = new Image(); sprite.src = '/assets/art-spritesheet-slices/player.png';",
+ )
+ .expect("script");
+
+ let error = sync_direct_codex_project_outputs_at(root.path(), None)
+ .expect_err("non-rendered spritesheet must block completion");
+ assert!(error.contains("未在实际渲染中同时使用陶泥儿背景图"));
+ let manifest = read_manifest(&root.path().join(".agent/manifest.json")).expect("manifest");
+ assert!(manifest
+ .assets
+ .iter()
+ .all(|asset| !asset.local_path.starts_with("game/")));
+ }
+
+ #[test]
+ fn direct_taonier_art_package_rejects_missing_required_slice() {
+ let root = tempfile::tempdir().expect("temp dir");
+ init_local_game_project_at(root.path(), "direct-sync-project", "直连产物同步")
+ .expect("init project");
+ register_direct_taonier_art_package_fixture(root.path());
+ std::fs::remove_file(root.path().join(DIRECT_CODEX_SPRITESHEET_SLICE_PATHS[2].1))
+ .expect("remove required slice");
+
+ assert!(!direct_taonier_art_package_is_valid(root.path()));
+ }
+}
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/generation.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/generation.rs
index 7d8bb5289..a14024431 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/generation.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/generation.rs
@@ -58,10 +58,12 @@ pub(crate) use canvas_generation::request_platform_art_asset_with_options_for_te
#[allow(unused_imports)]
pub(crate) use canvas_generation::{
build_platform_art_asset_prompt, editor_api_key_is_configured, generate_platform_art_asset_at,
- maybe_generate_platform_art_asset_step, needs_platform_art_asset_generation,
- platform_art_asset_art_spec, platform_art_asset_output_extension_matches,
- prepare_platform_art_asset_output_path, project_canvas_asset_media_types,
- role_has_canvas_assets, suggested_canvas_tool_call, PlatformArtAssetGenerationOptions,
+ generate_platform_art_asset_with_options_at,
+ generate_platform_art_asset_with_required_slices_at, maybe_generate_platform_art_asset_step,
+ needs_platform_art_asset_generation, platform_art_asset_art_spec,
+ platform_art_asset_output_extension_matches, prepare_platform_art_asset_output_path,
+ project_canvas_asset_media_types, role_has_canvas_assets, suggested_canvas_tool_call,
+ PlatformArtAssetGenerationOptions,
};
#[allow(unused_imports)]
pub(crate) use draft_validation::{
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/generation/canvas_generation.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/generation/canvas_generation.rs
index 0fe8bab76..24069166f 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/generation/canvas_generation.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/generation/canvas_generation.rs
@@ -430,7 +430,8 @@ pub(crate) async fn external_editor_json_request(
.map_err(|error| format!("{action}失败：{error}"))?;
let status = response.status();
if !status.is_success() {
- return Err(format!("{action}失败：HTTP {}", status.as_u16()));
+ let body = response.text().await.unwrap_or_default();
+ return Err(format_external_http_error(action, status, &body));
}
response
.json::
- {professionalPendingAction ? (
+ {professionalPendingAction && !readOnly ? (
) : mode === 'resources' ? (
@@ -3693,41 +3707,6 @@ export default function ProjectDevelopmentView({
)}
-
) : null}
- {userInputRequest ? (
+ {userInputRequest && !readOnly ? (
;
type ProjectSupervisorViewProps = RuntimePanelProps & {
chatInput: string;
+ directCodex?: boolean;
hiddenConversationCount: number;
needsUserInput: boolean;
onCancelConfirmation: () => void;
@@ -44,6 +45,7 @@ type ProjectSupervisorViewProps = RuntimePanelProps & {
export function ProjectSupervisorView({
chatInput,
+ directCodex = false,
hiddenConversationCount,
needsUserInput,
onCancelConfirmation,
@@ -99,7 +101,9 @@ export function ProjectSupervisorView({
) : null}
- 待回答问题未能读取，请稍后重试。
diff --git a/apps/ai-game-creator-shell/src/features/app-shell/WorkspaceLauncher.tsx b/apps/ai-game-creator-shell/src/features/app-shell/WorkspaceLauncher.tsx index ca97b8d2d..5ba4ce45b 100644 --- a/apps/ai-game-creator-shell/src/features/app-shell/WorkspaceLauncher.tsx +++ b/apps/ai-game-creator-shell/src/features/app-shell/WorkspaceLauncher.tsx @@ -62,7 +62,6 @@ export function WorkspaceLauncherShell({ activeProjectAgentResults, setAgentResults: setActiveProjectAgentResults, resetLauncherHomeDraft, - createHomeDraft, createHomeDraftAutomatically, openProject, } = homeProject; @@ -259,7 +258,6 @@ export function WorkspaceLauncherShell({ onStatusChange={setStatus} homeAgentModeItems={homeAgentModeItems} recentProjectRows={recentProjectRows} - onCreateDraft={createHomeDraft} onCreateDraftAutomatically={createHomeDraftAutomatically} onProjectsOpen={() => setLauncherView('projects')} onProjectOpen={(path) => { @@ -300,6 +298,7 @@ export function WorkspaceLauncherShell({ initialProjectPath={currentProjectContext.projectPath} initialProjectManifest={currentProjectContext.manifest} initialProjectKind={currentProjectContext.projectKind} + initialSupervisorMessage={currentProjectContext.initialPrompt} orchestrationMode="single-supervisor" projectSupervisorOnly onManifestChange={syncActiveProjectManifest} diff --git a/apps/ai-game-creator-shell/src/features/app-shell/model.ts b/apps/ai-game-creator-shell/src/features/app-shell/model.ts index cd73c7a55..8bf9982b1 100644 --- a/apps/ai-game-creator-shell/src/features/app-shell/model.ts +++ b/apps/ai-game-creator-shell/src/features/app-shell/model.ts @@ -35,6 +35,7 @@ export type ProjectSupervisorComponentProps = { initialProjectPath?: string; initialProjectManifest?: GameCreationAppManifest; initialProjectKind?: 'web' | 'godot'; + initialSupervisorMessage?: string; orchestrationMode?: 'single-supervisor' | 'professional-dag'; projectSupervisorOnly?: boolean; onManifestChange?: ( diff --git a/apps/ai-game-creator-shell/src/features/app-shell/useHomeProjectCreation.ts b/apps/ai-game-creator-shell/src/features/app-shell/useHomeProjectCreation.ts index 27c66e43c..2eaef631f 100644 --- a/apps/ai-game-creator-shell/src/features/app-shell/useHomeProjectCreation.ts +++ b/apps/ai-game-creator-shell/src/features/app-shell/useHomeProjectCreation.ts @@ -34,11 +34,7 @@ import type { ProjectAgentResultSummary, ProjectAgentRuntimeSummary, } from '../../view/project-development'; -import { - ensureProjectSupervisorActiveSessionId, - projectNameFromPath, - submitProjectSupervisorRuntimeTask, -} from '../agent-runtime'; +import { projectNameFromPath } from '../agent-runtime'; import { isAbsoluteProjectPath, projectPathHasControlCharacter, @@ -174,22 +170,11 @@ export function useHomeProjectCreation({ result.projectPath, attachments, ); - const sessionId = await ensureProjectSupervisorActiveSessionId( - invoke, - result.projectPath, + const conversationContent = buildHomeConversationContent( + mode, + prompt, + attachments, ); - if (!sessionId) { - throw new Error('项目总控 Agent active Session 不可用'); - } - await submitProjectSupervisorRuntimeTask({ - invoke, - projectPath: result.projectPath, - sessionId, - prompt: buildHomeConversationContent(mode, prompt, attachments), - runtime: null, - runProfile: 'autonomous-game-build', - source: 'project-supervisor-game-chat', - }); enterProjectDevelopment({ projectPath: result.projectPath, projectName: @@ -202,7 +187,7 @@ export function useHomeProjectCreation({ ), mode, initialPrompt: - prompt.trim() || + conversationContent.trim() || (attachments.length > 0 ? '用户上传了参考附件，等待后续补充需求。' : ''), @@ -265,7 +250,7 @@ export function useHomeProjectCreation({ prompt, attachments, ); - setStatus('已创建项目并交给项目总控 Agent'); + setStatus('已创建项目，正在开始智能创作'); } catch (error) { throw new Error( `项目已创建；首条需求投递失败：${ @@ -291,11 +276,11 @@ export function useHomeProjectCreation({ if (!invoke) { throw new Error('需要在 Tauri App 内运行'); } - setStatus('正在启动项目总控 Agent'); + setStatus('正在启动智能创作'); try { await enterCreatedHomeProject(invoke, result, mode, prompt, attachments); - setStatus('已自动创建工作区并开始工作'); - return '已自动创建工作区并开始工作'; + setStatus('已自动创建工作区并开始智能创作'); + return '已自动创建工作区并开始智能创作'; } catch (error) { const message = `工作区已创建；首条需求投递失败：${ error instanceof Error ? error.message : String(error) diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx index 630a38b88..0e3fdcaa8 100644 --- a/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx +++ b/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx @@ -26,6 +26,7 @@ type RuntimePanelProps = ComponentProps
@@ -120,7 +124,11 @@ export function ProjectSupervisorView({
disabled={runtimePanelProps.controlBusy || needsUserInput}
rows={3}
value={chatInput}
- placeholder="告诉项目总控接下来要做什么"
+ placeholder={
+ directCodex
+ ? '告诉陶泥儿接下来要做什么'
+ : '告诉项目总控接下来要做什么'
+ }
onChange={(event) => onChatInputChange(event.currentTarget.value)}
onKeyDown={(event) => {
if (
diff --git a/apps/ai-game-creator-shell/src/features/runtime-config/RuntimeConfigDialog.tsx b/apps/ai-game-creator-shell/src/features/runtime-config/RuntimeConfigDialog.tsx
index df6e2469e..d8529527a 100644
--- a/apps/ai-game-creator-shell/src/features/runtime-config/RuntimeConfigDialog.tsx
+++ b/apps/ai-game-creator-shell/src/features/runtime-config/RuntimeConfigDialog.tsx
@@ -24,7 +24,6 @@ import {
import { resolveTauriInvoke } from '../../app/tauri';
import {
type GameCreatorAgentLlmConfig,
- type GameCreatorAgentMode,
type GameCreatorAppConfig,
type GameCreatorAppConfigView,
type GameCreatorLlmApiKind,
@@ -69,10 +68,10 @@ const defaultRuntimeConfigDraft: GameCreatorAppConfig = {
agentMode: 'codex_app_server',
llm: {
apiKey: '',
- baseUrl: 'https://api.openai.com/v1',
- model: 'gpt-4.1',
+ baseUrl: 'https://dev.genarrative.world/gpt/v1',
+ model: 'gpt-5.6-sol',
apiKind: 'openai_responses',
- reasoningEffort: 'high',
+ reasoningEffort: 'max',
stream: false,
webSearchEnabled: false,
contextWindowTokens: 128000,
@@ -90,14 +89,13 @@ const defaultRuntimeConfigDraft: GameCreatorAppConfig = {
mcpServers: {},
};
-const runtimeAgentModes = new Set([
- 'codex_app_server',
- 'codex_cli',
- 'provider',
-]);
-
type RuntimeSettingsSection = 'general' | 'agents' | 'connections' | 'advanced';
+type RuntimeConfigToast = {
+ tone: 'success' | 'error';
+ message: string;
+};
+
const runtimeSettingsSections = [
{
id: 'general',
@@ -579,6 +577,8 @@ export function RuntimeConfigDialog({
}) {
const [runtimeConfigPath, setRuntimeConfigPath] = useState('');
const [runtimeConfigStatus, setRuntimeConfigStatus] = useState('未读取');
+ const [runtimeConfigToast, setRuntimeConfigToast] =
+ useState(null);
const [runtimeConfigDraft, setRuntimeConfigDraft] =
useState(defaultRuntimeConfigDraft);
const [runtimeConfigBusy, setRuntimeConfigBusy] = useState(false);
@@ -615,10 +615,6 @@ export function RuntimeConfigDialog({
}));
}
- function updateRuntimeAgentMode(agentMode: GameCreatorAgentMode) {
- setRuntimeConfigDraft((current) => ({ ...current, agentMode }));
- }
-
function updateRuntimeLlmProviderPreset(
presetId: RuntimeLlmProviderPresetId,
) {
@@ -830,10 +826,12 @@ export function RuntimeConfigDialog({
runtimeConfigBusyRef.current = true;
setRuntimeConfigBusy(true);
+ setRuntimeConfigToast(null);
setRuntimeConfigStatus('正在保存');
try {
const config = normalizeRuntimeConfigDraft({
...runtimeConfigDraft,
+ agentMode: 'codex_app_server',
mcpServers: materializeRuntimeMcpServers(
runtimeConfigDraft.mcpServers,
mcpStructuredDrafts,
@@ -851,11 +849,20 @@ export function RuntimeConfigDialog({
);
setMcpCatalog(null);
setRuntimeConfigStatus(`已保存：${result.path}`);
+ setRuntimeConfigToast({
+ tone: 'success',
+ message: '保存成功，新的运行时配置已生效',
+ });
onLog?.('runtime_config.save');
} catch (error) {
+ const message = error instanceof Error ? error.message : String(error);
setRuntimeConfigStatus(
- error instanceof Error ? error.message : String(error),
+ message,
);
+ setRuntimeConfigToast({
+ tone: 'error',
+ message: `保存失败：${message}`,
+ });
} finally {
runtimeConfigBusyRef.current = false;
setRuntimeConfigBusy(false);
@@ -933,6 +940,24 @@ export function RuntimeConfigDialog({
role="presentation"
onMouseDown={(event) => closeDialogOnBackdropMouseDown(event, onClose)}
>
+ {runtimeConfigToast ? (
+
);
}
- if (kind === 'document' && documentSummary) {
+ if ((kind === 'document' || kind === 'code') && documentSummary) {
return (
{documentSummary}
@@ -724,8 +726,6 @@ export default function ProjectDevelopmentView({
const [approvalDialogOpen, setApprovalDialogOpen] = useState(false);
const [approvalNotice, setApprovalNotice] = useState('');
const [showAllAgentGroups, setShowAllAgentGroups] = useState(false);
- const [runPlaying, setRunPlaying] = useState(false);
- const [activeSlice, setActiveSlice] = useState(0);
const [mediaDuration, setMediaDuration] = useState(null);
const [focusedAudioPlayIdentity, setFocusedAudioPlayIdentity] = useState<
string | null
@@ -3302,6 +3302,20 @@ export default function ProjectDevelopmentView({
)}
) : null}
+ {focusedResource.category === 'code' ? (
+
+ {runtimeConfigToast.tone === 'error' ? (
+
+ ) : (
+
+ )}
+ {runtimeConfigToast.message}
+
+ ) : null}
+ {focusedResourceCardPreview.status === 'loaded' &&
+ focusedResourceCardPreview.preview.content !== undefined ? (
+
+ ) : null}
+ {focusedResourceCardPreview.preview.content}
+
+ ) : focusedResourceCardPreview.status === 'failed' ? (
+ {focusedResourceCardPreview.error}
+ ) : ( +正在载入游戏代码…
+ )} +
-
-
- {`测试切片 ${activeSlice + 1}`}
-
-
与陶泥儿的对话
- 项目总控 Agent
+
+ {professionalDagVisible ? '项目总控 Agent' : '智能创作'}
+
{professionalDagVisible ? (