godot-cli 0.30.0 → 0.31.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +22 -1
- package/README.md +8 -4
- package/dist/commands/close.js +3 -2
- package/dist/commands/close.js.map +1 -1
- package/dist/commands/open.js +5 -6
- package/dist/commands/open.js.map +1 -1
- package/dist/lib/exec.d.ts +7 -3
- package/dist/lib/exec.js +6 -2
- package/dist/lib/exec.js.map +1 -1
- package/dist/lib/session.d.ts +14 -13
- package/dist/lib/session.js +73 -83
- package/dist/lib/session.js.map +1 -1
- package/dist/lib.d.ts +2 -2
- package/dist/lib.js +1 -1
- package/dist/lib.js.map +1 -1
- package/dist/utils/addon-deps.d.ts +11 -0
- package/dist/utils/addon-deps.js +13 -6
- package/dist/utils/addon-deps.js.map +1 -1
- package/dist/utils/addon-nuget-deps.d.ts +7 -3
- package/dist/utils/addon-nuget-deps.js +12 -8
- package/dist/utils/addon-nuget-deps.js.map +1 -1
- package/dist/utils/csproj-deps.d.ts +2 -1
- package/dist/utils/csproj-deps.js +48 -13
- package/dist/utils/csproj-deps.js.map +1 -1
- package/dist/utils/machine-store.js +2 -22
- package/dist/utils/machine-store.js.map +1 -1
- package/dist/utils/server-source.d.ts +1 -1
- package/dist/utils/server-source.js +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,27 @@ All notable changes to `godot-cli` are documented in this file.
|
|
|
4
4
|
|
|
5
5
|
## Unreleased
|
|
6
6
|
|
|
7
|
+
- **McpPlugin 8.11.0; `exec` waits for the server's tool timeout.** `install-plugin` pins `com.IvanMurzak.McpPlugin`
|
|
8
|
+
8.11.0 (fallback for addons without `nuget-deps.json`). The addon starts its local server with
|
|
9
|
+
`tool-timeout=300000` (on a server built on McpPlugin 8.11.0+ a call is sent to the editor once and may run
|
|
10
|
+
5 minutes; `plugin-timeout` is only the connection timeout), so `exec`'s default `--timeout` goes from 180000 to
|
|
11
|
+
310000 ms and a slow call ends with the server's timeout error rather than a client abort. Older servers ignore
|
|
12
|
+
`tool-timeout` and still give up after about 110 s.
|
|
13
|
+
- **No Roslyn in exported games.** `install-plugin` writes the addon's editor-only packages (RQL, Code-Exec, Roslyn)
|
|
14
|
+
with a Condition that leaves them out of Godot's export builds, and adds it to entries an older version wrote (a
|
|
15
|
+
`Condition` the project set is kept). The installed addon says which packages are editor-only (`editorOnly` in
|
|
16
|
+
`nuget-deps.json`); an older addon marks none.
|
|
17
|
+
- **Editor sessions on `@baizor/gamedev-cli-core` 0.7.1.** The pre-launch C# build of `exec` / `open --headless`
|
|
18
|
+
runs in the session's `beforeLaunch` hook, under its heartbeated startup lock and only when the call starts the
|
|
19
|
+
editor: parallel cold calls build once (the CLI's own `.ai-game-dev/build.lock` is gone). The lease records the
|
|
20
|
+
server URL and connection mode; while cli-core verifies that lease live (same host, pid and process start time),
|
|
21
|
+
`exec` / `open --headless` talk to that server whatever `--url` / `GODOT_MCP_HOST` say (a crashed editor's lease
|
|
22
|
+
is never followed), and `close --owned-only` / a windowed `open` send `session-close` there with the lease's nonce
|
|
23
|
+
(`close --url` is now a hidden fallback for a lease written by 0.30.0). A user's editor that does not answer is
|
|
24
|
+
reported after the session's own `foreign` wait (now 60 s, as in unity-mcp-cli). An editor started by another
|
|
25
|
+
call that does not answer is no longer stopped (that call may still wait for it). The session files are listed
|
|
26
|
+
in `.ai-game-dev/.gitignore`. Library: `createGodotSession` and the `GodotSession` type are exported;
|
|
27
|
+
`GodotSession.probe` is removed (the session probes itself).
|
|
7
28
|
- **`exec`: run C# in the editor.** `godot-cli exec '<code>'` (or `-f <file>` / stdin, repeatable `--using` /
|
|
8
29
|
`--include`) calls the addon's new `script-execute` tool. A running editor of the project is reused; otherwise the
|
|
9
30
|
C# assembly is built and a **headless** editor starts (`--window` for a GUI one) on the project's local server,
|
|
@@ -16,7 +37,7 @@ All notable changes to `godot-cli` are documented in this file.
|
|
|
16
37
|
the CLI started, through the plugin's `session-close` system tool (a windowless editor gets no WM_CLOSE).
|
|
17
38
|
- `install-plugin` keeps a newer third-party package the project already pins (e.g. its own Roslyn) instead of
|
|
18
39
|
downgrading it to the addon's pin; `com.IvanMurzak.*` pins are still reconciled exactly.
|
|
19
|
-
- `install-plugin` writes the addon's three new NuGet pins (`com.IvanMurzak.CodeExec` and `.Roslyn` 0.2.
|
|
40
|
+
- `install-plugin` writes the addon's three new NuGet pins (`com.IvanMurzak.CodeExec` and `.Roslyn` 0.2.1,
|
|
20
41
|
`Microsoft.CodeAnalysis.CSharp` 4.12.0); `setup-skills` lists `script-execute` and the `session` family.
|
|
21
42
|
|
|
22
43
|
- **Extension catalog: the extensions are RQL modules.** The `EXTENSIONS_CATALOG` mirror follows the shared
|
package/README.md
CHANGED
|
@@ -185,16 +185,20 @@ at the snippet's line (`snippet.cs(2,12)`) and exits 1.
|
|
|
185
185
|
- **None running:** the C# assembly is built, then a **headless** editor starts (`--headless --editor --path`, or a
|
|
186
186
|
window with `--window`) connected to the project's local server (`http://localhost:<derived port>`, or `--url`),
|
|
187
187
|
which its plugin starts itself. A headless one quits after `--idle <seconds>` (default 300, `0` = never) without
|
|
188
|
-
tool calls, saving the open scenes that have a file (a windowed one stays open). Parallel calls
|
|
189
|
-
a user's editor whose local server does not answer is waited for
|
|
188
|
+
tool calls, saving the open scenes that have a file (a windowed one stays open). Parallel calls build once and
|
|
189
|
+
start one editor; a user's editor whose local server does not answer is waited for up to 60 s, then reported.
|
|
190
190
|
- `open --headless [--idle-timeout <s>]` starts the same session without running code; `close --owned-only` saves
|
|
191
191
|
and quits it (through the plugin's `session-close` tool — never a user's editor).
|
|
192
192
|
|
|
193
193
|
Sessions use [`@baizor/gamedev-cli-core`](https://www.npmjs.com/package/@baizor/gamedev-cli-core) `EditorSession`:
|
|
194
194
|
the lease `<project>/.ai-game-dev/session.json` marks an editor as started by the CLI (only such an editor is ever
|
|
195
|
-
closed)
|
|
195
|
+
closed) and records the server it runs on: while that editor provably lives, later `exec` / `open` / `close` calls
|
|
196
|
+
use that server, whatever `--url` says.
|
|
197
|
+
`<project>/.ai-game-dev/session.lock` makes concurrent calls start one editor: the C# build runs under it, only in the
|
|
198
|
+
call that starts the editor. Both files are listed in `<project>/.ai-game-dev/.gitignore`. The editor receives
|
|
196
199
|
`AIGD_SESSION_IDLE_SECONDS`, `AIGD_SESSION_OWNER=cli` and `AIGD_SESSION_NONCE`, plus `GODOT_MCP_CONNECTION_MODE=Custom`,
|
|
197
|
-
`GODOT_MCP_HOST` and `GODOT_MCP_START_SERVER=true`. Options: `--ready-timeout <ms>`, `--timeout <ms>` (tool call
|
|
200
|
+
`GODOT_MCP_HOST` and `GODOT_MCP_START_SERVER=true`. Options: `--ready-timeout <ms>`, `--timeout <ms>` (tool call, default 310000: just over the
|
|
201
|
+
server's 5-minute `tool-timeout`),
|
|
198
202
|
`--no-build`, `--editor-path`, `--token`, `--raw`.
|
|
199
203
|
|
|
200
204
|
## `login`
|
package/dist/commands/close.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Command } from 'commander';
|
|
1
|
+
import { Command, Option } from 'commander';
|
|
2
2
|
import * as fs from 'fs';
|
|
3
3
|
import * as path from 'path';
|
|
4
4
|
import { platform as nodePlatform } from 'os';
|
|
@@ -53,7 +53,8 @@ export const closeCommand = new Command('close')
|
|
|
53
53
|
.option('--timeout <seconds>', `Polite-quit timeout in seconds (default: ${DEFAULT_TIMEOUT_SECONDS})`, String(DEFAULT_TIMEOUT_SECONDS))
|
|
54
54
|
.option('--force', 'Hard-kill the editor if it does not exit within --timeout')
|
|
55
55
|
.option('--owned-only', 'Close only an editor started by godot-cli (exec / open --headless); never a user editor')
|
|
56
|
-
|
|
56
|
+
// Hidden fallback: a lease written by godot-cli 0.30.0 (cli-core 0.7.0) does not record the editor's server.
|
|
57
|
+
.addOption(new Option('--url <url>', 'With --owned-only: the local MCP server of that editor, for a lease without one').hideHelp())
|
|
57
58
|
.option('--token <token>', 'With --owned-only: bearer token (default: GODOT_MCP_TOKEN)')
|
|
58
59
|
.action(async (positionalPath, options) => {
|
|
59
60
|
const projectPath = resolveCloseProjectPath(positionalPath, process.cwd());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"close.js","sourceRoot":"","sources":["../../src/commands/close.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"close.js","sourceRoot":"","sources":["../../src/commands/close.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/open.js
CHANGED
|
@@ -5,7 +5,6 @@ import { verbose } from '../utils/ui.js';
|
|
|
5
5
|
import { openProject, resolveProjectPath as libResolveProjectPath, isGodotProjectDir as libIsGodotProjectDir, } from '../lib/open.js';
|
|
6
6
|
import { resolveOpenAuthToken, resolveSessionConnection } from '../utils/connection.js';
|
|
7
7
|
import { createGodotSession, ensureEditor } from '../lib/session.js';
|
|
8
|
-
import { isLocalhostUrl } from '../utils/project-marker.js';
|
|
9
8
|
import { parsePositiveIntFlag } from '../utils/input.js';
|
|
10
9
|
import { DEFAULT_SESSION_IDLE_SECONDS, DEFAULT_SESSION_READY_TIMEOUT_MS } from '@baizor/gamedev-cli-core';
|
|
11
10
|
/**
|
|
@@ -70,11 +69,11 @@ export const openCommand = new Command('open')
|
|
|
70
69
|
await openHeadless(projectPath, options);
|
|
71
70
|
return;
|
|
72
71
|
}
|
|
73
|
-
// A headless editor this CLI started holds the project: close it so the windowed one can open
|
|
74
|
-
|
|
72
|
+
// A headless editor this CLI started holds the project: close it so the windowed one can open (its lease
|
|
73
|
+
// names the server it runs on, so `--url` — this open's connection, possibly remote — is not needed here).
|
|
75
74
|
let prepared;
|
|
76
75
|
try {
|
|
77
|
-
prepared = await createGodotSession({ projectPath, ...resolveSessionConnection({
|
|
76
|
+
prepared = await createGodotSession({ projectPath, ...resolveSessionConnection({ token: options.token }) }).session.prepareWindowOpen();
|
|
78
77
|
}
|
|
79
78
|
catch (err) {
|
|
80
79
|
ui.error(err instanceof Error ? err.message : String(err));
|
|
@@ -204,10 +203,10 @@ async function openHeadless(projectPath, options) {
|
|
|
204
203
|
ui.error(result.message);
|
|
205
204
|
process.exit(1);
|
|
206
205
|
}
|
|
207
|
-
const { ensured
|
|
206
|
+
const { ensured } = result;
|
|
208
207
|
const pid = ensured.lease?.pid;
|
|
209
208
|
const what = ensured.source === 'started' ? 'Started a headless Godot editor' : 'A Godot editor is already running for this project';
|
|
210
|
-
spinner.success(`${what}${pid !== undefined ? ` (PID ${pid})` : ''}; MCP server ready at ${
|
|
209
|
+
spinner.success(`${what}${pid !== undefined ? ` (PID ${pid})` : ''}; MCP server ready at ${ensured.ready}`);
|
|
211
210
|
if (ensured.source === 'started' && idleSeconds > 0)
|
|
212
211
|
ui.info(`It quits after ${idleSeconds}s without tool calls.`);
|
|
213
212
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open.js","sourceRoot":"","sources":["../../src/commands/open.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EACL,WAAW,EACX,kBAAkB,IAAI,qBAAqB,EAC3C,iBAAiB,IAAI,oBAAoB,GAC1C,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAExF,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"open.js","sourceRoot":"","sources":["../../src/commands/open.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/exec.d.ts
CHANGED
|
@@ -2,8 +2,12 @@ import type { EnsureResult } from '@baizor/gamedev-cli-core';
|
|
|
2
2
|
import { type EnsureEditorDeps, type EnsureEditorOptions, type EnsureEditorResult } from './session.js';
|
|
3
3
|
import type { RunToolFailure, RunToolOptions, RunToolResult } from './types.js';
|
|
4
4
|
export declare const SCRIPT_EXECUTE_TOOL = "script-execute";
|
|
5
|
-
/**
|
|
6
|
-
|
|
5
|
+
/**
|
|
6
|
+
* Default `script-execute` call timeout. Longer than the server `tool-timeout` the addon passes
|
|
7
|
+
* (`GodotMcpServerView.ToolTimeoutMs`, parity-tested), so a call the server gives up on returns the server's
|
|
8
|
+
* timeout error instead of a client abort.
|
|
9
|
+
*/
|
|
10
|
+
export declare const DEFAULT_EXEC_TIMEOUT_MS = 310000;
|
|
7
11
|
/** Injection points for tests. */
|
|
8
12
|
export interface ExecDeps extends EnsureEditorDeps {
|
|
9
13
|
invoke: (options: RunToolOptions) => Promise<RunToolResult>;
|
|
@@ -12,7 +16,7 @@ export interface ExecCodeOptions extends EnsureEditorOptions {
|
|
|
12
16
|
code: string;
|
|
13
17
|
usings?: string[];
|
|
14
18
|
include?: string[];
|
|
15
|
-
/** Tool call timeout. Default
|
|
19
|
+
/** Tool call timeout. Default {@link DEFAULT_EXEC_TIMEOUT_MS}. */
|
|
16
20
|
timeoutMs?: number;
|
|
17
21
|
deps?: Partial<ExecDeps>;
|
|
18
22
|
}
|
package/dist/lib/exec.js
CHANGED
|
@@ -3,8 +3,12 @@
|
|
|
3
3
|
import { runTool } from './run-tool.js';
|
|
4
4
|
import { ensureEditor } from './session.js';
|
|
5
5
|
export const SCRIPT_EXECUTE_TOOL = 'script-execute';
|
|
6
|
-
/**
|
|
7
|
-
|
|
6
|
+
/**
|
|
7
|
+
* Default `script-execute` call timeout. Longer than the server `tool-timeout` the addon passes
|
|
8
|
+
* (`GodotMcpServerView.ToolTimeoutMs`, parity-tested), so a call the server gives up on returns the server's
|
|
9
|
+
* timeout error instead of a client abort.
|
|
10
|
+
*/
|
|
11
|
+
export const DEFAULT_EXEC_TIMEOUT_MS = 310000;
|
|
8
12
|
/**
|
|
9
13
|
* Run C# in the project's editor. A running editor (GUI or headless) is reused and never closed; otherwise one is
|
|
10
14
|
* started headless (or windowed) on the project's local server that quits by itself after `idleSeconds` without
|
package/dist/lib/exec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/lib/exec.ts"],"names":[],"mappings":"AAAA,iHAAiH;AACjH,8FAA8F;AAG9F,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,YAAY,EAA4E,MAAM,cAAc,CAAC;AAGtH,MAAM,CAAC,MAAM,mBAAmB,GAAG,gBAAgB,CAAC;AAEpD
|
|
1
|
+
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/lib/exec.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/session.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { EditorSession, type EngineAdapter, type EnsureResult, type SessionProcessOps } from '@baizor/gamedev-cli-core';
|
|
1
|
+
import { EditorSession, type EditorSessionOptions, type EngineAdapter, type EnsureResult, type SessionProcessOps } from '@baizor/gamedev-cli-core';
|
|
2
2
|
import type { BuildProjectResult } from './types.js';
|
|
3
3
|
/** The plugin's system tool that saves and quits a CLI-started editor (a windowless one gets no WM_CLOSE). */
|
|
4
4
|
export declare const SESSION_CLOSE_TOOL = "session-close";
|
|
@@ -7,6 +7,7 @@ export interface GodotSessionOptions {
|
|
|
7
7
|
/**
|
|
8
8
|
* The server the editor's plugin connects to and the session probes. Default: the project's local port
|
|
9
9
|
* (`http://localhost:<derived>`). A non-loopback URL is rejected: headless sessions are local only.
|
|
10
|
+
* {@link ensureEditor} prefers the server of a verified live CLI editor of the project (its lease).
|
|
10
11
|
*/
|
|
11
12
|
url?: string;
|
|
12
13
|
/** Bearer token: the started editor uses it (auth Required) and every probe / call sends it. */
|
|
@@ -17,14 +18,14 @@ export interface GodotSessionOptions {
|
|
|
17
18
|
idleSeconds?: number;
|
|
18
19
|
/** How long to wait for a started editor's MCP server. Default 300000. */
|
|
19
20
|
readyTimeoutMs?: number;
|
|
21
|
+
/** Runs under the session's startup lock right before it starts an editor (the C# build). */
|
|
22
|
+
beforeLaunch?: EditorSessionOptions<string>['beforeLaunch'];
|
|
20
23
|
onStatus?: (message: string) => void;
|
|
21
24
|
/** Tests: OS process primitives. */
|
|
22
25
|
processOps?: Partial<SessionProcessOps>;
|
|
23
26
|
}
|
|
24
27
|
export interface GodotSession {
|
|
25
28
|
session: EditorSession<string>;
|
|
26
|
-
/** One readiness check of the local server (the session's warm-path probe): the URL, or undefined. */
|
|
27
|
-
probe: () => Promise<string | undefined>;
|
|
28
29
|
/** The local server URL the session probes and a started editor binds. */
|
|
29
30
|
url: string;
|
|
30
31
|
}
|
|
@@ -33,22 +34,20 @@ export interface GodotSession {
|
|
|
33
34
|
* (there is no dock button to press in a headless editor), and the token when one is given.
|
|
34
35
|
*/
|
|
35
36
|
export declare function sessionEditorEnv(url: string, token: string | undefined): Record<string, string>;
|
|
36
|
-
/** The Godot adapter with the CLI's hooks: running-editor detection and the plugin-side graceful close. */
|
|
37
|
-
export declare function godotSessionAdapter(url: string, token: string | undefined, readNonce: () => string | undefined): EngineAdapter;
|
|
38
|
-
/** Build the session of a Godot project. Throws when `url` is not local. */
|
|
39
|
-
export declare function createGodotSession(options: GodotSessionOptions): GodotSession;
|
|
40
37
|
/**
|
|
41
|
-
*
|
|
42
|
-
*
|
|
43
|
-
*
|
|
38
|
+
* The Godot adapter with the CLI's hooks: running-editor detection (its pid, so the session notices when it exits)
|
|
39
|
+
* and the plugin-side graceful close through the verified lease (its nonce, and the server it was started on;
|
|
40
|
+
* `url` serves a lease written before cli-core 0.7.1, which has no `serverUrl`).
|
|
44
41
|
*/
|
|
45
|
-
export declare function
|
|
42
|
+
export declare function godotSessionAdapter(url: string, token: string | undefined): EngineAdapter;
|
|
43
|
+
/** Build the session of a Godot project. Throws when `url` is not local. */
|
|
44
|
+
export declare function createGodotSession(options: GodotSessionOptions): GodotSession;
|
|
46
45
|
/** Injection points for tests. */
|
|
47
46
|
export interface EnsureEditorDeps {
|
|
48
47
|
ensure: (session: EditorSession<string>, mode: 'headless' | 'window') => Promise<EnsureResult<string>>;
|
|
49
48
|
build: (projectPath: string) => Promise<BuildProjectResult>;
|
|
50
49
|
}
|
|
51
|
-
export interface EnsureEditorOptions extends GodotSessionOptions {
|
|
50
|
+
export interface EnsureEditorOptions extends Omit<GodotSessionOptions, 'beforeLaunch'> {
|
|
52
51
|
/** Start the editor with a window instead of headless (only when none is running yet). */
|
|
53
52
|
window?: boolean;
|
|
54
53
|
/** Build the C# assembly before starting an editor. Default true. */
|
|
@@ -73,6 +72,8 @@ export type EnsureEditorResult = {
|
|
|
73
72
|
};
|
|
74
73
|
/**
|
|
75
74
|
* A ready editor of the project (the `exec` / `open --headless` policy): reuse a running one, otherwise build the
|
|
76
|
-
* C# assembly and start
|
|
75
|
+
* C# assembly (Godot does not build it in a headless editor, and a missing assembly disables the addon) and start
|
|
76
|
+
* ours. The build runs under the session's startup lock, only when this call starts the editor: parallel cold calls
|
|
77
|
+
* build once and join that editor.
|
|
77
78
|
*/
|
|
78
79
|
export declare function ensureEditor(options: EnsureEditorOptions): Promise<EnsureEditorResult>;
|
package/dist/lib/session.js
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
// Godot editor sessions on the shared cli-core EditorSession (Code-Exec plan §4.6): reuse any running editor of
|
|
2
2
|
// the project, otherwise start our own (headless by default) connected to the project's LOCAL MCP server, with a
|
|
3
3
|
// lease so only our own editor is ever closed. Library-safe: no console output, no `process.exit`.
|
|
4
|
-
import * as fs from 'fs';
|
|
5
|
-
import * as os from 'os';
|
|
6
4
|
import * as path from 'path';
|
|
7
|
-
import {
|
|
5
|
+
import { EditorSession, EditorSessionError, godotAdapter, mcpReadinessProbe, } from '@baizor/gamedev-cli-core';
|
|
8
6
|
import { buildProject } from './build.js';
|
|
9
7
|
import { runSystemTool } from './run-tool.js';
|
|
10
8
|
import { findGodotBinary } from '../utils/godot-editor.js';
|
|
@@ -13,38 +11,41 @@ import { isLocalhostUrl } from '../utils/project-marker.js';
|
|
|
13
11
|
import { ENV_AUTH_OPTION, ENV_CONNECTION_MODE, ENV_HOST, ENV_START_SERVER, ENV_TOKEN, localProjectUrl, } from '../utils/connection.js';
|
|
14
12
|
/** The plugin's system tool that saves and quits a CLI-started editor (a windowless one gets no WM_CLOSE). */
|
|
15
13
|
export const SESSION_CLOSE_TOOL = 'session-close';
|
|
16
|
-
/** Serializes the pre-start C# build of a project (beside the session lock). */
|
|
17
|
-
const BUILD_LOCK_FILE_NAME = 'build.lock';
|
|
18
14
|
/** How long to wait for a user's own editor whose local server does not answer yet (it may still be loading). */
|
|
19
|
-
const FOREIGN_READY_TIMEOUT_MS =
|
|
15
|
+
const FOREIGN_READY_TIMEOUT_MS = 60000;
|
|
16
|
+
/** The connection mode of an editor the session starts (a local server), in its env and its lease. */
|
|
17
|
+
const SESSION_CONNECTION_MODE = 'Custom';
|
|
20
18
|
/**
|
|
21
19
|
* Environment of an editor the session starts: Custom mode on the local URL, the plugin starts the local server
|
|
22
20
|
* (there is no dock button to press in a headless editor), and the token when one is given.
|
|
23
21
|
*/
|
|
24
22
|
export function sessionEditorEnv(url, token) {
|
|
25
23
|
return {
|
|
26
|
-
[ENV_CONNECTION_MODE]:
|
|
24
|
+
[ENV_CONNECTION_MODE]: SESSION_CONNECTION_MODE,
|
|
27
25
|
[ENV_HOST]: url,
|
|
28
26
|
[ENV_START_SERVER]: 'true',
|
|
29
27
|
...(token ? { [ENV_TOKEN]: token, [ENV_AUTH_OPTION]: 'Required' } : {}),
|
|
30
28
|
};
|
|
31
29
|
}
|
|
32
|
-
/**
|
|
33
|
-
|
|
30
|
+
/**
|
|
31
|
+
* The Godot adapter with the CLI's hooks: running-editor detection (its pid, so the session notices when it exits)
|
|
32
|
+
* and the plugin-side graceful close through the verified lease (its nonce, and the server it was started on;
|
|
33
|
+
* `url` serves a lease written before cli-core 0.7.1, which has no `serverUrl`).
|
|
34
|
+
*/
|
|
35
|
+
export function godotSessionAdapter(url, token) {
|
|
34
36
|
return {
|
|
35
37
|
...godotAdapter,
|
|
36
38
|
editor: {
|
|
37
39
|
...godotAdapter.editor,
|
|
38
|
-
findRunningEditor: async (projectRoot) => findGodotProcess(projectRoot)
|
|
39
|
-
requestClose: async () => {
|
|
40
|
-
|
|
41
|
-
if (nonce === undefined)
|
|
40
|
+
findRunningEditor: async (projectRoot) => findGodotProcess(projectRoot)?.pid ?? false,
|
|
41
|
+
requestClose: async (_pid, _projectRoot, lease) => {
|
|
42
|
+
if (lease === undefined)
|
|
42
43
|
return false;
|
|
43
44
|
const result = await runSystemTool({
|
|
44
45
|
toolName: SESSION_CLOSE_TOOL,
|
|
45
|
-
url,
|
|
46
|
+
url: lease.serverUrl ?? url,
|
|
46
47
|
...(token ? { token } : {}),
|
|
47
|
-
input: { nonce },
|
|
48
|
+
input: { nonce: lease.nonce },
|
|
48
49
|
timeoutMs: 15000,
|
|
49
50
|
});
|
|
50
51
|
// A refusing tool (wrong nonce, an addon without session-close) answers 200 with status "error".
|
|
@@ -53,19 +54,20 @@ export function godotSessionAdapter(url, token, readNonce) {
|
|
|
53
54
|
},
|
|
54
55
|
};
|
|
55
56
|
}
|
|
57
|
+
function normalizeUrl(url) {
|
|
58
|
+
return url.replace(/\/+$/, '');
|
|
59
|
+
}
|
|
56
60
|
/** Build the session of a Godot project. Throws when `url` is not local. */
|
|
57
61
|
export function createGodotSession(options) {
|
|
58
62
|
const projectRoot = path.resolve(options.projectPath);
|
|
59
|
-
const url = (options.url ?? localProjectUrl(projectRoot))
|
|
63
|
+
const url = normalizeUrl(options.url ?? localProjectUrl(projectRoot));
|
|
60
64
|
if (!isLocalhostUrl(url)) {
|
|
61
65
|
throw new Error(`editor sessions connect to a local server only; ${url} is not on this machine`);
|
|
62
66
|
}
|
|
63
|
-
const probe = mcpReadinessProbe({ urls: [url], ...(options.token ? { token: options.token } : {}) });
|
|
64
67
|
const session = new EditorSession({
|
|
65
|
-
|
|
66
|
-
adapter: godotSessionAdapter(url, options.token, () => session.readLease()?.nonce),
|
|
68
|
+
adapter: godotSessionAdapter(url, options.token),
|
|
67
69
|
projectRoot,
|
|
68
|
-
probeReady:
|
|
70
|
+
probeReady: mcpReadinessProbe({ urls: [url], ...(options.token ? { token: options.token } : {}) }),
|
|
69
71
|
editorBinary: () => {
|
|
70
72
|
const binary = findGodotBinary(options.editorPath);
|
|
71
73
|
if (!binary)
|
|
@@ -73,106 +75,94 @@ export function createGodotSession(options) {
|
|
|
73
75
|
return binary;
|
|
74
76
|
},
|
|
75
77
|
env: sessionEditorEnv(url, options.token),
|
|
78
|
+
// The resolved, normalised connection the started editor gets (env above), recorded in the lease.
|
|
79
|
+
serverUrl: url,
|
|
80
|
+
connectionMode: SESSION_CONNECTION_MODE,
|
|
81
|
+
// The user's editor without a reachable local server: it may still be loading, but do not wait the full start budget.
|
|
82
|
+
foreignReadyTimeoutMs: Math.min(options.readyTimeoutMs ?? FOREIGN_READY_TIMEOUT_MS, FOREIGN_READY_TIMEOUT_MS),
|
|
83
|
+
...(options.beforeLaunch ? { beforeLaunch: options.beforeLaunch } : {}),
|
|
76
84
|
...(options.idleSeconds !== undefined ? { idleSeconds: options.idleSeconds } : {}),
|
|
77
85
|
...(options.readyTimeoutMs !== undefined ? { readyTimeoutMs: options.readyTimeoutMs } : {}),
|
|
78
86
|
...(options.onStatus ? { onStatus: options.onStatus } : {}),
|
|
79
87
|
...(options.processOps ? { processOps: options.processOps } : {}),
|
|
80
88
|
});
|
|
81
|
-
return { session,
|
|
89
|
+
return { session, url };
|
|
82
90
|
}
|
|
83
|
-
/**
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
const dir = path.join(path.resolve(projectPath), SESSION_DIR_NAME);
|
|
90
|
-
removeDeadBuildLock(path.join(dir, BUILD_LOCK_FILE_NAME));
|
|
91
|
-
const lock = new MachineCredentialLock(dir, {
|
|
92
|
-
lockFileName: BUILD_LOCK_FILE_NAME,
|
|
93
|
-
staleMs: 600000,
|
|
94
|
-
acquireBudgetMs: 900000,
|
|
95
|
-
});
|
|
96
|
-
return lock.withLock(() => buildProject({ projectPath }));
|
|
91
|
+
/** The pre-launch C# build failed (thrown from `beforeLaunch`, which `ensure` propagates unchanged). */
|
|
92
|
+
class BuildFailedError extends Error {
|
|
93
|
+
constructor(buildError) {
|
|
94
|
+
super(buildError.message);
|
|
95
|
+
this.buildError = buildError;
|
|
96
|
+
}
|
|
97
97
|
}
|
|
98
98
|
/**
|
|
99
99
|
* A ready editor of the project (the `exec` / `open --headless` policy): reuse a running one, otherwise build the
|
|
100
|
-
* C# assembly and start
|
|
100
|
+
* C# assembly (Godot does not build it in a headless editor, and a missing assembly disables the addon) and start
|
|
101
|
+
* ours. The build runs under the session's startup lock, only when this call starts the editor: parallel cold calls
|
|
102
|
+
* build once and join that editor.
|
|
101
103
|
*/
|
|
102
104
|
export async function ensureEditor(options) {
|
|
103
105
|
const deps = {
|
|
104
106
|
ensure: (session, mode) => session.ensure({ mode }),
|
|
105
|
-
build:
|
|
107
|
+
build: (projectPath) => buildProject({ projectPath }),
|
|
106
108
|
...options.deps,
|
|
107
109
|
};
|
|
108
110
|
const fail = (reason, err, hint = '') => {
|
|
109
111
|
const error = err instanceof Error ? err : new Error(String(err));
|
|
110
112
|
return { kind: 'failure', success: false, reason, message: error.message + hint, error };
|
|
111
113
|
};
|
|
112
|
-
|
|
113
|
-
try {
|
|
114
|
-
godot = createGodotSession(options);
|
|
115
|
-
}
|
|
116
|
-
catch (err) {
|
|
117
|
-
return fail('invalid-options', err);
|
|
118
|
-
}
|
|
119
|
-
// Warm path: the local server answers, so an editor is up (the session would only probe it again).
|
|
120
|
-
const running = await godot.probe();
|
|
121
|
-
if (running !== undefined)
|
|
122
|
-
return { kind: 'success', success: true, godot, ensured: { ready: running, source: 'running' } };
|
|
123
|
-
const ours = await godot.session.ownedSession();
|
|
124
|
-
const foreign = ours === undefined && godot.session.readLease() === undefined && findGodotProcess(godot.session.projectRoot) !== null;
|
|
125
|
-
if (foreign) {
|
|
126
|
-
// The user's editor without a reachable local server: it may still be loading, but do not wait the full start budget.
|
|
127
|
-
godot = createGodotSession({ ...options, readyTimeoutMs: Math.min(options.readyTimeoutMs ?? FOREIGN_READY_TIMEOUT_MS, FOREIGN_READY_TIMEOUT_MS) });
|
|
128
|
-
}
|
|
129
|
-
else if (options.build !== false && ours === undefined) {
|
|
130
|
-
// Build only when an editor is about to be started: none of ours runs (or is starting), and no other editor has the project.
|
|
114
|
+
const beforeLaunch = async (projectRoot) => {
|
|
131
115
|
options.onStatus?.('Building C# assembly...');
|
|
132
116
|
let built;
|
|
133
117
|
try {
|
|
134
|
-
built = await deps.build(
|
|
118
|
+
built = await deps.build(projectRoot);
|
|
135
119
|
}
|
|
136
120
|
catch (err) {
|
|
137
|
-
|
|
121
|
+
throw new BuildFailedError(err instanceof Error ? err : new Error(String(err)));
|
|
138
122
|
}
|
|
139
123
|
if (built.kind === 'failure')
|
|
140
|
-
|
|
124
|
+
throw new BuildFailedError(built.error);
|
|
125
|
+
};
|
|
126
|
+
const sessionOptions = { ...options, ...(options.build !== false ? { beforeLaunch } : {}) };
|
|
127
|
+
let godot;
|
|
128
|
+
try {
|
|
129
|
+
godot = createGodotSession(sessionOptions);
|
|
130
|
+
// Our editor of this project runs: talk to the server it was started on (it may differ from --url /
|
|
131
|
+
// GODOT_MCP_HOST). Only a lease cli-core verified live counts: a crashed editor's lease may name a port that
|
|
132
|
+
// another project's editor serves now.
|
|
133
|
+
const leasedUrl = (await godot.session.ownedSession())?.serverUrl;
|
|
134
|
+
if (leasedUrl !== undefined && isLocalhostUrl(leasedUrl) && normalizeUrl(leasedUrl) !== godot.url) {
|
|
135
|
+
godot = createGodotSession({ ...sessionOptions, url: leasedUrl });
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
catch (err) {
|
|
139
|
+
return fail('invalid-options', err);
|
|
141
140
|
}
|
|
142
141
|
try {
|
|
143
142
|
return { kind: 'success', success: true, godot, ensured: await deps.ensure(godot.session, options.window ? 'window' : 'headless') };
|
|
144
143
|
}
|
|
145
144
|
catch (err) {
|
|
146
|
-
|
|
145
|
+
if (err instanceof BuildFailedError)
|
|
146
|
+
return fail('build-failed', err.buildError);
|
|
147
|
+
const sessionError = err instanceof EditorSessionError ? err : undefined;
|
|
147
148
|
let hint = '';
|
|
148
|
-
if (
|
|
149
|
-
if (
|
|
150
|
-
//
|
|
151
|
-
hint = ` (
|
|
149
|
+
if (sessionError?.reason === 'not-ready') {
|
|
150
|
+
if (sessionError.source === 'foreign') {
|
|
151
|
+
// Core's message says what is wrong; add only how to fix it in Godot.
|
|
152
|
+
hint = ` (Godot: in that editor's AI Game Developer dock choose Custom mode and start the server on ${godot.url})`;
|
|
152
153
|
}
|
|
153
|
-
else {
|
|
154
|
-
//
|
|
154
|
+
else if (sessionError.source === 'started') {
|
|
155
|
+
// The editor this call started never answered (e.g. the addon failed to load): it would never idle out.
|
|
155
156
|
const closed = await godot.session.closeOwned({ timeoutMs: 5000, force: true });
|
|
156
157
|
hint = closed.kind === 'closed' ? ` (stopped the unresponsive editor, PID ${closed.pid}; see its log)` : '';
|
|
157
158
|
}
|
|
159
|
+
else {
|
|
160
|
+
// Another call's editor: that call may still be waiting for it, so it is not stopped here.
|
|
161
|
+
hint = ' (an editor started by another godot-cli call; `godot-cli close --owned-only --force` stops it)';
|
|
162
|
+
}
|
|
158
163
|
}
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
}
|
|
162
|
-
/**
|
|
163
|
-
* Delete a build lock whose holder was this machine and is gone (a Ctrl+C mid-build never releases it); the lock
|
|
164
|
-
* protocol alone would wait out its staleness bar. Best-effort.
|
|
165
|
-
*/
|
|
166
|
-
function removeDeadBuildLock(lockPath) {
|
|
167
|
-
try {
|
|
168
|
-
const holder = JSON.parse(fs.readFileSync(lockPath, 'utf-8'));
|
|
169
|
-
if (typeof holder.pid === 'number' && typeof holder.hostId === 'string' && holder.hostId.toLowerCase() === os.hostname().toLowerCase()
|
|
170
|
-
&& !defaultSessionProcessOps.isAlive(holder.pid)) {
|
|
171
|
-
fs.rmSync(lockPath, { force: true });
|
|
172
|
-
}
|
|
173
|
-
}
|
|
174
|
-
catch {
|
|
175
|
-
// no lock, or one we cannot read: the lock protocol decides
|
|
164
|
+
const notReady = sessionError?.reason === 'exited' || sessionError?.reason === 'not-ready';
|
|
165
|
+
return fail(notReady ? 'not-ready' : 'launch-failed', err, hint);
|
|
176
166
|
}
|
|
177
167
|
}
|
|
178
168
|
//# sourceMappingURL=session.js.map
|
package/dist/lib/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/lib/session.ts"],"names":[],"mappings":"AAAA,gHAAgH;AAChH,iHAAiH;AACjH,mGAAmG;AAEnG,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/lib/session.ts"],"names":[],"mappings":"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"}
|
package/dist/lib.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
export { openProject } from './lib/open.js';
|
|
2
2
|
export { execCode, readToolResponse, buildScriptExecuteInput, SCRIPT_EXECUTE_TOOL } from './lib/exec.js';
|
|
3
3
|
export type { ExecCodeOptions, ExecCodeResult, ExecCodeSuccess, ExecCodeFailure } from './lib/exec.js';
|
|
4
|
-
export { ensureEditor, SESSION_CLOSE_TOOL } from './lib/session.js';
|
|
5
|
-
export type { GodotSessionOptions, EnsureEditorOptions, EnsureEditorResult } from './lib/session.js';
|
|
4
|
+
export { createGodotSession, ensureEditor, SESSION_CLOSE_TOOL } from './lib/session.js';
|
|
5
|
+
export type { GodotSession, GodotSessionOptions, EnsureEditorOptions, EnsureEditorResult } from './lib/session.js';
|
|
6
6
|
export { buildProject } from './lib/build.js';
|
|
7
7
|
export { createProject } from './lib/create-project.js';
|
|
8
8
|
export { runTool, runSystemTool } from './lib/run-tool.js';
|
package/dist/lib.js
CHANGED
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
// via the `exports` field in package.json).
|
|
15
15
|
export { openProject } from './lib/open.js';
|
|
16
16
|
export { execCode, readToolResponse, buildScriptExecuteInput, SCRIPT_EXECUTE_TOOL } from './lib/exec.js';
|
|
17
|
-
export { ensureEditor, SESSION_CLOSE_TOOL } from './lib/session.js';
|
|
17
|
+
export { createGodotSession, ensureEditor, SESSION_CLOSE_TOOL } from './lib/session.js';
|
|
18
18
|
export { buildProject } from './lib/build.js';
|
|
19
19
|
export { createProject } from './lib/create-project.js';
|
|
20
20
|
export { runTool, runSystemTool } from './lib/run-tool.js';
|
package/dist/lib.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,EAAE;AACF,eAAe;AACf,+EAA+E;AAC/E,wDAAwD;AACxD,oDAAoD;AACpD,yEAAyE;AACzE,4DAA4D;AAC5D,+EAA+E;AAC/E,gEAAgE;AAChE,6EAA6E;AAC7E,EAAE;AACF,0EAA0E;AAC1E,4CAA4C;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEzG,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,EAAE;AACF,eAAe;AACf,+EAA+E;AAC/E,wDAAwD;AACxD,oDAAoD;AACpD,yEAAyE;AACzE,4DAA4D;AAC5D,+EAA+E;AAC/E,gEAAgE;AAChE,6EAA6E;AAC7E,EAAE;AACF,0EAA0E;AAC1E,4CAA4C;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEzG,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAExF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,0FAA0F;AAC1F,yFAAyF;AACzF,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC"}
|
|
@@ -4,7 +4,18 @@ export interface AddonPackageReference {
|
|
|
4
4
|
id: string;
|
|
5
5
|
/** The pinned version (the `Version=` attribute). */
|
|
6
6
|
version: string;
|
|
7
|
+
/**
|
|
8
|
+
* Only editor (`#if TOOLS`) code uses the package: it is written with `EDITOR_ONLY_CONDITION`, so Godot's
|
|
9
|
+
* export builds leave it out (an exported game ships no RQL / Roslyn).
|
|
10
|
+
*/
|
|
11
|
+
editorOnly?: boolean;
|
|
7
12
|
}
|
|
13
|
+
/**
|
|
14
|
+
* The MSBuild condition of an editor-only `<PackageReference>`: every configuration except Godot's two export
|
|
15
|
+
* builds (`ExportDebug` / `ExportRelease`, the ones without `TOOLS`). The Godot SDK applies the same rule to
|
|
16
|
+
* GodotSharpEditor. Godot-MCP.csproj marks its editor-only packages with this exact attribute.
|
|
17
|
+
*/
|
|
18
|
+
export declare const EDITOR_ONLY_CONDITION = "'$(Configuration)' != 'ExportDebug' and '$(Configuration)' != 'ExportRelease'";
|
|
8
19
|
/**
|
|
9
20
|
* A single `<EmbeddedResource>` the consumer csproj must declare so an asset the
|
|
10
21
|
* addon reads at editor runtime via `GetManifestResourceStream` is embedded into
|
package/dist/utils/addon-deps.js
CHANGED
|
@@ -11,12 +11,19 @@
|
|
|
11
11
|
// this CLI's version — the SAME values, never a bump of those pins. `com.IvanMurzak.Rql` (the RQL data layer of
|
|
12
12
|
// the editor tools, PolyForm Shield 1.0.0) is a direct dependency of the addon sources since 1.0; Code-Exec
|
|
13
13
|
// (`com.IvanMurzak.CodeExec` + the source-only `.Roslyn` adapter, compiled against the pinned
|
|
14
|
-
// `Microsoft.CodeAnalysis.CSharp`) runs `script-execute`.
|
|
14
|
+
// `Microsoft.CodeAnalysis.CSharp`) runs `script-execute`. Those four are `editorOnly`: only `#if TOOLS` code
|
|
15
|
+
// uses them, so exported games ship neither RQL nor Roslyn. A parity test
|
|
15
16
|
// (`cli/tests/addon-deps-parity.test.ts`) reads `Godot-MCP.csproj` and FAILS the
|
|
16
17
|
// build if these constants ever drift from the addon's pins, so the scaffold can
|
|
17
18
|
// never silently install a mismatched version.
|
|
18
19
|
//
|
|
19
20
|
// No top-level side effects; pure data + pure string transforms only.
|
|
21
|
+
/**
|
|
22
|
+
* The MSBuild condition of an editor-only `<PackageReference>`: every configuration except Godot's two export
|
|
23
|
+
* builds (`ExportDebug` / `ExportRelease`, the ones without `TOOLS`). The Godot SDK applies the same rule to
|
|
24
|
+
* GodotSharpEditor. Godot-MCP.csproj marks its editor-only packages with this exact attribute.
|
|
25
|
+
*/
|
|
26
|
+
export const EDITOR_ONLY_CONDITION = "'$(Configuration)' != 'ExportDebug' and '$(Configuration)' != 'ExportRelease'";
|
|
20
27
|
/**
|
|
21
28
|
* The NuGet `PackageReference`s the addon of THIS CLI's version needs (fallback when
|
|
22
29
|
* the installed addon carries no `nuget-deps.json`), mirroring `Godot-MCP.csproj`.
|
|
@@ -24,11 +31,11 @@
|
|
|
24
31
|
*/
|
|
25
32
|
export const ADDON_PACKAGE_REFERENCES = [
|
|
26
33
|
{ id: 'com.IvanMurzak.ReflectorNet', version: '5.4.3' },
|
|
27
|
-
{ id: 'com.IvanMurzak.McpPlugin', version: '8.
|
|
28
|
-
{ id: 'com.IvanMurzak.Rql', version: '0.1.1' },
|
|
29
|
-
{ id: 'com.IvanMurzak.CodeExec', version: '0.2.
|
|
30
|
-
{ id: 'com.IvanMurzak.CodeExec.Roslyn', version: '0.2.
|
|
31
|
-
{ id: 'Microsoft.CodeAnalysis.CSharp', version: '4.12.0' },
|
|
34
|
+
{ id: 'com.IvanMurzak.McpPlugin', version: '8.11.0' },
|
|
35
|
+
{ id: 'com.IvanMurzak.Rql', version: '0.1.1', editorOnly: true },
|
|
36
|
+
{ id: 'com.IvanMurzak.CodeExec', version: '0.2.1', editorOnly: true },
|
|
37
|
+
{ id: 'com.IvanMurzak.CodeExec.Roslyn', version: '0.2.1', editorOnly: true },
|
|
38
|
+
{ id: 'Microsoft.CodeAnalysis.CSharp', version: '4.12.0', editorOnly: true },
|
|
32
39
|
];
|
|
33
40
|
/**
|
|
34
41
|
* The exact `<EmbeddedResource>`s the consumer's project `.csproj` needs, single-sourced
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addon-deps.js","sourceRoot":"","sources":["../../src/utils/addon-deps.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,mFAAmF;AACnF,oEAAoE;AACpE,6BAA6B;AAC7B,EAAE;AACF,gFAAgF;AAChF,0EAA0E;AAC1E,mFAAmF;AACnF,oFAAoF;AACpF,oFAAoF;AACpF,gHAAgH;AAChH,4GAA4G;AAC5G,8FAA8F;AAC9F,
|
|
1
|
+
{"version":3,"file":"addon-deps.js","sourceRoot":"","sources":["../../src/utils/addon-deps.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,mFAAmF;AACnF,oEAAoE;AACpE,6BAA6B;AAC7B,EAAE;AACF,gFAAgF;AAChF,0EAA0E;AAC1E,mFAAmF;AACnF,oFAAoF;AACpF,oFAAoF;AACpF,gHAAgH;AAChH,4GAA4G;AAC5G,8FAA8F;AAC9F,6GAA6G;AAC7G,0EAA0E;AAC1E,iFAAiF;AACjF,iFAAiF;AACjF,+CAA+C;AAC/C,EAAE;AACF,sEAAsE;AAetE;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,+EAA+E,CAAC;AAgBrH;;;;GAIG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAqC;IACxE,EAAE,EAAE,EAAE,6BAA6B,EAAE,OAAO,EAAE,OAAO,EAAE;IACvD,EAAE,EAAE,EAAE,0BAA0B,EAAE,OAAO,EAAE,QAAQ,EAAE;IACrD,EAAE,EAAE,EAAE,oBAAoB,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE;IAChE,EAAE,EAAE,EAAE,yBAAyB,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE;IACrE,EAAE,EAAE,EAAE,gCAAgC,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE;IAC5E,EAAE,EAAE,EAAE,+BAA+B,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE;CACpE,CAAC;AAEX;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAqC;IACxE;QACE,OAAO,EAAE,0CAA0C;QACnD,WAAW,EAAE,mCAAmC;KACjD;CACO,CAAC;AAEX,wFAAwF;AACxF,MAAM,CAAC,MAAM,yBAAyB,GAAG,mCAAmC,CAAC"}
|
|
@@ -7,11 +7,15 @@ export interface ResolvedAddonNugetDeps {
|
|
|
7
7
|
file?: string;
|
|
8
8
|
warnings: string[];
|
|
9
9
|
}
|
|
10
|
-
/**
|
|
10
|
+
/**
|
|
11
|
+
* Every `<PackageReference Include=".." Version="..">` in a csproj text, in document order. A reference whose
|
|
12
|
+
* `Condition` is `EDITOR_ONLY_CONDITION` is editor-only.
|
|
13
|
+
*/
|
|
11
14
|
export declare function parseCsprojPackageReferences(csprojText: string): AddonPackageReference[];
|
|
12
15
|
/**
|
|
13
|
-
* Parse a `nuget-deps.json` manifest (`{ "packageReferences": [{ "id", "version" }] }`).
|
|
14
|
-
*
|
|
16
|
+
* Parse a `nuget-deps.json` manifest (`{ "packageReferences": [{ "id", "version", "editorOnly"? }] }`).
|
|
17
|
+
* Manifests that predate `editorOnly` mark nothing editor-only, which those addons need (their RQL sources
|
|
18
|
+
* compile into export builds). Throws on malformed JSON, a missing/empty list, or an invalid entry.
|
|
15
19
|
*/
|
|
16
20
|
export declare function parseAddonNugetDeps(text: string): AddonPackageReference[];
|
|
17
21
|
/**
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as fs from 'fs';
|
|
2
2
|
import * as path from 'path';
|
|
3
|
-
import { ADDON_PACKAGE_REFERENCES } from './addon-deps.js';
|
|
3
|
+
import { ADDON_PACKAGE_REFERENCES, EDITOR_ONLY_CONDITION } from './addon-deps.js';
|
|
4
4
|
// Resolve the NuGet PackageReferences the INSTALLED addon needs, so `install-plugin`
|
|
5
5
|
// pins the consumer csproj to what that addon release was built against — not to the
|
|
6
6
|
// constants baked into this CLI build (they differ whenever the addon version differs
|
|
@@ -22,24 +22,28 @@ const ADDON_CSPROJ_FILE = 'Godot-MCP.csproj';
|
|
|
22
22
|
// NuGet-shaped ids and versions are accepted (no quotes, `<`, `&`, whitespace).
|
|
23
23
|
const NUGET_ID_RE = /^[A-Za-z0-9_][A-Za-z0-9_.-]*$/;
|
|
24
24
|
const NUGET_VERSION_RE = /^[0-9A-Za-z][0-9A-Za-z.+-]*$/;
|
|
25
|
-
function validRef(id, version) {
|
|
25
|
+
function validRef(id, version, editorOnly) {
|
|
26
26
|
return typeof id === 'string' && typeof version === 'string' && NUGET_ID_RE.test(id) && NUGET_VERSION_RE.test(version)
|
|
27
|
-
? { id, version }
|
|
27
|
+
? { id, version, ...(editorOnly && { editorOnly }) }
|
|
28
28
|
: null;
|
|
29
29
|
}
|
|
30
|
-
/**
|
|
30
|
+
/**
|
|
31
|
+
* Every `<PackageReference Include=".." Version="..">` in a csproj text, in document order. A reference whose
|
|
32
|
+
* `Condition` is `EDITOR_ONLY_CONDITION` is editor-only.
|
|
33
|
+
*/
|
|
31
34
|
export function parseCsprojPackageReferences(csprojText) {
|
|
32
35
|
const refs = [];
|
|
33
36
|
for (const element of csprojText.match(/<PackageReference\b[^>]*>/gi) ?? []) {
|
|
34
|
-
const ref = validRef(/\bInclude\s*=\s*"([^"]+)"/i.exec(element)?.[1], /\bVersion\s*=\s*"([^"]+)"/i.exec(element)?.[1]);
|
|
37
|
+
const ref = validRef(/\bInclude\s*=\s*"([^"]+)"/i.exec(element)?.[1], /\bVersion\s*=\s*"([^"]+)"/i.exec(element)?.[1], /\bCondition\s*=\s*"([^"]*)"/i.exec(element)?.[1] === EDITOR_ONLY_CONDITION);
|
|
35
38
|
if (ref !== null)
|
|
36
39
|
refs.push(ref);
|
|
37
40
|
}
|
|
38
41
|
return refs;
|
|
39
42
|
}
|
|
40
43
|
/**
|
|
41
|
-
* Parse a `nuget-deps.json` manifest (`{ "packageReferences": [{ "id", "version" }] }`).
|
|
42
|
-
*
|
|
44
|
+
* Parse a `nuget-deps.json` manifest (`{ "packageReferences": [{ "id", "version", "editorOnly"? }] }`).
|
|
45
|
+
* Manifests that predate `editorOnly` mark nothing editor-only, which those addons need (their RQL sources
|
|
46
|
+
* compile into export builds). Throws on malformed JSON, a missing/empty list, or an invalid entry.
|
|
43
47
|
*/
|
|
44
48
|
export function parseAddonNugetDeps(text) {
|
|
45
49
|
const parsed = JSON.parse(text);
|
|
@@ -49,7 +53,7 @@ export function parseAddonNugetDeps(text) {
|
|
|
49
53
|
}
|
|
50
54
|
return list.map((entry, i) => {
|
|
51
55
|
const e = entry;
|
|
52
|
-
const ref = validRef(e?.id, e?.version);
|
|
56
|
+
const ref = validRef(e?.id, e?.version, e?.editorOnly === true);
|
|
53
57
|
if (ref === null)
|
|
54
58
|
throw new Error(`packageReferences[${i}] is not a valid { id, version } pair`);
|
|
55
59
|
return ref;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addon-nuget-deps.js","sourceRoot":"","sources":["../../src/utils/addon-nuget-deps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,wBAAwB,EAA8B,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"addon-nuget-deps.js","sourceRoot":"","sources":["../../src/utils/addon-nuget-deps.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,8 @@ import { type AddonPackageReference, type AddonEmbeddedResource } from './addon-
|
|
|
8
8
|
* - a project with NO `<ItemGroup>` at all (appends one before `</Project>`);
|
|
9
9
|
* - a project that already declares both pins at the right version (no change);
|
|
10
10
|
* - a project that declares one or both at a DIFFERENT version (reconciles in place);
|
|
11
|
-
* - a project that declares only one of the two (adds the missing one)
|
|
11
|
+
* - a project that declares only one of the two (adds the missing one);
|
|
12
|
+
* - an editor-only package declared without a Condition (adds the editor-only Condition, see `desiredCondition`).
|
|
12
13
|
*
|
|
13
14
|
* It deliberately does a minimal, well-scoped text edit rather than a full XML
|
|
14
15
|
* parse/serialize, to preserve the rest of the consumer's csproj formatting
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { isNewerVersion } from './semver.js';
|
|
2
|
-
import { ADDON_PACKAGE_REFERENCES, ADDON_EMBEDDED_RESOURCES, } from './addon-deps.js';
|
|
2
|
+
import { ADDON_PACKAGE_REFERENCES, ADDON_EMBEDDED_RESOURCES, EDITOR_ONLY_CONDITION, } from './addon-deps.js';
|
|
3
3
|
/** Escape a string for use inside a RegExp source. */
|
|
4
4
|
function escapeRegExp(value) {
|
|
5
5
|
return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
@@ -30,9 +30,40 @@ function embeddedResourceRegex(include) {
|
|
|
30
30
|
const escInclude = escapeRegExp(include);
|
|
31
31
|
return new RegExp(`<EmbeddedResource\\b[^>]*?\\bInclude\\s*=\\s*"${escInclude}"[^>]*?(?:/>|></EmbeddedResource>)`, 'i');
|
|
32
32
|
}
|
|
33
|
-
/** Render the
|
|
34
|
-
function renderRef(ref) {
|
|
35
|
-
|
|
33
|
+
/** Render the self-closing element for a reference, with its Condition when it has one. */
|
|
34
|
+
function renderRef(ref, condition) {
|
|
35
|
+
const conditionAttr = condition === undefined ? '' : ` Condition="${condition}"`;
|
|
36
|
+
return `<PackageReference Include="${ref.id}" Version="${ref.version}"${conditionAttr} />`;
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Rewrite an existing element's Version and Condition in place, keeping every other attribute the project set
|
|
40
|
+
* (`PrivateAssets`, `IncludeAssets`, ...) and its attribute order.
|
|
41
|
+
*/
|
|
42
|
+
function patchRef(element, version, condition) {
|
|
43
|
+
const conditionRe = /\s+Condition\s*=\s*"[^"]*"/i;
|
|
44
|
+
// Function replacers throughout: a Condition holds `$`.
|
|
45
|
+
let out = element.replace(/(\bVersion\s*=\s*")[^"]*"/i, (_m, head) => `${head}${version}"`);
|
|
46
|
+
if (condition === undefined)
|
|
47
|
+
return out.replace(conditionRe, '');
|
|
48
|
+
if (conditionRe.test(out))
|
|
49
|
+
return out.replace(conditionRe, () => ` Condition="${condition}"`);
|
|
50
|
+
out = out.replace(/\s*(\/>|><\/PackageReference>)$/i, (_m, end) => ` Condition="${condition}"${end === '/>' ? ' />' : end}`);
|
|
51
|
+
return out;
|
|
52
|
+
}
|
|
53
|
+
/** The packages this CLI knows as editor-only (an older addon's manifest may not mark them). */
|
|
54
|
+
const KNOWN_EDITOR_ONLY_IDS = new Set(ADDON_PACKAGE_REFERENCES.filter((r) => r.editorOnly).map((r) => r.id));
|
|
55
|
+
/**
|
|
56
|
+
* The Condition a reference's element should carry, given the one it has (`undefined` for a new element). An
|
|
57
|
+
* editor-only reference keeps any Condition the project already set (e.g. a stricter `== 'Debug'`) and gains the
|
|
58
|
+
* canonical one when it has none (the migration of csprojs written before editor-only packages). Any other reference
|
|
59
|
+
* keeps its own Condition, except the canonical editor-only one on a package this CLI writes editor-only, which an
|
|
60
|
+
* addon that needs the package in export builds (an older one) drops. The same Condition on another package (e.g.
|
|
61
|
+
* McpPlugin, which docs/ARCHITECTURE.md lets a dev-only project exclude from exports) is the project's own and stays.
|
|
62
|
+
*/
|
|
63
|
+
function desiredCondition(ref, existing) {
|
|
64
|
+
if (ref.editorOnly)
|
|
65
|
+
return existing ?? EDITOR_ONLY_CONDITION;
|
|
66
|
+
return existing === EDITOR_ONLY_CONDITION && KNOWN_EDITOR_ONLY_IDS.has(ref.id) ? undefined : existing;
|
|
36
67
|
}
|
|
37
68
|
/** Render the canonical self-closing element for a required embedded resource. */
|
|
38
69
|
function renderEmbed(res) {
|
|
@@ -73,25 +104,29 @@ export function addAddonPackageReferences(csprojText, requiredRefs = ADDON_PACKA
|
|
|
73
104
|
continue;
|
|
74
105
|
}
|
|
75
106
|
const existingVersion = match[1] ?? match[2] ?? '';
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
}
|
|
80
|
-
// A third-party package (Roslyn) the project already uses at a newer version stays: the addon needs "at least"
|
|
81
|
-
// (the source-only Code-Exec adapter compiles against Roslyn 3.8+), and a downgrade would break the project's own use.
|
|
107
|
+
// A third-party package (Roslyn) the project already uses at a newer version stays as it is: the addon needs "at
|
|
108
|
+
// least" (the source-only Code-Exec adapter compiles against Roslyn 3.8+), and a downgrade, or making it
|
|
109
|
+
// editor-only, would break the project's own use.
|
|
82
110
|
if (!ref.id.startsWith('com.IvanMurzak.') && isNewerVersion(ref.version, existingVersion)) {
|
|
83
111
|
changes.push({ id: ref.id, action: 'unchanged', version: existingVersion });
|
|
84
112
|
continue;
|
|
85
113
|
}
|
|
86
|
-
|
|
87
|
-
|
|
114
|
+
const existingCondition = /\bCondition\s*=\s*"([^"]*)"/i.exec(match[0])?.[1];
|
|
115
|
+
const condition = desiredCondition(ref, existingCondition);
|
|
116
|
+
if (existingVersion === ref.version && condition === existingCondition) {
|
|
117
|
+
changes.push({ id: ref.id, action: 'unchanged', version: ref.version });
|
|
118
|
+
continue;
|
|
119
|
+
}
|
|
120
|
+
// Reconcile in place: patch Version / Condition, keeping the element's other attributes.
|
|
121
|
+
const patched = patchRef(match[0], ref.version, condition);
|
|
122
|
+
text = text.replace(re, () => patched);
|
|
88
123
|
changes.push({ id: ref.id, action: 'updated', from: existingVersion, version: ref.version });
|
|
89
124
|
}
|
|
90
125
|
// Second pass: add the missing references. Prefer an existing <ItemGroup> that
|
|
91
126
|
// already holds a <PackageReference> (group them together); else append a fresh
|
|
92
127
|
// <ItemGroup> just before </Project>.
|
|
93
128
|
if (missing.length > 0) {
|
|
94
|
-
const block = missing.map((ref) => `${indent}${renderRef(ref)}`).join(eol);
|
|
129
|
+
const block = missing.map((ref) => `${indent}${renderRef(ref, desiredCondition(ref, undefined))}`).join(eol);
|
|
95
130
|
const pkgItemGroupClose = findPackageReferenceItemGroupClose(text);
|
|
96
131
|
if (pkgItemGroupClose !== -1) {
|
|
97
132
|
// Insert the missing refs just before that ItemGroup's closing tag.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"csproj-deps.js","sourceRoot":"","sources":["../../src/utils/csproj-deps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EACL,wBAAwB,EACxB,wBAAwB,
|
|
1
|
+
{"version":3,"file":"csproj-deps.js","sourceRoot":"","sources":["../../src/utils/csproj-deps.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import * as fs from 'fs';
|
|
2
1
|
import * as os from 'os';
|
|
3
2
|
import * as path from 'path';
|
|
4
|
-
import { MachineCredentialStore, MachineCredentialLock, MachineCredentialProvider, HttpTokenRefresher, godotAdapter, effectiveFamilies, MACHINE_STORE_DIR_NAME, DEFAULT_CLOUD_BASE_URL, } from '@baizor/gamedev-cli-core';
|
|
3
|
+
import { MachineCredentialStore, MachineCredentialLock, MachineCredentialProvider, HttpTokenRefresher, godotAdapter, effectiveFamilies, ensureAiGameDevGitignore, MACHINE_STORE_DIR_NAME, DEFAULT_CLOUD_BASE_URL, } from '@baizor/gamedev-cli-core';
|
|
5
4
|
/**
|
|
6
5
|
* Thin resolution shim over the `@baizor/gamedev-cli-core` machine credential store — the ONLY
|
|
7
6
|
* store implementation this CLI ships (unified-machine-auth 06 D7: "CLI-local store copies …
|
|
@@ -62,26 +61,7 @@ export function openProjectStore(projectPath) {
|
|
|
62
61
|
* version-controllable. Idempotent and best-effort — a failure never blocks persisting.
|
|
63
62
|
*/
|
|
64
63
|
export function ensureProjectStoreGitignored(projectPath) {
|
|
65
|
-
|
|
66
|
-
try {
|
|
67
|
-
const dir = resolveProjectStoreDir(projectPath);
|
|
68
|
-
fs.mkdirSync(dir, { recursive: true });
|
|
69
|
-
const gitignorePath = path.join(dir, '.gitignore');
|
|
70
|
-
if (!fs.existsSync(gitignorePath)) {
|
|
71
|
-
fs.writeFileSync(gitignorePath, entries.join('\n') + '\n');
|
|
72
|
-
return;
|
|
73
|
-
}
|
|
74
|
-
const existing = fs.readFileSync(gitignorePath, 'utf-8');
|
|
75
|
-
const lines = existing.split(/\r?\n/).map((l) => l.trim());
|
|
76
|
-
const missing = entries.filter((e) => !lines.includes(e));
|
|
77
|
-
if (missing.length > 0) {
|
|
78
|
-
const prefix = existing.length > 0 && !existing.endsWith('\n') ? '\n' : '';
|
|
79
|
-
fs.appendFileSync(gitignorePath, `${prefix}${missing.join('\n')}\n`);
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
|
-
catch {
|
|
83
|
-
// Best-effort only — never fail a login over a .gitignore write.
|
|
84
|
-
}
|
|
64
|
+
ensureAiGameDevGitignore(projectPath, ['credentials.json', 'credentials.lock', 'credentials.lock.takeover']);
|
|
85
65
|
}
|
|
86
66
|
/**
|
|
87
67
|
* Build the cli-core {@link MachineCredentialProvider} for a store — THE single entry point for
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"machine-store.js","sourceRoot":"","sources":["../../src/utils/machine-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"machine-store.js","sourceRoot":"","sources":["../../src/utils/machine-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EACL,sBAAsB,EACtB,qBAAqB,EACrB,yBAAyB,EACzB,kBAAkB,EAClB,YAAY,EACZ,iBAAiB,EACjB,wBAAwB,EACxB,sBAAsB,EACtB,sBAAsB,GAEvB,MAAM,0BAA0B,CAAC;AAElC;;;;;;;;;;;;;;GAcG;AAEH;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,6BAA6B,CAAC;AAEnE,gGAAgG;AAChG,MAAM,UAAU,sBAAsB,CAAC,eAAwB;IAC7D,IAAI,eAAe;QAAE,OAAO,eAAe,CAAC;IAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IAClD,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,MAAM,CAAC;IACtD,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,sBAAsB,CAAC,CAAC;AACzD,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,gBAAgB,CAAC,eAAwB;IACvD,OAAO,IAAI,sBAAsB,CAAC,sBAAsB,CAAC,eAAe,CAAC,CAAC,CAAC;AAC7E,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,yBAAyB,CAAC,eAAwB;IAChE,OAAO,gBAAgB,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC;AAC3D,CAAC;AAED,2EAA2E;AAC3E,MAAM,UAAU,oBAAoB,CAAC,eAAwB;IAC3D,OAAO,IAAI,qBAAqB,CAAC,sBAAsB,CAAC,eAAe,CAAC,CAAC,CAAC;AAC5E,CAAC;AAED,6FAA6F;AAC7F,MAAM,CAAC,MAAM,sBAAsB,GAAG,sBAAsB,CAAC;AAE7D,2FAA2F;AAC3F,MAAM,UAAU,sBAAsB,CAAC,WAAmB;IACxD,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC;AACxD,CAAC;AAED,oGAAoG;AACpG,MAAM,UAAU,gBAAgB,CAAC,WAAmB;IAClD,OAAO,IAAI,sBAAsB,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC,CAAC;AACzE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,4BAA4B,CAAC,WAAmB;IAC9D,wBAAwB,CAAC,WAAW,EAAE,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,2BAA2B,CAAC,CAAC,CAAC;AAC/G,CAAC;AAcD;;;;;GAKG;AACH,MAAM,UAAU,+BAA+B,CAC7C,UAAiC,EAAE;IAEnC,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ;QAC5B,CAAC,CAAC,IAAI,sBAAsB,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC9C,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACvB,MAAM,SAAS,GAAG,IAAI,kBAAkB,CAAC;QACvC,oBAAoB,EAAE,OAAO,CAAC,aAAa,IAAI,sBAAsB;QACrE,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC/D,CAAC,CAAC;IACH,OAAO,IAAI,yBAAyB,CAAC,KAAK,EAAE,SAAS,EAAE;QACrD,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,cAAc;QACtD,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC/D,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,QAAmC;IACjE,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5B,OAAO,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CACpD,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,MAAM,EAAE,WAAW,KAAK,QAAQ,IAAI,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAC5F,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,wBAAwB,CAAC,QAAmC;IAC1E,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5B,MAAM,QAAQ,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC;IACjD,OAAO,OAAO,KAAK,EAAE,WAAW,KAAK,QAAQ,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;AACvF,CAAC"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* download entirely (offline / CI). Bumping the addon's server pin requires
|
|
6
6
|
* bumping this in the same PR or the parity test goes red.
|
|
7
7
|
*/
|
|
8
|
-
export declare const DEFAULT_SERVER_VERSION = "9.2.
|
|
8
|
+
export declare const DEFAULT_SERVER_VERSION = "9.2.13";
|
|
9
9
|
/** GitHub-release host the server zip + manifest are downloaded from. NOTHING else is trusted. */
|
|
10
10
|
export declare const TRUSTED_DOWNLOAD_HOST = "github.com";
|
|
11
11
|
/** The `owner/repo` the shared server releases live under. */
|
|
@@ -18,7 +18,7 @@ import { createHash } from 'crypto';
|
|
|
18
18
|
* download entirely (offline / CI). Bumping the addon's server pin requires
|
|
19
19
|
* bumping this in the same PR or the parity test goes red.
|
|
20
20
|
*/
|
|
21
|
-
export const DEFAULT_SERVER_VERSION = '9.2.
|
|
21
|
+
export const DEFAULT_SERVER_VERSION = '9.2.13';
|
|
22
22
|
/** GitHub-release host the server zip + manifest are downloaded from. NOTHING else is trusted. */
|
|
23
23
|
export const TRUSTED_DOWNLOAD_HOST = 'github.com';
|
|
24
24
|
/** The `owner/repo` the shared server releases live under. */
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "godot-cli",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.31.0",
|
|
4
4
|
"description": "Cross-platform CLI tool for Godot-MCP (Skills & MCP). Resolves and launches the Godot editor with MCP connection env vars, runs MCP/system tools over HTTP, probes server health, configures AI agents (Claude Code, Cursor, VS Code, …), and enables/disables the godot_mcp addon. Works with Claude Code, Cursor, Copilot, and any MCP client.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/lib.js",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"node": "^20.19.0 || >=22.12.0"
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
|
-
"@baizor/gamedev-cli-core": "^0.7.
|
|
65
|
+
"@baizor/gamedev-cli-core": "^0.7.1",
|
|
66
66
|
"chalk": "^5.6.2",
|
|
67
67
|
"commander": "^13.1.0",
|
|
68
68
|
"yocto-spinner": "^1.1.0"
|