@mirrowel/opencode-openshare 0.2.0-dev.1 → 0.2.0-dev.2

package/dist/dialogs.js

@@ -562,7 +562,7 @@ function InfoDialog(props) {
         unregister();
         popMode();
     });
-    return (_jsxs(DialogFrame, { api: props.api, title: props.title, children: [_jsx("scrollbox", { maxHeight: bodyHeight(), ref: (element) => (scroll = element), children: _jsx("box", { flexDirection: "column", paddingLeft: 1, paddingRight: 1, children: _jsx(InfoLines, { api: props.api, lines: lines() }) }) }), _jsxs("box", { flexDirection: "row", justifyContent: "space-between", width: "100%", paddingTop: 1, children: [_jsx("box", { flexDirection: "row", gap: 1, children: _jsx(For, { each: actions().filter((action) => action.key && action.key !== "enter"), children: (action) => (_jsx("text", { fg: action.danger ? theme().error : theme().textMuted, children: `${action.key}: ${action.title}` })) }) }), _jsx("box", { flexDirection: "row", gap: 1, children: _jsx(For, { each: actions(), children: (action) => (_jsx("box", { paddingLeft: 2, paddingRight: 2, backgroundColor: action.danger ? theme().error : theme().primary, onMouseUp: () => props.onDone(action.value), children: _jsx("text", { fg: theme().background, children: _jsx("b", { children: action.title }) }) })) }) })] })] }));
+    return (_jsxs(DialogFrame, { api: props.api, title: props.title, children: [_jsx("scrollbox", { maxHeight: bodyHeight(), ref: (element) => (scroll = element), children: _jsx("box", { flexDirection: "column", paddingLeft: 1, paddingRight: 1, children: _jsx(InfoLines, { api: props.api, lines: lines() }) }) }), _jsxs("box", { flexDirection: "row", justifyContent: "space-between", width: "100%", paddingTop: 1, children: [_jsx("box", { flexDirection: "row", gap: 1, children: _jsx(For, { each: actions().filter((action) => action.key && action.key !== "enter"), children: (action) => (_jsx("text", { fg: action.danger ? theme().error : theme().textMuted, children: `${action.key}: ${action.title}` })) }) }), _jsx("box", { flexDirection: "row", gap: 1, children: _jsx(For, { each: actions(), children: (action) => (_jsx("box", { paddingLeft: 2, paddingRight: 2, backgroundColor: action.key === "enter" ? (action.danger ? theme().error : theme().primary) : undefined, border: action.key === "enter" ? undefined : true, borderColor: action.danger ? theme().error : theme().textMuted, onMouseUp: () => props.onDone(action.value), children: _jsx("text", { fg: action.key === "enter" ? theme().background : action.danger ? theme().error : theme().textMuted, children: _jsx("b", { children: action.title }) }) })) }) })] })] }));
 }
 // --- confirm / alert on the InfoDialog body -------------------------------------
 export function showConfirmMenu(api, props) {

package/dist/settings.js

@@ -5,7 +5,7 @@
 //
 // Sections: Connection, Sharing, Read auth, Advanced, This session.
 import { configSourceMap, moduleDir, writeCandidates } from "./config.js";
-import { adminClient, adminTokenFor, confirmShare, currentConfig, deleteServerEntry, disconnectAtServer, enrollAtServer, hostOf, isConfigured, normServerUrl, probeAuthMode, probeWorker, patchSessionBinding, readBinding, readBindings, resolveRoot, rotateAtServer, runUnshareFlow, saveConfig, saveServerEntry, serverEntries, setShareFlag, } from "./share-flow.js";
+import { adminClient, adminTokenFor, currentConfig, deleteServerEntry, disconnectAtServer, enrollAtServer, hostOf, isConfigured, normServerUrl, probeAuthMode, probeWorker, patchSessionBinding, readBinding, readBindings, resolveRoot, rotateAtServer, runUnshareFlow, saveConfig, saveServerEntry, serverEntries, setShareFlag, shareWithConsent, workerDeleteShare, } from "./share-flow.js";
 import { DIALOG_WIDTH_COLUMNS, kvHeightPercentOf, kvWidthOf, nextDialogWidth, UI_HEIGHT_PERCENT_KV, UI_WIDTH_KV, clampHeightPercent } from "./ui-prefs.js";
 /** description suffix: `[from <source>]` when a key is overridden by a
  * file/env higher in the chain than the write target. */
@@ -903,26 +903,70 @@ export async function settingsDialog(host, startAtSession) {
     const sessionRows = async () => {
         if (!startAtSession)
             return [];
-        const binding = await readBinding(host.client, await resolveRoot(host.client, startAtSession));
-        const rows = [
-            {
-                title: binding?.url ? "Copy share link" : "Share this session",
+        const root = await resolveRoot(host.client, startAtSession);
+        const bindings = await readBindings(host.client, root);
+        const live = bindings.filter((b) => b.url && b.enabled !== false);
+        const rows = [];
+        if (live.length === 0) {
+            rows.push({
+                title: "Share this session",
                 value: "session:share",
-                description: binding?.url ? "copy the share URL to the clipboard" : "Set the share flag; the server plugin creates the page",
-                help: binding?.url
-                    ? `Copies the share URL to the clipboard.\n\nURL: ${binding.url}\nShare id: ${binding.id ?? "?"}`
-                    : "Publishes this session (and its subagent sessions) to the active server. The full history lands in the page — sharing mid-session is first-class, nothing is missed.",
-            },
-        ];
-        if (binding?.url) {
+                description: "set the share flag; the server plugin creates the page",
+                help: "Publishes this session (and its subagent sessions) to the active server. The full history lands in the page — sharing mid-session is first-class, nothing is missed. You will be asked to confirm before anything is published.",
+            });
+        }
+        else if (live.length === 1) {
+            const b = live[0];
+            rows.push({
+                title: "Copy share link",
+                value: "session:copy",
+                description: "copy the share URL to the clipboard",
+                help: `Copies the share URL to the clipboard.\n\nURL: ${b.url}\nShare id: ${b.id ?? "?"}`,
+            });
+        }
+        else {
+            for (const b of live) {
+                rows.push({
+                    title: `Copy link — ${hostOf(b.url || b.server)}`,
+                    value: `session:copy:${b.server}`,
+                    description: b.url,
+                    help: `Copies this server's share URL to the clipboard.\n\nURL: ${b.url}\nShare id: ${b.id}\n\nEach server carries an independent page of the same session.`,
+                });
+            }
+            rows.push({
+                title: "Copy all links",
+                value: "session:copyall",
+                description: `${live.length} servers`,
+                help: `Copies every bound server's share URL.\n\n${live.map((b) => `• ${b.url}`).join("\n")}`,
+            });
+        }
+        if (live.length) {
             rows.push({
                 title: "Stop sharing",
                 value: "session:unshare",
-                description: "delete the page(s), or leave a snapshot",
+                description: live.length > 1 ? `delete every page (${live.length} servers), or leave snapshots` : "delete the page, or leave a snapshot",
                 danger: true,
-                help: `Choose per run: DELETE every page server-side (links stop working — final "gone" state), or LEAVE AS-IS (stop updating; pages stay readable until their TTL — a frozen snapshot).\n\nURLs:\n${[binding.url].join("\n")}\n\nSharing again later always creates fresh page(s) with new URLs.`,
+                help: `Choose per run: DELETE every page server-side (links stop working — final "gone" state), or LEAVE AS-IS (stop updating; pages stay readable until their TTL — a frozen snapshot).\n\nURLs:\n${live.map((b) => b.url).join("\n")}\n\nSharing again later always creates fresh page(s) with new URLs.`,
             });
+            if (live.length > 1) {
+                rows.push({
+                    title: "Stop on one server…",
+                    value: "session:unshare:one",
+                    description: "delete or snapshot a single server's page",
+                    help: `Per-server stop: pick the server, then delete its page or leave it as a read-only snapshot. Other servers are unaffected.\n\nBound servers:\n${live.map((b) => `• ${b.server} — ${b.url}`).join("\n")}`,
+                });
+                const otherServers = serverEntries().filter((s) => !live.some((b) => b.server === s.url));
+                if (otherServers.length) {
+                    rows.push({
+                        title: "Share to another server…",
+                        value: "session:more",
+                        description: otherServers.map((s) => hostOf(s.url)).join(", "),
+                        help: `Adds one of your other configured servers as a destination for THIS session: it becomes the active server and the full history is mirrored there within seconds.\n\nAvailable:\n${otherServers.map((s) => `• ${s.url}`).join("\n")}`,
+                    });
+                }
+            }
         }
+        const binding = bindings[0];
         rows.push({
             title: "Session TTL override (days)",
             value: "session:ttl",
@@ -1033,16 +1077,97 @@ export async function settingsDialog(host, startAtSession) {
         }
         if (choice.startsWith("session:") && startAtSession) {
             const root = await resolveRoot(host.client, startAtSession);
-            const current = await readBinding(host.client, root);
+            const all = await readBindings(host.client, root);
+            const live = all.filter((b) => b.url && b.enabled !== false);
+            const current = all[0];
             if (choice === "session:share") {
                 if (!isConfigured(cfg)) {
                     await showInfo(host.ui, { title: "Not configured", message: "Connect a server (Servers group) first, then share." });
                     return;
                 }
-                const result = await confirmShare(host, root);
+                const result = await shareWithConsent(host, startAtSession);
                 host.ui.toast({ variant: result.ok ? "success" : "error", title: "OpenShare", message: result.message, duration: result.ok ? 8000 : 15000 });
                 return;
             }
+            if (choice === "session:copy" && live[0]) {
+                const okw = await host.clipboard.write(live[0].url);
+                host.ui.toast({ variant: okw ? "success" : "error", title: "OpenShare", message: okw ? `Share URL copied: ${live[0].url}` : `Clipboard failed — ${live[0].url}` });
+                return;
+            }
+            if (choice.startsWith("session:copy:")) {
+                const b = live.find((x) => `session:copy:${x.server}` === choice);
+                if (b) {
+                    const okw = await host.clipboard.write(b.url);
+                    host.ui.toast({ variant: okw ? "success" : "error", title: "OpenShare", message: okw ? `Share URL copied: ${b.url}` : `Clipboard failed — ${b.url}` });
+                }
+                return;
+            }
+            if (choice === "session:copyall") {
+                const joined = live.map((b) => b.url).filter(Boolean).join("\n");
+                const okw = await host.clipboard.write(joined);
+                host.ui.toast({ variant: okw ? "success" : "error", title: "OpenShare", message: okw ? `${live.length} share URL(s) copied` : "Clipboard failed" });
+                return;
+            }
+            if (choice === "session:unshare:one") {
+                const pick = await showSelect(host.ui, {
+                    title: "Stop on which server",
+                    options: [...live.map((b) => ({ title: hostOf(b.url || b.server), value: b.server, description: b.url })), { title: "Cancel", value: "__cancel" }],
+                });
+                if (!pick || pick === "__cancel")
+                    return;
+                const target = live.find((b) => b.server === pick);
+                if (!target)
+                    return;
+                const how = await showSelect(host.ui, {
+                    title: `Stop sharing — ${hostOf(target.url || target.server)}`,
+                    options: [
+                        { title: "Delete the page", value: "delete", description: "this link stops working for everyone", danger: true },
+                        { title: "Leave as-is (snapshot)", value: "leave", description: "stop updating; the page stays until its TTL" },
+                        { title: "Cancel", value: "__cancel" },
+                    ],
+                });
+                if (!how || how === "__cancel")
+                    return;
+                if (how === "leave") {
+                    await patchSessionBinding(host.client, root, (servers) => {
+                        delete servers[target.server];
+                        servers[target.server] = { optedOut: true };
+                    });
+                    host.ui.toast({ variant: "success", title: "OpenShare", message: `${hostOf(target.url || target.server)} left as-is — a snapshot until its TTL.` });
+                    return;
+                }
+                const targetEntry = all.find((b) => b.server === target.server);
+                if (!targetEntry?.secret) {
+                    host.ui.toast({ variant: "error", title: "OpenShare", message: "No secret for this page — cannot delete it server-side; binding cleared." });
+                    await patchSessionBinding(host.client, root, (servers) => {
+                        delete servers[target.server];
+                    });
+                    return;
+                }
+                const gone = await workerDeleteShare(target.server, target.id, targetEntry.secret);
+                await patchSessionBinding(host.client, root, (servers) => {
+                    delete servers[target.server];
+                });
+                host.ui.toast({ variant: gone ? "success" : "warning", title: "OpenShare", message: gone ? `Page deleted on ${hostOf(target.url || target.server)}.` : `Could not delete the page (it may already be gone) — binding cleared.` });
+                return;
+            }
+            if (choice === "session:more") {
+                const otherServers = serverEntries().filter((s) => !live.some((b) => b.server === s.url));
+                if (!otherServers.length)
+                    return;
+                const pick = await showSelect(host.ui, {
+                    title: "Share to another server",
+                    options: [...otherServers.map((s) => ({ title: hostOf(s.url), value: s.url, description: s.entry.label })), { title: "Cancel", value: "__cancel" }],
+                });
+                if (!pick || pick === "__cancel")
+                    return;
+                for (const s of serverEntries())
+                    if (s.url !== pick)
+                        saveServerEntry(s.url, { active: undefined });
+                saveServerEntry(pick, { active: true });
+                host.ui.toast({ variant: "success", title: "OpenShare", message: `${hostOf(pick)} activated — this session mirrors there within seconds.` });
+                return;
+            }
             if (choice === "session:unshare") {
                 const how = await showSelect(host.ui, {
                     title: "Stop sharing",

package/dist/share-flow.d.ts

@@ -9,7 +9,6 @@ export type SessionBinding = {
     enabled?: boolean;
     opts?: SessionOpts;
 };
-export declare const CONSENT_KV_KEY = "openshare_consent";
 export declare function pluginConfigPaths(baseDir?: string): string[];
 export declare function currentConfig(baseDir?: string): ShareConfig;
 /** Writes the config file. Target rule (owner-directed): the global
@@ -281,7 +280,13 @@ export type FlowResult = {
     url?: string;
     unconfigured?: boolean;
 };
-export declare function runShareFlow(host: ShareHostApi, sessionID: string | undefined): Promise<FlowResult>;
+/** Consent gate: EVERY share creation asks explicitly (per owner
+ * directive — no remembered consent, no silent creates). */
+export declare function requestShareConsent(host: ShareHostApi): Promise<boolean>;
+/** runShareFlow with the consent gate applied: share copies the link,
+ * unshared asks consent once, then creates. Every create path routes
+ * through here (/share, settings, gone-again). */
+export declare function shareWithConsent(host: ShareHostApi, sessionID: string | undefined): Promise<FlowResult>;
 /** Post-consent share: set the flag, wait for the URL, copy it. */
 export declare function confirmShare(host: ShareHostApi, rootSessionID: string): Promise<FlowResult>;
 export declare function runUnshareFlow(host: ShareHostApi, sessionID: string | undefined): Promise<FlowResult>;

package/dist/share-flow.js

@@ -16,7 +16,7 @@
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { loadConfig, moduleDir, configPaths, configHomePath, resolveServer, saveServerEntry, deleteServerEntry, METADATA_KEY } from "./config.js";
 import { dbg, dbgLog } from "./sidebar.js";
-export const CONSENT_KV_KEY = "openshare_consent";
+import { queueBindingWrite } from "./binding-queue.js";
 export function pluginConfigPaths(baseDir = moduleDir()) {
     return configPaths(baseDir);
 }
@@ -155,17 +155,22 @@ export function hostOf(url) {
  * server actions: opt-out entries, collision resolution). Reads-modifies-
  * writes the whole metadata to keep foreign keys intact. */
 export async function patchSessionBinding(client, sid, mutator) {
-    const info = await getSession(client, sid);
-    if (!info)
-        return false;
-    const metadata = { ...(info.metadata ?? {}) };
-    const raw = info.metadata?.[METADATA_KEY];
-    const binding = raw && typeof raw === "object" ? { ...raw } : { v: 2, servers: {} };
-    const servers = binding.servers && typeof binding.servers === "object" ? { ...binding.servers } : {};
-    mutator(servers, binding);
-    binding.servers = servers;
-    metadata[METADATA_KEY] = binding;
-    return patchMetadata(client, sid, metadata);
+    // the whole read-modify-write runs inside the shared per-session queue:
+    // the engine patches the same metadata (binding refresh) and interleaved
+    // RMWs silently lose one side's update (see binding-queue.ts)
+    return queueBindingWrite(sid, async () => {
+        const info = await getSession(client, sid);
+        if (!info)
+            return false;
+        const metadata = { ...(info.metadata ?? {}) };
+        const raw = info.metadata?.[METADATA_KEY];
+        const binding = raw && typeof raw === "object" ? { ...raw } : { v: 2, servers: {} };
+        const servers = binding.servers && typeof binding.servers === "object" ? { ...binding.servers } : {};
+        mutator(servers, binding);
+        binding.servers = servers;
+        metadata[METADATA_KEY] = binding;
+        return patchMetadata(client, sid, metadata);
+    });
 }
 /** The display/primary binding: the active server's entry when bound
  * there, else the first live entry (single-server configs are unchanged). */
@@ -446,7 +451,19 @@ export async function waitForBinding(client, sid, timeoutMs = 25000) {
     }
     return undefined;
 }
-export async function runShareFlow(host, sessionID) {
+/** Consent gate: EVERY share creation asks explicitly (per owner
+ * directive — no remembered consent, no silent creates). */
+export async function requestShareConsent(host) {
+    return host.ui.showConfirm({
+        title: "Share Session",
+        message: "Publish this session (and its subagent sessions) to your openshare worker?\nThe link lets anyone with it read the conversation.",
+        confirmLabel: "Share",
+    });
+}
+/** runShareFlow with the consent gate applied: share copies the link,
+ * unshared asks consent once, then creates. Every create path routes
+ * through here (/share, settings, gone-again). */
+export async function shareWithConsent(host, sessionID) {
     if (!sessionID)
         return { ok: false, message: "No active session to share." };
     const cfg = currentConfig();
@@ -460,10 +477,8 @@ export async function runShareFlow(host, sessionID) {
         await host.clipboard.write(existing.url);
         return { ok: true, message: `Share URL copied to clipboard: ${existing.url}`, url: existing.url };
     }
-    if (!host.kv.get(CONSENT_KV_KEY, false)) {
-        // caller shows the consent dialog before invoking confirmShare()
-        return { ok: false, message: "consent required" };
-    }
+    if (!(await requestShareConsent(host)))
+        return { ok: false, message: "Share cancelled." };
     return confirmShare(host, root);
 }
 /** Post-consent share: set the flag, wait for the URL, copy it. */

package/dist/sidebar.js

@@ -25,27 +25,6 @@ export function dbg(v, depth = 0) {
         return "obj:?}";
     }
 }
-/** shallow structural dump of a rendered element tree (type names, children kinds) */
-function dbgEl(el, depth = 0) {
-    if (el === null || el === undefined || typeof el === "string" || typeof el === "number" || typeof el === "boolean")
-        return dbg(el);
-    if (Array.isArray(el))
-        return `[${el.map((x) => dbgEl(x, depth)).join(",")}]`;
-    if (typeof el === "function")
-        return "fn-node";
-    if (depth >= 4)
-        return "…";
-    try {
-        const rec = el;
-        const t = dbg(rec.t ?? rec.type, 2);
-        const kids = rec.children;
-        const props = Object.keys(rec).filter((k) => !["t", "type", "children"].includes(k));
-        return `<${t} ${props.join(" ")}>${kids === undefined ? "" : dbgEl(kids, depth + 1)}</${t}>`;
-    }
-    catch (e) {
-        return `el?-${dbg(e)}`;
-    }
-}
 /** no-op: the TUI debug log file was a crash-hunt aid and must not write
  * to temp any more (owner request 2026-10-21) */
 export function dbgLog(_line) { }