@stage-labs/metro 0.1.0-beta.106 → 0.1.0-beta.108

package/dist/claude.js

@@ -6,10 +6,12 @@ import { localAgents, pickLocalAgent } from './local.js';
 import { PROVIDER_FLAGS } from './provider-flags.js';
 import { localPort, localUrl } from './runtime.js';
 const CHANNEL_FLAGS = ['--dangerously-load-development-channels', 'server:metro'];
+const PERMISSION_FLAGS = ['--permission-mode', 'auto'];
 const KEY_HEADER = 'x-metro-key';
 const PROBE_MS = 3_000;
 export const claudeArgs = (extra, mcpConfig) => [
     ...CHANNEL_FLAGS,
+    ...PERMISSION_FLAGS,
     ...(mcpConfig === undefined ? [] : ['--mcp-config', mcpConfig]),
     ...extra,
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stage-labs/metro",
-  "version": "0.1.0-beta.106",
+  "version": "0.1.0-beta.108",
   "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.106",
+  "version": "0.1.0-beta.108",
   "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, the standing rules loaded at each session start, and a refresh skill for when the daemon could not keep the server list current. No vendor credential ever sits in a config file.",
   "author": {
     "name": "Bonustrack",

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

@@ -1,11 +1,14 @@
 import { spawnSync } from 'node:child_process';
+import { realpathSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { errMsg, log } from '@metro-labs/core/log';
 import { isRecord } from '@metro-labs/core/is-record';
 import { readJson, writeJson } from '@metro-labs/core/secure-fs';
+import { METRO_VERSION } from '@metro-labs/core/version';
 import { agentsDir, listAgentFiles } from '../agents/files.js';
 import { notReady, readModelConfig } from '../gateway/model-config.js';
+import { claudeDir, listClaudeProjects } from './files.js';
 import { claudeAccount, claudeInstalled } from './login.js';
 import { trustFolder } from './onboarding.js';
 
@@ -26,6 +29,8 @@ export interface SessionDeps {
   agents?: string;
   signedIn?: () => boolean;
   now?: () => number;
+  version?: string;
+  continues?: (home: string) => boolean;
 }
 
 export interface SessionStatus {
@@ -48,13 +53,24 @@ const memory: Memory = { lastStartedAt: null, lastError: null, strikes: 0, pause
 
 const statePath = (agents: string): string => join(agents, STATE_FILE);
 
-export function autostartEnabled(agents = agentsDir()): boolean {
+function readState(agents: string): Record<string, unknown> {
   const raw = readJson<unknown>(statePath(agents), null);
-  return !isRecord(raw) || raw.autostart !== false;
+  return isRecord(raw) ? raw : {};
 }
 
+const writeState = (agents: string, patch: Record<string, unknown>): void => {
+  writeJson(statePath(agents), { ...readState(agents), ...patch });
+};
+
+export const autostartEnabled = (agents = agentsDir()): boolean => readState(agents).autostart !== false;
+
 export function setAutostart(enabled: boolean, agents = agentsDir()): void {
-  writeJson(statePath(agents), { autostart: enabled });
+  writeState(agents, { autostart: enabled });
+}
+
+export function startedVersion(agents = agentsDir()): string | null {
+  const version = readState(agents).version;
+  return typeof version === 'string' ? version : null;
 }
 
 function tmuxOk(tmux: string, args: string[]): boolean {
@@ -64,10 +80,24 @@ function tmuxOk(tmux: string, args: string[]): boolean {
 
 export const sessionRunning = (tmux = 'tmux'): boolean => tmuxOk(tmux, ['has-session', '-t', SESSION_NAME]);
 
-function metroCommand(deps: SessionDeps): string[] {
-  if (deps.metro !== undefined) return deps.metro;
+function realDir(dir: string): string {
+  try {
+    return realpathSync(dir);
+  } catch {
+    return dir;
+  }
+}
+
+export function hasConversation(home: string, dir = claudeDir()): boolean {
+  const cwd = realDir(home);
+  return listClaudeProjects(dir).some((project) => project.sessions > 0 && project.cwd !== null && realDir(project.cwd) === cwd);
+}
+
+function metroCommand(deps: SessionDeps, home: string): string[] {
   const bin = process.env.METRO_CLI_BIN?.trim() ?? '';
-  return bin === '' ? ['metro', 'claude'] : [process.execPath, bin, 'claude'];
+  const base = deps.metro ?? (bin === '' ? ['metro', 'claude'] : [process.execPath, bin, 'claude']);
+  const continues = (deps.continues ?? hasConversation)(home);
+  return continues ? [...base, '-c'] : base;
 }
 
 function credentialReady(deps: SessionDeps): string | null {
@@ -108,22 +138,27 @@ function confirmChannels(tmux: string, until: number): void {
   setTimeout(tick, CONFIRM_POLL_MS).unref();
 }
 
+function recordStart(deps: SessionDeps, tmux: string, now: number, run: { error?: Error; status: number | null; stderr: string }): void {
+  memory.lastStartedAt = now;
+  if (run.error !== undefined || run.status !== 0) {
+    memory.lastError = run.error === undefined ? `tmux new-session exited ${String(run.status)}: ${run.stderr.trim()}` : errMsg(run.error);
+    log.warn({ err: memory.lastError }, 'claude-session: tmux could not start');
+    return;
+  }
+  memory.lastError = null;
+  writeState(deps.agents ?? agentsDir(), { version: deps.version ?? METRO_VERSION });
+  confirmChannels(tmux, now + CONFIRM_WAIT_MS);
+}
+
 export function startSession(deps: SessionDeps = {}): SessionStatus {
   const tmux = deps.tmux ?? 'tmux';
   const home = deps.home ?? homedir();
   const now = (deps.now ?? Date.now)();
   const trusted = trustFolder(home);
-  const [command = 'metro', ...args] = metroCommand(deps);
+  const [command = 'metro', ...args] = metroCommand(deps, home);
   const run = spawnSync(tmux, ['new-session', '-d', '-s', SESSION_NAME, '-c', home, '-x', '200', '-y', '50', command, ...args], { encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], cwd: home });
-  memory.lastStartedAt = now;
-  if (run.error !== undefined || run.status !== 0) {
-    memory.lastError = run.error === undefined ? `tmux new-session exited ${String(run.status)}: ${run.stderr.trim()}` : errMsg(run.error);
-    log.warn({ err: memory.lastError }, 'claude-session: tmux could not start');
-  } else {
-    memory.lastError = null;
-    log.info({ home, trusted, command: [command, ...args].join(' ') }, 'claude-session: started Claude Code in tmux');
-    confirmChannels(tmux, now + CONFIRM_WAIT_MS);
-  }
+  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);
 }
 
@@ -153,15 +188,46 @@ function strike(now: number): boolean {
   return true;
 }
 
-export function ensureSession(deps: SessionDeps = {}): 'started' | 'running' | 'blocked' | 'off' | 'paused' {
-  const now = (deps.now ?? Date.now)();
-  if (!autostartEnabled(deps.agents ?? agentsDir())) return 'off';
-  if (sessionRunning(deps.tmux ?? 'tmux')) return 'running';
+export type Ensured = 'started' | 'restarted' | 'running' | 'blocked' | 'off' | 'paused';
+
+function holdsBack(deps: SessionDeps, now: number): Ensured | null {
   if (now < memory.pausedUntil) return 'paused';
   if (sessionBlocked(deps) !== null) return 'blocked';
-  if (strike(now)) return 'paused';
+  return strike(now) ? 'paused' : null;
+}
+
+interface Resolved {
+  now: number;
+  agents: string;
+  version: string;
+  tmux: string;
+}
+
+const resolved = (deps: SessionDeps): Resolved => ({
+  now: (deps.now ?? Date.now)(),
+  agents: deps.agents ?? agentsDir(),
+  version: deps.version ?? METRO_VERSION,
+  tmux: deps.tmux ?? 'tmux',
+});
+
+function situation(r: Resolved): 'running' | 'stale' | 'absent' {
+  if (!sessionRunning(r.tmux)) return 'absent';
+  return startedVersion(r.agents) === r.version ? 'running' : 'stale';
+}
+
+export function ensureSession(deps: SessionDeps = {}): Ensured {
+  const r = resolved(deps);
+  if (!autostartEnabled(r.agents)) return 'off';
+  const found = situation(r);
+  if (found === 'running') return 'running';
+  const held = holdsBack(deps, r.now);
+  if (held !== null) return held;
+  if (found === 'stale') {
+    log.info({ was: startedVersion(r.agents), now: r.version }, 'claude-session: restarting the session an older metro started, so the new plugin and flags load');
+    stopSession(deps);
+  }
   startSession(deps);
-  return 'started';
+  return found === 'stale' ? 'restarted' : 'started';
 }
 
 let watcher: ReturnType<typeof setInterval> | null = null;
@@ -171,7 +237,7 @@ export function watchSession(deps: SessionDeps = {}, everyMs = WATCH_MS): void {
   const tick = (): void => {
     try {
       const outcome = ensureSession(deps);
-      if (outcome === 'started') log.info('claude-session: started');
+      if (outcome === 'started' || outcome === 'restarted') log.info({ outcome }, 'claude-session: Claude Code is up');
     } catch (err) {
       log.warn({ err: errMsg(err) }, 'claude-session: check failed');
     }

package/runtime/runtime.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.0-beta.106"
+  "version": "0.1.0-beta.108"
 }