fix(addon): auto include dist files (#39)

Author: LemonNekoGH

AGENTS.md

@@ -16,9 +16,10 @@ The low-level plugin and IPC milestone covers:
 Application-framework behavior belongs above the low-level plugin and IPC core.
 The existing `@gd-kirie/ipc` package is a thin browser-side transport wrapper;
 do not expand it into an application event or invocation layer unless the user
-explicitly asks for that higher-level work. The planned Kirie CLI owns the app
-workflow described below: development sessions, local build inputs, export and
-run semantics, initialization, and diagnostics.
+explicitly asks for that higher-level work. The Kirie CLI owns app workflow
+above the addon core, including the implemented development sessions, local
+build inputs, export and run helpers, and the planned initialization and
+diagnostics commands.
 
 The mobile IPC v1 experiment keeps Kirie core byte-oriented and CBOR-based with
 text, binary, and data lanes. JSON belongs to callers or adapters, not to Kirie
@@ -125,17 +126,17 @@ label them as anecdotal when they influence a decision.
 - Keep `KirieClient` as a thin C# wrapper over the same platform singleton.
   Expose Kirie signals as C# events, and keep internal Godot `Callable` usage as
   bridge plumbing rather than public API.
-- Kirie supports packaged web content sourced from project resources. The
-  planned Kirie app layout standardizes production web content at
-  `res://src-web/dist/index.html`. When that migration is implemented, drop the
-  previous `res://web` behavior instead of preserving a compatibility layer.
-  Runtime-mounted Godot packs remain out of scope for that loading path.
+- Kirie supports packaged web content sourced from project resources. The Kirie
+  app layout standardizes production web content at
+  `res://src-web/dist/index.html`; do not reintroduce the previous `res://web`
+  behavior as a compatibility layer. Runtime-mounted Godot packs remain out of
+  scope for that loading path.
 - If an API is needed by both GDScript and C#, keep the behavior aligned and
   keep C# as a thin wrapper.
 
-## Planned Kirie CLI Direction
+## Kirie CLI Direction
 
-The planned Kirie app layout is:
+The Kirie app layout is:
 
 - `kirie.config.ts`
 - `package.json`
@@ -145,20 +146,22 @@ The planned Kirie app layout is:
 - `addons/kirie/`
 - optional `addons/godot_cef/`
 
-Kirie CLI should be installed through npm. The current foundation commands are:
+Kirie CLI should be installed through npm. The implemented foundation commands are:
 
 - `kirie dev`: start the Vite development server, launch Godot as a child
   process, and inject `KIRIE_DEV=1` and
   `KIRIE_WEB_URL=<resolved Vite URL>`.
 - `kirie build`: build every configured local input needed by a runnable or
   exportable Godot project, without exporting platform packages.
 - `kirie build web`: build only the Vite web output for Godot resource loading.
-- `kirie build dotnet`: build only the Godot C#/.NET project when one is
-  configured or discovered.
-- `kirie init`: explicitly initialize a Kirie project and write required
-  project configuration.
-- `kirie doctor`: diagnose project configuration without writing files.
-- `kirie doctor --fix`: explicitly repair supported configuration problems.
+- `kirie build dotnet`: build only the Godot C#/.NET project and fail if none
+  is configured or discovered.
+- `kirie init`: planned command to explicitly initialize a Kirie project and
+  write required project configuration.
+- `kirie doctor`: planned command to diagnose project configuration without
+  writing files.
+- `kirie doctor --fix`: planned command to explicitly repair supported
+  configuration problems.
 
 The broader app workflow should keep these command semantics:
 
@@ -189,14 +192,14 @@ Kirie enforces Vite for user web source. Advanced Vite options belong in
 `kirie.config.ts` under `web.vite`, but Kirie owns `root`, `base`,
 `server.host`, `server.port`, `server.open`, and `build.outDir`. Explicit CLI
 flags may override runtime server values for a single command invocation.
-Planned `kirie dev` flags include `--config <path>` for the Kirie config,
-`--project <dir>` for the Godot project, `--godot <path>` for a Godot executable
-override, and Vite-shaped flags such as `--host <host>`, `--port <number>`,
-`--strict-port`, `--mode <mode>`, `--force`, `--log-level <level>`,
-`--clear-screen`, and `--no-clear-screen`. Kirie must either parse and map
-Vite-shaped flags explicitly to Vite's public JavaScript API or proxy them to
-the real Vite CLI; unknown flags must not be silently ignored. Arguments after
-`--` on `kirie dev` belong to Godot.
+Current `kirie dev` flags include `--project <dir>` for the Godot project,
+`--godot <path>` for a Godot executable override, and Vite-shaped flags such as
+`--host <host>`, `--port <number>`, `--strict-port`, `--mode <mode>`,
+`--force`, `--log-level <level>`, `--clear-screen`, and `--no-clear-screen`.
+A Kirie `--config <path>` override remains planned. Kirie must either parse and
+map Vite-shaped flags explicitly to Vite's public JavaScript API or proxy them
+to the real Vite CLI; unknown flags must not be silently ignored. Arguments
+after `--` on `kirie dev` belong to Godot.
 
 Only explicit setup and repair commands may write Godot configuration.
 `kirie init` and `kirie doctor --fix` may modify `project.godot` or

README.md

@@ -39,7 +39,7 @@ enabled for production builds.
 ```mermaid
 flowchart LR
     A["Godot Project"] --> B["addons/kirie"]
-    B --> C["Kirie / KirieView / KirieClient"]
+    B --> C["GdKirie / KirieNode / KirieClient"]
     C --> D["Android native implementation"]
     C --> E["iOS native implementation"]
     D <--> F["WebView"]
@@ -55,6 +55,8 @@ example, and regression-test areas:
 - `packages/ipc`: a thin browser-side transport wrapper for Kirie WebView pages
 - `packages/ipc-eventa`: browser-side Eventa adapter over Kirie text IPC
 - `packages/build`: public build and export automation API for scripts
+- `packages/cli`: Kirie command-line tools for development sessions, export,
+  install, and launch workflows
 - `packages/GdKirie.EventaAdapter`: .NET 10 Eventa adapter over Kirie text IPC
 - `examples/basic-ipc`: beginner-friendly demo project for the raw IPC flow
 - `examples/basic-kirie-cli`: beginner-friendly demo project for the Kirie CLI workflow

docs/architecture.md

@@ -97,7 +97,7 @@ Android and iOS use private view IDs only to route callbacks back to the owning
 
 Kirie supports loading packaged offline web content from Godot project
 resources. The current native resolvers can serve packaged `res://` paths. The
-planned Kirie CLI app layout standardizes production web content at
+Kirie CLI app layout standardizes production web content at
 `res://src-web/dist/index.html`, as described below.
 
 ## Runtime debug configuration
@@ -123,8 +123,8 @@ debugging can opt into `Kirie-debug.aar` for a single export by passing
 
 ## Kirie app layout and CLI direction
 
-The planned Kirie application shape is a Godot project with a Vite web frontend
-beside the Godot source:
+The Kirie application shape is a Godot project with a Vite web frontend beside
+the Godot source:
 
 ```text
 kirie.config.ts
@@ -160,9 +160,9 @@ Kirie does not own native platform project directories. Do not introduce
 Capacitor-style `ios/` or `android/` project trees into Kirie user projects.
 Native capabilities should be provided by Godot plugins.
 
-The planned Kirie CLI surface is intentionally small. The current implemented
-subset covers desktop development, local build inputs, platform export, and
-mobile install-and-launch flows:
+The Kirie CLI surface is intentionally small. The current implemented subset
+covers desktop development, local build inputs, platform export, and mobile
+install-and-launch flows:
 
 ```sh
 kirie dev
@@ -279,10 +279,11 @@ processes. It only supports development sessions that the CLI starts and owns.
 `kirie build` builds local intermediate artifacts needed by a runnable or
 exportable Godot project, but it does not produce platform application packages.
 It should build every configured or clearly discovered input. `kirie build web`
-builds only the Vite web output, and `kirie build dotnet` builds only the
-Godot C#/.NET project when one is configured or discovered. If no C# project is
-configured or discovered, the aggregate `kirie build` command may skip the
-`.NET` step; if a C# project is present, C# build failure must fail the command.
+builds only the Vite web output. `kirie build dotnet` builds only the Godot
+C#/.NET project and fails when no project or solution is present. If no C#
+project is configured or discovered, the aggregate `kirie build` command may
+skip the `.NET` step; if a C# project is present, C# build failure must fail the
+command.
 
 `kirie export` means a complete platform export workflow: build local inputs
 first, then call Godot's export flow for the selected platform or preset.
@@ -382,15 +383,14 @@ When loading `http://`, `https://`, or `file://` URLs, Kirie should keep using
 the platform WebView's default loading behavior instead of intercepting or
 rewriting those URLs.
 
-The planned Kirie CLI app layout uses `res://src-web/dist/index.html` as the
-default production entry. When that migration is implemented, the addon export
-plugin should package `res://src-web/dist` for Android and iOS exports, fail
-export when `res://src-web/dist/index.html` is missing, and drop the previous
-`res://web` behavior instead of preserving a compatibility layer. Users should
-continue to use Godot's official export preset flow by default. Kirie may
-diagnose export preset issues, and explicit setup or repair commands may write
-supported preset changes through Godot, but normal run, build, and export
-commands must not silently mutate export presets.
+The Kirie CLI app layout uses `res://src-web/dist/index.html` as the default
+production entry. The addon export plugin packages `res://src-web/dist` for
+Android and iOS exports and fails export when `res://src-web/dist/index.html` is
+missing. The previous `res://web` behavior is not preserved as a compatibility
+layer. Users should continue to use Godot's official export preset flow by
+default. Kirie may diagnose export preset issues, and explicit setup or repair
+commands may write supported preset changes through Godot, but normal run,
+build, and export commands must not silently mutate export presets.
 
 ## Desktop Godot CEF direction
 

docs/npm-publishing.md

@@ -22,9 +22,9 @@ depend on the CLI.
 
 ## npm Setup
 
-The npm organization and package scope is `gd-kirie`; browser packages include
-`@gd-kirie/ipc` and `@gd-kirie/ipc-eventa`. Future published packages include
-`@gd-kirie/build` and `@gd-kirie/cli`.
+The npm organization and package scope is `gd-kirie`; public JavaScript
+packages include `@gd-kirie/ipc`, `@gd-kirie/ipc-eventa`, `@gd-kirie/build`,
+and `@gd-kirie/cli`.
 
 Configure trusted publishing for each public browser package on npmjs.com. These
 fields identify the GitHub repository that is allowed to publish the package:

docs/references.md

@@ -171,7 +171,7 @@ packaging, or platform WebView bridge details.
   fixture.
 - [Vite JavaScript API](https://vite.dev/guide/api-javascript.html)
   Reference for `createServer()`, `build()`, `mergeConfig()`, and dev server
-  `resolvedUrls`, which underpin the planned `kirie dev` implementation.
+  `resolvedUrls`, which underpin current and planned `kirie dev` behavior.
 - [Vite CLI](https://vite.dev/guide/cli)
   Reference for Vite command-line flags when Kirie chooses to expose or proxy
   Vite-shaped arguments.
@@ -228,5 +228,5 @@ packaging, or platform WebView bridge details.
   support, mise task configuration, and Execa.
 - When changing the platform integration web fixture, start with the Vite build
   guide and `@gd-kirie/ipc`.
-- When changing planned Kirie CLI development-server behavior, start with the
-  Vite JavaScript API and Vite server options.
+- When changing Kirie CLI development-server behavior, start with the Vite
+  JavaScript API and Vite server options.

examples/basic-ipc/export_presets.cfg

@@ -6,7 +6,7 @@ runnable=true
 dedicated_server=false
 custom_features=""
 export_filter="all_resources"
-include_filter="src-web/dist/index.html,src-web/dist/assets/*"
+include_filter=""
 exclude_filter="src-web/index.html,src-web/src/*,src-web/node_modules/*,src-web/package.json,src-web/tsconfig.json,src-web/vite.config.ts"
 export_path=""
 patches=PackedStringArray()
@@ -236,7 +236,7 @@ runnable=true
 dedicated_server=false
 custom_features=""
 export_filter="all_resources"
-include_filter="src-web/dist/index.html,src-web/dist/assets/*"
+include_filter=""
 exclude_filter="src-web/index.html,src-web/src/*,src-web/node_modules/*,src-web/package.json,src-web/tsconfig.json,src-web/vite.config.ts"
 export_path=""
 patches=PackedStringArray()

examples/basic-kirie-cli/export_presets.cfg

@@ -6,7 +6,7 @@ runnable=true
 dedicated_server=false
 custom_features=""
 export_filter="all_resources"
-include_filter="src-web/dist/index.html,src-web/dist/assets/*"
+include_filter=""
 exclude_filter="src-web/index.html,src-web/src/*,src-web/node_modules/*,src-web/package.json,src-web/tsconfig.json,src-web/vite.config.ts,node_modules/*,dist/kirie/*"
 export_path=""
 patches=PackedStringArray()
@@ -236,7 +236,7 @@ runnable=true
 dedicated_server=false
 custom_features=""
 export_filter="all_resources"
-include_filter="src-web/dist/index.html,src-web/dist/assets/*"
+include_filter=""
 exclude_filter="src-web/index.html,src-web/src/*,src-web/node_modules/*,src-web/package.json,src-web/tsconfig.json,src-web/vite.config.ts,node_modules/*,dist/kirie/*"
 export_path=""
 patches=PackedStringArray()

examples/eventa-csharp/export_presets.cfg

@@ -6,7 +6,7 @@ runnable=true
 dedicated_server=false
 custom_features=""
 export_filter="all_resources"
-include_filter="src-web/dist/index.html,src-web/dist/assets/*"
+include_filter=""
 exclude_filter="src-web/index.html,src-web/src/*,src-web/node_modules/*,src-web/package.json,src-web/tsconfig.json,src-web/vite.config.ts"
 export_path=""
 patches=PackedStringArray()
@@ -238,7 +238,7 @@ runnable=true
 dedicated_server=false
 custom_features=""
 export_filter="all_resources"
-include_filter="src-web/dist/index.html,src-web/dist/assets/*"
+include_filter=""
 exclude_filter="src-web/index.html,src-web/src/*,src-web/node_modules/*,src-web/package.json,src-web/tsconfig.json,src-web/vite.config.ts"
 export_path=""
 patches=PackedStringArray()

packages/cli/src/dev.test.ts

@@ -206,6 +206,41 @@ describe("runDev", () => {
     expect(launchRun?.argv).toContain("--kirie-web-url=http://127.0.0.1:5173/");
   });
 
+  it("waits for iOS simulator app installation before launch", async () => {
+    const project = await projects.copy();
+
+    await installKirieConfigFixture(project, "dev-log-silent.kirie.config.ts");
+    await installFakeXcrun(project);
+
+    const originalPath = process.env.PATH;
+    process.env.PATH = `${path.join(project, "fake-bin")}${path.delimiter}${originalPath ?? ""}`;
+    try {
+      await runIosSimulator({
+        appPath: "dist/kirie/ios/debug.app",
+        bundleId: "ai.moeru.kirie.integration",
+        cwd: project,
+        simulatorId: "booted",
+      });
+    } finally {
+      process.env.PATH = originalPath;
+    }
+
+    const invocations = await readFakeXcrunInvocations(project);
+
+    expect(invocations.map((invocation) => invocation.argv.slice(0, 2))).toEqual([
+      ["simctl", "install"],
+      ["simctl", "get_app_container"],
+      ["simctl", "launch"],
+    ]);
+    expect(invocations[1]?.argv).toEqual([
+      "simctl",
+      "get_app_container",
+      "booted",
+      "ai.moeru.kirie.integration",
+      "app",
+    ]);
+  });
+
   it("rejects Kirie-owned Vite options", async () => {
     const project = await projects.copy();
     await installKirieConfigFixture(project, "dev-owned-server-port.kirie.config.ts");

packages/cli/src/run.ts

@@ -189,6 +189,11 @@ export async function runIosSimulator(options: RunIosSimulatorOptions = {}): Pro
         stdio: "inherit",
       },
     );
+    await waitForIosSimulatorAppInstall({
+      bundleId,
+      cwd: config.cwd,
+      simulatorId,
+    });
   }
 
   await execa(
@@ -346,6 +351,37 @@ async function waitForAndroidPackagePid(options: {
   throw new Error(`Timed out waiting for Android package PID: ${options.packageName}`);
 }
 
+// TODO: Replace command-specific polling loops with a shared helper that accepts
+// the command, success predicate, timeout, and polling interval.
+async function waitForIosSimulatorAppInstall(options: {
+  bundleId: string;
+  cwd: string;
+  simulatorId: string;
+  timeoutMs?: number;
+}): Promise<void> {
+  const deadline = Date.now() + (options.timeoutMs ?? 30_000);
+
+  while (Date.now() < deadline) {
+    const result = await execa(
+      "xcrun",
+      ["simctl", "get_app_container", options.simulatorId, options.bundleId, "app"],
+      {
+        cwd: options.cwd,
+        reject: false,
+        stderr: "ignore",
+        stdout: "ignore",
+      },
+    );
+    if (result.exitCode === 0) {
+      return;
+    }
+
+    await new Promise((resolve) => setTimeout(resolve, 500));
+  }
+
+  throw new Error(`Timed out waiting for iOS app install: ${options.bundleId}`);
+}
+
 function iosLaunchOptionArgs(launchOptions: LaunchOptions | undefined): string[] {
   if (!launchOptions) {
     return [];