@memfork/cli 0.1.17 → 0.1.18

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/package.json

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