@touchtechclub/simbox 0.2.11 → 0.4.0

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/cli.ts
-import { Command, Option } from "commander";
+import { Argument, Command, Option } from "commander";
 import pc4 from "picocolors";
 import { createRequire } from "node:module";
 
@@ -12,6 +12,77 @@ import { join } from "node:path";
 
 // ../../packages/shared/src/constants.ts
 var PROD_API_URL = "https://api.simbox.touchtech.club";
+// ../../packages/shared/src/runners.ts
+var DEFAULT_RUNNERS = {
+  ios: { labels: ["macos-latest"] },
+  android: { labels: ["ubuntu-latest"] }
+};
+var RUNNER_PRESETS = [
+  {
+    name: "GitHub macOS (ARM64)",
+    platform: "ios",
+    provider: "github",
+    runner: DEFAULT_RUNNERS.ios
+  },
+  {
+    name: "GitHub Ubuntu (x64/KVM)",
+    platform: "android",
+    provider: "github",
+    runner: DEFAULT_RUNNERS.android
+  },
+  ...[2, 4, 8].map((cpu) => ({
+    name: `Blacksmith Ubuntu · ${cpu} vCPU`,
+    platform: "android",
+    provider: "blacksmith",
+    runner: { labels: [`blacksmith-${cpu}vcpu-ubuntu-2404`] }
+  })),
+  ...[6, 12].map((cpu) => ({
+    name: `Blacksmith macOS · ${cpu} vCPU`,
+    platform: "ios",
+    provider: "blacksmith",
+    runner: { labels: [`blacksmith-${cpu}vcpu-macos-latest`] }
+  }))
+];
+function validateRunner(value, platform) {
+  if (!value || typeof value !== "object" || Array.isArray(value) || Object.keys(value).some((key) => key !== "labels")) {
+    throw new Error('Runner must be {labels: ["runner-label"]}.');
+  }
+  const labels = value.labels;
+  if (!Array.isArray(labels) || labels.length < 1 || labels.length > 8 || labels.some((label) => typeof label !== "string" || !/^[A-Za-z0-9][A-Za-z0-9_. -]{0,99}$/.test(label) || label !== label.trim())) {
+    throw new Error("Use 1–8 runner labels (1–100 letters, numbers, spaces, dots, underscores or hyphens each).");
+  }
+  if (new Set(labels.map((label) => label.toLowerCase())).size !== labels.length)
+    throw new Error("Runner labels must be unique (case-insensitive).");
+  for (const label of labels) {
+    const lower = label.toLowerCase();
+    if (lower.includes("windows") || lower === "ubuntu-slim")
+      throw new Error("Windows and container-only ubuntu-slim runners are unsupported.");
+    if (platform === "android" && (/macos|darwin/.test(lower) || /(?:^|[-_ ])(?:arm|arm64|aarch64)(?:$|[-_ ])/.test(lower))) {
+      throw new Error("Android requires a Linux x64 runner with KVM, not macOS or ARM.");
+    }
+    if (platform === "ios" && (/ubuntu|linux/.test(lower) || /intel|x64|x86_64/.test(lower))) {
+      throw new Error("iOS requires a macOS ARM64 runner with Xcode.");
+    }
+  }
+  return { labels: [...labels] };
+}
+function parseRunnerInput(input, platform) {
+  const text = input.trim();
+  let labels = [text];
+  if (text.startsWith("[")) {
+    try {
+      labels = JSON.parse(text);
+    } catch {
+      throw new Error("Custom runner label list must be valid JSON.");
+    }
+  }
+  return validateRunner({ labels }, platform);
+}
+function formatRunner(runner) {
+  return runner ? runner.labels.join(" + ") : "unknown (legacy workflow)";
+}
+// ../../packages/shared/src/preview.ts
+var PREVIEW_SESSION_MS = 5 * 60000;
 // src/config.ts
 var DEFAULT_WEB_URL = "https://simbox.touchtech.club";
 function stripTrailingSlash(url) {
@@ -163,7 +234,13 @@ var repoStatus = () => api("/v1/repo/status");
 var repairRepo = () => api("/v1/repo/repair", {
   method: "POST"
 });
-var ensureRun = (fresh, platform2) => api("/v1/runs/ensure", { method: "POST", body: { new: fresh, platform: platform2 } });
+var ensureRun = (fresh, platform2, runner) => api("/v1/runs/ensure", {
+  method: "POST",
+  body: { new: fresh, platform: platform2, runner }
+});
+var runnerSettings = () => api("/v1/runners");
+var runnerDiagnostics = () => api("/v1/runners/doctor");
+var updateRunners = (scope, patch) => api(`/v1/runners/${scope}`, { method: "POST", body: patch });
 async function currentRun() {
   try {
     const res = await api("/v1/runs/current");
@@ -361,7 +438,57 @@ class Spinner {
 
 // src/remote.ts
 import { spawn } from "node:child_process";
+import { join as join3 } from "node:path";
+
+// src/device-registration.ts
+import { randomUUID } from "node:crypto";
+import { existsSync, mkdirSync as mkdirSync2, readdirSync, statSync, unlinkSync, writeFileSync as writeFileSync2 } from "node:fs";
+import { homedir as homedir2 } from "node:os";
 import { join as join2 } from "node:path";
+var MAX_AGE_MS = 5 * 60000;
+function registerDevice(info, options = {}) {
+  if (!process.env.T3CODE_HOME && !process.env.SIMBOX_DEVICE_REGISTRATION_DIR && ![".s5code", ".t3"].some((home) => existsSync(join2(homedir2(), home, "userdata", "server-runtime.json"))))
+    return;
+  try {
+    const directory = process.env.SIMBOX_DEVICE_REGISTRATION_DIR ?? join2(configDir(), "device-registrations");
+    mkdirSync2(directory, { recursive: true, mode: 448 });
+    for (const file of readdirSync(directory)) {
+      if (!/^[a-f0-9-]{36}\.json$/.test(file))
+        continue;
+      const path = join2(directory, file);
+      if (Date.now() - statSync(path).mtimeMs > MAX_AGE_MS)
+        unlinkSync(path);
+    }
+    const args = options.args ?? [];
+    const flag = (name) => {
+      const end = args.indexOf("--");
+      const flags = end < 0 ? args : args.slice(0, end);
+      const index = flags.indexOf(name);
+      return index >= 0 ? flags[index + 1] : flags.find((arg) => arg.startsWith(`${name}=`))?.slice(name.length + 1);
+    };
+    const id = randomUUID();
+    writeFileSync2(join2(directory, `${id}.json`), JSON.stringify({
+      version: 1,
+      createdAt: Date.now(),
+      ...info,
+      platform: flag("--platform") ?? options.platform,
+      deviceId: flag("--udid") ?? flag("--serial"),
+      deviceName: flag("--device"),
+      agentSession: flag("--session"),
+      stop: options.stop === true,
+      autoBoot: !options.args,
+      apiUrl: apiBaseUrl(),
+      userToken: loadToken()
+    }), { mode: 384, flag: "wx" });
+    process.stderr.write(`[simbox-device:${id}]
+`);
+  } catch {
+    process.stderr.write(`Could not notify S5 Code about this device; Simbox remains connected.
+`);
+  }
+}
+
+// src/remote.ts
 var STARTUP_TIMEOUT_MS = 300000;
 async function waitForAndroid(runId, options = {}) {
   const deadline = Date.now() + (options.timeoutMs ?? 12 * 60000);
@@ -469,13 +596,15 @@ async function cmdExec(args) {
   delete env.AGENT_DEVICE_REMOTE_CONFIG;
   delete env.AGENT_DEVICE_DAEMON_BASE_URL;
   const code = await new Promise((resolve, reject) => {
-    const child = spawn(bin, remoteArgs(args, info, join2(configDir(), "agent-device")), {
+    const child = spawn(bin, remoteArgs(args, info, join3(configDir(), "agent-device")), {
       stdio: "inherit",
       env
     });
     child.on("error", reject);
     child.on("exit", (status) => resolve(status ?? 1));
   });
+  if (code === 0 && !args.some((arg) => ["help", "--help", "-h", "--version", "version"].includes(arg)))
+    registerDevice(info, { args });
   if (code !== 0) {
     process.stderr.write("Simbox did not retry the device command (it may already have executed). Use `simbox exec session list` to inspect it; the next command refreshes the tunnel automatically.\n");
   }
@@ -560,7 +689,7 @@ function printRepoConnected(repo) {
     console.log(`Your default branch is protected — merge ${pc3.underline(repo.prUrl)} to activate Simbox.`);
   }
   if (repo.private) {
-    console.log(pc3.yellow("Note: private repos are billed at the 10× macOS minute multiplier by GitHub."));
+    console.log(pc3.yellow("Note: private repositories may consume paid runner minutes. Review GitHub or your selected provider's billing."));
   }
   console.log(`Run ${pc3.cyan("simbox sim")} to boot a simulator.`);
 }
@@ -569,7 +698,10 @@ var SIM_POLL_MS = 3000;
 async function cmdSim(opts) {
   const json = opts.json === true;
   const out = json ? process.stderr : process.stdout;
-  const first = await ensureRun(opts.new === true, opts.platform);
+  if (opts.runner !== undefined && !opts.platform)
+    throw new CliError("Use --platform ios or android with --runner.");
+  const runner = opts.runner === undefined ? undefined : parseRunnerInput(opts.runner, opts.platform);
+  const first = await ensureRun(opts.new === true, opts.platform, runner);
   let info;
   if (first.state === "live") {
     info = {
@@ -619,6 +751,7 @@ async function cmdSim(opts) {
   info = await waitForRemote(info);
   if (opts.platform === "android")
     await waitForAndroid(info.runId);
+  registerDevice(info, { platform: opts.platform });
   if (json) {
     const payload = {
       tunnel_url: info.tunnelUrl,
@@ -645,6 +778,7 @@ async function cmdPs() {
   console.log(`${pc3.bold("run")} ${run.id}`);
   console.log(`  state:          ${stateColor(run.state)}`);
   console.log(`  platform:       ${run.platform}`);
+  console.log(`  runner:         ${formatRunner(run.runner)}`);
   console.log(`  gh_run_id:      ${run.ghRunId ?? pc3.dim("pending")}`);
   console.log(`  active_devices: ${run.activeDevices}`);
   console.log(`  android_ready:  ${run.androidReady ? "yes" : "no"}`);
@@ -659,6 +793,13 @@ async function cmdStop() {
     return;
   }
   await stopRun(run.id);
+  if (run.tunnelUrl && run.daemonToken)
+    registerDevice({
+      runId: run.id,
+      tunnelUrl: run.tunnelUrl,
+      daemonToken: run.daemonToken,
+      expiresAt: run.expiresAt
+    }, { stop: true });
   console.log(`${pc3.green("✔")} Stop requested for run ${pc3.bold(run.id)}.`);
 }
 async function cmdRepair() {
@@ -680,6 +821,140 @@ async function cmdLogout() {
   }
 }
 
+// src/runners.ts
+import { spawnSync as spawnSync2 } from "node:child_process";
+function printRunnerSettings(settings, json = false) {
+  if (json) {
+    console.log(JSON.stringify(settings));
+    return;
+  }
+  console.log(`Repository: ${settings.repoFullName ?? "not connected"}`);
+  for (const platform2 of ["ios", "android"]) {
+    console.log(`${platform2}: ${formatRunner(settings.effective[platform2].runner)} (${settings.effective[platform2].source})`);
+    console.log(`  account: ${settings.account[platform2] ? formatRunner(settings.account[platform2]) : "GitHub default"}`);
+    console.log(`  repository: ${settings.repository?.[platform2] ? formatRunner(settings.repository[platform2]) : "inherit account"}`);
+  }
+  console.log("Settings apply to future runs only. Run `simbox repair` once to upgrade older workflows.");
+  console.log("Blacksmith requires its GitHub App on the repository and bills separately. Custom runners need Linux x64/KVM or macOS ARM64/Xcode.");
+}
+async function cmdRunnersShow(json = false) {
+  printRunnerSettings(await runnerSettings(), json);
+}
+function cmdRunnerPresets() {
+  for (const preset of RUNNER_PRESETS)
+    console.log(`${preset.platform.padEnd(7)} ${preset.runner.labels[0]} — ${preset.name}`);
+}
+async function cmdRunnersSet(platform2, input, scope, json = false) {
+  const runner = input === null ? null : parseRunnerInput(input, platform2);
+  printRunnerSettings(await updateRunners(scope, { [platform2]: runner }), json);
+}
+async function cmdDoctor(json = false) {
+  const diagnostics = await runnerDiagnostics();
+  const tool = (name, required) => {
+    const result = spawnSync2(name, ["--version"], {
+      encoding: "utf8",
+      timeout: 1e4,
+      shell: false
+    });
+    return {
+      name,
+      required,
+      ok: !result.error && result.status === 0,
+      message: result.error ? `Missing or failed ${name}; install it locally.` : (result.stdout || result.stderr).trim().slice(0, 200)
+    };
+  };
+  const local = [tool("agent-device", true), tool("bunx", false)];
+  if (json)
+    console.log(JSON.stringify({ ...diagnostics, local }));
+  else {
+    for (const check of [...local, ...diagnostics.checks])
+      console.log(`${check.ok ? "PASS" : ("required" in check) && !check.required ? "WARN" : "FAIL"} ${check.name}: ${check.message}`);
+    printRunnerSettings(diagnostics.settings);
+    console.log("No job was started. Actual KVM/Xcode capability is checked on the runner, not this machine.");
+  }
+  if (diagnostics.checks.some((check) => !check.ok) || local.some((check) => check.required && !check.ok))
+    process.exitCode = 1;
+}
+
+// src/skills.ts
+import { spawn as spawn2 } from "node:child_process";
+import { createInterface } from "node:readline/promises";
+function skillInstallArgs(opts) {
+  if (opts.project && opts.global)
+    throw new CliError("Choose either --project or --global, not both.");
+  if (!opts.project && !opts.global)
+    throw new CliError("Choose --project or --global (scope is never inferred).");
+  if (opts.agent?.some((agent) => !/^[a-z][a-z0-9-]*$/.test(agent) && agent !== "*"))
+    throw new CliError("Invalid agent ID. Use skills CLI agent names, e.g. claude-code or codex.");
+  if (opts.yes && !opts.agent?.length)
+    throw new CliError("Non-interactive installs require --agent; Simbox will not choose agents for you.");
+  return [
+    "skills",
+    "add",
+    "TouchTechClub/simbox",
+    "--skill",
+    "simbox",
+    ...opts.global ? ["--global"] : [],
+    ...opts.agent?.length ? ["--agent", ...opts.agent] : [],
+    ...opts.yes ? ["--yes"] : []
+  ];
+}
+async function selectSkillScope(opts, interactive, ask) {
+  if (opts.project && opts.global)
+    throw new CliError("Choose either --project or --global, not both.");
+  if (opts.project || opts.global)
+    return opts;
+  if (!interactive || opts.yes)
+    throw new CliError("Specify --project or --global. For automation also provide --agent <id> --yes.");
+  while (true) {
+    const answer = (await ask(`Install the Simbox skill where?
+  1. Current project (${process.cwd()})
+  2. Global (your user account)
+Choose 1 or 2 (q to cancel): `)).trim().toLowerCase();
+    if (answer === "1" || answer === "project")
+      return { ...opts, project: true };
+    if (answer === "2" || answer === "global")
+      return { ...opts, global: true };
+    if (answer === "q" || answer === "cancel")
+      throw new CliError("Skill installation canceled.");
+  }
+}
+async function cmdSkillsInstall(opts) {
+  let selected = opts;
+  if (!opts.project && !opts.global) {
+    if (!process.stdin.isTTY || !process.stdout.isTTY || opts.yes) {
+      selected = await selectSkillScope(opts, false, async () => "");
+    } else {
+      const prompt = createInterface({ input: process.stdin, output: process.stdout });
+      try {
+        selected = await selectSkillScope(opts, true, (q) => prompt.question(q));
+      } finally {
+        prompt.close();
+      }
+    }
+  }
+  const args = skillInstallArgs(selected);
+  if (!opts.dryRun && !opts.yes && (!process.stdin.isTTY || !process.stdout.isTTY)) {
+    throw new CliError("Interactive skills installation needs a terminal. Use --project/--global --agent <id> --yes for automation.");
+  }
+  console.log(`Scope: ${selected.global ? "global" : `current project (${process.cwd()})`}`);
+  console.log(`Command: bunx ${args.map((arg) => arg === "*" ? "'*'" : arg).join(" ")}`);
+  console.log("This runs the third-party skills CLI. It handles agent selection and install confirmations; --yes accepts its installation/overwrite prompts.");
+  console.log("Set DISABLE_TELEMETRY=1 to opt out of skills CLI telemetry.");
+  if (opts.dryRun)
+    return;
+  await new Promise((resolve, reject) => {
+    const child = spawn2("bunx", args, {
+      cwd: process.cwd(),
+      env: process.env,
+      stdio: "inherit",
+      shell: false
+    });
+    child.once("error", (err) => reject(new CliError(`Could not start bunx. Install Bun or run the printed command manually. (${err.message})`)));
+    child.once("exit", (code, signal) => code === 0 ? resolve() : reject(new CliError(`Skills installer ${signal ? `stopped by ${signal}` : `exited with code ${code}`}.`, code ?? 1)));
+  });
+}
+
 // src/cli.ts
 var program = new Command().enablePositionalOptions();
 program.name("simbox").description("On-demand iOS simulators & Android emulators on your own GitHub Actions minutes.").version(getVersion());
@@ -691,7 +966,7 @@ program.command("init").description("Open onboarding and wait until a repo is co
 program.command("sim").description("Ensure a run and its tunnel are ready for device commands").option("--new", "force a fresh run even if one is live").addOption(new Option("--platform <platform>", "ios: macOS runner; android: Linux/KVM runner").choices([
   "ios",
   "android"
-])).option("--json", "print {tunnel_url, daemon_token, run_id, expires_at} as JSON only").action((opts) => {
+])).option("--runner <label-or-json>", "override runner label or JSON label array; requires --platform").option("--json", "print {tunnel_url, daemon_token, run_id, expires_at} as JSON only").action((opts) => {
   requireToken();
   return run(cmdSim(opts));
 });
@@ -712,6 +987,33 @@ program.command("repair").description("Re-commit the workflow, rotate the repo s
   return run(cmdRepair());
 });
 program.command("logout").description("Delete the saved auth token").action(() => run(cmdLogout()));
+var runners2 = program.command("runners").description("Account runner defaults and connected-repository overrides");
+program.command("doctor").description("Check tools, runner settings and workflow without starting a job").option("--json", "print diagnostics as JSON").action((opts) => {
+  requireToken();
+  return run(cmdDoctor(opts.json));
+});
+runners2.command("show").option("--json", "print settings as JSON").action((opts) => {
+  requireToken();
+  return run(cmdRunnersShow(opts.json));
+});
+runners2.command("presets").description("List GitHub and Blacksmith presets").action(cmdRunnerPresets);
+for (const command of ["set", "reset"]) {
+  const cmd = runners2.command(command).addArgument(new Argument("<platform>").choices(["ios", "android"]));
+  if (command === "set")
+    cmd.argument("<label-or-json>", "runner label or JSON label array");
+  cmd.addOption(new Option("--scope <scope>", "account defaults or connected repository override").choices(["account", "repo"]).makeOptionMandatory()).option("--json", "print settings as JSON");
+  if (command === "set")
+    cmd.action((platform2, input, opts) => {
+      requireToken();
+      return run(cmdRunnersSet(platform2, input, opts.scope, opts.json));
+    });
+  else
+    cmd.action((platform2, opts) => {
+      requireToken();
+      return run(cmdRunnersSet(platform2, null, opts.scope, opts.json));
+    });
+}
+program.command("skills").description("Set up the small Simbox agent skill").command("install").description("Install via bunx skills; asks current project or global").option("--project", "install to the current project").option("--global", "install to your user account").option("--agent <agents...>", "target skills CLI agent IDs; otherwise let the installer ask").option("--yes", "accept installer confirmations; requires explicit scope and agents").option("--dry-run", "print the command without installing").action((opts) => run(cmdSkillsInstall(opts)));
 function getVersion() {
   try {
     const require2 = createRequire(import.meta.url);
@@ -725,9 +1027,10 @@ async function run(p) {
   try {
     await p;
   } catch (err) {
-    process.stderr.write(`${pc4.red("✖")} ${friendlyError(err).message}
+    const error = friendlyError(err);
+    process.stderr.write(`${pc4.red("✖")} ${error.message}
 `);
-    process.exitCode = 1;
+    process.exitCode = error.exitCode;
   }
 }
 program.parseAsync(process.argv).catch((err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@touchtechclub/simbox",
-  "version": "0.2.11",
+  "version": "0.4.0",
   "description": "On-demand iOS simulators & Android emulators on your own GitHub Actions minutes.",
   "repository": {
     "type": "git",