A polish pass over OpenAgent's flows: a Stop during a run's start stops it, and an unsent prompt survives a reload

packages/agent-runner/src/run.test.ts

@@ -257,6 +257,42 @@ test('a run asked only a slash command keeps it while it works, and is named fro
   }
 })
 
+test('a run\'s card says its name is being asked while it is, not once the ask ends without one, nor for a slash command', async () => {
+  const repo = await testRepo()
+  try {
+    let answer: (title: string | undefined) => void = () => {}
+    const title = new Promise<string | undefined>(resolve => (answer = resolve))
+    const seen: unknown[] = []
+    const driver: Driver = {
+      id: 'claude-code',
+      start: async opts => {
+        const fake = (await new FakeDriver({ respond: () => 'Done.' }).start(opts)) as FakeDriverSession
+        // What the card says once the writes made so far have landed.
+        const naming = async () => {
+          await fake.log?.settled()
+          return (await readLiveCard(opts.cwd, opts.log!.card.id))?.caller?.['naming']
+        }
+        return wrap(fake, async () => {
+          seen.push(await naming())
+          answer(undefined)
+          for (let tries = 0; (await naming()) === true && tries < 100; tries++) await new Promise(resolve => setTimeout(resolve, 20))
+          seen.push(await naming())
+        })
+      },
+    }
+    const run = await runCommand(repo, { prompt: 'make readme.md shorter', naming: { title, stop: new AbortController() }, driver, now: () => NOW, gitHost: noGitHost })
+    assert.deepEqual(seen, [true, undefined])
+    assert.equal((await findRun(repo, run.id))?.title, undefined)
+
+    // A slash command is named from its report, at its end: nothing is asked while it works.
+    seen.length = 0
+    await runCommand(repo, { prompt: '/work-queue', driver, now: () => new Date(NOW.getTime() + 60_000), gitHost: noGitHost })
+    assert.deepEqual(seen, [undefined, undefined])
+  } finally {
+    await removeRepo(repo)
+  }
+})
+
 test('a run told how hard to think starts its agent that way and keeps it on its record', async () => {
   const repo = await testRepo()
   try {

packages/agent-runner/src/run.ts

@@ -697,8 +697,13 @@ function nameSession(run: SessionRun, session: DriverSession | undefined, stoppe
   const titled = async (title: string | undefined): Promise<void> => {
     if (title !== undefined) await session?.log?.title(title)
   }
+  // The card says while the name is being asked, and only then: a list holds the run's place for it.
+  const asking = mayName && !fromReport
+  if (asking) void session?.log?.patch({ caller: { naming: true } })
   return {
-    done: mayName && !fromReport ? (asked?.title ?? nameRun(run.driver, { prompt: run.prompt, signal: stopped })).then(titled, () => {}) : Promise.resolve(),
+    done: asking
+      ? (asked?.title ?? nameRun(run.driver, { prompt: run.prompt, signal: stopped })).then(titled, () => {}).then(() => session?.log?.patch({ caller: { naming: undefined } }))
+      : Promise.resolve(),
     // Named from its first report once its status is settled, before it is said ended, so the
     // name's line in the diary comes before the ended one; a stop meanwhile only cuts the naming
     // short. A question is no report of the work, and a few seconds is all a name may hold the

packages/dashboard-changes/dashboard/ChangesPanel.test.tsx

@@ -47,7 +47,7 @@ const diffLines = (root: HTMLElement = document.body) => [...root.querySelectorA
 describe('ChangesPanel', () => {
   test('a run’s page lists only the files the run changed, grouped by folder, and its header says between which branches and that they are not merged yet', async () => {
     render(<ChangesPanel projectId="p1" agentId="run-1" context={context} />)
-    await waitFor(() => expect(screen.getByTestId('pane-title').textContent).toBe(`${NOT_MERGED}· not merged yet`))
+    await waitFor(() => expect(screen.getByTestId('pane-title').textContent).toBe(`${NOT_MERGED} · not merged yet`))
     expect(readRun).toHaveBeenCalledWith(expect.anything(), 'p1', 'run-1')
     expect(readProject).not.toHaveBeenCalled()
     expect(within(list()).getAllByRole('button').map(b => [b.textContent, b.title])).toEqual([
@@ -103,7 +103,7 @@ describe('ChangesPanel', () => {
   test('a run that changed nothing, a run whose changes are gone, and a run still being read each say so in one line', async () => {
     readRun.mockResolvedValue({ source: 'unchanged', changes: {} })
     render(<ChangesPanel projectId="p1" agentId="run-1" context={context} />)
-    await waitFor(() => expect(screen.getByText('This run changed no files.')).toBeTruthy())
+    await waitFor(() => expect(screen.getByText('This session changed no files.')).toBeTruthy())
     cleanup()
     readRun.mockResolvedValue({ source: 'gone' })
     render(<ChangesPanel projectId="p1" agentId="run-2" context={context} />)
@@ -112,7 +112,7 @@ describe('ChangesPanel', () => {
     readRun.mockResolvedValue({ source: 'pending' })
     render(<ChangesPanel projectId="p1" agentId="run-3" context={context} />)
     await waitFor(() => expect(readRun).toHaveBeenCalledWith(expect.anything(), 'p1', 'run-3'))
-    expect(screen.getByText('Looking for this run’s changes…')).toBeTruthy()
+    expect(screen.getByText('Looking for this session’s changes…')).toBeTruthy()
   })
 
   test('the project’s own page lists what is changed in its folder and not committed, or says nothing is', async () => {
@@ -137,7 +137,7 @@ describe('ChangesPanel remembered', () => {
     readRun.mockReturnValue(new Promise(() => {}) as never)
     readCommits.mockReturnValue(new Promise(() => {}) as never)
     render(<ChangesPanel projectId="p1" agentId="run-1" context={context} />)
-    expect(screen.queryByText('Looking for this run’s changes…')).toBeNull()
+    expect(screen.queryByText('Looking for this session’s changes…')).toBeNull()
     expect(screen.getByText(NOT_MERGED)).toBeTruthy()
     expect(readRun).toHaveBeenCalledTimes(2)
   })
@@ -151,7 +151,7 @@ describe('ChangesPanel remembered', () => {
     // Its commits have answered; its files have not.
     await waitFor(() => expect(readCommits).toHaveBeenCalledWith(expect.anything(), 'p1', 'run-2'))
     await new Promise(resolve => setTimeout(resolve, 20))
-    expect(screen.getByText('Looking for this run’s changes…')).toBeTruthy()
+    expect(screen.getByText('Looking for this session’s changes…')).toBeTruthy()
     expect(queryRow(/app\.ts/)).toBeNull()
   })
 })
@@ -219,7 +219,7 @@ describe('ChangesPanel commits', () => {
     render(<ChangesPanel projectId="p1" agentId="run-1" context={context} />)
     await waitFor(() => expect(commitRows()).toHaveLength(3))
     expect(screen.getByText('No change is left: the commits cancel out.')).toBeTruthy()
-    expect(screen.queryByText('This run changed no files.')).toBeNull()
+    expect(screen.queryByText('This session changed no files.')).toBeNull()
   })
 
   test('while the run’s files move as it ends, the commits last read stay, and so does the picked commit', async () => {
@@ -236,15 +236,15 @@ describe('ChangesPanel commits', () => {
     expect(screen.getByText('bbbbbbb Change the app')).toBeTruthy()
   })
 
-  test('"This run changed no files." is not said before the commits are read', async () => {
+  test('"This session changed no files." is not said before the commits are read', async () => {
     readRun.mockResolvedValue({ source: 'checkout', changes: {}, merged: false })
     let answer: (commits: unknown) => void = () => {}
     readCommits.mockReturnValue(new Promise(resolve => (answer = resolve)) as never)
     render(<ChangesPanel projectId="p1" agentId="run-1" context={context} />)
     await waitFor(() => expect(readRun).toHaveBeenCalled())
     await new Promise(resolve => setTimeout(resolve, 20))
-    expect(screen.queryByText('This run changed no files.')).toBeNull()
-    expect(screen.getByText('Looking for this run’s changes…')).toBeTruthy()
+    expect(screen.queryByText('This session changed no files.')).toBeNull()
+    expect(screen.getByText('Looking for this session’s changes…')).toBeTruthy()
     answer([NEW])
     await waitFor(() => expect(screen.getByText('No change is left: the commits cancel out.')).toBeTruthy())
   })

packages/dashboard-changes/dashboard/ChangesPanel.tsx

@@ -205,6 +205,7 @@ function ChangeSearch({ paths, changes, onPick }: { paths: string[]; changes: Re
       </Tooltip>
       <PopoverContent align="end" className="w-72 p-1">
         <Input
+          name="search-changes"
           autoFocus
           type="search"
           value={query}
@@ -268,7 +269,7 @@ function ChangesHeader({ between, merged, page, paths, changes, listShown, onPic
         {between ? (
           <h2 className="min-w-0 truncate pl-2 text-[13px] text-muted-foreground" title={between}>
             {between}
-            {merged !== undefined && <span className="pl-1 text-xs text-muted-foreground">{merged ? '· merged' : '· not merged yet'}</span>}
+            {merged !== undefined && <span className="text-xs text-muted-foreground">{merged ? ' · merged' : ' · not merged yet'}</span>}
           </h2>
         ) : (
           <h2 className="truncate pl-2 text-[13px] text-muted-foreground">Changes</h2>
@@ -490,10 +491,10 @@ export function ChangesPanel({ projectId, agentId, activity, reveal }: ModulePan
     </>
   )
   if (agentId) {
-    if (!runLoaded || !commitsLoaded || !run || run.source === 'pending') return waiting('Looking for this run’s changes…')
-    if (run.source === 'gone') return line('This run’s changes are gone from this machine: its checkout was reclaimed and it left no branch or merged pull request here.')
+    if (!runLoaded || !commitsLoaded || !run || run.source === 'pending') return waiting('Looking for this session’s changes…')
+    if (run.source === 'gone') return line('This session’s changes are gone from this machine: its checkout was reclaimed and it left no branch or merged pull request here.')
   } else if (!projectLoaded) return waiting('Reading the project’s files…')
-  if (Object.keys(all).length === 0 && commits.length === 0) return line(agentId ? 'This run changed no files.' : 'Nothing is changed in the project’s folder.')
+  if (Object.keys(all).length === 0 && commits.length === 0) return line(agentId ? 'This session changed no files.' : 'Nothing is changed in the project’s folder.')
 
   const caption = commit ? `${commit.short} ${commit.subject}` : agentId ? undefined : 'Changed in the project’s folder, not committed.'
   // What stands where the diffs would be, when the list is empty.

packages/dashboard-changes/dashboard/keys.ts

@@ -1,6 +1,6 @@
 // The keys the reads are remembered under (`usePolled`'s `remember`): a pane opened again shows
 // what was read last at once, while it is read again. Without them every opening of the pane
-// passed through "Looking for this run’s changes…".
+// passed through "Looking for this session’s changes…".
 
 /** What is changed in the project's own folder. */
 export const projectKey = (projectId: string) => `changes:project:${projectId}`

packages/dashboard-devices/dashboard/AddDevice.tsx

@@ -23,7 +23,7 @@ export type Adding = 'choose' | 'phone' | 'computer' | 'server' | 'code'
 
 const KINDS: readonly { id: Exclude<Adding, 'choose'>; icon: ComponentType<{ className?: string; 'aria-hidden'?: boolean }>; title: string; words: string }[] = [
   { id: 'phone', icon: Smartphone, title: 'Phone or tablet', words: 'Scan a code with its camera.' },
-  { id: 'computer', icon: Monitor, title: 'Computer', words: 'Another Mac or PC that runs OpenAgent.' },
+  { id: 'computer', icon: Monitor, title: 'Computer', words: 'Another computer that runs OpenAgent.' },
   { id: 'server', icon: Server, title: 'Server', words: 'Install OpenAgent on a VPS, or on a PC that stays on.' },
   { id: 'code', icon: Ticket, title: 'I have a code', words: 'Join a server of yours, or a computer someone shared with you.' },
 ]
@@ -339,7 +339,7 @@ function AddComputer({ d, onClose }: { d: Devices; onClose: () => void }) {
             ))}
           </ul>
         )}
-        <p className="text-xs text-muted-foreground">Not in the list? Open OpenAgent on it, on the same Wi-Fi, with "On this Wi-Fi" on there.</p>
+        <p className="text-xs text-muted-foreground">Don't see it? Open OpenAgent on it, on the same Wi-Fi, with "On this Wi-Fi" on there.</p>
         <div className="flex flex-wrap items-center justify-between gap-3 border-t border-border pt-3">
           <span className="text-sm">
             Somewhere else?

packages/dashboard-devices/dashboard/ComputerPage.tsx

@@ -75,7 +75,7 @@ export function ComputerPage({ d, item, onBack, onSetUp }: { d: Devices; item: C
           >
             <label className="min-w-60 flex-1 space-y-1 text-xs text-muted-foreground">
               <span>{`On ${item.name}, open Settings › Devices › Add device › Computer › Give it this computer's link, and paste that link here:`}</span>
-              <Input autoFocus aria-label={`${item.name}'s link`} value={link} onChange={event => setLink(event.target.value)} />
+              <Input name="computer-link" autoFocus aria-label={`${item.name}'s link`} value={link} onChange={event => setLink(event.target.value)} />
             </label>
             <Button size="sm" type="submit" disabled={busy || !link.trim()}>
               Save

packages/dashboard-devices/dashboard/ConnectServer.tsx

@@ -88,11 +88,11 @@ export function ConnectServer({ d, onClose, onInvite }: { d: Devices; onClose: (
             <div className="grid grid-cols-[1fr_8rem] gap-2">
               <label className="space-y-1 text-xs text-muted-foreground">
                 <span>{kind === 'tailscale' ? 'Its name on Tailscale' : kind === 'home' ? 'Its address on its network' : 'Its address'}</span>
-                <Input autoFocus aria-label="The server's address" placeholder={kind === 'tailscale' ? 'homepc.tail1234.ts.net' : kind === 'home' ? '192.168.1.40' : '203.0.113.5'} value={address} onChange={event => setAddress(event.target.value)} />
+                <Input name="server-address" autoFocus aria-label="The server's address" placeholder={kind === 'tailscale' ? 'homepc.tail1234.ts.net' : kind === 'home' ? '192.168.1.40' : '203.0.113.5'} value={address} onChange={event => setAddress(event.target.value)} />
               </label>
               <label className="space-y-1 text-xs text-muted-foreground">
                 <span>User</span>
-                <Input aria-label="User name" placeholder={pc ? 'yours on it' : 'root'} value={user} onChange={event => setUser(event.target.value)} />
+                <Input name="server-user" aria-label="User name" placeholder={pc ? 'yours on it' : 'root'} value={user} onChange={event => setUser(event.target.value)} />
               </label>
             </div>
             <p className="text-xs text-muted-foreground">

packages/dashboard-devices/dashboard/DevicesSettings.test.tsx

@@ -89,7 +89,7 @@ describe('Settings › Devices: this computer, and how devices reach it', () =>
     expect(card.getByText("Nothing reaches it yet: only this computer's own browser opens OpenAgent.")).toBeTruthy()
     expect(screen.getByText('Add your first device')).toBeTruthy()
     expect(screen.getByText('Start runs and answer your agents from your phone, on the same Wi-Fi as this computer.')).toBeTruthy()
-    expect(screen.getByText('Run agents on your other Mac or PC, on the same Wi-Fi as this computer.')).toBeTruthy()
+    expect(screen.getByText('Run agents on your other computer, on the same Wi-Fi as this one.')).toBeTruthy()
     expect(screen.getByRole('button', { name: 'Set up a server' })).toBeTruthy()
     expect(screen.getByRole('button', { name: 'Join with a code' })).toBeTruthy()
     // Only the server's card says "anywhere": nothing reaches this computer from anywhere yet.
@@ -705,6 +705,23 @@ describe('Settings › Devices: a computer several people use', () => {
     expect(runComputerCommand.mock.calls.some(([args]) => args[0] === 'owner' || args[0] === 'add')).toBe(false)
   })
 
+  test('the owner names themselves from the keyboard: their field has the focus once the name git knows is read, and again when the name is refused', async () => {
+    const SERVER = { on: false, listening: true, https: { address: '203.0.113.5' }, devices: [], persons: [] }
+    const { host } = door(args => (args[0] === 'me' ? ok({ name: 'Ada Lovelace' }) : args[0] === 'owner' ? { ok: false, error: 'that name is taken here' } : ok(SERVER)), [], () => ok({ server: true, servers: [] }))
+    show(host)
+    fireEvent.click(await screen.findByRole('button', { name: 'Add person' }))
+    fireEvent.change(await screen.findByRole('textbox', { name: 'Their name' }), { target: { value: 'Rom' } })
+    fireEvent.click(screen.getByRole('button', { name: 'Make the code' }))
+    const own = (await screen.findByRole('textbox', { name: 'First, your name?' })) as HTMLInputElement
+    await waitFor(() => expect(own.value).toBe('Ada Lovelace'))
+    await waitFor(() => expect(document.activeElement).toBe(own))
+    const go = screen.getByRole('button', { name: 'Continue' })
+    go.focus()
+    fireEvent.click(go)
+    expect(await screen.findByText(/that name is taken here/)).toBeTruthy()
+    await waitFor(() => expect(document.activeElement).toBe(own))
+  })
+
   test('once named, the owner is not asked again, and the devices are listed by person; a person is removed with their devices', async () => {
     const persons = [{ name: 'Ada', owner: true }, { name: 'Rom' }, { name: 'Eve' }]
     const devices = [{ ...PHONE, person: 'Ada' }, { ...PHONE, id: 'fed654cba321', name: 'Pixel, Chrome', person: 'Rom' }]

packages/dashboard-devices/dashboard/DevicesSettings.tsx

@@ -133,7 +133,7 @@ function Start({ d, onAdd }: { d: Devices; onAdd: (adding: Adding) => void }) {
       </div>
       <div className="grid grid-cols-1 gap-3 sm:grid-cols-3">
         <Tile icon={Smartphone} title="Use it on your phone" words="Start runs and answer your agents from your phone, on the same Wi-Fi as this computer." button="Add phone" primary onClick={() => onAdd('phone')} />
-        <Tile icon={Monitor} title="Use another computer" words="Run agents on your other Mac or PC, on the same Wi-Fi as this computer." button="Add computer" onClick={() => onAdd('computer')} />
+        <Tile icon={Monitor} title="Use another computer" words="Run agents on your other computer, on the same Wi-Fi as this one." button="Add computer" onClick={() => onAdd('computer')} />
         {!d.isServer && <Tile icon={Server} title="Get a server" words="Always on. Your phone and computers reach each other from anywhere, and you can share it with people." button="Set up a server" onClick={() => onAdd('server')} />}
       </div>
       <p className="text-xs text-muted-foreground">
@@ -327,7 +327,7 @@ function PhoneRow({ d, item }: { d: Devices; item: PhoneItem }) {
               void act(() => d.changeDoor(() => renameDevice(host, item.door!.id, name.trim()))).then(done => done && setRenaming(false))
             }}
           >
-            <Input autoFocus aria-label="Name" value={name} maxLength={80} onChange={event => setName(event.target.value)} />
+            <Input name="device-name" autoFocus aria-label="Name" value={name} maxLength={80} onChange={event => setName(event.target.value)} />
             <div className="flex justify-end gap-2">
               <Button size="sm" type="button" variant="ghost" onClick={() => setRenaming(false)}>
                 Cancel