@przeprogramowani/10x-cli 1.15.0 → 1.17.0

package/dist/index.mjs

@@ -10173,7 +10173,7 @@ var cac = (name = "") => new CAC(name);
 // package.json
 var package_default = {
   name: "@przeprogramowani/10x-cli",
-  version: "1.15.0",
+  version: "1.17.0",
   description: "Open-source CLI for 10xDevs course content",
   repository: {
     type: "git",
@@ -11459,6 +11459,7 @@ function topDetectedProfile(signals) {
 
 // src/commands/bench-kit.ts
 var TEMPLATE_REPO_URL = "https://github.com/przeprogramowani/10x-bench-kit";
+var SHARED_ROOT_FILES = ["AGENTS.md"];
 var PLACEHOLDER_BASE_REPO = "demo-app";
 function registerBenchKitCommand(cli) {
   if (!experimentalEnabled())
@@ -11511,15 +11512,27 @@ async function runBenchKitInit(ctx, dirArg, options, deps = defaultDeps) {
     const skills = syncDir(join4(scratch, skillSource), join4(targetDir, skillRootFor(toolId)), { overwrite: !repair });
     installWorkflows(targetDir, { skipExisting: repair });
     let baseRepo = null;
+    let demoTasksPinned = 0;
     if (!repair) {
       const detected = await deps.detectBaseRepo(process.cwd());
       if (detected !== null && resolve(detected.rootDir) !== targetDir) {
-        if (await registerBaseRepo(join4(targetDir, "bench.config.yaml"), detected)) {
-          baseRepo = detected;
-          verbose(ctx, `registered base repo ${detected.name} (${detected.url})`);
+        let repo = detected;
+        const https = toHttpsUrl(detected.url);
+        if (https !== null && await deps.remoteReachable(https)) {
+          repo = { ...detected, url: https };
+          verbose(ctx, `repo answers over https — using ${https} instead of SSH`);
+        }
+        if (await registerBaseRepo(join4(targetDir, "bench.config.yaml"), repo)) {
+          baseRepo = repo;
+          verbose(ctx, `registered base repo ${repo.name} (${repo.url})`);
+          demoTasksPinned = await pinPlaceholderTasks(join4(targetDir, "tasks"), repo);
+          if (demoTasksPinned > 0) {
+            verbose(ctx, `pinned ${demoTasksPinned} demo task(s) to ${repo.headCommit.slice(0, 12)}`);
+          }
         }
       }
     }
+    const runnerDeps = await installRunnerDependencies(ctx, deps, targetDir);
     const manifest = {
       templateVersion,
       templateRef: requestedRef ?? "latest",
@@ -11542,6 +11555,8 @@ async function runBenchKitInit(ctx, dirArg, options, deps = defaultDeps) {
       `Created a benchmark instance in '${targetDir}' from template ${templateVersion}.`,
       `Agent skills installed for ${toolName} under ${skillRootFor(toolId)}/.`,
       baseRepo === null ? "No product repo detected here — add your base repos to bench.config.yaml." : `Registered '${baseRepo.name}' (${baseRepo.url}) as the first base repo in bench.config.yaml.`,
+      ...demoTasksPinned > 0 ? [`Pinned the demo task to ${baseRepo?.headCommit.slice(0, 12)} (current HEAD of the base repo).`] : [],
+      ...runnerDeps === "failed" ? ["Runner dependencies did not install — run 'npm ci --prefix .bench-kit/runner' yourself."] : runnerDeps === "installed" ? ["Runner dependencies installed (.bench-kit/runner/node_modules)."] : [],
       committed ? "Initialized a fresh git repository with an initial commit." : "Initialized a fresh git repository (initial commit skipped — commit the files yourself).",
       "Next: wire up secrets, then run 'bench validate' before the first run."
     ];
@@ -11555,6 +11570,8 @@ async function runBenchKitInit(ctx, dirArg, options, deps = defaultDeps) {
       skillRoot: skillRootFor(toolId),
       filesCopied: copied + skills.added,
       baseRepo,
+      demoTasksPinned,
+      runnerDeps,
       gitInitialized: !repair,
       committed
     });
@@ -11618,11 +11635,18 @@ async function runBenchKitUpdate(ctx, dirArg, options, deps = defaultDeps) {
     const skills = syncDir(join4(scratch, skillSource), join4(targetDir, skillRootFor(toolId)), {
       overwrite: true
     });
+    const shared = { added: 0, updated: 0, unchanged: 0 };
+    for (const file of SHARED_ROOT_FILES) {
+      addSync(shared, syncFile(join4(scratch, file), join4(targetDir, file)));
+    }
+    const runnerDeps = await installRunnerDependencies(ctx, deps, targetDir);
     output(ctx, [
       `Updated the benchmark instance from template ${currentVersion} to ${newVersion}.`,
       "  .bench-kit/            replaced wholesale (runtime zone)",
+      ...runnerDeps === "failed" ? ["  .bench-kit/runner/     npm ci FAILED — run 'npm ci --prefix .bench-kit/runner' yourself"] : runnerDeps === "installed" ? ["  .bench-kit/runner/     dependencies reinstalled (npm ci)"] : [],
       `  .github/workflows/     ${describeSync(workflows)}`,
       `  ${`${skillRootFor(toolId)}/`.padEnd(23)}${describeSync(skills)} — proposal, review before committing`,
+      `  ${SHARED_ROOT_FILES.join(", ").padEnd(23)}${describeSync(shared)} — proposal, review before committing`,
       "  tasks/, evaluation-pool/, bench.config.yaml untouched (company zone)",
       "Next: review 'git diff', run 'bench validate' (it flags any schema changes to fix), then commit via PR."
     ].join(`
@@ -11635,7 +11659,8 @@ async function runBenchKitUpdate(ctx, dirArg, options, deps = defaultDeps) {
       templateRef: updatedManifest.templateRef,
       tool: toolId,
       skillRoot: skillRootFor(toolId),
-      zones: { benchKit: "replaced", workflows, skills }
+      runnerDeps,
+      zones: { benchKit: "replaced", workflows, skills, shared }
     });
   } finally {
     rmSync3(scratch, { recursive: true, force: true });
@@ -11758,6 +11783,26 @@ function syncDir(srcDir, destDir, opts) {
 function describeSync(counts) {
   return `${counts.added} added, ${counts.updated} updated, ${counts.unchanged} unchanged`;
 }
+function syncFile(from, to) {
+  const counts = { added: 0, updated: 0, unchanged: 0 };
+  if (!existsSync4(from))
+    return counts;
+  if (!existsSync4(to)) {
+    cpSync(from, to);
+    counts.added++;
+  } else if (readFileSync3(from).equals(readFileSync3(to))) {
+    counts.unchanged++;
+  } else {
+    cpSync(from, to);
+    counts.updated++;
+  }
+  return counts;
+}
+function addSync(into, counts) {
+  into.added += counts.added;
+  into.updated += counts.updated;
+  into.unchanged += counts.unchanged;
+}
 function materialize(srcDir, destDir, opts) {
   let copied = 0;
   const walk = (rel) => {
@@ -11805,6 +11850,53 @@ async function registerBaseRepo(configPath, repo) {
   writeFileSync3(configPath, doc.toString());
   return true;
 }
+function toHttpsUrl(url) {
+  const scp = url.match(/^git@([^:/]+):(.+)$/);
+  if (scp !== null)
+    return `https://${scp[1]}/${scp[2]}`;
+  const ssh = url.match(/^ssh:\/\/(?:[^@/]+@)?([^:/]+)(?::\d+)?\/(.+)$/);
+  if (ssh !== null)
+    return `https://${ssh[1]}/${ssh[2]}`;
+  return null;
+}
+var PLACEHOLDER_COMMIT = /^0{40}$/;
+async function pinPlaceholderTasks(tasksDir, repo) {
+  if (!existsSync4(tasksDir) || !/^[0-9a-f]{40}$/.test(repo.headCommit))
+    return 0;
+  const { parseDocument } = await Promise.resolve().then(() => __toESM(require_dist(), 1));
+  let pinned = 0;
+  for (const entry of readdirSync(tasksDir, { withFileTypes: true })) {
+    if (!entry.isDirectory())
+      continue;
+    const taskYaml = join4(tasksDir, entry.name, "task.yaml");
+    if (!existsSync4(taskYaml))
+      continue;
+    const doc = parseDocument(readFileSync3(taskYaml, "utf8"));
+    if (doc.getIn(["repo"]) !== PLACEHOLDER_BASE_REPO)
+      continue;
+    const commit = doc.getIn(["commit"]);
+    doc.setIn(["repo"], repo.name);
+    if (typeof commit === "string" && PLACEHOLDER_COMMIT.test(commit)) {
+      doc.setIn(["commit"], repo.headCommit);
+    }
+    writeFileSync3(taskYaml, doc.toString());
+    pinned++;
+  }
+  return pinned;
+}
+async function installRunnerDependencies(ctx, deps, targetDir) {
+  const runnerDir = join4(targetDir, ".bench-kit", "runner");
+  if (!existsSync4(join4(runnerDir, "package.json")))
+    return "skipped";
+  verbose(ctx, "installing runner dependencies (npm ci in .bench-kit/runner)");
+  const result = await deps.installRunnerDeps(runnerDir);
+  if (!result.ok) {
+    verbose(ctx, `npm ci failed (${result.error.trim().split(`
+`).pop() ?? ""})`);
+    return "failed";
+  }
+  return "installed";
+}
 async function freshGitInit(ctx, deps, dir, templateVersion) {
   const init = await deps.runGit(["init"], dir);
   if (!init.ok) {
@@ -11818,9 +11910,13 @@ async function freshGitInit(ctx, deps, dir, templateVersion) {
   }
   return true;
 }
-function run(cmd, args, cwd) {
+function run(cmd, args, cwd, env) {
   return new Promise((resolvePromise) => {
-    const child = spawn(cmd, args, { cwd, stdio: ["ignore", "pipe", "pipe"] });
+    const child = spawn(cmd, args, {
+      cwd,
+      stdio: ["ignore", "pipe", "pipe"],
+      ...env === undefined ? {} : { env: { ...process.env, ...env } }
+    });
     let stdout = "";
     let stderr = "";
     child.stdout?.on("data", (chunk) => {
@@ -11867,6 +11963,15 @@ var defaultDeps = {
       return null;
     return { rootDir, name: basename(rootDir), url, headCommit };
   },
+  async remoteReachable(url) {
+    const result = await run("git", ["ls-remote", "--heads", url], undefined, {
+      GIT_TERMINAL_PROMPT: "0"
+    });
+    return result.ok;
+  },
+  installRunnerDeps(runnerDir) {
+    return run("npm", ["ci", "--no-audit", "--no-fund"], runnerDir);
+  },
   detectToolSignals(cwd) {
     return detectTools(cwd);
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@przeprogramowani/10x-cli",
-  "version": "1.15.0",
+  "version": "1.17.0",
   "description": "Open-source CLI for 10xDevs course content",
   "repository": {
     "type": "git",