Compare commits
45 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3fc3399032 | |||
| 9a21690fe9 | |||
| deff6319e2 | |||
| 2257a78d6b | |||
| a0f6b7c67d | |||
| ee33af7b75 | |||
| be370cc615 | |||
| 21b059bd41 | |||
| 2d90b73b94 | |||
| cd8f480719 | |||
| 2ffccb844c | |||
| 1bd153d7f2 | |||
| f5a333b839 | |||
| 20b1fd63de | |||
| 105591bac5 | |||
| da44d66dc8 | |||
| 0a85c4f87e | |||
| efce7b102f | |||
| db5edc948c | |||
| 45c3780bf5 | |||
| 6fcf42e4ac | |||
| e0f9f811b7 | |||
| 03b5c1c9f4 | |||
| 58992330aa | |||
| 2c687b01a4 | |||
| c0e377f479 | |||
| 6001b87215 | |||
| b08ab6ee66 | |||
| 7f80012d7f | |||
| fbe95591d5 | |||
| d222aad2ec | |||
| 13b28ebbc7 | |||
| 30648e6b93 | |||
| 9dd1052374 | |||
| aec9568c39 | |||
| 0a1f0e0b26 | |||
| 5c31ae91ca | |||
| 3ba6168c6a | |||
| 2628b83d4b | |||
| a7b2b0e23b | |||
| ef982fdb78 | |||
| 91b65f94ca | |||
| 70513cf049 | |||
| 87aed0b765 | |||
| 733a7015af |
@@ -221,8 +221,7 @@ jobs:
|
|||||||
- name: Run AI game creator shell agent-run smoke
|
- name: Run AI game creator shell agent-run smoke
|
||||||
run: npm run check:native-shells:agc-rust-smoke
|
run: npm run check:native-shells:agc-rust-smoke
|
||||||
|
|
||||||
# AGC 壳依赖的共享 / 平台 crate 测试用的是 server-rs workspace 与两个无锁独立 crate
|
# AGC 壳依赖的共享 / 平台和编辑器插件 crate 各自预热独立 manifest,再运行对应测试。
|
||||||
# 的 manifest,属另一套依赖图,因此单独一个 job 预热、单独跑。
|
|
||||||
ai-game-creator-shell-rust-crates:
|
ai-game-creator-shell-rust-crates:
|
||||||
name: AI game creator shell Rust crates
|
name: AI game creator shell Rust crates
|
||||||
runs-on: genarrative-ci
|
runs-on: genarrative-ci
|
||||||
@@ -263,13 +262,15 @@ jobs:
|
|||||||
# `cargo test --manifest-path` 单独跑这两个 crate。不在这里预热的话,这两条测试
|
# `cargo test --manifest-path` 单独跑这两个 crate。不在这里预热的话,这两条测试
|
||||||
# 会在测试阶段自己 `Updating crates.io index`,crates.io 一抖动整条 job 就红
|
# 会在测试阶段自己 `Updating crates.io index`,crates.io 一抖动整条 job 就红
|
||||||
# (见 #327 / PR #316 run 1950)。
|
# (见 #327 / PR #316 run 1950)。
|
||||||
# 两个 crate 都没有提交 Cargo.lock,所以这里只能做不带锁标志的 fetch:
|
# Cocos 插件也使用独立且未提交的锁文件,一并预热。
|
||||||
|
# 这些 crate 都没有提交 Cargo.lock,所以这里只能做不带锁标志的 fetch:
|
||||||
# 加锁标志会因为缺少锁文件直接失败。生成的 Cargo.lock 落在两个 crate 目录内,
|
# 加锁标志会因为缺少锁文件直接失败。生成的 Cargo.lock 落在两个 crate 目录内,
|
||||||
# 已被各自的 .gitignore 忽略,只留在容器里;随后的测试阶段因此能用锁定版本
|
# 已被各自的 .gitignore 忽略,只留在容器里;随后的测试阶段因此能用锁定版本
|
||||||
# 解析,不再触碰 registry index。
|
# 解析,不再触碰 registry index。
|
||||||
for manifest_path in \
|
for manifest_path in \
|
||||||
server-rs/crates/agent-runtime-core/Cargo.toml \
|
server-rs/crates/agent-runtime-core/Cargo.toml \
|
||||||
server-rs/crates/agent-runtime-orchestration/Cargo.toml; do
|
server-rs/crates/agent-runtime-orchestration/Cargo.toml \
|
||||||
|
plugins/agc-cocos-editor/native/cocos-editor-bridge/Cargo.toml; do
|
||||||
for attempt in $(seq 1 5); do
|
for attempt in $(seq 1 5); do
|
||||||
if cargo fetch \
|
if cargo fetch \
|
||||||
--target x86_64-unknown-linux-gnu \
|
--target x86_64-unknown-linux-gnu \
|
||||||
@@ -284,6 +285,23 @@ jobs:
|
|||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
|
- name: Prepare Unity plugin Rust dependencies
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
for attempt in $(seq 1 5); do
|
||||||
|
if cargo fetch --locked \
|
||||||
|
--target x86_64-unknown-linux-gnu \
|
||||||
|
--manifest-path plugins/agc-unity-editor/native/unity-editor-bridge/Cargo.toml; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
if [[ "${attempt}" -eq 5 ]]; then
|
||||||
|
echo 'Unity plugin Cargo dependency fetch failed after 5 attempts.' >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
sleep $((attempt * 2))
|
||||||
|
done
|
||||||
|
|
||||||
- name: Run AI game creator shell shared crate gates
|
- name: Run AI game creator shell shared crate gates
|
||||||
run: npm run check:native-shells:agc-rust-crates
|
run: npm run check:native-shells:agc-rust-crates
|
||||||
|
|
||||||
|
|||||||
@@ -48,6 +48,10 @@ temp*build*/
|
|||||||
/apps/ai-game-creator-shell/src-tauri/resources/codex/mac-native/manifest.json
|
/apps/ai-game-creator-shell/src-tauri/resources/codex/mac-native/manifest.json
|
||||||
/apps/ai-game-creator-shell/src-tauri/resources/codex/mac-native/NOTICE.md
|
/apps/ai-game-creator-shell/src-tauri/resources/codex/mac-native/NOTICE.md
|
||||||
/plugins/agc-cocos-editor/native/payload/
|
/plugins/agc-cocos-editor/native/payload/
|
||||||
|
/plugins/agc-unity-editor/dotnet/**/bin/
|
||||||
|
/plugins/agc-unity-editor/dotnet/**/obj/
|
||||||
|
/plugins/agc-unity-editor/dotnet/publish/
|
||||||
|
/plugins/agc-unity-editor/dotnet/native-build/
|
||||||
/apps/ai-game-creator-shell/logs/
|
/apps/ai-game-creator-shell/logs/
|
||||||
/apps/ai-game-creator-shell/.llm-drafts/
|
/apps/ai-game-creator-shell/.llm-drafts/
|
||||||
/apps/ai-game-creator-shell/game-creator.config.local.json
|
/apps/ai-game-creator-shell/game-creator.config.local.json
|
||||||
|
|||||||
@@ -105,6 +105,7 @@ export const agcReleasePathPatterns = [
|
|||||||
'packages/',
|
'packages/',
|
||||||
'server-rs/crates/',
|
'server-rs/crates/',
|
||||||
'plugins/agc-cocos-editor/',
|
'plugins/agc-cocos-editor/',
|
||||||
|
'plugins/agc-unity-editor/',
|
||||||
'apps/desktop-shell/src-tauri/icons/',
|
'apps/desktop-shell/src-tauri/icons/',
|
||||||
'package.json',
|
'package.json',
|
||||||
'package-lock.json',
|
'package-lock.json',
|
||||||
|
|||||||
@@ -344,7 +344,11 @@ test('Windows remains the default and explicit Windows overrides macOS environme
|
|||||||
context,
|
context,
|
||||||
{
|
{
|
||||||
spawn: (_binary, command) => {
|
spawn: (_binary, command) => {
|
||||||
assert.ok(command.includes('--features=cocos-editor-execute'));
|
assert.ok(
|
||||||
|
command.includes(
|
||||||
|
'--features=cocos-editor-execute,unity-editor-execute',
|
||||||
|
),
|
||||||
|
);
|
||||||
assert.ok(command.includes('user-config.json'));
|
assert.ok(command.includes('user-config.json'));
|
||||||
const configIndex = command.lastIndexOf('--config');
|
const configIndex = command.lastIndexOf('--config');
|
||||||
const config = JSON.parse(
|
const config = JSON.parse(
|
||||||
|
|||||||
@@ -19,6 +19,6 @@ export function withDefaultCargoFeatures(argv, features) {
|
|||||||
|
|
||||||
export function defaultEditorFeatures(target) {
|
export function defaultEditorFeatures(target) {
|
||||||
return target === 'win32' || target.includes('windows')
|
return target === 'win32' || target.includes('windows')
|
||||||
? ['cocos-editor-execute']
|
? ['cocos-editor-execute', 'unity-editor-execute']
|
||||||
: [];
|
: [];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ test('Windows release includes the same editor feature as development', () => {
|
|||||||
buildTauriBuildArguments([], 'x86_64-pc-windows-msvc', 'win32'),
|
buildTauriBuildArguments([], 'x86_64-pc-windows-msvc', 'win32'),
|
||||||
[
|
[
|
||||||
'build',
|
'build',
|
||||||
'--features=cocos-editor-execute',
|
'--features=cocos-editor-execute,unity-editor-execute',
|
||||||
'--target',
|
'--target',
|
||||||
'x86_64-pc-windows-msvc',
|
'x86_64-pc-windows-msvc',
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -143,7 +143,6 @@ const allowedUncalledTauriCommands = [
|
|||||||
'reload_agc_plugin',
|
'reload_agc_plugin',
|
||||||
'call_agc_plugin',
|
'call_agc_plugin',
|
||||||
'read_agc_plugin_panel',
|
'read_agc_plugin_panel',
|
||||||
'set_agc_plugin_project_path',
|
|
||||||
'set_agc_plugin_enabled',
|
'set_agc_plugin_enabled',
|
||||||
];
|
];
|
||||||
const sourceExtensions = new Set([
|
const sourceExtensions = new Set([
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
import { resolve } from 'node:path';
|
import { resolve } from 'node:path';
|
||||||
import { fileURLToPath } from 'node:url';
|
import { fileURLToPath } from 'node:url';
|
||||||
|
|
||||||
import { withDefaultCargoFeatures } from './cargo-features.mjs';
|
import {
|
||||||
|
defaultEditorFeatures,
|
||||||
|
withDefaultCargoFeatures,
|
||||||
|
} from './cargo-features.mjs';
|
||||||
import {
|
import {
|
||||||
readAgcDevEndpoint,
|
readAgcDevEndpoint,
|
||||||
resolveAgcDevEndpoint,
|
resolveAgcDevEndpoint,
|
||||||
@@ -47,9 +50,8 @@ function buildTauriArguments(argv, devUrl = readAgcDevEndpoint().url) {
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
// `agc_cocos_execute` 与 Cocos 编辑器适配器只在 `cocos-editor-execute` feature 下
|
// 开发和发行构建使用同一平台编辑器 feature 集合。
|
||||||
// 注册。开发构建默认在 Windows 打开它,否则 Agent 的工具清单里根本没有该工具,
|
// 可用 AGC_DEV_CARGO_FEATURES(逗号分隔)覆盖,传空串即关闭。
|
||||||
// 只能退化成改写脚本。可用 AGC_DEV_CARGO_FEATURES(逗号分隔)覆盖,传空串即关闭。
|
|
||||||
function readDevCargoFeatures(env = process.env) {
|
function readDevCargoFeatures(env = process.env) {
|
||||||
const override = env.AGC_DEV_CARGO_FEATURES;
|
const override = env.AGC_DEV_CARGO_FEATURES;
|
||||||
if (override !== undefined) {
|
if (override !== undefined) {
|
||||||
@@ -58,7 +60,7 @@ function readDevCargoFeatures(env = process.env) {
|
|||||||
.map((value) => value.trim())
|
.map((value) => value.trim())
|
||||||
.filter(Boolean);
|
.filter(Boolean);
|
||||||
}
|
}
|
||||||
return process.platform === 'win32' ? ['cocos-editor-execute'] : [];
|
return defaultEditorFeatures(process.platform);
|
||||||
}
|
}
|
||||||
|
|
||||||
function withDevCargoFeatures(argv, features = readDevCargoFeatures()) {
|
function withDevCargoFeatures(argv, features = readDevCargoFeatures()) {
|
||||||
|
|||||||
+11
@@ -1793,6 +1793,7 @@ dependencies = [
|
|||||||
"ttf-parser",
|
"ttf-parser",
|
||||||
"typed_floats",
|
"typed_floats",
|
||||||
"unicode-normalization",
|
"unicode-normalization",
|
||||||
|
"unity-editor-bridge",
|
||||||
"url",
|
"url",
|
||||||
"uuid",
|
"uuid",
|
||||||
"windows-sys 0.61.2",
|
"windows-sys 0.61.2",
|
||||||
@@ -6407,6 +6408,16 @@ version = "0.2.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
|
checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "unity-editor-bridge"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"editor-adapter-api",
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
"windows-sys 0.61.2",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unsafe-libyaml"
|
name = "unsafe-libyaml"
|
||||||
version = "0.2.11"
|
version = "0.2.11"
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ template-library-fixtures = []
|
|||||||
cocos-editor = ["cocos-editor-bridge/process-discovery"]
|
cocos-editor = ["cocos-editor-bridge/process-discovery"]
|
||||||
cocos-editor-execute = ["cocos-editor", "cocos-editor-bridge/windows-bootstrap"]
|
cocos-editor-execute = ["cocos-editor", "cocos-editor-bridge/windows-bootstrap"]
|
||||||
cocos-editor-injection = ["cocos-editor-execute", "cocos-editor-bridge/windows-injection"]
|
cocos-editor-injection = ["cocos-editor-execute", "cocos-editor-bridge/windows-injection"]
|
||||||
|
unity-editor-execute = []
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
serde = { version = "1", features = ["derive"] }
|
serde = { version = "1", features = ["derive"] }
|
||||||
@@ -27,6 +28,7 @@ nalgebra = { version = "0.35.0", features = ["serde-serialize"] }
|
|||||||
agent-runtime-core = { path = "../../../server-rs/crates/agent-runtime-core" }
|
agent-runtime-core = { path = "../../../server-rs/crates/agent-runtime-core" }
|
||||||
cocos-editor-bridge = { path = "../../../plugins/agc-cocos-editor/native/cocos-editor-bridge", default-features = false }
|
cocos-editor-bridge = { path = "../../../plugins/agc-cocos-editor/native/cocos-editor-bridge", default-features = false }
|
||||||
editor-adapter-api = { path = "../../../server-rs/crates/editor-adapter-api" }
|
editor-adapter-api = { path = "../../../server-rs/crates/editor-adapter-api" }
|
||||||
|
unity-editor-bridge = { path = "../../../plugins/agc-unity-editor/native/unity-editor-bridge" }
|
||||||
base64 = "0.22"
|
base64 = "0.22"
|
||||||
axum = "0.8"
|
axum = "0.8"
|
||||||
chromiumoxide = "0.9.1"
|
chromiumoxide = "0.9.1"
|
||||||
|
|||||||
@@ -196,6 +196,7 @@ fn main() {
|
|||||||
);
|
);
|
||||||
let manifest_path = manifest_dir.join("prompts/runtime/manifest.json");
|
let manifest_path = manifest_dir.join("prompts/runtime/manifest.json");
|
||||||
stage_bundled_codex_cli(&manifest_dir);
|
stage_bundled_codex_cli(&manifest_dir);
|
||||||
|
prepare_unity_editor_helper(&manifest_dir);
|
||||||
stage_plugin_workspace(&manifest_dir);
|
stage_plugin_workspace(&manifest_dir);
|
||||||
stage_cocos_editor_payload(&manifest_dir);
|
stage_cocos_editor_payload(&manifest_dir);
|
||||||
let compiled = runtime_prompt_bundle::compile_manifest(&manifest_path)
|
let compiled = runtime_prompt_bundle::compile_manifest(&manifest_path)
|
||||||
@@ -266,6 +267,107 @@ fn stage_cocos_editor_payload(manifest_dir: &std::path::Path) {
|
|||||||
#[cfg(not(windows))]
|
#[cfg(not(windows))]
|
||||||
fn stage_cocos_editor_payload(_manifest_dir: &std::path::Path) {}
|
fn stage_cocos_editor_payload(_manifest_dir: &std::path::Path) {}
|
||||||
|
|
||||||
|
/// Unity helper 是插件的随包运行文件。内容指纹避免每次 Cargo 检查都重新发布 .NET。
|
||||||
|
fn prepare_unity_editor_helper(manifest_dir: &std::path::Path) {
|
||||||
|
println!("cargo:rerun-if-env-changed=CARGO_FEATURE_UNITY_EDITOR_EXECUTE");
|
||||||
|
let target = env::var("TARGET").expect("Cargo TARGET");
|
||||||
|
if env::var_os("CARGO_FEATURE_UNITY_EDITOR_EXECUTE").is_none()
|
||||||
|
|| target != "x86_64-pc-windows-msvc"
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let root = manifest_dir.join("../../../plugins/agc-unity-editor/dotnet");
|
||||||
|
let mut sources = Vec::new();
|
||||||
|
collect_unity_helper_sources(&root, &mut sources);
|
||||||
|
sources.sort();
|
||||||
|
let mut fingerprint = Sha256::new();
|
||||||
|
for source in &sources {
|
||||||
|
println!("cargo:rerun-if-changed={}", source.display());
|
||||||
|
fingerprint.update(
|
||||||
|
source
|
||||||
|
.strip_prefix(&root)
|
||||||
|
.expect("helper source")
|
||||||
|
.to_string_lossy()
|
||||||
|
.as_bytes(),
|
||||||
|
);
|
||||||
|
fingerprint.update([0]);
|
||||||
|
fingerprint.update(fs::read(source).expect("读取 Unity helper 源文件失败"));
|
||||||
|
}
|
||||||
|
let fingerprint = format!("{:x}", fingerprint.finalize());
|
||||||
|
let publish = root.join("publish/win-x64");
|
||||||
|
let executable = publish.join("Agc.Unity.Attach.exe");
|
||||||
|
let stamp = publish.join(".agc-source.sha256");
|
||||||
|
println!("cargo:rerun-if-changed={}", executable.display());
|
||||||
|
if unity_helper_publish_complete(&publish)
|
||||||
|
&& fs::read_to_string(&stamp).ok().as_deref() == Some(&fingerprint)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
assert!(
|
||||||
|
cfg!(windows),
|
||||||
|
"构建 Unity 插件 helper 需要 Windows .NET 10 与 x64 C++ 工具链"
|
||||||
|
);
|
||||||
|
let status = std::process::Command::new("powershell.exe")
|
||||||
|
.args([
|
||||||
|
"-NoProfile",
|
||||||
|
"-NonInteractive",
|
||||||
|
"-ExecutionPolicy",
|
||||||
|
"Bypass",
|
||||||
|
"-File",
|
||||||
|
])
|
||||||
|
.arg(root.join("build.ps1"))
|
||||||
|
.current_dir(&root)
|
||||||
|
.status()
|
||||||
|
.expect("无法启动 Unity helper 构建脚本");
|
||||||
|
assert!(
|
||||||
|
status.success() && unity_helper_publish_complete(&publish),
|
||||||
|
"Unity helper 构建失败或缺少运行文件/许可"
|
||||||
|
);
|
||||||
|
fs::write(stamp, fingerprint).expect("写入 Unity helper 构建指纹失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
fn unity_helper_publish_complete(publish: &std::path::Path) -> bool {
|
||||||
|
[
|
||||||
|
"Agc.Unity.Attach.exe",
|
||||||
|
"NOTICE",
|
||||||
|
"THIRD-PARTY-NOTICES.txt",
|
||||||
|
"licenses/DotCraft-Apache-2.0.txt",
|
||||||
|
"licenses/Roslyn-MIT.txt",
|
||||||
|
"licenses/upstream.json",
|
||||||
|
"licenses/dotnet-LICENSE.TXT",
|
||||||
|
"licenses/dotnet-THIRD-PARTY-NOTICES.TXT",
|
||||||
|
"licenses/microsoft.codeanalysis.common-ThirdPartyNotices.rtf",
|
||||||
|
"licenses/microsoft.codeanalysis.csharp-ThirdPartyNotices.rtf",
|
||||||
|
]
|
||||||
|
.iter()
|
||||||
|
.all(|name| {
|
||||||
|
fs::symlink_metadata(publish.join(name)).is_ok_and(|metadata| {
|
||||||
|
metadata.is_file() && !metadata.file_type().is_symlink() && metadata.len() > 0
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn collect_unity_helper_sources(root: &std::path::Path, sources: &mut Vec<PathBuf>) {
|
||||||
|
for entry in fs::read_dir(root)
|
||||||
|
.expect("Unity helper 源码目录缺失")
|
||||||
|
.flatten()
|
||||||
|
{
|
||||||
|
let kind = entry.file_type().expect("读取 Unity helper 源文件类型失败");
|
||||||
|
assert!(!kind.is_symlink(), "Unity helper 源码不允许符号链接");
|
||||||
|
let name = entry.file_name();
|
||||||
|
if kind.is_dir() {
|
||||||
|
if !matches!(
|
||||||
|
name.to_str(),
|
||||||
|
Some("bin" | "obj" | "publish" | "native-build")
|
||||||
|
) {
|
||||||
|
collect_unity_helper_sources(&entry.path(), sources);
|
||||||
|
}
|
||||||
|
} else if kind.is_file() {
|
||||||
|
sources.push(entry.path());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// 把 `plugins/` 工作区里的插件包随包映射到应用资源目录。
|
/// 把 `plugins/` 工作区里的插件包随包映射到应用资源目录。
|
||||||
///
|
///
|
||||||
/// 只复制插件运行需要的清单、入口、面板和 native payload,不复制 native 源码、
|
/// 只复制插件运行需要的清单、入口、面板和 native payload,不复制 native 源码、
|
||||||
@@ -313,9 +415,15 @@ fn stage_plugin_workspace(manifest_dir: &std::path::Path) {
|
|||||||
for relative in [
|
for relative in [
|
||||||
std::path::PathBuf::from("src"),
|
std::path::PathBuf::from("src"),
|
||||||
std::path::PathBuf::from("panels"),
|
std::path::PathBuf::from("panels"),
|
||||||
|
std::path::PathBuf::from("skills"),
|
||||||
std::path::PathBuf::from("native/payload"),
|
std::path::PathBuf::from("native/payload"),
|
||||||
|
std::path::PathBuf::from("dotnet/publish/win-x64"),
|
||||||
] {
|
] {
|
||||||
if relative == std::path::Path::new("native/payload") && !target.contains("windows") {
|
if (relative == std::path::Path::new("native/payload") && !target.contains("windows"))
|
||||||
|
|| (relative == std::path::Path::new("dotnet/publish/win-x64")
|
||||||
|
&& (target != "x86_64-pc-windows-msvc"
|
||||||
|
|| env::var_os("CARGO_FEATURE_UNITY_EDITOR_EXECUTE").is_none()))
|
||||||
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
copy_plugin_tree(&plugin_root.join(&relative), &destination.join(&relative));
|
copy_plugin_tree(&plugin_root.join(&relative), &destination.join(&relative));
|
||||||
|
|||||||
+3
@@ -14,6 +14,9 @@ Implement the user's actual game request in the current project as an npm-manage
|
|||||||
3. Build with the project's npm script before previewing. The playable entry is the package directory's `dist/index.html`; never report an unbuilt bare-module page as playable. Import assets or configure public assets so all runtime media is included in dist; preview and exports cannot read outside it.
|
3. Build with the project's npm script before previewing. The playable entry is the package directory's `dist/index.html`; never report an unbuilt bare-module page as playable. Import assets or configure public assets so all runtime media is included in dist; preview and exports cannot read outside it.
|
||||||
4. Build a complete playable loop: visible objective, responsive input, meaningful state changes, success or failure feedback, and a reliable restart path where the game needs one.
|
4. Build a complete playable loop: visible objective, responsive input, meaningful state changes, success or failure feedback, and a reliable restart path where the game needs one.
|
||||||
5. Fit the active game scene to desktop and mobile viewports without accidental page scrollbars. Reserve deliberate safe space for HUD elements instead of covering interactive content.
|
5. Fit the active game scene to desktop and mobile viewports without accidental page scrollbars. Reserve deliberate safe space for HUD elements instead of covering interactive content.
|
||||||
|
- **画布居中只能由一处负责。** 使用 `Phaser.Scale.FIT` 与 `autoCenter: Phaser.Scale.CENTER_BOTH` 时,canvas 的直接父容器应使用尺寸明确的普通块布局,不再对同一 canvas 叠加 Grid/Flex 居中、`place-items: center`、自动外边距或居中 transform。Phaser 自动计算的 margin 与 CSS 居中叠加会使竖屏画面向右偏移。
|
||||||
|
- 若决定由 CSS 居中,则显式使用 `autoCenter: Phaser.Scale.NO_CENTER`,由 CSS 独立完成定位;外围页面可以继续使用 Grid/Flex,限制只针对同一 canvas 的重复定位。
|
||||||
|
- 出现偏移先检查游戏自身的 CSS 与 Phaser scale 配置,不添加 AGC 预览容器固定偏移补偿。修改布局后重新构建 dist,在桌面、移动及窗口 resize 后检查 canvas 相对游戏父容器居中(误差不超过 1 CSS px)、画面完整且无意外滚动条;不能仅凭 build 成功宣称布局通过。
|
||||||
6. Invoke `taonier-art-assets` for every new game brief that needs visual assets. First reuse suitable registered Taonier art; when the brief's required visual elements are missing or unsuitable, call the reviewed `agc_tools` generation/edit workflow in the same task. After the tool returns, wire its relative paths into the game and verify the rendered result. A game with unused generated assets or placeholder emoji/CSS where requested art should appear is not complete. Load media defensively only for genuinely optional effects, and never relabel a local placeholder as platform art.
|
6. Invoke `taonier-art-assets` for every new game brief that needs visual assets. First reuse suitable registered Taonier art; when the brief's required visual elements are missing or unsuitable, call the reviewed `agc_tools` generation/edit workflow in the same task. After the tool returns, wire its relative paths into the game and verify the rendered result. A game with unused generated assets or placeholder emoji/CSS where requested art should appear is not complete. Load media defensively only for genuinely optional effects, and never relabel a local placeholder as platform art.
|
||||||
7. Let Phaser own the render loop and input dispatch. Avoid duplicate scenes, stale event listeners, and state that survives restart unintentionally.
|
7. Let Phaser own the render loop and input dispatch. Avoid duplicate scenes, stale event listeners, and state that survives restart unintentionally.
|
||||||
8. After a meaningful game change, use the browser playtest Skill and fix issues shown by real evidence before reporting completion.
|
8. After a meaningful game change, use the browser playtest Skill and fix issues shown by real evidence before reporting completion.
|
||||||
|
|||||||
+2
@@ -7,5 +7,7 @@
|
|||||||
- Score, steps, health, timer, or other core state updates consistently.
|
- Score, steps, health, timer, or other core state updates consistently.
|
||||||
- Restart restores all state and does not duplicate timers, animation loops, or event listeners.
|
- Restart restores all state and does not duplicate timers, animation loops, or event listeners.
|
||||||
- Desktop and mobile layouts keep the core scene visible without accidental document scrolling.
|
- Desktop and mobile layouts keep the core scene visible without accidental document scrolling.
|
||||||
|
- 画布的缩放与居中由 Phaser 或 CSS 中的一方独立负责。`FIT + CENTER_BOTH` 不与同一 canvas 父容器的 Grid/Flex 居中、自动外边距或居中 transform 叠加;使用 CSS 居中时关闭 Phaser 自动居中(`NO_CENTER`)。
|
||||||
|
- 在构建后的实际页面检查桌面、移动和 resize:比较 canvas 与游戏父容器的中心,预期居中时水平/垂直误差不超过 1 CSS px,并检查画面没有溢出或意外滚动条。偏移先修游戏 CSS/scale 配置,不用修改 AGC 预览位置掩盖。
|
||||||
- HUD and overlays reserve space and do not cover essential interactive content.
|
- HUD and overlays reserve space and do not cover essential interactive content.
|
||||||
- Requested Taonier art is visibly integrated into the core experience when available.
|
- Requested Taonier art is visibly integrated into the core experience when available.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"schemaVersion": "agc-skill-pack.v1",
|
"schemaVersion": "agc-skill-pack.v1",
|
||||||
"version": "2026-08-26.24",
|
"version": "2026-08-26.25",
|
||||||
"skills": [
|
"skills": [
|
||||||
{
|
{
|
||||||
"name": "agc-game-production-workflow",
|
"name": "agc-game-production-workflow",
|
||||||
@@ -80,7 +80,7 @@
|
|||||||
"agents/openai.yaml",
|
"agents/openai.yaml",
|
||||||
"references/game-quality-checklist.md"
|
"references/game-quality-checklist.md"
|
||||||
],
|
],
|
||||||
"sha256": "05b5cfbf7a40fd303717491f5cea84ff339a73359c9678b283fd54d2b5c45efd"
|
"sha256": "e122d8f3a6d986b594b95c971754d68197bf7896912fa8267d44a7aa129a57ba"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "agc-browser-playtest",
|
"name": "agc-browser-playtest",
|
||||||
|
|||||||
@@ -797,6 +797,16 @@ fn direct_thread_visible_item(
|
|||||||
direct_thread_event_item(root, item)
|
direct_thread_event_item(root, item)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// AGC 预写的 canonical 用户条目 id:`direct-codex:{clientTurnId}:user`。
|
||||||
|
///
|
||||||
|
/// 与 `direct_project_history::is_direct_project_codex_user_item` 的判据同一份口径(前缀 +
|
||||||
|
/// `:user` 后缀)。回合生命周期事件的 `userItemId` 只能来自这里或已落盘条目自身的 id;
|
||||||
|
/// clientTurnId 缺失时不猜身份,返回 `None` 让前端按"未知归属"处理。
|
||||||
|
fn direct_codex_user_item_id_for_client_turn_id(client_turn_id: &str) -> Option<String> {
|
||||||
|
let client_turn_id = client_turn_id.trim();
|
||||||
|
(!client_turn_id.is_empty()).then(|| format!("direct-codex:{client_turn_id}:user"))
|
||||||
|
}
|
||||||
|
|
||||||
fn direct_codex_command_is_game_verification(command: &str) -> bool {
|
fn direct_codex_command_is_game_verification(command: &str) -> bool {
|
||||||
let command = command.to_ascii_lowercase();
|
let command = command.to_ascii_lowercase();
|
||||||
command.contains("game.static_smoke")
|
command.contains("game.static_smoke")
|
||||||
@@ -2927,7 +2937,7 @@ impl CodexAppServerConnection {
|
|||||||
None => direct_project_local_message_item(
|
None => direct_project_local_message_item(
|
||||||
"user",
|
"user",
|
||||||
current_prompt,
|
current_prompt,
|
||||||
Some(&format!("direct-codex:{client_turn_id}:user")),
|
direct_codex_user_item_id_for_client_turn_id(client_turn_id).as_deref(),
|
||||||
)
|
)
|
||||||
.map_err(platform_llm::LlmError::InvalidRequest)?,
|
.map_err(platform_llm::LlmError::InvalidRequest)?,
|
||||||
};
|
};
|
||||||
@@ -3046,13 +3056,30 @@ impl CodexAppServerConnection {
|
|||||||
};
|
};
|
||||||
turn_start_guard.armed = false;
|
turn_start_guard.armed = false;
|
||||||
let direct_thread_id = direct_thread_id_for_project(history_root);
|
let direct_thread_id = direct_thread_id_for_project(history_root);
|
||||||
|
// 回合边界的阶段时间:Turn 上游只有**秒**级 `startedAt` / `completedAt`,秒级截断
|
||||||
|
// 撑不起前端 0.1 秒粒度的展示,也可能让完成时刻落进该轮用户消息的同一秒、落在真实
|
||||||
|
// 发送时间之前,被判成无效边界后整轮新回合被吞掉。因此这里只在宿主处理对应阶段时取
|
||||||
|
// 毫秒钟(与条目侧"没有原生阶段时间就用宿主钟"同一口径),不再读上游秒字段。
|
||||||
|
let direct_turn_started_at_ms = direct_tool_call_now_ms();
|
||||||
|
// 本轮开口用户条目的 canonical id:只从已落盘的那条条目上读身份(`id`,工具条目才用
|
||||||
|
// `call_id`),不在事件侧重造一份。拿不到就留空,让前端按"归属不可证明"处理。
|
||||||
|
let direct_turn_user_item_id = direct_persisted_user_item
|
||||||
|
.as_ref()
|
||||||
|
.and_then(direct_thread_item_identity);
|
||||||
if self.inner.workspace_mode == CodexAppServerWorkspaceMode::DirectProject {
|
if self.inner.workspace_mode == CodexAppServerWorkspaceMode::DirectProject {
|
||||||
append_direct_thread_event(&direct_thread_id, DirectThreadEvent::turn_started());
|
append_direct_thread_event(
|
||||||
|
&direct_thread_id,
|
||||||
|
DirectThreadEvent::turn_started(direct_turn_started_at_ms)
|
||||||
|
.with_user_item_id(direct_turn_user_item_id.as_deref()),
|
||||||
|
);
|
||||||
if let Some(user_item) = direct_persisted_user_item.as_ref() {
|
if let Some(user_item) = direct_persisted_user_item.as_ref() {
|
||||||
if let Some(entry_item) = direct_thread_event_item(history_root, user_item) {
|
if let Some(entry_item) = direct_thread_event_item(history_root, user_item) {
|
||||||
|
// 这里的条目时间可能是启动应答后的观测时间;前端按同一用户条目身份
|
||||||
|
// 保留更早的真实发送时间,不用此事件时间覆盖它。
|
||||||
|
let user_item_at = entry_item.at();
|
||||||
append_direct_thread_event(
|
append_direct_thread_event(
|
||||||
&direct_thread_id,
|
&direct_thread_id,
|
||||||
DirectThreadEvent::item_completed(entry_item),
|
DirectThreadEvent::item_completed(entry_item, user_item_at),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3191,9 +3218,14 @@ impl CodexAppServerConnection {
|
|||||||
.map_err(platform_llm::LlmError::InvalidRequest)?;
|
.map_err(platform_llm::LlmError::InvalidRequest)?;
|
||||||
direct_project_history.complete_item(&item);
|
direct_project_history.complete_item(&item);
|
||||||
if let Some(entry_item) = entry_item {
|
if let Some(entry_item) = entry_item {
|
||||||
|
// `rawResponseItem/completed` 不带阶段时间,宿主处理到这条
|
||||||
|
// 通知的钟就是该阶段唯一可证明的时间。
|
||||||
append_direct_thread_event(
|
append_direct_thread_event(
|
||||||
&direct_thread_id,
|
&direct_thread_id,
|
||||||
DirectThreadEvent::item_completed(entry_item),
|
DirectThreadEvent::item_completed(
|
||||||
|
entry_item,
|
||||||
|
direct_tool_call_now_ms(),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3322,9 +3354,19 @@ impl CodexAppServerConnection {
|
|||||||
if let Some(entry_item) =
|
if let Some(entry_item) =
|
||||||
direct_thread_visible_item(history_root, item)
|
direct_thread_visible_item(history_root, item)
|
||||||
{
|
{
|
||||||
|
// `item/started` 的通知层带 `startedAtMs`:这是工具真正
|
||||||
|
// 开始的阶段时间,优先于条目展示时间与宿主钟。
|
||||||
append_direct_thread_event(
|
append_direct_thread_event(
|
||||||
&direct_thread_id,
|
&direct_thread_id,
|
||||||
DirectThreadEvent::item_started(entry_item),
|
DirectThreadEvent::item_started(
|
||||||
|
entry_item,
|
||||||
|
direct_thread_item_event_at_ms(
|
||||||
|
¶ms,
|
||||||
|
item,
|
||||||
|
false,
|
||||||
|
direct_tool_call_now_ms(),
|
||||||
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3367,9 +3409,19 @@ impl CodexAppServerConnection {
|
|||||||
&& matches!(status, "completed" | "interrupted" | "failed")
|
&& matches!(status, "completed" | "interrupted" | "failed")
|
||||||
{
|
{
|
||||||
terminal_recorded = true;
|
terminal_recorded = true;
|
||||||
|
// 终态时间:`durationMs` 与宿主记下的毫秒起点都可靠时才派生,
|
||||||
|
// 否则取宿主处理这条终态的钟;上游秒级 `completedAt` 一律不用。
|
||||||
append_direct_thread_event(
|
append_direct_thread_event(
|
||||||
&direct_thread_id,
|
&direct_thread_id,
|
||||||
DirectThreadEvent::turn_completed(status.to_string()),
|
DirectThreadEvent::turn_completed(
|
||||||
|
status.to_string(),
|
||||||
|
direct_thread_turn_completed_at_ms(
|
||||||
|
turn,
|
||||||
|
Some(direct_turn_started_at_ms),
|
||||||
|
direct_tool_call_now_ms(),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.with_user_item_id(direct_turn_user_item_id.as_deref()),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
match status {
|
match status {
|
||||||
@@ -3426,7 +3478,11 @@ impl CodexAppServerConnection {
|
|||||||
"failed"
|
"failed"
|
||||||
}
|
}
|
||||||
.to_string(),
|
.to_string(),
|
||||||
),
|
// 这条兜底终态没有对应的 app-server 终态载荷,只能取宿主处理它的钟,
|
||||||
|
// 不能拿最后一次正文或工具更新时间当回合终点。
|
||||||
|
direct_tool_call_now_ms(),
|
||||||
|
)
|
||||||
|
.with_user_item_id(direct_turn_user_item_id.as_deref()),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
let text = match collect_result {
|
let text = match collect_result {
|
||||||
@@ -3624,6 +3680,15 @@ enum DirectCodexTurnCancelTarget {
|
|||||||
/// 这时显式释放这条守卫并把可读原因返回给界面。释放条件见
|
/// 这时显式释放这条守卫并把可读原因返回给界面。释放条件见
|
||||||
/// [`release_stale_direct_taonier_active_invocation`] 的注释;"正在跑的是另一轮"仍然
|
/// [`release_stale_direct_taonier_active_invocation`] 的注释;"正在跑的是另一轮"仍然
|
||||||
/// 保持原拒绝语义,什么都不释放。
|
/// 保持原拒绝语义,什么都不释放。
|
||||||
|
///
|
||||||
|
/// 兜底终态带 `userItemId`:身份取 `release_stale_direct_taonier_active_invocation` 返回的
|
||||||
|
/// clientTurnId(客户端回合身份的唯一来源),与正常路径的开口条目 id 同一份 canonical 口径。
|
||||||
|
/// 拿不到 clientTurnId 就留空——这一轮不会再有原生终态,猜一个身份会让前端把边界盖到别人身上。
|
||||||
|
fn direct_stale_cancel_turn_completed_event(client_turn_id: &str) -> DirectThreadEvent {
|
||||||
|
DirectThreadEvent::turn_completed("aborted".to_string(), direct_tool_call_now_ms())
|
||||||
|
.with_user_item_id(direct_codex_user_item_id_for_client_turn_id(client_turn_id).as_deref())
|
||||||
|
}
|
||||||
|
|
||||||
pub(crate) fn cancel_direct_codex_turn_at(
|
pub(crate) fn cancel_direct_codex_turn_at(
|
||||||
root: &Path,
|
root: &Path,
|
||||||
client_turn_id: Option<&str>,
|
client_turn_id: Option<&str>,
|
||||||
@@ -3680,7 +3745,7 @@ pub(crate) fn cancel_direct_codex_turn_at(
|
|||||||
// 兜底补一条,否则前端的"最新回合是否在跑"会永远停在运行中。
|
// 兜底补一条,否则前端的"最新回合是否在跑"会永远停在运行中。
|
||||||
append_direct_thread_event(
|
append_direct_thread_event(
|
||||||
&direct_thread_id_for_project(root),
|
&direct_thread_id_for_project(root),
|
||||||
DirectThreadEvent::turn_completed("aborted".to_string()),
|
direct_stale_cancel_turn_completed_event(&released),
|
||||||
);
|
);
|
||||||
Ok(DirectTurnCancelView {
|
Ok(DirectTurnCancelView {
|
||||||
outcome: DIRECT_TURN_CANCEL_OUTCOME_RELEASED.to_string(),
|
outcome: DIRECT_TURN_CANCEL_OUTCOME_RELEASED.to_string(),
|
||||||
@@ -5006,6 +5071,109 @@ mod tests {
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 阶段时间取自**通知层**字段,形状照抄 codex-cli 0.147 / 0.155 的 v2 协议 schema:
|
||||||
|
/// `item/started` 带 `startedAtMs`、`item/completed` 带 `completedAtMs`(毫秒),
|
||||||
|
/// `turn/completed` 带 `turn.startedAt` / `turn.completedAt`(秒)与 `turn.durationMs`(毫秒)。
|
||||||
|
/// 分类函数把 params 原样交给事件级 `at` 的投影函数,所以字段位置必须在这里钉住;
|
||||||
|
/// 回合边界的秒字段按"不用"锁在这里,避免以后有人再把秒级截断当 0.1 秒精度。
|
||||||
|
#[test]
|
||||||
|
fn direct_lifecycle_stage_times_come_from_notification_params() {
|
||||||
|
let started = serde_json::json!({
|
||||||
|
"threadId": "thread-1",
|
||||||
|
"turnId": "turn-1",
|
||||||
|
"startedAtMs": 1_700_000_000_123u64,
|
||||||
|
"item": {"id": "call-1", "type": "commandExecution", "command": "ls"},
|
||||||
|
});
|
||||||
|
let completed = serde_json::json!({
|
||||||
|
"threadId": "thread-1",
|
||||||
|
"turnId": "turn-1",
|
||||||
|
"completedAtMs": 1_700_000_001_500u64,
|
||||||
|
"item": {"id": "call-1", "type": "commandExecution", "command": "ls"},
|
||||||
|
});
|
||||||
|
for (method, params, expected_at_ms) in [
|
||||||
|
("item/started", &started, 1_700_000_000_123u64),
|
||||||
|
("item/completed", &completed, 1_700_000_001_500u64),
|
||||||
|
] {
|
||||||
|
let Some(CodexTurnEvent::Item {
|
||||||
|
completed,
|
||||||
|
params: event_params,
|
||||||
|
}) = direct_codex_notification_event(method, params, None, None, "turn-1")
|
||||||
|
else {
|
||||||
|
panic!("{method} 必须分类成条目生命周期事件");
|
||||||
|
};
|
||||||
|
let item = event_params.get("item").expect("item payload");
|
||||||
|
assert_eq!(
|
||||||
|
direct_thread_item_event_at_ms(&event_params, item, completed, 9_999),
|
||||||
|
expected_at_ms,
|
||||||
|
"{method} 必须用通知层的阶段时间,而不是宿主钟"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
let terminal = serde_json::json!({
|
||||||
|
"threadId": "thread-1",
|
||||||
|
"turn": {
|
||||||
|
"id": "turn-1",
|
||||||
|
"items": [],
|
||||||
|
"status": "completed",
|
||||||
|
"startedAt": 1_700_000_000i64,
|
||||||
|
"completedAt": 1_700_000_042i64,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
let Some(CodexTurnEvent::Terminal(params)) =
|
||||||
|
direct_codex_notification_event("turn/completed", &terminal, None, None, "turn-1")
|
||||||
|
else {
|
||||||
|
panic!("turn/completed 必须分类成终态事件");
|
||||||
|
};
|
||||||
|
let turn = params.get("turn").unwrap_or(¶ms);
|
||||||
|
assert_eq!(
|
||||||
|
direct_thread_turn_completed_at_ms(turn, Some(1_700_000_000_500), 9_999),
|
||||||
|
9_999,
|
||||||
|
"上游只有秒级 completedAt:不采用,取宿主处理终态的毫秒钟"
|
||||||
|
);
|
||||||
|
let with_duration = serde_json::json!({
|
||||||
|
"id": "turn-1",
|
||||||
|
"items": [],
|
||||||
|
"status": "completed",
|
||||||
|
"startedAt": 1_700_000_000i64,
|
||||||
|
"completedAt": 1_700_000_042i64,
|
||||||
|
"durationMs": 42_500u64,
|
||||||
|
});
|
||||||
|
assert_eq!(
|
||||||
|
direct_thread_turn_completed_at_ms(&with_duration, Some(1_700_000_000_500), 9_999),
|
||||||
|
1_700_000_043_000,
|
||||||
|
"durationMs + 宿主高精度起点才派生结束"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 取消兜底终态也要带开口用户条目身份,且身份只有一个来源:release 返回的 clientTurnId
|
||||||
|
/// 走与正常路径同一份 canonical 口径;拿不到(空 / 空白)就留空,不猜。
|
||||||
|
#[test]
|
||||||
|
fn stale_cancel_terminal_event_keeps_opener_user_item_id_from_client_turn_id() {
|
||||||
|
let event = direct_stale_cancel_turn_completed_event("turn-0001");
|
||||||
|
assert_eq!(event.user_item_id(), Some("direct-codex:turn-0001:user"));
|
||||||
|
assert!(event.at().is_some(), "兜底终态仍要带宿主观测时间");
|
||||||
|
assert!(matches!(
|
||||||
|
event,
|
||||||
|
DirectThreadEvent::TurnCompleted { ref status, .. } if status == "aborted"
|
||||||
|
));
|
||||||
|
|
||||||
|
for missing in ["", " "] {
|
||||||
|
let event = direct_stale_cancel_turn_completed_event(missing);
|
||||||
|
assert_eq!(
|
||||||
|
event.user_item_id(),
|
||||||
|
None,
|
||||||
|
"拿不到 clientTurnId 时不得编造开口条目身份"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// canonical 口径与落盘侧同一份:`direct-codex:{clientTurnId}:user`。
|
||||||
|
assert_eq!(
|
||||||
|
direct_codex_user_item_id_for_client_turn_id(" turn-0001 ").as_deref(),
|
||||||
|
Some("direct-codex:turn-0001:user")
|
||||||
|
);
|
||||||
|
assert_eq!(direct_codex_user_item_id_for_client_turn_id(""), None);
|
||||||
|
}
|
||||||
|
|
||||||
fn test_llm() -> GameCreatorLlmConfig {
|
fn test_llm() -> GameCreatorLlmConfig {
|
||||||
GameCreatorLlmConfig {
|
GameCreatorLlmConfig {
|
||||||
custom_enabled: false,
|
custom_enabled: false,
|
||||||
@@ -6740,12 +6908,33 @@ done
|
|||||||
|
|
||||||
let consumed = crate::agent::consume_direct_thread(&bootstrap.subscription_id)
|
let consumed = crate::agent::consume_direct_thread(&bootstrap.subscription_id)
|
||||||
.expect("consume events");
|
.expect("consume events");
|
||||||
|
// 回合起止必须与开口用户条目同源:前端在「只有锚点 + 历史、运行态为空」的回合里靠这个
|
||||||
|
// 身份把边界认领给同一条用户条目,缺了它就只能隐藏未知用时。
|
||||||
|
let lifecycle_user_item_ids = consumed
|
||||||
|
.events
|
||||||
|
.iter()
|
||||||
|
.filter(|event| {
|
||||||
|
matches!(
|
||||||
|
event,
|
||||||
|
DirectThreadEvent::TurnStarted { .. } | DirectThreadEvent::TurnCompleted { .. }
|
||||||
|
)
|
||||||
|
})
|
||||||
|
.map(DirectThreadEvent::user_item_id)
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
assert_eq!(
|
||||||
|
lifecycle_user_item_ids,
|
||||||
|
vec![
|
||||||
|
Some("direct-codex:turn-0001:user"),
|
||||||
|
Some("direct-codex:turn-0001:user"),
|
||||||
|
],
|
||||||
|
"turn.started / turn.completed 都要带本轮开口用户条目的 canonical itemId"
|
||||||
|
);
|
||||||
let mut user_items = Vec::new();
|
let mut user_items = Vec::new();
|
||||||
let mut assistant_items = Vec::new();
|
let mut assistant_items = Vec::new();
|
||||||
for event in &consumed.events {
|
for event in &consumed.events {
|
||||||
let item = match event {
|
let item = match event {
|
||||||
DirectThreadEvent::ItemStarted { item }
|
DirectThreadEvent::ItemStarted { item, .. }
|
||||||
| DirectThreadEvent::ItemCompleted { item } => item,
|
| DirectThreadEvent::ItemCompleted { item, .. } => item,
|
||||||
_ => continue,
|
_ => continue,
|
||||||
};
|
};
|
||||||
match item {
|
match item {
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -427,12 +427,16 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 事件级阶段时间只在重放稳定性用例里逐个指定;其余用例用一个固定值即可,
|
||||||
|
/// 它们断言的是队列 / 游标语义,不是时间本身。
|
||||||
|
const FIXED_AT_MS: u64 = 1_000;
|
||||||
|
|
||||||
fn item_started(item_id: &str) -> DirectThreadEvent {
|
fn item_started(item_id: &str) -> DirectThreadEvent {
|
||||||
DirectThreadEvent::item_started(message(item_id))
|
DirectThreadEvent::item_started(message(item_id), FIXED_AT_MS)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn item_completed(item_id: &str) -> DirectThreadEvent {
|
fn item_completed(item_id: &str) -> DirectThreadEvent {
|
||||||
DirectThreadEvent::item_completed(message(item_id))
|
DirectThreadEvent::item_completed(message(item_id), FIXED_AT_MS)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn item_delta(item_id: &str) -> DirectThreadEvent {
|
fn item_delta(item_id: &str) -> DirectThreadEvent {
|
||||||
@@ -450,7 +454,7 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn subscribers_have_independent_cursors_on_one_global_queue() {
|
fn subscribers_have_independent_cursors_on_one_global_queue() {
|
||||||
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
||||||
manager.append("thread-1", DirectThreadEvent::turn_started());
|
manager.append("thread-1", DirectThreadEvent::turn_started(FIXED_AT_MS));
|
||||||
let first = manager.subscribe("thread-1");
|
let first = manager.subscribe("thread-1");
|
||||||
let second = manager.subscribe("thread-1");
|
let second = manager.subscribe("thread-1");
|
||||||
manager.append("thread-1", item_started("item-1"));
|
manager.append("thread-1", item_started("item-1"));
|
||||||
@@ -474,7 +478,7 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn bootstrap_contains_lifecycle_anchor_and_unfinished_events_only() {
|
fn bootstrap_contains_lifecycle_anchor_and_unfinished_events_only() {
|
||||||
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
||||||
manager.append("thread-1", DirectThreadEvent::turn_started());
|
manager.append("thread-1", DirectThreadEvent::turn_started(FIXED_AT_MS));
|
||||||
manager.append("thread-1", item_started("item-1"));
|
manager.append("thread-1", item_started("item-1"));
|
||||||
manager.append("thread-1", item_delta("item-1"));
|
manager.append("thread-1", item_delta("item-1"));
|
||||||
manager.append("thread-1", item_completed("item-1"));
|
manager.append("thread-1", item_completed("item-1"));
|
||||||
@@ -484,7 +488,7 @@ mod tests {
|
|||||||
assert!(matches!(
|
assert!(matches!(
|
||||||
bootstrap.events.as_slice(),
|
bootstrap.events.as_slice(),
|
||||||
[
|
[
|
||||||
DirectThreadEvent::TurnStarted {},
|
DirectThreadEvent::TurnStarted { .. },
|
||||||
DirectThreadEvent::ItemStarted { item, .. },
|
DirectThreadEvent::ItemStarted { item, .. },
|
||||||
] if item.item_id() == "item-2"
|
] if item.item_id() == "item-2"
|
||||||
));
|
));
|
||||||
@@ -589,15 +593,118 @@ mod tests {
|
|||||||
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
||||||
manager.append(
|
manager.append(
|
||||||
"thread-1",
|
"thread-1",
|
||||||
DirectThreadEvent::turn_completed("completed".to_string()),
|
DirectThreadEvent::turn_completed("completed".to_string(), FIXED_AT_MS),
|
||||||
);
|
);
|
||||||
let bootstrap = manager.subscribe("thread-1");
|
let bootstrap = manager.subscribe("thread-1");
|
||||||
assert!(matches!(
|
assert!(matches!(
|
||||||
bootstrap.events.as_slice(),
|
bootstrap.events.as_slice(),
|
||||||
[DirectThreadEvent::TurnCompleted { status }] if status == "completed"
|
[DirectThreadEvent::TurnCompleted { status, at, .. }]
|
||||||
|
if status == "completed" && *at == Some(FIXED_AT_MS)
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 阶段时间必须随事件一起进队列:bootstrap 与重复订阅都拿到**原值**,
|
||||||
|
/// 重放不得重新取钟(否则每次重连都会把已固定的起止时间改掉)。
|
||||||
|
#[test]
|
||||||
|
fn replayed_events_keep_their_original_stage_time() {
|
||||||
|
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
||||||
|
manager.append("thread-1", DirectThreadEvent::turn_started(1_000));
|
||||||
|
manager.append(
|
||||||
|
"thread-1",
|
||||||
|
DirectThreadEvent::item_started(message("item-1"), 2_000),
|
||||||
|
);
|
||||||
|
|
||||||
|
let first = manager.subscribe("thread-1");
|
||||||
|
assert_eq!(
|
||||||
|
first
|
||||||
|
.events
|
||||||
|
.iter()
|
||||||
|
.map(DirectThreadEvent::at)
|
||||||
|
.collect::<Vec<_>>(),
|
||||||
|
vec![Some(1_000), Some(2_000)]
|
||||||
|
);
|
||||||
|
|
||||||
|
// 第二个订阅看到的是同一份事件,时间不因"又取了一次当前时间"而漂移。
|
||||||
|
let second = manager.subscribe("thread-1");
|
||||||
|
assert_eq!(second.events, first.events);
|
||||||
|
|
||||||
|
manager.append(
|
||||||
|
"thread-1",
|
||||||
|
DirectThreadEvent::item_completed(message("item-1"), 3_000),
|
||||||
|
);
|
||||||
|
let completion = manager
|
||||||
|
.consume(&first.subscription_id)
|
||||||
|
.expect("consume completion")
|
||||||
|
.events;
|
||||||
|
assert_eq!(
|
||||||
|
completion
|
||||||
|
.iter()
|
||||||
|
.map(DirectThreadEvent::at)
|
||||||
|
.collect::<Vec<_>>(),
|
||||||
|
vec![Some(3_000)]
|
||||||
|
);
|
||||||
|
// 重复消费不产生新事件,也不改写已下发过的时间。
|
||||||
|
assert!(manager
|
||||||
|
.consume(&first.subscription_id)
|
||||||
|
.expect("empty consume")
|
||||||
|
.events
|
||||||
|
.is_empty());
|
||||||
|
assert_eq!(
|
||||||
|
completion
|
||||||
|
.iter()
|
||||||
|
.map(DirectThreadEvent::at)
|
||||||
|
.collect::<Vec<_>>(),
|
||||||
|
vec![Some(3_000)]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 生命周期锚点重放时必须带上开口用户条目身份:前端在「只有锚点 + 历史切片、运行态一直空」
|
||||||
|
/// 的回合里也要能把边界认领给同一条用户条目,而不是按时间戳猜。
|
||||||
|
#[test]
|
||||||
|
fn bootstrap_replays_opener_user_item_id() {
|
||||||
|
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
||||||
|
manager.append(
|
||||||
|
"thread-1",
|
||||||
|
DirectThreadEvent::turn_started(1_000)
|
||||||
|
.with_user_item_id(Some("direct-codex:turn-1:user")),
|
||||||
|
);
|
||||||
|
let bootstrap = manager.subscribe("thread-1");
|
||||||
|
assert_eq!(
|
||||||
|
bootstrap
|
||||||
|
.events
|
||||||
|
.iter()
|
||||||
|
.map(DirectThreadEvent::user_item_id)
|
||||||
|
.collect::<Vec<_>>(),
|
||||||
|
vec![Some("direct-codex:turn-1:user")]
|
||||||
|
);
|
||||||
|
assert_eq!(bootstrap.events[0].at(), Some(1_000));
|
||||||
|
|
||||||
|
// 锚点是独立保存的副本:队列里那条事件被回收之后,新订阅仍拿到同一个身份。
|
||||||
|
manager
|
||||||
|
.consume(&bootstrap.subscription_id)
|
||||||
|
.expect("consume anchor");
|
||||||
|
manager.append(
|
||||||
|
"thread-1",
|
||||||
|
DirectThreadEvent::item_completed(message("item-1"), 2_000),
|
||||||
|
);
|
||||||
|
manager.append(
|
||||||
|
"thread-1",
|
||||||
|
DirectThreadEvent::turn_completed("completed".to_string(), 3_000)
|
||||||
|
.with_user_item_id(Some("direct-codex:turn-1:user")),
|
||||||
|
);
|
||||||
|
let second = manager.subscribe("thread-1");
|
||||||
|
assert_eq!(
|
||||||
|
second
|
||||||
|
.events
|
||||||
|
.iter()
|
||||||
|
.map(DirectThreadEvent::user_item_id)
|
||||||
|
.collect::<Vec<_>>(),
|
||||||
|
vec![Some("direct-codex:turn-1:user")],
|
||||||
|
"起止同源:终态锚点也带同一个开口用户条目身份"
|
||||||
|
);
|
||||||
|
assert_eq!(second.events[0].at(), Some(3_000));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn queue_cleanup_only_removes_a_cleanable_prefix() {
|
fn queue_cleanup_only_removes_a_cleanable_prefix() {
|
||||||
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -2391,6 +2391,8 @@ async fn bridge_generate_image(state: &DirectToolBridgeState, arguments: &Value)
|
|||||||
slice_mode,
|
slice_mode,
|
||||||
grid_x,
|
grid_x,
|
||||||
grid_y,
|
grid_y,
|
||||||
|
reference_asset_ids: Vec::new(),
|
||||||
|
target_category: None,
|
||||||
screen_color,
|
screen_color,
|
||||||
};
|
};
|
||||||
let _generation_guard = state.image_generation_gate.lock().await;
|
let _generation_guard = state.image_generation_gate.lock().await;
|
||||||
@@ -2590,6 +2592,51 @@ async fn bridge_web_search_at(root: &Path, arguments: &Value, search_url: &str)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(all(windows, target_arch = "x86_64", feature = "unity-editor-execute"))]
|
||||||
|
async fn bridge_unity_execute(state: &DirectToolBridgeState, arguments: &Value) -> Value {
|
||||||
|
let prepared = (|| {
|
||||||
|
if !crate::builtin_plugins::unity_editor_agent_tool_available_for_project(&state.root) {
|
||||||
|
return Err("当前项目不是 Unity 项目或 Unity 插件不可用".to_string());
|
||||||
|
}
|
||||||
|
enforce_project_permission_policy(&state.root, "unity.editor.execute")?;
|
||||||
|
bridge_reject_unknown_fields(arguments, &["code"])?;
|
||||||
|
let code = arguments
|
||||||
|
.get("code")
|
||||||
|
.and_then(Value::as_str)
|
||||||
|
.ok_or_else(|| "code 必须是 C# 代码".to_string())?;
|
||||||
|
if code.trim().is_empty() || code.len() > 131072 || code.contains('\0') {
|
||||||
|
return Err("code 不能为空、包含 NUL 或超过 128 KiB".to_string());
|
||||||
|
}
|
||||||
|
Ok(code.to_string())
|
||||||
|
})();
|
||||||
|
let code = match prepared {
|
||||||
|
Ok(code) => code,
|
||||||
|
Err(error) => {
|
||||||
|
return bridge_tool_result(
|
||||||
|
redact_agent_runtime_error(&state.root, &error, 480),
|
||||||
|
Vec::new(),
|
||||||
|
true,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let root = state.root.clone();
|
||||||
|
let result = tokio::task::spawn_blocking(move || {
|
||||||
|
if !crate::builtin_plugins::unity_editor_agent_tool_available_for_project(&root) {
|
||||||
|
return Err("当前 Unity 插件不可用".to_string());
|
||||||
|
}
|
||||||
|
crate::editor_adapters::execute_unity_editor_code(&root, &code)
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
match result {
|
||||||
|
Ok(Ok(response)) => {
|
||||||
|
let failed = response["ok"] != true || response["status"] != "completed";
|
||||||
|
bridge_tool_result(redact_agent_runtime_error(&state.root, &response.to_string(), 32_000), Vec::new(), failed)
|
||||||
|
}
|
||||||
|
Ok(Err(error)) => bridge_tool_result(redact_agent_runtime_error(&state.root, &error, 480), Vec::new(), true),
|
||||||
|
Err(_) => bridge_tool_result(json!({"ok":false,"status":"needs-reconciliation","retryAllowed":false,"error":"Unity 执行任务异常,请人工核对结果"}).to_string(), Vec::new(), true),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(all(windows, feature = "cocos-editor-execute"))]
|
#[cfg(all(windows, feature = "cocos-editor-execute"))]
|
||||||
async fn bridge_cocos_execute(state: &DirectToolBridgeState, arguments: &Value) -> Value {
|
async fn bridge_cocos_execute(state: &DirectToolBridgeState, arguments: &Value) -> Value {
|
||||||
bridge_cocos_call(state, arguments, None).await
|
bridge_cocos_call(state, arguments, None).await
|
||||||
@@ -2601,6 +2648,9 @@ async fn bridge_cocos_call(
|
|||||||
arguments: &Value,
|
arguments: &Value,
|
||||||
operation: Option<&str>,
|
operation: Option<&str>,
|
||||||
) -> Value {
|
) -> Value {
|
||||||
|
if !crate::builtin_plugins::is_enabled(crate::builtin_plugins::AGC_COCOS_EDITOR_PLUGIN_ID) {
|
||||||
|
return bridge_tool_result("Cocos 编辑器插件已禁用".to_string(), Vec::new(), true);
|
||||||
|
}
|
||||||
if !crate::builtin_plugins::cocos_editor_agent_tool_available_for_project(&state.root) {
|
if !crate::builtin_plugins::cocos_editor_agent_tool_available_for_project(&state.root) {
|
||||||
return bridge_tool_result(
|
return bridge_tool_result(
|
||||||
"当前项目不是 Cocos Creator 项目或 Cocos 插件不可用,agc_cocos_execute 不可用"
|
"当前项目不是 Cocos Creator 项目或 Cocos 插件不可用,agc_cocos_execute 不可用"
|
||||||
@@ -2787,6 +2837,8 @@ async fn handle_direct_tool_bridge(
|
|||||||
"agc_list_project_files" => bridge_list_project_files(&state.root, &request.arguments),
|
"agc_list_project_files" => bridge_list_project_files(&state.root, &request.arguments),
|
||||||
#[cfg(all(windows, feature = "cocos-editor-execute"))]
|
#[cfg(all(windows, feature = "cocos-editor-execute"))]
|
||||||
"agc_cocos_execute" => bridge_cocos_execute(&state, &request.arguments).await,
|
"agc_cocos_execute" => bridge_cocos_execute(&state, &request.arguments).await,
|
||||||
|
#[cfg(all(windows, target_arch = "x86_64", feature = "unity-editor-execute"))]
|
||||||
|
"agc_unity_execute" => bridge_unity_execute(&state, &request.arguments).await,
|
||||||
#[cfg(all(windows, feature = "cocos-editor-execute"))]
|
#[cfg(all(windows, feature = "cocos-editor-execute"))]
|
||||||
operation if cocos_editor_bridge::is_cocos_operation(operation) => {
|
operation if cocos_editor_bridge::is_cocos_operation(operation) => {
|
||||||
bridge_cocos_call(&state, &request.arguments, Some(operation)).await
|
bridge_cocos_call(&state, &request.arguments, Some(operation)).await
|
||||||
|
|||||||
@@ -75,7 +75,14 @@ pub(crate) fn run_direct_tools_mcp_if_requested(args: &[String]) -> Option<i32>
|
|||||||
|
|
||||||
async fn direct_tools_mcp_specs() -> Value {
|
async fn direct_tools_mcp_specs() -> Value {
|
||||||
let mut cocos_editor_available = false;
|
let mut cocos_editor_available = false;
|
||||||
if cfg!(all(windows, feature = "cocos-editor-execute")) {
|
let mut unity_editor_available = false;
|
||||||
|
if cfg!(all(windows, feature = "cocos-editor-execute"))
|
||||||
|
|| cfg!(all(
|
||||||
|
windows,
|
||||||
|
target_arch = "x86_64",
|
||||||
|
feature = "unity-editor-execute"
|
||||||
|
))
|
||||||
|
{
|
||||||
// 每次 tools/list 询问绑定的宿主;失败时不广告可选插件工具。
|
// 每次 tools/list 询问绑定的宿主;失败时不广告可选插件工具。
|
||||||
if let Ok(result) = tokio::time::timeout(
|
if let Ok(result) = tokio::time::timeout(
|
||||||
std::time::Duration::from_secs(5),
|
std::time::Duration::from_secs(5),
|
||||||
@@ -96,10 +103,22 @@ async fn direct_tools_mcp_specs() -> Value {
|
|||||||
.iter()
|
.iter()
|
||||||
.any(|tool| tool == crate::builtin_plugins::AGC_COCOS_EDITOR_TOOL_NAME)
|
.any(|tool| tool == crate::builtin_plugins::AGC_COCOS_EDITOR_TOOL_NAME)
|
||||||
});
|
});
|
||||||
|
unity_editor_available = availability
|
||||||
|
.as_ref()
|
||||||
|
.and_then(|v| v["tools"].as_array())
|
||||||
|
.is_some_and(|tools| {
|
||||||
|
tools
|
||||||
|
.iter()
|
||||||
|
.any(|tool| tool == crate::builtin_plugins::AGC_UNITY_EDITOR_TOOL_NAME)
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
direct_tools_mcp_specs_for(controlled_web_search_enabled(), cocos_editor_available)
|
direct_tools_mcp_specs_for_plugins(
|
||||||
|
controlled_web_search_enabled(),
|
||||||
|
cocos_editor_available,
|
||||||
|
unity_editor_available,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 工具 kind(wire 值)对应的提示词上限。
|
/// 工具 kind(wire 值)对应的提示词上限。
|
||||||
@@ -128,7 +147,16 @@ fn resource_tool_prompt_schema_max_chars() -> usize {
|
|||||||
.unwrap_or(0)
|
.unwrap_or(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn direct_tools_mcp_specs_for(controlled_web_search: bool, _cocos_editor_available: bool) -> Value {
|
#[cfg(test)]
|
||||||
|
fn direct_tools_mcp_specs_for(controlled_web_search: bool, cocos_editor_available: bool) -> Value {
|
||||||
|
direct_tools_mcp_specs_for_plugins(controlled_web_search, cocos_editor_available, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn direct_tools_mcp_specs_for_plugins(
|
||||||
|
controlled_web_search: bool,
|
||||||
|
_cocos_editor_available: bool,
|
||||||
|
_unity_editor_available: bool,
|
||||||
|
) -> Value {
|
||||||
let tools = vec![
|
let tools = vec![
|
||||||
json!({
|
json!({
|
||||||
"name": "client.session.info",
|
"name": "client.session.info",
|
||||||
@@ -568,6 +596,14 @@ fn direct_tools_mcp_specs_for(controlled_web_search: bool, _cocos_editor_availab
|
|||||||
.cloned(),
|
.cloned(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
#[cfg(all(windows, target_arch = "x86_64", feature = "unity-editor-execute"))]
|
||||||
|
if _unity_editor_available {
|
||||||
|
tools.push(json!({
|
||||||
|
"name": "agc_unity_execute",
|
||||||
|
"description": "在当前项目已打开的 Windows x64 Unity Mono Editor 执行 C#,可使用 return 返回值。仅提交 code;宿主绑定项目及进程。needs-reconciliation 或超时后禁止自动重发。",
|
||||||
|
"inputSchema": {"type":"object", "properties":{"code":{"type":"string", "minLength":1, "maxLength":131072}}, "required":["code"], "additionalProperties":false}
|
||||||
|
}));
|
||||||
|
}
|
||||||
if controlled_web_search {
|
if controlled_web_search {
|
||||||
tools.push(json!({
|
tools.push(json!({
|
||||||
"name": "agc_web_search",
|
"name": "agc_web_search",
|
||||||
@@ -655,6 +691,24 @@ async fn call_agc_cocos_execute(arguments: &Value) -> Value {
|
|||||||
call_client_tool_bridge("agc_cocos_execute", arguments).await
|
call_client_tool_bridge("agc_cocos_execute", arguments).await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(all(windows, target_arch = "x86_64", feature = "unity-editor-execute"))]
|
||||||
|
async fn call_agc_unity_execute(arguments: &Value) -> Value {
|
||||||
|
let validated = validate_tool_object_fields(arguments, &["code"]).and_then(|()| {
|
||||||
|
let code = arguments
|
||||||
|
.get("code")
|
||||||
|
.and_then(Value::as_str)
|
||||||
|
.ok_or_else(|| "code 必须是 C# 代码".to_string())?;
|
||||||
|
if code.trim().is_empty() || code.len() > 131072 || code.contains('\0') {
|
||||||
|
return Err("code 不能为空、包含 NUL 或超过 128 KiB".to_string());
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
});
|
||||||
|
if let Err(error) = validated {
|
||||||
|
return mcp_tool_result(error, Vec::new(), true);
|
||||||
|
}
|
||||||
|
call_client_tool_bridge("agc_unity_execute", arguments).await
|
||||||
|
}
|
||||||
|
|
||||||
fn mcp_success(id: Value, result: Value) -> Value {
|
fn mcp_success(id: Value, result: Value) -> Value {
|
||||||
json!({ "jsonrpc": "2.0", "id": id, "result": result })
|
json!({ "jsonrpc": "2.0", "id": id, "result": result })
|
||||||
}
|
}
|
||||||
@@ -1757,6 +1811,8 @@ async fn handle_direct_tools_mcp_request(root: &Path, request: Value) -> Option<
|
|||||||
"agc_write_file" => call_agc_write_file(&arguments).await,
|
"agc_write_file" => call_agc_write_file(&arguments).await,
|
||||||
#[cfg(all(windows, feature = "cocos-editor-execute"))]
|
#[cfg(all(windows, feature = "cocos-editor-execute"))]
|
||||||
"agc_cocos_execute" => call_agc_cocos_execute(&arguments).await,
|
"agc_cocos_execute" => call_agc_cocos_execute(&arguments).await,
|
||||||
|
#[cfg(all(windows, target_arch = "x86_64", feature = "unity-editor-execute"))]
|
||||||
|
"agc_unity_execute" => call_agc_unity_execute(&arguments).await,
|
||||||
#[cfg(all(windows, feature = "cocos-editor-execute"))]
|
#[cfg(all(windows, feature = "cocos-editor-execute"))]
|
||||||
operation if cocos_editor_bridge::is_cocos_operation(operation) => {
|
operation if cocos_editor_bridge::is_cocos_operation(operation) => {
|
||||||
call_client_tool_bridge(operation, &arguments).await
|
call_client_tool_bridge(operation, &arguments).await
|
||||||
|
|||||||
@@ -67,10 +67,11 @@ pub(crate) use canvas_generation::{
|
|||||||
generate_platform_art_asset_with_options_at,
|
generate_platform_art_asset_with_options_at,
|
||||||
generate_platform_art_asset_with_required_slices_at, maybe_generate_platform_art_asset_step,
|
generate_platform_art_asset_with_required_slices_at, maybe_generate_platform_art_asset_step,
|
||||||
needs_platform_art_asset_generation, normalize_platform_art_asset_generation_kind,
|
needs_platform_art_asset_generation, normalize_platform_art_asset_generation_kind,
|
||||||
|
normalize_platform_art_reference_asset_ids, normalize_platform_art_target_category,
|
||||||
platform_art_asset_art_spec, platform_art_asset_output_extension_matches,
|
platform_art_asset_art_spec, platform_art_asset_output_extension_matches,
|
||||||
prepare_platform_art_asset_output_path, project_canvas_asset_media_types,
|
platform_art_runtime_references_match_request_contract, prepare_platform_art_asset_output_path,
|
||||||
role_has_canvas_assets, suggested_canvas_tool_call, PlatformArtAssetGenerationOptions,
|
project_canvas_asset_media_types, role_has_canvas_assets, suggested_canvas_tool_call,
|
||||||
PLATFORM_ART_ASSET_GENERATION_KINDS,
|
PlatformArtAssetGenerationOptions, PLATFORM_ART_ASSET_GENERATION_KINDS,
|
||||||
};
|
};
|
||||||
#[allow(unused_imports)]
|
#[allow(unused_imports)]
|
||||||
pub(crate) use draft_validation::{
|
pub(crate) use draft_validation::{
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1620,7 +1620,7 @@ pub(crate) fn agent_runtime_tool_action_input_summary(
|
|||||||
.unwrap_or(160)
|
.unwrap_or(160)
|
||||||
),
|
),
|
||||||
"command.run_limited" => format!("commandId={}", text(&["commandId", "command_id", "id"])),
|
"command.run_limited" => format!("commandId={}", text(&["commandId", "command_id", "id"])),
|
||||||
"cocos.editor.execute" => format!(
|
"cocos.editor.execute" | "unity.editor.execute" => format!(
|
||||||
"codeChars={} · codeSha256={:x}",
|
"codeChars={} · codeSha256={:x}",
|
||||||
chars(&["code"]),
|
chars(&["code"]),
|
||||||
Sha256::digest(
|
Sha256::digest(
|
||||||
|
|||||||
@@ -383,6 +383,16 @@ pub(crate) async fn execute_game_creator_agent_runtime_tool_action_with_pending_
|
|||||||
true,
|
true,
|
||||||
|| observe_agent_runtime_cocos_editor_execute(root, action, pending_action),
|
|| observe_agent_runtime_cocos_editor_execute(root, action, pending_action),
|
||||||
),
|
),
|
||||||
|
"unity.editor.execute" => observe_agent_runtime_project_snapshot_with_lock(
|
||||||
|
root,
|
||||||
|
agent_id,
|
||||||
|
run_id,
|
||||||
|
action,
|
||||||
|
&action_fingerprint,
|
||||||
|
pending_action,
|
||||||
|
true,
|
||||||
|
|| observe_agent_runtime_unity_editor_execute(root, action, pending_action),
|
||||||
|
),
|
||||||
"preview.validate" => {
|
"preview.validate" => {
|
||||||
observe_agent_runtime_preview_validate(
|
observe_agent_runtime_preview_validate(
|
||||||
root,
|
root,
|
||||||
|
|||||||
@@ -97,6 +97,7 @@ pub(in crate::agent) fn game_creator_agent_runtime_tool_command_id(
|
|||||||
"command.run_limited" => Some("command.run_limited"),
|
"command.run_limited" => Some("command.run_limited"),
|
||||||
#[cfg(feature = "cocos-editor-execute")]
|
#[cfg(feature = "cocos-editor-execute")]
|
||||||
"cocos.editor.execute" => Some("cocos.editor.execute"),
|
"cocos.editor.execute" => Some("cocos.editor.execute"),
|
||||||
|
"unity.editor.execute" => Some("unity.editor.execute"),
|
||||||
"preview.start" => Some("preview.start"),
|
"preview.start" => Some("preview.start"),
|
||||||
"preview.validate" => Some("preview.validate"),
|
"preview.validate" => Some("preview.validate"),
|
||||||
"image.inspect" => Some("image.inspect"),
|
"image.inspect" => Some("image.inspect"),
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user