nativeapptemplate-agent 0.3.2 → 0.4.1

package/dist/validation/test-suites.d.ts

@@ -0,0 +1,10 @@
+import type { JudgeResult, Platform, StepResult } from "../agents/types.js";
+export type TestSuiteOptions = {
+    useMise?: boolean;
+    env?: NodeJS.ProcessEnv;
+};
+export declare function testsEnabled(): boolean;
+export declare function runTestSuite(platform: Platform, outDir: string, options?: TestSuiteOptions): Promise<StepResult>;
+export declare function extractSummary(output: string): string | undefined;
+export declare function applyTestResults(judge: JudgeResult, results: Partial<Record<Platform, StepResult>>): JudgeResult;
+//# sourceMappingURL=test-suites.d.ts.map

package/dist/validation/test-suites.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-suites.d.ts","sourceRoot":"","sources":["../../src/validation/test-suites.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAiB5E,MAAM,MAAM,gBAAgB,GAAG;IAE7B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB,CAAC;AAEF,wBAAgB,YAAY,IAAI,OAAO,CAEtC;AAED,wBAAsB,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,UAAU,CAAC,CAM1H;AAsDD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CASjE;AAkCD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,GAAG,WAAW,CAahH"}

package/dist/validation/test-suites.js

@@ -0,0 +1,135 @@
+import { access, readdir } from "node:fs/promises";
+import { join } from "node:path";
+import { iosSimulatorDestination } from "./ios-destination.js";
+import { commandAvailable, runStep, tailLines, withMisePrefix } from "./run-step.js";
+import { testsFromEnv } from "../run-options.js";
+// SPEC §4 Operation 3: the generated apps' own test suites must pass. Layer 2
+// only builds, and the suites take minutes (Rails ~650 tests, iOS ~1,100,
+// Android ~900 on the paid substrates), so they run only when
+// NATIVEAPPTEMPLATE_TESTS=1. A rename can break a test without breaking the
+// build (#150: the iOS substrate's "unknown type" example became a real type).
+const RAILS_TEST_TIMEOUT_MS = 1_800_000;
+const IOS_TEST_TIMEOUT_MS = 2_700_000;
+const ANDROID_TEST_TIMEOUT_MS = 1_800_000;
+const DB_PREPARE_TIMEOUT_MS = 300_000;
+const OUTPUT_TAIL_LINES = 60;
+export function testsEnabled() {
+    return testsFromEnv();
+}
+export async function runTestSuite(platform, outDir, options = {}) {
+    switch (platform) {
+        case "rails": return runRailsTests(outDir, options);
+        case "ios": return runIosTests(outDir, options);
+        case "android": return runAndroidTests(outDir, options);
+    }
+}
+async function runRailsTests(outDir, options) {
+    if (!(await exists(join(outDir, "bin", "rails"))))
+        return skipped("bin/rails test", "no bin/rails in the generated app");
+    const useMise = options.useMise ?? (await commandAvailable("mise", options.env));
+    const env = options.env ? { env: options.env } : {};
+    // The generated app's own <slug>_api_test database; Layer 2's db:prepare
+    // only sets up development.
+    const prepare = await runStep(outDir, ["bin/rails", "db:test:prepare"], { timeoutMs: DB_PREPARE_TIMEOUT_MS, useMise, ...env });
+    if (prepare.exitCode !== 0) {
+        return fromRun(withMisePrefix("bin/rails db:test:prepare", useMise), prepare, "tests not run: db:test:prepare failed");
+    }
+    const run = await runStep(outDir, ["bin/rails", "test"], { timeoutMs: RAILS_TEST_TIMEOUT_MS, useMise, ...env });
+    return fromRun(withMisePrefix("bin/rails test", useMise), run);
+}
+async function runIosTests(outDir, options) {
+    let entries = [];
+    try {
+        entries = await readdir(outDir);
+    }
+    catch { /* reported below */ }
+    const xcodeproj = entries.find((e) => e.endsWith(".xcodeproj"));
+    if (!xcodeproj)
+        return skipped("xcodebuild test", `no .xcodeproj in ${outDir}`);
+    const scheme = xcodeproj.slice(0, -".xcodeproj".length);
+    // Same project, scheme, destination and configuration as Layer 2's build,
+    // so xcodebuild reuses that build.
+    const args = ["xcodebuild", "-project", xcodeproj, "-scheme", scheme, "-destination", iosSimulatorDestination(), "-configuration", "Debug", "test"];
+    const run = await runStep(outDir, args, { timeoutMs: IOS_TEST_TIMEOUT_MS, ...(options.env ? { env: options.env } : {}) });
+    return fromRun(`xcodebuild test -scheme ${scheme}`, run);
+}
+async function runAndroidTests(outDir, options) {
+    if (!(await exists(join(outDir, "gradlew"))))
+        return skipped("./gradlew testDebugUnitTest", "no ./gradlew wrapper in the generated app");
+    const run = await runStep(outDir, ["./gradlew", "testDebugUnitTest", "--no-daemon"], {
+        timeoutMs: ANDROID_TEST_TIMEOUT_MS,
+        ...(options.env ? { env: options.env } : {}),
+    });
+    return fromRun("./gradlew testDebugUnitTest", run);
+}
+// The last line each runner prints about the whole run:
+//   Minitest:    "643 runs, 2108 assertions, 0 failures, 0 errors, 0 skips"
+//   XCTest:      "Executed 1117 tests, with 1 failure (0 unexpected) in ..."
+//   Swift Testing: "✘ Test run with 1117 tests in 85 suites failed after ..."
+//   xcodebuild:  "** TEST SUCCEEDED **" / "** TEST FAILED **"
+//   Gradle:      "BUILD SUCCESSFUL in 1m 2s" / "BUILD FAILED in 40s",
+//                "888 tests completed, 1 failed"
+const SUMMARY_PATTERNS = [
+    /^\d+ runs, \d+ assertions, \d+ failures, \d+ errors, \d+ skips$/,
+    /Executed \d+ tests?, with \d+ failures?.*$/,
+    /Test run with \d+ tests?.*$/,
+    /^\d+ tests completed, \d+ failed.*$/,
+    /^\*\* TEST (SUCCEEDED|FAILED) \*\*$/,
+    /^BUILD (SUCCESSFUL|FAILED) in .*$/,
+];
+export function extractSummary(output) {
+    const lines = output.split("\n").map((l) => l.trim()).filter(Boolean);
+    for (const pattern of SUMMARY_PATTERNS) {
+        for (let i = lines.length - 1; i >= 0; i--) {
+            const m = lines[i].match(pattern);
+            if (m)
+                return m[0];
+        }
+    }
+    return undefined;
+}
+function fromRun(command, run, failNote) {
+    const pass = run.exitCode === 0;
+    const tail = tailLines(run.output, OUTPUT_TAIL_LINES);
+    const summary = extractSummary(run.output);
+    return {
+        status: pass ? "pass" : "fail",
+        command,
+        exitCode: run.exitCode,
+        durationMs: run.durationMs,
+        ...(tail ? { outputTail: tail } : {}),
+        ...(summary ? { summary } : {}),
+        ...(!pass && failNote ? { note: failNote } : {}),
+        ...(!pass && !failNote && run.timedOut ? { note: "timed out" } : {}),
+    };
+}
+function skipped(command, note) {
+    return { status: "skipped", command, exitCode: null, durationMs: 0, note };
+}
+async function exists(path) {
+    try {
+        await access(path);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+// Fold suite results into the judge result: each platform carries its
+// `tests`, and an opted-in suite that fails fails the run (SPEC §4
+// Operation 3). Skipped suites are shown but don't count.
+export function applyTestResults(judge, results) {
+    const platforms = (judge.platforms ?? []).map((p) => {
+        const tests = results[p.platform];
+        return tests ? { ...p, tests } : p;
+    });
+    const ran = platforms.filter((p) => p.tests && p.tests.status !== "skipped");
+    const passed = ran.filter((p) => p.tests.status === "pass").length;
+    return {
+        ...judge,
+        overallPass: judge.overallPass && passed === ran.length,
+        summary: `${judge.summary} · tests ${passed}/${ran.length} pass`,
+        platforms,
+    };
+}
+//# sourceMappingURL=test-suites.js.map

package/dist/validation/test-suites.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-suites.js","sourceRoot":"","sources":["../../src/validation/test-suites.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativeapptemplate-agent",
-  "version": "0.3.2",
+  "version": "0.4.1",
   "description": "A Claude Code agent that turns a natural-language SaaS spec into a working three-platform implementation (Rails API + SwiftUI iOS + Jetpack Compose Android).",
   "type": "module",
   "main": "dist/index.js",

package/scripts/ruby/rename.rb

@@ -3,6 +3,9 @@
 # Apply a rename plan to a Rails project tree.
 # Stdin:  { "renamePlan": [{"from":"Shop","to":"Clinic"}, ...],
 #          "japaneseRenamePlan": [{"from":"店舗","to":"医院"}, ...],  (optional)
+#          "appDomain": {"domain":"orangebaton.app",                 (optional)
+#                        "bundleIdPrefix":"app.orangebaton",
+#                        "androidPackagePrefix":"app.orangebaton"},
 #          "root": "/abs/path" }
 # Stdout: { "files_scanned": N, "files_changed": N, "substitutions": N, "files_renamed": N }
 #
@@ -15,10 +18,12 @@
 # them from their (un-renamed) sources, e.g. Turbo's VisitState.completed.
 
 require "json"
+require "fileutils"
 
 input = JSON.parse($stdin.read)
 plan  = input.fetch("renamePlan")
 japanese_plan = input.fetch("japaneseRenamePlan", [])
+app_domain = input["appDomain"]
 root  = input.fetch("root")
 
 stats = { files_scanned: 0, files_changed: 0, substitutions: 0, files_renamed: 0 }
@@ -187,7 +192,32 @@ japanese_patterns = japanese_plan
   .sort_by { |p| -p.fetch("from").length }
   .map { |p| [/#{Regexp.escape(p.fetch("from"))}/, p.fetch("to")] }
 
-all_patterns = japanese_patterns + plan.flat_map { |p| build_patterns(p.fetch("from"), p.fetch("to")) }
+# The template's domain and reverse-DNS prefix, when the app has a domain of
+# its own (src/app-domain.ts). Matched whole before any product-name pattern
+# can reach the `nativeapptemplate` inside them; the single-pass substitution
+# below then renames what follows the prefix
+# (com.nativeapptemplate.NativeAppTemplate.ios -> app.orangebaton.OrangeBaton.ios)
+# and never re-scans the replaced text. The Android package (the lowercase
+# product after the prefix, also in google-services.json and the API's FCM
+# test) takes the Java-safe prefix; every other com.nativeapptemplate (iOS
+# bundle IDs, keychain services, log subsystems) the plain reverse domain. Without appDomain these are absent and
+# the flat product rule turns both into <flat product>.com / com.<flat product>.
+def domain_patterns(app_domain)
+  return [] unless app_domain
+
+  domain  = app_domain.fetch("domain")
+  bundle  = app_domain.fetch("bundleIdPrefix")
+  package = app_domain.fetch("androidPackagePrefix")
+  android_product = "nativeapptemplate[a-z0-9]*(?![A-Za-z0-9_])"
+  [
+    [/(?<![A-Za-z0-9_-])nativeapptemplate\.com(?![A-Za-z0-9_-]|\.[A-Za-z0-9])/, domain],
+    [/(?<![A-Za-z0-9_.-])com\.nativeapptemplate(?=\.#{android_product})/, package],
+    [/(?<![A-Za-z0-9_-])com\/nativeapptemplate(?=\/#{android_product})/, package.tr(".", "/")],
+    [/(?<![A-Za-z0-9_.-])com\.nativeapptemplate(?![A-Za-z0-9_-])/, bundle],
+  ]
+end
+
+all_patterns = domain_patterns(app_domain) + japanese_patterns + plan.flat_map { |p| build_patterns(p.fetch("from"), p.fetch("to")) }
 
 # One combined regex, applied in a single pass, so a replacement is never
 # re-scanned by a later pair: with NativeAppTemplate→PetShop and Shop→Store,
@@ -207,6 +237,37 @@ def rename_all(text)
   [result, count]
 end
 
+# References to the template's own GitHub repos and the agent's name are left
+# byte-for-byte as they are: renamed, they become dead links
+# (github.com/orangebaton/OrangeBaton-iOS) and a tool that doesn't exist
+# (orangebaton-agent). They are masked with placeholders before the
+# substitution and restored after it, so nothing inside them is renamed: not
+# the product name, nor a Shop / ItemTag token in a URL path. The product's
+# domains and emails (nativeapptemplate.com) are not protected; they become
+# the app's own. Mirrored in src/validation/protected-references.ts, which
+# keeps Layer 1 from flagging what is left here.
+PROTECTED_REFERENCE = %r{
+  github\.com[/:]nativeapptemplate(?![A-Za-z0-9_-])(?:/[^\s)\]"'<>`]*)?
+  |
+  (?<![A-Za-z0-9_-])nativeapptemplate-agent(?:-mcp)?(?![A-Za-z0-9_])
+}x
+MASK_OPEN  = "\u{E000}"
+MASK_CLOSE = "\u{E001}"
+MASK       = /#{MASK_OPEN}(\d+)#{MASK_CLOSE}/
+
+def rename_content(text)
+  # A file that already holds the sentinel can't be masked unambiguously.
+  return rename_all(text) if text.include?(MASK_OPEN)
+
+  spans = []
+  masked = text.gsub(PROTECTED_REFERENCE) do
+    spans << Regexp.last_match(0)
+    "#{MASK_OPEN}#{spans.length - 1}#{MASK_CLOSE}"
+  end
+  result, count = rename_all(masked)
+  [result.gsub(MASK) { spans[Regexp.last_match(1).to_i] }, count]
+end
+
 def skip?(path, root)
   # Compare against the path RELATIVE to the project root, not the absolute
   # path. Otherwise SKIP_DIR_SEGMENTS like "tmp" / "log" / "build" silently
@@ -245,7 +306,7 @@ Dir.glob("#{root}/**/*", File::FNM_DOTMATCH).each do |path|
     next
   end
 
-  content, local_subst = rename_all(original)
+  content, local_subst = rename_content(original)
   next if content == original
 
   File.write(path, content)
@@ -253,10 +314,44 @@ Dir.glob("#{root}/**/*", File::FNM_DOTMATCH).each do |path|
   stats[:substitutions] += local_subst
 end
 
+# Pass 1.5 — move the Android package directories (<source root>/com/
+# nativeapptemplate/nativeapptemplate) under the app's package prefix
+# (app/orangebaton/nativeapptemplate; Pass 2 then renames the last segment).
+# The directories made for the prefix are pinned so Pass 2 leaves them as they
+# are even when a domain label happens to be a rename token (shop.example).
+pinned = {}
+if app_domain
+  package_dirs = app_domain.fetch("androidPackagePrefix").split(".")
+  Dir.glob("#{root}/**/com/nativeapptemplate", File::FNM_DOTMATCH).sort.each do |template_dir|
+    next if skip?(template_dir, root)
+    next unless File.directory?(template_dir) && !File.symlink?(template_dir)
+    next unless Dir.children(template_dir).any? { |c| c.match?(/\Anativeapptemplate[a-z0-9]*\z/) }
+
+    source_root = File.dirname(File.dirname(template_dir))
+    target = File.join(source_root, *package_dirs)
+    if File.exist?(target)
+      warn "rename.rb: not moving #{template_dir}: #{target} already exists"
+      next
+    end
+    FileUtils.mkdir_p(File.dirname(target))
+    File.rename(template_dir, target)
+    stats[:files_renamed] += 1
+    com_dir = File.dirname(template_dir)
+    # Finder's .DS_Store alone doesn't keep the template's com/ directory.
+    leftovers = Dir.children(com_dir)
+    if leftovers.all? { |c| c == ".DS_Store" }
+      leftovers.each { |c| File.delete(File.join(com_dir, c)) }
+      Dir.rmdir(com_dir)
+    end
+    package_dirs.each_index { |i| pinned[File.join(source_root, *package_dirs[0..i])] = true }
+  end
+end
+
 # Pass 2 — rename paths. Deepest-first so renaming a parent directory
 # doesn't invalidate paths we haven't visited yet.
 Dir.glob("#{root}/**/*", File::FNM_DOTMATCH).sort_by { |p| -p.length }.each do |path|
   next if skip?(path, root)
+  next if pinned[path]
   next unless File.exist?(path)
 
   old_name = File.basename(path)