truecourse 0.6.0-next.1 → 0.6.0-next.2

package/cli.mjs

@@ -128242,7 +128242,7 @@ function readToolVersion() {
   if (cachedVersion)
     return cachedVersion;
   if (true) {
-    cachedVersion = "0.6.0-next.1";
+    cachedVersion = "0.6.0-next.2";
     return cachedVersion;
   }
   try {
@@ -149341,12 +149341,18 @@ async function runSpecScan(opts = {}) {
       O2.message("Open conflicts:");
       for (const c2 of merge2.openConflicts.slice(0, 10)) {
         O2.message(`  \u2022 ${c2.subject}  (${c2.candidates.length} candidates, default: ${c2.candidates[c2.defaultPick].claim.provenance.file})`);
+        O2.message(`    id: ${c2.id}`);
       }
       if (merge2.openConflicts.length > 10) {
-        O2.message(`  \u2026 (+${merge2.openConflicts.length - 10} more)`);
+        O2.message(`  \u2026 (+${merge2.openConflicts.length - 10} more \u2014 run \`truecourse spec conflicts list\`)`);
       }
       O2.message("");
-      O2.message("Resolve in the dashboard, or run `truecourse spec resolve --all-defaults`.");
+      O2.message("Resolve them:");
+      O2.message("  \u2022 dashboard:        truecourse dashboard            (Spec tab)");
+      O2.message("  \u2022 per conflict:     truecourse spec conflicts show <id>");
+      O2.message("                      truecourse spec conflicts pick <id> <candidateIndex>");
+      O2.message('                      truecourse spec conflicts custom <id> --text "\u2026"');
+      O2.message("  \u2022 accept defaults:  truecourse spec resolve --all-defaults");
     }
     gt(merge2.openConflicts.length === 0 ? "No open conflicts." : `${merge2.openConflicts.length} open.`);
   } catch (e) {
@@ -149563,7 +149569,7 @@ async function runSpecConflictsList(opts = {}) {
   const list = opts.all ? [...open, ...decided.map((d3) => d3.conflict)] : opts.decided ? decided.map((d3) => d3.conflict) : open;
   O2.step(`${list.length} ${which} conflicts`);
   for (const c2 of list) {
-    O2.message(`  \u2022 ${c2.id.slice(0, 12)}\u2026  [${c2.topic}] ${c2.subject}  (${c2.candidates.length} candidates)`);
+    O2.message(`  \u2022 ${c2.id}  [${c2.topic}] ${c2.subject}  (${c2.candidates.length} candidates)`);
   }
   gt("Use `truecourse spec conflicts show <id>` for full detail.");
 }
@@ -149575,7 +149581,7 @@ async function runSpecConflictsShow(conflictId2, opts = {}) {
     pt(`Conflict ${conflictId2} not found.`);
     process.exit(1);
   }
-  mt(`Conflict ${conflict.id.slice(0, 12)}\u2026 \u2014 ${conflict.subject}`);
+  mt(`Conflict ${conflict.id} \u2014 ${conflict.subject}`);
   O2.step(`topic: ${conflict.topic}`);
   if (conflict.explanation) O2.message(conflict.explanation);
   O2.step(`${conflict.candidates.length} candidates (default-pick: ${conflict.defaultPick})`);
@@ -152745,7 +152751,7 @@ async function runHooksRun() {
 
 // tools/cli/src/index.ts
 var program2 = new Command();
-program2.name("truecourse").version("0.6.0-next.1").description("TrueCourse CLI \u2014 analyze your repository and open the dashboard");
+program2.name("truecourse").version("0.6.0-next.2").description("TrueCourse CLI \u2014 analyze your repository and open the dashboard");
 var dashboardCmd = program2.command("dashboard").description("Start the TrueCourse dashboard and open it in your browser").option("--reconfigure", "Re-prompt for console vs background service mode").option("--service", "Run as a background service (skips mode prompt)").option("--console", "Run in this terminal (skips mode prompt)").action(async (options) => {
   if (options.service && options.console) {
     console.error("error: --service and --console are mutually exclusive");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "truecourse",
-  "version": "0.6.0-next.1",
+  "version": "0.6.0-next.2",
   "description": "Visualize your codebase architecture as an interactive graph",
   "type": "module",
   "bin": {

package/server.mjs

@@ -156920,7 +156920,7 @@ function readToolVersion() {
   if (cachedVersion)
     return cachedVersion;
   if (true) {
-    cachedVersion = "0.6.0-next.1";
+    cachedVersion = "0.6.0-next.2";
     return cachedVersion;
   }
   try {