create-egregore 0.21.0-runtime-mvp.6 → 0.21.0-runtime-mvp.8

package/assets/egregore-launcher.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// egregore-launcher-version: 0.21.0-runtime-mvp.6
+// egregore-launcher-version: 0.21.0-runtime-mvp.8
 //
 // egregore — launch and browse Egregore instances from your terminal.
 // Installed by create-egregore. Reads ~/.egregore/instances.json.
@@ -35,7 +35,7 @@ const crypto = require("node:crypto");
 const { spawnSync, spawn } = require("node:child_process");
 const readline = require("node:readline");
 
-const VERSION = "0.21.0-runtime-mvp.6";
+const VERSION = "0.21.0-runtime-mvp.8";
 const REGISTRY = path.join(os.homedir(), ".egregore", "instances.json");
 const DEFAULT_FILE = path.join(os.homedir(), ".egregore", "default");
 const UPDATE_CACHE_FILE = path.join(os.homedir(), ".egregore", "update-check.json");
@@ -3143,6 +3143,7 @@ function renderUpgradePanel({ inst, data, candidate, retrieval, mode, notice, wi
     if (notice) lines.push(boxLine(notice, innerWidth, margin));
     const keys = [];
     if (!status || status === "none" || ["pending", "failed", "interrupted", "cancelled", "rolled-back"].includes(status)) keys.push(`${BOLD}p${RESET}${DIM} prepare${RESET}`);
+    if (status === "active" && candidate && candidate !== (data && data.active_version)) keys.push(`${BOLD}p${RESET}${DIM} prepare update${RESET}`);
     if (status === "ready-to-activate") keys.push(`${BOLD}a${RESET}${DIM} activate${RESET}`);
     if (status === "preparing") keys.push(`${BOLD}c${RESET}${DIM} cancel${RESET}`);
     if (status === "active") keys.push(`${BOLD}r${RESET}${DIM} roll back${RESET}`);
@@ -3169,6 +3170,40 @@ function renderSettingsPanel({ inst, data, cursor, view, domain, items, listCurs
     emptyBoxLine(innerWidth, margin),
   ];
 
+  if (view === "workflow") {
+    const current = (d.workflow === "simple" || d.workflow === "staged") ? d.workflow : "custom";
+    lines.push(boxLine(`${BOLD}Git workflow${RESET}`, innerWidth, margin));
+    lines.push(emptyBoxLine(innerWidth, margin));
+    const options = [
+      { key: "simple", name: "Simple", detail: "pull requests target main — one branch, no release staging" },
+      { key: "staged", name: "Staged", detail: "pull requests target develop; releases promote to main" },
+    ];
+    options.forEach((option, i) => {
+      const sel = i === listCursor;
+      const marker = sel ? `${CYAN}❯${RESET}` : " ";
+      const active = option.key === current ? ` ${GREEN}● current${RESET}` : "";
+      lines.push(boxLine(`${marker} ${sel ? BOLD : ""}${option.name}${RESET}${active}`, innerWidth, margin));
+      lines.push(boxLine(`   ${DIM}${option.detail}${RESET}`, innerWidth, margin));
+    });
+    if (current === "custom") {
+      lines.push(emptyBoxLine(innerWidth, margin));
+      lines.push(boxLine(`${YELLOW}● current: CUSTOM${RESET} ${DIM}— pull requests target ${d.base_branch || "?"}${RESET}`, innerWidth, margin));
+      lines.push(boxLine(`   ${DIM}selecting an option above replaces this for the whole org${RESET}`, innerWidth, margin));
+    }
+    lines.push(emptyBoxLine(innerWidth, margin));
+    if (mode === "confirm") {
+      const target = listCursor === 0 ? "SIMPLE — pull requests target main" : "STAGED — pull requests target develop";
+      lines.push(boxLine(`${YELLOW}Switch ${BOLD}${title}${RESET}${YELLOW} to ${target}?${RESET}`, innerWidth, margin));
+      lines.push(boxLine(`${DIM}This edits the org's committed egregore.json for everyone.${RESET} ${DIM}y / N${RESET}`, innerWidth, margin));
+    } else {
+      if (notice) lines.push(boxLine(notice, innerWidth, margin));
+      lines.push(boxLine(`${DIM}↑↓ nav · ${RESET}${BOLD}enter${RESET}${DIM} select · ← back · q quit${RESET}`, innerWidth, margin));
+    }
+    lines.push(emptyBoxLine(innerWidth, margin));
+    lines.push(`${margin}${DIM}└${"─".repeat(innerWidth)}┘${RESET}`);
+    return lines;
+  }
+
   if (view === "privacy" || view === "telemetry") {
     lines.push(boxLine(`${BOLD}${view === "privacy" ? "Privacy & access" : "Telemetry"}${RESET}`, innerWidth, margin));
     lines.push(emptyBoxLine(innerWidth, margin));
@@ -3330,7 +3365,7 @@ function renderSettingsPanel({ inst, data, cursor, view, domain, items, listCurs
     });
     lines.push(emptyBoxLine(innerWidth, margin));
     if (notice) lines.push(boxLine(notice, innerWidth, margin));
-    lines.push(boxLine(`${DIM}↑↓ nav · ${RESET}${BOLD}enter${RESET}${DIM} ${cursor === 3 || cursor === 4 ? "toggle" : "open"} · ← back · q quit${RESET}`, innerWidth, margin));
+    lines.push(boxLine(`${DIM}↑↓ nav · ${RESET}${BOLD}enter${RESET}${DIM} ${cursor === 3 ? "toggle" : "open"} · ← back · q quit${RESET}`, innerWidth, margin));
   }
 
   lines.push(emptyBoxLine(innerWidth, margin));
@@ -3827,9 +3862,12 @@ async function browser(args = {}) {
           render(); return;
         }
         const status = state.upgradeData && state.upgradeData.status;
-        if (chunk === "p" && (!status || ["none", "pending", "failed", "interrupted", "cancelled", "rolled-back"].includes(status))) {
+        const activeUpdatable = status === "active"
+          && state.upgradeCandidate
+          && state.upgradeCandidate !== (state.upgradeData && state.upgradeData.active_version);
+        if (chunk === "p" && (!status || activeUpdatable || ["none", "pending", "failed", "interrupted", "cancelled", "rolled-back"].includes(status))) {
           const staged = state.upgradeData
-            && !["none", "cancelled", "rolled-back"].includes(status)
+            && !["none", "cancelled", "rolled-back", "active"].includes(status)
             && state.upgradeData.candidate_version;
           if (!staged) {
             const candidate = state.upgradeCandidate;
@@ -3876,6 +3914,36 @@ async function browser(args = {}) {
         if (key.ctrl && key.name === "c") { cleanup(); process.exit(130); }
         if (key.name === "q") { cleanup(); resolve(); return; }
 
+        if (S.settingsView === "workflow") {
+          if (S.settingsMode === "confirm") {
+            if (chunk === "y" || chunk === "Y") {
+              settingsRunVerb(["workflow", S.settingsListCursor === 0 ? "simple" : "staged"]);
+              S.settingsMode = "browse";
+              S.settingsView = "menu";
+              render(); return;
+            }
+            if (key.name === "escape" || chunk === "n" || chunk === "N" || key.name === "return") {
+              S.settingsMode = "browse"; render(); return;
+            }
+            return;
+          }
+          if (key.name === "escape" || key.name === "left") {
+            S.settingsView = "menu"; S.settingsNotice = ""; render(); return;
+          }
+          if (key.name === "up" || key.name === "k") { S.settingsListCursor = (S.settingsListCursor + 1) % 2; render(); return; }
+          if (key.name === "down" || key.name === "j") { S.settingsListCursor = (S.settingsListCursor + 1) % 2; render(); return; }
+          if (key.name === "return") {
+            const chosen = S.settingsListCursor === 0 ? "simple" : "staged";
+            const current = (S.settingsData && S.settingsData.workflow) || "custom";
+            if (chosen === current) {
+              S.settingsNotice = `${DIM}already on ${chosen.toUpperCase()}${RESET}`;
+              render(); return;
+            }
+            S.settingsMode = "confirm"; render(); return;
+          }
+          return;
+        }
+
         if (S.settingsView === "privacy" || S.settingsView === "telemetry") {
           const backToMenu = () => {
             S.settingsView = "menu"; S.settingsMode = "browse"; S.settingsInput = ""; S.settingsNotice = ""; render();
@@ -4072,8 +4140,9 @@ async function browser(args = {}) {
             settingsRunVerb(["hosting", on ? "off" : "on"]);
             render();
           } else if (S.settingsCursor === 4) {
-            const simple = (S.settingsData && S.settingsData.workflow) === "simple";
-            settingsRunVerb(["workflow", simple ? "staged" : "simple"]);
+            S.settingsView = "workflow"; S.settingsMode = "browse";
+            S.settingsListCursor = (S.settingsData && S.settingsData.workflow) === "simple" ? 0 : 1;
+            S.settingsNotice = "";
             render();
           } else {
             const domain = S.settingsCursor === 5 ? "repo" : S.settingsCursor === 6 ? "admin" : "people";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-egregore",
-  "version": "0.21.0-runtime-mvp.6",
+  "version": "0.21.0-runtime-mvp.8",
   "description": "Set up Egregore for your team in one command — installs the egregore launcher and your choice of Claude Code, Codex, or Pi.",
   "license": "MIT",
   "bin": {