@mortiseai/stem 0.0.29 → 0.0.30

package/bin/stem-supervisor-lib.mjs

@@ -44,6 +44,29 @@ function createSupervisorAnnounceFile(cwd) {
   return join(mkdtempSync(join(tmpRoot, 'session-')), 'session.json')
 }
 
+/** Replace startup mode flags and remove options unsupported by the target interface. */
+export function rewriteStartModeArgs(argv, mode) {
+  if (!['agent', 'coding', 'fde', 'evo'].includes(mode)) throw new Error('invalid startup mode')
+  let args = argv.filter(arg => !['--agent', '--coding', '--fde', '--evo'].includes(arg))
+  if (args[0] === 'evo' && args[1] === 'attach') args = args.slice(2)
+  const result = []
+  for (let i = 0; i < args.length; i++) {
+    const name = args[i].split('=')[0]
+    if (['--evo-view', '--type', '--space'].includes(name)) {
+      if (!args[i].includes('=')) i++
+      continue
+    }
+    // Evolve has a separate, strict argument parser. Keep shared startup options only.
+    if (mode === 'evo') {
+      if (['--tenant', '--user', '--model', '--telemetry-url'].includes(name)) {
+        result.push(args[i])
+        if (!args[i].includes('=') && i + 1 < args.length) result.push(args[++i])
+      }
+    } else result.push(args[i])
+  }
+  return [...result, `--${mode}`]
+}
+
 /** 从 argv 剥离 --resume/-r(supervisor 重启时按通告会话重挂)。 */
 export function stripResumeFlag(argv) {
   const out = []
@@ -525,6 +548,8 @@ export async function runSupervisor(distEntry, argv, options = {}) {
   let crashTimes = []
   let memoryRestartTimes = []
   let configurationRestartTimes = []
+  let switchedStartMode = null
+  let returnFromEvoArgs = null
   let expectedResumePath = ''
   let automaticResume = false
   let evoResumeHandoff = ''
@@ -593,6 +618,8 @@ export async function runSupervisor(distEntry, argv, options = {}) {
       STEM_RESUME_EXPECTED_PATH: automaticResume ? expectedResumePath : '',
       STEM_EVO_RESUME_HANDOFF: evoResumeHandoff,
       STEM_CONFIGURATION_RELOAD: configurationReload ? '1' : '',
+      STEM_START_RESUME_ID: switchedStartMode === 'evo' ? (resumeId ?? '') : '',
+      STEM_EVO_ROLE: switchedStartMode && switchedStartMode !== 'evo' ? '' : (process.env.STEM_EVO_ROLE ?? ''),
     }, { command: launchCommand, cwd: launchCwd })
     evoResumeHandoff = '' // Only the immediately following controlled restart receives the capability.
     configurationReload = false
@@ -623,12 +650,12 @@ export async function runSupervisor(distEntry, argv, options = {}) {
     if (code === EXIT_CODE_CONFIGURATION_RESTART) {
       const t = now()
       configurationRestartTimes = configurationRestartTimes.filter(x => t - x < CRASH_WINDOW_MS)
-      configurationRestartTimes.push(t)
       resetTerminalFn()
       const announce = readSessionAnnouncement(announceFile)
+      if (announce?.startMode === undefined) configurationRestartTimes.push(t)
       if (!announce || announce.requestState?.pid !== child.pid || announce.requestState?.active !== false ||
           typeof announce.queuePath !== 'string' || !announce.queuePath ||
-          configurationRestartTimes.length >= CRASH_GIVE_UP_COUNT) {
+          (announce.startMode === undefined && configurationRestartTimes.length >= CRASH_GIVE_UP_COUNT)) {
         logLine(isZh ? 'stem: 无法安全自动重启，请重新启动 CLI 加载配置。'
           : 'stem: automatic restart is unavailable; restart the CLI to load configuration.')
         return EXIT_CODE_CONFIGURATION_RESTART
@@ -656,10 +683,27 @@ export async function runSupervisor(distEntry, argv, options = {}) {
       automaticResume = true
       expectedResumePath = (Array.isArray(announce.jsonlPaths) ? announce.jsonlPaths : [])
         .find(p => typeof p === 'string' && existsSync(p)) ?? ''
-      // Load model and permission defaults from the new configuration.
-      baseArgs = stripPermissionModeFlag(stripModelFlag(baseArgs))
-      permissionModeFromAnnounce = null
-      modelFromAnnounce = null
+      if (announce.startMode !== undefined) {
+        const returningFromEvo = switchedStartMode === 'evo' && announce.startMode !== 'evo' && returnFromEvoArgs !== null
+        if (announce.startMode === 'evo' && switchedStartMode !== 'evo') {
+          returnFromEvoArgs = stripModelFlag(stripPermissionModeFlag(baseArgs))
+          if (announce.model) returnFromEvoArgs.push('--model', announce.model)
+          if (announce.permissionMode) returnFromEvoArgs.push('--permission-mode', announce.permissionMode)
+        }
+        try { baseArgs = rewriteStartModeArgs(returningFromEvo ? returnFromEvoArgs : baseArgs, announce.startMode) }
+        catch { return EXIT_CODE_CONFIG }
+        if (returningFromEvo) returnFromEvoArgs = null
+        switchedStartMode = announce.startMode
+        // A standalone Evolve window has no chat transcript to resume.
+        if (!expectedResumePath) { resumeId = null; automaticResume = false }
+        permissionModeFromAnnounce = switchedStartMode === 'evo' || returningFromEvo ? null : (announce.permissionMode || null)
+        modelFromAnnounce = returningFromEvo ? null : (announce.model || null)
+      } else {
+        // Load model and permission defaults from the new configuration.
+        baseArgs = stripPermissionModeFlag(stripModelFlag(baseArgs))
+        permissionModeFromAnnounce = null
+        modelFromAnnounce = null
+      }
       evoResumeHandoff = ''
       configurationReload = true
       onCrashCleanupPid(child.pid)