@augmentd-labs/canvas-edge 0.6.2 → 0.6.3

package/README.md

@@ -76,6 +76,11 @@ mirrors.json). `CANVAS_DIRECTION=pull` makes the container a backup target
 Protocol: canvas-server `docs/canvas-edge-protocol.md` (tunnel) and
 `docs/sync-protocol.md` (file plane).
 
+New mirrors default to `rename` conflict handling: the hub version keeps its
+name and the device version gets a conflict-copy name. Set `CANVAS_CONFLICTS=prompt`
+for the hub conflict inbox instead. Existing `mirrors.json` conflict policies
+are preserved unless explicitly overridden.
+
 ### Client certificates (0.5.0+)
 
 Hub remotes retain `tls: { certFile, keyFile }` from the shared client config.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@augmentd-labs/canvas-edge",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "Canvas device runtime: folder mirrors (canvas-stored Mirror engine) + edge tunnel client (dist artifact)",
   "license": "AGPL-3.0-or-later",
   "type": "module",
@@ -47,6 +47,6 @@
   "bundleDependencies": [
     "canvas-stored"
   ],
-  "canvasRev": "52fc07d",
+  "canvasRev": "107b933",
   "canvasSource": "runtimes/edge"
 }

package/src/env.js

@@ -99,7 +99,7 @@ export function ensureEnvConfig(env = process.env) {
         mountpoint: path.resolve(env.CANVAS_MIRROR_PATH ? String(env.CANVAS_MIRROR_PATH) : (existing.mountpoint || '/data')),
         pins: env.CANVAS_PINS != null ? list(env.CANVAS_PINS) : (existing.pins || []),
         ignore: env.CANVAS_IGNORE != null ? list(env.CANVAS_IGNORE) : (existing.ignore || []),
-        conflicts: oneOf(env.CANVAS_CONFLICTS, ['prompt', 'rename'], existing.conflicts || 'prompt'),
+        conflicts: oneOf(env.CANVAS_CONFLICTS, ['prompt', 'rename'], existing.conflicts || 'rename'),
         deletes: oneOf(env.CANVAS_DELETES, ['propagate', 'keep'], existing.deletes || 'propagate'),
         direction: oneOf(env.CANVAS_DIRECTION, ['bi', 'pull', 'push'], existing.direction || 'bi'),
         client: 'daemon',

package/src/mirror-runtime.js

@@ -98,7 +98,7 @@ export class MirrorRuntime {
         this.#engine = new Mirror(this.#stored, {
             id: this.#mirror.id, local: 'local', remote: 'canvas:hub', trash: 'trash', conflicts: 'conflicts',
             prefixes: this.#mirror.pins || [], ignore: this.#mirror.ignore || [],
-            deletes: this.#mirror.deletes || 'propagate', conflictMode: this.#mirror.conflicts || 'prompt',
+            deletes: this.#mirror.deletes || 'propagate', conflictMode: this.#mirror.conflicts || 'rename',
             direction: this.#mirror.direction || 'bi',
             deviceId: this.#identity.deviceId, deviceName: this.#identity.deviceName,
         });