maesttro 0.4.1 → 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

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)}.`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maesttro",
-  "version": "0.4.1",
+  "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": {