@fangorn-network/westmarch 0.1.1 → 0.1.2

package/docs/app-to-agent.md

@@ -49,7 +49,8 @@ update: each step checks the chain (or Cloudflare) first and acts only on a diff
                     "tags": ["category"], "text": ["summary"] },
       "presentation": { "facets": ["category"] } } },
   "relations": [],
-  "sources": [{ "namespace": "things", "command": ["python", "-m", "my_source"] }],
+  "sources": [{ "namespace": "things", "command": ["python", "-m", "my_source"] }],   // your wallet's repos only
+  "live": ["readings"],                      // optional: namespaces other wallets push to; "0x<wallet>/readings" for one wallet's
   "network": "baseSepolia",                  // required
   "fangorn": "fangorn",                      // the CLI that signs
   "paid": { "price": "0.01", "description": "the full record" }   // optional: USDC on the app's network, x402 v2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fangorn-network/westmarch",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "all-in-one builder for fangorn apps",
   "license": "MIT",
   "type": "module",
@@ -90,5 +90,6 @@
   },
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "packageManager": "pnpm@10.30.1+sha512.3590e550d5384caa39bd5c7c739f72270234b2f6059e13018f975c313b1eb9fefcc09714048765d4d9efe961382c312e624572c0420762bdc5d5940cdf9be73a"
 }

package/src/agent/agent-card.js

@@ -38,6 +38,8 @@ export async function captureTools(register) {
  * tools. With it, `{app, owner, fromBlock, repos, views, mcp, config}`:
  *   app        the app's repo name
  *   owner      the address that publishes it
+ *   repos      the repos the app presents: `0x<owner>/<repo>` (that publisher's) or a
+ *              bare `<repo>` (any publisher's); [] for every repo
  *   fromBlock  a block at or before the app's registration. The reader's log
  *              scan starts here; leave it at 0 and a reader makes one RPC call
  *              per 1000 blocks of chain history.

package/src/publish/ship.js

@@ -31,10 +31,10 @@
 
 import { spawn, spawnSync } from "node:child_process";
 import { createHash } from "node:crypto";
-import { cpSync, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, rmSync, writeFileSync } from "node:fs";
+import { cpSync, existsSync, mkdtempSync, mkdirSync, readFileSync, readdirSync, realpathSync, rmSync, writeFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import { dirname, join, relative, resolve } from "node:path";
-import { homedir } from "node:os";
+import { homedir, tmpdir } from "node:os";
 import { fileURLToPath, pathToFileURL } from "node:url";
 
 const HERE = dirname(fileURLToPath(import.meta.url));
@@ -63,9 +63,11 @@ const log = (s) => console.error(`[ship] ${s}`);
 //   "sources": [{ "namespace": "…", "cwd": "…", "command": ["python", "-m", "…", …] }],
 //   "live": ["readings"],     // optional: namespaces members push to from their own wallets (devices,
 //                             //   contributors), presented beside the sources'; true = every repo they push.
+//                             //   A bare name takes any wallet's repo of it; "0x<wallet>/readings" takes only
+//                             //   that wallet's. Sources are always the app's own wallet's repos.
 //                             //   Without sources the app already presents every member's repo.
 //   "network": "baseSepolia", // required: the SDK's network name
-//   "owner": "0x…",           // the wallet that publishes the app's repo; only `westmarch build` (the
+//   "owner": "0x…",           // the wallet that publishes the app's repo and its sources; only `westmarch build` (the
 //                             //   deploy button) needs it, westmarch-ship asks the CLI
 //   "fangorn": "fangorn",     // the CLI that signs; e.g. "node ~/fangorn/fangorn/lib/cli/cli.js",
 //                             //   or "env HOME=<dir> node …/cli.js" to sign with <dir>/.fangorn/config.json
@@ -111,16 +113,17 @@ export function loadConfig(path) {
     if (!c.site.project) throw new Error(`${path}: site.project names the Cloudflare Worker`);
     for (const s of c.sources) if (!s.namespace || !Array.isArray(s.command))
         throw new Error(`${path}: each source needs a namespace and a command (an argv array)`);
-    if (c.live != null && c.live !== true && !(Array.isArray(c.live) && c.live.every((n) => typeof n === "string")))
-        throw new Error(`${path}: live is true (every repo members push) or a list of the namespaces they push to`);
+    if (c.live != null && c.live !== true && !(Array.isArray(c.live) && c.live.every((n) => typeof n === "string" && n && !/^0x(?![0-9a-fA-F]{40}\/.)/.test(n))))
+        throw new Error(`${path}: live is true (every repo members push) or a list of the namespaces they push to: "name" (any wallet's) or "0x<40 hex>/name" (that wallet's)`);
     return { relations: [], tags: [], types: {}, ...c };
 }
 
-/** The repo names the view presents: the sources' namespaces plus `live`'s, the ones members push
- *  to themselves (devices, contributors). [] means every repo the app presents: no sources, or live: true. */
-export function presentedRepos(cfg) {
+/** The repos the view presents (view.js `presents`): the sources' namespaces, pinned to `owner`, the
+ *  wallet that publishes them, plus `live`'s, the ones members push to themselves (devices, contributors).
+ *  [] means every repo the app presents: no sources, or live: true. */
+export function presentedRepos(cfg, owner) {
     if (cfg.live === true) return [];
-    return [...new Set([...cfg.sources.map((s) => s.namespace), ...(cfg.live ?? [])])];
+    return [...new Set([...cfg.sources.map((s) => `${owner.toLowerCase()}/${s.namespace}`), ...(cfg.live ?? [])])];
 }
 
 /** The Worker's wrangler config: the stock worker, the site as its assets, its bucket, the AI
@@ -225,11 +228,13 @@ export async function buildForDeploy(configPath, wranglerPath = join(dirname(res
 
     const base = dirname(resolve(configPath));
     const { site, writeCard } = await buildSite(cfg, base);
-    writeCard(view.ORIGIN, { owner: cfg.owner, fromBlock, repos: [] });
+    // Sources pinned to the owner beside `live`, as a ship presents them; [] (every repo) with neither, or live: true.
+    const repos = presentedRepos(cfg, cfg.owner);
+    writeCard(view.ORIGIN, { owner: cfg.owner, fromBlock, repos });
     const gateway = process.env.FANGORN_IPFS_GATEWAY;
     w.assets = { ...w.assets, directory: relative(dirname(resolve(wranglerPath)), site) };
     w.vars = { ...w.vars, CONFIG: { app: cfg.app, name: cfg.name, description: cfg.description, fromBlock, network: cfg.network,
-                                    schema: { types: cfg.types, relations: cfg.relations }, repos: [], paid: false },
+                                    schema: { types: cfg.types, relations: cfg.relations }, repos, paid: false },
                ...(gateway ? { IPFS_GATEWAY: gateway } : {}) };
     writeFileSync(wranglerPath, JSON.stringify(w, null, 1) + "\n");
     log(`built ${cfg.app} (fromBlock ${fromBlock}) into ${site}; wrangler deploy ships it`);
@@ -266,7 +271,7 @@ export async function ship(configPath, { crawl = true, deploy = true, dry = fals
     const repoDir = join(dir, "repo");
     if (!(await fangorn.onChainTip(me, cfg.app))) {
         // Its own records start now; an app presenting every repo (the explorer) reads from the deployment's start.
-        if (presentedRepos(cfg).length) state.fromBlock = String(await chain.getBlockNumber());
+        if (presentedRepos(cfg, me).length) state.fromBlock = String(await chain.getBlockNumber());
         log(`creating the app's repo ${me}:${cfg.app}`);
         mkdirSync(repoDir, { recursive: true });
         fangornCli(["repo", "init", cfg.app], { cwd: repoDir, dry });
@@ -295,7 +300,7 @@ export async function ship(configPath, { crawl = true, deploy = true, dry = fals
     // site.url: the app's own domain, routed to the Worker. Otherwise its workers.dev URL,
     // which is only known once it is deployed: the first deploy learns it and the card follows.
     let url = cfg.site.url?.replace(/\/$/, "") ?? state.url ?? null;
-    const repos = presentedRepos(cfg);
+    const repos = presentedRepos(cfg, me);
     const writeSite = (u) => writeCard(u, { owner: me, fromBlock: state.fromBlock, repos, paid: !!cfg.paid });
     writeSite(url ?? `https://${cfg.site.project}.workers.dev`);
 
@@ -470,7 +475,7 @@ export async function devnetShip(configPath, { crawl = false, only = null, port
     }
 
     const url = `http://127.0.0.1:${port}`;
-    const repos = Object.keys(staged);
+    const repos = Object.keys(staged).map((ns) => `${owner.getAddress().toLowerCase()}/${ns}`);
     const { site, writeCard } = await buildSite(cfg, base);
     writeCard(url, { owner: owner.getAddress(), fromBlock: "0", repos, paid: !!services });
     const wcfg = wranglerConfig({ name: cfg.site.project, site, config: { app: cfg.app, name: cfg.name, description: cfg.description,
@@ -583,9 +588,10 @@ export async function buildLocal(configPath, out, { crawl = false, only = null,
         const statePath = join(base, ".ship/state.json");
         const fromBlock = (existsSync(statePath) ? JSON.parse(readFileSync(statePath, "utf8")).fromBlock : null) ?? cfg.fromBlock;
         const staged = new Set(cfg.sources.map((s) => s.namespace));
+        const { presents } = view;
         for (const t of await fangorn.repos(fromBlock == null ? {} : { fromBlock: BigInt(fromBlock) })) {
             if (t.repo === "fangorn.schema" || staged.has(t.repo) || (only && !only.includes(t.repo))
-                || (cfg.live !== true && !cfg.live.includes(t.repo))) continue;
+                || (cfg.live !== true && !presents(cfg.live, t.owner, t.repo))) continue;
             const { contents } = await fangorn.readRepo(t.owner, t.repo);
             chain[`${t.owner.toLowerCase()}/${t.repo}`] = { records: contents.records };
             say(`live ${t.owner}/${t.repo}: ${contents.records.length} records, from the chain`);
@@ -595,7 +601,7 @@ export async function buildLocal(configPath, out, { crawl = false, only = null,
     rmSync(out, { recursive: true, force: true });
     mkdirSync(join(base, ".ship"), { recursive: true });
     const embed = view.cachedEmbed(join(base, ".ship/vectors.ndjson"));
-    const repos = presentedRepos(cfg).filter((n) => !only || only.includes(n));
+    const repos = presentedRepos(cfg, owner).filter((n) => !only || only.includes(n.replace(/^0x[0-9a-f]{40}\//i, "")));
     const report = await view.publishView({ fangorn: view.localFangorn(chain), app: cfg.app,
         schema: { types: cfg.types, relations: cfg.relations }, repos, out, embed, log: say });
     const rows = Object.values(report).reduce((n, r) => n + r.added, 0);
@@ -615,10 +621,15 @@ if (process.argv[1]?.endsWith("ship.js") || process.argv[1]?.endsWith("westmarch
             || !w.compatibility_flags.includes("nodejs_compat") || !existsSync(w.main) || !existsSync(w.alias["@huggingface/transformers"]))
             throw new Error(`wrangler config: ${JSON.stringify(w)}`);
         const src = [{ namespace: "towns", command: ["py"] }];
-        if (presentedRepos({ sources: src }).join() !== "towns" || presentedRepos({ sources: src, live: ["readings", "towns"] }).join() !== "towns,readings"
-            || presentedRepos({ sources: src, live: true }).length || presentedRepos({ sources: [] }).length)
-            throw new Error("presentedRepos: sources plus live namespaces; [] (every repo) for live: true or no sources");
-        console.log("ship.js self-check ok — a source template fills per row, the Worker config binds its bucket, AI and cron, and presentedRepos merges sources and live namespaces");
+        const O = `0x${"Ab".repeat(20)}`, o = O.toLowerCase(), M = `0x${"cd".repeat(20)}`;
+        if (presentedRepos({ sources: src }, O).join() !== `${o}/towns` || presentedRepos({ sources: src, live: ["readings", `${M}/towns`] }, O).join() !== `${o}/towns,readings,${M}/towns`
+            || presentedRepos({ sources: src, live: true }, O).length || presentedRepos({ sources: [] }, O).length)
+            throw new Error("presentedRepos: sources pinned to the owner plus live namespaces as written; [] (every repo) for live: true or no sources");
+        const tmp = join(mkdtempSync(join(tmpdir(), "ship-")), "app.json");
+        const takes = (live) => { writeFileSync(tmp, JSON.stringify({ app: "a", name: "a", description: "d", site: { project: "a" }, live })); try { return !!loadConfig(tmp); } catch { return false; } };
+        if (![takes(["readings"]), takes([`${M}/readings`]), takes(true), !takes(["0x12/readings"]), !takes([`${M}/`]), !takes([""])].every(Boolean))
+            throw new Error("live: a bare name or 0x<40 hex>/name, nothing half-qualified");
+        console.log("ship.js self-check ok — a source template fills per row, the Worker config binds its bucket, AI and cron, and presentedRepos pins sources to the owner beside live namespaces, bare or owner-qualified");
         process.exit(0);
     }
     const [path, ...flags] = process.argv.slice(2);

package/src/publish/view-cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 // westmarch-view: publish what an app presents as a view (see view.js).
 //
-//   westmarch-view --app my-app --out site/view [--config app.json] [--repo catalog …] [--from-block N] [--rebake]
+//   westmarch-view --app my-app --out site/view [--config app.json] [--repo 0x<owner>/catalog …] [--from-block N] [--rebake]
 //
 // The schema (types, relations) is read from --config; without it every type is guessed.
 // Reads only; needs no key. Deploy <out> with the site, and put its URL in the card's
@@ -20,7 +20,7 @@ for (let i = 2; i < process.argv.length; i++) {
     if (m[1] === "repo") flags.repo.push(v); else flags[m[1]] = v;
 }
 if (flags.help || !flags.app || !flags.out) {
-    console.error("usage: westmarch-view --app <name|0xid> --out <dir> [--config app.json] [--repo <name> …] [--from-block N] [--rebake]");
+    console.error("usage: westmarch-view --app <name|0xid> --out <dir> [--config app.json] [--repo <0xowner/name | name> …] [--from-block N] [--rebake]");
     process.exit(flags.help ? 0 : 2);
 }
 

package/src/publish/view.js

@@ -1,11 +1,11 @@
 // An app's presented data → a view any Fangorn reader loads: the embedding lens
 // (WHITEPAPER_1 §3.4), computed by whoever runs this.
 //
-//   westmarch-view --app my-app [--repo catalog …] --out site/view     (a laptop, CI)
+//   westmarch-view --app my-app [--repo 0x<owner>/catalog …] --out site/view     (a laptop, CI)
 //   site/worker.js, on a cron                                          (the free tier)
 //
-// Reads the registry and storage and nothing else: every repo the app presents (any
-// publisher's repo of a name it lists), at their latest heads; the schema
+// Reads the registry and storage and nothing else: every repo the app presents (`presents`:
+// `0x<owner>/<repo>` for one publisher's, a bare name for any publisher's), at their latest heads; the schema
 // (app.json's `types` + `relations`) comes from the caller. Embeds only records the view does not hold
 // yet, drops removed ones, and writes, through a store (a directory or an R2 bucket):
 //
@@ -54,6 +54,11 @@ const slug = (s) => (String(s ?? "").replace(/[^A-Za-z0-9_-]+/g, "-").replace(/^
 /** A domain's name in the view: the publisher's address prefix and the repo. */
 export const domainFor = (owner, namespace) => `${slug(owner.slice(2, 10))}-${slug(namespace)}`;
 
+/** Whether an app's `repos` list takes `owner`'s `repo`: an entry is `0x<owner>/<repo>` (that
+ *  publisher's only) or a bare `<repo>` (any publisher's, for open namespaces). [] takes every repo. */
+export const presents = (repos, owner, repo) =>
+    !repos?.length || repos.includes(repo) || repos.some((r) => r.toLowerCase() === `${owner.toLowerCase()}/${repo}`.toLowerCase());
+
 /** The text a row is embedded from, minus the `search_document: ` prefix that
  *  `embedDocumentDirect` adds itself. */
 export function composeText(fields, rm) {
@@ -279,8 +284,8 @@ const sha256 = (s) => createHash("sha256").update(s).digest("hex");
 
 /**
  * Bring the view up to date with what the app presents. `fangorn` is an SDK client (reads
- * only); `schema` is app.json's { types, relations } (a type it leaves out is guessed); the view goes to `store`, or the directory `out`. `repos` narrows it to those repo
- * names (every publisher's); without it, every repo. `fromBlock` must be
+ * only); `schema` is app.json's { types, relations } (a type it leaves out is guessed); the view goes to `store`, or the directory `out`. `repos` narrows it
+ * (`presents`: `0x<owner>/<repo>` for one publisher's, a bare name for anyone's); without it, every repo. `fromBlock` must be
  * at or before the first update to a repo the app presents, or a repo the scan misses is left out;
  * left out, the SDK's deployment start. `embedBatch(texts)` embeds many at once where the
  * encoder batches (a Worker's AI binding); `embedder` is what the manifest records.
@@ -297,11 +302,10 @@ export async function publishView({ fangorn, app, schema, repos, out, store = fs
     const schemaHash = sha256(JSON.stringify(schema));
 
     // Every repo the app presents, at its latest head: one log scan.
-    // ponytail: open: any publisher's repo of a listed name, and with no names, every repo.
-    // Read the app's repo of citations instead once the SDK reads citations.
+    // ponytail: read the app's repo of citations instead once the SDK reads citations.
     const listed = (presented ?? await retry(() => fangorn.repos(fromBlock == null ? {} : { fromBlock: BigInt(fromBlock) })))
         // ponytail: "fangorn.schema" is where apps shipped before 2026-10-22 committed their schema; never data.
-        .filter((t) => t.repo !== "fangorn.schema" && (!repos?.length || repos.includes(t.repo)));
+        .filter((t) => t.repo !== "fangorn.schema" && presents(repos, t.owner, t.repo));
     log(`${listed.length} repo(s) presented${repos?.length ? ` of ${repos.join(", ")}` : ""}`);
 
     const report = {};
@@ -328,7 +332,8 @@ export async function publishView({ fangorn, app, schema, repos, out, store = fs
         if (live.has(d)) continue;
         const m = await readJson(store, `cdn/domains/${d}/manifest`, null);
         const repo = m?.filter?.repo?.[0] ?? m?.filter?.namespace?.[0];
-        if (repos?.length && !repos.includes(repo)) continue;
+        // A name this run doesn't cover (an --only build) is left alone; another publisher's repo of a covered name is dropped.
+        if (repos?.length && !repos.some((r) => r.replace(/^0x[0-9a-f]{40}\//i, "") === repo)) continue;
         await store.del(`cdn/domains/${d}`);
         report[d] = { added: 0, removed: m?.count ?? 0, dropped: true };
         log(`${d}: no longer presented by the app; dropped`);
@@ -647,6 +652,20 @@ if (import.meta.url === `file://${globalThis.process?.argv?.[1]}` && process.arg
     chain[`${PUB}/shop`] = shop;
     eq((await run())[d], { added: 2, removed: 0 }, "and presenting it again brings it back");
 
+    // Two publishers, one repo name: `0x<owner>/<repo>` takes only that publisher's; a bare name takes both.
+    eq([presents([`${PUB}/shop`], PUB, "shop"), presents([`${PUB.toUpperCase().replace("0X", "0x")}/shop`], PUB, "shop"),
+        presents([`${PUB}/shop`], OWNER, "shop"), presents(["shop"], OWNER, "shop"), presents([], OWNER, "x")],
+       [true, true, false, true, true], "presents: owner-qualified, case-insensitive address, bare name, empty list");
+    {
+        const twins = { [`${PUB}/shop`]: shop, [`${OWNER}/shop`]: { records: [rec("s1", TAG, { sku: "z9", name: "Squat", about: "not the shop you meant" })] } };
+        const o = mkdtempSync(`${tmpdir()}/view-twins-`);
+        const go = (repos) => publishView({ fangorn: localFangorn(twins), app: APP, schema, out: o, repos, embed, log: () => {} });
+        eq(Object.keys(await go(["shop"])).sort(), [domainFor(OWNER, "shop"), domainFor(PUB, "shop")].sort(), "a bare name presents every publisher's repo of it");
+        const r = await go([`${PUB}/shop`]);
+        eq([r[domainFor(OWNER, "shop")]?.dropped, existsSync(`${o}/cdn/domains/${domainFor(PUB, "shop")}`)], [true, true],
+           "pinning the name to one publisher drops the other's, already indexed");
+    }
+
     const setEmbedder = (e) => { const x = manifestOf(out, d); x.embedder = e; x.head = "moved"; writeFileSync(`${out}/cdn/domains/${d}/manifest`, JSON.stringify(x)); };
     setEmbedder({ ...EMBEDDER, runtime: "transformers.js cuda" });
     if ((await run())[d]?.error) throw new Error("another runtime of the same q8 model must be accepted");
@@ -766,5 +785,5 @@ if (import.meta.url === `file://${globalThis.process?.argv?.[1]}` && process.arg
         await r2.del(`cdn/domains/${d}`);
         eq([...objs.keys()].filter((k) => k.includes(d)), [], "del removes a folder and everything under it");
     }
-    console.log("view.js self-check ok — domain names and embedded text are stable, the schema is applied, an unmoved head reads nothing, additions ship as delta shards, removals compact the domain, an excluded repo is dropped and a restored one returns, the real reader sees exactly the live records by the publisher's id, another encoder's view is refused, declared references land on their source rows, and the view builds the same into R2");
+    console.log("view.js self-check ok — domain names and embedded text are stable, the schema is applied, an unmoved head reads nothing, additions ship as delta shards, removals compact the domain, an excluded repo is dropped and a restored one returns, a repo name pinned to one publisher drops the others, the real reader sees exactly the live records by the publisher's id, another encoder's view is refused, declared references land on their source rows, and the view builds the same into R2");
 }

package/template/README.md

@@ -37,7 +37,10 @@ fangorn push
 ```
 
 The view picks it up within 5 minutes at `<url>/view`. A source that crawls something
-on a schedule goes in `app.json` `sources`, and publishes with
+on a schedule goes in `app.json` `sources`. Once there are sources, the view presents
+only those repos, published by your wallet, plus the namespaces listed in `"live"`
+(`"live": ["items"]` for any wallet's `items`, `"0x<wallet>/items"` for one wallet's).
+A source publishes with
 `npx westmarch-ship app.json --no-deploy` (the push to `main` deploys; without the flag it
 would deploy a second copy over this Worker). See westmarch's docs.
 

package/template/package.json

@@ -6,7 +6,7 @@
     "deploy": "wrangler deploy"
   },
   "dependencies": {
-    "@fangorn-network/westmarch": "0.1.1",
+    "@fangorn-network/westmarch": "0.1.2",
     "@huggingface/transformers": "^4.3.1",
     "wrangler": "^4.83.0"
   }