@tamsensedev/runner 0.18.0 → 0.19.0

package/README.md

@@ -50,6 +50,21 @@ Options:
 - `--server <url>` TAMsense address, default https://my.tamsense.com (login)
 - `--parallel <n>` how many tasks to work on at once (start)
 - `--no-browser` do not install the headless browser for interface checks (start)
+- `-p <name>`, also `--p` or `--profile`: which connection to use (login, start, status, logout)
+
+## Several projects on one computer
+
+One connection works for one account in one project. For another project, or another account, use a profile: a separate connection with its own name.
+
+```
+cd C:\work\client-a
+npx @tamsensedev/runner@latest login -p client-a
+npx @tamsensedev/runner@latest start -p client-a
+```
+
+Confirm the code in the browser while the project of that profile is open in TAMsense. Each profile keeps its own login, folders and task copies in `~/.tamsense/profiles/<name>`, and its computer is called `<computer name> (<profile>)` on the site. Run each profile in its own terminal, at the same time if you like. Claude Code and the headless browser are shared. Without `-p` the program uses the main connection, as before.
+
+A profile name may have letters, digits, `-` and `_`, up to 32 characters, and is case-insensitive.
 
 ## What it does on your computer
 

package/dist/cli.js

@@ -2,7 +2,7 @@
 
 // src/cli.ts
 import { existsSync as existsSync8 } from "fs";
-import { homedir as homedir3 } from "os";
+import { homedir as homedir2 } from "os";
 import process8 from "process";
 
 // src/api.ts
@@ -252,6 +252,7 @@ var START_COMMAND = "npx @tamsensedev/runner@latest start";
 var BROWSER_COMMAND = "npx @tamsensedev/runner@latest browser";
 var DEFAULT_PARALLEL = 2;
 var MAX_PARALLEL = 4;
+var PROFILE_NAME = /^[a-z0-9][\w-]{0,31}$/i;
 var HELP_TEXT = `Connects this computer to TAMsense so it can work on your tasks.
 
 Usage:
@@ -263,6 +264,12 @@ Usage:
   npx @tamsensedev/runner@latest status   show the connection
   npx @tamsensedev/runner@latest logout   disconnect this computer
 
+Profiles, for several projects or accounts on one computer:
+  -p, --profile <name>   use a separate connection with its own folders, for example:
+      ${LOGIN_COMMAND} -p client-a
+      ${START_COMMAND} -p client-a
+      Works with login, start, status and logout. Without it, the main connection is used.
+
 Login options:
   --name <name>    how this computer is called in TAMsense (default: its network name)
   --server <url>   TAMsense address (default: ${DEFAULT_SERVER})
@@ -270,6 +277,18 @@ Login options:
 Start options:
   --parallel <n>   how many tasks to work on at once, 1 to ${MAX_PARALLEL} (default: ${DEFAULT_PARALLEL}, or TAMSENSE_PARALLEL)
   --no-browser     do not install the headless browser for interface checks (start installs it when it is missing)`;
+function profileFor(flag) {
+  if (flag === void 0) {
+    return null;
+  }
+  if (!PROFILE_NAME.test(flag)) {
+    throw new Error(`The profile name may have letters, digits, - and _, up to 32 characters, got "${flag}".`);
+  }
+  return flag.toLowerCase();
+}
+function withProfile(command, profile) {
+  return profile === null ? command : `${command} -p ${profile}`;
+}
 function parallelFor(flag, env) {
   const [source, value] = flag !== void 0 ? ["--parallel", flag] : ["TAMSENSE_PARALLEL", env?.trim() || void 0];
   if (value === void 0) {
@@ -287,6 +306,8 @@ function parseCommand(argv, env = {}) {
     allowPositionals: true,
     strict: true,
     options: {
+      "profile": { type: "string", short: "p" },
+      "p": { type: "string" },
       "server": { type: "string" },
       "name": { type: "string" },
       "parallel": { type: "string" },
@@ -304,14 +325,15 @@ function parseCommand(argv, env = {}) {
   if (positionals.length !== 1) {
     return { name: "help" };
   }
+  const profile = profileFor(values.profile ?? values.p);
   if (name === "login") {
-    return { name: "login", server: values.server ?? null, deviceName: values.name ?? null };
+    return { name: "login", profile, server: values.server ?? null, deviceName: values.name ?? null };
   }
   if (name === "start") {
-    return { name: "start", parallel: parallelFor(values.parallel, env.TAMSENSE_PARALLEL), browser: !values["no-browser"] };
+    return { name: "start", profile, parallel: parallelFor(values.parallel, env.TAMSENSE_PARALLEL), browser: !values["no-browser"] };
   }
   if (name === "status" || name === "logout") {
-    return { name };
+    return { name, profile };
   }
   return { name: "help" };
 }
@@ -1554,8 +1576,8 @@ var cacheLock = keyedLock();
 function githubRemoteUrl(fullName) {
   return `https://github.com/${fullName}.git`;
 }
-function tamsenseFolder(home, ...parts) {
-  return join3(home, ".tamsense", ...parts);
+function tamsenseFolder(dataFolder, ...parts) {
+  return join3(dataFolder, ...parts);
 }
 function folderNames(repositories) {
   const shortName = (fullName) => fullName.split("/").pop() ?? fullName;
@@ -1619,15 +1641,15 @@ async function keptBase(cache, path, job, repository) {
   }
   return git(["rev-parse", await baseRef(cache, job, repository)], { cwd: cache });
 }
-function taskFolder(home, job) {
-  return tamsenseFolder(home, "work", ...stepFolder(job));
+function taskFolder(dataFolder, job) {
+  return tamsenseFolder(dataFolder, "work", ...stepFolder(job));
 }
 async function prepareWorkspace(job, token, tools) {
-  const root = taskFolder(tools.home, job);
+  const root = taskFolder(tools.dataFolder, job);
   const folders = folderNames(job.repositories);
   const repositories = [];
   for (const [index, repository] of job.repositories.entries()) {
-    const cache = tamsenseFolder(tools.home, "repos", repository.fullName.replace("/", "__"));
+    const cache = tamsenseFolder(tools.dataFolder, "repos", repository.fullName.replace("/", "__"));
     const folder = folders[index] ?? repository.fullName;
     const path = join3(root, folder);
     const baseSha = await cacheLock.run(repository.fullName, async () => {
@@ -1742,9 +1764,9 @@ async function startRef(source, job, local) {
   const where = local.remote ? `${source} or on its remote ${local.remote}` : source;
   throw new Error(`Branch ${job.branch} is not in ${where}. It was made on another computer: push it to a remote this folder can fetch, or run this check on that computer.`);
 }
-async function releaseBranch2(source, branch, keep, home) {
+async function releaseBranch2(source, branch, keep, dataFolder) {
   const listed = await runGit(["worktree", "list", "--porcelain"], { cwd: source });
-  const work2 = tamsenseFolder(home, "work");
+  const work2 = tamsenseFolder(dataFolder, "work");
   for (const holder of branchHolders(listed.stdout, branch).filter((path) => resolve3(path) !== resolve3(keep))) {
     if (!isInside(holder, work2)) {
       throw new Error(`Branch ${branch} is checked out in ${resolve3(holder)}. Switch that folder to another branch, then start the step again.`);
@@ -1789,13 +1811,13 @@ async function prepareRepository(job, repository, path, tools) {
   if (readsOnly(job)) {
     await git(["worktree", "add", "--detach", path, start], { cwd: source });
   } else {
-    await releaseBranch2(source, job.branch, path, tools.home);
+    await releaseBranch2(source, job.branch, path, tools.dataFolder);
     await git(["worktree", "add", "-B", job.branch, path, start], { cwd: source });
   }
   return { baseSha: await git(["rev-parse", "HEAD"], { cwd: path }), local };
 }
 async function prepareLocalWorkspace(job, tools) {
-  const root = taskFolder(tools.home, job);
+  const root = taskFolder(tools.dataFolder, job);
   const folders = folderNames(job.repositories);
   const repositories = [];
   for (const [index, repository] of job.repositories.entries()) {
@@ -2247,14 +2269,14 @@ function wakeUpLaterTool(tools) {
     }
   );
 }
-async function checkFolder(home, job) {
+async function checkFolder(dataFolder, job) {
   if (job.taskId !== null) {
-    const step = taskFolder(home, { taskId: job.taskId, stage: { columnId: job.stepColumnId } });
+    const step = taskFolder(dataFolder, { taskId: job.taskId, stage: { columnId: job.stepColumnId } });
     if (existsSync5(step)) {
       return step;
     }
   }
-  const own = tamsenseFolder(home, "schedules", `schedule-${job.scheduleId}`);
+  const own = tamsenseFolder(dataFolder, "schedules", `schedule-${job.scheduleId}`);
   await mkdir3(own, { recursive: true });
   return own;
 }
@@ -3457,12 +3479,16 @@ var runClaude = claudeRunner(query3);
 
 // src/config.ts
 import { mkdir as mkdir4, readFile as readFile3, rm as rm4, writeFile as writeFile3 } from "fs/promises";
-import { homedir as homedir2 } from "os";
 import { dirname as dirname2, join as join6 } from "path";
 var OWNER_ONLY_FILE = 384;
 var OWNER_ONLY_FOLDER = 448;
-function configPath(home = homedir2()) {
-  return join6(home, ".tamsense", "runner.json");
+var PROFILES_FOLDER = "profiles";
+function dataFolderFor(home, profile) {
+  const shared = join6(home, ".tamsense");
+  return profile === null ? shared : join6(shared, PROFILES_FOLDER, profile);
+}
+function configPath(dataFolder) {
+  return join6(dataFolder, "runner.json");
 }
 function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -3478,7 +3504,7 @@ function parseConfig(value) {
 function isMissingFile(error) {
   return error instanceof Error && "code" in error && error.code === "ENOENT";
 }
-async function readConfig(path = configPath()) {
+async function readConfig(path) {
   try {
     return parseConfig(JSON.parse(await readFile3(path, "utf8")));
   } catch (error) {
@@ -3488,18 +3514,18 @@ async function readConfig(path = configPath()) {
     throw error;
   }
 }
-async function writeConfig(config, path = configPath()) {
+async function writeConfig(config, path) {
   await mkdir4(dirname2(path), { recursive: true, mode: OWNER_ONLY_FOLDER });
   await writeFile3(path, `${JSON.stringify(config, null, 4)}
 `, { mode: OWNER_ONLY_FILE });
 }
-async function removeConfig(path = configPath()) {
+async function removeConfig(path) {
   await rm4(path, { force: true });
 }
 
 // src/login.ts
 var MS_PER_SECOND = 1e3;
-var EXPIRED_TEXT = `The code expired before it was confirmed. Run ${LOGIN_COMMAND} again.`;
+var EXPIRED_TEXT = "The code expired before it was confirmed. Run the same command again.";
 var DENIED_TEXT = "The connection was cancelled in the browser. This computer was not connected.";
 async function login(tools, request) {
   const pairing = await tools.api.request("POST", PAIRINGS_PATH, request);
@@ -3864,8 +3890,8 @@ function bundledRecorder() {
   const path = fileURLToPath(new URL("./recorder.cjs", import.meta.url));
   return existsSync6(path) ? path : null;
 }
-function recordingsFolder(home, runId) {
-  return join8(home, ".tamsense", "recordings", `run-${runId}`);
+function recordingsFolder(dataFolder, runId) {
+  return join8(dataFolder, "recordings", `run-${runId}`);
 }
 function nodeOptionsWithRecorder(recorder, nodeOptions) {
   return [nodeOptions?.trim(), `--require "${recorder.replaceAll("\\", "/")}"`].filter(Boolean).join(" ");
@@ -3912,8 +3938,9 @@ var MAX_NAME_LENGTH2 = 80;
 function platformLabel(platform = process.platform) {
   return PLATFORM_LABELS[platform] ?? platform;
 }
-function defaultDeviceName() {
-  return hostname().slice(0, MAX_NAME_LENGTH2) || "My computer";
+function defaultDeviceName(profile = null) {
+  const name = hostname() || "My computer";
+  return (profile === null ? name : `${name} (${profile})`).slice(0, MAX_NAME_LENGTH2);
 }
 function browserCommand(url, platform) {
   if (platform === "win32") {
@@ -4171,8 +4198,8 @@ function allowedSkills(stage) {
   const skills = stage.role?.skills ?? null;
   return skills && [.../* @__PURE__ */ new Set([...skills, ...STAGE_SKILLS[stage.kind] ?? []])].filter((name) => SKILL_NAME.test(name));
 }
-function roleLibraryFolder(home, runId) {
-  return join10(home, ".tamsense", "libraries", `run-${runId}`);
+function roleLibraryFolder(dataFolder, runId) {
+  return join10(dataFolder, "libraries", `run-${runId}`);
 }
 async function prepareLibrary(folder, skills, source = LIBRARY_PATH) {
   if (skills === null) {
@@ -4655,7 +4682,7 @@ function skillsLine(skills) {
 async function prepare(job, tools) {
   if (isFolderJob(job)) {
     tools.print("Preparing the task folder\u2026");
-    const { results, ...workspace2 } = await prepareFolder(job, taskFolder(tools.home, job), tools.api);
+    const { results, ...workspace2 } = await prepareFolder(job, taskFolder(tools.dataFolder, job), tools.api);
     return { workspace: workspace2, results, identity: {} };
   }
   const taskResults = (workspace2) => writeResults(join12(workspace2.root, RESULTS_FOLDER), job, tools.api);
@@ -4678,12 +4705,12 @@ async function executeJob(job, tools, signal, input, record) {
   if (skills) {
     tools.print(skillsLine(skills));
   }
-  const library = await prepareLibrary(roleLibraryFolder(tools.home, job.runId), skills);
+  const library = await prepareLibrary(roleLibraryFolder(tools.dataFolder, job.runId), skills);
   signal.throwIfAborted();
   tools.print("Claude is working\u2026");
   const attached = { count: 0 };
   const session = sessionReporter(tools.api, job, tools.print);
-  const recordings = recordingsFolder(tools.home, job.runId);
+  const recordings = recordingsFolder(tools.dataFolder, job.runId);
   const baseEnv = withNodeOnPath(process7.env, dirname6(process7.execPath));
   const recording = tools.recorder ? recorderEnv({ recorder: tools.recorder, folder: recordings, server: tools.api.server, job, nodeOptions: baseEnv.NODE_OPTIONS }) : {};
   const outcome = await tools.runAgent({
@@ -4770,7 +4797,7 @@ function resultLine(finish2, workspace = "repositories") {
   return `Done. Pushed ${finish2.pushed.length} branch(es), the pull requests open on TAMsense.`;
 }
 async function sendRecordings(job, tools) {
-  const folder = recordingsFolder(tools.home, job.runId);
+  const folder = recordingsFolder(tools.dataFolder, job.runId);
   try {
     const report = await uploadPendingRecordings(tools.api, job.runId, folder);
     if (report.uploaded > 0) {
@@ -4811,7 +4838,7 @@ async function runJob(job, tools, stop) {
   } catch (error) {
     finish2 = { outcome: "failed", report: failureReport(error, run2.signal), pushed: [], model: null, usage: null, verdict: null, handoff: null, sessionId: null, pausedUntil: null, questions: null, spec: null, waitingFor: null };
   } finally {
-    await rm7(roleLibraryFolder(tools.home, job.runId), { recursive: true, force: true });
+    await rm7(roleLibraryFolder(tools.dataFolder, job.runId), { recursive: true, force: true });
     clearInterval(polling);
     clearInterval(feeding);
     stop.removeEventListener("abort", stopRun);
@@ -4823,7 +4850,7 @@ async function runJob(job, tools, stop) {
   }
   await feed.flush();
   if (run2.signal.reason === CLOSED_ON_SITE2) {
-    await rm7(recordingsFolder(tools.home, job.runId), { recursive: true, force: true });
+    await rm7(recordingsFolder(tools.dataFolder, job.runId), { recursive: true, force: true });
     tools.print("TAMsense closed this run while it was in progress. The result was not sent.");
     return;
   }
@@ -4854,7 +4881,7 @@ async function runCheckJob(check, runCheck, tools, stop) {
   const beating = setInterval(() => void beat(), CHECK_HEARTBEAT_MS);
   let body;
   try {
-    const folder = await checkFolder(tools.home, check);
+    const folder = await checkFolder(tools.dataFolder, check);
     const env = withNodeOnPath(process7.env, dirname6(process7.execPath));
     const prompt = routine ? buildRoutinePrompt(check, folder) : buildCheckPrompt(check, folder);
     body = checkFinishBody(await runCheck({ cwd: folder, prompt, model: check.model, env, signal: run2.signal, sources: sourceTools(check.sourceTools, tools.api, checkPath(check.checkId, "sources")), routine }));
@@ -4994,11 +5021,18 @@ async function work(tools, stop, parallel = 1) {
 }
 
 // src/cli.ts
-var NOT_CONNECTED_TEXT = `This computer is not connected. Run ${LOGIN_COMMAND}`;
-var DISCONNECTED_TEXT = `This computer was disconnected on the website. Run ${LOGIN_COMMAND}`;
 var NO_TASKS_ACCESS_TEXT = "Your account no longer has access to Tasks. Ask the project owner.";
-var ACCESS_PROBLEMS = { 401: DISCONNECTED_TEXT, 403: NO_TASKS_ACCESS_TEXT };
+var UNAUTHORIZED_STATUS = 401;
+var FORBIDDEN_STATUS = 403;
 var INTERRUPTED_EXIT_CODE = 130;
+function connectionFor(profile) {
+  const dataFolder = dataFolderFor(homedir2(), profile);
+  return { profile, dataFolder, configFile: configPath(dataFolder) };
+}
+function notConnectedText(profile) {
+  const which = profile === null ? "" : ` in the profile ${profile}`;
+  return `This computer is not connected${which}. Run ${withProfile(LOGIN_COMMAND, profile)}`;
+}
 function print(line) {
   process8.stdout.write(`${line}
 `);
@@ -5006,27 +5040,33 @@ function print(line) {
 function serverFor(flag, saved) {
   return serverOrigin(flag ?? process8.env.TAMSENSE_URL ?? saved?.server ?? DEFAULT_SERVER);
 }
-function accessProblem(error) {
-  return error instanceof ApiError ? ACCESS_PROBLEMS[error.status] ?? null : null;
+function accessProblem(error, profile) {
+  if (!(error instanceof ApiError)) {
+    return null;
+  }
+  if (error.status === UNAUTHORIZED_STATUS) {
+    return `This computer was disconnected on the website. Run ${withProfile(LOGIN_COMMAND, profile)}`;
+  }
+  return error.status === FORBIDDEN_STATUS ? NO_TASKS_ACCESS_TEXT : null;
 }
-async function forgetDevice(config) {
+async function forgetDevice(config, connection) {
   await createApi(config.server, config.token).request("DELETE", IDENTITY_PATH).catch(() => {
   });
-  await removeConfig();
+  await removeConfig(connection.configFile);
 }
-async function runLogin(server, deviceName) {
-  const saved = await readConfig();
+async function runLogin(connection, server, deviceName) {
+  const saved = await readConfig(connection.configFile);
   const api = createApi(serverFor(server, saved));
   if (saved) {
-    await forgetDevice(saved);
+    await forgetDevice(saved, connection);
   }
-  const name = deviceName?.trim() || defaultDeviceName();
+  const name = deviceName?.trim() || defaultDeviceName(connection.profile);
   const result = await login(
     { api, openBrowser, print, sleep, now: Date.now },
     { name, platform: platformLabel() }
   );
-  await writeConfig({ server: api.server, token: result.token, deviceId: result.device.id, deviceName: result.device.name });
-  print(`Connected: ${result.device.name}. To take your tasks, go to your code folder and run ${START_COMMAND}`);
+  await writeConfig({ server: api.server, token: result.token, deviceId: result.device.id, deviceName: result.device.name }, connection.configFile);
+  print(`Connected: ${result.device.name}. To take your tasks, go to your code folder and run ${withProfile(START_COMMAND, connection.profile)}`);
 }
 function stopOnInterrupt() {
   const stop = new AbortController();
@@ -5061,13 +5101,13 @@ async function startedNewVersion() {
     return false;
   }
 }
-async function runStart(parallel, installsBrowser) {
+async function runStart(connection, parallel, installsBrowser) {
   if (await startedNewVersion()) {
     return;
   }
-  const saved = await readConfig();
+  const saved = await readConfig(connection.configFile);
   if (!saved) {
-    print(NOT_CONNECTED_TEXT);
+    print(notConnectedText(connection.profile));
     return;
   }
   const identity = await createApi(saved.server, saved.token).request("GET", IDENTITY_PATH);
@@ -5076,13 +5116,13 @@ async function runStart(parallel, installsBrowser) {
     throw new Error(problem2);
   }
   print(`${identity.device.name} is connected to ${saved.server} as ${describeDevice(identity)}.`);
-  const home = homedir3();
+  const home = homedir2();
   const browser = await browserForStart(home, installsBrowser);
   const api = createApi(saved.server, saved.token, { watch: connectionWatch(print) });
-  await work({ api, runAgent: runClaude, runCheck: runClaudeCheck, runSense: runClaudeSense, version: currentVersion() ?? void 0, capabilities: probeCapabilities, print, sleep, home, remoteUrl: githubRemoteUrl, browser, recorder: bundledRecorder(), inspectFolder: (path) => inspectFolder(path, home), startFolder: process8.cwd() }, stopOnInterrupt(), parallel);
+  await work({ api, runAgent: runClaude, runCheck: runClaudeCheck, runSense: runClaudeSense, version: currentVersion() ?? void 0, capabilities: probeCapabilities, print, sleep, home, dataFolder: connection.dataFolder, remoteUrl: githubRemoteUrl, browser, recorder: bundledRecorder(), inspectFolder: (path) => inspectFolder(path, home), startFolder: process8.cwd() }, stopOnInterrupt(), parallel);
 }
 async function runBrowser(remove) {
-  const home = homedir3();
+  const home = homedir2();
   if (remove) {
     print(await removeBrowser(home) ? "Removed the headless browser. The next start installs it again, unless you add --no-browser." : "No headless browser is installed.");
     return;
@@ -5095,46 +5135,53 @@ async function runBrowser(remove) {
   await installBrowser(installTools(home));
   print("Claude uses it for interface checks from the next start.");
 }
-async function runStatus() {
-  const saved = await readConfig();
+async function runStatus(connection) {
+  const saved = await readConfig(connection.configFile);
   if (!saved) {
-    print(NOT_CONNECTED_TEXT);
+    print(notConnectedText(connection.profile));
     return;
   }
   const identity = await createApi(saved.server, saved.token).request("GET", IDENTITY_PATH);
   print(`Connected: ${identity.device.name}, ${describeDevice(identity)}`);
   print(`Account: ${identity.email ?? "unknown"}, project ${identity.projectName}`);
   print(`Server: ${saved.server}`);
+  if (connection.profile !== null) {
+    print(`Profile: ${connection.profile}, folders in ${connection.dataFolder}`);
+  }
 }
-async function runLogout() {
-  const saved = await readConfig();
+async function runLogout(connection) {
+  const saved = await readConfig(connection.configFile);
   if (!saved) {
-    print(NOT_CONNECTED_TEXT);
+    print(notConnectedText(connection.profile));
     return;
   }
-  await forgetDevice(saved);
+  await forgetDevice(saved, connection);
   print("Disconnected. This computer no longer takes your tasks.");
 }
 async function run(command) {
   if (command.name === "login") {
-    await runLogin(command.server, command.deviceName);
+    await runLogin(connectionFor(command.profile), command.server, command.deviceName);
   } else if (command.name === "start") {
-    await runStart(command.parallel, command.browser);
+    await runStart(connectionFor(command.profile), command.parallel, command.browser);
   } else if (command.name === "browser") {
     await runBrowser(command.remove);
   } else if (command.name === "status") {
-    await runStatus();
+    await runStatus(connectionFor(command.profile));
   } else if (command.name === "logout") {
-    await runLogout();
+    await runLogout(connectionFor(command.profile));
   } else {
     print(HELP_TEXT);
   }
 }
-try {
-  await run(parseCommand(process8.argv.slice(2), process8.env));
-} catch (error) {
-  process8.stderr.write(`${accessProblem(error) ?? (error instanceof Error ? error.message : String(error))}
+function fail(error, profile) {
+  process8.stderr.write(`${accessProblem(error, profile) ?? (error instanceof Error ? error.message : String(error))}
 `);
   process8.exitCode = 1;
 }
+try {
+  const command = parseCommand(process8.argv.slice(2), process8.env);
+  await run(command).catch((error) => fail(error, "profile" in command ? command.profile : null));
+} catch (error) {
+  fail(error, null);
+}
 //# sourceMappingURL=cli.js.map