plotlink-ows 1.2.94 → 1.2.95

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);

package/app/web/components/CartoonNextAction.tsx

@@ -0,0 +1,145 @@
+import { useEffect, useState } from "react";
+import type { StoryProgress } from "@app-lib/story-progress";
+import type { CoachUiAction } from "@app-lib/cartoon-coach";
+import { WorkflowCoachView } from "./WorkflowCoach";
+
+export function storyInfoNextStep(progress: StoryProgress): string {
+  if (progress.cover !== "present") {
+    return progress.cover === "invalid"
+      ? "Replace the cover image - it must be a valid WebP or JPEG."
+      : "Add a cover image before publishing.";
+  }
+  const missing: string[] = [];
+  if (!progress.metadata.language) missing.push("language");
+  if (!progress.metadata.genre) missing.push("genre");
+  if (!progress.metadata.title) missing.push("title");
+  return `Add the story ${missing.join(" and ") || "details"} before publishing.`;
+}
+
+export function cartoonWorkflowActiveKey(progress: StoryProgress): string | null {
+  const coach = progress.coach ?? null;
+  const m = progress.metadata;
+  const hasStructure = progress.setup.hasStructure;
+  const hasGenesis = progress.setup.hasGenesis;
+  const coverDone = progress.cover === "present";
+  const metadataIncomplete = !m.title || !m.language || !m.genre;
+  const activeEp = progress.episodes.find((e) => !e.published) ?? null;
+  const productionPending = !!activeEp && activeEp.state !== "ready";
+
+  if (!hasStructure) return "whitepaper";
+  if (!hasGenesis) return "genesis.md";
+  if (metadataIncomplete) return "story-info";
+  if (productionPending && coach?.episodeFile) return coach.episodeFile;
+  if (!coverDone) return "story-info";
+  return coach?.episodeFile ?? null;
+}
+
+export function StoryInfoNextActionCard({
+  progress,
+  onOpenStoryInfo,
+}: {
+  progress: StoryProgress;
+  onOpenStoryInfo?: () => void;
+}) {
+  return (
+    <div className="m-3 rounded-lg border border-accent/40 bg-accent/10 px-4 py-3 shadow-sm" data-testid="story-info-cta">
+      <div className="flex items-center gap-3">
+        <div className="min-w-0 flex-1">
+          <span className="inline-flex rounded-full bg-background px-2 py-0.5 text-[10px] font-bold uppercase tracking-[0.14em] text-accent">
+            Story info
+          </span>
+          <p className="mt-1 text-sm text-foreground" data-testid="story-info-next-action">
+            <span className="font-semibold">Next: </span>
+            <span>{storyInfoNextStep(progress)}</span>
+          </p>
+        </div>
+        <button
+          type="button"
+          onClick={onOpenStoryInfo}
+          disabled={!onOpenStoryInfo}
+          className="flex-shrink-0 rounded bg-accent px-4 py-2.5 text-sm font-bold text-white shadow-sm transition-colors hover:bg-accent-dim disabled:cursor-not-allowed disabled:opacity-50"
+          data-testid="story-info-next-action-btn"
+        >
+          Next Action
+        </button>
+      </div>
+    </div>
+  );
+}
+
+export function CartoonNextActionView({
+  progress,
+  onCoachAction,
+  onOpenStoryInfo,
+}: {
+  progress: StoryProgress;
+  onCoachAction: (action: CoachUiAction, episodeFile: string | null) => void;
+  onOpenStoryInfo?: () => void;
+}) {
+  const activeKey = cartoonWorkflowActiveKey(progress);
+  if (activeKey === "story-info") {
+    return <StoryInfoNextActionCard progress={progress} onOpenStoryInfo={onOpenStoryInfo} />;
+  }
+  return (
+    <WorkflowCoachView
+      coach={progress.coach ?? null}
+      showEmptyState
+      onAction={onCoachAction}
+    />
+  );
+}
+
+export function CartoonNextAction({
+  storyName,
+  authFetch,
+  refreshKey = 0,
+  onCoachAction,
+  onOpenStoryInfo,
+}: {
+  storyName: string;
+  authFetch: (url: string, opts?: RequestInit) => Promise<Response>;
+  refreshKey?: number;
+  onCoachAction: (action: CoachUiAction, episodeFile: string | null) => void;
+  onOpenStoryInfo?: () => void;
+}) {
+  const [progress, setProgress] = useState<StoryProgress | null | undefined>(undefined);
+
+  const targetKey = JSON.stringify([storyName, refreshKey]);
+  const [loadedKey, setLoadedKey] = useState<string | null>(null);
+  if (loadedKey !== targetKey) {
+    setProgress(undefined);
+    setLoadedKey(targetKey);
+  }
+
+  useEffect(() => {
+    let cancelled = false;
+    authFetch(`/api/stories/${storyName}/progress`)
+      .then((res) => (res.ok ? res.json() : null))
+      .then((data: StoryProgress | null) => {
+        if (!cancelled) setProgress(isValidProgress(data) ? data : null);
+      })
+      .catch(() => {
+        if (!cancelled) setProgress(null);
+      });
+    return () => { cancelled = true; };
+  }, [storyName, authFetch, refreshKey]);
+
+  if (progress === undefined) return null;
+  if (!progress) {
+    return <WorkflowCoachView coach={null} showEmptyState onAction={onCoachAction} />;
+  }
+  return (
+    <CartoonNextActionView
+      progress={progress}
+      onCoachAction={onCoachAction}
+      onOpenStoryInfo={onOpenStoryInfo}
+    />
+  );
+}
+
+function isValidProgress(data: StoryProgress | null): data is StoryProgress {
+  return !!data
+    && !!data.metadata
+    && !!data.setup
+    && Array.isArray(data.episodes);
+}

package/app/web/components/CartoonPublishPage.tsx

@@ -178,7 +178,7 @@ export function CartoonPublishPage({ storyName, authFetch, onOpenFile, onOpenSto
     { label: "Opening text ready", status: "done" }, // the episode exists once it appears here
     { label: "Cut plan", status: c && c.total > 0 ? "done" : "todo", detail: c ? `${c.total} cut${c.total === 1 ? "" : "s"} planned` : "not started" },
     { label: "Clean images converted", status: c && c.needClean > 0 && c.withClean === c.needClean ? "done" : "todo", detail: c ? `${c.withClean} / ${c.needClean}` : null },
-    { label: "Cuts lettered", status: c && c.needClean > 0 && c.withText === c.needClean ? "done" : "todo", detail: c ? `${c.withText} / ${c.needClean}` : null },
+    { label: "Cuts lettered", status: c && c.total > 0 && c.withText === c.total ? "done" : "todo", detail: c ? `${c.withText} / ${c.total}` : null },
     { label: "Final images exported", status: c && c.total > 0 && c.exported === c.total ? "done" : "todo", detail: c ? `${c.exported} / ${c.total}` : null },
     { label: "Final images uploaded", status: c && c.total > 0 && c.uploaded === c.total ? "done" : "todo", detail: c ? `${c.uploaded} / ${c.total}` : null },
     { label: "Cover image", status: coverDone ? "done" : "todo", detail: coverDone ? null : "recommended before publishing" },