@memfork/cli 0.1.17 → 0.1.19

package/dist/cli.js

@@ -89,9 +89,9 @@ program
     .action(wrap((opts) => cmdCommit(opts)));
 program
     .command("merge <from> <into>")
-    .description("propose a merge from one branch into another")
-    .requiredOption("-r, --resolver <id>", "ResolverRef object ID")
-    .option("--ttl <ms>", "TTL in milliseconds", parseInt, 86_400_000)
+    .description("merge memory from one branch into another")
+    .option("-r, --resolver <id>", "ResolverRef object ID (default: LastWriteWins, or MEMFORK_RESOLVER_ID env var)")
+    .option("--ttl <ms>", "proposal TTL in milliseconds", parseInt, 86_400_000)
     .action(wrap((from, into, opts) => cmdMerge(from, into, opts)));
 program
     .command("proposals")

package/dist/commands/ops.d.ts

@@ -20,7 +20,7 @@ export declare function cmdCommit(opts: {
     autoExtract?: boolean;
 }): Promise<void>;
 export declare function cmdMerge(from: string, into: string, opts: {
-    resolver: string;
+    resolver?: string;
     ttl?: number;
 }): Promise<void>;
 export declare function cmdProposals(): Promise<void>;

package/dist/commands/ops.js

@@ -126,20 +126,34 @@ export async function cmdCommit(opts) {
 }
 // ─── merge ────────────────────────────────────────────────────────────────────
 export async function cmdMerge(from, into, opts) {
-    const { client } = await getClient();
-    process.stdout.write(chalk.dim(`Proposing merge ${chalk.green(from)} → ${chalk.green(into)} …  `));
-    const digest = await client.proposeMerge({
-        fromBranch: from,
-        intoBranch: into,
-        resolverId: opts.resolver,
-        ttlMs: opts.ttl ?? 86_400_000,
-    });
+    const cfg = resolveConfig();
+    const clientCfg = {
+        ...toClientConfig(cfg),
+        // --resolver flag overrides MEMFORK_RESOLVER_ID env var for this call
+        ...(opts.resolver ? { defaultResolverId: opts.resolver } : {}),
+    };
+    const client = await MemForksClient.connect(clientCfg);
+    const governed = !!(opts.resolver ?? process.env["MEMFORK_RESOLVER_ID"]);
+    process.stdout.write(chalk.dim(`Merging ${chalk.green(from)} → ${chalk.green(into)}`) +
+        chalk.dim(governed ? "  (governed — awaiting resolver…)" : "  (LWW — self-finalizing…)") +
+        "  ");
+    const { digest, mergedCount, blobId, proposalId } = await client.merge(from, into);
     console.log(chalk.green("done"));
     console.log("");
-    console.log(chalk.dim(`  tx: ${digest}`));
+    console.log(chalk.dim(`  facts merged: ${mergedCount}`));
+    if (blobId)
+        console.log(chalk.dim(`  blob:         ${blobId}`));
+    if (digest)
+        console.log(chalk.dim(`  tx:           ${digest}`));
+    if (proposalId)
+        console.log(chalk.dim(`  proposal:     ${proposalId}`));
     console.log("");
-    console.log(chalk.dim("The resolver runtime will handle attestation and finalization automatically."));
-    console.log(chalk.dim("Use `memfork proposals` to monitor progress."));
+    if (governed) {
+        console.log(chalk.dim("Resolver finalized. Use `memfork log --branch " + into + "` to verify."));
+    }
+    else {
+        console.log(chalk.dim("Merge anchor written on-chain. Use `memfork log --branch " + into + "` to verify."));
+    }
     console.log("");
 }
 // ─── proposals ────────────────────────────────────────────────────────────────

package/dist/commands/ui-server.js

@@ -49,7 +49,7 @@ async function handleApiConfig(res) {
     const stored = treeId ? creds.trees[treeId] : undefined;
     json(res, {
         treeId,
-        packageId: project?.packageId ?? "0x7df9719d799386d34d657c49ae8cd6f5f03b39036f7c428b556095e42afd852f",
+        packageId: project?.packageId ?? "0xc13cc014fb8084b3468f6e5ffdc272e64ef35b7a912332eba7a0d44dd66b3121",
         network,
         rpcUrl: project?.rpcUrl ?? null,
         hasMemwal: !!(stored?.memwalKey && stored?.memwalAccountId),

package/dist/config.d.ts

@@ -25,22 +25,22 @@
 export declare const MEMWAL_CONSTANTS: {
     readonly testnet: {
         readonly packageId: "0xcf6ad755a1cdff7217865c796778fabe5aa399cb0cf2eba986f4b582047229c6";
-        readonly memforksPackageId: "0xc9f0a4964f810c794479bc5b66347998969d2c59d6797c313b8a96d2bdd6a914";
+        readonly memforksPackageId: "0x185e765a4979fb9d9089374f822485c88b9d0b2f91f9b1313a73043d5ef2357f";
         readonly registryId: "0xe80f2feec1c139616a86c9f71210152e2a7ca552b20841f2e192f99f75864437";
-        readonly relayer: "https://relayer.staging.memwal.ai";
+        readonly relayer: "https://relayer-staging.memory.walrus.xyz";
     };
     readonly mainnet: {
         readonly packageId: "0xcee7a6fd8de52ce645c38332bde23d4a30fd9426bc4681409733dd50958a24c6";
-        readonly memforksPackageId: "0x7df9719d799386d34d657c49ae8cd6f5f03b39036f7c428b556095e42afd852f";
+        readonly memforksPackageId: "0xc13cc014fb8084b3468f6e5ffdc272e64ef35b7a912332eba7a0d44dd66b3121";
         readonly registryId: "0x0da982cefa26864ae834a8a0504b904233d49e20fcc17c373c8bed99c75a7edd";
-        readonly relayer: "https://relayer.memwal.ai";
+        readonly relayer: "https://relayer.memory.walrus.xyz";
     };
 };
 export interface ProjectConfig {
     /** Sui MemoryTree object ID. */
     treeId?: string;
     /** Sui network. Default: "mainnet". */
-    network?: "testnet" | "mainnet" | "devnet" | "localnet";
+    network?: 'testnet' | 'mainnet' | 'devnet' | 'localnet';
     /** Default branch name. Default: "main". */
     defaultBranch?: string;
     /** Override Sui RPC URL. */
@@ -70,7 +70,7 @@ export interface ResolvedConfig {
     memwalAccountId: string;
     memwalKey: string;
     memwalRelayer: string;
-    network: "testnet" | "mainnet" | "devnet" | "localnet";
+    network: 'testnet' | 'mainnet' | 'devnet' | 'localnet';
     defaultBranch: string;
     rpcUrl?: string;
     packageId?: string;

package/dist/config.js

@@ -22,32 +22,32 @@
  *
  * Plugins and hooks call the CLI binary and never read credentials themselves.
  */
-import fs from "node:fs";
-import path from "node:path";
-import os from "node:os";
+import fs from 'node:fs';
+import path from 'node:path';
+import os from 'node:os';
 // ─── Public network constants ─────────────────────────────────────────────────
 // Sources: https://docs.memwal.ai/contract/overview
 export const MEMWAL_CONSTANTS = {
     testnet: {
-        packageId: "0xcf6ad755a1cdff7217865c796778fabe5aa399cb0cf2eba986f4b582047229c6",
-        memforksPackageId: "0xc9f0a4964f810c794479bc5b66347998969d2c59d6797c313b8a96d2bdd6a914",
-        registryId: "0xe80f2feec1c139616a86c9f71210152e2a7ca552b20841f2e192f99f75864437",
-        relayer: "https://relayer.staging.memwal.ai",
+        packageId: '0xcf6ad755a1cdff7217865c796778fabe5aa399cb0cf2eba986f4b582047229c6',
+        memforksPackageId: '0x185e765a4979fb9d9089374f822485c88b9d0b2f91f9b1313a73043d5ef2357f',
+        registryId: '0xe80f2feec1c139616a86c9f71210152e2a7ca552b20841f2e192f99f75864437',
+        relayer: 'https://relayer-staging.memory.walrus.xyz',
     },
     mainnet: {
-        packageId: "0xcee7a6fd8de52ce645c38332bde23d4a30fd9426bc4681409733dd50958a24c6",
-        memforksPackageId: "0x7df9719d799386d34d657c49ae8cd6f5f03b39036f7c428b556095e42afd852f",
-        registryId: "0x0da982cefa26864ae834a8a0504b904233d49e20fcc17c373c8bed99c75a7edd",
-        relayer: "https://relayer.memwal.ai",
+        packageId: '0xcee7a6fd8de52ce645c38332bde23d4a30fd9426bc4681409733dd50958a24c6',
+        memforksPackageId: '0xc13cc014fb8084b3468f6e5ffdc272e64ef35b7a912332eba7a0d44dd66b3121',
+        registryId: '0x0da982cefa26864ae834a8a0504b904233d49e20fcc17c373c8bed99c75a7edd',
+        relayer: 'https://relayer.memory.walrus.xyz',
     },
 };
 // ─── Paths ────────────────────────────────────────────────────────────────────
 function defaultRelayer(network) {
-    return MEMWAL_CONSTANTS[network]?.relayer
-        ?? MEMWAL_CONSTANTS.mainnet.relayer;
+    return (MEMWAL_CONSTANTS[network]?.relayer ??
+        MEMWAL_CONSTANTS.mainnet.relayer);
 }
 export function projectConfigPath(cwd = process.cwd()) {
-    return path.join(cwd, ".memfork", "config.json");
+    return path.join(cwd, '.memfork', 'config.json');
 }
 /**
  * Walk up the directory tree from `cwd` looking for a `.memfork/config.json`,
@@ -56,7 +56,7 @@ export function projectConfigPath(cwd = process.cwd()) {
 function findProjectConfigPath(cwd = process.cwd()) {
     let dir = cwd;
     while (true) {
-        const candidate = path.join(dir, ".memfork", "config.json");
+        const candidate = path.join(dir, '.memfork', 'config.json');
         if (fs.existsSync(candidate))
             return candidate;
         const parent = path.dirname(dir);
@@ -66,7 +66,7 @@ function findProjectConfigPath(cwd = process.cwd()) {
     }
 }
 export function credentialsPath() {
-    return path.join(os.homedir(), ".memfork", "credentials.json");
+    return path.join(os.homedir(), '.memfork', 'credentials.json');
 }
 // ─── Read helpers ─────────────────────────────────────────────────────────────
 export function readProjectConfig(cwd = process.cwd()) {
@@ -74,7 +74,7 @@ export function readProjectConfig(cwd = process.cwd()) {
     if (!p)
         return null;
     try {
-        return JSON.parse(fs.readFileSync(p, "utf8"));
+        return JSON.parse(fs.readFileSync(p, 'utf8'));
     }
     catch {
         return null;
@@ -85,7 +85,7 @@ export function readCredentials() {
     if (!fs.existsSync(p))
         return { trees: {} };
     try {
-        return JSON.parse(fs.readFileSync(p, "utf8"));
+        return JSON.parse(fs.readFileSync(p, 'utf8'));
     }
     catch {
         return { trees: {} };
@@ -94,14 +94,14 @@ export function readCredentials() {
 // ─── Write helpers ────────────────────────────────────────────────────────────
 export function writeProjectConfig(cfg, cwd = process.cwd()) {
     const root = findGitRoot(cwd) ?? cwd;
-    const dir = path.join(root, ".memfork");
+    const dir = path.join(root, '.memfork');
     fs.mkdirSync(dir, { recursive: true });
-    fs.writeFileSync(path.join(root, ".memfork", "config.json"), JSON.stringify(cfg, null, 2) + "\n", "utf8");
+    fs.writeFileSync(path.join(root, '.memfork', 'config.json'), JSON.stringify(cfg, null, 2) + '\n', 'utf8');
 }
 function findGitRoot(cwd) {
     let dir = cwd;
     while (true) {
-        if (fs.existsSync(path.join(dir, ".git")))
+        if (fs.existsSync(path.join(dir, '.git')))
             return dir;
         const parent = path.dirname(dir);
         if (parent === dir)
@@ -110,10 +110,10 @@ function findGitRoot(cwd) {
     }
 }
 export function writeCredentials(creds) {
-    const dir = path.join(os.homedir(), ".memfork");
+    const dir = path.join(os.homedir(), '.memfork');
     fs.mkdirSync(dir, { recursive: true });
     const p = credentialsPath();
-    fs.writeFileSync(p, JSON.stringify(creds, null, 2) + "\n", "utf8");
+    fs.writeFileSync(p, JSON.stringify(creds, null, 2) + '\n', 'utf8');
     // 600: owner read+write only — no other users can read private keys.
     fs.chmodSync(p, 0o600);
 }
@@ -133,7 +133,7 @@ export function setDefaultTree(treeId) {
 export class ConfigError extends Error {
     constructor(message) {
         super(message);
-        this.name = "ConfigError";
+        this.name = 'ConfigError';
     }
 }
 /**
@@ -145,21 +145,15 @@ export function resolveConfig(opts = {}) {
     const creds = readCredentials();
     const env = process.env;
     // ── Resolve treeId ──────────────────────────────────────────────────────────
-    const treeId = env["MEMFORK_TREE_ID"] ??
-        opts.treeId ??
-        project?.treeId ??
-        creds.default;
+    const treeId = env['MEMFORK_TREE_ID'] ?? opts.treeId ?? project?.treeId ?? creds.default;
     if (!treeId) {
-        throw new ConfigError("No MemoryTree found. Run `memfork init` to create or link one.");
+        throw new ConfigError('No MemoryTree found. Run `memfork init` to create or link one.');
     }
     // ── Resolve credentials ────────────────────────────────────────────────────
     const stored = creds.trees[treeId];
-    const privateKey = env["MEMFORK_PRIVATE_KEY"] ??
-        stored?.privateKey;
-    const memwalAccountId = env["MEMFORK_MEMWAL_ACCOUNT"] ??
-        stored?.memwalAccountId;
-    const memwalKey = env["MEMFORK_MEMWAL_KEY"] ??
-        stored?.memwalKey;
+    const privateKey = env['MEMFORK_PRIVATE_KEY'] ?? stored?.privateKey;
+    const memwalAccountId = env['MEMFORK_MEMWAL_ACCOUNT'] ?? stored?.memwalAccountId;
+    const memwalKey = env['MEMFORK_MEMWAL_KEY'] ?? stored?.memwalKey;
     if (!privateKey) {
         throw new ConfigError(`No private key for tree ${treeId}. Run \`memfork init\` or set MEMFORK_PRIVATE_KEY.`);
     }
@@ -170,22 +164,23 @@ export function resolveConfig(opts = {}) {
         throw new ConfigError(`No MemWal delegate key for tree ${treeId}. Run \`memfork init\` or set MEMFORK_MEMWAL_KEY.`);
     }
     // ── Merge non-secret config ────────────────────────────────────────────────
-    const network = (env["MEMFORK_NETWORK"] ??
+    const network = (env['MEMFORK_NETWORK'] ??
         project?.network ??
-        "mainnet");
+        'mainnet');
     return {
         treeId,
         privateKey,
         memwalAccountId,
         memwalKey,
-        memwalRelayer: env["MEMFORK_RELAYER_URL"] ??
+        memwalRelayer: env['MEMFORK_RELAYER_URL'] ??
             stored?.memwalRelayer ??
             defaultRelayer(network),
         network,
-        defaultBranch: project?.defaultBranch ?? "main",
-        rpcUrl: env["MEMFORK_RPC_URL"] ?? project?.rpcUrl,
-        packageId: env["MEMFORK_PACKAGE_ID"] ?? project?.packageId,
-        sponsorUrl: env["MEMFORK_SPONSOR_URL"] ?? project?.["sponsorUrl"],
+        defaultBranch: project?.defaultBranch ?? 'main',
+        rpcUrl: env['MEMFORK_RPC_URL'] ?? project?.rpcUrl,
+        packageId: env['MEMFORK_PACKAGE_ID'] ?? project?.packageId,
+        sponsorUrl: env['MEMFORK_SPONSOR_URL'] ??
+            project?.['sponsorUrl'],
     };
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memfork/cli",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "MemForks CLI — init, commit, recall, merge, install plugins",
   "repository": {
     "type": "git",