supbuddy 3.3.2 → 3.3.3

package/dist/bin.js

@@ -19812,7 +19812,7 @@ function cliBuildKind(env3 = process.env) {
   return raw === "host" || raw === "npm" ? raw : "dev";
 }
 function cliVersion(env3 = process.env) {
-  return "3.3.2".trim() || "0.0.0-dev";
+  return "3.3.3".trim() || "0.0.0-dev";
 }
 function isDevBuild(env3) {
   return cliBuildKind(env3) === "dev";
@@ -41733,15 +41733,24 @@ loopback IP \u2014 target the app's **canonical** dev port (Next.js \`:3000\`, V
 share \`127.0.0.1\` and need unique ports.
 `;
 }
+function supabaseServicePort(project, type2, managedKey, stock) {
+  const svc = (project.services ?? []).find((s) => s.type === type2);
+  const snapshot = svc?.port ?? svc?.ports?.[0];
+  if (typeof snapshot === "number") return snapshot;
+  const managed = project.supabaseManaged?.ports?.[managedKey];
+  return typeof managed === "number" ? managed : stock;
+}
 function renderServicesMd(ctx) {
   const placeholder = ctx.write_secrets ? "<set; populated by Supbuddy>" : "<see Supbuddy \u2192 Configure, or use MCP tools>";
+  const apiPort = supabaseServicePort(ctx.project, "supabase-kong", "api.port", 54321);
+  const studioPort = supabaseServicePort(ctx.project, "supabase-studio", "studio.port", 54323);
   return HEADER(".supbuddy/services.md") + `# Services
 
 ## Supabase
 
 - **Status:** ${ctx.supabase_running ? "running" : "stopped"}
-- **API URL:** ${ctx.supabase_running ? "http://127.0.0.1:54321" : "<not running>"}
-- **Studio:** ${ctx.supabase_running ? "http://127.0.0.1:54323" : "<not running>"}
+- **API URL:** ${ctx.supabase_running ? `http://127.0.0.1:${apiPort}` : "<not running>"}
+- **Studio:** ${ctx.supabase_running ? `http://127.0.0.1:${studioPort}` : "<not running>"}
 - **Anon key:** ${placeholder}
 - **Service role key:** ${placeholder}
 
@@ -42311,10 +42320,17 @@ function buildContext(projectId, generatedAt) {
     project,
     mappings,
     proxyState: s.proxyState,
-    // Supabase status isn't yet exposed on the store — keep the honest "stopped"
-    // placeholder. Compose status IS live: the scanner writes per-service state
-    // into `project.services`, so reflect any running compose service here.
-    supabase_running: false,
+    // Both statuses come off the SAME per-service snapshot the scanner writes
+    // into `project.services`. Supabase used to be hardcoded `false` here — so
+    // every `.supbuddy/services.md` in every registered repo said "Supabase:
+    // stopped" whatever the truth, and `--force` re-rendered the same lie. An
+    // agent reading that file on a project with the stack up concluded the DB
+    // was down and acted on it. `startsWith('supabase')` (not an exact type)
+    // because the snapshot carries one entry per container — supabase-kong,
+    // -db, -studio, … — and matches get_supabase_status / the CLI / the TUI.
+    supabase_running: (project.services ?? []).some(
+      (sv) => typeof sv.type === "string" && sv.type.startsWith("supabase") && sv.status === "running"
+    ),
     compose_running: (project.services ?? []).some((sv) => sv.type === "compose" && sv.status === "running"),
     mcp_endpoint: `http://127.0.0.1:${s.mcpServerState.bound_port ?? s.settings.mcp.port}/mcp`,
     mcp_running: !!s.mcpServerState.running,

package/dist/daemon/worker.cjs

@@ -48467,7 +48467,7 @@ headers = { Authorization = "Bearer ${token}" }
 `;
   let updated;
   if (existing.includes("[mcp_servers.supbuddy]")) {
-    updated = existing.replace(/\[mcp_servers\.supbuddy\][\s\S]*?(?=\n\[|$)/, block.trim());
+    updated = existing.replace(/\[mcp_servers\.supbuddy\][\s\S]*?(?=\n\[|$)/, () => block.trim());
   } else {
     updated = (existing.endsWith("\n") ? existing : existing + "\n") + block;
   }
@@ -48749,7 +48749,7 @@ const systemTools = {
     return { ok: true, granted: missing, scopes: nextScopes };
   }
 };
-function requireProjectPath(projectId) {
+function requireProjectPath$1(projectId) {
   const project = useStore.getState().getProject(projectId);
   if (!project?.path) {
     throw new McpError("invalid_args", `Project ${projectId} not found or has no path`);
@@ -48759,7 +48759,7 @@ function requireProjectPath(projectId) {
 const addonTools = {
   // Create a starter supbuddy.addons.yml (create-if-absent; never clobbers).
   scaffold_addons: async (a) => {
-    const projectPath = requireProjectPath(a.project_id);
+    const projectPath = requireProjectPath$1(a.project_id);
     const { scaffoldAddonsFile: scaffoldAddonsFile2 } = await __vitePreload(async () => {
       const { scaffoldAddonsFile: scaffoldAddonsFile3 } = await Promise.resolve().then(() => addonManager);
       return { scaffoldAddonsFile: scaffoldAddonsFile3 };
@@ -48769,7 +48769,7 @@ const addonTools = {
   },
   // Run the declared one-shot add-on seed step (idempotent unless force=true).
   seed_addons: async (a) => {
-    const projectPath = requireProjectPath(a.project_id);
+    const projectPath = requireProjectPath$1(a.project_id);
     const { runSeedIfNeeded: runSeedIfNeeded2 } = await __vitePreload(async () => {
       const { runSeedIfNeeded: runSeedIfNeeded3 } = await Promise.resolve().then(() => addonManager);
       return { runSeedIfNeeded: runSeedIfNeeded3 };
@@ -48964,14 +48964,26 @@ const supabaseExtrasTools = {
   // Mirror supabase:analytics:set (worker/index.ts:2506)
   // Does NOT trigger auto-restart (the IPC handler's autoRestart flag).
   // Callers that want a restart should follow up with restart_supabase.
+  // Enabling analytics can CREATE the `[analytics]` section, and a created section
+  // carries the CLI's stock port — so a thin project's block is re-imposed over it
+  // and reported here through the same shaping the other config-replacing tools use.
+  // `thinBlock` is not spread into the result: it carries the whole config.toml.
   set_supabase_analytics: async (args) => {
     requireProject$1(args.project_id);
     const { setAnalyticsEnabled: setAnalyticsEnabled2 } = await __vitePreload(async () => {
       const { setAnalyticsEnabled: setAnalyticsEnabled3 } = await Promise.resolve().then(() => supabaseHealth);
       return { setAnalyticsEnabled: setAnalyticsEnabled3 };
     }, false ? __VITE_PRELOAD__ : void 0);
-    const result = await setAnalyticsEnabled2(args.project_id, args.enabled);
-    return { ok: true, project_id: args.project_id, ...result };
+    const { thinBlock, thinBlockError, ...result } = await setAnalyticsEnabled2(
+      args.project_id,
+      args.enabled
+    );
+    return {
+      ok: true,
+      project_id: args.project_id,
+      ...result,
+      ...shapeThinBlock("set_supabase_analytics", thinBlock ?? null, thinBlockError ?? null)
+    };
   },
   // Mirror bundle:validate (worker/index.ts:3145)
   validate_bundle: async (args) => {
@@ -49472,11 +49484,11 @@ async function ensureHostedSnapshot(projectPath) {
 function rewriteSiteUrl(raw, newValue) {
   const re = /^(\s*site_url\s*=\s*)"[^"]*"/m;
   if (re.test(raw)) {
-    return raw.replace(re, `$1"${newValue}"`);
+    return raw.replace(re, (_m, lead) => `${lead}"${newValue}"`);
   }
   const authRe = /^\[auth\]\s*$/m;
   if (authRe.test(raw)) {
-    return raw.replace(authRe, `[auth]
+    return raw.replace(authRe, () => `[auth]
 site_url = "${newValue}"`);
   }
   const sep = raw.endsWith("\n") ? "" : "\n";
@@ -49486,20 +49498,22 @@ site_url = "${newValue}"
 `;
 }
 function rewriteStudioApiUrl(raw, newValue) {
-  const sectionRe = /^\[studio\][\s\S]*?(?=^\[|\Z)/m;
+  const sectionRe = /^\[studio\][\s\S]*?(?=^\[|$(?![\s\S]))/m;
   const sectionMatch = raw.match(sectionRe);
   if (sectionMatch) {
     const section = sectionMatch[0];
+    const start = sectionMatch.index ?? 0;
+    const end = start + section.length;
     const re = /^(\s*api_url\s*=\s*)"[^"]*"/m;
     if (re.test(section)) {
-      const updatedSection = section.replace(re, `$1"${newValue}"`);
-      return raw.replace(section, updatedSection);
+      const updatedSection = section.replace(re, (_m, lead) => `${lead}"${newValue}"`);
+      return raw.slice(0, start) + updatedSection + raw.slice(end);
     }
     const headerRe = /^\[studio\]\s*$/m;
     if (headerRe.test(section)) {
-      const updatedSection = section.replace(headerRe, `[studio]
+      const updatedSection = section.replace(headerRe, () => `[studio]
 api_url = "${newValue}"`);
-      return raw.replace(section, updatedSection);
+      return raw.slice(0, start) + updatedSection + raw.slice(end);
     }
   }
   const sep = raw.endsWith("\n") ? "" : "\n";
@@ -49512,16 +49526,16 @@ function rewriteAdditionalRedirectUrls(raw, values) {
   const body = values.map((v) => `"${v}"`).join(", ");
   const re = /^(\s*additional_redirect_urls\s*=\s*)\[[^\]]*\]/m;
   if (re.test(raw)) {
-    return raw.replace(re, `$1[${body}]`);
+    return raw.replace(re, (_m, lead) => `${lead}[${body}]`);
   }
   const authWithSite = /^(\[auth\][\s\S]*?^(\s*site_url\s*=\s*"[^"]*")\s*$)/m;
   if (authWithSite.test(raw)) {
-    return raw.replace(authWithSite, `$1
+    return raw.replace(authWithSite, (_m, kept) => `${kept}
 additional_redirect_urls = [${body}]`);
   }
   const authRe = /^\[auth\]\s*$/m;
   if (authRe.test(raw)) {
-    return raw.replace(authRe, `[auth]
+    return raw.replace(authRe, () => `[auth]
 additional_redirect_urls = [${body}]`);
   }
   const sep = raw.endsWith("\n") ? "" : "\n";
@@ -50814,15 +50828,24 @@ loopback IP — target the app's **canonical** dev port (Next.js \`:3000\`, Vite
 share \`127.0.0.1\` and need unique ports.
 `;
 }
+function supabaseServicePort(project, type2, managedKey, stock) {
+  const svc = (project.services ?? []).find((s) => s.type === type2);
+  const snapshot2 = svc?.port ?? svc?.ports?.[0];
+  if (typeof snapshot2 === "number") return snapshot2;
+  const managed = project.supabaseManaged?.ports?.[managedKey];
+  return typeof managed === "number" ? managed : stock;
+}
 function renderServicesMd(ctx) {
   const placeholder = ctx.write_secrets ? "<set; populated by Supbuddy>" : "<see Supbuddy → Configure, or use MCP tools>";
+  const apiPort = supabaseServicePort(ctx.project, "supabase-kong", "api.port", 54321);
+  const studioPort = supabaseServicePort(ctx.project, "supabase-studio", "studio.port", 54323);
   return HEADER(".supbuddy/services.md") + `# Services
 
 ## Supabase
 
 - **Status:** ${ctx.supabase_running ? "running" : "stopped"}
-- **API URL:** ${ctx.supabase_running ? "http://127.0.0.1:54321" : "<not running>"}
-- **Studio:** ${ctx.supabase_running ? "http://127.0.0.1:54323" : "<not running>"}
+- **API URL:** ${ctx.supabase_running ? `http://127.0.0.1:${apiPort}` : "<not running>"}
+- **Studio:** ${ctx.supabase_running ? `http://127.0.0.1:${studioPort}` : "<not running>"}
 - **Anon key:** ${placeholder}
 - **Service role key:** ${placeholder}
 
@@ -51397,10 +51420,17 @@ function buildContext(projectId, generatedAt) {
     project,
     mappings,
     proxyState: s.proxyState,
-    // Supabase status isn't yet exposed on the store — keep the honest "stopped"
-    // placeholder. Compose status IS live: the scanner writes per-service state
-    // into `project.services`, so reflect any running compose service here.
-    supabase_running: false,
+    // Both statuses come off the SAME per-service snapshot the scanner writes
+    // into `project.services`. Supabase used to be hardcoded `false` here — so
+    // every `.supbuddy/services.md` in every registered repo said "Supabase:
+    // stopped" whatever the truth, and `--force` re-rendered the same lie. An
+    // agent reading that file on a project with the stack up concluded the DB
+    // was down and acted on it. `startsWith('supabase')` (not an exact type)
+    // because the snapshot carries one entry per container — supabase-kong,
+    // -db, -studio, … — and matches get_supabase_status / the CLI / the TUI.
+    supabase_running: (project.services ?? []).some(
+      (sv) => typeof sv.type === "string" && sv.type.startsWith("supabase") && sv.status === "running"
+    ),
     compose_running: (project.services ?? []).some((sv) => sv.type === "compose" && sv.status === "running"),
     mcp_endpoint: `http://127.0.0.1:${s.mcpServerState.bound_port ?? s.settings.mcp.port}/mcp`,
     mcp_running: !!s.mcpServerState.running,
@@ -51949,7 +51979,22 @@ function parseEnvText(text) {
   }
   return out;
 }
+function requireProjectPath(project) {
+  const p = project.path;
+  if (typeof p !== "string" || p.trim() === "") {
+    const label = project.name ? `"${project.name}" (${project.id})` : project.id;
+    throw new Error(
+      `Project ${label} has no recorded directory, so its env cannot be read. Refusing rather than returning an empty preview, which would read as "this project has no secrets". Re-add the project so its directory is recorded, then preview again.`
+    );
+  }
+  return p;
+}
 async function previewProjectEnv(projectPath, files = [".env", ".env.local", ".env.development"], inBoxEquivalent) {
+  if (typeof projectPath !== "string" || projectPath.trim() === "") {
+    throw new Error(
+      `previewProjectEnv needs the project's directory, got ${JSON.stringify(projectPath)}. Callers holding a Project should go through requireProjectPath(), which names the project.`
+    );
+  }
   const out = [];
   const seen2 = /* @__PURE__ */ new Set();
   for (const file of files) {
@@ -51988,7 +52033,13 @@ const cloudTools = {
   preview_cloud_env: async (a) => {
     const p = useStore.getState().getProject(a.project_id);
     if (!p) throw new McpError("plan_not_found", `Project ${a.project_id} not found`);
-    const entries = await previewProjectEnv(p.path, a.files);
+    let projectPath;
+    try {
+      projectPath = requireProjectPath(p);
+    } catch (e) {
+      throw new McpError("invalid_args", e.message);
+    }
+    const entries = await previewProjectEnv(projectPath, a.files);
     const counts = entries.reduce((acc, e) => {
       acc[e.verdict] = (acc[e.verdict] ?? 0) + 1;
       return acc;
@@ -53126,6 +53177,7 @@ function filenameToImage(file) {
   return file.replace(/\.tar$/, "").replace(/_/g, "/");
 }
 const execFileAsync$2 = util$1.promisify(child_process.execFile);
+const STOCK_ANALYTICS_PORT = SUPABASE_PORT_KEYS.find((k) => k.key === "analytics.port")?.stock ?? 54327;
 function assertNotUnprovisionedVm(project, op) {
   if (project?.isolation === "vm") {
     throw new Error(
@@ -53179,6 +53231,7 @@ enabled = ${value}`);
   return raw + `${sep}
 [analytics]
 enabled = ${value}
+port = ${STOCK_ANALYTICS_PORT}
 `;
 }
 async function setAnalyticsEnabled(projectId, value) {
@@ -53188,9 +53241,17 @@ async function setAnalyticsEnabled(projectId, value) {
   const configPath = path.join(project.path, "supabase", "config.toml");
   const raw = await fs.readFile(configPath, "utf-8");
   const next = rewriteAnalyticsEnabled(raw, value);
-  if (next === raw) return { configPath, bytes: Buffer.byteLength(raw) };
+  if (next === raw) {
+    return { configPath, bytes: Buffer.byteLength(raw), thinBlock: null, thinBlockError: null };
+  }
   await fs.writeFile(configPath, next, "utf-8");
-  return { configPath, bytes: Buffer.byteLength(next) };
+  const { reapplyThinBlockAfterConfigReplace: reapplyThinBlockAfterConfigReplace2 } = await __vitePreload(async () => {
+    const { reapplyThinBlockAfterConfigReplace: reapplyThinBlockAfterConfigReplace3 } = await Promise.resolve().then(() => supabaseManager);
+    return { reapplyThinBlockAfterConfigReplace: reapplyThinBlockAfterConfigReplace3 };
+  }, false ? __VITE_PRELOAD__ : void 0);
+  const thin = await reapplyThinBlockAfterConfigReplace2(project.path, "analytics toggle");
+  const bytes = await fs.stat(configPath).then((s) => s.size).catch(() => Buffer.byteLength(next));
+  return { configPath, bytes, thinBlock: thin.block, thinBlockError: thin.error };
 }
 function recordSupabaseFailure(projectId, operation, error) {
   const store2 = useStore.getState();
@@ -56417,10 +56478,10 @@ process.on("message", async (message) => {
       case "supabase:analytics:set": {
         try {
           const { projectId, enabled, autoRestart } = message.data;
-          const result = await setAnalyticsEnabled(projectId, !!enabled);
+          const { configPath, bytes } = await setAnalyticsEnabled(projectId, !!enabled);
           process.send({
             type: "supabase:analytics:set:response",
-            data: { ...result, restartScheduled: autoRestart !== false }
+            data: { configPath, bytes, restartScheduled: autoRestart !== false }
           });
           if (autoRestart !== false) {
             restartSupabaseForProject(projectId, io).catch((err) => {
@@ -57112,7 +57173,7 @@ process.on("message", async (message) => {
           if (typeof projectId !== "string" || !projectId) throw new Error("cloud:preview-env requires a projectId");
           const project = useStore.getState().getProject(projectId);
           if (!project) throw new Error(`Project ${projectId} not found`);
-          const entries = await previewProjectEnv(project.path);
+          const entries = await previewProjectEnv(requireProjectPath(project));
           process.send({
             type: "cloud:preview-env:response",
             _rid: message._rid,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supbuddy",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "Run multiple Supabase projects at once on custom local domains with HTTPS. A headless CLI and daemon (proxy, DNS, Supabase/Compose lifecycle, MCP) for macOS and Linux.",
   "keywords": [
     "supabase",