stashes 0.1.47 → 0.1.48

package/dist/cli.js

@@ -40,6 +40,10 @@ var DEFAULT_STASH_COUNT = 3;
 var APP_PROXY_PORT = STASHES_PORT + 1;
 var STASH_PORT_START = 4010;
 var STASH_PORT_END = 4030;
+var STASH_PORT_OFFSET = 10;
+var STASH_PORT_RANGE = 20;
+var PORT_SLOT_SIZE = 100;
+var MAX_PORT_SLOTS = 10;
 var MAX_PREVIEW_SERVERS = 5;
 var PREVIEW_TTL_MS = 300000;
 var PREVIEW_REAPER_INTERVAL = 30000;
@@ -1683,14 +1687,18 @@ class PreviewPool {
   usedPorts = new Set;
   maxSize;
   ttlMs;
+  portStart;
+  portEnd;
   worktreeManager;
   broadcast;
   reaperInterval;
-  constructor(worktreeManager, broadcast, maxSize = MAX_PREVIEW_SERVERS, ttlMs = PREVIEW_TTL_MS) {
+  constructor(worktreeManager, broadcast, maxSize = MAX_PREVIEW_SERVERS, ttlMs = PREVIEW_TTL_MS, portStart = STASH_PORT_START, portEnd = STASH_PORT_END) {
     this.worktreeManager = worktreeManager;
     this.broadcast = broadcast;
     this.maxSize = maxSize;
     this.ttlMs = ttlMs;
+    this.portStart = portStart;
+    this.portEnd = portEnd;
     this.reaperInterval = setInterval(() => this.reap(), PREVIEW_REAPER_INTERVAL);
   }
   async getOrStart(stashId) {
@@ -1834,12 +1842,12 @@ class PreviewPool {
     }
   }
   allocatePort() {
-    for (let port = STASH_PORT_START;port <= STASH_PORT_END; port++) {
+    for (let port = this.portStart;port <= this.portEnd; port++) {
       if (!this.usedPorts.has(port)) {
         return port;
       }
     }
-    throw new Error(`No available ports in range ${STASH_PORT_START}-${STASH_PORT_END}`);
+    throw new Error(`No available ports in range ${this.portStart}-${this.portEnd}`);
   }
   killEntry(entry) {
     try {
@@ -1877,12 +1885,12 @@ class StashService {
   chatSessions = new Map;
   stashPollTimer = null;
   knownStashIds = new Set;
-  constructor(projectPath, worktreeManager, persistence, broadcast) {
+  constructor(projectPath, worktreeManager, persistence, broadcast, stashPortStart, stashPortEnd) {
     this.projectPath = projectPath;
     this.worktreeManager = worktreeManager;
     this.persistence = persistence;
     this.broadcast = broadcast;
-    this.previewPool = new PreviewPool(worktreeManager, broadcast);
+    this.previewPool = new PreviewPool(worktreeManager, broadcast, undefined, undefined, stashPortStart, stashPortEnd);
   }
   getActiveChatId() {
     return this.activeChatId;
@@ -1909,7 +1917,7 @@ class StashService {
       "Reply with ONLY the file path relative to the project root."
     ].join(`
 `);
-    const aiProcess = startAiProcess("resolve-component", prompt, this.projectPath);
+    const aiProcess = startAiProcess("resolve-component", prompt, this.projectPath, undefined, "claude-haiku-4-5-20251001");
     let resolvedPath = "";
     try {
       for await (const chunk of parseClaudeStream(aiProcess.process)) {
@@ -2295,10 +2303,10 @@ function broadcast(event) {
 function getPersistenceFromWs() {
   return persistence;
 }
-function createWebSocketHandler(projectPath, userDevPort, appProxyPort) {
+function createWebSocketHandler(projectPath, userDevPort, appProxyPort, stashPortStart, stashPortEnd) {
   worktreeManager = new WorktreeManager(projectPath);
   persistence = new PersistenceService(projectPath);
-  stashService = new StashService(projectPath, worktreeManager, persistence, broadcast);
+  stashService = new StashService(projectPath, worktreeManager, persistence, broadcast, stashPortStart, stashPortEnd);
   return {
     open(ws) {
       clients.add(ws);
@@ -2432,17 +2440,37 @@ app2.get("/*", async (c) => {
     headers: { "content-type": "application/json" }
   });
 });
-function startServer(projectPath, userDevPort, port = STASHES_PORT) {
+async function isPortAvailable(port) {
+  try {
+    const server = Bun.serve({ port, fetch: () => new Response("") });
+    server.stop(true);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function findAvailablePort(requestedPort) {
+  for (let slot = 0;slot < MAX_PORT_SLOTS; slot++) {
+    const port = requestedPort + slot * PORT_SLOT_SIZE;
+    if (await isPortAvailable(port))
+      return port;
+  }
+  throw new Error(`No available port found. Tried ${MAX_PORT_SLOTS} slots starting from ${requestedPort} (step ${PORT_SLOT_SIZE}).`);
+}
+async function startServer(projectPath, userDevPort, requestedPort = STASHES_PORT) {
+  const port = await findAvailablePort(requestedPort);
+  const appProxyPort = port + 1;
+  const stashPortStart = port + STASH_PORT_OFFSET;
+  const stashPortEnd = port + STASH_PORT_OFFSET + STASH_PORT_RANGE;
   serverState = { projectPath, userDevPort };
   initLogFile(projectPath);
-  const appProxyPort = port + 1;
   startAppProxy(userDevPort, appProxyPort, injectOverlayScript);
-  const wsHandler = createWebSocketHandler(projectPath, userDevPort, appProxyPort);
-  const server = Bun.serve({
+  const wsHandler = createWebSocketHandler(projectPath, userDevPort, appProxyPort, stashPortStart, stashPortEnd);
+  Bun.serve({
     port,
-    fetch(req, server2) {
+    fetch(req, server) {
       if (req.headers.get("upgrade") === "websocket") {
-        const success = server2.upgrade(req, {
+        const success = server.upgrade(req, {
           data: { projectPath, userDevPort }
         });
         if (success)
@@ -2455,7 +2483,10 @@ function startServer(projectPath, userDevPort, port = STASHES_PORT) {
   logger.info("server", `Stashes running at http://localhost:${port}`);
   logger.info("server", `Proxying user app from http://localhost:${userDevPort}`);
   logger.info("server", `Project: ${projectPath}`);
-  return server;
+  if (port !== requestedPort) {
+    logger.info("server", `Port ${requestedPort} was in use, using ${port} instead`);
+  }
+  return { port, appProxyPort, stashPortStart, stashPortEnd };
 }
 
 // ../server/dist/services/detector.js
@@ -2535,7 +2566,7 @@ function findConfig(projectPath, candidates) {
 // src/commands/start.ts
 async function startCommand(path, options) {
   const projectPath = resolve(path || ".");
-  const port = parseInt(options.port, 10);
+  const requestedPort = parseInt(options.port, 10);
   console.log("");
   console.log("  \u2554\u2550\u2557\u2554\u2566\u2557\u2554\u2550\u2557\u2554\u2550\u2557\u2566 \u2566\u2554\u2550\u2557\u2554\u2550\u2557");
   console.log("  \u255A\u2550\u2557 \u2551 \u2560\u2550\u2563\u255A\u2550\u2557\u2560\u2550\u2563\u2551\u2563 \u255A\u2550\u2557");
@@ -2546,17 +2577,20 @@ async function startCommand(path, options) {
   console.log(`  Project:    ${projectPath}`);
   console.log(`  Framework:  ${detected.framework}`);
   console.log(`  Dev server: http://localhost:${devPort}`);
-  console.log(`  Stashes:    http://localhost:${port}`);
-  console.log("");
   const isDevRunning = await checkPort(devPort);
   if (!isDevRunning) {
+    console.log("");
     console.log(`  ! Your dev server is not running on port ${devPort}`);
     console.log(`    Start it with: ${detected.devCommand}`);
-    console.log("");
   }
-  startServer(projectPath, devPort, port);
+  const result = await startServer(projectPath, devPort, requestedPort);
+  console.log(`  Stashes:    http://localhost:${result.port}`);
+  if (result.port !== requestedPort) {
+    console.log(`  (port ${requestedPort} was in use, using ${result.port})`);
+  }
+  console.log("");
   if (options.open !== false) {
-    await open(`http://localhost:${port}`);
+    await open(`http://localhost:${result.port}`);
   }
 }
 async function checkPort(port) {

package/dist/commands/start.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AAMA,UAAU,YAAY;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;CACf;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BrF"}
+{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AAMA,UAAU,YAAY;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;CACf;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAmCrF"}

package/dist/commands/start.js

@@ -4,7 +4,7 @@ import { startServer } from '@stashes/server';
 import { detectFramework } from '@stashes/server/services/detector';
 export async function startCommand(path, options) {
     const projectPath = resolve(path || '.');
-    const port = parseInt(options.port, 10);
+    const requestedPort = parseInt(options.port, 10);
     console.log('');
     console.log('  ╔═╗╔╦╗╔═╗╔═╗╦ ╦╔═╗╔═╗');
     console.log('  ╚═╗ ║ ╠═╣╚═╗╠═╣║╣ ╚═╗');
@@ -15,17 +15,20 @@ export async function startCommand(path, options) {
     console.log(`  Project:    ${projectPath}`);
     console.log(`  Framework:  ${detected.framework}`);
     console.log(`  Dev server: http://localhost:${devPort}`);
-    console.log(`  Stashes:    http://localhost:${port}`);
-    console.log('');
     const isDevRunning = await checkPort(devPort);
     if (!isDevRunning) {
+        console.log('');
         console.log(`  ! Your dev server is not running on port ${devPort}`);
         console.log(`    Start it with: ${detected.devCommand}`);
-        console.log('');
     }
-    startServer(projectPath, devPort, port);
+    const result = await startServer(projectPath, devPort, requestedPort);
+    console.log(`  Stashes:    http://localhost:${result.port}`);
+    if (result.port !== requestedPort) {
+        console.log(`  (port ${requestedPort} was in use, using ${result.port})`);
+    }
+    console.log('');
     if (options.open !== false) {
-        await open(`http://localhost:${port}`);
+        await open(`http://localhost:${result.port}`);
     }
 }
 async function checkPort(port) {

package/dist/commands/start.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AASpE,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAY,EAAE,OAAqB;IACpE,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;IACzC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAExC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEhB,MAAM,QAAQ,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAE1E,OAAO,CAAC,GAAG,CAAC,iBAAiB,WAAW,EAAE,CAAC,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,iBAAiB,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;IACnD,OAAO,CAAC,GAAG,CAAC,kCAAkC,OAAO,EAAE,CAAC,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,kCAAkC,IAAI,EAAE,CAAC,CAAC;IACtD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEhB,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,CAAC;IAC9C,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,8CAA8C,OAAO,EAAE,CAAC,CAAC;QACrE,OAAO,CAAC,GAAG,CAAC,sBAAsB,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;QACzD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClB,CAAC;IAED,WAAW,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAExC,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QAC3B,MAAM,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;IACzC,CAAC;AACH,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,IAAY;IACnC,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,oBAAoB,IAAI,EAAE,EAAE;YACvD,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;SAClC,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC,EAAE,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,CAAC;IAC9C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AASpE,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAY,EAAE,OAAqB;IACpE,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;IACzC,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAEjD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEhB,MAAM,QAAQ,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAE1E,OAAO,CAAC,GAAG,CAAC,iBAAiB,WAAW,EAAE,CAAC,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,iBAAiB,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;IACnD,OAAO,CAAC,GAAG,CAAC,kCAAkC,OAAO,EAAE,CAAC,CAAC;IAEzD,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,CAAC;IAC9C,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,8CAA8C,OAAO,EAAE,CAAC,CAAC;QACrE,OAAO,CAAC,GAAG,CAAC,sBAAsB,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,WAAW,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;IAEtE,OAAO,CAAC,GAAG,CAAC,kCAAkC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAC7D,IAAI,MAAM,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,WAAW,aAAa,sBAAsB,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;IAC5E,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEhB,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QAC3B,MAAM,IAAI,CAAC,oBAAoB,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAChD,CAAC;AACH,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,IAAY;IACnC,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,oBAAoB,IAAI,EAAE,EAAE;YACvD,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;SAClC,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC,EAAE,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,CAAC;IAC9C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}

package/dist/mcp.js

@@ -36,6 +36,10 @@ var DEFAULT_STASH_COUNT = 3;
 var APP_PROXY_PORT = STASHES_PORT + 1;
 var STASH_PORT_START = 4010;
 var STASH_PORT_END = 4030;
+var STASH_PORT_OFFSET = 10;
+var STASH_PORT_RANGE = 20;
+var PORT_SLOT_SIZE = 100;
+var MAX_PORT_SLOTS = 10;
 var MAX_PREVIEW_SERVERS = 5;
 var PREVIEW_TTL_MS = 300000;
 var PREVIEW_REAPER_INTERVAL = 30000;
@@ -1879,14 +1883,18 @@ class PreviewPool {
   usedPorts = new Set;
   maxSize;
   ttlMs;
+  portStart;
+  portEnd;
   worktreeManager;
   broadcast;
   reaperInterval;
-  constructor(worktreeManager, broadcast, maxSize = MAX_PREVIEW_SERVERS, ttlMs = PREVIEW_TTL_MS) {
+  constructor(worktreeManager, broadcast, maxSize = MAX_PREVIEW_SERVERS, ttlMs = PREVIEW_TTL_MS, portStart = STASH_PORT_START, portEnd = STASH_PORT_END) {
     this.worktreeManager = worktreeManager;
     this.broadcast = broadcast;
     this.maxSize = maxSize;
     this.ttlMs = ttlMs;
+    this.portStart = portStart;
+    this.portEnd = portEnd;
     this.reaperInterval = setInterval(() => this.reap(), PREVIEW_REAPER_INTERVAL);
   }
   async getOrStart(stashId) {
@@ -2030,12 +2038,12 @@ class PreviewPool {
     }
   }
   allocatePort() {
-    for (let port = STASH_PORT_START;port <= STASH_PORT_END; port++) {
+    for (let port = this.portStart;port <= this.portEnd; port++) {
       if (!this.usedPorts.has(port)) {
         return port;
       }
     }
-    throw new Error(`No available ports in range ${STASH_PORT_START}-${STASH_PORT_END}`);
+    throw new Error(`No available ports in range ${this.portStart}-${this.portEnd}`);
   }
   killEntry(entry) {
     try {
@@ -2073,12 +2081,12 @@ class StashService {
   chatSessions = new Map;
   stashPollTimer = null;
   knownStashIds = new Set;
-  constructor(projectPath, worktreeManager, persistence, broadcast) {
+  constructor(projectPath, worktreeManager, persistence, broadcast, stashPortStart, stashPortEnd) {
     this.projectPath = projectPath;
     this.worktreeManager = worktreeManager;
     this.persistence = persistence;
     this.broadcast = broadcast;
-    this.previewPool = new PreviewPool(worktreeManager, broadcast);
+    this.previewPool = new PreviewPool(worktreeManager, broadcast, undefined, undefined, stashPortStart, stashPortEnd);
   }
   getActiveChatId() {
     return this.activeChatId;
@@ -2105,7 +2113,7 @@ class StashService {
       "Reply with ONLY the file path relative to the project root."
     ].join(`
 `);
-    const aiProcess = startAiProcess("resolve-component", prompt, this.projectPath);
+    const aiProcess = startAiProcess("resolve-component", prompt, this.projectPath, undefined, "claude-haiku-4-5-20251001");
     let resolvedPath = "";
     try {
       for await (const chunk of parseClaudeStream(aiProcess.process)) {
@@ -2491,10 +2499,10 @@ function broadcast(event) {
 function getPersistenceFromWs() {
   return persistence;
 }
-function createWebSocketHandler(projectPath, userDevPort, appProxyPort) {
+function createWebSocketHandler(projectPath, userDevPort, appProxyPort, stashPortStart, stashPortEnd) {
   worktreeManager = new WorktreeManager(projectPath);
   persistence = new PersistenceService(projectPath);
-  stashService = new StashService(projectPath, worktreeManager, persistence, broadcast);
+  stashService = new StashService(projectPath, worktreeManager, persistence, broadcast, stashPortStart, stashPortEnd);
   return {
     open(ws) {
       clients.add(ws);
@@ -2628,17 +2636,37 @@ app2.get("/*", async (c) => {
     headers: { "content-type": "application/json" }
   });
 });
-function startServer(projectPath, userDevPort, port = STASHES_PORT) {
+async function isPortAvailable(port) {
+  try {
+    const server = Bun.serve({ port, fetch: () => new Response("") });
+    server.stop(true);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function findAvailablePort(requestedPort) {
+  for (let slot = 0;slot < MAX_PORT_SLOTS; slot++) {
+    const port = requestedPort + slot * PORT_SLOT_SIZE;
+    if (await isPortAvailable(port))
+      return port;
+  }
+  throw new Error(`No available port found. Tried ${MAX_PORT_SLOTS} slots starting from ${requestedPort} (step ${PORT_SLOT_SIZE}).`);
+}
+async function startServer(projectPath, userDevPort, requestedPort = STASHES_PORT) {
+  const port = await findAvailablePort(requestedPort);
+  const appProxyPort = port + 1;
+  const stashPortStart = port + STASH_PORT_OFFSET;
+  const stashPortEnd = port + STASH_PORT_OFFSET + STASH_PORT_RANGE;
   serverState = { projectPath, userDevPort };
   initLogFile(projectPath);
-  const appProxyPort = port + 1;
   startAppProxy(userDevPort, appProxyPort, injectOverlayScript);
-  const wsHandler = createWebSocketHandler(projectPath, userDevPort, appProxyPort);
-  const server = Bun.serve({
+  const wsHandler = createWebSocketHandler(projectPath, userDevPort, appProxyPort, stashPortStart, stashPortEnd);
+  Bun.serve({
     port,
-    fetch(req, server2) {
+    fetch(req, server) {
       if (req.headers.get("upgrade") === "websocket") {
-        const success = server2.upgrade(req, {
+        const success = server.upgrade(req, {
           data: { projectPath, userDevPort }
         });
         if (success)
@@ -2651,7 +2679,10 @@ function startServer(projectPath, userDevPort, port = STASHES_PORT) {
   logger.info("server", `Stashes running at http://localhost:${port}`);
   logger.info("server", `Proxying user app from http://localhost:${userDevPort}`);
   logger.info("server", `Project: ${projectPath}`);
-  return server;
+  if (port !== requestedPort) {
+    logger.info("server", `Port ${requestedPort} was in use, using ${port} instead`);
+  }
+  return { port, appProxyPort, stashPortStart, stashPortEnd };
 }
 
 // ../mcp/src/tools/browse.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stashes",
-  "version": "0.1.47",
+  "version": "0.1.48",
   "type": "module",
   "description": "Generate AI-powered UI design explorations in your project",
   "keywords": [