@yemi33/minions 0.1.2019 → 0.1.2020

package/engine/shared.js

@@ -3255,16 +3255,18 @@ function getOperatorLogin(config) {
 }
 
 function deriveWorkItemBranchName(item, config) {
-  const login = getOperatorLogin(config) || 'unknown';
-  const wid = String(item?.id || '').toLowerCase();
-  const src = String(item?.title || item?.description || '').toLowerCase();
-  let slug = src.replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '');
-  const prefix = `user/${login}/${wid}-`;
-  // Cap total length at 120 chars by trimming the slug, leaving at least 8
-  // chars of slug room. Strip any trailing dash exposed by truncation.
-  const budget = Math.max(8, 120 - prefix.length);
-  if (slug.length > budget) slug = slug.slice(0, budget).replace(/-+$/, '');
-  return sanitizeBranch(prefix + (slug || 'work'));
+  // Reverted to the pre-#2698 short form `work/<wi-id>` after the
+  // descriptive-slug convention `user/<loginname>/<wi-id>-<slug>` produced
+  // 80–120-char branch names that polluted derived identifiers (e.g. the
+  // conflict-fix WI id in engine.js#buildDepConflictFixItem) and made the
+  // dashboard unreadable. The function signature is preserved so call sites
+  // and the dashboard pre-compute path stay wired. `getOperatorLogin` /
+  // `config` are intentionally unused here but retained for callers that
+  // may still inspect them.
+  void config;
+  const wid = String(item?.id || '').trim();
+  if (!wid) return null;
+  return sanitizeBranch(`work/${wid}`);
 }
 
 function _worktreeNameSuffix(dispatchId, projectName, branchName) {

package/engine.js

@@ -214,6 +214,31 @@ function parseConflictFiles(mergeOutput) {
 // be spawned in the blocked item's worktree root. That is a PRE-EXISTING
 // limitation of the dep-conflict-fix path — single-project plans (the common
 // case, and the trigger scenario P-wi1-bridge-readonly-{a,b,c}) are unaffected.
+// Derive a SHORT, stable conflict-fix WI id from a branch name. The legacy
+// shape `conflict-fix-${branch.replace(/[^a-zA-Z0-9-]/g, '-')}` was fine when
+// branches were `work/<wi-id>` (max ~25 chars), but PR #2698 codified the
+// `user/<loginname>/<wi-id>-<slug>` convention which makes branch names
+// 80-120+ chars and the resulting WI ids unreadable in the dashboard.
+//
+// Strategy:
+//   - strip `user/<login>/` prefix (only the WI portion matters)
+//   - strip `work/` prefix → keep `work-` for legacy-branch shape parity
+//   - sanitize remaining `/` → `-`
+//   - cap at 40 chars total; if truncated, suffix with 8-char sha1 of the
+//     full branch so different long branches that share a 40-char prefix
+//     still get distinct (deterministic) ids
+function deriveConflictFixKey(branch) {
+  let s = String(branch || '');
+  const userMatch = s.match(/^user\/[^/]+\/(.+)$/);
+  if (userMatch) s = userMatch[1];
+  const workMatch = s.match(/^work\/(.+)$/);
+  if (workMatch) s = `work-${workMatch[1]}`;
+  s = s.replace(/[^a-zA-Z0-9-]/g, '-');
+  if (s.length <= 40) return s;
+  const hash = require('crypto').createHash('sha1').update(String(branch || '')).digest('hex').slice(0, 8);
+  return `${s.slice(0, 31)}-${hash}`;
+}
+
 function buildDepConflictFixItem({
   depConflictBranch,
   depConflictFiles = [],
@@ -225,7 +250,7 @@ function buildDepConflictFixItem({
 }) {
   if (!depConflictBranch) throw new Error('buildDepConflictFixItem: depConflictBranch is required');
   if (!mainBranch) throw new Error('buildDepConflictFixItem: mainBranch is required');
-  const conflictFixId = `conflict-fix-${depConflictBranch.replace(/[^a-zA-Z0-9-]/g, '-')}`;
+  const conflictFixId = `conflict-fix-${deriveConflictFixKey(depConflictBranch)}`;
   const filesDesc = depConflictFiles.length > 0
     ? `\n\nConflicting files:\n${depConflictFiles.map(f => '- ' + f).join('\n')}`
     : '';
@@ -6758,7 +6783,7 @@ module.exports = {
   reconcileItemsWithPrs, detectDependencyCycles,
   areDependenciesMet, // exported for testing (P-bf04-decompose-zero-children)
   parseConflictFiles, pruneAncestorDeps, preflightMergeSimulation, // exported for testing
-  buildDepConflictFixItem, // exported for testing (W-mpcwojgr000a0244)
+  buildDepConflictFixItem, deriveConflictFixKey, // exported for testing (W-mpcwojgr000a0244)
   isWorktreeRetryableError, removeStaleIndexLock, syncReusedWorktree, assertCleanSharedWorktree, // exported for testing
   pruneStaleWorktreeForBranch, // exported for testing
   findExistingWorktree, // exported for testing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yemi33/minions",
-  "version": "0.1.2019",
+  "version": "0.1.2020",
   "description": "Multi-agent AI dev team that runs from ~/.minions/ — five autonomous agents share a single engine, dashboard, and knowledge base",
   "bin": {
     "minions": "bin/minions.js"