@bytespell/shella 0.1.6 → 0.1.8

package/dist/bin/cli.js

@@ -20,6 +20,7 @@ import { fileURLToPath } from "url";
 import { createExpressMiddleware } from "@trpc/server/adapters/express";
 import { applyWSSHandler } from "@trpc/server/adapters/ws";
 import { agentManager as agentManager2 } from "@bytespell/amux/agents/manager";
+import { setVerbose, debug } from "@bytespell/amux/lib/logger";
 import "@bytespell/amux/db";
 
 // src/db/index.ts
@@ -80,8 +81,8 @@ var windows = sqliteTable("windows", {
 var panes = sqliteTable("panes", {
   id: text("id").primaryKey(),
   windowId: text("window_id").notNull().references(() => windows.id, { onDelete: "cascade" }),
-  /** References amux session ID (cross-database) */
-  sessionId: text("session_id").notNull(),
+  /** Content configuration. Null when pane type not yet selected. */
+  content: text("content", { mode: "json" }).$type(),
   createdAt: integer("created_at", { mode: "timestamp_ms" }).notNull().default(sql`(unixepoch() * 1000)`)
 });
 var uiState = sqliteTable("ui_state", {
@@ -109,7 +110,7 @@ sqlite.exec(`
   CREATE TABLE IF NOT EXISTS panes (
     id TEXT PRIMARY KEY,
     window_id TEXT NOT NULL REFERENCES windows(id) ON DELETE CASCADE,
-    session_id TEXT NOT NULL,
+    content TEXT,
     created_at INTEGER NOT NULL DEFAULT (unixepoch() * 1000)
   );
 
@@ -118,6 +119,46 @@ sqlite.exec(`
     value TEXT NOT NULL
   );
 `);
+try {
+  const tableInfo = sqlite.prepare("PRAGMA table_info(panes)").all();
+  const hasSessionId = tableInfo.some((col) => col.name === "session_id");
+  const hasContent = tableInfo.some((col) => col.name === "content");
+  if (hasSessionId && !hasContent) {
+    sqlite.exec(`
+      -- Disable foreign keys temporarily
+      PRAGMA foreign_keys = OFF;
+
+      -- Create new table with content column
+      CREATE TABLE panes_new (
+        id TEXT PRIMARY KEY,
+        window_id TEXT NOT NULL REFERENCES windows(id) ON DELETE CASCADE,
+        content TEXT,
+        created_at INTEGER NOT NULL DEFAULT (unixepoch() * 1000)
+      );
+
+      -- Copy data, converting session_id to content JSON
+      INSERT INTO panes_new (id, window_id, content, created_at)
+      SELECT
+        id,
+        window_id,
+        CASE
+          WHEN session_id IS NOT NULL THEN json_object('type', 'session', 'sessionId', session_id)
+          ELSE NULL
+        END,
+        created_at
+      FROM panes;
+
+      -- Drop old table and rename new
+      DROP TABLE panes;
+      ALTER TABLE panes_new RENAME TO panes;
+
+      -- Re-enable foreign keys
+      PRAGMA foreign_keys = ON;
+    `);
+    console.log("[shella-db] Migrated panes from session_id to content column");
+  }
+} catch {
+}
 
 // src/amuxBridge.ts
 import { randomUUID } from "crypto";
@@ -141,8 +182,8 @@ function createAmuxBridge() {
       if (!configId) {
         const lastUsedRow = db2.select().from(appState).where(eq(appState.key, "last_used_agent_config_id")).get();
         if (lastUsedRow?.value) {
-          const config = db2.select().from(agentConfigs).where(eq(agentConfigs.id, lastUsedRow.value)).get();
-          if (config) configId = config.id;
+          const config2 = db2.select().from(agentConfigs).where(eq(agentConfigs.id, lastUsedRow.value)).get();
+          if (config2) configId = config2.id;
         }
         if (!configId) {
           const firstConfig = db2.select().from(agentConfigs).get();
@@ -156,11 +197,14 @@ function createAmuxBridge() {
       }
       const id = params.id ?? randomUUID();
       const now = /* @__PURE__ */ new Date();
+      const config = db2.select().from(agentConfigs).where(eq(agentConfigs.id, configId)).get();
+      const initialTitle = config?.streamType === "pty" ? params.directory.split("/").pop() || null : null;
       db2.insert(sessions).values({
         id,
         directory: params.directory,
         agentConfigId: configId,
         acpSessionId: null,
+        title: initialTitle,
         model: null,
         mode: null,
         createdAt: now
@@ -196,17 +240,6 @@ function createAmuxBridge() {
     respondPermission(sessionId, requestId, optionId) {
       agentManager.respondPermission(sessionId, requestId, optionId);
     },
-    async switchAgent(sessionId, agentConfigId) {
-      await agentManager.stopForSession(sessionId);
-      clearEventsForSession(sessionId);
-      db2.update(sessions).set({
-        agentConfigId,
-        acpSessionId: null,
-        model: null,
-        mode: null
-      }).where(eq(sessions.id, sessionId)).run();
-      db2.insert(appState).values({ key: "last_used_agent_config_id", value: agentConfigId }).onConflictDoUpdate({ target: appState.key, set: { value: agentConfigId } }).run();
-    },
     subscribeToSession(sessionId, callback) {
       const handler = (event) => {
         if (event.sessionId === sessionId) {
@@ -220,6 +253,22 @@ function createAmuxBridge() {
       const session = db2.select().from(sessions).where(eq(sessions.id, sessionId)).get();
       if (!session) throw new Error(`Session ${sessionId} not found`);
       return listFilesForAutocomplete(session.directory, partialPath, limit);
+    },
+    // Terminal operations
+    terminalWrite(sessionId, data) {
+      agentManager.terminalWrite(sessionId, data);
+    },
+    terminalResize(sessionId, cols, rows) {
+      agentManager.terminalResize(sessionId, cols, rows);
+    },
+    getTerminalScrollback(sessionId) {
+      return agentManager.getTerminalScrollback(sessionId);
+    },
+    isTerminalSession(sessionId) {
+      return agentManager.isTerminalSession(sessionId);
+    },
+    updateSessionTitle(sessionId, title) {
+      db2.update(sessions).set({ title }).where(eq(sessions.id, sessionId)).run();
     }
   };
 }
@@ -363,7 +412,9 @@ var windowsRouter = router({
     const allWindows = db.select().from(windows).orderBy(windows.createdAt).all();
     const allPanes = db.select().from(panes).all();
     const activeRow = db.select().from(uiState).where(eq2(uiState.key, "active_window_id")).get();
-    const sessionIds = [...new Set(allPanes.map((p2) => p2.sessionId))];
+    const sessionIds = [...new Set(
+      allPanes.map((p2) => p2.content?.type === "session" ? p2.content.sessionId : null).filter((id) => id !== null)
+    )];
     const sessionsData = await amux.getSessions(sessionIds);
     const sessionMap = new Map(sessionsData.map((s) => [s.id, s]));
     const agentConfigs2 = await amux.getAgentConfigs();
@@ -372,7 +423,8 @@ var windowsRouter = router({
         ...w,
         panes: allPanes.filter((p2) => p2.windowId === w.id).map((p2) => ({
           ...p2,
-          session: sessionMap.get(p2.sessionId) ?? null
+          // Enrich session-type content with full session data
+          session: p2.content?.type === "session" ? sessionMap.get(p2.content.sessionId) ?? null : null
         }))
       })),
       activeWindowId: activeRow?.value ?? allWindows[allWindows.length - 1]?.id ?? null,
@@ -388,19 +440,20 @@ var windowsRouter = router({
       throw new Error(`Window ${input.id} not found`);
     }
     const windowPanes = db.select().from(panes).where(eq2(panes.windowId, input.id)).all();
-    const sessionIds = windowPanes.map((p2) => p2.sessionId);
+    const sessionIds = windowPanes.map((p2) => p2.content?.type === "session" ? p2.content.sessionId : null).filter((id) => id !== null);
     const sessionsData = await amux.getSessions(sessionIds);
     const sessionMap = new Map(sessionsData.map((s) => [s.id, s]));
     return {
       ...window,
       panes: windowPanes.map((p2) => ({
         ...p2,
-        session: sessionMap.get(p2.sessionId) ?? null
+        session: p2.content?.type === "session" ? sessionMap.get(p2.content.sessionId) ?? null : null
       }))
     };
   }),
   /**
    * Create a new window with a single pane.
+   * If agentConfigId is not provided, pane is created with no content (shows picker).
    */
   create: publicProcedure.input(z.object({
     id: z.string().optional(),
@@ -409,10 +462,13 @@ var windowsRouter = router({
     agentConfigId: z.string().optional()
   })).mutation(async ({ input }) => {
     const directory = input.directory ?? process.cwd();
-    const session = await amux.createSession({
-      directory,
-      agentConfigId: input.agentConfigId
-    });
+    let session = null;
+    if (input.agentConfigId) {
+      session = await amux.createSession({
+        directory,
+        agentConfigId: input.agentConfigId
+      });
+    }
     const windowId = input.id ?? randomUUID2();
     const paneId = randomUUID2();
     const existingCount = db.select().from(windows).all().length;
@@ -421,14 +477,13 @@ var windowsRouter = router({
       id: windowId,
       title: input.title || generateTitle(existingCount, directory),
       hasCustomTitle: !!input.title,
-      // Only true if title is non-empty string
       layout,
       activePaneId: paneId
     }).run();
     db.insert(panes).values({
       id: paneId,
       windowId,
-      sessionId: session.id
+      content: session ? { type: "session", sessionId: session.id } : null
     }).run();
     db.insert(uiState).values({ key: "active_window_id", value: windowId }).onConflictDoUpdate({ target: uiState.key, set: { value: windowId } }).run();
     const newWindow = db.select().from(windows).where(eq2(windows.id, windowId)).get();
@@ -437,7 +492,7 @@ var windowsRouter = router({
       ...newWindow,
       panes: newPanes.map((p2) => ({
         ...p2,
-        session: p2.sessionId === session.id ? session : null
+        session: session && p2.content?.type === "session" && p2.content.sessionId === session.id ? session : null
       }))
     };
   }),
@@ -463,7 +518,9 @@ var windowsRouter = router({
   delete: publicProcedure.input(z.object({ id: z.string() })).mutation(async ({ input }) => {
     const windowPanes = db.select().from(panes).where(eq2(panes.windowId, input.id)).all();
     for (const pane of windowPanes) {
-      await amux.deleteSession(pane.sessionId);
+      if (pane.content?.type === "session") {
+        await amux.deleteSession(pane.content.sessionId);
+      }
     }
     db.delete(windows).where(eq2(windows.id, input.id)).run();
     const activeRow = db.select().from(uiState).where(eq2(uiState.key, "active_window_id")).get();
@@ -499,7 +556,7 @@ function setAmuxBridge2(bridge) {
 var layoutRouter = router({
   /**
    * Split a pane horizontally or vertically.
-   * Creates a new session in amux and a new pane in shella.
+   * If source pane has a session, clones it. Otherwise creates empty pane.
    */
   split: publicProcedure.input(z2.object({
     windowId: z2.string(),
@@ -513,25 +570,17 @@ var layoutRouter = router({
     if (!sourcePane) {
       throw new Error(`Pane ${input.paneId} not found`);
     }
-    const sourceSession = await amux2.getSession(sourcePane.sessionId);
-    if (!sourceSession) {
-      throw new Error(`Session ${sourcePane.sessionId} not found`);
+    const window = db.select().from(windows).where(eq3(windows.id, input.windowId)).get();
+    if (!window) {
+      throw new Error(`Window ${input.windowId} not found`);
     }
-    const newSession = await amux2.createSession({
-      id: input.newSessionId,
-      directory: sourceSession.directory,
-      agentConfigId: sourceSession.agentConfigId
-    });
+    const newContent = null;
     const newPaneId = input.newPaneId ?? randomUUID3();
     db.insert(panes).values({
       id: newPaneId,
       windowId: input.windowId,
-      sessionId: newSession.id
+      content: newContent
     }).run();
-    const window = db.select().from(windows).where(eq3(windows.id, input.windowId)).get();
-    if (!window) {
-      throw new Error(`Window ${input.windowId} not found`);
-    }
     const currentLayout = window.layout;
     const newLayout = splitPane(currentLayout, input.paneId, newPaneId, input.direction);
     db.update(windows).set({
@@ -539,27 +588,17 @@ var layoutRouter = router({
       activePaneId: newPaneId,
       lastAccessedAt: /* @__PURE__ */ new Date()
     }).where(eq3(windows.id, input.windowId)).run();
-    await amux2.startAgent(newSession.id);
     const now = /* @__PURE__ */ new Date();
     return {
       newPaneId,
-      newSessionId: newSession.id,
+      newSessionId: null,
       layout: newLayout,
-      // Match exact shape from windows.list: { ...pane, session }
       newPane: {
         id: newPaneId,
         windowId: input.windowId,
-        sessionId: newSession.id,
+        content: newContent,
         createdAt: now.toISOString(),
-        session: {
-          id: newSession.id,
-          directory: newSession.directory,
-          agentConfigId: newSession.agentConfigId,
-          model: newSession.model,
-          mode: newSession.mode,
-          createdAt: newSession.createdAt.toISOString(),
-          acpSessionId: newSession.acpSessionId
-        }
+        session: null
       }
     };
   }),
@@ -581,11 +620,15 @@ var layoutRouter = router({
     const currentLayout = window.layout;
     const allPaneIds = getAllPaneIds(currentLayout);
     if (allPaneIds.length === 1) {
-      await amux2.deleteSession(pane.sessionId);
+      if (pane.content?.type === "session") {
+        await amux2.deleteSession(pane.content.sessionId);
+      }
       db.delete(windows).where(eq3(windows.id, input.windowId)).run();
       return { windowClosed: true, layout: null, activePaneId: null };
     }
-    await amux2.deleteSession(pane.sessionId);
+    if (pane.content?.type === "session") {
+      await amux2.deleteSession(pane.content.sessionId);
+    }
     db.delete(panes).where(eq3(panes.id, input.paneId)).run();
     const newLayout = removePane(currentLayout, input.paneId);
     if (!newLayout) {
@@ -655,6 +698,78 @@ var layoutRouter = router({
     const newLayout = updateRatio(currentLayout, input.path, input.ratio);
     db.update(windows).set({ layout: newLayout }).where(eq3(windows.id, input.windowId)).run();
     return { layout: newLayout };
+  }),
+  /**
+   * Set the session for an empty pane (used when user picks agent/shell type).
+   * Creates a session in amux and updates the pane.
+   */
+  setSession: publicProcedure.input(z2.object({
+    paneId: z2.string(),
+    agentConfigId: z2.string(),
+    directory: z2.string().optional()
+  })).mutation(async ({ input }) => {
+    const pane = db.select().from(panes).where(eq3(panes.id, input.paneId)).get();
+    if (!pane) {
+      throw new Error(`Pane ${input.paneId} not found`);
+    }
+    if (pane.content) {
+      throw new Error(`Pane ${input.paneId} already has content`);
+    }
+    const session = await amux2.createSession({
+      directory: input.directory ?? process.cwd(),
+      agentConfigId: input.agentConfigId
+    });
+    db.update(panes).set({ content: { type: "session", sessionId: session.id } }).where(eq3(panes.id, input.paneId)).run();
+    await amux2.startAgent(session.id);
+    return {
+      sessionId: session.id,
+      content: { type: "session", sessionId: session.id },
+      session: {
+        id: session.id,
+        directory: session.directory,
+        agentConfigId: session.agentConfigId,
+        model: session.model,
+        mode: session.mode,
+        createdAt: session.createdAt.toISOString(),
+        acpSessionId: session.acpSessionId
+      }
+    };
+  }),
+  /**
+   * Set browser content for an empty pane.
+   */
+  setBrowserContent: publicProcedure.input(z2.object({
+    paneId: z2.string(),
+    url: z2.string().url()
+  })).mutation(async ({ input }) => {
+    const pane = db.select().from(panes).where(eq3(panes.id, input.paneId)).get();
+    if (!pane) {
+      throw new Error(`Pane ${input.paneId} not found`);
+    }
+    if (pane.content) {
+      throw new Error(`Pane ${input.paneId} already has content`);
+    }
+    const content = { type: "browser", url: input.url };
+    db.update(panes).set({ content }).where(eq3(panes.id, input.paneId)).run();
+    return { content };
+  }),
+  /**
+   * Update the URL of an existing browser pane.
+   */
+  updateBrowserUrl: publicProcedure.input(z2.object({
+    paneId: z2.string(),
+    url: z2.string().url()
+  })).mutation(async ({ input }) => {
+    const pane = db.select().from(panes).where(eq3(panes.id, input.paneId)).get();
+    if (!pane) {
+      throw new Error(`Pane ${input.paneId} not found`);
+    }
+    if (pane.content?.type !== "browser") {
+      throw new Error(`Pane ${input.paneId} is not a browser pane`);
+    }
+    const content = { type: "browser", url: input.url };
+    db.update(panes).set({ content }).where(eq3(panes.id, input.paneId)).run();
+    return { content };
   })
 });
 
@@ -674,7 +789,10 @@ function getSessionIdForPane(paneId) {
   if (!pane) {
     throw new Error(`Pane ${paneId} not found`);
   }
-  return pane.sessionId;
+  if (pane.content?.type !== "session") {
+    throw new Error(`Pane ${paneId} is not a session pane`);
+  }
+  return pane.content.sessionId;
 }
 var agentsRouter = router({
   /**
@@ -745,17 +863,6 @@ var agentsRouter = router({
     amux3.respondPermission(sessionId, input.requestId, input.optionId);
     return { ok: true };
   }),
-  /**
-   * Switch to a different agent.
-   */
-  switchAgent: publicProcedure.input(z3.object({
-    paneId: z3.string(),
-    agentConfigId: z3.string()
-  })).mutation(async ({ input }) => {
-    const sessionId = getSessionIdForPane(input.paneId);
-    await amux3.switchAgent(sessionId, input.agentConfigId);
-    return { ok: true };
-  }),
   /**
    * Subscribe to updates for a pane's agent session.
    */
@@ -781,7 +888,10 @@ function getSessionIdForPane2(paneId) {
   if (!pane) {
     throw new Error(`Pane ${paneId} not found`);
   }
-  return pane.sessionId;
+  if (pane.content?.type !== "session") {
+    throw new Error(`Pane ${paneId} is not a session pane`);
+  }
+  return pane.content.sessionId;
 }
 var filesRouter = router({
   /**
@@ -798,24 +908,97 @@ var filesRouter = router({
   })
 });
 
+// src/trpc/terminals.ts
+import { z as z5 } from "zod";
+import { eq as eq6 } from "drizzle-orm";
+var amux5;
+function setAmuxBridge5(bridge) {
+  amux5 = bridge;
+}
+var paneInput2 = z5.object({
+  paneId: z5.string()
+});
+function getSessionIdForPane3(paneId) {
+  const pane = db.select().from(panes).where(eq6(panes.id, paneId)).get();
+  if (!pane) {
+    throw new Error(`Pane ${paneId} not found`);
+  }
+  if (pane.content?.type !== "session") {
+    throw new Error(`Pane ${paneId} is not a session pane`);
+  }
+  return pane.content.sessionId;
+}
+var terminalsRouter = router({
+  /**
+   * Write raw input to terminal (keystrokes from client).
+   */
+  write: publicProcedure.input(
+    z5.object({
+      paneId: z5.string(),
+      data: z5.string()
+    })
+  ).mutation(({ input }) => {
+    const sessionId = getSessionIdForPane3(input.paneId);
+    amux5.terminalWrite(sessionId, input.data);
+    return { ok: true };
+  }),
+  /**
+   * Resize terminal dimensions.
+   */
+  resize: publicProcedure.input(
+    z5.object({
+      paneId: z5.string(),
+      cols: z5.number().int().positive(),
+      rows: z5.number().int().positive()
+    })
+  ).mutation(({ input }) => {
+    const sessionId = getSessionIdForPane3(input.paneId);
+    amux5.terminalResize(sessionId, input.cols, input.rows);
+    return { ok: true };
+  }),
+  /**
+   * Check if a pane is a terminal session.
+   */
+  isTerminal: publicProcedure.input(paneInput2).query(({ input }) => {
+    const sessionId = getSessionIdForPane3(input.paneId);
+    return { isTerminal: amux5.isTerminalSession(sessionId) };
+  }),
+  /**
+   * Set terminal title (from OSC escape sequence).
+   */
+  setTitle: publicProcedure.input(z5.object({
+    paneId: z5.string(),
+    title: z5.string()
+  })).mutation(({ input }) => {
+    const sessionId = getSessionIdForPane3(input.paneId);
+    amux5.updateSessionTitle(sessionId, input.title);
+    return { ok: true };
+  })
+});
+
 // src/trpc/router.ts
-function initializeRouters(amux5) {
-  setAmuxBridge(amux5);
-  setAmuxBridge2(amux5);
-  setAmuxBridge3(amux5);
-  setAmuxBridge4(amux5);
+function initializeRouters(amux6) {
+  setAmuxBridge(amux6);
+  setAmuxBridge2(amux6);
+  setAmuxBridge3(amux6);
+  setAmuxBridge4(amux6);
+  setAmuxBridge5(amux6);
 }
 var shellaRouter = router({
   windows: windowsRouter,
   layout: layoutRouter,
   agents: agentsRouter,
-  files: filesRouter
+  files: filesRouter,
+  terminals: terminalsRouter
 });
 
 // src/index.ts
 var __dirname = path2.dirname(fileURLToPath(import.meta.url));
 function createShellaServer(options = {}) {
   const port = options.port ?? 3067;
+  if (options.verbose) {
+    setVerbose(true);
+  }
   const amuxBridge = createAmuxBridge();
   initializeRouters(amuxBridge);
   const app = express();
@@ -832,17 +1015,24 @@ function createShellaServer(options = {}) {
   applyWSSHandler({ wss, router: shellaRouter });
   return {
     start: () => {
-      return new Promise((resolve) => {
+      return new Promise((resolve, reject) => {
+        server.once("error", (err) => {
+          if (err.code === "EADDRINUSE") {
+            reject(new Error(`Port ${port} is already in use. Kill the other process or use a different port.`));
+          } else {
+            reject(err);
+          }
+        });
         server.listen(port, () => {
           const url = `http://localhost:${port}`;
-          console.log(`[shella] Running on ${url}`);
+          debug("shella", `Running on ${url}`);
           options.onReady?.(url);
           resolve();
         });
       });
     },
     stop: async () => {
-      console.log("[shella] Shutting down...");
+      debug("shella", "Shutting down...");
       wss.close();
       await agentManager2.stopAll();
       server.close();
@@ -883,6 +1073,7 @@ async function startCommand(options) {
   else log2("Starting server...");
   const shella = createShellaServer({
     port,
+    verbose,
     onReady: (url) => {
       if (s) s.stop("Ready");
       const lanIp = getLanIp();
@@ -905,7 +1096,13 @@ ${dim("press ctrl+c to stop")}
       }
     }
   });
-  await shella.start();
+  try {
+    await shella.start();
+  } catch (err) {
+    if (s) s.stop("Failed");
+    p.log.error(err instanceof Error ? err.message : String(err));
+    process.exit(1);
+  }
   const shutdown = async () => {
     console.log("");
     console.log(dim("stopping..."));