@aictiq/cli 0.1.0 → 0.2.0

package/dist/index.js

@@ -299,7 +299,7 @@ async function promptSecret(question) {
     const muted = rl;
     const original = muted.output.write.bind(muted.output);
     muted.output.write = (() => true);
-    const answer = await new Promise((resolve2) => rl.question("", resolve2));
+    const answer = await new Promise((resolve3) => rl.question("", resolve3));
     muted.output.write = original;
     process.stdout.write("\n");
     return answer.trim();
@@ -948,7 +948,7 @@ function mcpCommand(globals) {
     };
     process.on("SIGINT", () => void shutdown());
     process.on("SIGTERM", () => void shutdown());
-    await new Promise((resolve2) => process.stdin.once("close", resolve2));
+    await new Promise((resolve3) => process.stdin.once("close", resolve3));
     await shutdown();
   });
 }
@@ -1146,7 +1146,7 @@ async function streamLog(ctx, orgSlug, runId, follow, pollMs) {
       if (page.items.length < logPageSize) break;
     }
     if (finished) return;
-    await new Promise((resolve2) => setTimeout(resolve2, pollMs));
+    await new Promise((resolve3) => setTimeout(resolve3, pollMs));
   }
 }
 function formatLogEntry(entry) {
@@ -1203,7 +1203,7 @@ async function resolveAgentId(ctx, agent) {
 import { Command as Command7 } from "commander";
 import { existsSync as existsSync3 } from "fs";
 import { arch, platform } from "os";
-import { resolve } from "path";
+import { resolve as resolve2 } from "path";
 
 // src/runner/client.ts
 var RunnerHttpError = class extends Error {
@@ -1344,9 +1344,9 @@ import { dirname as dirname2, join as join3 } from "path";
 
 // src/runner/workspace.ts
 import { spawn } from "child_process";
-import { chmodSync as chmodSync2, mkdirSync as mkdirSync2, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "fs";
+import { chmodSync as chmodSync2, mkdirSync as mkdirSync2, realpathSync, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "fs";
 import { homedir as homedir2 } from "os";
-import { join as join2 } from "path";
+import { isAbsolute, join as join2, relative, resolve } from "path";
 
 // src/runner/types.ts
 var RunFailure = class extends Error {
@@ -1521,18 +1521,52 @@ function uniqueFileName(value, existing) {
 function formatBytes(value) {
   return value >= 1024 * 1024 ? `${(value / (1024 * 1024)).toFixed(1)} MiB` : `${value} bytes`;
 }
+function resolveLocalRepository(run, options) {
+  const mapped = options.repositories[run.projectKey];
+  if (mapped !== void 0) return { path: mapped, root: null };
+  const hint = run.repo.localPathHint?.trim();
+  const roots = options.repoRoots ?? [];
+  if (hint) {
+    const expanded = expandHome(hint);
+    if (isAbsolute(expanded)) {
+      const real = realpathOrSelf(expanded);
+      for (const configured of roots) {
+        const expandedRoot = expandHome(configured);
+        if (!isAbsolute(expandedRoot)) continue;
+        const root = realpathOrSelf(expandedRoot);
+        if (isWithin(real, root)) return { path: real, root };
+      }
+    }
+  }
+  const example = `("${run.projectKey}": "/path/to/repository")`;
+  const detail = !hint ? ` Add it to the \`workspaces\` map in runner.json ${example}, or set the project's path hint and list its parent directory in \`repoRoots\`.` : roots.length === 0 ? ` The project suggests ${hint}. Add its parent directory to \`repoRoots\` in runner.json (\`aictiq runner root <path>\`), or map it in \`workspaces\` ${example}.` : ` The project suggests ${hint}, which is not under any of this runner's repoRoots (${roots.join(", ")}). Add a root that contains it, or map it in \`workspaces\` ${example}.`;
+  throw new RunFailure(
+    "no-local-repository",
+    `No local repository is mapped for project ${run.projectKey}.${detail}`
+  );
+}
+function expandHome(path) {
+  if (path === "~") return homedir2();
+  return path.startsWith("~/") ? join2(homedir2(), path.slice(2)) : path;
+}
+function realpathOrSelf(path) {
+  const normalised = resolve(path);
+  try {
+    return realpathSync(normalised);
+  } catch {
+    return normalised;
+  }
+}
+function isWithin(path, root) {
+  const rel = relative(root, path);
+  return rel === "" || !rel.startsWith("..") && !isAbsolute(rel);
+}
 function message(error) {
   return error instanceof Error ? error.message : String(error);
 }
 async function provisionLocal(run, checkout, options, env) {
-  const mapped = options.repositories[run.projectKey];
-  if (mapped === void 0) {
-    const hint = run.repo.localPathHint ? ` The project suggests ${run.repo.localPathHint}.` : "";
-    throw new RunFailure(
-      "no-local-repository",
-      `No local repository is mapped for project ${run.projectKey}. Add it to the \`workspaces\` map in runner.json ("${run.projectKey}": "/path/to/repository").${hint}`
-    );
-  }
+  const { path: mapped, root } = resolveLocalRepository(run, options);
+  const origin = root === null ? "mapped for project" : "the path hint for project";
   const toplevel = await git(["rev-parse", "--show-toplevel"], {
     cwd: mapped,
     env,
@@ -1541,9 +1575,15 @@ async function provisionLocal(run, checkout, options, env) {
     if (isAbort(error)) throw error;
     throw new RunFailure(
       "no-local-repository",
-      `${mapped}, mapped for project ${run.projectKey} in runner.json, is not a git repository.`
+      `${mapped}, ${origin} ${run.projectKey}, is not a git repository.`
     );
   });
+  if (root !== null && !isWithin(realpathOrSelf(toplevel.trim()), root)) {
+    throw new RunFailure(
+      "no-local-repository",
+      `${mapped}, the path hint for project ${run.projectKey}, is not a git repository under ${root}.`
+    );
+  }
   const repo = toplevel.trim();
   const call = (args) => gitStep(args, { cwd: repo, env, signal: options.signal });
   const hasOrigin = await git(["remote", "get-url", "origin"], {
@@ -1672,7 +1712,7 @@ ${tail}` : error.message;
   }
 }
 function git(args, options) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
     const child = spawn("git", args, {
       cwd: options.cwd,
       env: { ...options.env, GIT_TERMINAL_PROMPT: "0" },
@@ -1687,7 +1727,7 @@ function git(args, options) {
     });
     child.on("error", reject);
     child.on("close", (code) => {
-      if (code === 0) resolve2(stdout);
+      if (code === 0) resolve3(stdout);
       else reject(new GitError(args, code, stderr));
     });
   });
@@ -1710,7 +1750,7 @@ function readRunnerConfig(path = runnerConfigPath()) {
     return null;
   }
   if (typeof parsed !== "object" || parsed === null) return null;
-  const { url, token, name, workspaces, attachments } = parsed;
+  const { url, token, name, workspaces, repoRoots, attachments } = parsed;
   if (typeof url !== "string" || typeof token !== "string") return null;
   const mapped = {};
   if (typeof workspaces === "object" && workspaces !== null) {
@@ -1718,12 +1758,14 @@ function readRunnerConfig(path = runnerConfigPath()) {
       if (typeof value === "string") mapped[key] = value;
     }
   }
+  const roots = Array.isArray(repoRoots) ? repoRoots.filter((root) => typeof root === "string" && root.trim() !== "") : [];
   const rawLimits = typeof attachments === "object" && attachments !== null ? attachments : {};
   return {
     url,
     token,
     ...typeof name === "string" ? { name } : {},
     workspaces: mapped,
+    repoRoots: roots,
     attachments: {
       maxCount: validLimit(rawLimits.maxCount, DefaultAttachmentMaxCount),
       maxBytes: validLimit(rawLimits.maxBytes, DefaultAttachmentMaxBytes)
@@ -1872,7 +1914,7 @@ function splitByBytes(text, maxBytes) {
   return pieces;
 }
 function delay(ms) {
-  return new Promise((resolve2) => setTimeout(resolve2, ms));
+  return new Promise((resolve3) => setTimeout(resolve3, ms));
 }
 
 // src/runner/process.ts
@@ -1885,12 +1927,12 @@ function spawnSupervised(options) {
     detached: process.platform !== "win32",
     stdio: ["pipe", "pipe", "pipe"]
   });
-  const exited = new Promise((resolve2) => {
+  const exited = new Promise((resolve3) => {
     let settled = false;
     const settle = (code) => {
       if (settled) return;
       settled = true;
-      resolve2(code);
+      resolve3(code);
     };
     child.on("error", (error) => {
       options.onLine("stderr", `Could not start ${options.command}: ${error.message}`);
@@ -2210,7 +2252,7 @@ async function sendFinish(client, run, report, local) {
       return true;
     } catch (error) {
       if (error instanceof RunnerNetworkError && attempt < 30) {
-        await new Promise((resolve2) => setTimeout(resolve2, Math.min(3e4, 1e3 * 2 ** attempt)));
+        await new Promise((resolve3) => setTimeout(resolve3, Math.min(3e4, 1e3 * 2 ** attempt)));
         continue;
       }
       if (error instanceof RunnerHttpError && error.revoked) throw error;
@@ -2220,14 +2262,14 @@ async function sendFinish(client, run, report, local) {
   }
 }
 function findPullRequest(checkout, branch, env) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     execFile(
       "gh",
       ["pr", "view", branch, "--json", "url", "--jq", ".url"],
       { cwd: checkout, env, timeout: 15e3 },
       (error, stdout) => {
         const url = error ? "" : stdout.trim();
-        resolve2(/^https:\/\/\S+\/pull\/\d+$/.test(url) ? url : null);
+        resolve3(/^https:\/\/\S+\/pull\/\d+$/.test(url) ? url : null);
       }
     );
   });
@@ -2245,12 +2287,12 @@ import { execFile as execFile2 } from "child_process";
 var limit2 = (value, length) => value.length > length ? `${value.slice(0, Math.max(0, length - 1))}\u2026` : value;
 var recordOf = (value) => typeof value === "object" && value !== null ? value : null;
 function versionOf(command, env = process.env) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     execFile2(command, ["--version"], { env, timeout: 5e3 }, (error, stdout, stderr) => {
-      if (error) return resolve2(null);
+      if (error) return resolve3(null);
       const output = String(stdout || stderr).trim();
       const firstLine = output.split(/\r?\n/)[0]?.slice(0, 100) ?? "";
-      resolve2(firstLine || null);
+      resolve3(firstLine || null);
     });
   });
 }
@@ -2696,20 +2738,20 @@ var RunnerLoop = class {
     return null;
   }
   waitForSlot() {
-    return new Promise((resolve2) => {
+    return new Promise((resolve3) => {
       this.wake = () => {
         this.wake = void 0;
-        resolve2();
+        resolve3();
       };
     });
   }
   sleep(ms) {
-    return new Promise((resolve2) => {
+    return new Promise((resolve3) => {
       const timer = setTimeout(done, ms);
       this.wake = done;
       function done() {
         clearTimeout(timer);
-        resolve2();
+        resolve3();
       }
     });
   }
@@ -2748,6 +2790,7 @@ function runnerCommand(globals) {
       ...options.name ? { name: options.name } : existing?.name ? { name: existing.name } : {},
       // Re-registering (a rotated secret) keeps the repository map someone built up.
       workspaces: existing?.workspaces ?? {},
+      repoRoots: existing?.repoRoots ?? [],
       attachments: existing?.attachments ?? { maxCount: DefaultAttachmentMaxCount, maxBytes: DefaultAttachmentMaxBytes }
     };
     writeRunnerConfig(config);
@@ -2769,7 +2812,7 @@ Config written to ${runnerConfigPath()}. Start it with \`aictiq runner start\`.`
     if (options.remove) {
       delete config.workspaces[key];
     } else {
-      const absolute = resolve(path ?? ".");
+      const absolute = resolve2(path ?? ".");
       if (!existsSync3(absolute))
         throw new CliError(`${absolute} does not exist.`, ExitCode.Validation);
       config.workspaces[key] = absolute;
@@ -2779,6 +2822,24 @@ Config written to ${runnerConfigPath()}. Start it with \`aictiq runner start\`.`
       options.remove ? `Removed the mapping for ${key}.` : `${key} \u2192 ${config.workspaces[key]}`
     );
   });
+  runner.command("root").description(
+    "Trust the web UI's path hint for local projects whose clone is under this directory"
+  ).argument("[path]", "Directory that holds your clones (default: the current directory)").option("--remove", "Stop trusting path hints under this directory").action((path, options) => {
+    const config = requireConfig();
+    const absolute = resolve2(path ?? ".");
+    if (options.remove) {
+      config.repoRoots = config.repoRoots.filter((root) => resolve2(root) !== absolute);
+    } else {
+      if (!existsSync3(absolute))
+        throw new CliError(`${absolute} does not exist.`, ExitCode.Validation);
+      if (!config.repoRoots.some((root) => resolve2(root) === absolute))
+        config.repoRoots.push(absolute);
+    }
+    writeRunnerConfig(config);
+    print(
+      options.remove ? `Path hints under ${absolute} are no longer used.` : `Path hints under ${absolute} are used for projects without a mapping.`
+    );
+  });
   runner.command("status").description("Show the registration, detected harnesses and mapped repositories").action(async () => {
     const config = requireConfig();
     const capabilities = await probe(1);
@@ -2796,7 +2857,7 @@ Config written to ${runnerConfigPath()}. Start it with \`aictiq runner start\`.`
       if (error instanceof RunnerHttpError && error.revoked) process.exitCode = ExitCode.Auth;
     }
     if (globals().json) {
-      printJson({ url: config.url, registration, capabilities, workspaces: config.workspaces, attachments: config.attachments });
+      printJson({ url: config.url, registration, capabilities, workspaces: config.workspaces, repoRoots: config.repoRoots, attachments: config.attachments });
       return;
     }
     print(
@@ -2824,6 +2885,10 @@ Config written to ${runnerConfigPath()}. Start it with \`aictiq runner start\`.`
         { header: "REPOSITORY", value: ([, path]) => path }
       ])
     );
+    print("");
+    print(
+      config.repoRoots.length === 0 ? "No repository roots; path hints from the web UI are not used (`aictiq runner root <path>`)." : renderTable(config.repoRoots, [{ header: "REPOSITORY ROOT", value: (root) => root }])
+    );
   });
   runner.command("start").description("Poll for runs and execute them until interrupted").option("--parallel <n>", "Runs executed at the same time", "1").option("--keep-workspaces", "Leave each run\u2019s checkout on disk after it finishes").option("--workspace-root <path>", "Where run checkouts are created").action(
     async (options) => {
@@ -2835,28 +2900,32 @@ Config written to ${runnerConfigPath()}. Start it with \`aictiq runner start\`.`
       const client = new RunnerClient({ baseUrl: config.url, token: config.token });
       const local = (message3) => process.stderr.write(`${(/* @__PURE__ */ new Date()).toISOString()} ${message3}
 `);
-      const workspaceRoot = resolve(options.workspaceRoot ?? defaultWorkspaceRoot());
+      const workspaceRoot = resolve2(options.workspaceRoot ?? defaultWorkspaceRoot());
       const loop = new RunnerLoop({
         client,
         parallel,
         probe: () => probe(parallel),
         local,
-        execute: (run, hello, shutdown) => executeRun(run, {
-          client,
-          hello,
-          adapters: harnesses,
-          runnerToken: config.token,
-          shutdown,
-          local,
-          workspace: {
-            root: workspaceRoot,
-            repositories: config.workspaces,
-            keep: options.keepWorkspaces === true,
-            mcpServer: mcpServerCommand(),
-            attachmentMaxCount: config.attachments.maxCount,
-            attachmentMaxBytes: config.attachments.maxBytes
-          }
-        })
+        execute: (run, hello, shutdown) => {
+          const current = readRunnerConfig() ?? config;
+          return executeRun(run, {
+            client,
+            hello,
+            adapters: harnesses,
+            runnerToken: config.token,
+            shutdown,
+            local,
+            workspace: {
+              root: workspaceRoot,
+              repositories: current.workspaces,
+              repoRoots: current.repoRoots,
+              keep: options.keepWorkspaces === true,
+              mcpServer: mcpServerCommand(),
+              attachmentMaxCount: current.attachments.maxCount,
+              attachmentMaxBytes: current.attachments.maxBytes
+            }
+          });
+        }
       });
       let interrupts = 0;
       const onSignal = (signal2) => {
@@ -2930,7 +2999,7 @@ async function probe(maxParallel) {
   };
 }
 function cliEntry() {
-  return resolve(process.argv[1] ?? "aictiq");
+  return resolve2(process.argv[1] ?? "aictiq");
 }
 function mcpServerCommand() {
   return { command: process.execPath, args: [cliEntry(), "mcp"] };