Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions l10n/bundle.l10n.es.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"✅ Executor closed": "✅ Ejecutor cerrado",
"❌ Executor exit code: {code}": "❌ Código de salida del ejecutor: {code}",
"The executor is not running.": "El ejecutor no está en ejecución.",
"Stop the running executor before starting another project.": "Detén el ejecutor en curso antes de iniciar otro proyecto.",
"❌ Failed to stop executor: {error}": "❌ No se pudo detener el ejecutor: {error}",
"Extra arguments or environment variables are configured for {count} task(s); the executor runs every task in one process, so they no longer apply.": "Hay argumentos adicionales o variables de entorno configurados para {count} tareas; el ejecutor ejecuta todas las tareas en un solo proceso, por lo que ya no se aplican.",
"Loaded {count} tasks; parameter schema is ready ({broken} failed)": "Se cargaron {count} tareas; el schema está listo ({broken} errores)",
Expand Down Expand Up @@ -138,6 +139,7 @@
"Save to assets cancelled.": "Se canceló el guardado en assets.",
"Connecting to game window…": "Conectando a la ventana del juego (inicia el juego automáticamente si no está en ejecución)…",
"Failed to connect game window: {error}": "Error al conectar con la ventana del juego: {error}",
"Failed to disconnect game window: {error}": "Error al desconectar la ventana del juego: {error}",
"Reusing game connection from toolbox: {title} (PID {pid})": "Reutilizando la conexión del juego del kit de herramientas: {title} (PID {pid})",
"▶ Enabling debug overlay…": "▶ Activando la superposición de depuración…",
"⏹ Disabling debug overlay…": "⏹ Desactivando la superposición de depuración…",
Expand Down
2 changes: 2 additions & 0 deletions l10n/bundle.l10n.ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"✅ Executor closed": "✅ エグゼキュータを終了しました",
"❌ Executor exit code: {code}": "❌ エグゼキュータ終了コード: {code}",
"The executor is not running.": "エグゼキュータが起動していません。",
"Stop the running executor before starting another project.": "別のプロジェクトを開始する前に、実行中のエグゼキュータを停止してください。",
"❌ Failed to stop executor: {error}": "❌ エグゼキュータの停止に失敗しました: {error}",
"Extra arguments or environment variables are configured for {count} task(s); the executor runs every task in one process, so they no longer apply.": "{count} 件のタスクに追加引数または環境変数が設定されています。エグゼキュータは全タスクを 1 プロセスで実行するため、これらは適用されません。",
"Loaded {count} tasks; parameter schema is ready ({broken} failed)": "{count} 件のタスクを読み込み、schema を準備しました({broken} 件失敗)",
Expand Down Expand Up @@ -138,6 +139,7 @@
"Save to assets cancelled.": "assets への保存をキャンセルしました。",
"Connecting to game window…": "ゲームウィンドウに接続中(未起動なら自動で起動します)…",
"Failed to connect game window: {error}": "ゲームウィンドウへの接続に失敗しました: {error}",
"Failed to disconnect game window: {error}": "ゲームウィンドウの接続解除に失敗しました: {error}",
"Reusing game connection from toolbox: {title} (PID {pid})": "ツールボックスのゲーム接続を再利用: {title}(PID {pid})",
"▶ Enabling debug overlay…": "▶ デバッグ オーバーレイを有効化中…",
"⏹ Disabling debug overlay…": "⏹ デバッグ オーバーレイを無効化中…",
Expand Down
2 changes: 2 additions & 0 deletions l10n/bundle.l10n.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"✅ Executor closed": "✅ Executor closed",
"❌ Executor exit code: {code}": "❌ Executor exit code: {code}",
"The executor is not running.": "The executor is not running.",
"Stop the running executor before starting another project.": "Stop the running executor before starting another project.",
"❌ Failed to stop executor: {error}": "❌ Failed to stop executor: {error}",
"Extra arguments or environment variables are configured for {count} task(s); the executor runs every task in one process, so they no longer apply.": "Extra arguments or environment variables are configured for {count} task(s); the executor runs every task in one process, so they no longer apply.",
"Loaded {count} tasks; parameter schema is ready ({broken} failed)": "Loaded {count} tasks; parameter schema is ready ({broken} failed)",
Expand Down Expand Up @@ -147,6 +148,7 @@
"Save to assets cancelled.": "Save to assets cancelled.",
"Connecting to game window…": "Connecting to game window (auto-starts the game if not running)…",
"Failed to connect game window: {error}": "Failed to connect game window: {error}",
"Failed to disconnect game window: {error}": "Failed to disconnect game window: {error}",
"Reusing game connection from toolbox: {title} (PID {pid})": "Reusing game connection from toolbox: {title} (PID {pid})",
"▶ Enabling debug overlay…": "▶ Enabling debug overlay…",
"⏹ Disabling debug overlay…": "⏹ Disabling debug overlay…",
Expand Down
2 changes: 2 additions & 0 deletions l10n/bundle.l10n.ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"✅ Executor closed": "✅ 실행기를 닫았습니다",
"❌ Executor exit code: {code}": "❌ 실행기 종료 코드: {code}",
"The executor is not running.": "실행기가 실행 중이 아닙니다.",
"Stop the running executor before starting another project.": "다른 프로젝트를 시작하기 전에 실행 중인 실행기를 중지하세요.",
"❌ Failed to stop executor: {error}": "❌ 실행기 중지 실패: {error}",
"Extra arguments or environment variables are configured for {count} task(s); the executor runs every task in one process, so they no longer apply.": "{count}개 작업에 추가 인수 또는 환경 변수가 설정되어 있습니다. 실행기는 모든 작업을 하나의 프로세스에서 실행하므로 더 이상 적용되지 않습니다.",
"Loaded {count} tasks; parameter schema is ready ({broken} failed)": "작업 {count}개와 매개변수 schema를 불러왔습니다({broken}개 실패)",
Expand Down Expand Up @@ -138,6 +139,7 @@
"Save to assets cancelled.": "assets 저장이 취소되었습니다.",
"Connecting to game window…": "게임 창에 연결하는 중(실행 중이 아니면 자동으로 시작)…",
"Failed to connect game window: {error}": "게임 창 연결 실패: {error}",
"Failed to disconnect game window: {error}": "게임 창 연결 해제 실패: {error}",
"Reusing game connection from toolbox: {title} (PID {pid})": "도구 상자의 게임 연결 재사용: {title}(PID {pid})",
"▶ Enabling debug overlay…": "▶ 디버그 오버레이 활성화 중…",
"⏹ Disabling debug overlay…": "⏹ 디버그 오버레이 비활성화 중…",
Expand Down
2 changes: 2 additions & 0 deletions l10n/bundle.l10n.zh-cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"✅ Executor closed": "✅ 执行器已关闭",
"❌ Executor exit code: {code}": "❌ 执行器退出码:{code}",
"The executor is not running.": "执行器尚未启动。",
"Stop the running executor before starting another project.": "请先停止正在运行的执行器,再启动另一个项目。",
"❌ Failed to stop executor: {error}": "❌ 关闭执行器失败:{error}",
"Extra arguments or environment variables are configured for {count} task(s); the executor runs every task in one process, so they no longer apply.": "有 {count} 个任务配置了额外参数或环境变量;执行器把所有任务跑在同一进程里,这些设置不再生效。",
"Loaded {count} tasks; parameter schema is ready ({broken} failed)": "已加载 {count} 个任务;参数 schema 已就绪({broken} 个采集失败)",
Expand Down Expand Up @@ -138,6 +139,7 @@
"Save to assets cancelled.": "已取消保存到 assets。",
"Connecting to game window…": "正在连接游戏窗口(游戏未运行时会自动启动)…",
"Failed to connect game window: {error}": "连接游戏窗口失败:{error}",
"Failed to disconnect game window: {error}": "断开游戏窗口失败:{error}",
"Reusing game connection from toolbox: {title} (PID {pid})": "复用工具箱游戏连接:{title}(PID {pid})",
"▶ Enabling debug overlay…": "▶ 正在开启调试浮层…",
"⏹ Disabling debug overlay…": "⏹ 正在关闭调试浮层…",
Expand Down
2 changes: 2 additions & 0 deletions l10n/bundle.l10n.zh-tw.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"✅ Executor closed": "✅ 執行器已關閉",
"❌ Executor exit code: {code}": "❌ 執行器結束碼:{code}",
"The executor is not running.": "執行器尚未啟動。",
"Stop the running executor before starting another project.": "請先停止正在執行的執行器,再啟動另一個專案。",
"❌ Failed to stop executor: {error}": "❌ 關閉執行器失敗:{error}",
"Extra arguments or environment variables are configured for {count} task(s); the executor runs every task in one process, so they no longer apply.": "有 {count} 個任務設定了額外參數或環境變數;執行器將所有任務執行於同一行程,這些設定不再生效。",
"Loaded {count} tasks; parameter schema is ready ({broken} failed)": "已載入 {count} 個任務;參數 schema 已就緒({broken} 個失敗)",
Expand Down Expand Up @@ -138,6 +139,7 @@
"Save to assets cancelled.": "已取消儲存到 assets。",
"Connecting to game window…": "正在連線遊戲視窗(遊戲未執行時會自動啟動)…",
"Failed to connect game window: {error}": "連線遊戲視窗失敗:{error}",
"Failed to disconnect game window: {error}": "中斷遊戲視窗連線失敗:{error}",
"Reusing game connection from toolbox: {title} (PID {pid})": "複用工具箱遊戲連線:{title}(PID {pid})",
"▶ Enabling debug overlay…": "▶ 正在開啟除錯浮層…",
"⏹ Disabling debug overlay…": "⏹ 正在關閉除錯浮層…",
Expand Down
16 changes: 10 additions & 6 deletions media/console/taskCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,7 @@
/** 单个卡片的执行状态:触发任务看入列/轮询,一次性任务看排队/执行 */
function cardState(card) {
const executor = state.executor;
if (executor.projectMismatch) return card.dataset.kind === 'trigger' && triggerEnabled(card.dataset.taskKey) ? 'armed' : '';
const key = card.dataset.taskKey;
const isTrigger = card.dataset.kind === 'trigger';
const current = executor.current === key;
Expand All @@ -558,7 +559,7 @@
/** 执行器是否已拉起(含连接中) */
function executorRunning() {
const status = state.executor.status;
return status === 'running' || status === 'connecting';
return !state.executor.projectMismatch && (status === 'running' || status === 'connecting');
}

function updateRunningState() {
Expand All @@ -578,7 +579,7 @@
if (toggle.checked !== enabled) toggle.checked = enabled;
}
const launch = card.querySelector('[data-role="launch"]');
if (launch) launch.disabled = status === 'queued' || status === 'running';
if (launch) launch.disabled = state.executor.projectMismatch || status === 'queued' || status === 'running';
// 参数覆盖徽标:全量接管语义——快照值 ≠ 出厂值(或存在孤儿键)时高亮
const configBtn = card.querySelector('[data-role="config-toggle"]');
if (configBtn) {
Expand Down Expand Up @@ -643,7 +644,10 @@
const active = executor.status === 'running' || executor.status === 'connecting';
let text = t('executorIdle');
let level = 'idle';
if (executor.status === 'connecting') {
if (executor.projectMismatch) {
text = executor.projectMismatchText;
level = 'paused';
} else if (executor.status === 'connecting') {
text = t('executorConnecting');
level = 'connecting';
} else if (executor.status === 'running') {
Expand Down Expand Up @@ -671,10 +675,10 @@
elements.startExecutor.hidden = active;
elements.startExecutor.disabled = active;
elements.startExecutor.textContent = `▶ ${t('startExecutor')}`;
elements.pauseToggle.hidden = !active;
elements.pauseToggle.disabled = executor.status !== 'running';
elements.pauseToggle.hidden = !active || executor.projectMismatch;
elements.pauseToggle.disabled = executor.status !== 'running' || executor.projectMismatch;
elements.pauseToggle.textContent = executor.paused ? `▶ ${t('resume')}` : `⏸ ${t('pause')}`;
elements.stopCurrent.hidden = !active;
elements.stopCurrent.hidden = !active || executor.projectMismatch;
elements.stopCurrent.disabled = !executor.current;
elements.stopCurrent.textContent = `⏹ ${t('stopCurrent')}`;
elements.stopExecutor.hidden = !active;
Expand Down
2 changes: 1 addition & 1 deletion scripts/test_label_enum_guard.js
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ console.log('\n破坏性对照');
//
// 用正则匹配三元表达式的尾部而不是整行:tsc 会把模块内的常量写成
// `exports.FALLBACK_ENUM_CLASS_NAME`,把这一串硬编码进测试会在升级 TS 时静默失配。
const rawName = source.replace(/\? raw : [^;]*FALLBACK_ENUM_CLASS_NAME;/, '? raw : raw;');
const rawName = source.replace(/\?\s*raw\s*:\s*[^;]*FALLBACK_ENUM_CLASS_NAME;/, '? raw : raw;');
check(rawName !== source, '对照五源码确实被改动了(替换命中)—— 否则对照是假的');
const rawExports = evalSandbox(rawName);
check(
Expand Down
Loading
Loading