plotlink-ows 1.2.94 → 1.2.96

package/app/lib/lettering-status.ts

@@ -3,7 +3,12 @@
 // tested and shared between the editor checklist and the insert-from-script
 // panel. None of this changes the export model or publish readiness rules.
 
-import type { Overlay } from "./overlays";
+import {
+  comfortableOverlaySize,
+  createOverlay,
+  type Overlay,
+  type OverlayType,
+} from "./overlays";
 
 /** The cut fields the lettering guidance reads (a structural subset of Cut). */
 export interface LetteringCut {
@@ -16,6 +21,7 @@ export interface LetteringCut {
   sfx?: string;
   dialogue?: { speaker: string; text: string }[];
   overlays?: Overlay[];
+  kind?: "image" | "text";
 }
 
 export interface LetteringChecklist {
@@ -45,12 +51,16 @@ export function cutLetteringChecklist(
   cut: LetteringCut,
   opts: { staleExport?: boolean } = {},
 ): LetteringChecklist {
-  const exported = !opts.staleExport && (!!cut.finalImagePath || !!cut.exportedAt);
-  const uploaded = !opts.staleExport && (!!cut.uploadedUrl || !!cut.uploadedCid);
+  const exported =
+    !opts.staleExport && (!!cut.finalImagePath || !!cut.exportedAt);
+  const uploaded =
+    !opts.staleExport && (!!cut.uploadedUrl || !!cut.uploadedCid);
   return {
     hasCleanImage: !!cut.cleanImagePath,
     hasScriptText:
-      (cut.dialogue?.length ?? 0) > 0 || !!cut.narration?.trim() || !!cut.sfx?.trim(),
+      (cut.dialogue?.length ?? 0) > 0 ||
+      !!cut.narration?.trim() ||
+      !!cut.sfx?.trim(),
     bubblesPlaced: cut.overlays?.length ?? 0,
     exported,
     uploaded,
@@ -120,14 +130,62 @@ export function cutScriptLines(cut: LetteringCut): ScriptLine[] {
   const lines: ScriptLine[] = [];
   (cut.dialogue ?? []).forEach((d, i) => {
     if (d?.text?.trim()) {
-      lines.push({ type: "speech", speaker: d.speaker, text: d.text.trim(), key: `speech-${i}` });
+      lines.push({
+        type: "speech",
+        speaker: d.speaker,
+        text: d.text.trim(),
+        key: `speech-${i}`,
+      });
     }
   });
   if (cut.narration?.trim()) {
-    lines.push({ type: "narration", text: cut.narration.trim(), key: "narration" });
+    lines.push({
+      type: "narration",
+      text: cut.narration.trim(),
+      key: "narration",
+    });
   }
   if (cut.sfx?.trim()) {
     lines.push({ type: "sfx", text: cut.sfx.trim(), key: "sfx" });
   }
   return lines;
 }
+
+function draftAnchorFor(
+  type: OverlayType,
+  index: number,
+  total: number,
+): { x: number; y: number } {
+  if (type === "narration")
+    return { x: 0.08, y: 0.05 + Math.min(index, 2) * 0.18 };
+  if (type === "sfx") {
+    const col = index % 2;
+    const row = Math.floor(index / 2);
+    return { x: col === 0 ? 0.1 : 0.62, y: 0.68 + row * 0.12 };
+  }
+  const row = Math.floor(index / 2);
+  const left = index % 2 === 0;
+  const y = 0.08 + row * Math.max(0.15, Math.min(0.22, total > 4 ? 0.16 : 0.2));
+  return { x: left ? 0.05 : 0.45, y };
+}
+
+/**
+ * Create a first-pass editable overlay set from the cut script (#494). Pure,
+ * deterministic, and intentionally approximate: these are draft bubble/caption
+ * positions for the writer to review in the focused editor, not export-ready
+ * layout. Empty script pieces produce no overlays.
+ */
+export function buildDraftOverlays(cut: LetteringCut): Overlay[] {
+  const lines = cutScriptLines(cut);
+  return lines.map((line, index) => {
+    const { x, y } = draftAnchorFor(line.type, index, lines.length);
+    const overlay = createOverlay(line.type, x, y);
+    const comfortable = comfortableOverlaySize(line.type, x, y);
+    return {
+      ...overlay,
+      ...comfortable,
+      text: line.text,
+      ...(line.type === "speech" ? { speaker: line.speaker ?? "" } : {}),
+    };
+  });
+}

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<{

package/app/routes/settings.ts

@@ -2,28 +2,66 @@ import { Hono } from "hono";
 import { createPublicClient, createWalletClient, http, decodeEventLog } from "viem";
 import { base } from "viem/chains";
 import { erc8004Abi } from "../../packages/cli/src/sdk/abi";
-import { listAgentWallets, getBaseAddress } from "../../lib/ows/wallet";
+import { resolveActiveWallet } from "../lib/active-wallet";
 import { createOwsAccount } from "../lib/publish";
-import { db } from "../db";
-import {
-  signMessage as owsSignMsg,
-} from "@open-wallet-standard/core";
 import { CONFIG_DIR } from "../lib/paths";
 import fs from "fs";
 import path from "path";
 
 const CONFIG_FILE = path.join(CONFIG_DIR, "config.json");
+type Config = Record<string, unknown>;
 
-function readConfig(): Record<string, unknown> {
+function readConfig(): Config {
   try { return JSON.parse(fs.readFileSync(CONFIG_FILE, "utf-8")); } catch { return {}; }
 }
 
-function writeConfig(updates: Record<string, unknown>) {
+function writeConfig(updates: Config) {
   const config = readConfig();
   Object.assign(config, updates);
   fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
 }
 
+function normalizeAddress(address: unknown): string | null {
+  return typeof address === "string" && /^0x[a-fA-F0-9]{40}$/.test(address)
+    ? address.toLowerCase()
+    : null;
+}
+
+function getWalletAgentConfig(
+  config: Config,
+  wallet: { walletId?: string; name: string; address: string },
+  selectableWalletCount: number,
+): Config | null {
+  if (!config.agentId) return null;
+
+  const cachedAddress = normalizeAddress(config.agentWalletAddress);
+  const activeAddress = normalizeAddress(wallet.address);
+  if (cachedAddress && activeAddress) {
+    return cachedAddress === activeAddress ? config : null;
+  }
+
+  if (typeof config.agentWalletId === "string" && wallet.walletId) {
+    return config.agentWalletId === wallet.walletId ? config : null;
+  }
+
+  if (typeof config.agentWalletName === "string") {
+    return config.agentWalletName === wallet.name ? config : null;
+  }
+
+  // Backwards compatibility for pre-#196 installs: an unscoped cache can only
+  // be trusted when there is no wallet-switching ambiguity.
+  return selectableWalletCount <= 1 ? config : null;
+}
+
+function walletAgentConfig(wallet: { walletId?: string; name: string; address: string }, updates: Config): Config {
+  return {
+    ...updates,
+    agentWalletAddress: wallet.address.toLowerCase(),
+    agentWalletName: wallet.name,
+    ...(wallet.walletId ? { agentWalletId: wallet.walletId } : {}),
+  };
+}
+
 const ERC_8004 = "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432" as const;
 const rpcUrl = process.env.NEXT_PUBLIC_RPC_URL || "https://mainnet.base.org";
 
@@ -43,33 +81,37 @@ settings.post("/generate-binding", 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 found. Create one in Wallet settings first." }, 400);
+    const resolvedWallet = await resolveActiveWallet();
+    const wallet = resolvedWallet.activeWallet;
+    if (!wallet) {
+      return c.json({
+        error: resolvedWallet.error || "No OWS wallet found. Create one in Wallet settings first.",
+        selectionRequired: resolvedWallet.selectionRequired,
+        wallets: resolvedWallet.wallets,
+      }, 400);
+    }
 
-    const owsWallet = getBaseAddress(wallet);
+    const owsWallet = wallet.address;
     if (!owsWallet) return c.json({ error: "No EVM address on wallet" }, 400);
 
     const message = `I authorize ${body.humanWallet} as my PlotLink owner. Wallet: ${owsWallet}`;
-    const passphrase = process.env.OWS_PASSPHRASE;
-
-    const result = owsSignMsg(wallet.name, "eip155:8453", message, passphrase);
-    const signature = result.signature.startsWith("0x") ? result.signature : `0x${result.signature}`;
+    const account = createOwsAccount(wallet.name, owsWallet as `0x${string}`);
+    const signature = await account.signMessage({ message });
 
     // Include agent data from config.json if available
-    const config = readConfig();
+    const config = getWalletAgentConfig(readConfig(), wallet, resolvedWallet.wallets.filter((w) => w.address).length);
 
     return c.json({
       message,
       signature,
       owsWallet,
-      agentId: config.agentId ? Number(config.agentId) : undefined,
-      agentName: (config.agentName as string) || undefined,
-      agentDescription: (config.agentDescription as string) || undefined,
-      agentGenre: (config.agentGenre as string) || undefined,
-      agentLlmModel: (config.agentLlmModel as string) || undefined,
-      agentRegisteredBy: (config.agentRegisteredBy as string) || undefined,
-      agentRegisteredAt: (config.agentRegisteredAt as string) || undefined,
+      agentId: config?.agentId ? Number(config.agentId) : undefined,
+      agentName: (config?.agentName as string) || undefined,
+      agentDescription: (config?.agentDescription as string) || undefined,
+      agentGenre: (config?.agentGenre as string) || undefined,
+      agentLlmModel: (config?.agentLlmModel as string) || undefined,
+      agentRegisteredBy: (config?.agentRegisteredBy as string) || undefined,
+      agentRegisteredAt: (config?.agentRegisteredAt as string) || undefined,
     });
   } catch (err: unknown) {
     const msg = err instanceof Error ? err.message : "Failed to generate binding proof";
@@ -89,11 +131,17 @@ settings.post("/register-agent", 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 found. Create one in Wallet settings first." }, 400);
+    const resolvedWallet = await resolveActiveWallet();
+    const wallet = resolvedWallet.activeWallet;
+    if (!wallet) {
+      return c.json({
+        error: resolvedWallet.error || "No OWS wallet found. Create one in Wallet settings first.",
+        selectionRequired: resolvedWallet.selectionRequired,
+        wallets: resolvedWallet.wallets,
+      }, 400);
+    }
 
-    const owsAddress = getBaseAddress(wallet);
+    const owsAddress = wallet.address;
     if (!owsAddress) return c.json({ error: "No EVM address on wallet" }, 400);
 
     // Check if already registered
@@ -160,7 +208,7 @@ settings.post("/register-agent", async (c) => {
     }
 
     // Cache full tokenURI data in config.json (survives npx reinstalls, no Prisma dependency)
-    writeConfig({
+    writeConfig(walletAgentConfig(wallet, {
       agentId,
       agentName: body.name.trim(),
       agentDescription: body.description.trim(),
@@ -168,7 +216,7 @@ settings.post("/register-agent", async (c) => {
       agentLlmModel: "Claude",
       agentRegisteredBy: "plotlink-ows",
       agentRegisteredAt: registeredAt,
-    });
+    }));
 
     return c.json({
       agentId,
@@ -184,16 +232,23 @@ settings.post("/register-agent", async (c) => {
 /** GET /api/settings/link-status — check if OWS wallet is registered on ERC-8004 */
 settings.get("/link-status", async (c) => {
   try {
-    const wallets = listAgentWallets();
-    const wallet = wallets.find((w) => w.name.startsWith("plotlink-writer"));
-    if (!wallet) return c.json({ linked: false, error: "No wallet" });
+    const resolvedWallet = await resolveActiveWallet();
+    const wallet = resolvedWallet.activeWallet;
+    if (!wallet) {
+      return c.json({
+        linked: false,
+        error: resolvedWallet.error || "No wallet",
+        selectionRequired: resolvedWallet.selectionRequired,
+        wallets: resolvedWallet.wallets,
+      });
+    }
 
-    const address = getBaseAddress(wallet);
+    const address = wallet.address;
     if (!address) return c.json({ linked: false, error: "No EVM address" });
 
     // Check config.json cache first (survives npx reinstalls + RPC rate limits)
-    const config = readConfig();
-    if (config.agentId) {
+    const config = getWalletAgentConfig(readConfig(), wallet, resolvedWallet.wallets.filter((w) => w.address).length);
+    if (config?.agentId) {
       return c.json({ linked: true, agentId: Number(config.agentId), owsWallet: address });
     }
 
@@ -207,7 +262,7 @@ settings.get("/link-status", async (c) => {
       }) as bigint;
 
       if (agentId > 0n) {
-        writeConfig({ agentId: Number(agentId) });
+        writeConfig(walletAgentConfig(wallet, { agentId: Number(agentId) }));
         return c.json({ linked: true, agentId: Number(agentId), owsWallet: address });
       }
     } catch { /* agentIdByWallet may revert if not bound */ }
@@ -235,7 +290,7 @@ settings.get("/link-status", async (c) => {
         } catch { /* ERC-721 Enumerable not supported */ }
 
         if (agentId !== undefined) {
-          writeConfig({ agentId });
+          writeConfig(walletAgentConfig(wallet, { agentId }));
         }
         return c.json({ linked: true, agentId, owsWallet: address });
       }

package/app/routes/wallet.ts

@@ -1,6 +1,7 @@
 import { Hono } from "hono";
 import fs from "fs";
 import { ENV_FILE } from "../lib/paths";
+import { nextPlotlinkWalletName, resolveActiveWallet, selectActiveWallet, toPublicActiveWallet } from "../lib/active-wallet";
 
 const envPath = ENV_FILE;
 
@@ -21,18 +22,8 @@ function readEnvPassphrase(): string | null {
 /** GET /api/wallet — get wallet info */
 wallet.get("/", async (c) => {
   try {
-    const { getAgentWallet, getBaseAddress } = await import("../../lib/ows/wallet");
-
-    // Try to find existing wallet
-    const { listAgentWallets } = await import("../../lib/ows/wallet");
-    const wallets = listAgentWallets();
-    const plotlinkWallet = wallets.find((w) => w.name.startsWith("plotlink-writer"));
-
-    if (!plotlinkWallet) {
-      return c.json({ exists: false });
-    }
-
-    const address = getBaseAddress(plotlinkWallet);
+    const resolved = await resolveActiveWallet();
+    const activeWallet = resolved.activeWallet;
 
     // Fetch balances on Base via RPC
     let ethBalance = "0";
@@ -40,8 +31,8 @@ wallet.get("/", async (c) => {
     let plotBalance = "0";
     const rpcUrl = process.env.NEXT_PUBLIC_RPC_URL || "https://mainnet.base.org";
 
-    if (address) {
-      const addrPadded = "000000000000000000000000" + address.slice(2).toLowerCase();
+    if (activeWallet?.address) {
+      const addrPadded = "000000000000000000000000" + activeWallet.address.slice(2).toLowerCase();
       const balanceOfSig = "0x70a08231" + addrPadded;
 
       try {
@@ -49,7 +40,7 @@ wallet.get("/", async (c) => {
         const ethRes = await fetch(rpcUrl, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ jsonrpc: "2.0", id: 1, method: "eth_getBalance", params: [address, "latest"] }),
+          body: JSON.stringify({ jsonrpc: "2.0", id: 1, method: "eth_getBalance", params: [activeWallet.address, "latest"] }),
         });
         const ethData = await ethRes.json() as { result?: string };
         if (ethData.result && ethData.result !== "0x" && ethData.result !== "0x0") {
@@ -82,15 +73,27 @@ wallet.get("/", async (c) => {
       } catch { /* balance fetch best-effort */ }
     }
 
+    if (!activeWallet) {
+      return c.json({
+        exists: resolved.wallets.length > 0,
+        selectionRequired: resolved.selectionRequired,
+        error: resolved.error,
+        wallets: resolved.wallets,
+      });
+    }
+
     return c.json({
       exists: true,
-      walletId: plotlinkWallet.id,
-      name: plotlinkWallet.name,
-      address,
+      walletId: activeWallet.walletId,
+      name: activeWallet.name,
+      address: activeWallet.address,
+      activeWallet: toPublicActiveWallet(activeWallet),
+      selectionRequired: false,
+      wallets: resolved.wallets,
       ethBalance,
       usdcBalance,
       plotBalance,
-      accounts: plotlinkWallet.accounts,
+      accounts: activeWallet.wallet.accounts,
     });
   } catch (err: unknown) {
     const message = err instanceof Error ? err.message : "Failed to get wallet";
@@ -98,6 +101,30 @@ wallet.get("/", async (c) => {
   }
 });
 
+/** POST /api/wallet/active — select active OWS wallet */
+wallet.post("/active", async (c) => {
+  const body = await c.req.json<{ walletId?: string; name?: string; address?: string }>();
+  if (!body.walletId && !body.name && !body.address) {
+    return c.json({ error: "walletId, name, or address required" }, 400);
+  }
+
+  const resolved = await selectActiveWallet(body);
+  if (!resolved.activeWallet) {
+    return c.json({
+      error: resolved.error || "Could not select wallet",
+      selectionRequired: resolved.selectionRequired,
+      wallets: resolved.wallets,
+    }, 400);
+  }
+
+  return c.json({
+    ok: true,
+    activeWallet: toPublicActiveWallet(resolved.activeWallet),
+    wallets: resolved.wallets,
+    selectionRequired: false,
+  });
+});
+
 /** POST /api/wallet/create — create OWS wallet */
 wallet.post("/create", async (c) => {
   try {
@@ -106,20 +133,21 @@ wallet.post("/create", async (c) => {
       return c.json({ error: "Passphrase not configured" }, 400);
     }
 
-    const { createAgentWallet, getBaseAddress, listAgentWallets } = await import("../../lib/ows/wallet");
+    const { createAgentWallet, listAgentWallets } = await import("../../lib/ows/wallet");
 
-    // Check if wallet already exists
     const wallets = listAgentWallets();
-    const existing = wallets.find((w) => w.name.startsWith("plotlink-writer"));
-    if (existing) {
-      const address = getBaseAddress(existing);
-      return c.json({ walletId: existing.id, address, alreadyExisted: true });
-    }
-
-    const wallet = createAgentWallet("plotlink-writer", passphrase);
-    const address = getBaseAddress(wallet);
+    const name = nextPlotlinkWalletName(wallets);
+    const createdWallet = createAgentWallet(name, passphrase);
+    const resolved = await selectActiveWallet({ walletId: createdWallet.id, name: createdWallet.name });
 
-    return c.json({ walletId: wallet.id, address, alreadyExisted: false });
+    return c.json({
+      walletId: resolved.activeWallet?.walletId ?? createdWallet.id,
+      name: createdWallet.name,
+      address: resolved.activeWallet?.address,
+      activeWallet: resolved.activeWallet ? toPublicActiveWallet(resolved.activeWallet) : null,
+      wallets: resolved.wallets,
+      alreadyExisted: false,
+    });
   } catch (err: unknown) {
     const message = err instanceof Error ? err.message : "Wallet creation failed";
     return c.json({ error: message }, 500);