maesttro 0.3.0 → 0.4.1

package/README.md

@@ -155,7 +155,12 @@ thinking blocks shown. The two providers replace yours of the same name; the
 rest (`mcp`, `plugin`, other providers) is merged. Removed secrets are listed
 at launch by path. `{env:X}` / `$X` references are kept.
 
-Claude Code gets no Maesttro config and uses its own defaults and login.
+Claude Code keeps its own login and defaults. It is pointed at envoy's
+`$MAESTTRO_URL/claude-code` (`ANTHROPIC_BASE_URL`), with Maesttro added to the
+model picker as a custom option (`maesttro`), with its context window read
+from envoy at launch. Anthropic models pass
+through to Anthropic on your own subscription. These env entries are merged
+into the runner's `~/.claude/settings.json` at every start.
 
 ---
 
@@ -172,6 +177,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

@@ -461,6 +461,29 @@ var ORCHESTRATOR_MODEL = "maesttro";
 function maesttroUrl(env = process.env) {
   return (env.MAESTTRO_URL?.trim() || DEFAULT_MAESTTRO_URL).replace(/\/+$/, "");
 }
+function contextWindowOf(card) {
+  const { max_input_tokens: input, max_tokens: output } = card;
+  return typeof input === "number" && typeof output === "number" ? input + output : undefined;
+}
+async function fetchOrchestratorWindow({
+  url,
+  fetch: fetch2 = globalThis.fetch,
+  timeoutMs = 2000
+}) {
+  try {
+    const response = await fetch2(`${url}/claude-code/v1/models`, {
+      signal: AbortSignal.timeout(timeoutMs)
+    });
+    if (!response.ok)
+      return;
+    const body = await response.json();
+    const cards = Array.isArray(body.data) ? body.data : [];
+    const card = cards.find(({ id }) => id === `claude-${ORCHESTRATOR_MODEL}`);
+    return card ? contextWindowOf(card) : undefined;
+  } catch {
+    return;
+  }
+}
 
 // src/provider-configs.ts
 var PROVIDER_ID = "maesttro";
@@ -531,6 +554,20 @@ function opencodeConfig(base, url) {
     }
   };
 }
+function claudeSettings({
+  url,
+  orchestratorWindow
+}) {
+  return {
+    env: {
+      ANTHROPIC_BASE_URL: `${url}/claude-code`,
+      ANTHROPIC_CUSTOM_MODEL_OPTION: ORCHESTRATOR_MODEL,
+      ANTHROPIC_CUSTOM_MODEL_OPTION_NAME: "Maesttro",
+      ANTHROPIC_CUSTOM_MODEL_OPTION_DESCRIPTION: "Maesttro orchestrator",
+      ...orchestratorWindow ? { CLAUDE_CODE_MAX_CONTEXT_TOKENS: String(orchestratorWindow) } : {}
+    }
+  };
+}
 
 // src/secrets.ts
 var SECRET_KEY = /api[_-]?key|token|secret|passw(or)?d|credential|authorization|bearer|private[_-]?key|cookie/i;
@@ -617,6 +654,8 @@ var OPENCODE_HOST_CONFIGS = [
   ".config/opencode/opencode.jsonc"
 ];
 var OPENCODE_CONFIG = ".config/opencode/opencode.json";
+var CLAUDE_SETTINGS = ".claude/settings.json";
+var MERGED_INTO_HOME = [CLAUDE_SETTINGS];
 var OPENCODE_TUI_STATE = ".local/state/opencode/kv.json";
 var CURATED_OPENCODE_TUI_STATE = {
   thinking_mode: "show",
@@ -652,11 +691,15 @@ function json(value) {
 }
 function buildClientConfigs({
   host,
-  url
+  url,
+  orchestratorWindow
 }) {
   const opencode = redactSecrets(opencodeHostBase(host.opencode));
   return {
-    files: { [OPENCODE_CONFIG]: json(opencodeConfig(opencode.value, url)) },
+    files: {
+      [OPENCODE_CONFIG]: json(opencodeConfig(opencode.value, url)),
+      [CLAUDE_SETTINGS]: json(claudeSettings({ url, orchestratorWindow }))
+    },
     removed: opencode.removed.map((path) => `opencode ${path}`)
   };
 }
@@ -679,7 +722,19 @@ function installClientConfigs({
 }) {
   if (!existsSync(source))
     return false;
-  cpSync(source, home, { recursive: true, force: true });
+  const merged = MERGED_INTO_HOME.map((file) => join2(source, file));
+  cpSync(source, home, {
+    recursive: true,
+    force: true,
+    filter: (path) => !merged.includes(path)
+  });
+  for (const file of MERGED_INTO_HOME) {
+    const staged = join2(source, file);
+    if (!existsSync(staged))
+      continue;
+    const target = join2(home, file);
+    writeJson(target, mergeJson(readJson(target), readJson(staged)));
+  }
   return true;
 }
 function injectOpencodeTuiState({ home }) {
@@ -2123,9 +2178,15 @@ async function launch({
   if (github.notice)
     console.log(github.notice);
   const hostHome = homedir4();
+  const url = maesttroUrl();
+  const orchestratorWindow = await fetchOrchestratorWindow({ url });
+  if (orchestratorWindow === undefined) {
+    console.log("Couldn't read Maesttro's context window; Claude Code will assume its default.");
+  }
   const clientConfigs = buildClientConfigs({
     host: readHostClientConfigs({ home: hostHome }),
-    url: maesttroUrl()
+    url,
+    orchestratorWindow
   });
   if (clientConfigs.removed.length > 0) {
     console.log(`Kept out of the runner as secrets: ${clientConfigs.removed.join(", ")}`);
@@ -2382,16 +2443,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(`
@@ -2414,8 +2519,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
@@ -2455,6 +2579,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.3.0",
+  "version": "0.4.1",
   "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": {