+1

CHANGELOG.md

Reviewed

··· 28 28 - Fix `session_exit` sometimes missing from the events log when the daemon was killed via SIGTERM (`pty kill` and similar). The event was queued on the `EventWriter` chain but the daemon exited before the append flushed. `close()` now waits for the child process's `onExit` (bounded at 2s) and then drains the writer before resolving. 29 29 30 30 ### Interactive TUI 31 31 + - **"Create new session..." is now a one-keystroke action.** Pressing Enter spawns `$SHELL` (fallback `bash`) in `$HOME` with a random id and no `displayName`. No wizard, no directory picker, no name/command prompts. Use `pty rename` and `pty exec` from inside the new session to promote it into something specific. Remote "Create new session..." mirrors the same one-shot flow via `pty-relay connect <url> --spawn <random-id>` (the relay is responsible for the remote-side shell/cwd defaults). 31 32 - Add `--preselect-new` flag: `pty --preselect-new` opens the interactive TUI with "Create new session..." pre-selected (useful for pty-layout panes that should land on the create prompt) 32 33 - Add `--filter-tag key=value` flag (repeatable): filters the TUI to sessions matching all given tags AND auto-applies those tags to any session created from this TUI instance — so new sessions (local and remote) stay in the filtered view (e.g., pty-layout layouts) 33 34 - Remote session spawns forward filter tags to pty-relay as `--tag key=value` so remote sessions created from a filtered TUI are tagged on the remote side and stay in the filtered view

+52 -400

src/tui/interactive.ts

Reviewed

··· 1 1 // Interactive session list — built with the declarative TUI framework + app() 2 2 import * as fs from "node:fs"; 3 3 + import * as os from "node:os"; 3 4 import * as path from "node:path"; 5 5 + import { randomBytes } from "node:crypto"; 4 6 import { execFileSync, spawn as spawnChild, spawnSync } from "node:child_process"; 5 7 import { attach } from "../client.ts"; 6 8 import { 7 7 - listSessions, validateName, acquireLock, releaseLock, 9 9 + listSessions, acquireLock, releaseLock, 8 10 cleanupAll, getSession, getSessionDir, type SessionInfo, 9 11 } from "../sessions.ts"; 10 10 - import { spawnDaemon, resolveCommand } from "../spawn.ts"; 12 12 + import { spawnDaemon } from "../spawn.ts"; 11 13 import { matchesAllTags } from "../tags.ts"; 12 14 import { 13 15 app, screen, signal, computed, batch, 14 14 - text, row, spacer, panel, selectable, footer, canvas, 16 16 + text, panel, footer, 15 17 groupedSelectable, type SelectableGroup, 16 18 updateScrollRegion, themes, 17 19 type KeyEvent, type ScreenContext, type UINode, 18 20 } from "./index.ts"; 19 21 // Reuse utility functions from the existing screen modules 20 22 import { sortSessions, shortPath, timeAgo } from "./screen-list.ts"; 21 21 - import { dedupName, listDirs } from "./screen-create.ts"; 22 23 import { fuzzyMatch } from "./fuzzy.ts"; 23 24 24 24 - /** Generate a session name from dir and command. */ 25 25 - function autoName(dir: string, cmd: string, cmdArgs: string[]): string { 26 26 - const dirPart = path.basename(dir); 27 27 - const cmdBase = path.basename(cmd); 28 28 - const firstArg = cmdArgs.find(a => !a.startsWith("-") && a.length < 30); 29 29 - let cmdPart = cmdBase; 30 30 - if (firstArg) { 31 31 - const argBase = path.basename(firstArg).replace(/\.[^.]+$/, ""); 32 32 - if (argBase && /^[a-zA-Z0-9._-]+$/.test(argBase)) { 33 33 - cmdPart = `${cmdBase}-${argBase}`; 34 34 - } 35 35 - } 36 36 - const raw = `${dirPart}-${cmdPart}`; 37 37 - return raw.replace(/[^a-zA-Z0-9._-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, ""); 25 25 + /** Short random id matching src/cli.ts's randomSessionName — 8 chars of 26 26 + * Crockford-ish base32. Used when spawning sessions from the TUI where 27 27 + * the user didn't pick a name. */ 28 28 + function randomSessionName(): string { 29 29 + const alphabet = "23456789abcdefghjkmnpqrstuvwxyz"; 30 30 + const bytes = randomBytes(8); 31 31 + let out = ""; 32 32 + for (const b of bytes) out += alphabet[b % alphabet.length]; 33 33 + return out; 34 34 + } 35 35 + 36 36 + /** The directory the shell spawned from the TUI opens in. Defaults to the 37 37 + * user's home so "Create new session" is predictable regardless of where 38 38 + * the `pty` binary was invoked. */ 39 39 + function defaultCwd(): string { 40 40 + return process.env.HOME ?? os.homedir(); 41 41 + } 42 42 + 43 43 + /** The shell to spawn for a one-keystroke "Create new session". */ 44 44 + function defaultShell(): string { 45 45 + return process.env.SHELL ?? "bash"; 38 46 } 39 47 40 48 // ============================================================ ··· 44 52 const sessions = signal<SessionInfo[]>([]); 45 53 const filterText = signal(""); 46 54 const selectedIndex = signal(0); 47 47 - const currentScreen = signal<"list" | "create" | "remote-create">("list"); 48 55 49 56 /** Tag filter from `--filter-tag key=value`. Filters the list AND auto-applies 50 57 * to any session created from this TUI instance. */ ··· 78 85 function currentTheme() { 79 86 return themes[themeNames[themeIndex.get()]]; 80 87 } 81 81 - 82 82 - // Create wizard state 83 83 - const createStep = signal<"dir-initial" | "dir-browse" | "name-command">("dir-initial"); 84 84 - const cwdPath = signal(process.cwd()); 85 85 - const browsePath = signal(process.cwd()); 86 86 - const browseFilter = signal(""); 87 87 - const createSelectedIndex = signal(0); 88 88 - const sessionName = signal(""); 89 89 - const sessionCommand = signal(""); 90 90 - const nameManuallyEdited = signal(false); 91 91 - const focusedField = signal<"name" | "command">("command"); 92 92 - const existingNames = signal<Set<string>>(new Set()); 93 93 - 94 94 - // Remote create wizard state 95 95 - const remoteCreateHost = signal<RelayHost | null>(null); 96 96 - const remoteSessionName = signal(""); 97 97 - const remoteSessionCommand = signal("bash"); 98 98 - const remoteFocusedField = signal<"name" | "command">("name"); 99 88 100 89 // ============================================================ 101 90 // Relay integration ··· 417 406 const item = getItemAtIndex(idx); 418 407 if (!item) return true; 419 408 if (item.type === "create") { 420 420 - batch(() => { 421 421 - currentScreen.set("create"); 422 422 - createStep.set("dir-initial"); 423 423 - createSelectedIndex.set(0); 424 424 - existingNames.set(new Set(sessions.peek().map(s => s.name))); 425 425 - }); 409 409 + // One-keystroke local create: spawn the user's shell in $HOME with a 410 410 + // random id and no displayName. The user can `pty rename` and/or 411 411 + // `pty exec` from inside to promote it. 412 412 + doCreate(defaultCwd(), randomSessionName(), defaultShell()); 426 413 return true; 427 414 } 428 415 if (item.type === "remote-create" && item.remoteHost) { 429 429 - batch(() => { 430 430 - remoteCreateHost.set(item.remoteHost!); 431 431 - remoteSessionName.set(""); 432 432 - remoteSessionCommand.set("bash"); 433 433 - remoteFocusedField.set("name"); 434 434 - currentScreen.set("remote-create"); 435 435 - }); 416 416 + // One-keystroke remote create: ask pty-relay to spawn a shell on the 417 417 + // remote host with a random id. The relay is responsible for the 418 418 + // remote-side shell/cwd defaults. 419 419 + doSpawnRemote(item.remoteHost, randomSessionName()); 436 420 return true; 437 421 } 438 422 if (item.type === "remote" && item.remote) { ··· 476 460 }); 477 461 478 462 // ============================================================ 479 479 - // Create screen (multi-step wizard) 480 480 - // ============================================================ 481 481 - 482 482 - function renderDirInitialUI(ctx: ScreenContext): UINode[] { 483 483 - const cwd = cwdPath.get(); 484 484 - const idx = createSelectedIndex.get(); 485 485 - const items = [ 486 486 - { label: shortPath(cwd) + " (current directory)" }, 487 487 - { label: "Choose disk location\u2026" }, 488 488 - ]; 489 489 - const region = updateScrollRegion( 490 490 - { offset: 0, selectedIndex: idx, totalItems: items.length, viewportHeight: 10 }, 491 491 - items.length, 10, 492 492 - ); 493 493 - return [ 494 494 - panel("New Session \u2014 Choose Directory", [ 495 495 - selectable(region, items, (item, _i, selected) => [ 496 496 - text(selected ? " " + item.label : " " + item.label, 497 497 - selected ? "accent" : "primary", { bold: selected, truncate: true }), 498 498 - ]), 499 499 - ]), 500 500 - footer("\u2191\u2193 select \u23ce confirm esc back"), 501 501 - ]; 502 502 - } 503 503 - 504 504 - function renderDirBrowseUI(ctx: ScreenContext): UINode[] { 505 505 - const bp = browsePath.get(); 506 506 - const bf = browseFilter.get(); 507 507 - const dirs = listDirs(bp, bf); 508 508 - const idx = createSelectedIndex.get(); 509 509 - 510 510 - const items = [ 511 511 - { label: "[Select this directory]", dim: true }, 512 512 - { label: "..", dim: true }, 513 513 - ...dirs.map(d => ({ label: d + "/", dim: false })), 514 514 - ]; 515 515 - const region = updateScrollRegion( 516 516 - { offset: 0, selectedIndex: idx, totalItems: items.length, viewportHeight: Math.max(1, ctx.rows - 6) }, 517 517 - items.length, Math.max(1, ctx.rows - 6), 518 518 - ); 519 519 - 520 520 - const filterLine = bf 521 521 - ? text(" Filter: " + bf, "primary") 522 522 - : null; 523 523 - 524 524 - return [ 525 525 - panel("Browse \u2014 " + shortPath(bp), [ 526 526 - ...(filterLine ? [filterLine, text("", "muted")] : []), 527 527 - selectable(region, items, (item, _i, selected) => [ 528 528 - text(selected ? " " + item.label : " " + item.label, 529 529 - selected ? "accent" : (item.dim ? "muted" : "primary"), 530 530 - { bold: selected, truncate: true }), 531 531 - ]), 532 532 - ]), 533 533 - footer("\u2191\u2193 select \u23ce enter esc back type to filter"), 534 534 - ]; 535 535 - } 536 536 - 537 537 - function renderNameCommandUI(ctx: ScreenContext): UINode[] { 538 538 - const bp = browsePath.peek(); 539 539 - const cwd = cwdPath.peek(); 540 540 - const dir = bp !== cwd ? bp : cwd; 541 541 - const focused = focusedField.get(); 542 542 - const name = sessionName.get(); 543 543 - const cmd = sessionCommand.get(); 544 544 - 545 545 - return [ 546 546 - panel("New Session", [ 547 547 - text(" Directory: " + shortPath(dir), "muted"), 548 548 - text("", "muted"), 549 549 - row( 550 550 - text(" Name: ", focused === "name" ? "accent" : "muted", { bold: focused === "name" }), 551 551 - text(name + (focused === "name" ? "\u2588" : ""), "primary"), 552 552 - ), 553 553 - row( 554 554 - text(" Command: ", focused === "command" ? "accent" : "muted", { bold: focused === "command" }), 555 555 - text(cmd + (focused === "command" ? "\u2588" : ""), "primary"), 556 556 - ), 557 557 - canvas(() => {}, {}), // flex spacer 558 558 - ]), 559 559 - footer("\u21e5 switch field \u23ce create esc back"), 560 560 - ]; 561 561 - } 562 562 - 563 563 - const createScreen = screen({ 564 564 - id: "create", 565 565 - 566 566 - render(ctx: ScreenContext): UINode[] { 567 567 - const step = createStep.get(); 568 568 - if (step === "dir-initial") return renderDirInitialUI(ctx); 569 569 - if (step === "dir-browse") return renderDirBrowseUI(ctx); 570 570 - return renderNameCommandUI(ctx); 571 571 - }, 572 572 - 573 573 - handleKey(key: KeyEvent, _ctx: ScreenContext): boolean { 574 574 - const step = createStep.peek(); 575 575 - if (step === "dir-initial") return handleDirInitialKey(key); 576 576 - if (step === "dir-browse") return handleDirBrowseKey(key); 577 577 - return handleNameCommandKey(key); 578 578 - }, 579 579 - }); 580 580 - 581 581 - function handleDirInitialKey(key: KeyEvent): boolean { 582 582 - if (key.name === "up") { createSelectedIndex.set(0); return true; } 583 583 - if (key.name === "down") { createSelectedIndex.set(1); return true; } 584 584 - if (key.name === "return") { 585 585 - if (createSelectedIndex.peek() === 0) { 586 586 - batch(() => { 587 587 - createStep.set("name-command"); 588 588 - sessionName.set(dedupName(path.basename(cwdPath.peek()), existingNames.peek())); 589 589 - nameManuallyEdited.set(false); 590 590 - sessionCommand.set(""); 591 591 - }); 592 592 - } else { 593 593 - batch(() => { 594 594 - createStep.set("dir-browse"); 595 595 - browsePath.set(cwdPath.peek()); 596 596 - createSelectedIndex.set(0); 597 597 - browseFilter.set(""); 598 598 - }); 599 599 - } 600 600 - return true; 601 601 - } 602 602 - if (key.name === "escape" || (key.name === "c" && key.ctrl)) { 603 603 - batch(() => { currentScreen.set("list"); }); 604 604 - return true; 605 605 - } 606 606 - return true; 607 607 - } 608 608 - 609 609 - function handleDirBrowseKey(key: KeyEvent): boolean { 610 610 - const dirs = listDirs(browsePath.peek(), browseFilter.peek()); 611 611 - const totalItems = 2 + dirs.length; 612 612 - const idx = createSelectedIndex.peek(); 613 613 - 614 614 - if (key.name === "up") { createSelectedIndex.set(Math.max(0, idx - 1)); return true; } 615 615 - if (key.name === "down") { createSelectedIndex.set(Math.min(totalItems - 1, idx + 1)); return true; } 616 616 - if (key.name === "return") { 617 617 - if (idx === 0) { 618 618 - batch(() => { 619 619 - createStep.set("name-command"); 620 620 - sessionName.set(dedupName(path.basename(browsePath.peek()), existingNames.peek())); 621 621 - nameManuallyEdited.set(false); 622 622 - sessionCommand.set(""); 623 623 - }); 624 624 - } else if (idx === 1) { 625 625 - const parent = path.dirname(browsePath.peek()); 626 626 - if (parent !== browsePath.peek()) { 627 627 - batch(() => { browsePath.set(parent); createSelectedIndex.set(0); browseFilter.set(""); }); 628 628 - } 629 629 - } else { 630 630 - const dirName = dirs[idx - 2]; 631 631 - if (dirName) { 632 632 - batch(() => { 633 633 - browsePath.set(path.join(browsePath.peek(), dirName)); 634 634 - createSelectedIndex.set(0); 635 635 - browseFilter.set(""); 636 636 - }); 637 637 - } 638 638 - } 639 639 - return true; 640 640 - } 641 641 - if (key.name === "escape") { 642 642 - if (browseFilter.peek()) { 643 643 - batch(() => { browseFilter.set(""); createSelectedIndex.set(0); }); 644 644 - return true; 645 645 - } 646 646 - batch(() => { createStep.set("dir-initial"); createSelectedIndex.set(0); }); 647 647 - return true; 648 648 - } 649 649 - if (key.name === "c" && key.ctrl) { 650 650 - batch(() => { currentScreen.set("list"); }); 651 651 - return true; 652 652 - } 653 653 - if (key.name === "backspace") { 654 654 - if (browseFilter.peek().length > 0) { 655 655 - const newFilter = browseFilter.peek().slice(0, -1); 656 656 - const newDirs = listDirs(browsePath.peek(), newFilter); 657 657 - batch(() => { 658 658 - browseFilter.set(newFilter); 659 659 - createSelectedIndex.set(Math.min(idx, 1 + newDirs.length)); 660 660 - }); 661 661 - } 662 662 - return true; 663 663 - } 664 664 - if (key.char && !key.ctrl && !key.alt) { 665 665 - batch(() => { browseFilter.set(browseFilter.peek() + key.char); createSelectedIndex.set(2); }); 666 666 - return true; 667 667 - } 668 668 - return true; 669 669 - } 670 670 - 671 671 - function handleNameCommandKey(key: KeyEvent): boolean { 672 672 - if (key.name === "tab") { 673 673 - focusedField.set(focusedField.peek() === "name" ? "command" : "name"); 674 674 - return true; 675 675 - } 676 676 - if (key.name === "return") { 677 677 - const name = sessionName.peek().trim(); 678 678 - const cmd = sessionCommand.peek().trim(); 679 679 - if (name && cmd) { 680 680 - const dir = browsePath.peek() !== cwdPath.peek() ? browsePath.peek() : cwdPath.peek(); 681 681 - doCreate(dir, name, cmd); 682 682 - } 683 683 - return true; 684 684 - } 685 685 - if (key.name === "escape") { 686 686 - batch(() => { createStep.set("dir-initial"); createSelectedIndex.set(0); }); 687 687 - return true; 688 688 - } 689 689 - if (key.name === "c" && key.ctrl) { 690 690 - batch(() => { currentScreen.set("list"); }); 691 691 - return true; 692 692 - } 693 693 - if (key.name === "backspace") { 694 694 - if (focusedField.peek() === "name") { 695 695 - nameManuallyEdited.set(true); 696 696 - sessionName.set(sessionName.peek().slice(0, -1)); 697 697 - } else { 698 698 - sessionCommand.set(sessionCommand.peek().slice(0, -1)); 699 699 - regenerateNameIfAuto(); 700 700 - } 701 701 - return true; 702 702 - } 703 703 - if (key.char && !key.ctrl && !key.alt) { 704 704 - if (focusedField.peek() === "name") { 705 705 - nameManuallyEdited.set(true); 706 706 - sessionName.set(sessionName.peek() + key.char); 707 707 - } else { 708 708 - sessionCommand.set(sessionCommand.peek() + key.char); 709 709 - regenerateNameIfAuto(); 710 710 - } 711 711 - return true; 712 712 - } 713 713 - return true; 714 714 - } 715 715 - 716 716 - function regenerateNameIfAuto(): void { 717 717 - if (nameManuallyEdited.peek()) return; 718 718 - const dir = browsePath.peek() !== cwdPath.peek() ? browsePath.peek() : cwdPath.peek(); 719 719 - const cmd = sessionCommand.peek().trim(); 720 720 - if (!cmd) { 721 721 - sessionName.set(dedupName(path.basename(dir), existingNames.peek())); 722 722 - return; 723 723 - } 724 724 - const parts = cmd.split(/\s+/); 725 725 - const name = autoName(dir, parts[0], parts.slice(1)); 726 726 - sessionName.set(dedupName(name, existingNames.peek())); 727 727 - } 728 728 - 729 729 - // ============================================================ 730 463 // Attach / Create 731 464 // ============================================================ 732 465 ··· 768 501 refreshRelayHosts(); 769 502 batch(() => { 770 503 sessions.set(updated); 771 771 - currentScreen.set("list"); 772 504 filterText.set(""); 773 505 const maxIdx = Math.max(0, totalItems.get() - 1); 774 506 if (selectedIndex.peek() > maxIdx) selectedIndex.set(maxIdx); ··· 803 535 refreshRelayHosts(); 804 536 batch(() => { 805 537 sessions.set(updated); 806 806 - currentScreen.set("list"); 807 538 filterText.set(""); 808 539 const maxIdx = Math.max(0, totalItems.get() - 1); 809 540 if (selectedIndex.peek() > maxIdx) selectedIndex.set(maxIdx); ··· 820 551 const updated = await listSessions(); 821 552 batch(() => { 822 553 sessions.set(updated); 823 823 - currentScreen.set("list"); 824 554 filterText.set(""); 825 555 const maxIdx = Math.max(0, totalItems.get() - 1); 826 556 if (selectedIndex.peek() > maxIdx) selectedIndex.set(maxIdx); ··· 833 563 const updated = await listSessions(); 834 564 batch(() => { 835 565 sessions.set(updated); 836 836 - currentScreen.set("list"); 837 566 filterText.set(""); 838 567 const maxIdx = Math.max(0, totalItems.get() - 1); 839 568 if (selectedIndex.peek() > maxIdx) selectedIndex.set(maxIdx); ··· 843 572 }); 844 573 } 845 574 846 846 - async function doCreate(dir: string, name: string, command: string): Promise<void> { 575 575 + /** Spawn a new local session with the given shell in the given cwd. Used 576 576 + * by the one-keystroke "Create new session" path; name is a random id 577 577 + * generated by the caller. */ 578 578 + async function doCreate(dir: string, name: string, shell: string): Promise<void> { 847 579 myApp?.pause(); 848 580 849 849 - try { 850 850 - validateName(name); 851 851 - } catch (e: any) { 852 852 - console.error(e.message); 853 853 - const updated = await listSessions(); 854 854 - sessions.set(updated); 855 855 - currentScreen.set("list"); 856 856 - myApp?.resume(); 857 857 - return; 858 858 - } 859 859 - 860 860 - let existing; 861 861 - try { 862 862 - existing = await getSession(name); 863 863 - } catch { 864 864 - existing = null; 865 865 - } 866 866 - 867 867 - if (existing?.status === "running") { 868 868 - doAttach(name); 869 869 - return; 870 870 - } 871 871 - 581 581 + // Random names come from randomSessionName() — no collision check needed, 582 582 + // but we still acquireLock to guard against multi-process races during 583 583 + // creation. 872 584 if (!acquireLock(name)) { 873 585 console.error(`Session "${name}" is being created by another process.`); 874 586 const updated = await listSessions(); 875 587 sessions.set(updated); 876 876 - currentScreen.set("list"); 877 588 myApp?.resume(); 878 589 return; 879 590 } 880 591 881 881 - if (existing?.status === "exited") { 882 882 - cleanupAll(name); 883 883 - } 884 884 - 885 885 - // Spawn via sh -c so the command field supports quotes, pipes, env vars, etc. 886 886 - const shellCmd = "/bin/sh"; 887 887 - const shellArgs = ["-c", command]; 888 888 - 889 592 // Auto-apply --filter-tag tags so the new session stays in the layout. 890 593 const tags = filterTags.peek(); 891 891 - const spawnOpts = { name, command: shellCmd, args: shellArgs, displayCommand: command, cwd: dir, ...(Object.keys(tags).length > 0 ? { tags } : {}) }; 594 594 + // displayName intentionally unset — matches `pty run --no-display-name`. 595 595 + // Users run `pty rename` / `pty exec` from inside to promote it. 596 596 + const spawnOpts = { 597 597 + name, 598 598 + command: shell, 599 599 + args: [] as string[], 600 600 + displayCommand: shell, 601 601 + cwd: dir, 602 602 + ...(Object.keys(tags).length > 0 ? { tags } : {}), 603 603 + }; 892 604 893 605 try { 894 606 await spawnDaemon(spawnOpts); ··· 897 609 console.error(e.message); 898 610 const updated = await listSessions(); 899 611 sessions.set(updated); 900 900 - currentScreen.set("list"); 901 612 myApp?.resume(); 902 613 return; 903 614 } finally { ··· 908 619 } 909 620 910 621 // ============================================================ 911 911 - // Remote create screen 912 912 - // ============================================================ 913 913 - 914 914 - const remoteCreateScreen = screen({ 915 915 - id: "remote-create", 916 916 - 917 917 - render(_ctx: ScreenContext): UINode[] { 918 918 - const host = remoteCreateHost.get(); 919 919 - if (!host) return [text("No host selected", "error")]; 920 920 - 921 921 - const name = remoteSessionName.get(); 922 922 - 923 923 - return [ 924 924 - panel(`Spawn on ${host.label}`, [ 925 925 - text("", "muted"), 926 926 - text(" Session name: " + name + "\u2588", "primary"), 927 927 - text("", "muted"), 928 928 - text(" Enter to spawn, Escape to cancel", "muted", { dim: true }), 929 929 - ]), 930 930 - ]; 931 931 - }, 932 932 - 933 933 - handleKey(key: KeyEvent, _ctx: ScreenContext): boolean { 934 934 - if (key.name === "escape") { 935 935 - batch(() => { 936 936 - currentScreen.set("list"); 937 937 - remoteCreateHost.set(null); 938 938 - }); 939 939 - return true; 940 940 - } 941 941 - 942 942 - if (key.name === "return") { 943 943 - const host = remoteCreateHost.peek(); 944 944 - const name = remoteSessionName.peek().trim(); 945 945 - if (!host || !name) return true; 946 946 - doSpawnRemote(host, name); 947 947 - return true; 948 948 - } 949 949 - 950 950 - if (key.name === "backspace") { 951 951 - remoteSessionName.set(remoteSessionName.peek().slice(0, -1)); 952 952 - return true; 953 953 - } 954 954 - 955 955 - if (key.char && !key.ctrl && !key.alt) { 956 956 - remoteSessionName.set(remoteSessionName.peek() + key.char); 957 957 - return true; 958 958 - } 959 959 - 960 960 - return true; 961 961 - }, 962 962 - }); 963 963 - 964 964 - // ============================================================ 965 622 // Entry point 966 623 // ============================================================ 967 624 ··· 999 656 refreshRelayHosts(); 1000 657 1001 658 myApp = app({ 1002 1002 - screen: () => { 1003 1003 - const s = currentScreen.get(); 1004 1004 - if (s === "remote-create") return remoteCreateScreen; 1005 1005 - if (s === "create") return createScreen; 1006 1006 - return listScreen; 1007 1007 - }, 659 659 + screen: () => listScreen, 1008 660 theme: () => currentTheme(), 1009 661 onKey: (key) => { 1010 662 if (key.name === "g" && key.ctrl) { cycleTheme(); return true; }

-396

src/tui/screen-create.ts

Reviewed

··· 1 1 - import * as fs from "node:fs"; 2 2 - import * as os from "node:os"; 3 3 - import * as path from "node:path"; 4 4 - import type { KeyEvent } from "./input.ts"; 5 5 - import { 6 6 - moveTo, 7 7 - drawBox, 8 8 - bold, 9 9 - dim, 10 10 - inverse, 11 11 - truncate, 12 12 - pad, 13 13 - } from "./render.ts"; 14 14 - 15 15 - export interface CreateAction { 16 16 - type: "create" | "cancel" | "none"; 17 17 - dir?: string; 18 18 - name?: string; 19 19 - command?: string; 20 20 - } 21 21 - 22 22 - export type CreateStep = "dir-initial" | "dir-browse" | "name-command"; 23 23 - 24 24 - export interface CreateState { 25 25 - step: CreateStep; 26 26 - // Dir picker 27 27 - selectedIndex: number; 28 28 - cwdPath: string; 29 29 - browsePath: string; 30 30 - browseFilter: string; 31 31 - // Name + command 32 32 - name: string; 33 33 - command: string; 34 34 - focusedField: "name" | "command"; 35 35 - // Layout 36 36 - termWidth: number; 37 37 - termHeight: number; 38 38 - // For dedup 39 39 - existingNames: Set<string>; 40 40 - } 41 41 - 42 42 - export function createCreateState( 43 43 - termWidth: number, 44 44 - termHeight: number, 45 45 - existingNames: string[] 46 46 - ): CreateState { 47 47 - const cwdPath = process.cwd(); 48 48 - return { 49 49 - step: "dir-initial", 50 50 - selectedIndex: 0, 51 51 - cwdPath, 52 52 - browsePath: cwdPath, 53 53 - browseFilter: "", 54 54 - name: path.basename(cwdPath), 55 55 - command: "", 56 56 - focusedField: "command", 57 57 - termWidth, 58 58 - termHeight, 59 59 - existingNames: new Set(existingNames), 60 60 - }; 61 61 - } 62 62 - 63 63 - function shortPath(p: string): string { 64 64 - const home = os.homedir(); 65 65 - if (p === home) return "~"; 66 66 - if (p.startsWith(home + "/")) return "~" + p.slice(home.length); 67 67 - return p; 68 68 - } 69 69 - 70 70 - export function dedupName(base: string, existing: Set<string>): string { 71 71 - if (!existing.has(base)) return base; 72 72 - for (let i = 2; ; i++) { 73 73 - const candidate = `${base}-${i}`; 74 74 - if (!existing.has(candidate)) return candidate; 75 75 - } 76 76 - } 77 77 - 78 78 - export function listDirs(dirPath: string, filter: string): string[] { 79 79 - let entries: fs.Dirent[]; 80 80 - try { 81 81 - entries = fs.readdirSync(dirPath, { withFileTypes: true }); 82 82 - } catch { 83 83 - return []; 84 84 - } 85 85 - const dirs = entries 86 86 - .filter((e) => { 87 87 - if (e.name.startsWith(".")) return false; 88 88 - if (e.isDirectory()) return true; 89 89 - // Follow symlinks — include if target is a directory 90 90 - if (e.isSymbolicLink()) { 91 91 - try { 92 92 - const target = fs.statSync(path.join(dirPath, e.name)); 93 93 - return target.isDirectory(); 94 94 - } catch { 95 95 - return false; // broken symlink 96 96 - } 97 97 - } 98 98 - return false; 99 99 - }) 100 100 - .map((e) => e.name) 101 101 - .sort(); 102 102 - if (!filter) return dirs; 103 103 - const lf = filter.toLowerCase(); 104 104 - return dirs.filter((d) => d.toLowerCase().includes(lf)); 105 105 - } 106 106 - 107 107 - export function handleCreateKey(state: CreateState, key: KeyEvent): CreateAction { 108 108 - switch (state.step) { 109 109 - case "dir-initial": 110 110 - return handleDirInitial(state, key); 111 111 - case "dir-browse": 112 112 - return handleDirBrowse(state, key); 113 113 - case "name-command": 114 114 - return handleNameCommand(state, key); 115 115 - } 116 116 - } 117 117 - 118 118 - function handleDirInitial(state: CreateState, key: KeyEvent): CreateAction { 119 119 - // Two items: 0 = cwd, 1 = "Choose disk location..." 120 120 - if (key.name === "up") { 121 121 - state.selectedIndex = 0; 122 122 - return { type: "none" }; 123 123 - } 124 124 - if (key.name === "down") { 125 125 - state.selectedIndex = 1; 126 126 - return { type: "none" }; 127 127 - } 128 128 - if (key.name === "return") { 129 129 - if (state.selectedIndex === 0) { 130 130 - // Use cwd 131 131 - state.step = "name-command"; 132 132 - state.name = dedupName(path.basename(state.cwdPath), state.existingNames); 133 133 - return { type: "none" }; 134 134 - } else { 135 135 - // Browse 136 136 - state.step = "dir-browse"; 137 137 - state.browsePath = state.cwdPath; 138 138 - state.selectedIndex = 0; 139 139 - state.browseFilter = ""; 140 140 - return { type: "none" }; 141 141 - } 142 142 - } 143 143 - if (key.name === "escape" || (key.name === "c" && key.ctrl)) { 144 144 - return { type: "cancel" }; 145 145 - } 146 146 - return { type: "none" }; 147 147 - } 148 148 - 149 149 - function handleDirBrowse(state: CreateState, key: KeyEvent): CreateAction { 150 150 - const dirs = listDirs(state.browsePath, state.browseFilter); 151 151 - // Items: [Select this directory], .., ...dirs 152 152 - const totalItems = 2 + dirs.length; 153 153 - 154 154 - if (key.name === "up") { 155 155 - state.selectedIndex = Math.max(0, state.selectedIndex - 1); 156 156 - return { type: "none" }; 157 157 - } 158 158 - if (key.name === "down") { 159 159 - state.selectedIndex = Math.min(totalItems - 1, state.selectedIndex + 1); 160 160 - return { type: "none" }; 161 161 - } 162 162 - if (key.name === "return") { 163 163 - if (state.selectedIndex === 0) { 164 164 - // Select this directory 165 165 - state.step = "name-command"; 166 166 - state.name = dedupName(path.basename(state.browsePath), state.existingNames); 167 167 - return { type: "none" }; 168 168 - } 169 169 - if (state.selectedIndex === 1) { 170 170 - // .. 171 171 - const parent = path.dirname(state.browsePath); 172 172 - if (parent !== state.browsePath) { 173 173 - state.browsePath = parent; 174 174 - state.selectedIndex = 0; 175 175 - state.browseFilter = ""; 176 176 - } 177 177 - return { type: "none" }; 178 178 - } 179 179 - // Navigate into a directory 180 180 - const dirName = dirs[state.selectedIndex - 2]; 181 181 - if (dirName) { 182 182 - state.browsePath = path.join(state.browsePath, dirName); 183 183 - state.selectedIndex = 0; 184 184 - state.browseFilter = ""; 185 185 - } 186 186 - return { type: "none" }; 187 187 - } 188 188 - if (key.name === "escape") { 189 189 - if (state.browseFilter) { 190 190 - state.browseFilter = ""; 191 191 - state.selectedIndex = 0; 192 192 - return { type: "none" }; 193 193 - } 194 194 - state.step = "dir-initial"; 195 195 - state.selectedIndex = 0; 196 196 - return { type: "none" }; 197 197 - } 198 198 - if (key.name === "c" && key.ctrl) { 199 199 - return { type: "cancel" }; 200 200 - } 201 201 - if (key.name === "backspace") { 202 202 - if (state.browseFilter.length > 0) { 203 203 - state.browseFilter = state.browseFilter.slice(0, -1); 204 204 - state.selectedIndex = Math.min(state.selectedIndex, 1 + listDirs(state.browsePath, state.browseFilter).length); 205 205 - } 206 206 - return { type: "none" }; 207 207 - } 208 208 - // Typing — filter directories 209 209 - if (key.char && !key.ctrl && !key.alt) { 210 210 - state.browseFilter += key.char; 211 211 - state.selectedIndex = 2; // Jump to first directory match 212 212 - return { type: "none" }; 213 213 - } 214 214 - return { type: "none" }; 215 215 - } 216 216 - 217 217 - function handleNameCommand(state: CreateState, key: KeyEvent): CreateAction { 218 218 - if (key.name === "tab") { 219 219 - state.focusedField = state.focusedField === "name" ? "command" : "name"; 220 220 - return { type: "none" }; 221 221 - } 222 222 - if (key.name === "return") { 223 223 - if (state.name.trim() && state.command.trim()) { 224 224 - const dir = state.step === "name-command" 225 225 - ? (state.browsePath !== state.cwdPath ? state.browsePath : state.cwdPath) 226 226 - : state.cwdPath; 227 227 - return { 228 228 - type: "create", 229 229 - dir, 230 230 - name: state.name.trim(), 231 231 - command: state.command.trim(), 232 232 - }; 233 233 - } 234 234 - return { type: "none" }; 235 235 - } 236 236 - if (key.name === "escape") { 237 237 - state.step = "dir-initial"; 238 238 - state.selectedIndex = 0; 239 239 - return { type: "none" }; 240 240 - } 241 241 - if (key.name === "c" && key.ctrl) { 242 242 - return { type: "cancel" }; 243 243 - } 244 244 - 245 245 - // Text editing for focused field 246 246 - const field = state.focusedField; 247 247 - if (key.name === "backspace") { 248 248 - if (field === "name") { 249 249 - state.name = state.name.slice(0, -1); 250 250 - } else { 251 251 - state.command = state.command.slice(0, -1); 252 252 - } 253 253 - return { type: "none" }; 254 254 - } 255 255 - if (key.char && !key.ctrl && !key.alt) { 256 256 - if (field === "name") { 257 257 - state.name += key.char; 258 258 - } else { 259 259 - state.command += key.char; 260 260 - } 261 261 - return { type: "none" }; 262 262 - } 263 263 - return { type: "none" }; 264 264 - } 265 265 - 266 266 - export function renderCreate(state: CreateState): string { 267 267 - switch (state.step) { 268 268 - case "dir-initial": 269 269 - return renderDirInitial(state); 270 270 - case "dir-browse": 271 271 - return renderDirBrowse(state); 272 272 - case "name-command": 273 273 - return renderNameCommand(state); 274 274 - } 275 275 - } 276 276 - 277 277 - function renderDirInitial(state: CreateState): string { 278 278 - const { termWidth, termHeight } = state; 279 279 - const boxWidth = Math.min(Math.max(40, termWidth - 4), termWidth - 2); 280 280 - const boxCol = Math.max(1, Math.floor((termWidth - boxWidth) / 2) + 1); 281 281 - const boxHeight = 8; 282 282 - const boxRow = Math.max(1, Math.floor((termHeight - boxHeight - 1) / 2) + 1); 283 283 - const contentWidth = boxWidth - 4; 284 284 - 285 285 - let out = drawBox(boxRow, boxCol, boxWidth, boxHeight, bold("New Session \u2014 Choose Directory")); 286 286 - 287 287 - let row = boxRow + 2; 288 288 - // Build items as plain text first, then style 289 289 - const cwdText = shortPath(state.cwdPath); 290 290 - const plainItems = [ 291 291 - ` ${cwdText} (current directory)`, 292 292 - ` Choose disk location\u2026`, 293 293 - ]; 294 294 - const styledItems = [ 295 295 - ` ${cwdText} ${dim("(current directory)")}`, 296 296 - ` Choose disk location\u2026`, 297 297 - ]; 298 298 - for (let i = 0; i < plainItems.length; i++) { 299 299 - const plain = pad(truncate(plainItems[i], contentWidth), contentWidth); 300 300 - // Rebuild styled version with correct padding 301 301 - const styled = styledItems[i]; 302 302 - const padAmount = contentWidth - plainItems[i].length; 303 303 - const paddedStyled = padAmount > 0 ? styled + " ".repeat(padAmount) : styled; 304 304 - out += moveTo(row, boxCol + 2) + (i === state.selectedIndex ? inverse(paddedStyled) : paddedStyled); 305 305 - row++; 306 306 - } 307 307 - 308 308 - const footerRow = boxRow + boxHeight; 309 309 - out += moveTo(footerRow, boxCol + 1) + dim("\u2191\u2193 select \u23ce confirm \u238b back"); 310 310 - 311 311 - return out; 312 312 - } 313 313 - 314 314 - function renderDirBrowse(state: CreateState): string { 315 315 - const { termWidth, termHeight } = state; 316 316 - const boxWidth = Math.min(Math.max(40, termWidth - 4), termWidth - 2); 317 317 - const boxCol = Math.max(1, Math.floor((termWidth - boxWidth) / 2) + 1); 318 318 - const contentWidth = boxWidth - 4; 319 319 - 320 320 - const dirs = listDirs(state.browsePath, state.browseFilter); 321 321 - const maxItems = Math.min(dirs.length + 2, termHeight - 6); 322 322 - const boxHeight = Math.max(8, maxItems + 5); 323 323 - const boxRow = Math.max(1, Math.floor((termHeight - boxHeight - 1) / 2) + 1); 324 324 - 325 325 - let out = drawBox(boxRow, boxCol, boxWidth, boxHeight, bold("Browse \u2014 " + shortPath(state.browsePath))); 326 326 - 327 327 - let row = boxRow + 1; 328 328 - 329 329 - // Filter line 330 330 - if (state.browseFilter) { 331 331 - row++; 332 332 - out += moveTo(row, boxCol + 2) + `Filter: ${state.browseFilter}`; 333 333 - } 334 334 - 335 335 - row++; 336 336 - 337 337 - // Fixed items — build plain first, style after 338 338 - const plainFixed = [ 339 339 - " [Select this directory]", 340 340 - " ..", 341 341 - ]; 342 342 - const styledFixed = [ 343 343 - ` ${dim("[Select this directory]")}`, 344 344 - ` ${dim("..")}`, 345 345 - ]; 346 346 - for (let i = 0; i < plainFixed.length; i++) { 347 347 - row++; 348 348 - const padAmount = Math.max(0, contentWidth - plainFixed[i].length); 349 349 - const line = styledFixed[i] + " ".repeat(padAmount); 350 350 - out += moveTo(row, boxCol + 2) + (i === state.selectedIndex ? inverse(line) : line); 351 351 - } 352 352 - 353 353 - // Directory entries 354 354 - const visibleDirs = dirs.slice(0, boxHeight - 7); 355 355 - for (let i = 0; i < visibleDirs.length; i++) { 356 356 - row++; 357 357 - const actualIndex = i + 2; 358 358 - const line = pad(` ${visibleDirs[i]}/`, contentWidth); 359 359 - out += moveTo(row, boxCol + 2) + (actualIndex === state.selectedIndex ? inverse(line) : line); 360 360 - } 361 361 - 362 362 - const footerRow = boxRow + boxHeight; 363 363 - out += moveTo(footerRow, boxCol + 1) + dim("\u2191\u2193 select \u23ce enter \u238b back type to filter"); 364 364 - 365 365 - return out; 366 366 - } 367 367 - 368 368 - function renderNameCommand(state: CreateState): string { 369 369 - const { termWidth, termHeight } = state; 370 370 - const boxWidth = Math.min(Math.max(40, termWidth - 4), termWidth - 2); 371 371 - const boxCol = Math.max(1, Math.floor((termWidth - boxWidth) / 2) + 1); 372 372 - const boxHeight = 10; 373 373 - const boxRow = Math.max(1, Math.floor((termHeight - boxHeight - 1) / 2) + 1); 374 374 - 375 375 - const dir = state.browsePath !== state.cwdPath ? state.browsePath : state.cwdPath; 376 376 - 377 377 - let out = drawBox(boxRow, boxCol, boxWidth, boxHeight, bold("New Session")); 378 378 - 379 379 - let row = boxRow + 2; 380 380 - out += moveTo(row, boxCol + 2) + `Directory: ${dim(shortPath(dir))}`; 381 381 - 382 382 - row += 2; 383 383 - const nameLabel = "Name: "; 384 384 - const nameValue = state.name + (state.focusedField === "name" ? "\u2588" : ""); 385 385 - out += moveTo(row, boxCol + 2) + (state.focusedField === "name" ? bold(nameLabel) : nameLabel) + nameValue; 386 386 - 387 387 - row++; 388 388 - const cmdLabel = "Command: "; 389 389 - const cmdValue = state.command + (state.focusedField === "command" ? "\u2588" : ""); 390 390 - out += moveTo(row, boxCol + 2) + (state.focusedField === "command" ? bold(cmdLabel) : cmdLabel) + cmdValue; 391 391 - 392 392 - const footerRow = boxRow + boxHeight; 393 393 - out += moveTo(footerRow, boxCol + 1) + dim("\u21e5 switch field \u23ce create \u238b back"); 394 394 - 395 395 - return out; 396 396 - }

+33 -101

tests/tui.test.ts

Reviewed

··· 335 335 ); 336 336 337 337 it( 338 338 - "--filter-tag auto-applies the tag to sessions created from the TUI", 338 338 + "--filter-tag auto-applies the tag to sessions created from the TUI (one-keystroke create)", 339 339 async () => { 340 340 const sessionDir = makeSessionDir(); 341 341 ··· 346 346 }); 347 347 tuiSessions.push(tui); 348 348 349 349 - // Create item is preselected; walk the wizard 350 350 - await tui.waitForText("#role=web", 10000); // filter line visible 349 349 + // Create item is preselected; a single Enter now spawns the shell 350 350 + // directly — no prompts. 351 351 + await tui.waitForText("#role=web", 10000); 351 352 tui.press("return"); 352 352 - await tui.waitForText("Choose Directory", 5000); 353 353 - tui.press("return"); // use current directory 354 354 - await tui.waitForText("Name:", 5000); 355 355 - tui.type("cat"); 356 356 - await new Promise((r) => setTimeout(r, 200)); 357 357 - tui.press("return"); // create 358 353 359 359 - // Wait for the session metadata file to appear and contain the tag 354 354 + // Wait for the session metadata file to appear with the tag applied. 360 355 const start = Date.now(); 361 356 let found: any = null; 362 357 while (Date.now() - start < 5000) { ··· 364 359 for (const e of entries) { 365 360 try { 366 361 const meta = JSON.parse(fs.readFileSync(path.join(sessionDir, e), "utf-8")); 367 367 - if (meta.tags?.role === "web") { 368 368 - found = meta; 369 369 - break; 370 370 - } 362 362 + if (meta.tags?.role === "web") { found = meta; break; } 371 363 } catch {} 372 364 } 373 365 if (found) break; ··· 375 367 } 376 368 expect(found).not.toBeNull(); 377 369 expect(found.tags.role).toBe("web"); 370 370 + // No displayName should be set — the "new anonymous" flow matches 371 371 + // pty run --no-display-name. 372 372 + expect(found.displayName).toBeUndefined(); 378 373 379 379 - // Clean up the spawned session 380 374 const pidFiles = fs.readdirSync(sessionDir).filter((f) => f.endsWith(".pid")); 381 375 for (const p of pidFiles) { 382 376 try { ··· 554 548 ); 555 549 556 550 it( 557 557 - "create wizard: shows directory picker", 558 558 - async () => { 559 559 - const sessionDir = makeSessionDir(); 560 560 - const tui = createTuiSession(sessionDir); 561 561 - 562 562 - await tui.waitForText("Create new session...", 10000); 563 563 - tui.press("return"); 564 564 - 565 565 - const ss = await tui.waitForText("Choose Directory", 5000); 566 566 - expect(ss.text).toContain("current directory"); 567 567 - }, 568 568 - 15000 569 569 - ); 570 570 - 571 571 - it( 572 572 - "create wizard: name auto-fills from directory", 573 573 - async () => { 574 574 - const sessionDir = makeSessionDir(); 575 575 - const tui = createTuiSession(sessionDir); 576 576 - 577 577 - await tui.waitForText("Create new session...", 10000); 578 578 - tui.press("return"); 579 579 - await tui.waitForText("Choose Directory", 5000); 580 580 - tui.press("return"); 581 581 - 582 582 - const ss = await tui.waitForText("Name:", 5000); 583 583 - expect(ss.text).toContain("Command:"); 584 584 - }, 585 585 - 15000 586 586 - ); 587 587 - 588 588 - it( 589 589 - "create wizard: name updates as command is typed", 590 590 - async () => { 591 591 - const sessionDir = makeSessionDir(); 592 592 - const tui = createTuiSession(sessionDir); 593 593 - 594 594 - await tui.waitForText("Create new session...", 10000); 595 595 - tui.press("return"); 596 596 - await tui.waitForText("Choose Directory", 5000); 597 597 - tui.press("return"); 598 598 - await tui.waitForText("Name:", 5000); 599 599 - 600 600 - // Name should start as the directory basename 601 601 - let ss = tui.screenshot(); 602 602 - const nameLine = ss.lines.find(l => l.includes("Name:")); 603 603 - expect(nameLine).toBeDefined(); 604 604 - 605 605 - // Type a command — the name should auto-update to include it 606 606 - tui.type("node server.js"); 607 607 - await new Promise(r => setTimeout(r, 300)); 608 608 - 609 609 - ss = tui.screenshot(); 610 610 - const updatedName = ss.lines.find(l => l.includes("Name:")); 611 611 - expect(updatedName).toBeDefined(); 612 612 - // Should contain "node-server" somewhere in the name field 613 613 - expect(updatedName).toMatch(/node-server/i); 614 614 - }, 615 615 - 15000 616 616 - ); 617 617 - 618 618 - it( 619 619 - "create wizard: manually edited name is not overwritten by command typing", 551 551 + "Enter on 'Create new session...' spawns a shell with a random id and no displayName", 620 552 async () => { 621 553 const sessionDir = makeSessionDir(); 622 554 const tui = createTuiSession(sessionDir); 623 555 624 556 await tui.waitForText("Create new session...", 10000); 625 557 tui.press("return"); 626 626 - await tui.waitForText("Choose Directory", 5000); 627 627 - tui.press("return"); 628 628 - await tui.waitForText("Name:", 5000); 629 558 630 630 - // Tab to name field, type a custom name 631 631 - tui.press("tab"); 632 632 - await new Promise(r => setTimeout(r, 200)); 633 633 - // Clear auto-filled name and type custom 634 634 - for (let i = 0; i < 30; i++) tui.press("backspace"); 635 635 - await new Promise(r => setTimeout(r, 200)); 636 636 - tui.type("custom"); 637 637 - await new Promise(r => setTimeout(r, 200)); 559 559 + // Wait for a session metadata file to materialize; verify it has 560 560 + // no displayName and a random-looking name. 561 561 + const start = Date.now(); 562 562 + let meta: any = null; 563 563 + while (Date.now() - start < 5000) { 564 564 + const entries = fs.readdirSync(sessionDir).filter((f) => f.endsWith(".json")); 565 565 + if (entries.length > 0) { 566 566 + try { meta = JSON.parse(fs.readFileSync(path.join(sessionDir, entries[0]), "utf-8")); } catch {} 567 567 + if (meta) break; 568 568 + } 569 569 + await new Promise((r) => setTimeout(r, 100)); 570 570 + } 571 571 + expect(meta).not.toBeNull(); 572 572 + expect(meta.displayName).toBeUndefined(); 638 573 639 639 - // Tab back to command and type something 640 640 - tui.press("tab"); 641 641 - await new Promise(r => setTimeout(r, 200)); 642 642 - tui.type("echo hi"); 643 643 - await new Promise(r => setTimeout(r, 300)); 644 644 - 645 645 - // Name should still be "custom", not auto-generated 646 646 - const ss = tui.screenshot(); 647 647 - const nameLine = ss.lines.find(l => l.includes("Name:")); 648 648 - expect(nameLine).toContain("custom"); 649 649 - expect(nameLine).not.toContain("echo"); 574 574 + // Record the spawned session pid for cleanup 575 575 + const pidFiles = fs.readdirSync(sessionDir).filter((f) => f.endsWith(".pid")); 576 576 + for (const p of pidFiles) { 577 577 + try { 578 578 + const pid = parseInt(fs.readFileSync(path.join(sessionDir, p), "utf-8").trim(), 10); 579 579 + bgPids.push(pid); 580 580 + } catch {} 581 581 + } 650 582 }, 651 651 - 15000 583 583 + 20000 652 584 ); 653 585 654 586 it(