zigmini 0.8.0-beta.3 → 0.8.0-beta.4

package/src/omo/generations.ts

@@ -1,4 +1,5 @@
 import type { RuntimeSlot } from "../runtime/paths.ts";
+import { activeRecord, type SlotRegistry, slotUrl } from "../runtime/slots.ts";
 import type { OmoClientHandlers, OmoEvent, OmoStatus } from "./client.ts";
 
 /**
@@ -55,18 +56,43 @@ type Listed = { sessionId?: unknown; sessionPath?: unknown };
 
 const LIVENESS_TIMEOUT_MS = 5000;
 
+/**
+ * Bug 134: an installed gateway gets ZGW_OMO_URL from config.env, and it names this Mac's own slot a bridge. That value
+ * must not hide run/runtime-slots.json: when the update handoff restarts the gateway, the generation that still holds the
+ * sessions can be slot b. The registry is used unless ZGW_OMO_URL names another OMO (Docker, tests).
+ */
+export function startupGenerations(explicitUrl: string | undefined, localUrl: string, registry: () => SlotRegistry | null): { endpoints: GenerationEndpoint[]; active: RuntimeSlot } {
+	const url = explicitUrl || localUrl;
+	const listed = isLocalBridge(url, localUrl) ? registry() : null;
+	if (listed === null) return { endpoints: [{ slot: "a", url }], active: "a" };
+	return { endpoints: listed.slots.map((record) => ({ slot: record.slot, url: slotUrl(record) })), active: activeRecord(listed).slot };
+}
+
+function isLocalBridge(url: string, localUrl: string): boolean {
+	if (!URL.canParse(url)) return false;
+	const given = new URL(url);
+	const local = new URL(localUrl);
+	return given.protocol === local.protocol && given.port === local.port && given.pathname === "/" && given.search === "" &&
+		(given.hostname === "127.0.0.1" || given.hostname === "localhost");
+}
+
 /**
  * Bug 118: after a bridge restart the previous OMO host can still hold its claim on a session file for a moment (the
  * bridge's SIGTERM ends the host without waiting for it). The new host answers open_session with `session_path_in_use`
  * and `errorData.retry_after_ms` until that claim is gone; OMO documents the refusal as retryable. The open waits it out
  * for at most SESSION_PATH_WAIT_MS and never takes the path from the other host.
+ * Bug 134: `session_held` (a live holder outside this host's daemon family, e.g. a draining older generation) is waited
+ * out the same way; it carries no retry hint, so the open waits SESSION_PATH_RETRY_MS between tries.
  */
 export const SESSION_PATH_WAIT_MS = 60_000;
 export const SESSION_PATH_RETRY_MS = 2000;
 
-/** Milliseconds to wait before reopening after this error, or null when the error is not a held session path. */
+/** Milliseconds to wait before reopening after this error, or null when the error is not a held session. */
 export function sessionPathRetryMs(error: unknown): number | null {
-	if (typeof error !== "object" || error === null || (error as { code?: unknown }).code !== "session_path_in_use") return null;
+	if (typeof error !== "object" || error === null) return null;
+	const code = (error as { code?: unknown }).code;
+	if (code === "session_held") return SESSION_PATH_RETRY_MS;
+	if (code !== "session_path_in_use") return null;
 	const data = (error as { errorData?: unknown }).errorData;
 	const hint = typeof data === "object" && data !== null ? (data as { retry_after_ms?: unknown }).retry_after_ms : undefined;
 	return typeof hint === "number" && hint > 0 ? hint : SESSION_PATH_RETRY_MS;

package/web/app.js

@@ -41,6 +41,7 @@ import { createEnrollment, NO_DEVICES_LINE, REVOKE_ARMED_LABEL, REVOKE_LABEL } f
 import { canUpdate, checkFailedLine, noticeLine, parseNotice, progressLine, questionGate, resultLine, UPDATE_CHECK_PATH, UPDATE_CONSENT_PATH, UPDATE_PATH, UPDATE_STATE_PATH, UPDATE_STATUS_PATH, updateStep, updateView } from "./update.js";
 import { createAppDownload } from "./app-download.js";
 import { cleanRequest, cleanResultLine, GC_CLEAN_PATH, GC_PATH, gcView } from "./gc.js";
+import { manualFailureText, manualLinkLang, manualUrl, otherLang } from "./manual.js";
 
 const $ = (id) => document.getElementById(id);
 const state = {
@@ -3689,4 +3690,93 @@ settings.toggle.onclick = () => (settings.open ? closeSettings() : openSettings(
 settings.close.onclick = closeSettings;
 enrollEls.renew.onclick = () => void enrollment.renew();
 
+// 설정 "매뉴얼": GET /api/manual (Korean first) rendered with the chat Markdown renderer; the first-line language links
+// and the header button switch to the other language in place.
+const manualEls = { el: $("manual"), open: $("manual-open"), close: $("manual-close"), title: $("manual-title"), lang: $("manual-lang"), status: $("manual-status"), body: $("manual-body") };
+const manualView = { open: false, lang: "ko", load: 0 };
+
+function showManualStatus(text, error = false) {
+	manualEls.status.textContent = text;
+	manualEls.status.classList.toggle("error", error);
+	manualEls.status.hidden = text === "";
+}
+
+async function loadManual(lang) {
+	const load = ++manualView.load;
+	manualView.lang = lang;
+	manualEls.lang.textContent = otherLang(lang) === "en" ? "English" : "한국어";
+	manualEls.el.lang = lang;
+	showManualStatus("매뉴얼을 불러오는 중입니다.");
+	let status = 0;
+	let text = "";
+	try {
+		const res = await fetch(manualUrl(lang));
+		status = res.status;
+		if (res.ok) text = await res.text();
+	} catch (error) {
+		console.warn("manual:", error);
+	}
+	if (load !== manualView.load) return;
+	if (text === "") {
+		manualEls.body.innerHTML = "";
+		showManualStatus(manualFailureText(status), true);
+		return;
+	}
+	showManualStatus("");
+	renderMarkdown(manualEls.body, text);
+	manualEls.body.scrollTop = 0;
+}
+
+function openManual() {
+	if (manualView.open) return;
+	manualView.open = true;
+	manualEls.el.hidden = false;
+	manualEls.open.setAttribute("aria-expanded", "true");
+	manualEls.title.focus();
+	void loadManual(manualView.lang);
+}
+
+function closeManual() {
+	if (!manualView.open) return;
+	manualView.open = false;
+	manualView.load++;
+	manualEls.el.hidden = true;
+	manualEls.open.setAttribute("aria-expanded", "false");
+	manualEls.open.focus();
+}
+
+manualEls.open.onclick = openManual;
+manualEls.close.onclick = closeManual;
+manualEls.lang.onclick = () => void loadManual(otherLang(manualView.lang));
+manualEls.body.addEventListener("click", (ev) => {
+	const link = ev.target instanceof Element ? ev.target.closest("a") : null;
+	const lang = manualLinkLang(link?.getAttribute("href"));
+	if (lang === null) return;
+	ev.preventDefault();
+	void loadManual(lang);
+});
+manualEls.el.addEventListener("click", (ev) => {
+	if (ev.target === manualEls.el) closeManual();
+});
+manualEls.el.addEventListener("keydown", (ev) => {
+	if (ev.isComposing) return;
+	if (ev.key === "Escape") {
+		ev.preventDefault();
+		closeManual();
+		return;
+	}
+	if (ev.key !== "Tab") return;
+	const focusable = [...manualEls.el.querySelectorAll(FOCUSABLE)].filter((node) => node.offsetParent !== null);
+	if (focusable.length === 0) return;
+	const first = focusable[0];
+	const last = focusable.at(-1);
+	if (ev.shiftKey && (document.activeElement === first || document.activeElement === manualEls.title)) {
+		ev.preventDefault();
+		last.focus();
+	} else if (!ev.shiftKey && document.activeElement === last) {
+		ev.preventDefault();
+		first.focus();
+	}
+});
+
 connect();

package/web/index.html

@@ -122,6 +122,7 @@
     <div class="settings-card">
       <header class="settings-head">
         <h2 class="settings-title" id="settings-title" tabindex="-1">설정</h2>
+        <button type="button" class="text-btn" id="manual-open" title="사용자 매뉴얼: 화면, 단축키, 기능" aria-haspopup="dialog" aria-expanded="false" aria-controls="manual">매뉴얼</button>
         <button type="button" class="icon-btn settings-close" id="settings-close" aria-label="설정 닫기" title="닫기 (Esc)">×</button>
       </header>
       <div class="settings-body">
@@ -185,6 +186,17 @@
       </div>
     </div>
   </aside>
+  <aside class="settings manual" id="manual" role="dialog" aria-labelledby="manual-title" hidden>
+    <div class="settings-card manual-card">
+      <header class="settings-head">
+        <h2 class="settings-title" id="manual-title" tabindex="-1">매뉴얼</h2>
+        <button type="button" class="text-btn" id="manual-lang">English</button>
+        <button type="button" class="icon-btn settings-close" id="manual-close" aria-label="매뉴얼 닫기" title="닫기 (Esc)">×</button>
+      </header>
+      <p class="manual-status" id="manual-status" role="status" aria-live="polite" hidden></p>
+      <div class="manual-body msg-text" id="manual-body"></div>
+    </div>
+  </aside>
   <aside class="dev" id="dev">
     <header class="dev-head">
       <span>이벤트</span>

package/web/manual.d.ts

@@ -0,0 +1,7 @@
+export type ManualLang = "ko" | "en";
+export declare const MANUAL_PATH: string;
+export declare const MANUAL_MISSING_TEXT: string;
+export declare function manualUrl(lang: string): string;
+export declare function otherLang(lang: string): ManualLang;
+export declare function manualLinkLang(href: string | null | undefined): ManualLang | null;
+export declare function manualFailureText(status: number): string;

package/web/manual.js

@@ -0,0 +1,29 @@
+// The user manual view of 설정 "매뉴얼": decisions only, with no DOM, so test/unit/manual.test.ts and the mutation run
+// drive them directly; app.js fetches GET /api/manual and renders the Markdown with the chat renderer.
+
+export const MANUAL_PATH = "/api/manual";
+export const MANUAL_MISSING_TEXT = "이 게이트웨이 버전에는 매뉴얼이 없습니다. 게이트웨이를 업데이트하면 볼 수 있습니다.";
+
+export function manualUrl(lang) {
+	return `${MANUAL_PATH}?lang=${lang === "en" ? "en" : "ko"}`;
+}
+
+export function otherLang(lang) {
+	return lang === "en" ? "ko" : "en";
+}
+
+/** The language a rendered link switches to: the manuals' first line links manual.md (English) and manual.ko.md (Korean). */
+export function manualLinkLang(href) {
+	if (typeof href !== "string") return null;
+	const file = href.split(/[?#]/)[0].split("/").pop();
+	if (file === "manual.md") return "en";
+	if (file === "manual.ko.md") return "ko";
+	return null;
+}
+
+/** The line for a failed load: [status] is the HTTP status, or 0 when the request itself failed. */
+export function manualFailureText(status) {
+	if (status === 404) return MANUAL_MISSING_TEXT;
+	if (status === 0) return "매뉴얼을 불러오지 못했습니다. 게이트웨이 연결을 확인하세요.";
+	return `매뉴얼을 불러오지 못했습니다 (HTTP ${status}).`;
+}

package/web/style.css

@@ -423,6 +423,11 @@ button { font: inherit; color: inherit; cursor: pointer; }
 .gc-message:empty { display: none; }
 .gc-message.error { color: #f38b8d; }
 .gc-actions { display: flex; justify-content: flex-end; }
+.settings.manual { z-index: 31; }
+.manual-card { width: min(100%, 760px); height: 100%; }
+.manual-status { margin: 0; padding: 12px 16px 0; font-size: 13px; color: var(--muted); }
+.manual-status.error { color: #f38b8d; }
+.manual-body { flex: 1; min-height: 0; overflow-y: auto; overscroll-behavior: contain; padding: 16px; }
 @media (max-width: 640px) {
 	.settings { padding: 0; }
 	.settings-card { width: 100%; height: 100dvh; max-height: none; border: 0; border-radius: 0; }