Adom Gantt

@@ -2035,13 +2035,52 @@ function saveToFile(){ function onSaveConflict(d){   saveBlocked=true;   clearTimeout(undoTimer); clearTimeout(undoToast.__t);   // this one waits for a decision-  undoToast.innerHTML='Someone else changed this plan. Your edits are not being saved. '+-    '<button type="button" id="reloadPlan" class="de-btn primary" style="margin-left:8px;padding:2px 10px">Reload</button>';+  // Three ways out, and the safe one is always available. Before this, a blocked+  // user's only choices were Reload (throw my edits away) and Export (which pulled+  // the SERVER's stale state, silently omitting the very edits they were trying to+  // keep). Download my version writes the in-memory plan to a file, so nothing is+  // ever trapped behind the banner. Save mine anyway force-writes over the other+  // change, behind a confirm click. Reload is unchanged.+  undoToast.innerHTML='Someone else changed this plan, so your edits are not being saved. '++    '<button type="button" id="dlMine" class="de-btn secondary" style="margin-left:8px;padding:2px 10px">Download my version</button>'++    '<button type="button" id="forceMine" class="de-btn secondary" style="margin-left:6px;padding:2px 10px">Save mine anyway</button>'++    '<button type="button" id="reloadPlan" class="de-btn primary" style="margin-left:6px;padding:2px 10px">Reload</button>';   undoToast.classList.add('show');-  const b=$('reloadPlan');-  if(b)b.addEventListener('click',()=>location.reload());+  const dl=$('dlMine');+  if(dl)dl.addEventListener('click',()=>{ doExport('json'); flash(saveInd,'downloaded your version',4000); });+  const rl=$('reloadPlan');+  if(rl)rl.addEventListener('click',()=>location.reload());+  // Two clicks, because it overwrites someone else's change. The first arms it and+  // says so; a second click inside four seconds commits; otherwise it disarms.+  const fm=$('forceMine');+  if(fm)fm.addEventListener('click',()=>{+    if(fm.dataset.armed!=='1'){+      fm.dataset.armed='1'; fm.textContent='Confirm overwrite'; fm.classList.remove('secondary'); fm.classList.add('primary');+      setTimeout(()=>{ if(fm&&fm.dataset.armed==='1'){ fm.dataset.armed='0'; fm.textContent='Save mine anyway'; fm.classList.remove('primary'); fm.classList.add('secondary'); } },4000);+      return;+    }+    forceSaveMine();+  });   flash(saveInd,'not saved, plan changed elsewhere',5000); }+// Overwrite whatever is on the server now with this tab's state. Posting with no+// baseRev bypasses the conflict guard exactly the way flushSave already does on+// unload: the guard only fires when a baseRev is present and stale. On success the+// tab adopts the new revision and autosave resumes, so the user is not stuck+// re-confirming after every keystroke.+function forceSaveMine(){+  const payload=getState();          // deliberately NO baseRev+  fetch('save',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(payload)})+    .then(async r=>{+      const d=await r.json().catch(()=>({}));+      if(!r.ok)throw new Error('server '+r.status);+      if(typeof d.stateRev==='number')baseRev=d.stateRev;+      saveBlocked=false;+      undoToast.classList.remove('show');+      flash(saveInd,'saved your version, overwriting the other change',5000);+    })+    .catch(()=>flash(saveInd,'could not force-save, try Download my version',4000));+} // Every toast's timer lives here so hover can pause it. Gone-before-you-noticed was // half duration and half that a toast you are reading keeps counting down; pointing // at one now stops the clock until you look away, which is what every toast in every@@ -3285,12 +3324,76 @@ $('btnExport').addEventListener('click',e=>{ }); } -function doExport(fmt){-  const url = `export/${fmt}`;-  const a = document.createElement('a');-  a.href = url;-  a.download = `${project.title.replace(/[^a-zA-Z0-9]/g,'-').toLowerCase()}.${fmt==='html'?'html':fmt}`;+// The plan as the user sees it RIGHT NOW, in the shape /export/json returns from+// disk: project, phases, items in display order with only their real fields. The+// point is that this reads the in-memory model, not the server, so an export+// reflects unsaved edits and keeps working when a save conflict has blocked the+// sidecar. `getState()` is a delta for the server to merge; this is the whole+// merged plan, which is what an export is.+function clientMergedData(){+  const FIELDS=['type','uid','id','name','label','start','end','date','phase','owner','status','description','deps','note','striped','provenance'];+  const clean=r=>{const o={};FIELDS.forEach(k=>{if(r[k]!==undefined)o[k]=r[k];});+    if(o.status)o.status=statusKey(o.status);        // the canonical vocabulary, as the server normalises on the way out+    return o;};+  const phs=phases.map(p=>{const o={name:p.name,start:p.start,end:p.end};if(p.color)o.color=p.color;return o;});+  return {project:Object.assign({},project),phases:phs,items:items.map(clean)};+}+// Byte-for-byte the server's itemsToCSV, because a CSV that round-trips has to+// re-import cleanly and the two must not drift. Kept client-side so the CSV export+// works with no server, same as JSON.+const CSV_FORMULA_LEAD=/^[=+\-@\t\r]/;+function csvGuardCell(s){return CSV_FORMULA_LEAD.test(s)?"'"+s:s;}+function clientItemsToCSV(itemsArr,phasesArr){+  const headers=['uid','id','name','start','end','phase','owner','status','description','provenance','provenance_url','deps','type','label','date','striped'];+  const cell=v=>{if(v==null)return '';const s=csvGuardCell(String(v));+    return (s.includes(',')||s.includes('"')||s.includes('\n')||s.includes('\r'))?'"'+s.replace(/"/g,'""')+'"':s;};+  const phaseName=i=>{const p=phasesArr&&phasesArr[i];return p&&p.name?p.name:(i==null?'':i);};+  const lines=[headers.join(',')];+  itemsArr.forEach(item=>{+    lines.push(headers.map(h=>{+      if(h==='deps')return cell((item.deps||[]).join(';'));+      if(h==='phase')return cell(phaseName(item.phase));+      if(h==='status')return cell(statusKey(item.status));+      if(h==='provenance'){const p=item.provenance;return cell(typeof p==='string'?p:(p&&p.label)||'');}+      if(h==='provenance_url'){const p=item.provenance;return cell((p&&typeof p==='object'&&p.url)||'');}+      return cell(item[h]);+    }).join(','));+  });+  return lines.join('\n');+}+function downloadBlob(blob,fname){+  const url=URL.createObjectURL(blob);+  const a=document.createElement('a');a.href=url;a.download=fname;   document.body.appendChild(a);a.click();a.remove();+  setTimeout(()=>URL.revokeObjectURL(url),1500);+}+// The export BUTTON serialises the client's current state. JSON and CSV are built+// here and need no server at all. SVG and HTML are rendered by POSTing that same+// client model to the server, so they reflect what is on screen rather than what+// is on disk, which is the whole fix: a user whose save is conflict-blocked can+// still get their in-memory edits out. The server /export GETs are untouched and+// still serve disk state for the AI handoff loop.+async function doExport(fmt){+  const fname=`${project.title.replace(/[^a-zA-Z0-9]/g,'-').toLowerCase()}.${fmt==='html'?'html':fmt}`;+  try{+    let blob;+    if(fmt==='json'){+      blob=new Blob([JSON.stringify(clientMergedData(),null,2)],{type:'application/json'});+    }else if(fmt==='csv'){+      const m=clientMergedData();+      blob=new Blob([clientItemsToCSV(m.items,m.phases)],{type:'text/csv'});+    }else{+      const m=clientMergedData();+      const r=await fetch('export/'+fmt,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(m)});+      if(!r.ok)throw new Error('the server answered '+r.status);+      const text=await r.text();+      blob=new Blob([text],{type:fmt==='svg'?'image/svg+xml':'text/html'});+    }+    downloadBlob(blob,fname);+    flash(saveInd,'exported '+fmt.toUpperCase());+  }catch(err){+    flash(saveInd,'export failed: '+err.message,4500);+  } }  // ── Import menu ──

@@ -1467,8 +1467,8 @@ function svgPhaseColor(p, i) {   return (p && p.color && !/^var\(/.test(p.color)) ? p.color : SVG_PHASE_RAMP[i % SVG_PHASE_RAMP.length]; } -function generateSVG() {-  const data = mergedData();+function generateSVG(dataArg) {+  const data = dataArg || mergedData();   const { project, phases } = data;    // Imports reject undateable rows, but a hand-edited data file never goes through@@ -1575,6 +1575,10 @@ function generateSVG() {    // Phase backgrounds   phases.forEach((p, pi) => {+    // An empty lane the user just created has no dated range yet, and a phase with+    // no start used to throw here and 500 the whole export. Skip it: no items, no+    // band. Same guard the phase-band pass above already applies.+    if (!p || !DATE_RE.test(String(p.start || '')) || !DATE_RE.test(String(p.end || ''))) return;     const [sy, sm] = p.start.split('-').map(Number);     const [ey, em] = p.end.split('-').map(Number);     const x1 = LABEL_W + PAD + mDiff(START, new Date(sy, sm - 1, 1)) * COL;@@ -1639,9 +1643,9 @@ function generateSVG() {  // ── Export: HTML snapshot ── -function generateHTMLSnapshot(user) {+function generateHTMLSnapshot(user, dataArg) {   const ganttHtml = serveApp(user);-  const data = mergedData();+  const data = dataArg || mergedData();    // Replace the fetch('data') call with inline data.   // The original code: const projData = await fetch('data').then(r => r.json());@@ -2017,8 +2021,29 @@ const server = http.createServer(async (req, res) => {      // ── Export endpoints ── +    // The four exports render from the merged plan on disk on a GET, which is what+    // the AI handoff loop reads. On a POST they render from the body instead: the+    // browser's Export button sends the LIVE client model, so what downloads is+    // exactly what the user sees, even when their edits are conflict-blocked and+    // not on disk. A malformed body falls back to disk rather than 400ing away+    // someone's only copy of their work.+    async function exportData() {+      if (req.method !== 'POST') return mergedData();+      const body = await readBody(req);+      try {+        const d = JSON.parse(body);+        if (d && Array.isArray(d.items) && Array.isArray(d.phases) && d.project) {+          // Normalise on the way through, exactly as mergedData does on the way+          // out, so a POSTed export speaks the same vocabulary as a GET one.+          d.items.forEach(r => { if (r && r.status) r.status = statusKey(r.status); });+          return d;+        }+      } catch (e) {}+      return mergedData();+    }+     if (urlPath === '/export/json') {-      const data = mergedData();+      const data = await exportData();       res.writeHead(200, {         'Content-Type': 'application/json',         'Content-Disposition': 'attachment; filename="adom-gantt-export.json"'@@ -2028,7 +2053,7 @@ const server = http.createServer(async (req, res) => {     }      if (urlPath === '/export/csv') {-      const data = mergedData();+      const data = await exportData();       const csv = itemsToCSV(data.items, data.phases);       res.writeHead(200, {         'Content-Type': 'text/csv',@@ -2039,7 +2064,7 @@ const server = http.createServer(async (req, res) => {     }      if (urlPath === '/export/svg') {-      const svg = generateSVG();+      const svg = generateSVG(await exportData());       res.writeHead(200, {         'Content-Type': 'image/svg+xml',         'Content-Disposition': 'attachment; filename="adom-gantt-timeline.svg"'@@ -2049,7 +2074,7 @@ const server = http.createServer(async (req, res) => {     }      if (urlPath === '/export/html') {-      const html = generateHTMLSnapshot(auth.user);+      const html = generateHTMLSnapshot(auth.user, await exportData());       res.writeHead(200, {         'Content-Type': 'text/html',         'Content-Disposition': 'attachment; filename="adom-gantt-snapshot.html"'