@insforge/cli 0.1.67 → 0.1.69

package/dist/index.js

@@ -1416,8 +1416,8 @@ function registerBranchListCommand(branch) {
 import { writeFileSync as writeFileSync2 } from "fs";
 import * as clack5 from "@clack/prompts";
 function registerBranchMergeCommand(branch) {
-  branch.command("merge <name>").description("Merge a branch back to its parent project").option("--dry-run", "Compute the diff and print rendered SQL; do not apply").option("-y, --yes", "Skip confirmation prompt").option("--save-sql <path>", "Write rendered SQL preview to a file").action(async (name, opts, cmd) => {
-    const { json, apiUrl } = getRootOpts(cmd);
+  branch.command("merge <name>").description("Merge a branch back to its parent project").option("--dry-run", "Compute the diff and print rendered SQL; do not apply").option("--save-sql <path>", "Write rendered SQL preview to a file").action(async (name, opts, cmd) => {
+    const { json, apiUrl, yes } = getRootOpts(cmd);
     try {
       await requireAuth(apiUrl);
       const project = getProjectConfig();
@@ -1469,7 +1469,7 @@ function registerBranchMergeCommand(branch) {
         }
         return;
       }
-      if (!opts.yes && !json) {
+      if (!yes && !json) {
         const parentLabel = project.branched_from?.project_name ?? project.project_name;
         const confirmed = await clack5.confirm({
           message: `Apply this merge to parent project '${parentLabel}'?`
@@ -1523,8 +1523,8 @@ import * as clack6 from "@clack/prompts";
 var POLL_INTERVAL_MS2 = 3e3;
 var POLL_TIMEOUT_MS2 = 5 * 60 * 1e3;
 function registerBranchResetCommand(branch) {
-  branch.command("reset <name>").description("Reset a branch's database back to T0 (the parent snapshot at branch creation)").option("-y, --yes", "Skip confirmation").action(async (name, opts, cmd) => {
-    const { json, apiUrl } = getRootOpts(cmd);
+  branch.command("reset <name>").description("Reset a branch's database back to T0 (the parent snapshot at branch creation)").action(async (name, _opts, cmd) => {
+    const { json, apiUrl, yes } = getRootOpts(cmd);
     try {
       await requireAuth(apiUrl);
       const project = getProjectConfig();
@@ -1539,7 +1539,7 @@ function registerBranchResetCommand(branch) {
         );
       }
       const entryState = target.branch_state;
-      if (!opts.yes && !json) {
+      if (!yes && !json) {
         const confirmed = await clack6.confirm({
           message: `Reset branch '${name}' back to T0? This wipes all schema/data/policy/function/migration changes made on the branch since creation.` + (entryState === "merged" ? " (Branch is currently merged \u2014 reset will reopen it for further work.)" : "")
         });
@@ -1601,8 +1601,8 @@ async function pollUntilReady2(branchId, apiUrl, showProgress, startingState) {
 // src/commands/branch/delete.ts
 import * as clack7 from "@clack/prompts";
 function registerBranchDeleteCommand(branch) {
-  branch.command("delete <name>").description("Delete a branch").option("-y, --yes", "Skip confirmation").action(async (name, opts, cmd) => {
-    const { json, apiUrl } = getRootOpts(cmd);
+  branch.command("delete <name>").description("Delete a branch").action(async (name, _opts, cmd) => {
+    const { json, apiUrl, yes } = getRootOpts(cmd);
     try {
       await requireAuth(apiUrl);
       const project = getProjectConfig();
@@ -1611,7 +1611,7 @@ function registerBranchDeleteCommand(branch) {
       const branches = await listBranchesApi(parentId, apiUrl);
       const target = branches.find((b) => b.name === name);
       if (!target) throw new CLIError(`Branch '${name}' not found.`);
-      if (!opts.yes && !json) {
+      if (!yes && !json) {
         const confirmed = await clack7.confirm({
           message: `Delete branch '${name}'? This terminates its EC2 instance.`
         });
@@ -1901,6 +1901,33 @@ function extractEnvKeys(content) {
   }
   return keys;
 }
+function extractEnvPairs(content) {
+  const out = /* @__PURE__ */ new Map();
+  for (const line of content.split("\n")) {
+    const trimmed = line.replace(/^\s*export\s+/, "").trimStart();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+    const m = trimmed.match(/^([A-Za-z_][A-Za-z0-9_]*)\s*=(.*)$/);
+    if (m) out.set(m[1], m[2]);
+  }
+  return out;
+}
+function refreshStaleEnvDefaults(existing, manifestDefaults, platformValues) {
+  const refreshed = [];
+  const lines = existing.split("\n").map((line) => {
+    const m = line.match(/^([A-Za-z_][A-Za-z0-9_]*)\s*=(.*)$/);
+    if (!m) return line;
+    const key = m[1];
+    const userValue = m[2];
+    const def = manifestDefaults.get(key);
+    const real = platformValues.get(key);
+    if (def !== void 0 && real !== void 0 && userValue === def && real !== def) {
+      refreshed.push(key);
+      return `${key}=${real}`;
+    }
+    return line;
+  });
+  return { updated: lines.join("\n"), refreshed };
+}
 function filterCollidingEnvLines(append, existingKeys) {
   const dropped = [];
   const out = [];
@@ -1995,6 +2022,7 @@ async function applyAuthProvider(provider, cwd, projectConfig, json) {
       envExampleAppended: false,
       envLocalWritten: false,
       envKeysSkipped: [],
+      envKeysRefreshed: [],
       nextSteps: manifest.nextSteps
     };
     const allFiles = (await walkFiles(providerDir)).filter((rel) => !PROVIDER_META_FILES.has(rel));
@@ -2063,13 +2091,20 @@ async function applyAuthProvider(provider, cwd, projectConfig, json) {
       await fs.writeFile(envLocalPath, filled + "\n");
       result.envLocalWritten = true;
     } else {
-      const { filtered, dropped } = filterCollidingEnvLines(filled, existingLocalKeys);
+      const manifestDefaults = extractEnvPairs(manifest.envExampleAppend);
+      const platformValues = extractEnvPairs(filled);
+      const { updated, refreshed } = refreshStaleEnvDefaults(existingLocal, manifestDefaults, platformValues);
+      const refreshedSet = new Set(refreshed);
+      const keysAfterRefresh = /* @__PURE__ */ new Set([...existingLocalKeys, ...refreshedSet]);
+      const { filtered, dropped } = filterCollidingEnvLines(filled, keysAfterRefresh);
       const hasNewKey = filtered.split("\n").some((l) => /^[A-Z][A-Z0-9_]*=/.test(l));
-      if (hasNewKey) {
-        await fs.writeFile(envLocalPath, existingLocal.replace(/\n*$/, "\n\n") + filtered + "\n");
+      if (refreshed.length > 0 || hasNewKey) {
+        const base = hasNewKey ? updated.replace(/\n*$/, "\n\n") + filtered + "\n" : updated;
+        await fs.writeFile(envLocalPath, base);
         result.envLocalWritten = true;
       }
       result.envKeysSkipped = Array.from(/* @__PURE__ */ new Set([...result.envKeysSkipped, ...dropped]));
+      result.envKeysRefreshed = Array.from(/* @__PURE__ */ new Set([...result.envKeysRefreshed, ...refreshed]));
     }
     if (!jwtSecret && !json) {
       clack9.log.warn("Could not auto-fill JWT_SECRET \u2014 run `npx @insforge/cli secrets get JWT_SECRET` and paste it into .env.local.");
@@ -2079,6 +2114,11 @@ async function applyAuthProvider(provider, cwd, projectConfig, json) {
         `Kept your existing values for: ${result.envKeysSkipped.join(", ")}. If any of these need the auth-provider's defaults, see .env.example for reference.`
       );
     }
+    if (result.envKeysRefreshed.length > 0 && !json) {
+      clack9.log.info(
+        `Refreshed stale platform defaults: ${result.envKeysRefreshed.join(", ")}. Your value matched the manifest's default, so we replaced it with the live one.`
+      );
+    }
     return result;
   } finally {
     await cleanup();
@@ -6789,7 +6829,7 @@ function registerDiagnoseCommands(diagnoseCmd2) {
         const s = !json ? clack14.spinner() : null;
         s?.start("Collecting diagnostic data...");
         const data2 = await collectDiagnosticData(projectId, ossMode, apiUrl);
-        const cliVersion = "0.1.67";
+        const cliVersion = "0.1.69";
         s?.stop("Data collected");
         if (!json) {
           console.log(`