tines 0.0.187 → 0.0.188

package/dist/index.js

@@ -4413,6 +4413,51 @@ async function listAll(fetchPage, opts = {}) {
 // ../shared/src/routing.ts
 var INHERIT_RUNNER_ID = "*";
 
+// ../shared/src/issue-transfer.ts
+var compare = (a, b) => a < b ? -1 : a > b ? 1 : 0;
+function conflictsByKey(context) {
+  const repositories = new Map(context.repos.map((repo) => [repo.item_id, repo]));
+  return new Map(
+    context.conflicts.map((conflict) => {
+      const ids = [...new Set(conflict.item_ids)].sort(compare);
+      const key = JSON.stringify([conflict.dir, ids]);
+      return [
+        key,
+        {
+          dir: conflict.dir,
+          participants: ids.map((item_id) => {
+            const repo = repositories.get(item_id);
+            return {
+              item_id,
+              name: repo?.name ?? null,
+              scope_label: repo?.scope.label ?? null
+            };
+          })
+        }
+      ];
+    })
+  );
+}
+function deriveTransferConflictDeltas(before, after) {
+  const beforeByKey = conflictsByKey(before);
+  const afterByKey = conflictsByKey(after);
+  const keys = /* @__PURE__ */ new Set([...beforeByKey.keys(), ...afterByKey.keys()]);
+  const rank = { retained: 0, resolved: 1, introduced: 2 };
+  return [...keys].map((key) => {
+    const oldConflict = beforeByKey.get(key);
+    const newConflict = afterByKey.get(key);
+    return {
+      key,
+      change: oldConflict && newConflict ? "retained" : oldConflict ? "resolved" : "introduced",
+      dir: (oldConflict ?? newConflict).dir,
+      before: oldConflict?.participants ?? [],
+      after: newConflict?.participants ?? []
+    };
+  }).sort(
+    (a, b) => rank[a.change] - rank[b.change] || compare(a.dir, b.dir) || compare(a.key, b.key)
+  );
+}
+
 // ../shared/src/library/types.ts
 var LibraryValidationError = class extends Error {
   constructor(diagnostics) {
@@ -5397,6 +5442,7 @@ function routingLines(preview) {
       lines.push(
         `           ${check.ok ? "pass" : "FAIL"} ${check.name}: ${check.detail}${check.action?.label ? ` (${check.action.label})` : ""}`
       );
+      if (check.action?.cli) lines.push(`             fix: ${check.action.cli}`);
     }
     if (explainer.matched_rule)
       lines.push(`           matched rule ${explainer.matched_rule.scope_label}`);
@@ -5454,18 +5500,15 @@ function effectiveRepositoryLines(preview) {
 }
 function conflictLines(preview) {
   const lines = ["", "Repository checkout conflicts:"];
-  for (const [label, context] of [
-    ["  before", preview.context.before],
-    ["  after ", preview.context.after]
-  ]) {
-    if (!context.conflicts.length) lines.push(`${label}: none`);
-    for (const conflict of context.conflicts) {
-      const participants = conflict.item_ids.map((id2) => {
-        const repo = context.repos.find((item) => item.item_id === id2);
-        return repo ? `${repo.name} (${repo.scope.label})` : id2;
-      }).join(", ");
-      lines.push(`${label}: ${conflict.dir} \u2014 ${participants}`);
-    }
+  const deltas = deriveTransferConflictDeltas(preview.context.before, preview.context.after);
+  if (!deltas.length) return [...lines, "  none"];
+  const participants = (items) => items.map(
+    (item) => item.name && item.scope_label ? `${item.name} (${item.scope_label})` : item.item_id
+  ).join(", ");
+  for (const delta of deltas) {
+    lines.push(`  ${delta.change[0].toUpperCase()}${delta.change.slice(1)} \u2014 ${delta.dir}`);
+    if (delta.before.length) lines.push(`    Before: ${participants(delta.before)}`);
+    if (delta.after.length) lines.push(`    After: ${participants(delta.after)}`);
   }
   return lines;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tines",
-  "version": "0.0.187",
+  "version": "0.0.188",
   "description": "CLI for Tines, an orchestration layer for AI agents",
   "repository": {
     "type": "git",