reslop 0.3.1 → 0.3.2

package/lib/session/agents/agents.js

@@ -4,19 +4,8 @@ const fs = require('node:fs');
 const path = require('node:path');
 const { clamp } = require('../../common/utilities.js');
 const agents = require('../../agents/agents.js');
-const {
-  detectAgents,
-  canLogin,
-  listedOf,
-  listModels,
-  startAgent,
-  buildLaunch,
-  buildLogin,
-  needsAuth,
-  probeAuth,
-  emptyChoice,
-  mergeModels,
-} = agents;
+const { detectAgents, listModels, startAgent, buildLaunch } = agents;
+const { emptyChoice, catalogOf, buildInstall } = agents;
 const review = require('../../review/review.js');
 const { latestReviewName, listReviewNames, planFileNames } = review;
 const { REVIEW_DIR } = require('../../common/files.js');
@@ -24,16 +13,18 @@ const render = require('../../render/log.js');
 const { logRowCount } = render;
 const { RunPanel } = require('../run-panel.js');
 const options = require('./options.js');
-const { AgentOptions, concrete, restoreChoice, storedChoice } = options;
+const { AgentOptions, restoreChoice, storedChoice } = options;
 const jobs = require('./jobs.js');
+const { AwayRuns } = require('./away.js');
 const { readPrefs, writePrefs } = require('../prefs.js');
 const { elapsedLabel, launchJob, assignLog, stemOf } = jobs;
 const { restoreJobs, readRunList, saveRunFiles } = jobs;
 const { panelSessions, orderedSessions, runBlock } = jobs;
 const { runningJobs, withLiveRuns } = jobs;
-const { replayLaunch } = jobs;
 const plans = require('./plans.js');
 const { planKey, planProgress, planPart, planLabel, alignPlanLabels } = plans;
+const { planCaption } = plans;
+const { NO_PICK, NO_LIST, NO_JOB } = require('./view.js');
 const { MenuPick, menuRows, pickDelta } = require('../../input/menu-pick.js');
 const { lineKey } = require('../../input/line-edit.js');
 
@@ -41,7 +32,9 @@ const optionsOf = (row) => new AgentOptions(row);
 
 const APPLY_FIELD = {
   model: (choices, picked, value) => choices.pickModel(picked, value),
-  context: (choices, picked, value) => choices.pickContext(picked, value),
+  context: (choices, picked, value) => {
+    picked.context = value;
+  },
   effort: (choices, picked, value) => {
     picked.effort = value;
   },
@@ -61,9 +54,9 @@ const continuedId = (session) => {
 
 const cacheKey = (row) => `${row.id}:${row.bin}`;
 
-const listQuietly = async (list, row, env) => {
+const listQuietly = async (list, row, options) => {
   try {
-    return await list(row.bin, row.spec, { env });
+    return await list(row, options);
   } catch {
     return null;
   }
@@ -75,42 +68,12 @@ const firstEnabled = (items, at, isOff) => {
   return free < 0 ? at : free;
 };
 
-const NO_PICK = {
-  agentPick: '',
-  agentMenu: null,
-  agentQuery: '',
-  agentEditor: null,
-  agentMenuOff: [],
-  agentPickCursor: 0,
-  agentMenuScroll: 0,
-};
-
-const NO_LIST = {
-  agents: null,
-  agentRuns: [],
-  agentRunCursor: 0,
-  agentRunScroll: 0,
-  agentFocus: 'cli',
-  agentCanContinue: false,
-  agentPlanCount: 0,
-  agentView: false,
-};
-
-const NO_JOB = {
-  agentOutput: '',
-  agentCommand: '',
-  agentElapsed: '',
-  agentProgress: '',
-  agentRunning: false,
-  agentStatus: '',
-};
-
 class AgentsController extends RunPanel {
   constructor(ui) {
     super(ui);
     this.spawn = startAgent;
     this.listModels = listModels;
-    this.authProbe = probeAuth;
+    this.probes = null;
     this.reset();
   }
 
@@ -123,8 +86,12 @@ class AgentsController extends RunPanel {
     this.list = [];
     this.choices = new Map();
     this.loaded = new Map();
+    this.asking = new Set();
     this.modelsEpoch = 0;
     this.jobs = [];
+    this.away = new AwayRuns();
+    this.installs = new Map();
+    this.installTarget = '';
     this.nextId = 1;
     this.viewing = false;
     this.viewId = 0;
@@ -140,31 +107,34 @@ class AgentsController extends RunPanel {
     this.viewSession = '';
     this.historyText = '';
     this.historyAt = 0;
-    this.pendingStart = null;
-    this.authYes = new Set();
-    this.authWait = '';
     this.env = process.env;
     this.refresh();
     this.loadRuns();
   }
 
   killAll() {
-    for (const job of this.jobs ?? []) {
+    if (this.probes) this.probes.abort();
+    this.probes = null;
+    for (const job of this.everyJob()) {
       if (job.child) job.child.kill();
     }
   }
 
+  // The install of an adapter is watched like a run but is no session
+  everyJob() {
+    const installs = this.installs ? this.installs.values() : [];
+    const runs = this.jobs ?? [];
+    const away = this.away ? this.away.jobs() : [];
+    return [...runs, ...away, ...installs];
+  }
+
   reviewStore() {
     return this.ui.review ? this.ui.review.store : null;
   }
 
   applyCached(row) {
     const cached = this.loaded.get(cacheKey(row));
-    if (!cached) return;
-    row.models = cached.models;
-    row.wide = cached.wide;
-    row.listedEfforts = cached.efforts;
-    row.modelEfforts = cached.modelEfforts;
+    if (cached) row.catalog = cached;
   }
 
   refresh(env = this.env) {
@@ -174,7 +144,7 @@ class AgentsController extends RunPanel {
     this.choices = new Map();
     for (const row of this.list) {
       this.applyCached(row);
-      this.choices.set(row.id, prev.get(row.id) ?? emptyChoice(row));
+      this.choices.set(row.id, prev.get(row.id) ?? emptyChoice());
     }
     this.loadChoices();
     this.clampCursor();
@@ -185,7 +155,7 @@ class AgentsController extends RunPanel {
     const saved = readPrefs(this.root).agents;
     for (const row of this.list) {
       const picked = this.choice(row.id);
-      restoreChoice(picked, saved[row.id], row.spec);
+      restoreChoice(picked, saved[row.id]);
       optionsOf(row).preferEffort(picked, 'medium');
     }
   }
@@ -196,7 +166,7 @@ class AgentsController extends RunPanel {
     if (!this.root || !picked || !row) return;
     const data = readPrefs(this.root);
     const saved = { ...data.agents };
-    const stored = storedChoice(picked, row.spec);
+    const stored = storedChoice(picked);
     if (stored) saved[id] = stored;
     else delete saved[id];
     writePrefs(this.root, { ...data, agents: saved });
@@ -211,22 +181,36 @@ class AgentsController extends RunPanel {
   }
 
   // The repository can change after construction: its runs and its saved
-  // sessions must come from the same directory
+  // sessions must come from the same directory. A run that goes on in the
+  // previous one stays with it
   syncRuns() {
     if (!this.root || this.root === this.runsRoot) return;
-    const live = this.jobs.filter((job) => job.status === 'running');
-    this.loadRuns();
-    for (const job of live) {
-      job.id = this.nextId;
-      this.nextId += 1;
-      this.jobs.push(job);
-    }
+    this.away.park(this.runsRoot, this.jobs);
+    const parked = this.away.take(this.root);
+    if (parked) this.jobs = parked;
+    else this.loadRuns();
+    this.runsRoot = this.root;
+    const last = this.jobs.reduce((max, job) => Math.max(max, job.id), 0);
+    this.nextId = Math.max(this.nextId, last + 1);
     this.viewId = 0;
   }
 
+  retarget() {
+    this.viewing = false;
+    this.viewId = 0;
+    this.pick = null;
+    this.viewSession = '';
+  }
+
+  // The runs in work by directory, for the screen of worktrees
+  liveByRoot() {
+    return this.away.counts(this.runsRoot, this.jobs);
+  }
+
   saveRuns() {
     if (!this.root) return;
-    saveRunFiles(this.root, this.jobs);
+    saveRunFiles(this.runsRoot || this.root, this.jobs);
+    this.away.save();
   }
 
   clampCursor() {
@@ -244,8 +228,8 @@ class AgentsController extends RunPanel {
 
   choice(id) {
     const row = this.cliById(id);
-    if (!row) return emptyChoice(null);
-    if (!this.choices.has(id)) this.choices.set(id, emptyChoice(row));
+    if (!row) return emptyChoice();
+    if (!this.choices.has(id)) this.choices.set(id, emptyChoice());
     return this.choices.get(id);
   }
 
@@ -256,13 +240,14 @@ class AgentsController extends RunPanel {
       const picked = this.choice(row.id);
       const choices = optionsOf(row);
       const model = choices.normalize(picked);
+      const { effort, fast, context } = choices.settings(picked);
       return {
         ...row,
         model,
-        effort: concrete(picked.effort),
-        efforts: choices.efforts(picked.model),
-        fast: picked.fast ? 'on' : 'off',
-        context: concrete(picked.context),
+        effort,
+        efforts: choices.efforts(model),
+        fast,
+        context,
         contexts: choices.contexts(model),
         plan: row.bin ? plan : '',
         planBusy: Boolean(row.bin && planBusy),
@@ -317,25 +302,21 @@ class AgentsController extends RunPanel {
   }
 
   jobById(id) {
-    return this.jobs.find((job) => job.id === id) ?? null;
+    return this.everyJob().find((job) => job.id === id) ?? null;
   }
 
   viewedJob() {
     return this.jobById(this.viewId);
   }
 
-  runningJob(id, action = '') {
-    const live = (job) => {
-      const sameCli = job.cliId === id;
-      const running = job.status === 'running';
-      const sameAction = !action || job.action === action;
-      return sameCli && running && sameAction;
-    };
+  runningJob(id) {
+    const live = (job) => job.cliId === id && job.status === 'running';
     return this.jobs.findLast(live) ?? null;
   }
 
   runningCount() {
-    return this.jobs.filter((job) => job.status === 'running').length;
+    const live = (job) => job.status === 'running';
+    return this.everyJob().filter(live).length;
   }
 
   summary() {
@@ -381,17 +362,18 @@ class AgentsController extends RunPanel {
     if (!onAgents) return NO_LIST;
     const agentRuns = this.sessionRows();
     const selected = agentRuns[this.runCursor];
-    const agentCanContinue =
-      this.focus === 'runs' &&
-      Boolean(continuedId(selected)) &&
-      selected.status !== 'running';
+    const running = Boolean(selected && selected.status === 'running');
+    const fresh = Boolean(selected && selected.fresh);
+    const resume = Boolean(continuedId(selected));
+    const agentCanStart = !running && (fresh || resume);
     return {
       agents: this.rows(),
+      agentInstallPackage: this.installPackage(),
       agentRuns,
       agentRunCursor: this.runCursor,
       agentRunScroll: this.runScroll,
       agentFocus: this.focus,
-      agentCanContinue,
+      agentCanStart,
       agentPlanCount: this.reviewChoices().length,
       agentView: this.viewing,
     };
@@ -409,7 +391,7 @@ class AgentsController extends RunPanel {
     if (!job) return NO_JOB;
     const running = job.status === 'running';
     const name = stemOf(job.logName);
-    const agentCommand = name || job.command;
+    const agentCommand = job.title || name || job.command;
     return {
       agentOutput: job.output,
       agentCommand,
@@ -465,25 +447,52 @@ class AgentsController extends RunPanel {
   async loadModels() {
     this.modelsEpoch += 1;
     const epoch = this.modelsEpoch;
-    const pending = this.list
-      .filter((row) => row.bin && !this.loaded.has(cacheKey(row)))
-      .map((row) => this.fetchModels(row, epoch));
-    if (!pending.length) return;
-    await Promise.all(pending);
+    const waiting = this.list.filter(
+      (row) => row.bin && !this.loaded.has(cacheKey(row)),
+    );
+    if (!waiting.length) return;
+    await Promise.all(waiting.map((row) => this.fetchModels(row, epoch)));
     if (epoch === this.modelsEpoch) this.ui.paint();
   }
 
+  probeOptions(model) {
+    this.probes ??= new AbortController();
+    const { signal } = this.probes;
+    const models = model ? [model] : [];
+    return { env: this.env, cwd: this.root, signal, models };
+  }
+
+  // The agent lists its models only to a session, so one is opened to ask
   async fetchModels(row, epoch) {
-    const listed = listedOf(await listQuietly(this.listModels, row, this.env));
-    if (epoch !== this.modelsEpoch) return;
-    const { spec } = row;
-    const models = mergeModels(spec.models, listed.names, spec.partialList);
-    const wide = listed.wide ? new Set(listed.wide) : null;
-    const { efforts, modelEfforts } = listed;
-    const cached = { models, wide, efforts, modelEfforts };
-    this.loaded.set(cacheKey(row), cached);
+    const options = this.probeOptions(this.choice(row.id).model);
+    const catalog = await listQuietly(this.listModels, row, options);
+    if (epoch !== this.modelsEpoch || !catalog) return;
+    this.loaded.set(cacheKey(row), catalog);
+    const current = this.cliById(row.id);
+    if (!current || current.bin !== row.bin) return;
+    this.applyCached(current);
+    optionsOf(current).preferEffort(this.choice(current.id), 'medium');
+  }
+
+  // The settings of a model come from asking the agent about that model
+  async describeModel(row, model) {
+    const key = cacheKey(row);
+    const mark = `${key}:${model}`;
+    const known = this.loaded.get(key);
+    if (!known || !catalogOf(known).unknown(model)) return;
+    if (this.asking.has(mark)) return;
+    this.asking.add(mark);
+    const options = this.probeOptions(model);
+    const found = await listQuietly(this.listModels, row, options);
+    this.asking.delete(mark);
+    const cached = this.loaded.get(key);
+    if (!cached || !found || !(found.byModel instanceof Map)) return;
+    const prior = cached.byModel ?? [];
+    const byModel = new Map([...prior, ...found.byModel]);
+    this.loaded.set(key, { ...cached, byModel });
     const current = this.cliById(row.id);
     if (current && current.bin === row.bin) this.applyCached(current);
+    this.ui.paint();
   }
 
   logWidth() {
@@ -560,9 +569,7 @@ class AgentsController extends RunPanel {
     const choices = optionsOf(row);
     const picked = this.choice(row.id);
     if (field === 'model') return choices.names;
-    if (field === 'context') {
-      return choices.contexts(choices.shown(picked.model));
-    }
+    if (field === 'context') return choices.contexts(picked.model);
     return choices.efforts(picked.model);
   }
 
@@ -573,9 +580,10 @@ class AgentsController extends RunPanel {
       return firstEnabled(items, Math.max(0, at), this.busyCheck());
     }
     const picked = this.choice(row.id);
-    const model = field === 'model';
-    const current = model ? optionsOf(row).shown(picked.model) : picked[field];
-    return Math.max(0, items.indexOf(current));
+    const choices = optionsOf(row);
+    const shown = { ...choices.settings(picked) };
+    shown.model = choices.shown(picked.model);
+    return Math.max(0, items.indexOf(shown[field]));
   }
 
   menuItems() {
@@ -621,7 +629,7 @@ class AgentsController extends RunPanel {
     if (!row || !row.bin) return;
     optionsOf(row).normalize(this.choice(row.id));
     const items = this.fieldItems(field, row);
-    if (items.length < (field === 'context' ? 1 : 2)) return;
+    if (items.length < 2) return;
     this.pick = new MenuPick(field, this.fieldStart(field, items, row));
     this.ui.status = '';
     this.ui.paint();
@@ -654,6 +662,7 @@ class AgentsController extends RunPanel {
     const apply = APPLY_FIELD[field] ?? APPLY_FIELD.effort;
     apply(optionsOf(row), picked, value);
     this.saveChoice(row.id);
+    if (field === 'model') void this.describeModel(row, picked.model);
     return `${field} ${picked[field]}`;
   }
 
@@ -680,9 +689,9 @@ class AgentsController extends RunPanel {
       return;
     }
     const picked = this.choice(row.id);
-    optionsOf(row).toggleFast(picked);
-    this.saveChoice(row.id);
-    this.ui.status = picked.fast ? 'fast on' : 'fast off';
+    const choices = optionsOf(row);
+    if (choices.toggleFast(picked)) this.saveChoice(row.id);
+    this.ui.status = `fast ${choices.settings(picked).fast}`;
     this.ui.paint();
   }
 
@@ -718,7 +727,7 @@ class AgentsController extends RunPanel {
   busyPlans() {
     const busy = new Set();
     for (const job of this.jobs) {
-      if (job.status !== 'running' || job.action === 'login') continue;
+      if (job.status !== 'running') continue;
       const name = path.basename(`${job.plan ?? ''}`);
       if (name) busy.add(name);
     }
@@ -766,12 +775,10 @@ class AgentsController extends RunPanel {
   }
 
   closeView() {
-    const job = this.viewedJob();
     this.viewing = false;
     this.viewSession = '';
     this.historyText = '';
-    const waiting = job && job.action === 'login' && job.status === 'running';
-    this.ui.status = waiting ? 'logging in' : '';
+    this.ui.status = '';
     this.ui.paint();
   }
 
@@ -790,6 +797,7 @@ class AgentsController extends RunPanel {
   showOutput(job, text) {
     job.output = text;
     job.dirty = true;
+    job.captureStats();
     this.keepLog(job);
     const watched = this.viewing && this.viewId === job.id;
     if (watched || this.ui.nav.pane === 'agents') this.ui.paint();
@@ -808,77 +816,13 @@ class AgentsController extends RunPanel {
     if (job.status !== 'running') return;
     const stopped = job.stopping;
     this.settleJob(job, stopped ? null : result);
-    const isLogin = job.action === 'login';
-    const watched = this.viewing && this.viewId === job.id;
-    const signedIn = !stopped && isLogin && result.status === 0;
-    if (stopped && watched) this.ui.status = 'stopped';
-    else if (signedIn) this.ui.status = 'logged in';
-    this.ui.paint();
-    if (isLogin) return void this.finishLogin(job, result, stopped, signedIn);
-    if (stopped || !needsAuth(job.output)) return;
-    const cli = this.cliById(job.cliId);
-    if (canLogin(cli)) this.startLogin(cli);
-  }
-
-  finishLogin(job, result, stopped, signedIn) {
-    if (!signedIn) {
-      this.pendingStart = null;
-      if (!stopped && result) this.ui.status = 'not logged in';
-      this.ui.paint();
-      return;
+    if (stopped && this.viewing && this.viewId === job.id) {
+      this.ui.status = 'stopped';
     }
-    this.authYes.add(job.cliId);
-    const pending = this.pendingStart;
-    this.pendingStart = null;
-    if (!pending || pending.id !== job.cliId) return;
-    const cli = this.cliById(pending.id);
-    if (cli) this.launchReady(cli, pending.session || '');
-  }
-
-  authAnswer(row) {
-    if (!canLogin(row)) return true;
-    const args = row.spec && row.spec.status;
-    if (!args || !args.length) return true;
-    if (this.authYes.has(row.id)) return true;
-    return this.authProbe(row);
-  }
-
-  beginStart(row, sessionId = '') {
-    const id = row.id;
-    if (this.authWait === id) return;
-    const answer = this.authAnswer(row);
-    const go = (ok) => {
-      if (this.authWait === id) this.authWait = '';
-      const current = this.cliById(id);
-      if (!current) return;
-      this.afterAuth(current, sessionId, ok);
-    };
-    if (answer && typeof answer.then === 'function') {
-      this.authWait = id;
-      answer.then(go, () => go(null));
-      return;
-    }
-    this.afterAuth(row, sessionId, answer);
-  }
-
-  afterAuth(row, sessionId, ok) {
-    if (ok === true) this.authYes.add(row.id);
-    if (ok === false) return void this.holdForLogin(row, sessionId);
-    this.launchReady(row, sessionId);
-  }
-
-  holdForLogin(row, sessionId) {
-    this.pendingStart = { id: row.id, session: sessionId };
-    this.startLogin(row);
-    this.ui.status = 'not logged in';
     this.ui.paint();
   }
 
-  launchReady(row, sessionId = '') {
-    this.startJob(row, sessionId);
-  }
-
-  startLaunch(launch, model, showLog = true) {
+  startLaunch(launch, model) {
     if (!launch.ok) {
       this.ui.status = launch.error;
       return;
@@ -893,14 +837,15 @@ class AgentsController extends RunPanel {
     if (job.status === 'running') job.child = child;
     this.saveRuns();
     this.syncProgress();
-    if (showLog && this.jobs.at(-1) === job) this.openView(job.id);
+    if (this.jobs.at(-1) === job) this.openView(job.id);
   }
 
   startJob(row, sessionId = '') {
     const picked = this.choice(row.id);
     const plan = this.ensurePlan();
     const launch = buildLaunch(row, picked, plan, this.root, sessionId);
-    this.startLaunch(launch, picked.model);
+    const title = planCaption(this.root, launch.plan);
+    this.startLaunch({ ...launch, title }, picked.model);
   }
 
   prepareStart() {
@@ -922,19 +867,90 @@ class AgentsController extends RunPanel {
     return row;
   }
 
-  startLogin(row) {
-    const live = this.runningJob(row.id, 'login');
-    if (!live) this.startLaunch(buildLogin(row), '', false);
-    if (this.viewing) this.closeView();
-    this.ui.status = 'logging in';
-    this.ui.paint();
-  }
-
   rerun() {
     if (!this.viewing) return;
     const job = this.viewedJob();
-    if (!job || job.status === 'running' || !job.cmd) return;
-    this.startLaunch(replayLaunch(job), job.model);
+    if (!job || job.status === 'running') return;
+    if (job.action === 'install') {
+      this.closeView();
+      return void this.install(job.cliId);
+    }
+    const row = this.cliById(job.cliId);
+    const plan = job.plan ? path.resolve(this.root, job.plan) : '';
+    const launch = buildLaunch(row, job.choice, plan, this.root, job.resume);
+    const title = planCaption(this.root, launch.plan) || job.title;
+    this.startLaunch({ ...launch, title }, job.model);
+  }
+
+  installPackage() {
+    const row = this.cliById(this.installTarget);
+    return row ? row.package || row.installLabel : '';
+  }
+
+  proposeInstall() {
+    if (this.viewing || this.pick) return;
+    const row = this.selected();
+    const live = row ? this.installs.get(row.id) : null;
+    if (live && live.status === 'running') return void this.openView(live.id);
+    const launch = buildInstall(row);
+    if (!launch.ok) {
+      this.ui.status = launch.error;
+      return void this.ui.paint();
+    }
+    this.installTarget = row.id;
+    this.ui.status = '';
+    this.ui.mode = 'confirmAgentInstall';
+    this.ui.paint();
+  }
+
+  cancelInstall() {
+    this.installTarget = '';
+    this.ui.mode = 'review';
+    this.ui.paint();
+  }
+
+  confirmInstall() {
+    const id = this.installTarget;
+    this.installTarget = '';
+    this.ui.mode = 'review';
+    this.install(id);
+  }
+
+  install(id = '') {
+    if (this.viewing || this.pick) return;
+    const row = id ? this.cliById(id) : this.selected();
+    const launch = buildInstall(row);
+    if (!launch.ok) {
+      this.ui.status = launch.error;
+      return void this.ui.paint();
+    }
+    const job = launchJob(this.nextId, launch, '');
+    this.nextId += 1;
+    this.installs.set(row.id, job);
+    const onData = (text) => this.showOutput(job, text);
+    const onClose = (result) => this.finishInstall(job, result);
+    const child = this.spawn(this.root, launch, onData, onClose);
+    if (job.status === 'running') job.child = child;
+    this.syncProgress();
+    this.openView(job.id);
+  }
+
+  // Refresh PATH and managed registry locations after the installer exits.
+  finishInstall(job, result) {
+    if (job.status !== 'running') return;
+    const stopped = job.stopping;
+    this.settleJob(job, stopped ? null : result);
+    this.ui.status = stopped ? 'stopped' : this.installOutcome(job, result);
+    this.ui.paint();
+  }
+
+  installOutcome(job, result) {
+    if (result.status !== 0) return 'install failed';
+    this.refresh();
+    const row = this.cliById(job.cliId);
+    if (!row || !row.bin) return 'installed, but not found';
+    void this.loadModels();
+    return `installed ${job.name}`;
   }
 
   start() {
@@ -942,18 +958,17 @@ class AgentsController extends RunPanel {
     const session = this.selectedSession();
     if (this.focus === 'runs' && this.openRunRow(session)) return;
     const row = this.prepareStart();
-    if (!row) return;
-    this.beginStart(row, continuedId(session));
+    if (row) this.startJob(row, continuedId(session));
   }
 
-  continueSession() {
-    if (this.viewing || this.pick || this.focus !== 'runs') return;
+  startSelected() {
+    if (this.viewing || this.pick) return;
     const session = this.selectedSession();
-    const id = continuedId(session);
-    if (!id || session.status === 'running') return;
+    if (!session || session.status === 'running') return;
+    const resume = session.fresh ? '' : continuedId(session);
+    if (!session.fresh && !resume) return;
     const row = this.prepareStart();
-    if (!row) return;
-    this.beginStart(row, id);
+    if (row) this.startJob(row, resume);
   }
 
   selectedJob() {