jui-tools-mcp-server 2.8.0 → 2.10.1

package/README.md

@@ -107,13 +107,14 @@ bash ~/.jsonui-mcp-server/uninstall.sh
 | `list_api_models` | 生成済み DTO/Domain 一覧（orphan 検出付き） | `jui ls api-models --json` |
 | `preview_api_model_sync` | swagger→DTO/Domain 同期の dry-run プレビュー（書き込みなし） | `jui g api --dry-run --json` |
 
-### Group F: jsonui-test CLI (8)
+### Group F: jsonui-test CLI (9)
 
 | Tool | Description | CLI |
 |------|-------------|-----|
 | `test_validate` | テストファイル（screen/flow + description）のバリデーション。既定では CLI 同様に flatten-install 副作用あり（`no_install=true` で検証のみ） | `jsonui-test validate [--no-install]` |
 | `test_generate_screen` | screen テストテンプレート生成 | `jsonui-test generate test screen` |
 | `test_generate_flow` | flow テストテンプレート生成 | `jsonui-test generate test flow` |
+| `test_generate_branch_tests` | spec の branchContracts から分岐テスト生成(web/android/ios) | `jsonui-test generate branch-tests` |
 | `test_generate_description` | テストケースの description JSON 生成（screen/flow） | `jsonui-test generate description` |
 | `test_report` | results JSON → JUnit XML / HTML レポート変換 | `jsonui-test report` |
 | `test_mock_generate` | OpenAPI からモック scaffold（`check=true` で drift レポートのみ・書き込みなし） | `jsonui-test mock generate [--check]` |

package/data/attribute_definitions.json

@@ -1031,6 +1031,54 @@
         }
       }
     },
+    "alert": {
+      "type": "object",
+      "description": "Alert configuration (iOS 15+). Same shape as confirmationDialog minus titleVisibility: .alert always shows its title, and unlike .confirmationDialog it draws the cancel role in a regular size class",
+      "platform": "swift",
+      "mode": "swiftui",
+      "properties": {
+        "isPresented": {
+          "type": "binding",
+          "required": true,
+          "description": "Binding to control alert visibility"
+        },
+        "title": {
+          "type": [
+            "string",
+            "binding"
+          ],
+          "default": "",
+          "description": "Alert title (empty string if not specified)"
+        },
+        "message": {
+          "type": [
+            "string",
+            "binding"
+          ],
+          "description": "Optional alert message"
+        },
+        "actions": {
+          "type": "binding",
+          "description": "Binding to function returning action buttons (alternative to layout)"
+        },
+        "layout": {
+          "type": "object",
+          "description": "Layout configuration for alert content (alternative to actions)",
+          "properties": {
+            "name": {
+              "type": "string",
+              "required": true,
+              "description": "JSON filename for alert content"
+            },
+            "data": {
+              "type": "binding",
+              "required": true,
+              "description": "Binding to data for the layout view"
+            }
+          }
+        }
+      }
+    },
     "alignment": {
       "type": "string",
       "enum": [

package/data/screen_identity.json

@@ -85,7 +85,7 @@
     }
   },
   "appOwnedScreens": {
-    "description": "Screens the app owns outright — a hand-written page with no JsonUI layout behind it. They are real navigation destinations (a test navigates to them and asserts there), so they must be declarable, otherwise the screen-unknown rule rejects a legitimate id.",
+    "description": "Screens the app owns outright — a hand-written page with no JsonUI layout behind it. They are real navigation destinations (a test navigates to them and asserts there), so they must be declarable, otherwise the screen-unknown rule rejects a legitimate id. Having no layout is what they ARE, not an omission: `jui verify`'s spec-coverage check looks for a layout that generates a screen nobody declared, so these fall outside it — requiring a spec would also leave no way to comply, since there is no layout root to carry a `role` and a spec for a screen with nothing to generate describes nothing.",
     "declaration": {
       "location": "jui.config.json",
       "key": "test.appOwnedScreens",

package/dist/index.js

@@ -12,6 +12,7 @@ import { register as registerGetBindingRules } from "./tools/spec/get_binding_ru
 import { register as registerGetScreenIdentity } from "./tools/spec/get_screen_identity.js";
 import { register as registerGetPlatformMapping } from "./tools/spec/get_platform_mapping.js";
 import { register as registerGetDataSource } from "./tools/spec/get_data_source.js";
+import { register as registerGetPlatformRules } from "./tools/spec/get_platform_rules.js";
 // --- Group B: Project Context ---
 import { register as registerGetProjectConfig } from "./tools/context/get_project_config.js";
 import { register as registerListScreenSpecs } from "./tools/context/list_screen_specs.js";
@@ -19,6 +20,7 @@ import { register as registerListComponentSpecs } from "./tools/context/list_com
 import { register as registerListLayouts } from "./tools/context/list_layouts.js";
 import { register as registerReadSpecFile } from "./tools/context/read_spec_file.js";
 import { register as registerReadLayoutFile } from "./tools/context/read_layout_file.js";
+import { register as registerSearchSpecs } from "./tools/context/search_specs.js";
 // --- Group C: jui CLI ---
 import { register as registerJuiInit } from "./tools/jui/jui_init.js";
 import { register as registerJuiGenerateProject } from "./tools/jui/jui_generate_project.js";
@@ -46,6 +48,7 @@ import { register as registerDocRulesShow } from "./tools/doc/doc_rules_show.js"
 import { register as registerTestValidate } from "./tools/test/test_validate.js";
 import { register as registerTestGenerateScreen } from "./tools/test/test_generate_screen.js";
 import { register as registerTestGenerateFlow } from "./tools/test/test_generate_flow.js";
+import { register as registerTestGenerateBranchTests } from "./tools/test/test_generate_branch_tests.js";
 import { register as registerTestGenerateDescription } from "./tools/test/test_generate_description.js";
 import { register as registerTestReport } from "./tools/test/test_report.js";
 import { register as registerTestMockGenerate } from "./tools/test/test_mock_generate.js";
@@ -70,7 +73,7 @@ log(`component_metadata:    [${source.componentMetadata.layer}] ${source.compone
 log(`Loaded ${source.componentCount} components, ${source.commonAttributeCount} common attributes`);
 // Initialize server config for Groups B/C/D
 const config = new ServerConfig();
-// Register Group A: Component Spec Lookup (7 tools)
+// Register Group A: Component Spec Lookup (9 tools)
 registerLookupComponent(server, loader);
 registerLookupAttribute(server, loader);
 registerSearchComponents(server, loader);
@@ -79,13 +82,15 @@ registerGetBindingRules(server, loader);
 registerGetScreenIdentity(server, loader);
 registerGetPlatformMapping(server, loader);
 registerGetDataSource(server, loader);
-// Register Group B: Project Context (6 tools)
+registerGetPlatformRules(server, loader);
+// Register Group B: Project Context (7 tools)
 registerGetProjectConfig(server, config);
 registerListScreenSpecs(server, config);
 registerListComponentSpecs(server, config);
 registerListLayouts(server, config);
 registerReadSpecFile(server, config);
 registerReadLayoutFile(server, config);
+registerSearchSpecs(server, config);
 // Register Group C: jui CLI (8 tools)
 registerJuiInit(server, config);
 registerJuiGenerateProject(server, config);
@@ -116,6 +121,7 @@ registerPreviewApiModelSync(server, config);
 registerTestValidate(server, config);
 registerTestGenerateScreen(server, config);
 registerTestGenerateFlow(server, config);
+registerTestGenerateBranchTests(server, config);
 registerTestGenerateDescription(server, config);
 registerTestReport(server, config);
 registerTestMockGenerate(server, config);

package/dist/spec_loader.d.ts

@@ -38,6 +38,7 @@ export interface DataSourceInfo {
     screenIdentity: FileInfo | null;
     bindingSemantics: FileInfo | null;
     attributeSemantics: FileInfo | null;
+    platformSemantics: FileInfo | null;
     coverage: FileInfo | null;
     componentCount: number;
     commonAttributeCount: number;
@@ -60,6 +61,7 @@ export declare class SpecLoader {
     private commonAttributesRaw;
     private bindingSemantics;
     private attributeSemantics;
+    private platformSemantics;
     private coverageGaps;
     private screenIdentity;
     private commonAttributes;
@@ -75,6 +77,8 @@ export declare class SpecLoader {
     getAttribute(name: string): any;
     private withImplementationGaps;
     searchComponents(query: string): any[];
+    /** Keyword-indexed topical guides, each backed by a dedicated MCP tool. */
+    private topicGuides;
     getModifierOrder(platform?: string): any;
     /**
      * The canonical screen-identity asset, or null when this checkout predates
@@ -93,6 +97,7 @@ export declare class SpecLoader {
     getChangedSinceLoad(): string[];
     getScreenIdentity(): any;
     getBindingRules(): any;
+    getPlatformRules(): any;
     getPlatformMapping(category?: string): any;
     listComponents(): string[];
     getDataSource(): DataSourceInfo;

package/dist/spec_loader.js

@@ -35,6 +35,7 @@ export class SpecLoader {
     commonAttributesRaw = {};
     bindingSemantics = null;
     attributeSemantics = null;
+    platformSemantics = null;
     /// `${component}.${attribute}` -> [{platform, reason, note}] from the
     /// coverage ledger. The ledger tracks pairs that ARE declared (platform
     /// field includes them) but that the platform's codegen does not consume —
@@ -159,8 +160,40 @@ export class SpecLoader {
                 }
             }
         }
+        // Topic-guide index: task vocabulary ("iOSだけ色を変える", "ios only",
+        // "platform override") does not contain any component or attribute
+        // name, so the loops above can't surface the mechanism. Each guide
+        // declares its own keywords (en + ja) in its semantics file; a hit
+        // pins a pointer to the dedicated tool at the top of the results.
+        for (const guide of this.topicGuides()) {
+            const hit = guide.keywords.some((kw) => q.includes(kw) || (q.length >= 3 && kw.includes(q)));
+            if (hit) {
+                results.push({
+                    guide: guide.topic,
+                    score: 100,
+                    matches: [guide.summary],
+                    nextTool: guide.tool,
+                });
+            }
+        }
         return results.sort((a, b) => b.score - a.score);
     }
+    /** Keyword-indexed topical guides, each backed by a dedicated MCP tool. */
+    topicGuides() {
+        const guides = [];
+        if (this.platformSemantics) {
+            const kws = Array.isArray(this.platformSemantics.keywords)
+                ? this.platformSemantics.keywords
+                : [];
+            guides.push({
+                topic: "platform_rules",
+                tool: "get_platform_rules",
+                summary: "Per-platform styling/visibility (e.g. change fontColor on iOS only): node-level 'platform' directive (object form = per-platform overrides, string form = platform filter), root 'platforms' whitelist, vs 'responsive'. Call get_platform_rules for the full semantics with examples.",
+                keywords: kws.map((k) => k.toLowerCase()),
+            });
+        }
+        return guides;
+    }
     getModifierOrder(platform) {
         if (platform)
             return MODIFIER_ORDER[platform] || null;
@@ -189,6 +222,7 @@ export class SpecLoader {
             this.dataSource.screenIdentity,
             this.dataSource.bindingSemantics,
             this.dataSource.attributeSemantics,
+            this.dataSource.platformSemantics,
             this.dataSource.coverage,
         ].filter((f) => f != null);
         const changed = [];
@@ -222,6 +256,14 @@ export class SpecLoader {
             semantics: this.bindingSemantics,
         };
     }
+    getPlatformRules() {
+        // Canonical platform-scoping semantics (SSoT:
+        // shared/core/platform_semantics.json — restates
+        // jui_tools/jui_cli/core/platform_resolver.py). Null on jsonui-cli
+        // checkouts that predate the file; the tool reports that instead of
+        // inventing rules.
+        return this.platformSemantics;
+    }
     getPlatformMapping(category) {
         if (category)
             return PLATFORM_MAPPING[category] || null;
@@ -262,6 +304,18 @@ export class SpecLoader {
         catch {
             this.attributeSemantics = null;
         }
+        // Platform-scoped layout semantics (node 'platform' directive, root
+        // 'platforms', vs 'responsive'). Optional for the same backward-compat
+        // reason.
+        let platformSemanticsResolution = null;
+        try {
+            const platSemResolution = this.resolveFile("shared/core/platform_semantics.json", "data/platform_semantics.json");
+            this.platformSemantics = JSON.parse(readFileSync(platSemResolution.path, "utf-8"));
+            platformSemanticsResolution = platSemResolution;
+        }
+        catch {
+            this.platformSemantics = null;
+        }
         // Canonical screen identity (screen-identity track). Optional so older
         // jsonui-cli checkouts without the file still load.
         try {
@@ -337,6 +391,7 @@ export class SpecLoader {
             screenIdentity: screenIdentityResolution,
             bindingSemantics: bindingResolution,
             attributeSemantics: attributeSemanticsResolution,
+            platformSemantics: platformSemanticsResolution,
             coverage: coverageResolution,
             componentCount,
             commonAttributeCount: Object.keys(this.commonAttributesRaw).filter((k) => !k.startsWith("_")).length,

package/dist/tools/context/list_screen_specs.js

@@ -13,21 +13,40 @@ export function register(server, config) {
                 return { content: [{ type: "text", text: `Spec directory not found: ${specDir}` }] };
             }
             const files = readdirSync(specDir).filter((f) => f.endsWith(".spec.json"));
-            const specs = files.map((file) => {
+            const specs = [];
+            for (const file of files) {
                 try {
                     const data = JSON.parse(readFileSync(join(specDir, file), "utf-8"));
-                    return {
+                    specs.push({
                         file,
                         name: data.metadata?.name || file.replace(".spec.json", ""),
                         displayName: data.metadata?.displayName || "",
                         type: data.type || "screen_spec",
                         layoutFile: data.metadata?.layoutFile || null,
-                    };
+                    });
+                    // A parent spec splits one screen across sub-spec files (its
+                    // 'subSpecs' array). Surface them inline so a session can see
+                    // the split and read_spec_file the right part without first
+                    // opening the parent.
+                    if (Array.isArray(data.subSpecs)) {
+                        for (const sub of data.subSpecs) {
+                            if (!sub?.file)
+                                continue;
+                            specs.push({
+                                file: sub.file,
+                                name: sub.name || sub.file,
+                                displayName: sub.description || "",
+                                type: "screen_sub_spec",
+                                parent: file,
+                                layoutFile: data.metadata?.layoutFile || null,
+                            });
+                        }
+                    }
                 }
                 catch {
-                    return { file, name: file.replace(".spec.json", ""), displayName: "", type: "unknown", layoutFile: null };
+                    specs.push({ file, name: file.replace(".spec.json", ""), displayName: "", type: "unknown", layoutFile: null });
                 }
-            });
+            }
             return { content: [{ type: "text", text: JSON.stringify(specs, null, 2) }] };
         }
         catch (e) {

package/dist/tools/context/search_specs.d.ts

@@ -0,0 +1,3 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { ServerConfig } from "../../config.js";
+export declare function register(server: McpServer, config: ServerConfig): void;

package/dist/tools/context/search_specs.js

@@ -0,0 +1,113 @@
+import { z } from "zod";
+import { readFileSync, readdirSync, existsSync, statSync } from "fs";
+import { join, relative } from "path";
+const MAX_RESULTS = 30;
+const SNIPPET_LEN = 200;
+/** Recursively collect *.spec.json / *.component.json under dir. */
+function collectSpecFiles(dir, out = []) {
+    for (const entry of readdirSync(dir)) {
+        const p = join(dir, entry);
+        if (statSync(p).isDirectory()) {
+            collectSpecFiles(p, out);
+        }
+        else if (entry.endsWith(".spec.json") || entry.endsWith(".component.json")) {
+            out.push(p);
+        }
+    }
+    return out;
+}
+/**
+ * Walk a parsed spec and report the JSON paths whose keys or string values
+ * contain the query. One entry per path, with a short snippet.
+ */
+function findMatches(node, q, path, out) {
+    if (out.length >= MAX_RESULTS)
+        return;
+    if (typeof node === "string") {
+        if (node.toLowerCase().includes(q)) {
+            out.push({ path, snippet: node.slice(0, SNIPPET_LEN) });
+        }
+        return;
+    }
+    if (Array.isArray(node)) {
+        node.forEach((v, i) => findMatches(v, q, `${path}[${i}]`, out));
+        return;
+    }
+    if (node && typeof node === "object") {
+        for (const [k, v] of Object.entries(node)) {
+            const childPath = path ? `${path}.${k}` : k;
+            if (k.toLowerCase().includes(q)) {
+                const snippet = typeof v === "string"
+                    ? v.slice(0, SNIPPET_LEN)
+                    : JSON.stringify(v)?.slice(0, SNIPPET_LEN) ?? "";
+                out.push({ path: childPath, snippet });
+                if (out.length >= MAX_RESULTS)
+                    return;
+            }
+            findMatches(v, q, childPath, out);
+            if (out.length >= MAX_RESULTS)
+                return;
+        }
+    }
+}
+export function register(server, config) {
+    server.tool("search_specs", "Keyword-search across ALL project spec files (screen specs, sub-specs in subdirectories, component specs). Returns file + JSON path + snippet per match — the fast way to find which spec (or which sub-spec of a split screen) covers a topic", {
+        query: z.string().describe("Search keyword (matched case-insensitively against keys and string values)"),
+        project_dir: z.string().optional().describe("Project directory (overrides JUI_PROJECT_DIR env)"),
+    }, async ({ query, project_dir }) => {
+        try {
+            const projectDir = config.resolveProjectDir(project_dir);
+            const projectConfig = config.readProjectConfig(projectDir);
+            const q = query.toLowerCase();
+            if (!q.trim()) {
+                return { content: [{ type: "text", text: "Empty query." }] };
+            }
+            const dirs = new Set();
+            for (const field of ["spec_directory", "component_spec_directory"]) {
+                try {
+                    const d = config.resolveDir(projectConfig, field, projectDir);
+                    if (existsSync(d))
+                        dirs.add(d);
+                }
+                catch {
+                    /* directory not configured */
+                }
+            }
+            if (dirs.size === 0) {
+                return { content: [{ type: "text", text: "No spec directories found." }] };
+            }
+            const results = [];
+            for (const dir of dirs) {
+                for (const filePath of collectSpecFiles(dir)) {
+                    if (results.length >= MAX_RESULTS)
+                        break;
+                    let matches = [];
+                    try {
+                        const data = JSON.parse(readFileSync(filePath, "utf-8"));
+                        findMatches(data, q, "", matches);
+                    }
+                    catch {
+                        continue;
+                    }
+                    if (matches.length > 0) {
+                        results.push({
+                            file: relative(dir, filePath),
+                            matchCount: matches.length,
+                            matches: matches.slice(0, 5),
+                        });
+                    }
+                }
+            }
+            if (results.length === 0) {
+                return { content: [{ type: "text", text: `No matches for '${query}'.` }] };
+            }
+            results.sort((a, b) => b.matchCount - a.matchCount);
+            return {
+                content: [{ type: "text", text: JSON.stringify(results, null, 2) }],
+            };
+        }
+        catch (e) {
+            return { content: [{ type: "text", text: `Error: ${e.message}` }] };
+        }
+    });
+}

package/dist/tools/doc/doc_validate_spec.js

@@ -2,7 +2,7 @@ import { z } from "zod";
 import { join } from "path";
 import { runCli } from "../../cli_runner.js";
 export function register(server, config) {
-    server.tool("doc_validate_spec", "Validate a screen specification JSON file against the schema", {
+    server.tool("doc_validate_spec", "Validate a screen specification JSON file against the schema. Also expands `@canonical` marks in dataFlow method params/returnType against the project's OpenAPI documents, so a mark that names no operation is reported here as an error rather than reaching `jui build`.", {
         file: z.string().describe("Spec file path (e.g., 'login.spec.json' or full path)"),
         project_dir: z.string().optional().describe("Project directory (overrides JUI_PROJECT_DIR env)"),
     }, async (params) => {

package/dist/tools/spec/get_platform_rules.d.ts

@@ -0,0 +1,3 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { SpecLoader } from "../../spec_loader.js";
+export declare function register(server: McpServer, loader: SpecLoader): void;

package/dist/tools/spec/get_platform_rules.js

@@ -0,0 +1,18 @@
+export function register(server, loader) {
+    server.tool("get_platform_rules", "Get platform-scoping rules for layouts: how to change an attribute on one platform only (node-level 'platform' object form, e.g. iOS-only fontColor), how to drop a node per platform (string form + language tokens), the layout-root 'platforms' whitelist, precedence, and how this differs from 'responsive'", {}, async () => {
+        const result = loader.getPlatformRules();
+        if (!result) {
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: "platform_semantics.json not found — the connected jsonui-cli checkout predates it. Fall back to lookup_attribute('platform') for the short definition.",
+                    },
+                ],
+            };
+        }
+        return {
+            content: [{ type: "text", text: JSON.stringify(result, null, 2) }],
+        };
+    });
+}

package/dist/tools/test/test_generate_branch_tests.d.ts

@@ -0,0 +1,3 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { ServerConfig } from "../../config.js";
+export declare function register(server: McpServer, config: ServerConfig): void;

package/dist/tools/test/test_generate_branch_tests.js

@@ -0,0 +1,76 @@
+import { z } from "zod";
+import { runCli, formatResult } from "../../cli_runner.js";
+export function register(server, config) {
+    server.tool("test_generate_branch_tests", "Generate unit-level branch tests from a screen spec's branchContracts " +
+        "(vitest / Kotlin JUnit4+Robolectric / Swift XCTest). Only the HTTP " +
+        "boundary is mocked — ViewModel, UseCase, Repository and response " +
+        "decoding all run for real. The generated test file and runtime are " +
+        "@generated; the harness skeleton is emitted once and then owned by " +
+        "the project. Screens with no branchContracts section are an error, " +
+        "not a no-op", {
+        screen: z
+            .string()
+            .describe("Screen name in snake_case (resolves <spec_directory>/<screen>.spec.json)"),
+        platform: z
+            .enum(["web", "android", "ios"])
+            .optional()
+            .describe("Target platform (default web). android additionally requires " +
+            "`package`; ios additionally requires `module`"),
+        package: z
+            .string()
+            .optional()
+            .describe("Kotlin package for the generated sources — required for platform 'android'"),
+        module: z
+            .string()
+            .optional()
+            .describe("App module name for @testable import — required for platform 'ios'"),
+        spec: z
+            .string()
+            .optional()
+            .describe("Explicit spec file path (overrides spec_directory resolution)"),
+        out_dir: z
+            .string()
+            .optional()
+            .describe("Output directory for the @generated test + runtime files"),
+        harness_dir: z
+            .string()
+            .optional()
+            .describe("Project-owned harness directory (skeleton written only when absent)"),
+        mocks_dir: z
+            .string()
+            .optional()
+            .describe("Directory scanned for *.mock.json scenario files"),
+        project_dir: z.string().optional().describe("Project directory (overrides JUI_PROJECT_DIR env)"),
+    }, async (params) => {
+        try {
+            const projectDir = config.resolveProjectDir(params.project_dir);
+            const args = ["generate", "branch-tests", params.screen];
+            if (params.platform) {
+                args.push("--platform", params.platform);
+            }
+            if (params.package) {
+                args.push("--package", params.package);
+            }
+            if (params.module) {
+                args.push("--module", params.module);
+            }
+            if (params.spec) {
+                args.push("--spec", params.spec);
+            }
+            if (params.out_dir) {
+                args.push("--out-dir", params.out_dir);
+            }
+            if (params.harness_dir) {
+                args.push("--harness-dir", params.harness_dir);
+            }
+            if (params.mocks_dir) {
+                args.push("--mocks-dir", params.mocks_dir);
+            }
+            const result = await runCli("jsonui-test", args, { cwd: projectDir });
+            return { content: [{ type: "text", text: formatResult(result) }] };
+        }
+        catch (e) {
+            return { content: [{ type: "text", text: `Error: ${e.message}` }] };
+        }
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jui-tools-mcp-server",
-  "version": "2.8.0",
+  "version": "2.10.1",
   "description": "MCP server for JsonUI project management - wraps jui and jsonui-doc CLIs plus component spec lookup",
   "main": "dist/index.js",
   "scripts": {

package/scripts/fetch-definitions.js

@@ -44,7 +44,7 @@ const DATA_DIR = join(PROJECT_ROOT, "data");
 //   3. `npm run fetch-definitions` and commit the data/ diff together with
 //      this pin in one commit
 // JSONUI_CLI_RAW_BASE still overrides the whole base URL for manual testing.
-const JSONUI_CLI_TAG = "v1.6.0";
+const JSONUI_CLI_TAG = "v1.7.53";
 const BASE_URL =
   process.env.JSONUI_CLI_RAW_BASE ||
   `https://raw.githubusercontent.com/Tai-Kimura/jsonui-cli/${JSONUI_CLI_TAG}`;

package/src/index.ts

@@ -55,6 +55,7 @@ import { register as registerDocRulesShow } from "./tools/doc/doc_rules_show.js"
 import { register as registerTestValidate } from "./tools/test/test_validate.js";
 import { register as registerTestGenerateScreen } from "./tools/test/test_generate_screen.js";
 import { register as registerTestGenerateFlow } from "./tools/test/test_generate_flow.js";
+import { register as registerTestGenerateBranchTests } from "./tools/test/test_generate_branch_tests.js";
 import { register as registerTestGenerateDescription } from "./tools/test/test_generate_description.js";
 import { register as registerTestReport } from "./tools/test/test_report.js";
 import { register as registerTestMockGenerate } from "./tools/test/test_mock_generate.js";
@@ -144,6 +145,7 @@ registerPreviewApiModelSync(server, config);
 registerTestValidate(server, config);
 registerTestGenerateScreen(server, config);
 registerTestGenerateFlow(server, config);
+registerTestGenerateBranchTests(server, config);
 registerTestGenerateDescription(server, config);
 registerTestReport(server, config);
 registerTestMockGenerate(server, config);

package/src/tools/doc/doc_validate_spec.ts

@@ -7,7 +7,7 @@ import { runCli } from "../../cli_runner.js";
 export function register(server: McpServer, config: ServerConfig) {
   server.tool(
     "doc_validate_spec",
-    "Validate a screen specification JSON file against the schema",
+    "Validate a screen specification JSON file against the schema. Also expands `@canonical` marks in dataFlow method params/returnType against the project's OpenAPI documents, so a mark that names no operation is reported here as an error rather than reaching `jui build`.",
     {
       file: z.string().describe("Spec file path (e.g., 'login.spec.json' or full path)"),
       project_dir: z.string().optional().describe("Project directory (overrides JUI_PROJECT_DIR env)"),

package/src/tools/test/test_generate_branch_tests.ts

@@ -0,0 +1,72 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { z } from "zod";
+import { ServerConfig } from "../../config.js";
+import { runCli, formatResult } from "../../cli_runner.js";
+
+export function register(server: McpServer, config: ServerConfig) {
+  server.tool(
+    "test_generate_branch_tests",
+    "Generate unit-level branch tests from a screen spec's branchContracts " +
+      "(vitest / Kotlin JUnit4+Robolectric / Swift XCTest). Only the HTTP " +
+      "boundary is mocked — ViewModel, UseCase, Repository and response " +
+      "decoding all run for real. The generated test file and runtime are " +
+      "@generated; the harness skeleton is emitted once and then owned by " +
+      "the project. Screens with no branchContracts section are an error, " +
+      "not a no-op",
+    {
+      screen: z
+        .string()
+        .describe("Screen name in snake_case (resolves <spec_directory>/<screen>.spec.json)"),
+      platform: z
+        .enum(["web", "android", "ios"])
+        .optional()
+        .describe(
+          "Target platform (default web). android additionally requires " +
+            "`package`; ios additionally requires `module`"
+        ),
+      package: z
+        .string()
+        .optional()
+        .describe("Kotlin package for the generated sources — required for platform 'android'"),
+      module: z
+        .string()
+        .optional()
+        .describe("App module name for @testable import — required for platform 'ios'"),
+      spec: z
+        .string()
+        .optional()
+        .describe("Explicit spec file path (overrides spec_directory resolution)"),
+      out_dir: z
+        .string()
+        .optional()
+        .describe("Output directory for the @generated test + runtime files"),
+      harness_dir: z
+        .string()
+        .optional()
+        .describe("Project-owned harness directory (skeleton written only when absent)"),
+      mocks_dir: z
+        .string()
+        .optional()
+        .describe("Directory scanned for *.mock.json scenario files"),
+      project_dir: z.string().optional().describe("Project directory (overrides JUI_PROJECT_DIR env)"),
+    },
+    async (params) => {
+      try {
+        const projectDir = config.resolveProjectDir(params.project_dir);
+        const args = ["generate", "branch-tests", params.screen];
+        if (params.platform) { args.push("--platform", params.platform); }
+        if (params.package) { args.push("--package", params.package); }
+        if (params.module) { args.push("--module", params.module); }
+        if (params.spec) { args.push("--spec", params.spec); }
+        if (params.out_dir) { args.push("--out-dir", params.out_dir); }
+        if (params.harness_dir) { args.push("--harness-dir", params.harness_dir); }
+        if (params.mocks_dir) { args.push("--mocks-dir", params.mocks_dir); }
+
+        const result = await runCli("jsonui-test", args, { cwd: projectDir });
+        return { content: [{ type: "text", text: formatResult(result) }] };
+      } catch (e: any) {
+        return { content: [{ type: "text", text: `Error: ${e.message}` }] };
+      }
+    }
+  );
+}

package/tests/tools_test.test.ts

@@ -14,6 +14,7 @@ import { ServerConfig } from "../src/config.js";
 import { register as registerTestValidate } from "../src/tools/test/test_validate.js";
 import { register as registerTestGenerateScreen } from "../src/tools/test/test_generate_screen.js";
 import { register as registerTestGenerateFlow } from "../src/tools/test/test_generate_flow.js";
+import { register as registerTestGenerateBranchTests } from "../src/tools/test/test_generate_branch_tests.js";
 import { register as registerTestGenerateDescription } from "../src/tools/test/test_generate_description.js";
 import { register as registerTestReport } from "../src/tools/test/test_report.js";
 import { register as registerTestMockGenerate } from "../src/tools/test/test_mock_generate.js";
@@ -65,6 +66,7 @@ beforeEach(() => {
   registerTestValidate(harness.server, config);
   registerTestGenerateScreen(harness.server, config);
   registerTestGenerateFlow(harness.server, config);
+  registerTestGenerateBranchTests(harness.server, config);
   registerTestGenerateDescription(harness.server, config);
   registerTestReport(harness.server, config);
   registerTestMockGenerate(harness.server, config);
@@ -86,11 +88,12 @@ function failWithCode(code: number, stdout = "", stderr = ""): void {
 }
 
 describe("Group F registration", () => {
-  it("registers all 8 jsonui-test tools", () => {
+  it("registers all 9 jsonui-test tools", () => {
     expect([...harness.tools.keys()].sort()).toEqual(
       [
         "test_artifacts_pull",
         "test_artifacts_status",
+        "test_generate_branch_tests",
         "test_generate_description",
         "test_generate_flow",
         "test_generate_screen",
@@ -102,6 +105,68 @@ describe("Group F registration", () => {
   });
 });
 
+describe("test_generate_branch_tests", () => {
+  it("builds the base argv and runs in the project dir", async () => {
+    nextResponse = { stdout: "generated 5 branch(es)" };
+    await harness.call("test_generate_branch_tests", {
+      project_dir: projectDir,
+      screen: "booking_confirm",
+    });
+    expect(recorded).toEqual([
+      expect.objectContaining({
+        command: "jsonui-test",
+        args: ["generate", "branch-tests", "booking_confirm"],
+        options: expect.objectContaining({ cwd: projectDir }),
+      }),
+    ]);
+  });
+
+  it("maps every optional flag", async () => {
+    nextResponse = { stdout: "ok" };
+    await harness.call("test_generate_branch_tests", {
+      project_dir: projectDir,
+      screen: "bottle_detail",
+      platform: "android",
+      package: "com.example.app",
+      module: "AppModule",
+      spec: "docs/screens/json/bottle_detail.spec.json",
+      out_dir: "app/src/test/java",
+      harness_dir: "app/src/test/java",
+      mocks_dir: "tests/mocks",
+    });
+    expect(recorded[0].args).toEqual([
+      "generate",
+      "branch-tests",
+      "bottle_detail",
+      "--platform",
+      "android",
+      "--package",
+      "com.example.app",
+      "--module",
+      "AppModule",
+      "--spec",
+      "docs/screens/json/bottle_detail.spec.json",
+      "--out-dir",
+      "app/src/test/java",
+      "--harness-dir",
+      "app/src/test/java",
+      "--mocks-dir",
+      "tests/mocks",
+    ]);
+  });
+
+  it("surfaces a generation failure instead of reporting success", async () => {
+    // Unbindable declarations are hard errors in the generator, and the
+    // wrapper must not flatten them into a bland OK.
+    failWithCode(1, "", "branches[0].when.arg.status: no parameter");
+    const text = await harness.call("test_generate_branch_tests", {
+      project_dir: projectDir,
+      screen: "home",
+    });
+    expect(text).toContain("no parameter");
+  });
+});
+
 describe("test_validate", () => {
   it("builds the base argv and runs in the project dir", async () => {
     nextResponse = { stdout: "All valid" };