@timqi/pier 0.0.8 → 0.0.9

package/dist/web/session-state.js

@@ -22,23 +22,42 @@ export class SessionStateStore {
     }
     /** Pin plus the summary Projects needs, atomically in one row. */
     pin(summary, pinned) {
-        this.#db.prepare(`INSERT INTO session_state(session_id, pinned, cwd, title, created_at)
-       VALUES (?, ?, ?, ?, ?)
+        // A new session joins a project that already has a place in the list.
+        // Unranked it would sort on top — lifting the whole project with it, which
+        // is the jump manual order exists to stop.
+        const sibling = this.#db.prepare("SELECT project_sort AS rank FROM session_state WHERE cwd = ? AND project_sort IS NOT NULL LIMIT 1").get(summary.cwd);
+        this.#db.prepare(`INSERT INTO session_state(session_id, pinned, cwd, title, created_at, project_sort)
+       VALUES (?, ?, ?, ?, ?, ?)
        ON CONFLICT(session_id) DO UPDATE SET
          pinned = excluded.pinned,
          cwd = excluded.cwd,
          title = COALESCE(excluded.title, session_state.title),
-         created_at = excluded.created_at`).run(summary.id, pinned ? 1 : 0, summary.cwd, summary.title ?? null, summary.createdAt);
+         created_at = excluded.created_at,
+         project_sort = COALESCE(session_state.project_sort, excluded.project_sort)`).run(summary.id, pinned ? 1 : 0, summary.cwd, summary.title ?? null, summary.createdAt, sibling?.rank ?? null);
+    }
+    /** One drag = one write of the whole list it reordered: index is the place.
+     *  `sessions` are ids (a session's place inside its project), `projects` are
+     *  cwds, whose place is stamped on every session that has that cwd. */
+    reorder(order) {
+        const bySession = this.#db.prepare("UPDATE session_state SET sort = ? WHERE session_id = ?");
+        const byCwd = this.#db.prepare("UPDATE session_state SET project_sort = ? WHERE cwd = ?");
+        this.#tx(() => {
+            order.sessions?.forEach((id, i) => bySession.run(i, id));
+            order.projects?.forEach((cwd, i) => byCwd.run(i, cwd));
+        });
     }
     /** Project rows only; unlike AgentFactory.list(), this never touches disk. */
     projects() {
-        const rows = this.#db.prepare(`SELECT session_id AS id, cwd, title, created_at AS createdAt, unread
+        const rows = this.#db.prepare(`SELECT session_id AS id, cwd, title, created_at AS createdAt, unread,
+              sort, project_sort AS projectSort
        FROM session_state
        WHERE pinned = 1 AND cwd IS NOT NULL AND created_at IS NOT NULL
        ORDER BY created_at DESC`).all();
-        return rows.map(({ title, unread, ...row }) => ({
+        return rows.map(({ title, unread, sort, projectSort, ...row }) => ({
             ...row,
             ...(title ? { title } : {}),
+            ...(sort === null ? {} : { sort }),
+            ...(projectSort === null ? {} : { projectSort }),
             unread: unread === 1,
         }));
     }
@@ -58,10 +77,16 @@ export class SessionStateStore {
         const update = this.#db.prepare(`UPDATE session_state SET
          cwd = ?, title = COALESCE(?, title), created_at = ?
        WHERE session_id = ?`);
-        this.#db.exec("BEGIN");
-        try {
+        this.#tx(() => {
             for (const s of summaries)
                 update.run(s.cwd, s.title ?? null, s.createdAt, s.id);
+        });
+    }
+    /** All-or-nothing: a half-written order is a list nobody arranged. */
+    #tx(run) {
+        this.#db.exec("BEGIN");
+        try {
+            run();
             this.#db.exec("COMMIT");
         }
         catch (err) {
@@ -70,8 +95,14 @@ export class SessionStateStore {
         }
     }
     flags() {
-        const rows = this.#db.prepare("SELECT session_id AS id, pinned, unread FROM session_state WHERE pinned = 1 OR unread = 1").all();
-        return new Map(rows.map((r) => [r.id, { pinned: r.pinned === 1, unread: r.unread === 1 }]));
+        const rows = this.#db.prepare(`SELECT session_id AS id, pinned, unread, sort, project_sort AS projectSort
+       FROM session_state WHERE pinned = 1 OR unread = 1`).all();
+        return new Map(rows.map((r) => [r.id, {
+                pinned: r.pinned === 1,
+                unread: r.unread === 1,
+                ...(r.sort === null ? {} : { sort: r.sort }),
+                ...(r.projectSort === null ? {} : { projectSort: r.projectSort }),
+            }]));
     }
     /** The first prompt supplies the title of a newly-created pinned session. */
     title(sessionId, text) {

package/dist/web/terminal.js

@@ -28,6 +28,15 @@ const MAX_FRAME_BYTES = 1024 * 1024;
 // start under. Inheriting these can attach the shell back into Pier's parent
 // tmux session; SSH_AUTH_SOCK deliberately stays so git/ssh keep working.
 const PARENT_TERMINAL_ENV = ["TMUX", "TMUX_PANE", "SSH_TTY", "SSH_CLIENT", "SSH_CONNECTION"];
+// Pier's own configuration is Pier's, not this shell's. `NODE_ENV=production`
+// alone turns an `npm i` typed here into an install with no dev dependencies,
+// and every `PI_*`/`PIER_*` would point a `pi` started here at Pier's own
+// instance rather than the person's. Everything else is inherited on purpose:
+// PATH, LANG, SSH_AUTH_SOCK and the session's XDG/DBUS handles are what make
+// the shell usable, and on a service-managed instance nothing else supplies
+// them.
+const PIER_OWN_ENV = ["NODE_ENV", "PORT", "HOST"];
+const PIER_OWN_PREFIX = /^PI(ER)?_/;
 const send = (sock, data) => {
     try {
         sock.send(data);
@@ -44,6 +53,7 @@ export class TerminalHub {
     #shell;
     #idleMs;
     #maxTerms;
+    #initCommand;
     #sweeper;
     #closeListeners = new Set();
     #closed = false;
@@ -51,6 +61,7 @@ export class TerminalHub {
         this.#shell = opts.shell ?? process.env.SHELL ?? "/bin/bash";
         this.#idleMs = opts.idleMs ?? IDLE_MS;
         this.#maxTerms = opts.maxTerms ?? MAX_TERMS;
+        this.#initCommand = opts.initCommand ?? (() => "");
         this.#sweeper = setInterval(() => this.sweep(Date.now()), SWEEP_MS);
         this.#sweeper.unref();
     }
@@ -117,8 +128,11 @@ export class TerminalHub {
     }
     #spawn(cwd) {
         const env = { ...process.env };
-        for (const key of PARENT_TERMINAL_ENV)
-            delete env[key];
+        for (const key of Object.keys(env)) {
+            if (PARENT_TERMINAL_ENV.includes(key) || PIER_OWN_ENV.includes(key) || PIER_OWN_PREFIX.test(key)) {
+                delete env[key];
+            }
+        }
         const pty = spawn(this.#shell, [], {
             name: "xterm-256color",
             cols: 120,
@@ -129,6 +143,14 @@ export class TerminalHub {
         const term = { pty, ring: [], ringBytes: 0, clients: new Set(), idleSince: Infinity };
         this.#terms.set(cwd, term);
         log.info(`shell ${pty.pid} for ${cwd}`);
+        // Typed in, not exec'd: the shell stays the parent, so quitting whatever
+        // this starts leaves a usable prompt, and the echo plus any error is in
+        // the ring where the person can see what ran. The tty buffers it until the
+        // shell's first read, so no wait is needed. A reattach never repeats it —
+        // this runs once per pty, which is once per cwd.
+        const init = this.#initCommand().trim();
+        if (init)
+            pty.write(`${init}\r`);
         pty.onData((data) => {
             const chunk = Buffer.from(data);
             term.ring.push(chunk);
@@ -179,6 +201,13 @@ export class TerminalHub {
             term.pty.write(msg.d);
             return;
         }
+        // The only way a page can end a shell: everything attached to it is told by
+        // the exit path below, exactly as if the shell had exited on its own.
+        if (msg.t === "restart") {
+            log.info(`shell ${term.pty.pid} for ${cwd} killed on request`);
+            term.pty.kill();
+            return;
+        }
         if (msg.t === "resize" &&
             typeof msg.cols === "number" && typeof msg.rows === "number" &&
             Number.isInteger(msg.cols) && Number.isInteger(msg.rows) &&
@@ -225,8 +254,9 @@ export class TerminalHub {
 /** The upgrade seam: `/api/terminal?cwd=…` behind the same password boundary
  *  as every route. SameSite=Lax already withholds the cookie cross-site; the
  *  Origin check is the explicit copy of that fact. */
-export function attachTerminal(server, auth, heartbeatMs = HEARTBEAT_MS) {
-    const hub = new TerminalHub();
+export function attachTerminal(server, auth, opts = {}) {
+    const heartbeatMs = opts.heartbeatMs ?? HEARTBEAT_MS;
+    const hub = new TerminalHub(opts);
     const wss = new WebSocketServer({ noServer: true, maxPayload: MAX_FRAME_BYTES });
     const alive = new WeakSet();
     const heartbeat = setInterval(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timqi/pier",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "A self-hosted workspace for coding agents: web workbench and IM channels in front of Pi sessions",
   "license": "AGPL-3.0-only",
   "repository": "github:timqi/pier",