@stage-labs/metro 0.1.0-beta.184 → 0.1.0-beta.186

package/dist/service.js

@@ -35,6 +35,7 @@ export function systemdUnit(host, exec, target) {
         `ExecStart=${exec.map(unitWord).join(' ')}`,
         'Restart=always',
         'RestartSec=2',
+        'OOMPolicy=continue',
         `WorkingDirectory=${unitWord(host.home)}`,
         ...env,
         '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stage-labs/metro",
-  "version": "0.1.0-beta.184",
+  "version": "0.1.0-beta.186",
   "description": "The metro command line. Sign in once per machine, then hand your MCP connector list to Claude Code without the credentials touching disk, argv or shell history.",
   "license": "MIT",
   "repository": {

package/runtime/marketplace/plugin/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.1.0-beta.184",
+  "version": "0.1.0-beta.186",
   "description": "Metro for Claude Code, installed by the metro daemon on this machine: every connector the agent holds as its own MCP server relayed through the daemon, the orchestrator-only guard on the main thread, and the standing rules loaded at each session start. No vendor credential ever sits in a config file.",
   "author": {
     "name": "Bonustrack",

package/runtime/node_modules/@metro-labs/daemon/src/agent-user/user.ts

@@ -70,7 +70,7 @@ export function agentEnv(user: AgentUser, extra: Record<string, string> = {}): R
 export function asUser(user: AgentUser | null, file: string, args: readonly string[], extra: Record<string, string> = {}): [string, string[]] {
   if (user === null) return [file, [...args]];
   const env = Object.entries(agentEnv(user, extra)).map(([k, v]) => `${k}=${v}`);
-  return ['runuser', ['-u', user.name, '--', 'env', '-i', ...env, file, ...args]];
+  return ['setpriv', [`--reuid=${String(user.uid)}`, `--regid=${String(user.gid)}`, '--init-groups', 'env', '-i', ...env, file, ...args]];
 }
 
 export const asAgent = (file: string, args: readonly string[], extra: Record<string, string> = {}): [string, string[]] =>

package/runtime/node_modules/@metro-labs/daemon/src/boot/boot.ts

@@ -24,6 +24,7 @@ import { syncPluginServers } from '../connectors/plugin-sync.js';
 import { loadConnectorPolicies, readLocalConnectors } from '../connectors/store.js';
 import { ensureMetroPlugin } from '../claude/plugin-install.js';
 import { provisionAgentUser } from '../agent-user/provision.js';
+import { ensureServiceOomPolicy } from '../claude/memory.js';
 import { unwatchSession, watchSession } from '../claude/session.js';
 import { tryClaudeSetup } from '../claude/setup.js';
 import { applyLocalOwner } from './local-owner.js';
@@ -154,6 +155,7 @@ installBearerSessions(agentsDir(), localOwner);
 }
 
 async function startClaude(): Promise<void> {
+  ensureServiceOomPolicy();
   const agentUser = await provisionAgentUser();
   if (agentUser !== 'off') log.info({ agentUser }, 'agent-user: Claude Code runs as its own user');
   if (agentUser === 'failed' || agentUser === 'unsupported') return;

package/runtime/node_modules/@metro-labs/daemon/src/claude/memory.ts

@@ -0,0 +1,72 @@
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { totalmem } from 'node:os';
+import { dirname } from 'node:path';
+import { errMsg, log } from '@metro-labs/core/log';
+
+const UNIT = '/etc/systemd/system/metro.service';
+const DROP_IN = '/etc/systemd/system/metro.service.d/10-metro-memory.conf';
+const DROP_IN_TEXT = '[Service]\nOOMPolicy=continue\n';
+const GIB = 1024 ** 3;
+const RESERVE = 1.5 * GIB;
+const FLOOR = GIB;
+
+export interface ScopeHost {
+  platform: string;
+  uid: number | undefined;
+  systemd: boolean;
+  total: number;
+}
+
+const realHost = (): ScopeHost => ({
+  platform: process.platform,
+  uid: process.getuid?.(),
+  systemd: existsSync('/run/systemd/system'),
+  total: totalmem(),
+});
+
+export function sessionMemoryLimit(total: number): number {
+  const kept = Math.min(Math.floor(total * 0.8), total - RESERVE);
+  return Math.max(FLOOR, Math.floor(kept / (1024 * 1024)) * 1024 * 1024);
+}
+
+const usesScopes = (host: ScopeHost): boolean => host.platform === 'linux' && host.uid === 0 && host.systemd;
+
+export function inSessionScope(command: [string, string[]], host: ScopeHost = realHost(), now = Date.now()): [string, string[]] {
+  if (!usesScopes(host)) return command;
+  const limit = sessionMemoryLimit(host.total);
+  const [file, args] = command;
+  return [
+    'systemd-run',
+    [
+      '--scope',
+      '--quiet',
+      '--collect',
+      `--unit=metro-claude-${String(now)}`,
+      '-p',
+      `MemoryMax=${String(limit)}`,
+      '-p',
+      `MemoryHigh=${String(Math.floor(limit * 0.9))}`,
+      '-p',
+      'OOMPolicy=continue',
+      '--',
+      file,
+      ...args,
+    ],
+  ];
+}
+
+export function ensureServiceOomPolicy(host: ScopeHost = realHost(), env: NodeJS.ProcessEnv = process.env): 'written' | 'present' | 'skipped' {
+  if (!usesScopes(host) || (env.INVOCATION_ID ?? '') === '' || !existsSync(UNIT)) return 'skipped';
+  try {
+    if (existsSync(DROP_IN) && readFileSync(DROP_IN, 'utf8') === DROP_IN_TEXT) return 'present';
+    mkdirSync(dirname(DROP_IN), { recursive: true });
+    writeFileSync(DROP_IN, DROP_IN_TEXT, { mode: 0o644 });
+    const reload = spawnSync('systemctl', ['daemon-reload'], { stdio: 'ignore' });
+    log.info({ reloaded: reload.status === 0 }, 'claude-memory: the metro service no longer stops as a whole when the kernel kills one process for memory');
+    return 'written';
+  } catch (err) {
+    log.warn({ err: errMsg(err) }, 'claude-memory: could not set the service memory policy');
+    return 'skipped';
+  }
+}

package/runtime/node_modules/@metro-labs/daemon/src/claude/session.ts

@@ -11,6 +11,7 @@ import { notReady, readModelConfig, routedConnection } from '../gateway/model-co
 import { claudeDir, listClaudeProjects } from './files.js';
 import { claudeAccount, claudeInstalled } from './login.js';
 import { trustFolder } from './onboarding.js';
+import { inSessionScope } from './memory.js';
 import { agentUser, agentViewDir, asAgent, claudeHome, wantedAgentUser } from '../agent-user/user.js';
 
 function sessionEnv(): Record<string, string> {
@@ -88,6 +89,8 @@ function tmuxOk(tmux: string, args: string[]): boolean {
 
 export const sessionRunning = (tmux = 'tmux'): boolean => tmuxOk(tmux, ['has-session', '-t', SESSION_NAME]);
 
+export const tmuxServerUp = (tmux = 'tmux'): boolean => tmuxOk(tmux, ['list-sessions']);
+
 function realDir(dir: string): string {
   try {
     return realpathSync(dir);
@@ -179,7 +182,8 @@ export function startSession(deps: SessionDeps = {}): SessionStatus {
   const trusted = trustFolder(home);
   const [command = 'metro', ...args] = metroCommand(deps, home);
   const tmuxArgs = ['new-session', '-d', '-s', SESSION_NAME, '-c', home, '-x', '200', '-y', '50', command, ...args];
-  const run = spawnSync(...asAgent(tmux, tmuxArgs), { encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], cwd: home });
+  const launch = deps.tmux === undefined && !tmuxServerUp(tmux) ? inSessionScope(asAgent(tmux, tmuxArgs)) : asAgent(tmux, tmuxArgs);
+  const run = spawnSync(...launch, { encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], cwd: home });
   recordStart(deps, tmux, now, run);
   if (memory.lastError === null) log.info({ home, trusted, command: [command, ...args].join(' ') }, 'claude-session: started Claude Code in tmux');
   return sessionStatus(deps);

package/runtime/node_modules/@metro-labs/daemon/src/gateway/model-api.ts

@@ -5,7 +5,8 @@ import { isRecord } from '@metro-labs/core/is-record';
 import { log } from '@metro-labs/core/log';
 import { openrouterModels, openrouterZdrModels } from './openrouter.js';
 import { anthropicModels, bedrockModels } from './provider-models.js';
-import { syncAvailableModelsQuietly } from '../claude/setup.js';
+import { routeOf, syncAvailableModelsQuietly } from '../claude/setup.js';
+import { sessionRunning, stopSession } from '../claude/session.js';
 import { forgetOne } from './usage.js';
 import {
   addConnection,
@@ -35,10 +36,19 @@ const DEVICE_ID_RE = /^[A-Za-z0-9_-]{16,64}$/;
 
 export type { ModelApiDeps } from './model-store.js';
 
+function restartRunningSession(): boolean {
+  if (!sessionRunning()) return false;
+  stopSession();
+  return true;
+}
+
 function kept(store: Store, next: ModelConfig, deps: ModelApiDeps, note: string, fields: Record<string, unknown>): unknown {
+  const before = routeOf(store.read());
   store.write(next);
   syncAvailableModelsQuietly(deps.setup ?? {}, next);
   log.info(fields, note);
+  if (routeOf(next) !== before && (deps.restartSession ?? restartRunningSession)())
+    log.info({ was: before, now: routeOf(next) }, 'model-api: the model changed, so the Claude session restarts on it');
   return settingsBody(next);
 }
 

package/runtime/node_modules/@metro-labs/daemon/src/gateway/model-store.ts

@@ -23,6 +23,7 @@ export interface ModelApiDeps {
   anthropicBase?: string;
   bedrockControlBase?: string;
   setup?: SetupDeps;
+  restartSession?: () => boolean;
 }
 
 export interface Store {

package/runtime/node_modules/@metro-labs/daemon/src/terminal/api.ts

@@ -6,12 +6,21 @@ import { bodyField, readJsonBody, sessionRoute } from '@metro-labs/http/api-http
 import { log } from '@metro-labs/core/log';
 import { mintTerminalTicket } from './tickets.js';
 import { agentCommand, asAgent, claudeHome } from '../agent-user/user.js';
+import { inSessionScope } from '../claude/memory.js';
+import { tmuxServerUp } from '../claude/session.js';
 
 const PREFIX = '/api/terminal';
 const TICKETS = `${PREFIX}/tickets`;
 const SESSION_RE = /^[A-Za-z0-9][A-Za-z0-9._-]{0,31}$/;
 
-export const tmuxCommand = (session: string, home = claudeHome() ?? homedir()): string[] => agentCommand([
+const scoped = (command: string[]): string[] => {
+  if (tmuxServerUp()) return command;
+  const [file = '', ...args] = command;
+  const [bin, argv] = inSessionScope([file, args]);
+  return [bin, ...argv];
+};
+
+export const tmuxCommand = (session: string, home = claudeHome() ?? homedir()): string[] => scoped(agentCommand([
   'tmux',
   'new-session',
   '-A',
@@ -35,7 +44,7 @@ export const tmuxCommand = (session: string, home = claudeHome() ?? homedir()):
   '-as',
   'terminal-features',
   ',xterm-256color:clipboard',
-], { TERM: 'xterm-256color', COLORTERM: 'truecolor' });
+], { TERM: 'xterm-256color', COLORTERM: 'truecolor' }));
 
 export interface TerminalApiDeps {
   command?: (session: string) => string[];

package/runtime/runtime.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.0-beta.184"
+  "version": "0.1.0-beta.186"
 }