plotlink-ows 1.2.94 → 1.2.95

package/app/lib/active-wallet.ts

@@ -0,0 +1,260 @@
+import type { WalletInfo } from "../../lib/ows/types";
+import { getBaseAddress, listAgentWallets } from "../../lib/ows/wallet";
+import { db } from "../db";
+
+const ACTIVE_WALLET_SETTING_KEY = "activeOwsWallet.v1";
+const PLOTLINK_WALLET_PREFIX = "plotlink-writer";
+
+export interface StoredWalletSelection {
+  walletId?: string;
+  name?: string;
+  address?: string;
+  source: "ows";
+  label?: string;
+}
+
+export interface WalletChoice {
+  walletId?: string;
+  name: string;
+  address?: string;
+  normalizedAddress?: string;
+  source: "ows";
+  label: string;
+  recognized: boolean;
+  active: boolean;
+}
+
+export interface ActiveWallet {
+  wallet: WalletInfo;
+  walletId?: string;
+  name: string;
+  address: string;
+  normalizedAddress: string;
+  source: "ows";
+  label: string;
+}
+
+export interface PublicActiveWallet {
+  walletId?: string;
+  name: string;
+  address: string;
+  normalizedAddress: string;
+  source: "ows";
+  label: string;
+}
+
+export interface ActiveWalletResolution {
+  activeWallet: ActiveWallet | null;
+  wallets: WalletChoice[];
+  selectionRequired: boolean;
+  error?: string;
+}
+
+function normalizeAddress(address: string | undefined): string | undefined {
+  const trimmed = address?.trim();
+  return trimmed ? trimmed.toLowerCase() : undefined;
+}
+
+function getWalletId(wallet: WalletInfo): string | undefined {
+  const maybeId = (wallet as WalletInfo & { id?: unknown }).id;
+  return typeof maybeId === "string" && maybeId.trim() ? maybeId : undefined;
+}
+
+function toWalletChoice(wallet: WalletInfo, activeSelection?: StoredWalletSelection): WalletChoice {
+  const address = getBaseAddress(wallet);
+  const normalizedAddress = normalizeAddress(address);
+  const walletId = getWalletId(wallet);
+  const recognized = wallet.name.startsWith(PLOTLINK_WALLET_PREFIX);
+  return {
+    walletId,
+    name: wallet.name,
+    address: normalizedAddress,
+    normalizedAddress,
+    source: "ows",
+    label: recognized ? "PlotLink writer wallet" : "OWS wallet",
+    recognized,
+    active: matchesSelection(wallet, address, activeSelection),
+  };
+}
+
+function matchesSelection(wallet: WalletInfo, address: string | undefined, selection: StoredWalletSelection | null | undefined): boolean {
+  if (!selection) return false;
+  const walletId = getWalletId(wallet);
+  const normalizedAddress = normalizeAddress(address);
+  const selectedAddress = normalizeAddress(selection.address);
+  if (selection.walletId && walletId && selection.walletId === walletId) return true;
+  if (selectedAddress && normalizedAddress && selectedAddress === normalizedAddress) return true;
+  if (selection.name && selection.name === wallet.name) return true;
+  return false;
+}
+
+function storedSelectionFor(wallet: WalletInfo): StoredWalletSelection {
+  const address = normalizeAddress(getBaseAddress(wallet));
+  return {
+    walletId: getWalletId(wallet),
+    name: wallet.name,
+    address,
+    source: "ows",
+    label: wallet.name.startsWith(PLOTLINK_WALLET_PREFIX) ? "PlotLink writer wallet" : "OWS wallet",
+  };
+}
+
+async function readStoredSelection(): Promise<StoredWalletSelection | null> {
+  try {
+    const row = await db.setting.findUnique({ where: { key: ACTIVE_WALLET_SETTING_KEY } });
+    if (!row?.value) return null;
+    const parsed = JSON.parse(row.value) as Partial<StoredWalletSelection>;
+    if (parsed.source !== "ows") return null;
+    return {
+      walletId: typeof parsed.walletId === "string" ? parsed.walletId : undefined,
+      name: typeof parsed.name === "string" ? parsed.name : undefined,
+      address: normalizeAddress(parsed.address),
+      source: "ows",
+      label: typeof parsed.label === "string" ? parsed.label : undefined,
+    };
+  } catch {
+    return null;
+  }
+}
+
+async function writeStoredSelection(selection: StoredWalletSelection): Promise<void> {
+  try {
+    await db.setting.upsert({
+      where: { key: ACTIVE_WALLET_SETTING_KEY },
+      create: { key: ACTIVE_WALLET_SETTING_KEY, value: JSON.stringify(selection) },
+      update: { value: JSON.stringify(selection) },
+    });
+  } catch {
+    // The app can still operate in legacy single-wallet mode if persistence is
+    // temporarily unavailable; signing never depends on this write succeeding.
+  }
+}
+
+function findSelectedWallet(wallets: WalletInfo[], selection: StoredWalletSelection | null): WalletInfo | null {
+  if (!selection) return null;
+  return wallets.find((wallet) => matchesSelection(wallet, getBaseAddress(wallet), selection)) ?? null;
+}
+
+function toActiveWallet(wallet: WalletInfo): ActiveWallet | null {
+  const address = normalizeAddress(getBaseAddress(wallet));
+  if (!address) return null;
+  return {
+    wallet,
+    walletId: getWalletId(wallet),
+    name: wallet.name,
+    address,
+    normalizedAddress: address,
+    source: "ows",
+    label: wallet.name.startsWith(PLOTLINK_WALLET_PREFIX) ? "PlotLink writer wallet" : "OWS wallet",
+  };
+}
+
+export async function listWalletChoices(): Promise<WalletChoice[]> {
+  const wallets = listAgentWallets();
+  const selection = await readStoredSelection();
+  return wallets.map((wallet) => toWalletChoice(wallet, selection));
+}
+
+export async function resolveActiveWallet(): Promise<ActiveWalletResolution> {
+  const wallets = listAgentWallets();
+  const selection = await readStoredSelection();
+  const storedWallet = findSelectedWallet(wallets, selection);
+  const activeFromStored = storedWallet ? toActiveWallet(storedWallet) : null;
+  if (activeFromStored) {
+    return {
+      activeWallet: activeFromStored,
+      wallets: wallets.map((wallet) => toWalletChoice(wallet, storedSelectionFor(storedWallet))),
+      selectionRequired: false,
+    };
+  }
+
+  const evmWallets = wallets.filter((wallet) => Boolean(getBaseAddress(wallet)));
+  const recognizedWallets = evmWallets.filter((wallet) => wallet.name.startsWith(PLOTLINK_WALLET_PREFIX));
+  const autoSelected = recognizedWallets.length === 1
+    ? recognizedWallets[0]
+    : recognizedWallets.length === 0 && evmWallets.length === 1
+      ? evmWallets[0]
+      : null;
+
+  if (autoSelected) {
+    const stored = storedSelectionFor(autoSelected);
+    await writeStoredSelection(stored);
+    return {
+      activeWallet: toActiveWallet(autoSelected),
+      wallets: wallets.map((wallet) => toWalletChoice(wallet, stored)),
+      selectionRequired: false,
+    };
+  }
+
+  const choices = wallets.map((wallet) => toWalletChoice(wallet, null));
+  const hasSelectableWallets = evmWallets.length > 0;
+  return {
+    activeWallet: null,
+    wallets: choices,
+    selectionRequired: hasSelectableWallets,
+    error: hasSelectableWallets
+      ? "Multiple OWS wallets found. Select an active wallet before publishing or signing."
+      : "No OWS wallet found",
+  };
+}
+
+export async function selectActiveWallet(input: { walletId?: string; name?: string; address?: string }): Promise<ActiveWalletResolution> {
+  const wallets = listAgentWallets();
+  const normalizedInputAddress = normalizeAddress(input.address);
+  const selected = wallets.find((wallet) => {
+    const walletId = getWalletId(wallet);
+    const address = normalizeAddress(getBaseAddress(wallet));
+    if (input.walletId && walletId && walletId === input.walletId) return true;
+    if (normalizedInputAddress && address && address === normalizedInputAddress) return true;
+    if (input.name && wallet.name === input.name) return true;
+    return false;
+  });
+
+  if (!selected) {
+    return {
+      activeWallet: null,
+      wallets: wallets.map((wallet) => toWalletChoice(wallet, null)),
+      selectionRequired: true,
+      error: "Selected OWS wallet was not found",
+    };
+  }
+
+  const activeWallet = toActiveWallet(selected);
+  if (!activeWallet) {
+    return {
+      activeWallet: null,
+      wallets: wallets.map((wallet) => toWalletChoice(wallet, null)),
+      selectionRequired: true,
+      error: "Selected OWS wallet has no EVM address",
+    };
+  }
+
+  const stored = storedSelectionFor(selected);
+  await writeStoredSelection(stored);
+  return {
+    activeWallet,
+    wallets: wallets.map((wallet) => toWalletChoice(wallet, stored)),
+    selectionRequired: false,
+  };
+}
+
+export function nextPlotlinkWalletName(wallets: WalletInfo[]): string {
+  const names = new Set(wallets.map((wallet) => wallet.name));
+  if (!names.has(PLOTLINK_WALLET_PREFIX)) return PLOTLINK_WALLET_PREFIX;
+  for (let index = 2; index < 1000; index += 1) {
+    const name = `${PLOTLINK_WALLET_PREFIX}-${index}`;
+    if (!names.has(name)) return name;
+  }
+  return `${PLOTLINK_WALLET_PREFIX}-${Date.now()}`;
+}
+
+export function toPublicActiveWallet(wallet: ActiveWallet): PublicActiveWallet {
+  return {
+    walletId: wallet.walletId,
+    name: wallet.name,
+    address: wallet.address,
+    normalizedAddress: wallet.normalizedAddress,
+    source: wallet.source,
+    label: wallet.label,
+  };
+}

package/app/lib/cartoon-coach.ts

@@ -168,7 +168,7 @@ function coachForEpisode(ep: EpisodeProgress, undetectedClean: number): CartoonC
   }
 
   // 2) Lettering — place speech bubbles & captions in the cut workspace.
-  if (c.withText < c.needClean) {
+  if (c.withText < c.total) {
     return ui("Clean images ready", "Review cuts and start lettering", "open-lettering", file);
   }
 

package/app/lib/cartoon-readiness.ts

@@ -492,7 +492,7 @@ export interface CartoonCutProgress {
   needClean: number;
   /** Of `needClean`, how many have a clean image recorded. */
   withClean: number;
-  /** Of the clean-image cuts, how many have text overlays placed. */
+  /** Cuts with lettering overlays placed. Image cuts still require clean art first; text panels are first-class lettering targets. */
   withText: number;
   /** Cuts (any kind) with an exported final image. */
   exported: number;
@@ -517,8 +517,8 @@ export function summarizeCutProgress(cuts: Cut[]): CartoonCutProgress {
   let uploaded = 0;
   for (const cut of cuts) {
     // Image cuts need a clean image → lettering; text/interstitial panels (#350)
-    // do not (they're text on a styled background). Every panel still exports +
-    // uploads a final image, so those are counted for both kinds.
+    // do not (they're text on a styled background). Text panels still require
+    // lettering overlays before the shared workflow can advance to export (#488).
     if (!isTextPanel(cut)) {
       needClean++;
       // A PNG clean image is a draft intermediate, not a finished clean asset
@@ -531,6 +531,8 @@ export function summarizeCutProgress(cuts: Cut[]): CartoonCutProgress {
         // every cut-list render now (#414), so a bad persisted cut must not crash it.
         if ((cut.overlays?.length ?? 0) > 0) withText++;
       }
+    } else if ((cut.overlays?.length ?? 0) > 0) {
+      withText++;
     }
     if (cut.finalImagePath && cut.exportedAt) exported++;
     if (cut.uploadedUrl) uploaded++;
@@ -583,12 +585,12 @@ export function cartoonChecklist(input: { cuts: Cut[]; published?: boolean }): C
   const p = summarizeCutProgress(cuts);
   if (p.total === 0) return { steps: [], nextStep: null };
 
-  // Clean + letter gate only IMAGE cuts (needClean); export + upload gate EVERY
-  // cut including text panels (total). For an all-image story needClean === total
-  // so this is unchanged from before (#350).
+  // Clean gates only IMAGE cuts (needClean); lettering/export/upload gate EVERY
+  // cut including text panels. Text panels need no clean art, but they are still
+  // editable lettering targets before export (#488).
   const planDone = p.total > 0;
   const cleanDone = planDone && p.withClean === p.needClean;
-  const letterDone = cleanDone && p.withText === p.needClean;
+  const letterDone = cleanDone && p.withText === p.total;
   const exportDone = letterDone && p.exported === p.total;
   const uploadDone = exportDone && p.uploaded === p.total;
   const publishDone = uploadDone && published;
@@ -604,13 +606,13 @@ export function cartoonChecklist(input: { cuts: Cut[]; published?: boolean }): C
   const order: CartoonStepKey[] = ["plan", "clean", "letter", "export", "upload", "publish"];
   const currentIdx = order.findIndex((k) => !complete[k]);
 
-  // Clean/letter count image cuts (needClean); export/upload count every cut
+  // Clean counts image cuts (needClean); lettering/export/upload count every cut
   // (total). An all-text-panel episode has needClean === 0 → "no image cuts".
   const imageDetail = (done: number) => (p.needClean > 0 ? fraction(done, p.needClean) : "no image cuts");
   const detail: Record<CartoonStepKey, string | null> = {
     plan: fraction(p.total, p.total),
     clean: imageDetail(p.withClean),
-    letter: imageDetail(p.withText),
+    letter: fraction(p.withText, p.total),
     export: fraction(p.exported, p.total),
     upload: fraction(p.uploaded, p.total),
     publish: null,
@@ -702,7 +704,7 @@ export function previewFooterGuidance(ctx: PreviewFooterContext): string | null
       if (p.withClean < p.needClean) {
         return "Genesis has a cut plan — generate the clean images for its cuts next.";
       }
-      if (p.withText < p.needClean) {
+      if (p.withText < p.total) {
         return "Genesis clean art is ready — review the cuts and add speech bubbles & captions next.";
       }
       if (p.exported < p.total) {

package/app/lib/story-progress.ts

@@ -38,9 +38,8 @@ export interface EpisodeProgress {
   summary: string;
   published: boolean;
   /**
-   * Cartoon cut progress; null for fiction. `needClean`/`withText` count IMAGE
-   * cuts only (text panels are excluded), so the workflow coach (#429) can tell
-   * the clean-image stage from the lettering stage.
+   * Cartoon cut progress; null for fiction. `needClean`/`withClean` count image
+   * cuts only; `withText`, export, and upload count every cut including text panels.
    */
   cuts: { total: number; needClean: number; withClean: number; withText: number; exported: number; uploaded: number } | null;
   /**

package/app/routes/dashboard.ts

@@ -4,7 +4,7 @@ import { base } from "viem/chains";
 import fs from "fs";
 import path from "path";
 import { getEthBalance } from "../lib/publish";
-import { listAgentWallets, getBaseAddress } from "../../lib/ows/wallet";
+import { resolveActiveWallet } from "../lib/active-wallet";
 import { mcv2BondAbi } from "../../packages/cli/src/sdk/abi";
 import { STORIES_DIR, readPublishStatus } from "./stories";
 
@@ -82,10 +82,10 @@ dashboard.get("/", async (c) => {
   // Get wallet info
   let walletInfo = null;
   try {
-    const wallets = listAgentWallets();
-    const wallet = wallets.find((w) => w.name.startsWith("plotlink-writer"));
+    const resolvedWallet = await resolveActiveWallet();
+    const wallet = resolvedWallet.activeWallet;
     if (wallet) {
-      const address = getBaseAddress(wallet);
+      const address = wallet.address;
       if (address) {
         const ethBalance = await getEthBalance(address);
 
@@ -107,6 +107,8 @@ dashboard.get("/", async (c) => {
         } catch { /* best effort */ }
 
         walletInfo = {
+          walletId: wallet.walletId,
+          name: wallet.name,
           address,
           ethBalance: ethBalance.toString(),
           ethFormatted: (Number(ethBalance) / 1e18).toFixed(6),

package/app/routes/publish.ts

@@ -2,7 +2,7 @@ import { Hono } from "hono";
 import { streamSSE } from "hono/streaming";
 import { publishStoryline, publishPlot, getEthBalance, getCreationFee, estimatePublishCost, uploadCoverImage, uploadPlotImage, updateStoryline } from "../lib/publish";
 import { keccak256, toBytes } from "viem";
-import { listAgentWallets, getBaseAddress } from "../../lib/ows/wallet";
+import { resolveActiveWallet } from "../lib/active-wallet";
 import path from "path";
 import { STORIES_DIR } from "../lib/paths";
 import { readCutsFile } from "../lib/cuts";
@@ -51,13 +51,18 @@ const publish = new Hono();
 publish.get("/preflight", async (c) => {
   try {
     // Check wallet
-    const wallets = listAgentWallets();
-    const wallet = wallets.find((w) => w.name.startsWith("plotlink-writer"));
+    const resolvedWallet = await resolveActiveWallet();
+    const wallet = resolvedWallet.activeWallet;
     if (!wallet) {
-      return c.json({ ready: false, error: "No OWS wallet found" });
+      return c.json({
+        ready: false,
+        error: resolvedWallet.error || "No OWS wallet found",
+        selectionRequired: resolvedWallet.selectionRequired,
+        wallets: resolvedWallet.wallets,
+      });
     }
 
-    const address = getBaseAddress(wallet);
+    const address = wallet.address;
     if (!address) {
       return c.json({ ready: false, error: "No EVM address on wallet" });
     }
@@ -76,6 +81,8 @@ publish.get("/preflight", async (c) => {
       return c.json({
         ready: false,
         address,
+        walletName: wallet.name,
+        walletId: wallet.walletId,
         ethBalance: balance.toString(),
         error: "Could not read creation fee — check RPC and contract config",
       });
@@ -108,6 +115,8 @@ publish.get("/preflight", async (c) => {
     return c.json({
       ready: hasEnoughEth,
       address,
+      walletName: wallet.name,
+      walletId: wallet.walletId,
       ethBalance: balance.toString(),
       creationFee: creationFee.toString(),
       requiredBalance: requiredBalance.toString(),
@@ -259,16 +268,22 @@ publish.post("/file", async (c) => {
     }
   }
 
-  // Get wallet
-  let wallets;
+  // Get active wallet
+  let wallet;
   try {
-    wallets = listAgentWallets();
+    const resolvedWallet = await resolveActiveWallet();
+    wallet = resolvedWallet.activeWallet;
+    if (!wallet) {
+      return c.json({
+        error: resolvedWallet.error || "No OWS wallet",
+        selectionRequired: resolvedWallet.selectionRequired,
+        wallets: resolvedWallet.wallets,
+      }, 400);
+    }
   } catch (err) {
-    console.error("[publish/file] listAgentWallets error:", err);
+    console.error("[publish/file] resolveActiveWallet error:", err);
     return c.json({ error: `OWS wallet error: ${err instanceof Error ? err.message : String(err)}` }, 500);
   }
-  const wallet = wallets.find((w) => w.name.startsWith("plotlink-writer"));
-  if (!wallet) return c.json({ error: "No OWS wallet" }, 400);
 
   console.log("[publish/file] Starting publish for", body.storyName, body.fileName, "wallet:", wallet.name);
 
@@ -369,11 +384,17 @@ publish.post("/retry-index", async (c) => {
 /** POST /api/publish/upload-cover — upload cover image with wallet signature */
 publish.post("/upload-cover", async (c) => {
   try {
-    const wallets = listAgentWallets();
-    const wallet = wallets.find((w) => w.name.startsWith("plotlink-writer"));
-    if (!wallet) return c.json({ error: "No OWS wallet" }, 400);
+    const resolvedWallet = await resolveActiveWallet();
+    const wallet = resolvedWallet.activeWallet;
+    if (!wallet) {
+      return c.json({
+        error: resolvedWallet.error || "No OWS wallet",
+        selectionRequired: resolvedWallet.selectionRequired,
+        wallets: resolvedWallet.wallets,
+      }, 400);
+    }
 
-    const address = getBaseAddress(wallet);
+    const address = wallet.address;
     if (!address) return c.json({ error: "No EVM address on wallet" }, 400);
 
     const formData = await c.req.formData();
@@ -407,11 +428,17 @@ publish.post("/upload-cover", async (c) => {
 /** POST /api/publish/upload-plot-image — upload plot illustration with wallet signature */
 publish.post("/upload-plot-image", async (c) => {
   try {
-    const wallets = listAgentWallets();
-    const wallet = wallets.find((w) => w.name.startsWith("plotlink-writer"));
-    if (!wallet) return c.json({ error: "No OWS wallet" }, 400);
+    const resolvedWallet = await resolveActiveWallet();
+    const wallet = resolvedWallet.activeWallet;
+    if (!wallet) {
+      return c.json({
+        error: resolvedWallet.error || "No OWS wallet",
+        selectionRequired: resolvedWallet.selectionRequired,
+        wallets: resolvedWallet.wallets,
+      }, 400);
+    }
 
-    const address = getBaseAddress(wallet);
+    const address = wallet.address;
     if (!address) return c.json({ error: "No EVM address on wallet" }, 400);
 
     const formData = await c.req.formData();
@@ -442,11 +469,17 @@ publish.post("/upload-plot-image", async (c) => {
 /** POST /api/publish/update-storyline — update storyline metadata with wallet signature */
 publish.post("/update-storyline", async (c) => {
   try {
-    const wallets = listAgentWallets();
-    const wallet = wallets.find((w) => w.name.startsWith("plotlink-writer"));
-    if (!wallet) return c.json({ error: "No OWS wallet" }, 400);
+    const resolvedWallet = await resolveActiveWallet();
+    const wallet = resolvedWallet.activeWallet;
+    if (!wallet) {
+      return c.json({
+        error: resolvedWallet.error || "No OWS wallet",
+        selectionRequired: resolvedWallet.selectionRequired,
+        wallets: resolvedWallet.wallets,
+      }, 400);
+    }
 
-    const address = getBaseAddress(wallet);
+    const address = wallet.address;
     if (!address) return c.json({ error: "No EVM address on wallet" }, 400);
 
     const body = await c.req.json<{