@maintainer-pro/ai-cli 0.1.9 → 0.1.12

package/dist/index.cjs

@@ -62,6 +62,7 @@ __export(index_exports, {
   createToolValidator: () => createToolValidator,
   defaultAiServerApp: () => defaultAiServerApp,
   detectHostAppsFromFiles: () => detectHostAppsFromFiles,
+  detectHostAppsFromFolders: () => detectHostAppsFromFolders,
   ensureAiServerApp: () => ensureAiServerApp,
   ensureProjectDataDir: () => ensureProjectDataDir,
   ensureSingleHost: () => ensureSingleHost,
@@ -71,8 +72,10 @@ __export(index_exports, {
   getProviderPreference: () => getProviderPreference,
   hostAppsCachePath: () => hostAppsCachePath2,
   hostAppsFingerprint: () => hostAppsFingerprint,
+  hostAppsFingerprintForFolders: () => hostAppsFingerprintForFolders,
   inspectAndRepairWorkspace: () => inspectAndRepairWorkspace,
   inspectConfigOnly: () => inspectConfigOnly,
+  isAiServerApp: () => isAiServerApp,
   isDevMode: () => isDevMode,
   isIgnoredRelative: () => isIgnoredRelative,
   isInsideWorkspace: () => isInsideWorkspace,
@@ -105,7 +108,9 @@ __export(index_exports, {
   sanitizeProjectId: () => sanitizeProjectId,
   saveChatAttachments: () => saveChatAttachments,
   toNextRoute: () => toNextRoute,
+  unionHostApps: () => unionHostApps,
   upsertManagedIgnoreFile: () => upsertManagedIgnoreFile,
+  withoutAiServerApp: () => withoutAiServerApp,
   writeCollaboraterApps: () => writeCollaboraterApps,
   writeHostAppsCache: () => writeHostAppsCache
 });
@@ -2601,9 +2606,9 @@ var inspectJsonSchema = import_zod.z.object({
   name: import_zod.z.string().max(200).optional(),
   summary: import_zod.z.string().max(800).optional(),
   scripts: import_zod.z.object({
-    ui: import_zod.z.string().min(1).max(64).optional(),
-    backend: import_zod.z.string().min(1).max(64).optional(),
-    app: import_zod.z.string().min(1).max(64).optional()
+    ui: import_zod.z.string().min(1).max(200).optional(),
+    backend: import_zod.z.string().min(1).max(200).optional(),
+    app: import_zod.z.string().min(1).max(200).optional()
   }).optional(),
   ports: import_zod.z.object({
     ui: import_zod.z.number().int().min(1).max(65535).optional(),
@@ -2631,12 +2636,12 @@ function setupSystemPrompt(input) {
 Workspace: ${input.workspaceDir}
 App name: ${input.appName || "the app"}
 
-Inspect this repository (package.json, README, lockfiles, existing env files, how the UI and API start).
+Inspect this repository (package.json, README, lockfiles, Maven/Gradle/sbt files, Spring/Play config, existing env files, how the UI and API start).
 You MAY edit files to fix setup problems that would block local run or the chat widget (env keys, widget mount, missing config).
 Do NOT start long-lived dev servers, tunnels, or install global tools.
 Do NOT run \`npm run dev\` or similar.
 
-Script names you report MUST already exist in package.json. Omit chat/ai-server scripts.
+Script names you report MUST already exist in package.json, OR be a real JVM start command (./gradlew bootRun, mvn spring-boot:run, sbt run). Omit chat/ai-server scripts.
 
 End with a short human summary AND one \`\`\`json fence with:
 
@@ -2708,7 +2713,21 @@ ${lock}`);
     "vite.config.mjs",
     "next.config.js",
     "next.config.mjs",
-    "next.config.ts"
+    "next.config.ts",
+    "pom.xml",
+    "build.gradle",
+    "build.gradle.kts",
+    "build.sbt",
+    "application.yml",
+    "application.yaml",
+    "application.properties",
+    "application.conf",
+    "src/main/resources/application.yml",
+    "src/main/resources/application.yaml",
+    "src/main/resources/application.properties",
+    "src/main/resources/application.conf",
+    "src/main/resources/application-dev.yml",
+    "conf/application.conf"
   ]) {
     const body = readSnippet(import_node_path7.default.join(folder, rel), 2500);
     if (body) parts.push(`### ${rel}
@@ -2736,7 +2755,7 @@ DO NOT edit, create, or delete any files.
 DO NOT run shell commands, install packages, or start servers.
 Only infer how this project runs locally from the excerpts.
 
-Script names you report MUST appear in package.json scripts. Omit chat/ai-server scripts.
+Script names you report MUST appear in package.json scripts, OR be a JVM start command such as \`./gradlew bootRun\`, \`mvn spring-boot:run\`, or \`sbt run\`. Omit chat/ai-server scripts.
 
 Reply with a short human summary AND one \`\`\`json fence with:
 
@@ -2744,8 +2763,8 @@ Reply with a short human summary AND one \`\`\`json fence with:
   "kind": "next" | "vite" | "html" | "empty" | "other",
   "name": "package or folder name",
   "summary": "one sentence about this project",
-  "scripts": { "ui": "dev:client", "backend": "dev:server" },
-  "ports": { "ui": 5173, "backend": 4100 },
+  "scripts": { "ui": "dev:client", "backend": "sbt run" },
+  "ports": { "ui": 5173, "backend": 9000 },
   "issues": ["uncertainties"],
   "fixes": [],
   "ready": true
@@ -2878,6 +2897,9 @@ function dataInput(folder, extra) {
 function hostAppsCachePath2(folder, extra) {
   return hostAppsCachePath(dataInput(folder, extra));
 }
+function isAiServerApp(app) {
+  return Boolean(app && (app.role === "ai-server" || app.id === AI_SERVER_APP_ID));
+}
 function defaultAiServerApp(port = AI_SERVER_DEFAULT_PORT) {
   return {
     id: AI_SERVER_APP_ID,
@@ -2908,7 +2930,8 @@ function normalizeHostApp(raw) {
       row.source
     ) ? row.source : "manual",
     locked: row.locked === true || id === AI_SERVER_APP_ID || role === "ai-server",
-    host: role !== "ai-server" && id !== AI_SERVER_APP_ID && row.host === true
+    host: role !== "ai-server" && id !== AI_SERVER_APP_ID && row.host === true,
+    folderPath: typeof row.folderPath === "string" && row.folderPath.trim() ? row.folderPath.trim().slice(0, 500) : null
   };
 }
 function ensureSingleHost(apps) {
@@ -2938,24 +2961,17 @@ function normalizeHostApps(raw) {
   const apps = [];
   for (const item of raw) {
     const app = normalizeHostApp(item);
-    if (!app || seen.has(app.id)) continue;
+    if (!app || isAiServerApp(app) || seen.has(app.id)) continue;
     seen.add(app.id);
     apps.push(app);
   }
   return apps;
 }
-function ensureAiServerApp(apps, preferredPort = AI_SERVER_DEFAULT_PORT) {
-  const next = normalizeHostApps(apps);
-  const existing = next.find((app) => app.id === AI_SERVER_APP_ID || app.role === "ai-server");
-  if (existing) {
-    existing.id = AI_SERVER_APP_ID;
-    existing.role = "ai-server";
-    existing.locked = true;
-    existing.host = false;
-    existing.name = existing.name || "AI server";
-    return ensureSingleHost([existing, ...next.filter((app) => app !== existing)]);
-  }
-  return ensureSingleHost([defaultAiServerApp(preferredPort), ...next]);
+function withoutAiServerApp(apps) {
+  return ensureSingleHost(normalizeHostApps(apps).filter((app) => !isAiServerApp(app)));
+}
+function ensureAiServerApp(apps, _preferredPort = AI_SERVER_DEFAULT_PORT) {
+  return withoutAiServerApp(apps);
 }
 function readText(file) {
   try {
@@ -3021,19 +3037,151 @@ function configPort(folder, files) {
   }
   return 0;
 }
-function hostAppsFingerprint(folder) {
+var JVM_CONFIG_FILES = [
+  "pom.xml",
+  "build.gradle",
+  "build.gradle.kts",
+  "settings.gradle",
+  "settings.gradle.kts",
+  "build.sbt",
+  "gradle.properties",
+  "application.yml",
+  "application.yaml",
+  "application.properties",
+  "application.conf",
+  "src/main/resources/application.yml",
+  "src/main/resources/application.yaml",
+  "src/main/resources/application.properties",
+  "src/main/resources/application.conf",
+  "src/main/resources/application-dev.yml",
+  "src/main/resources/application-dev.yaml",
+  "src/main/resources/application-dev.properties",
+  "src/main/resources/application-local.yml",
+  "conf/application.conf",
+  "conf/application.yml"
+];
+var FINGERPRINT_FILES = [
+  "package.json",
+  ...ENV_FILES,
+  "vite.config.ts",
+  "vite.config.js",
+  "vite.config.mjs",
+  "next.config.js",
+  "next.config.mjs",
+  "next.config.ts",
+  ...JVM_CONFIG_FILES
+];
+function fileExists(folder, rel) {
+  return import_node_fs4.default.existsSync(import_node_path8.default.join(folder, rel));
+}
+function jvmPortFromText(text) {
+  const patterns = [
+    /(?:^|\n)\s*server\.port\s*[:=]\s*["']?(\d{2,5})/im,
+    /(?:^|\n)\s*SERVER_PORT\s*[:=]\s*["']?(\d{2,5})/im,
+    /(?:^|\n)\s*play\.http\.port\s*[:=]\s*["']?(\d{2,5})/im,
+    /(?:^|\n)\s*play\.server\.http\.port\s*[:=]\s*["']?(\d{2,5})/im,
+    /(?:^|\n)\s*http\.port\s*[:=]\s*["']?(\d{2,5})/im,
+    /-Dserver\.port=(\d{2,5})/i,
+    /systemProperty\s*\(?\s*["']server\.port["']\s*,\s*["']?(\d{2,5})/i,
+    /["']play\.http\.port["']\s*->\s*["']?(\d{2,5})/i
+  ];
+  for (const pattern of patterns) {
+    const match = text.match(pattern);
+    const port = parsePort(match?.[1]);
+    if (port) return port;
+  }
+  const yaml = text.match(
+    /(?:^|\n)server:\s*\n(?:[ \t].*\n)*?[ \t]+port:\s*["']?(\d{2,5})/i
+  );
+  return parsePort(yaml?.[1]);
+}
+function looksLike(haystack, ...needles) {
+  const lower = haystack.toLowerCase();
+  return needles.some((needle) => lower.includes(needle.toLowerCase()));
+}
+function wrapperCommand(folder, unixName, winName, fallback) {
+  if (process.platform === "win32") {
+    return fileExists(folder, winName) ? `.\\${winName}` : fallback;
+  }
+  return fileExists(folder, unixName) ? `./${unixName}` : fallback;
+}
+function detectJvmHostApp(folder, opts = {}) {
+  const resolved = import_node_path8.default.resolve(folder);
+  const texts = [];
+  let foundMarker = false;
+  for (const rel of JVM_CONFIG_FILES) {
+    const text = readText(import_node_path8.default.join(resolved, rel));
+    if (!text) continue;
+    foundMarker = true;
+    texts.push(text);
+  }
+  const hasGradle = fileExists(resolved, "build.gradle") || fileExists(resolved, "build.gradle.kts") || fileExists(resolved, "settings.gradle") || fileExists(resolved, "settings.gradle.kts") || fileExists(resolved, "gradlew") || fileExists(resolved, "gradlew.bat");
+  const hasMaven = fileExists(resolved, "pom.xml");
+  const hasSbt = fileExists(resolved, "build.sbt");
+  if (!foundMarker && !hasGradle && !hasMaven && !hasSbt) return null;
+  const blob = texts.join("\n");
+  const { merged } = readProjectEnvLayers(resolved);
+  const envPort = parsePort(merged.SERVER_PORT) || parsePort(merged.PLAY_HTTP_PORT) || parsePort(merged.HTTP_PORT) || parsePort(merged.PORT);
+  let port = envPort || jvmPortFromText(blob);
+  const isPlay = looksLike(
+    blob,
+    "play.http.port",
+    "enablePlugins(Play",
+    "com.typesafe.play",
+    "play-scala",
+    "play-java"
+  );
+  const isSpring = looksLike(
+    blob,
+    "spring-boot",
+    "springframework.boot",
+    "org.springframework"
+  );
+  const isQuarkus = looksLike(blob, "quarkus", "io.quarkus");
+  if (!port) {
+    port = isPlay ? 9e3 : 8080;
+  }
+  let startCommand = null;
+  if (hasGradle) {
+    const gradle = wrapperCommand(resolved, "gradlew", "gradlew.bat", "gradle");
+    startCommand = isQuarkus ? `${gradle} quarkusDev` : isPlay ? `${gradle} run` : `${gradle} bootRun`;
+  } else if (hasMaven) {
+    const mvn = wrapperCommand(resolved, "mvnw", "mvnw.cmd", "mvn");
+    startCommand = isQuarkus ? `${mvn} quarkus:dev` : `${mvn} spring-boot:run`;
+  } else if (hasSbt) {
+    startCommand = "sbt run";
+  }
+  const framework = isPlay ? "Play" : isSpring ? "Spring" : isQuarkus ? "Quarkus" : hasSbt ? "Scala" : "JVM";
+  return {
+    id: "backend",
+    name: opts.appName ? `${opts.appName} API` : `${framework} backend`,
+    role: "backend",
+    port,
+    startCommand,
+    source: envPort ? "env" : "package",
+    folderPath: resolved
+  };
+}
+function uniqueWorkspaceDirs(primary, extra) {
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const raw of [primary, ...extra || []]) {
+    if (!raw || typeof raw !== "string") continue;
+    const resolved = import_node_path8.default.resolve(raw.trim());
+    const key = process.platform === "win32" ? resolved.toLowerCase() : resolved;
+    if (seen.has(key)) continue;
+    seen.add(key);
+    out.push(resolved);
+  }
+  return out;
+}
+function folderSlug(folder) {
+  return import_node_path8.default.basename(import_node_path8.default.resolve(folder)).replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 24) || "app";
+}
+function fingerprintOneFolder(folder) {
   const resolved = import_node_path8.default.resolve(folder);
   const parts = [];
-  for (const rel of [
-    "package.json",
-    ...ENV_FILES,
-    "vite.config.ts",
-    "vite.config.js",
-    "vite.config.mjs",
-    "next.config.js",
-    "next.config.mjs",
-    "next.config.ts"
-  ]) {
+  for (const rel of FINGERPRINT_FILES) {
     const file = import_node_path8.default.join(resolved, rel);
     if (!import_node_fs4.default.existsSync(file)) continue;
     try {
@@ -3042,7 +3190,16 @@ function hostAppsFingerprint(folder) {
     } catch {
     }
   }
-  return (0, import_node_crypto4.createHash)("sha256").update(parts.join("|") || resolved).digest("hex").slice(0, 32);
+  return parts.join("|") || resolved;
+}
+function hostAppsFingerprint(folder) {
+  const resolved = import_node_path8.default.resolve(folder);
+  return (0, import_node_crypto4.createHash)("sha256").update(fingerprintOneFolder(resolved)).digest("hex").slice(0, 32);
+}
+function hostAppsFingerprintForFolders(folders) {
+  const dirs = uniqueWorkspaceDirs(folders[0] || "", folders.slice(1));
+  const parts = dirs.map((dir) => `${dir}:${fingerprintOneFolder(dir)}`);
+  return (0, import_node_crypto4.createHash)("sha256").update(parts.join("||") || "empty").digest("hex").slice(0, 32);
 }
 function pickScript(scripts, names) {
   return names.find((name) => scripts[name] && !isChatScript(name, scripts[name])) || null;
@@ -3056,14 +3213,15 @@ function detectHostAppsFromFiles(folder, opts = {}) {
   const apps = [];
   const envAi = parsePort(merged.AI_SERVER_PORT) || parsePort(merged.AI_SERVER_URL);
   const aiPort = envAi || parsePort(opts.preferredAiPort, AI_SERVER_DEFAULT_PORT);
-  apps.push({
-    ...defaultAiServerApp(aiPort),
-    source: envAi ? "env" : "default"
-  });
   const envPorts = {
-    PORT: layers.filter((layer) => layer.file !== ".env.example").map((layer) => ({ file: layer.file, port: parsePort(layer.values.PORT) })).filter((row) => row.port),
+    PORT: layers.filter((layer) => layer.file !== ".env.example").map((layer) => ({
+      file: layer.file,
+      port: parsePort(layer.values.PORT) || parsePort(layer.values.SERVER_PORT) || parsePort(layer.values.PLAY_HTTP_PORT)
+    })).filter((row) => row.port),
     APP_URL: parsePort(merged.APP_URL || merged.NEXT_PUBLIC_APP_URL || merged.PUBLIC_URL),
-    API_PORT: parsePort(merged.API_PORT || merged.API_URL || merged.VITE_API_URL)
+    API_PORT: parsePort(
+      merged.API_PORT || merged.API_URL || merged.VITE_API_URL || merged.SERVER_PORT || merged.PLAY_HTTP_PORT || merged.HTTP_PORT
+    )
   };
   const portValues = [...new Set(envPorts.PORT.map((row) => row.port))];
   if (portValues.length > 1) {
@@ -3108,7 +3266,8 @@ function detectHostAppsFromFiles(folder, opts = {}) {
       port,
       startCommand: `npm run ${uiScript}`,
       source: uiFromEnv ? "env" : scriptPort ? "package" : "package",
-      host: true
+      host: true,
+      folderPath: resolved
     });
   } else if (uiFromEnv) {
     apps.push({
@@ -3118,7 +3277,8 @@ function detectHostAppsFromFiles(folder, opts = {}) {
       port: uiFromEnv,
       startCommand: scripts.dev ? "npm run dev" : null,
       source: "env",
-      host: true
+      host: true,
+      folderPath: resolved
     });
   }
   if (apiScript && apiScript !== uiScript) {
@@ -3130,19 +3290,80 @@ function detectHostAppsFromFiles(folder, opts = {}) {
       role: "backend",
       port,
       startCommand: `npm run ${apiScript}`,
-      source: envPorts.API_PORT ? "env" : "package"
+      source: envPorts.API_PORT ? "env" : "package",
+      folderPath: resolved
     });
   }
-  const hostApps = apps.filter((app) => app.role !== "ai-server");
+  const hasHostApp = apps.some((app) => app.role !== "ai-server");
+  const usedPorts = new Set(
+    apps.filter((app) => app.role !== "ai-server").map((app) => app.port)
+  );
+  const jvm = detectJvmHostApp(resolved, { appName: opts.appName });
+  if (jvm && !usedPorts.has(jvm.port)) {
+    apps.push({
+      ...jvm,
+      id: apps.some((app) => app.id === "backend") ? `backend-${folderSlug(resolved)}` : "backend",
+      host: !hasHostApp
+    });
+  } else if (jvm && usedPorts.has(jvm.port) && !hasHostApp) {
+    reasons.push(
+      `JVM config suggests port ${jvm.port}, which is already used by another detected app`
+    );
+  }
+  const tagged = apps.map(
+    (app) => app.role === "ai-server" || app.folderPath ? app : { ...app, folderPath: resolved }
+  );
+  const hostApps = tagged.filter((app) => app.role !== "ai-server");
   if (pkg && Object.keys(scripts).length && hostApps.length === 0) {
     reasons.push("Found package.json scripts but no host app port in env or config");
   }
   return {
-    apps: ensureAiServerApp(apps, aiPort),
+    apps: withoutAiServerApp(tagged),
     reasons,
     confused: reasons.length > 0
   };
 }
+function detectHostAppsFromFolders(folders, opts = {}) {
+  const dirs = uniqueWorkspaceDirs(folders[0] || "", folders.slice(1));
+  const reasons = [];
+  let confused = false;
+  const apps = [];
+  const usedIds = /* @__PURE__ */ new Set();
+  const usedPortSet = /* @__PURE__ */ new Set();
+  const primary = dirs[0];
+  for (const folder of dirs) {
+    const detected = detectHostAppsFromFiles(folder, opts);
+    confused = confused || detected.confused;
+    const base = import_node_path8.default.basename(folder);
+    for (const reason of detected.reasons) {
+      reasons.push(dirs.length > 1 ? `${base}: ${reason}` : reason);
+    }
+    for (const app of detected.apps) {
+      if (isAiServerApp(app)) continue;
+      let id = app.id;
+      if (usedIds.has(id)) id = `${app.id}-${folderSlug(folder)}`;
+      usedIds.add(id);
+      if (usedPortSet.has(app.port)) {
+        reasons.push(
+          `${base}: port ${app.port} is also used by another attached folder`
+        );
+        confused = true;
+      }
+      usedPortSet.add(app.port);
+      apps.push({
+        ...app,
+        id,
+        folderPath: import_node_path8.default.resolve(folder),
+        name: dirs.length > 1 && primary && folder !== primary && !app.name.includes(base) ? `${app.name} (${base})` : app.name
+      });
+    }
+  }
+  return {
+    apps: withoutAiServerApp(apps),
+    reasons,
+    confused
+  };
+}
 function readHostAppsCache(folder, extra) {
   try {
     const raw = JSON.parse(
@@ -3187,12 +3408,37 @@ function mergeDesiredHostApps(desired, detected) {
       ...local,
       ...app,
       startCommand: app.startCommand || local?.startCommand || null,
+      folderPath: app.folderPath || local?.folderPath || null,
       locked: app.locked || app.id === AI_SERVER_APP_ID || app.role === "ai-server",
       host: app.role === "ai-server" || app.id === AI_SERVER_APP_ID ? false : app.host === true || app.host !== false && local?.host === true
     };
   });
   return ensureAiServerApp(merged);
 }
+function unionHostApps(desired, detected) {
+  const merged = mergeDesiredHostApps(desired, detected);
+  const seenIds = new Set(merged.map((app) => app.id));
+  const seenPorts = new Set(merged.map((app) => app.port));
+  for (const app of detected) {
+    if (app.role === "ai-server") continue;
+    if (seenIds.has(app.id) || seenPorts.has(app.port)) continue;
+    seenIds.add(app.id);
+    seenPorts.add(app.port);
+    merged.push(app);
+  }
+  return ensureAiServerApp(merged);
+}
+function startCommandFromScript(script) {
+  if (!script || !script.trim()) return null;
+  const value = script.trim();
+  if (/\s/.test(value) || /[\\/]/.test(value) || value.includes(":")) {
+    if (/^(npm|pnpm|yarn|npx)\s/i.test(value)) return value;
+    if (/^(sbt|mvn|gradle|gradlew|mvnw|\.\\|\.\/)/i.test(value) || /\s/.test(value)) {
+      return value;
+    }
+  }
+  return `npm run ${value}`;
+}
 function appsFromInspectPorts(ports, scripts, name) {
   const apps = [];
   if (ports.ui || scripts.ui) {
@@ -3201,7 +3447,7 @@ function appsFromInspectPorts(ports, scripts, name) {
       name,
       role: "ui",
       port: parsePort(ports.ui, 5173),
-      startCommand: scripts.ui ? `npm run ${scripts.ui}` : null,
+      startCommand: startCommandFromScript(scripts.ui),
       source: "ai"
     });
   }
@@ -3210,8 +3456,8 @@ function appsFromInspectPorts(ports, scripts, name) {
       id: "backend",
       name: "Backend",
       role: "backend",
-      port: parsePort(ports.backend, 4100),
-      startCommand: scripts.backend ? `npm run ${scripts.backend}` : null,
+      port: parsePort(ports.backend, 8080),
+      startCommand: startCommandFromScript(scripts.backend),
       source: "ai"
     });
   }
@@ -3221,7 +3467,7 @@ function appsFromInspectPorts(ports, scripts, name) {
       name,
       role: "app",
       port: parsePort(ports.app, 3e3),
-      startCommand: scripts.app ? `npm run ${scripts.app}` : null,
+      startCommand: startCommandFromScript(scripts.app),
       source: "ai"
     });
   }
@@ -3299,11 +3545,12 @@ function projectSummaryFromDetect(folder, apps, opts = {}) {
   return `${name}: ${hostApps.map((app) => `${app.name} on ${app.port}${app.startCommand ? ` (${app.startCommand})` : ""}`).join(", ")}.`;
 }
 async function proposeHostAppsFromConfig(input) {
-  const folder = import_node_path8.default.resolve(input.workspaceDir);
+  const dirs = uniqueWorkspaceDirs(input.workspaceDir, input.workspaceDirs);
+  const folder = dirs[0] || import_node_path8.default.resolve(input.workspaceDir);
   const preferredAi = parsePort(input.preferredAiPort, AI_SERVER_DEFAULT_PORT);
-  const fingerprint = hostAppsFingerprint(folder);
+  const fingerprint = hostAppsFingerprintForFolders(dirs);
   const allowAi = input.allowAi !== false;
-  const detected = detectHostAppsFromFiles(folder, {
+  const detected = detectHostAppsFromFolders(dirs, {
     preferredAiPort: preferredAi,
     appName: input.appName
   });
@@ -3322,8 +3569,9 @@ async function proposeHostAppsFromConfig(input) {
         appName: input.appName,
         extraContext: [
           "File-based detection was uncertain or incomplete.",
+          dirs.length > 1 ? `This sandbox also has folders: ${dirs.slice(1).join(", ")}` : "",
           ...reasons
-        ].join("\n")
+        ].filter(Boolean).join("\n")
       });
       usedAi = true;
       const fromAi = appsFromInspectPorts(
@@ -3332,10 +3580,7 @@ async function proposeHostAppsFromConfig(input) {
         inspected.name || input.appName || "App"
       );
       if (fromAi.length) {
-        apps = ensureAiServerApp(
-          [defaultAiServerApp(preferredAi), ...fromAi],
-          preferredAi
-        );
+        apps = unionHostApps(fromAi, detected.apps);
       }
       if (inspected.summary) projectSummary = inspected.summary;
       if (inspected.issues?.length) {
@@ -3347,9 +3592,9 @@ async function proposeHostAppsFromConfig(input) {
       );
     }
   }
-  const alternatives = collectScriptAlternatives(folder, apps, {
-    appName: input.appName
-  });
+  const alternatives = dirs.flatMap(
+    (dir) => collectScriptAlternatives(dir, apps, { appName: input.appName })
+  );
   const confidence = proposalConfidence(apps, reasons, usedAi);
   const needsReview = confidence !== "high" || detected.confused || apps.filter((app) => app.role !== "ai-server").length === 0;
   return {
@@ -3364,11 +3609,12 @@ async function proposeHostAppsFromConfig(input) {
   };
 }
 async function resolveHostApps(input) {
-  const folder = import_node_path8.default.resolve(input.workspaceDir);
+  const dirs = uniqueWorkspaceDirs(input.workspaceDir, input.workspaceDirs);
+  const folder = dirs[0] || import_node_path8.default.resolve(input.workspaceDir);
   const loc = { sandboxId: input.sandboxId, dataDir: input.dataDir };
-  const fingerprint = hostAppsFingerprint(folder);
+  const fingerprint = hostAppsFingerprintForFolders(dirs);
   const preferredAi = parsePort(input.preferredAiPort, AI_SERVER_DEFAULT_PORT);
-  const detected = detectHostAppsFromFiles(folder, {
+  const detected = detectHostAppsFromFolders(dirs, {
     preferredAiPort: preferredAi,
     appName: input.appName
   });
@@ -3418,10 +3664,7 @@ Return the real local ports and npm script names.`
         inspected.scripts,
         inspected.name || input.appName || "App"
       );
-      const apps2 = ensureAiServerApp(
-        [defaultAiServerApp(preferredAi), ...fromAi],
-        preferredAi
-      );
+      const apps2 = withoutAiServerApp(fromAi);
       writeHostAppsCache(
         folder,
         apps2,
@@ -3504,6 +3747,7 @@ Return the real local ports and npm script names.`
   createToolValidator,
   defaultAiServerApp,
   detectHostAppsFromFiles,
+  detectHostAppsFromFolders,
   ensureAiServerApp,
   ensureProjectDataDir,
   ensureSingleHost,
@@ -3513,8 +3757,10 @@ Return the real local ports and npm script names.`
   getProviderPreference,
   hostAppsCachePath,
   hostAppsFingerprint,
+  hostAppsFingerprintForFolders,
   inspectAndRepairWorkspace,
   inspectConfigOnly,
+  isAiServerApp,
   isDevMode,
   isIgnoredRelative,
   isInsideWorkspace,
@@ -3547,7 +3793,9 @@ Return the real local ports and npm script names.`
   sanitizeProjectId,
   saveChatAttachments,
   toNextRoute,
+  unionHostApps,
   upsertManagedIgnoreFile,
+  withoutAiServerApp,
   writeCollaboraterApps,
   writeHostAppsCache
 });