maesttro 0.4.0 → 0.4.2

package/README.md

@@ -73,8 +73,9 @@ maesttro update                          # bump the package + rebuild image with
 
 Run `maesttro` from the root of a repository (git 2.48+ required). Each run is a
 **session** with its own isolated clone, `.worktrees/maesttro-<id>`, detached at
-`origin/<default branch>` and mounted at `/workspace`. That clone is the only
-part of the repo the container sees:
+`origin/<default branch>` and mounted at `/workspace`. The runner container is
+named `maesttro-<id>` too, so `docker ps` and `docker logs maesttro-<id>` line up
+with the session. That clone is the only part of the repo the container sees:
 
 - Your real `.git` is never mounted, and neither is your main checkout or any
   uncommitted work there. The container works in a `git clone --shared` that
@@ -177,6 +178,9 @@ config, keeping your own keys. So `maesttro update` has two steps:
 Your session state (in the `maesttro-home` volume) and your project files are
 untouched by an update.
 
+On start, `maesttro` checks for a newer published version and offers to update.
+Declining only skips it for that run; the next start asks again.
+
 ---
 
 ## What's mounted, and why

package/dist/maesttro.js

@@ -1279,7 +1279,7 @@ Usage:
 `;
 
 // src/launch.ts
-import { execSync as execSync3, spawn } from "node:child_process";
+import { execSync as execSync3, spawn, spawnSync as spawnSync2 } from "node:child_process";
 import { existsSync as existsSync4, rmSync as rmSync6 } from "node:fs";
 import { constants, homedir as homedir4 } from "node:os";
 import { join as join11 } from "node:path";
@@ -1979,7 +1979,8 @@ function dockerRunArgs({
   command,
   mounts,
   workdir,
-  extra = []
+  extra = [],
+  name
 }) {
   const volumes = mounts.flatMap(({ host, container, readOnly }) => [
     "-v",
@@ -1989,6 +1990,7 @@ function dockerRunArgs({
     "run",
     "-it",
     "--rm",
+    ...name ? ["--name", name] : [],
     ...volumes,
     ...extra,
     "-w",
@@ -2016,6 +2018,9 @@ function ensureReady() {
     throw new LaunchError("Runner isn't set up yet. Run `maesttro setup` first.");
   }
 }
+function clearStaleContainer(id) {
+  spawnSync2("docker", ["rm", "-f", id], { stdio: "ignore" });
+}
 function sharedSkillsDir() {
   const dir = process.env.AGENT_SHARED_SKILLS ?? join11(homedir4(), "agent-shared", "skills");
   return existsSync4(dir) ? dir : undefined;
@@ -2216,10 +2221,12 @@ async function launch({
     "MAESTTRO_HOST_UID",
     "MAESTTRO_HOST_GID"
   ].concat(repo ? ["MAESTTRO_REPO"] : []).flatMap((name) => ["-e", name]);
+  clearStaleContainer(saved.id);
   const child = spawn("docker", dockerRunArgs({
     command: containerCommand(resolveCommand(args)),
     mounts,
     workdir,
+    name: saved.id,
     extra: [...github.dockerArgs, ...envFlags]
   }), { stdio: "inherit", env: { ...process.env, ...sessionEnv } });
   const forward = (signal) => child.kill(signal);
@@ -2238,7 +2245,7 @@ async function launch({
 }
 
 // src/push.ts
-import { spawnSync as spawnSync2 } from "node:child_process";
+import { spawnSync as spawnSync3 } from "node:child_process";
 function pushCandidates(sessions) {
   const candidates = new Map;
   for (const session of sessions) {
@@ -2349,7 +2356,7 @@ Push? [y/N] `);
       return;
     }
   }
-  const pushed = spawnSync2("git", ["-C", root, "push", "origin", `${tip}:refs/heads/${branch}`], { stdio: "inherit" });
+  const pushed = spawnSync3("git", ["-C", root, "push", "origin", `${tip}:refs/heads/${branch}`], { stdio: "inherit" });
   if (pushed.status === 0) {
     console.log(`Pushed ${branch}. Base for comparison was ${baseSha.slice(0, 8)}.`);
   }
@@ -2443,16 +2450,60 @@ async function setup({ args }) {
 
 // src/update.ts
 import { execSync as execSync5 } from "node:child_process";
-import { readFileSync as readFileSync8 } from "node:fs";
+
+// src/version-check.ts
+import { execFile } from "node:child_process";
+import { existsSync as existsSync6, readFileSync as readFileSync8 } from "node:fs";
 import { join as join12 } from "node:path";
-function installedPackageName() {
-  const manifest = JSON.parse(readFileSync8(join12(PACKAGE_ROOT, "package.json"), "utf8"));
-  return manifest.name;
+var LOOKUP_TIMEOUT_MS = 3000;
+function installedManifest() {
+  return JSON.parse(readFileSync8(join12(PACKAGE_ROOT, "package.json"), "utf8"));
+}
+function canOfferUpdate({
+  interactive = Boolean(process.stdin.isTTY && process.stdout.isTTY),
+  inRunner = existsSync6(RUNNER_MARKER)
+} = {}) {
+  return interactive && !inRunner;
+}
+function releaseNumbers(version) {
+  const match = /^(\d+)\.(\d+)\.(\d+)$/.exec(version.trim());
+  return match ? match.slice(1).map(Number) : undefined;
+}
+function isNewer({
+  candidate,
+  current
+}) {
+  const candidateNumbers = releaseNumbers(candidate);
+  const currentNumbers = releaseNumbers(current);
+  if (!candidateNumbers || !currentNumbers)
+    return false;
+  for (let index = 0;index < candidateNumbers.length; index++) {
+    const difference = (candidateNumbers[index] ?? 0) - (currentNumbers[index] ?? 0);
+    if (difference !== 0)
+      return difference > 0;
+  }
+  return false;
+}
+function publishedVersion(name) {
+  return new Promise((resolve, reject) => execFile("npm", ["view", name, "version"], { timeout: LOOKUP_TIMEOUT_MS }, (error, stdout) => error ? reject(error) : resolve(stdout.trim())));
+}
+async function findNewerVersion({
+  manifest = installedManifest(),
+  lookupLatest = publishedVersion
+} = {}) {
+  try {
+    const latest = await lookupLatest(manifest.name);
+    return isNewer({ candidate: latest, current: manifest.version }) ? { name: manifest.name, current: manifest.version, latest } : undefined;
+  } catch {
+    return;
+  }
 }
+
+// src/update.ts
 function update() {
   console.log(`== maesttro update ==
 `);
-  const packageName = installedPackageName();
+  const packageName = installedManifest().name;
   console.log(`-> Updating ${packageName} package...`);
   execSync5(`npm i -g ${packageName}@latest`, { stdio: "inherit" });
   console.log(`
@@ -2475,8 +2526,27 @@ var defaultCommands = {
   login,
   logout,
   status,
-  print: (text) => console.log(text)
+  print: (text) => console.log(text),
+  findNewerVersion: () => canOfferUpdate() ? findNewerVersion() : Promise.resolve(undefined),
+  ask
 };
+var SKIPS_UPDATE_CHECK = new Set(["update", "list", "help", "--help", "-h"]);
+async function updatedInstead({
+  command,
+  commands
+}) {
+  if (command !== undefined && SKIPS_UPDATE_CHECK.has(command))
+    return false;
+  const available = await commands.findNewerVersion();
+  if (!available)
+    return false;
+  const answer = await commands.ask(`${available.name} ${available.latest} is available (you have ${available.current}). Update now? [Y/n] `);
+  if (!/^(y(es)?)?$/i.test(answer))
+    return false;
+  await commands.update();
+  commands.print("Re-run maesttro to continue.");
+  return true;
+}
 var MODE_FLAGS = {
   "--strict": true,
   "--no-strict": false
@@ -2516,6 +2586,8 @@ async function main(argv, commands = defaultCommands) {
     commands.print(`--strict and --no-strict apply to launching a session, not to \`${command}\`.`);
     return;
   }
+  if (await updatedInstead({ command, commands }))
+    return;
   switch (command) {
     case undefined:
       await commands.launch({ args: [], ...mode });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maesttro",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Isolated Docker runner for local coding agents (opencode, claude, ...) under a dedicated bot GitHub identity, with curated configs baked in per client.",
   "type": "module",
   "bin": {