@iamu-dev/iamu 0.8.0-beta.6 → 0.8.0-beta.7

package/dist/bin.js

@@ -6685,6 +6685,9 @@ var init_wire_compat = __esm({
 });
 
 // ../../packages/local-store/dist/sync/server-meta.js
+function cloudDistinguishesHumanEdits(capabilities) {
+  return Boolean(capabilities?.includes(SYNC_TOKEN_CAPABILITY));
+}
 function cloudSupportsGuidance(capabilities) {
   return Boolean(capabilities?.includes(GUIDANCE_CAPABILITY) || capabilities?.includes(DESIGNER_FINDINGS_CAPABILITY));
 }
@@ -6753,7 +6756,7 @@ function shapeForServer(pending, capabilities) {
   }
   return { pending: out2, heldDesigner };
 }
-var DESIGNER_FINDINGS_CAPABILITY, GUIDANCE_CAPABILITY, WALKTHROUGH_DELETE_CAPABILITY, FINDING_PROVENANCE_CAPABILITY, BUNDLE_FINDING_HASH_CAPABILITY, RUN_BLOCKED_CAPABILITY;
+var DESIGNER_FINDINGS_CAPABILITY, GUIDANCE_CAPABILITY, WALKTHROUGH_DELETE_CAPABILITY, FINDING_PROVENANCE_CAPABILITY, BUNDLE_FINDING_HASH_CAPABILITY, RUN_BLOCKED_CAPABILITY, SYNC_TOKEN_CAPABILITY;
 var init_server_meta = __esm({
   "../../packages/local-store/dist/sync/server-meta.js"() {
     "use strict";
@@ -6765,6 +6768,7 @@ var init_server_meta = __esm({
     FINDING_PROVENANCE_CAPABILITY = "finding-provenance";
     BUNDLE_FINDING_HASH_CAPABILITY = "bundle-finding-hash";
     RUN_BLOCKED_CAPABILITY = "run-blocked";
+    SYNC_TOKEN_CAPABILITY = "sync-token";
   }
 });
 
@@ -14281,6 +14285,18 @@ async function pushOneBatch(target, batch, byType, label, opts = {}) {
   out2.errors.push(failure.message);
   return out2;
 }
+function cloudTokenOrigin(hash, humanTokens) {
+  if (hash.startsWith("cloud-sync-"))
+    return "projection";
+  if (hash.startsWith("cloud-"))
+    return humanTokens ? "person" : "unknown";
+  if (hash.startsWith("cloud:"))
+    return "unknown";
+  return null;
+}
+function isCloudToken(hash) {
+  return cloudTokenOrigin(hash, false) !== null;
+}
 async function ownEarlierWrites(projectRoot, batch, conflicts) {
   if (conflicts.length === 0)
     return [];
@@ -14294,7 +14310,7 @@ async function ownEarlierWrites(projectRoot, batch, conflicts) {
     const entity = byId.get(c.entity_id);
     if (!entity || c.base_hash || bases[c.entity_id])
       continue;
-    if (!c.cloud_hash || c.cloud_hash.startsWith("cloud:"))
+    if (!c.cloud_hash || isCloudToken(c.cloud_hash))
       continue;
     if (!sent[c.entity_id]?.includes(c.cloud_hash))
       continue;
@@ -14303,45 +14319,54 @@ async function ownEarlierWrites(projectRoot, batch, conflicts) {
   }
   return out2;
 }
-function findingRun(frontmatter) {
+function findingRuns(frontmatter) {
+  const out2 = /* @__PURE__ */ new Set();
   if (typeof frontmatter.run === "string" && frontmatter.run) {
-    return frontmatter.run;
+    out2.add(frontmatter.run);
   }
   const seen = frontmatter.seen_in;
-  if (typeof seen !== "string")
-    return null;
-  const i = seen.indexOf(":");
-  return i >= 0 ? seen.slice(i + 1) : seen;
+  if (typeof seen === "string") {
+    const m = /^(?:ux|designer):(.+)$/.exec(seen);
+    if (m?.[1])
+      out2.add(m[1]);
+  }
+  return out2;
 }
-async function rowsFromOwnBundles(projectRoot, batch, conflicts, adopt) {
-  if (!adopt || adopt.runs.size === 0 || conflicts.length === 0)
+async function rowsToAdopt(projectRoot, batch, conflicts, adopt) {
+  if (!adopt || conflicts.length === 0)
     return [];
   const bases = await readBaseHashes(projectRoot);
   const byId = new Map(batch.map((e) => [e.id, e]));
   const out2 = [];
   for (const c of conflicts) {
     const entity = byId.get(c.entity_id);
-    if (!entity || entity.type !== "finding")
-      continue;
-    if (!c.cloud_hash?.startsWith("cloud:"))
+    if (!entity || entity.type !== "finding" || !c.cloud_hash)
       continue;
-    const run = findingRun(entity.frontmatter);
-    if (!run || !adopt.runs.has(run))
+    const origin = cloudTokenOrigin(c.cloud_hash, adopt.humanTokens);
+    if (origin === null || origin === "person")
       continue;
-    const at = c.cloud_updated_at ? Date.parse(c.cloud_updated_at) : Number.NaN;
-    const slack = adopt.serverClock ? ADOPT_CLOCK_SLACK_MS : 0;
-    if (Number.isNaN(at) || at < adopt.since - slack)
-      continue;
-    if (adopt.identity && c.cloud_changed_by !== adopt.identity)
+    if (origin === "unknown" && !stampedByThisPass(c, entity, adopt)) {
       continue;
+    }
     await recordCloudBase(projectRoot, c.entity_id, c.cloud_hash);
-    out2.push({
+    out2.push(origin === "projection" ? { entity, restamped: false, kind: "projection" } : {
       entity,
-      restamped: Boolean(c.base_hash || bases[c.entity_id])
+      restamped: Boolean(c.base_hash || bases[c.entity_id]),
+      kind: "bundle"
     });
   }
   return out2;
 }
+function stampedByThisPass(c, entity, adopt) {
+  const runs = findingRuns(entity.frontmatter);
+  if (![...runs].some((r) => adopt.runs.has(r)))
+    return false;
+  const at = c.cloud_updated_at ? Date.parse(c.cloud_updated_at) : Number.NaN;
+  const slack = adopt.serverClock ? ADOPT_CLOCK_SLACK_MS : 0;
+  if (Number.isNaN(at) || at < adopt.since - slack)
+    return false;
+  return !adopt.identity || c.cloud_changed_by === adopt.identity;
+}
 async function pushBatches(target, batches, byType, opts = {}) {
   let pushed = 0;
   let enqueued = 0;
@@ -14377,7 +14402,7 @@ async function pushBatches(target, batches, byType, opts = {}) {
     const own = await ownEarlierWrites(target.projectRoot, batch, unresolved);
     const ownIds = new Set(own.map((e) => e.id));
     const basesBefore = opts.adopt ? await readCloudBase(target.projectRoot) : {};
-    const fromBundles = await rowsFromOwnBundles(target.projectRoot, batch, unresolved.filter((c) => !ownIds.has(c.entity_id)), opts.adopt);
+    const fromBundles = await rowsToAdopt(target.projectRoot, batch, unresolved.filter((c) => !ownIds.has(c.entity_id)), opts.adopt);
     const resend = [...own, ...fromBundles.map((a) => a.entity)];
     if (resend.length > 0) {
       const resendIds = new Set(resend.map((e) => e.id));
@@ -14391,6 +14416,7 @@ async function pushBatches(target, batches, byType, opts = {}) {
         if (landed2.has(a.entity.id)) {
           adopted.push({
             slug: a.entity.slug,
+            kind: a.kind,
             restamped: a.restamped,
             serverClock: opts.adopt?.serverClock ?? false
           });
@@ -15118,6 +15144,7 @@ async function runSync(projectRoot, deps) {
     runs: /* @__PURE__ */ new Set([...drainedRuns, ...runs]),
     since: startedAt + (serverClockOffsetMs ?? 0),
     serverClock: serverClockOffsetMs !== null,
+    humanTokens: cloudDistinguishesHumanEdits(capabilities),
     identity: deps.identity ?? null
   });
   const scanned = await scanPending(projectRoot);
@@ -15187,6 +15214,10 @@ async function runSync(projectRoot, deps) {
   progress.errors.push(...deletion.errors);
   notices.push(...deletion.notices);
   for (const a of progress.adopted) {
+    if (a.kind === "projection") {
+      notices.push(`${a.slug}: kept the local version over the cloud's projected triage (automated, from a run's outcome)`);
+      continue;
+    }
     const what = a.restamped ? "overwrote the cloud row re-stamped during this sync (its version token came from this sync's own bundle of the finding's run)" : "overwrote the cloud row stamped during this sync (its version token came from this sync's own bundle)";
     const clock = a.serverClock ? "" : "; the server sent no clock, so only rows stamped after this sync began by this machine's clock counted";
     notices.push(`${a.slug}: ${what}${clock}`);
@@ -25077,8 +25108,8 @@ import { dirname as dirname3, join as join5, relative, resolve as resolve2 } fro
 import { fileURLToPath as fileURLToPath2 } from "url";
 import chalk6 from "chalk";
 function getVersion() {
-  if ("0.8.0-beta.6") {
-    return "0.8.0-beta.6";
+  if ("0.8.0-beta.7") {
+    return "0.8.0-beta.7";
   }
   try {
     const thisDir = dirname3(fileURLToPath2(import.meta.url));

package/dist/build-hash.txt

@@ -1 +1 @@
-f5e575f9a571d24c34c77773c0feb71a627d2be39209a2124310486e49cd2bdf
+59403743808ddbd9b8b8b6dd935e183ee7c9040c9405d2f1deabed46c09ea324

package/dist/index.js

@@ -6684,6 +6684,9 @@ var init_wire_compat = __esm({
 });
 
 // ../../packages/local-store/dist/sync/server-meta.js
+function cloudDistinguishesHumanEdits(capabilities) {
+  return Boolean(capabilities?.includes(SYNC_TOKEN_CAPABILITY));
+}
 function cloudSupportsGuidance(capabilities) {
   return Boolean(capabilities?.includes(GUIDANCE_CAPABILITY) || capabilities?.includes(DESIGNER_FINDINGS_CAPABILITY));
 }
@@ -6752,7 +6755,7 @@ function shapeForServer(pending, capabilities) {
   }
   return { pending: out2, heldDesigner };
 }
-var DESIGNER_FINDINGS_CAPABILITY, GUIDANCE_CAPABILITY, WALKTHROUGH_DELETE_CAPABILITY, FINDING_PROVENANCE_CAPABILITY, BUNDLE_FINDING_HASH_CAPABILITY, RUN_BLOCKED_CAPABILITY;
+var DESIGNER_FINDINGS_CAPABILITY, GUIDANCE_CAPABILITY, WALKTHROUGH_DELETE_CAPABILITY, FINDING_PROVENANCE_CAPABILITY, BUNDLE_FINDING_HASH_CAPABILITY, RUN_BLOCKED_CAPABILITY, SYNC_TOKEN_CAPABILITY;
 var init_server_meta = __esm({
   "../../packages/local-store/dist/sync/server-meta.js"() {
     "use strict";
@@ -6764,6 +6767,7 @@ var init_server_meta = __esm({
     FINDING_PROVENANCE_CAPABILITY = "finding-provenance";
     BUNDLE_FINDING_HASH_CAPABILITY = "bundle-finding-hash";
     RUN_BLOCKED_CAPABILITY = "run-blocked";
+    SYNC_TOKEN_CAPABILITY = "sync-token";
   }
 });
 
@@ -14280,6 +14284,18 @@ async function pushOneBatch(target, batch, byType, label, opts = {}) {
   out2.errors.push(failure.message);
   return out2;
 }
+function cloudTokenOrigin(hash, humanTokens) {
+  if (hash.startsWith("cloud-sync-"))
+    return "projection";
+  if (hash.startsWith("cloud-"))
+    return humanTokens ? "person" : "unknown";
+  if (hash.startsWith("cloud:"))
+    return "unknown";
+  return null;
+}
+function isCloudToken(hash) {
+  return cloudTokenOrigin(hash, false) !== null;
+}
 async function ownEarlierWrites(projectRoot, batch, conflicts) {
   if (conflicts.length === 0)
     return [];
@@ -14293,7 +14309,7 @@ async function ownEarlierWrites(projectRoot, batch, conflicts) {
     const entity = byId.get(c.entity_id);
     if (!entity || c.base_hash || bases[c.entity_id])
       continue;
-    if (!c.cloud_hash || c.cloud_hash.startsWith("cloud:"))
+    if (!c.cloud_hash || isCloudToken(c.cloud_hash))
       continue;
     if (!sent[c.entity_id]?.includes(c.cloud_hash))
       continue;
@@ -14302,45 +14318,54 @@ async function ownEarlierWrites(projectRoot, batch, conflicts) {
   }
   return out2;
 }
-function findingRun(frontmatter) {
+function findingRuns(frontmatter) {
+  const out2 = /* @__PURE__ */ new Set();
   if (typeof frontmatter.run === "string" && frontmatter.run) {
-    return frontmatter.run;
+    out2.add(frontmatter.run);
   }
   const seen = frontmatter.seen_in;
-  if (typeof seen !== "string")
-    return null;
-  const i = seen.indexOf(":");
-  return i >= 0 ? seen.slice(i + 1) : seen;
+  if (typeof seen === "string") {
+    const m = /^(?:ux|designer):(.+)$/.exec(seen);
+    if (m?.[1])
+      out2.add(m[1]);
+  }
+  return out2;
 }
-async function rowsFromOwnBundles(projectRoot, batch, conflicts, adopt) {
-  if (!adopt || adopt.runs.size === 0 || conflicts.length === 0)
+async function rowsToAdopt(projectRoot, batch, conflicts, adopt) {
+  if (!adopt || conflicts.length === 0)
     return [];
   const bases = await readBaseHashes(projectRoot);
   const byId = new Map(batch.map((e) => [e.id, e]));
   const out2 = [];
   for (const c of conflicts) {
     const entity = byId.get(c.entity_id);
-    if (!entity || entity.type !== "finding")
-      continue;
-    if (!c.cloud_hash?.startsWith("cloud:"))
+    if (!entity || entity.type !== "finding" || !c.cloud_hash)
       continue;
-    const run = findingRun(entity.frontmatter);
-    if (!run || !adopt.runs.has(run))
+    const origin = cloudTokenOrigin(c.cloud_hash, adopt.humanTokens);
+    if (origin === null || origin === "person")
       continue;
-    const at = c.cloud_updated_at ? Date.parse(c.cloud_updated_at) : Number.NaN;
-    const slack = adopt.serverClock ? ADOPT_CLOCK_SLACK_MS : 0;
-    if (Number.isNaN(at) || at < adopt.since - slack)
-      continue;
-    if (adopt.identity && c.cloud_changed_by !== adopt.identity)
+    if (origin === "unknown" && !stampedByThisPass(c, entity, adopt)) {
       continue;
+    }
     await recordCloudBase(projectRoot, c.entity_id, c.cloud_hash);
-    out2.push({
+    out2.push(origin === "projection" ? { entity, restamped: false, kind: "projection" } : {
       entity,
-      restamped: Boolean(c.base_hash || bases[c.entity_id])
+      restamped: Boolean(c.base_hash || bases[c.entity_id]),
+      kind: "bundle"
     });
   }
   return out2;
 }
+function stampedByThisPass(c, entity, adopt) {
+  const runs = findingRuns(entity.frontmatter);
+  if (![...runs].some((r) => adopt.runs.has(r)))
+    return false;
+  const at = c.cloud_updated_at ? Date.parse(c.cloud_updated_at) : Number.NaN;
+  const slack = adopt.serverClock ? ADOPT_CLOCK_SLACK_MS : 0;
+  if (Number.isNaN(at) || at < adopt.since - slack)
+    return false;
+  return !adopt.identity || c.cloud_changed_by === adopt.identity;
+}
 async function pushBatches(target, batches, byType, opts = {}) {
   let pushed = 0;
   let enqueued = 0;
@@ -14376,7 +14401,7 @@ async function pushBatches(target, batches, byType, opts = {}) {
     const own = await ownEarlierWrites(target.projectRoot, batch, unresolved);
     const ownIds = new Set(own.map((e) => e.id));
     const basesBefore = opts.adopt ? await readCloudBase(target.projectRoot) : {};
-    const fromBundles = await rowsFromOwnBundles(target.projectRoot, batch, unresolved.filter((c) => !ownIds.has(c.entity_id)), opts.adopt);
+    const fromBundles = await rowsToAdopt(target.projectRoot, batch, unresolved.filter((c) => !ownIds.has(c.entity_id)), opts.adopt);
     const resend = [...own, ...fromBundles.map((a) => a.entity)];
     if (resend.length > 0) {
       const resendIds = new Set(resend.map((e) => e.id));
@@ -14390,6 +14415,7 @@ async function pushBatches(target, batches, byType, opts = {}) {
         if (landed2.has(a.entity.id)) {
           adopted.push({
             slug: a.entity.slug,
+            kind: a.kind,
             restamped: a.restamped,
             serverClock: opts.adopt?.serverClock ?? false
           });
@@ -15117,6 +15143,7 @@ async function runSync(projectRoot, deps) {
     runs: /* @__PURE__ */ new Set([...drainedRuns, ...runs]),
     since: startedAt + (serverClockOffsetMs ?? 0),
     serverClock: serverClockOffsetMs !== null,
+    humanTokens: cloudDistinguishesHumanEdits(capabilities),
     identity: deps.identity ?? null
   });
   const scanned = await scanPending(projectRoot);
@@ -15186,6 +15213,10 @@ async function runSync(projectRoot, deps) {
   progress.errors.push(...deletion.errors);
   notices.push(...deletion.notices);
   for (const a of progress.adopted) {
+    if (a.kind === "projection") {
+      notices.push(`${a.slug}: kept the local version over the cloud's projected triage (automated, from a run's outcome)`);
+      continue;
+    }
     const what = a.restamped ? "overwrote the cloud row re-stamped during this sync (its version token came from this sync's own bundle of the finding's run)" : "overwrote the cloud row stamped during this sync (its version token came from this sync's own bundle)";
     const clock = a.serverClock ? "" : "; the server sent no clock, so only rows stamped after this sync began by this machine's clock counted";
     notices.push(`${a.slug}: ${what}${clock}`);
@@ -25076,8 +25107,8 @@ import { dirname as dirname3, join as join5, relative, resolve as resolve2 } fro
 import { fileURLToPath as fileURLToPath2 } from "url";
 import chalk6 from "chalk";
 function getVersion() {
-  if ("0.8.0-beta.6") {
-    return "0.8.0-beta.6";
+  if ("0.8.0-beta.7") {
+    return "0.8.0-beta.7";
   }
   try {
     const thisDir = dirname3(fileURLToPath2(import.meta.url));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iamu-dev/iamu",
-  "version": "0.8.0-beta.6",
+  "version": "0.8.0-beta.7",
   "type": "module",
   "description": "Test your product as realistic personas — scenario-driven development CLI",
   "license": "MIT",