New sessions land on top unless created inside a group; prompt tracks current dir relative to workspaces root

server/src/runner.js

@@ -247,11 +247,12 @@ export function attach(session, cols, rows) {
       '-e', `AM_SESSION=${folder}`,
       '-e', `AM_NAME=${session.name}`,
       '-e', `AM_USER=${AM_USER}`,
+      '-e', `AM_ROOT=${WORKSPACES_DIR}`, // prompt shows $PWD relative to this
       'sh', '-lc', full,
     );
     term = pty.spawn('tmux', args, { name: 'xterm-256color', cols, rows, cwd: workdir, env: TERM_ENV });
   } else {
-    const env = { ...TERM_ENV, AM_SESSION: folder, AM_NAME: session.name, AM_USER };
+    const env = { ...TERM_ENV, AM_SESSION: folder, AM_NAME: session.name, AM_USER, AM_ROOT: WORKSPACES_DIR };
     term = pty.spawn('bash', ['-lc', full], { name: 'xterm-256color', cols, rows, cwd: workdir, env });
   }
 

session.bashrc

@@ -3,8 +3,23 @@
 [ -f /etc/bash.bashrc ] && . /etc/bash.bashrc
 
 AM_USER="${AM_USER:-${SPACE_AUTHOR_NAME:-user}}"
-AM_SESSION="${AM_SESSION:-session}"
 
-# Prompt: "user/session $" — colors come from the (theme-tuned) ANSI palette,
-# bold cyan user + bold green session, readable on both light and dark backgrounds.
-PS1='\[\e[1;36m\]'"${AM_USER}"'\[\e[0;2m\]/\[\e[0m\]\[\e[1;32m\]'"${AM_SESSION}"'\[\e[0;2m\] \$\[\e[0m\] '
+# The prompt's location segment: the CURRENT directory, shown relative to the
+# workspaces root (AM_ROOT, exported by the manager) so it starts as the
+# session's folder and follows you as you cd around. Falls back to ~-style
+# for anything outside the workspace tree.
+_am_pwd() {
+  local root="${AM_ROOT:-/data/workspaces}"
+  case "$PWD" in
+    "$root")     printf 'workspaces' ;;
+    "$root"/*)   printf '%s' "${PWD#"$root"/}" ;;
+    "$HOME")     printf '~' ;;
+    "$HOME"/*)   printf '~/%s' "${PWD#"$HOME"/}" ;;
+    *)           printf '%s' "$PWD" ;;
+  esac
+}
+
+# Prompt: "user/current-dir $" — colors come from the (theme-tuned) ANSI
+# palette, bold cyan user + bold green location, readable on both light and
+# dark backgrounds. $(_am_pwd) is single-quoted so it re-evaluates per prompt.
+PS1='\[\e[1;36m\]'"${AM_USER}"'\[\e[0;2m\]/\[\e[0m\]\[\e[1;32m\]$(_am_pwd)\[\e[0;2m\] \$\[\e[0m\] '

web/src/App.tsx

@@ -93,12 +93,18 @@ export default function App() {
   }, [visibleIds, focusedId]);
 
   // actions
-  const newSession = async (name: string, cli: string, path: string) => {
-    const s = await api.createSession(name, cli, activeGroup?.id, path);
+  const createSession = async (name: string, cli: string, path: string, groupId?: string) => {
+    const s = await api.createSession(name, cli, groupId, path);
     rememberPath(s.path);
     await refresh();
-    setActiveRef(`s:${s.id}`);
+    if (groupId) { setActiveRef(`g:${groupId}`); setFocusedId(s.id); }
+    else setActiveRef(`s:${s.id}`);
   };
+  // Sidebar + quick-add creations always land loose at the top of the list —
+  // never in a group just because one happens to be selected.
+  const newSession = (name: string, cli: string, path: string) => createSession(name, cli, path);
+  // The empty-group card explicitly creates "an agent here".
+  const newSessionHere = (name: string, cli: string, path: string) => createSession(name, cli, path, activeGroup?.id);
   const newGroup = async (name: string, cart?: { cli: string; count: number }[], path = '') => {
     const g = await api.createGroup(name);
     for (const { cli, count } of cart || []) {
@@ -221,7 +227,7 @@ export default function App() {
                 <div className="empty-card">
                   <h2>{activeGroup.name}</h2>
                   <p>Create an agent here, or drag one in from the sidebar.</p>
-                  <NewSession clis={clis} sessions={tree.sessions} defaultPath={lastPath} onCreate={newSession} />
+                  <NewSession clis={clis} sessions={tree.sessions} defaultPath={lastPath} onCreate={newSessionHere} />
                   <div className="dropline">⤓ drop an agent to add it to this group</div>
                 </div>
               </div>