@yemi33/minions 0.1.2018 → 0.1.2020

package/dashboard/js/render-meetings.js

@@ -115,6 +115,9 @@ let _meetingPollId = null;
 function _stopMeetingPoll() {
   if (_meetingPollInterval) { clearInterval(_meetingPollInterval); _meetingPollInterval = null; }
   _meetingPollId = null;
+  // F2 (W-mpgb0xe6000gb66d): drop linked-plan recheck cache when the modal closes.
+  _modalMeetingForLinkedPlanRecheck = null;
+  _modalLastLinkedPlanFile = null;
 }
 
 function _renderMeetingDetail(m) {
@@ -227,6 +230,10 @@ function _renderMeetingDetail(m) {
       try { showModalQa(); } catch { /* expected if QA not loaded */ }
 
       document.getElementById('modal').classList.add('open');
+
+      // F2 (W-mpgb0xe6000gb66d): refresh the linked-plan cache after each
+      // render so refreshPlans() can detect a flip and re-render the modal.
+      _setModalMeetingForLinkedPlanRecheck(m);
 }
 
 function openMeetingDetail(id) {
@@ -401,7 +408,14 @@ function _viewPlanWithBack(file, meetingId) {
 }
 
 function _findLinkedPlan(meeting) {
-  var plans = window._lastStatus?.plans || [];
+  // F2 (W-mpgb0xe6000gb66d): prefer window._lastPlans (refreshed by refreshPlans
+  // every ~12s) over window._lastStatus.plans, which is gated on the next
+  // /api/status fetch and can lag a newly-created plan by an entire refresh
+  // cycle. Falling back to _lastStatus.plans preserves first-paint behavior
+  // before refreshPlans has run.
+  var plans = (Array.isArray(window._lastPlans) ? window._lastPlans : null)
+    || window._lastStatus?.plans
+    || [];
   // Check 1: regex in conclusion text (agent may reference plan path)
   if (meeting?.conclusion?.content) {
     var match = meeting.conclusion.content.match(/plans\/([\w-]+\.md)/);
@@ -419,6 +433,36 @@ function _findLinkedPlan(meeting) {
   return null;
 }
 
+// F2 (W-mpgb0xe6000gb66d): post-refreshPlans hook. Cache the meeting
+// currently displayed in the modal so refreshPlans() can re-evaluate
+// _findLinkedPlan and re-render the action row when a freshly-created plan
+// now matches. Without this, the modal poll loop (3s) only re-renders on
+// meeting hash changes, so a plan created in the background never flips
+// "Create Plan from Meeting" → "View Plan".
+var _modalMeetingForLinkedPlanRecheck = null;
+var _modalLastLinkedPlanFile = null;
+
+function _setModalMeetingForLinkedPlanRecheck(meeting) {
+  if (meeting && meeting.status === 'completed') {
+    _modalMeetingForLinkedPlanRecheck = meeting;
+    _modalLastLinkedPlanFile = _findLinkedPlan(meeting)?.file || null;
+  } else {
+    _modalMeetingForLinkedPlanRecheck = null;
+    _modalLastLinkedPlanFile = null;
+  }
+}
+
+function _rerenderMeetingLinkedPlanIfChanged() {
+  if (!_modalMeetingForLinkedPlanRecheck) return;
+  var modalOpen = document.getElementById('modal')?.classList?.contains('open');
+  if (!modalOpen || !_meetingPollId) return;
+  var nextFile = _findLinkedPlan(_modalMeetingForLinkedPlanRecheck)?.file || null;
+  if (nextFile === _modalLastLinkedPlanFile) return;
+  // Linked-plan resolution changed — re-render the modal (preserves scroll;
+  // _renderMeetingDetail will refresh _modalLastLinkedPlanFile via the cache hook).
+  _renderMeetingDetail(_modalMeetingForLinkedPlanRecheck);
+}
+
 async function _createPlanFromMeeting(id, btn) {
   // Optimistic: instant feedback before fetching the meeting + posting the WI.
   showToast('meeting-plan-toast', 'Plan task queued — agent will draft the plan from this meeting', true);
@@ -483,4 +527,4 @@ async function _deleteMeeting(id) {
   } catch (e) { clearDeleted('mtg:' + id); showToast('cmd-toast', 'Error: ' + e.message, false); refresh(); }
 }
 
-window.MinionsMeetings = { renderMeetings, openMeetingDetail, openCreateMeetingModal };
+window.MinionsMeetings = { renderMeetings, openMeetingDetail, openCreateMeetingModal, _rerenderMeetingLinkedPlanIfChanged };

package/dashboard/js/render-plans.js

@@ -65,6 +65,17 @@ async function refreshPlans() {
     // colliding with the 'plans' slice tracked by _processStatusUpdate (F6).
     if (typeof _changed !== 'function' || _changed('plansPayload', plans)) {
       renderPlans(plans);
+      // F2 (W-mpgb0xe6000gb66d): if a meeting modal is open, ask it to re-check
+      // its linked-plan resolution against the freshly fetched plan list. Without
+      // this hook, a meeting modal's "Create Plan from Meeting" → "View Plan"
+      // flip waits for the next meeting-object change (refresh.js:135 gates
+      // renderMeetings on _changed(meetings, ...)). Gated on _changed so we only
+      // re-render meeting modal when plan data actually moved (F6 alignment).
+      try {
+        if (typeof _rerenderMeetingLinkedPlanIfChanged === 'function') {
+          _rerenderMeetingLinkedPlanIfChanged();
+        }
+      } catch { /* hook is best-effort — never block plan refresh on it */ }
     }
   } catch (e) { console.error('plans refresh:', e.message); }
 }

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.2018",
+  "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"