thatcher 1.0.76 → 1.0.78

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thatcher",
-  "version": "1.0.76",
+  "version": "1.0.78",
   "description": "A config-driven application framework for building data-intensive web apps without code.",
   "main": "src/index.js",
   "type": "module",

package/src/lib/config-generator-engine.js

@@ -253,6 +253,27 @@ function withTimeTrackingDefaults(masterConfig) {
   return changed ? { ...masterConfig, entities } : masterConfig;
 }
 
+const RESOURCE_ALLOCATION_ENTITY_DEFAULT = {
+  label: 'Resource Allocation',
+  label_plural: 'Resource Allocations',
+  system_entity: true,
+  fields: {
+    user_id: { type: 'ref', ref: 'user', required: true, label: 'User' },
+    project_id: { type: 'ref', ref: 'project', required: true, label: 'Project' },
+    allocated_hours_per_week: { type: 'number', required: true, min: 0, max: 168, label: 'Allocated Hours/Week' },
+    start_date: { type: 'date', required: true, label: 'Start Date' },
+    end_date: { type: 'date', required: true, label: 'End Date' },
+    role: { type: 'text', label: 'Role' },
+  },
+};
+
+function withResourceManagementDefaults(masterConfig) {
+  const entities = { ...(masterConfig.entities || {}) };
+  let changed = false;
+  if (!entities.resource_allocation) { entities.resource_allocation = RESOURCE_ALLOCATION_ENTITY_DEFAULT; changed = true; }
+  return changed ? { ...masterConfig, entities } : masterConfig;
+}
+
 const CONTRACT_LIFECYCLE_WORKFLOW = {
   state_field: 'status',
   stages: [
@@ -295,7 +316,7 @@ function withContractDefaults(masterConfig) {
 export class ConfigGeneratorEngine {
   constructor(masterConfig) {
     if (!masterConfig) throw new Error('[ConfigGeneratorEngine] masterConfig is required');
-    this.masterConfig = deepFreeze(withContractDefaults(withTimeTrackingDefaults(withInventoryDefaults(withProjectDefaults(withCrmDefaults(withWebhookDefaults(withMultiTenancyDefaults(masterConfig))))))));
+    this.masterConfig = deepFreeze(withResourceManagementDefaults(withContractDefaults(withTimeTrackingDefaults(withInventoryDefaults(withProjectDefaults(withCrmDefaults(withWebhookDefaults(withMultiTenancyDefaults(masterConfig)))))))));
     this.specCache = new LRUCache(100);
     this.debugMode = false;
     this._plugins = new Map();

package/src/lib/presence-tracker.js

@@ -0,0 +1,52 @@
+// In-memory presence: who is currently viewing entity+id. No persistence --
+// presence is inherently ephemeral, and a restart clearing it is correct
+// behavior, not data loss. Swept on a timer the same way scheduler-engine.js
+// sweeps due jobs, so a closed tab's viewer entry disappears on its own
+// without requiring an explicit "leaving" signal the client might never send.
+const STALE_AFTER_MS = 30 * 1000;
+const SWEEP_INTERVAL_MS = 15 * 1000;
+const presence = new Map();
+
+let sweepHandle = null;
+function ensureSweep() {
+  if (sweepHandle) return;
+  sweepHandle = setInterval(() => {
+    const now = Date.now();
+    for (const [key, viewers] of presence) {
+      for (const [userId, entry] of viewers) {
+        if (now - entry.lastSeenAt > STALE_AFTER_MS) viewers.delete(userId);
+      }
+      if (viewers.size === 0) presence.delete(key);
+    }
+  }, SWEEP_INTERVAL_MS);
+  if (sweepHandle.unref) sweepHandle.unref();
+}
+
+function keyFor(entity, id) {
+  return `${entity}:${id}`;
+}
+
+export function heartbeat(entity, id, userId, userName) {
+  ensureSweep();
+  const key = keyFor(entity, id);
+  let viewers = presence.get(key);
+  if (!viewers) { viewers = new Map(); presence.set(key, viewers); }
+  viewers.set(userId, { userId, userName, lastSeenAt: Date.now() });
+}
+
+// Excludes the requester so a solo viewer never sees themselves listed as
+// "someone else is viewing this record" -- the indicator is meaningless (and
+// mildly alarming) if it counts the person reading it.
+export function getViewers(entity, id, excludeUserId) {
+  const key = keyFor(entity, id);
+  const viewers = presence.get(key);
+  if (!viewers) return [];
+  const now = Date.now();
+  return [...viewers.values()]
+    .filter(v => v.userId !== excludeUserId && now - v.lastSeenAt <= STALE_AFTER_MS)
+    .map(v => ({ userId: v.userId, userName: v.userName }));
+}
+
+export function resetPresence() {
+  presence.clear();
+}

package/src/lib/validation/entity-validators.js

@@ -157,17 +157,30 @@ function resolveEnumOptions(fieldDef, entityName) {
 // UI-side, but server-side is the authoritative check per this session's SEC
 // pattern. Privileged roles (partner/manager) may log time for anyone, e.g.
 // entering a team member's hours on their behalf.
-function checkTimeEntryOwnership(entityName, data, options) {
-  if (entityName !== 'time_entry') return null;
+// Shared self-only check: a non-privileged actingUser may only write a
+// record whose user_id matches their own id; partner/admin/manager may write
+// for anyone. One function so every self-only entity enforces identically
+// rather than each growing its own slightly-different copy over time.
+function checkSelfOnlyOwnership(data, options, actionDescription) {
   const actingUser = options?.actingUser;
   if (!actingUser) return null;
   if (['partner', 'admin', 'manager'].includes(actingUser.role)) return null;
   if (data.user_id !== undefined && data.user_id !== actingUser.id) {
-    return `Cannot log time for another user`;
+    return `Cannot ${actionDescription} for another user`;
   }
   return null;
 }
 
+function checkTimeEntryOwnership(entityName, data, options) {
+  if (entityName !== 'time_entry') return null;
+  return checkSelfOnlyOwnership(data, options, 'log time');
+}
+
+function checkResourceAllocationOwnership(entityName, data, options) {
+  if (entityName !== 'resource_allocation') return null;
+  return checkSelfOnlyOwnership(data, options, 'create a resource allocation');
+}
+
 // Stock movements are immutable history (checked at creation only, never on
 // edit -- there is no update path for them). An outbound movement (negative
 // quantity) that would drive the running balance below zero is invalid: the
@@ -205,6 +218,40 @@ function checkContractDateOrder(entityName, data, existingRecord) {
   return null;
 }
 
+const WEEKLY_CAPACITY_HOURS = 40;
+
+// Two date ranges overlap unless one entirely precedes the other -- the
+// standard interval-intersection test, not a same-day/exact-match check.
+function rangesOverlap(startA, endA, startB, endB) {
+  return Number(startA) <= Number(endB) && Number(startB) <= Number(endA);
+}
+
+// A user's total weekly allocation across every project they're assigned to,
+// for any date range that overlaps the new/changed allocation, must not
+// exceed a configurable weekly capacity. Checked against EVERY OTHER
+// existing allocation for that user (excluding the record being updated, if
+// any) plus the new one -- never trusting a client-supplied total.
+async function checkResourceCapacity(entityName, data, existingRecord) {
+  if (entityName !== 'resource_allocation') return null;
+  const userId = data.user_id !== undefined ? data.user_id : existingRecord?.user_id;
+  const startDate = data.start_date !== undefined ? data.start_date : existingRecord?.start_date;
+  const endDate = data.end_date !== undefined ? data.end_date : existingRecord?.end_date;
+  const hours = Number(data.allocated_hours_per_week !== undefined ? data.allocated_hours_per_week : existingRecord?.allocated_hours_per_week);
+  if (!userId || startDate == null || endDate == null || !Number.isFinite(hours)) return null;
+
+  const { list } = await import('@/lib/busybase/store');
+  const existingAllocations = await list('resource_allocation', { user_id: userId });
+  const overlapping = existingAllocations.filter(a =>
+    a.id !== existingRecord?.id && rangesOverlap(startDate, endDate, a.start_date, a.end_date)
+  );
+  const overlappingTotal = overlapping.reduce((sum, a) => sum + (Number(a.allocated_hours_per_week) || 0), 0);
+  const resultingTotal = overlappingTotal + hours;
+  if (resultingTotal > WEEKLY_CAPACITY_HOURS) {
+    return `Over-allocated: this would bring the user's weekly total to ${resultingTotal}h against overlapping allocations, exceeding the ${WEEKLY_CAPACITY_HOURS}h capacity`;
+  }
+  return null;
+}
+
 export async function validateEntity(entityName, data, existingRecord = null, options = {}) {
   const spec = getSpec(entityName);
   const errors = {};
@@ -232,12 +279,15 @@ export async function validateEntity(entityName, data, existingRecord = null, op
   const stockErr = await checkStockBalance(entityName, data);
   if (stockErr) errors.quantity = stockErr;
 
-  const ownershipErr = checkTimeEntryOwnership(entityName, data, options);
+  const ownershipErr = checkTimeEntryOwnership(entityName, data, options) || checkResourceAllocationOwnership(entityName, data, options);
   if (ownershipErr) errors.user_id = ownershipErr;
 
   const dateOrderErr = checkContractDateOrder(entityName, data, existingRecord);
   if (dateOrderErr) errors.end_date = dateOrderErr;
 
+  const capacityErr = await checkResourceCapacity(entityName, data, existingRecord);
+  if (capacityErr) errors.allocated_hours_per_week = capacityErr;
+
   return errors;
 }
 
@@ -316,6 +366,9 @@ export async function validateUpdate(entityName, changes, existingRecord) {
   const dateOrderErr = checkContractDateOrder(entityName, changes, existingRecord);
   if (dateOrderErr) errors.end_date = dateOrderErr;
 
+  const capacityErr = await checkResourceCapacity(entityName, changes, existingRecord);
+  if (capacityErr) errors.allocated_hours_per_week = capacityErr;
+
   return errors;
 }
 

package/src/server/server.js

@@ -119,6 +119,22 @@ export function createServer(options) {
         const id = parts[1] || null;
         const action = parts[2] || null;
 
+        // presence/changes are meta-routes over an (entity,id) pair, not
+        // themselves entities -- parts[1]/parts[2] here are the TARGET
+        // entity name and record id, distinct from the entity/id/action
+        // parsed above for the generic CRUD routes.
+        if (req.method === 'POST' && entity === 'presence' && parts[1] && parts[2] && parts[3] === 'heartbeat') {
+          return await handlePresenceHeartbeat(req, res, parts[1], parts[2]);
+        }
+
+        if (req.method === 'GET' && entity === 'presence' && parts[1] && parts[2] && !parts[3]) {
+          return await handlePresenceGet(req, res, parts[1], parts[2]);
+        }
+
+        if (req.method === 'GET' && entity === 'changes' && parts[1] && parts[2] && parts[3] === 'since' && parts[4]) {
+          return await handleChangesSince(req, res, parts[1], parts[2], parts[4]);
+        }
+
         if (req.method === 'GET' && entity === 'auth' && id === 'google' && !action) {
           return await handleOAuthGoogleStart(req, res);
         }
@@ -1427,6 +1443,67 @@ async function readMultipartFile(req) {
   throw new Error('No file field found in upload');
 }
 
+async function verifyRecordAccess(req, res, entityName, id) {
+  const user = await resolveRequestUser(req);
+  if (!user) {
+    res.writeHead(401, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ error: 'Authentication required' }));
+    return null;
+  }
+  const { get } = await import('../lib/busybase/store.js');
+  let record;
+  try {
+    record = await get(entityName, id, { user });
+  } catch {
+    res.writeHead(404, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ error: 'Not found' }));
+    return null;
+  }
+  if (!record) {
+    // A record the caller cannot access and a record that doesn't exist
+    // resolve identically here on purpose -- distinguishing them would leak
+    // that a specific id exists to someone who isn't allowed to see it.
+    res.writeHead(404, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ error: 'Not found' }));
+    return null;
+  }
+  return user;
+}
+
+async function handlePresenceHeartbeat(req, res, entityName, id) {
+  const user = await verifyRecordAccess(req, res, entityName, id);
+  if (!user) return;
+  const { heartbeat } = await import('../lib/presence-tracker.js');
+  heartbeat(entityName, id, user.id, user.name || user.email || user.id);
+  res.writeHead(200, { 'Content-Type': 'application/json' });
+  res.end(JSON.stringify({ ok: true }));
+}
+
+async function handlePresenceGet(req, res, entityName, id) {
+  const user = await verifyRecordAccess(req, res, entityName, id);
+  if (!user) return;
+  const { getViewers } = await import('../lib/presence-tracker.js');
+  const viewers = getViewers(entityName, id, user.id);
+  res.writeHead(200, { 'Content-Type': 'application/json' });
+  res.end(JSON.stringify({ viewers }));
+}
+
+async function handleChangesSince(req, res, entityName, id, timestampStr) {
+  const user = await verifyRecordAccess(req, res, entityName, id);
+  if (!user) return;
+  const since = Number(timestampStr);
+  if (!Number.isFinite(since)) {
+    res.writeHead(400, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ error: 'Invalid timestamp' }));
+    return;
+  }
+  const { getEntityAuditTrail } = await import('../lib/busybase/audit-reads.js');
+  const trail = await getEntityAuditTrail(entityName, id);
+  const changed = trail.some(entry => (entry.createdAt || 0) > since);
+  res.writeHead(200, { 'Content-Type': 'application/json' });
+  res.end(JSON.stringify({ changed }));
+}
+
 async function handleFileUpload(req, res, thatcher, configEngineArg) {
   const user = await resolveRequestUser(req);
   if (!user) {

package/src/ui/entity-renderer.js

@@ -160,9 +160,23 @@ export function renderEntityDetail(entityName, item, spec, user, history = []) {
       })()
     : ''
 
+  // allocated_hours_per_week/weekly_capacity_hours are computed (page-handler.js
+  // sums resource_allocation rows for this user), same not-a-spec-field
+  // treatment as current_stock/total_hours above.
+  const utilizationRow = entityName === 'user' && typeof item.allocated_hours_per_week === 'number'
+    ? (() => {
+        const over = item.allocated_hours_per_week > item.weekly_capacity_hours
+        const pillCls = over ? 'pill-danger' : 'pill-success'
+        return `<div class="detail-row">
+          <span class="detail-row-label">Resource Utilization</span>
+          <span class="detail-row-value"><span class="pill ${pillCls}">${esc(String(item.allocated_hours_per_week))}h / ${esc(String(item.weekly_capacity_hours))}h${over ? ' (Over-allocated)' : ''}</span></span>
+        </div>`
+      })()
+    : ''
+
   const visibleFields = Object.entries(fields).filter(([k]) => k !== 'id' && !HIDDEN_FIELDS.has(k) && item[k] !== undefined)
 
-  const fieldRows = stockRow + timeTrackingRows + expiryRow + visibleFields.map(([k, f]) =>
+  const fieldRows = stockRow + timeTrackingRows + expiryRow + utilizationRow + visibleFields.map(([k, f]) =>
     `<div class="detail-row">
       <span class="detail-row-label">${esc(f.label || k)}</span>
       <span class="detail-row-value">${formatFieldValue(k, item[k], entityName, f)}</span>
@@ -199,6 +213,13 @@ export function renderEntityDetail(entityName, item, spec, user, history = []) {
       <div style="flex:1">${headerExtra}</div>
       <div style="display:flex;gap:0.5rem;margin-left:1rem">${editBtn}${cloneBtn}${delBtn}</div>
     </div>
+    <div id="stale-data-banner" style="display:none;margin-bottom:12px" class="card-clean">
+      <div class="card-clean-body" style="padding:10px 16px;display:flex;align-items:center;justify-content:space-between">
+        <span style="font-size:13px">This record was updated by someone else -- refresh to see changes.</span>
+        <button type="button" class="btn-ghost-clean" onclick="window.location.reload()">Refresh</button>
+      </div>
+    </div>
+    <div id="presence-indicator" style="display:none;margin-bottom:12px;font-size:13px;color:var(--color-text-muted)"></div>
     <div class="card-clean">
       <div class="card-clean-body"><div class="detail-grid">${fieldRows || '<p style="color:var(--color-text-muted);font-size:0.875rem;grid-column:1/-1">No details available</p>'}</div></div>
     </div>
@@ -207,8 +228,38 @@ export function renderEntityDetail(entityName, item, spec, user, history = []) {
 
   // Canonical gmConfirm (session-13): showDeleteConfirm runs the styled confirm then DELETEs; no bespoke dialog markup/show-hide.
   const script = `${TOAST_SCRIPT}window.showDeleteConfirm=async()=>{const ok=await window.gmConfirm({title:'Delete ${entityName}',message:'Delete this ${entityName}? This cannot be undone.',confirmLabel:'Delete',danger:true});if(!ok)return;try{const res=await fetch('/api/${entityName}/${item.id}',{method:'DELETE'});if(res.ok){showToast('Deleted successfully','success');setTimeout(()=>{window.location='/${entityName}'},500)}else{const d=await res.json().catch(()=>({}));showToast(d.message||d.error||'Delete failed','error')}}catch(err){showToast('Error: '+err.message,'error')}}`
+  const collabScript = `(function(){
+    var entity='${entityName}',id='${esc(String(item.id))}';
+    var openedAt=Math.floor(Date.now()/1000);
+    function heartbeat(){fetch('/api/presence/'+entity+'/'+id+'/heartbeat',{method:'POST'}).catch(function(){})}
+    function pollPresence(){
+      fetch('/api/presence/'+entity+'/'+id).then(function(r){return r.json()}).then(function(d){
+        var el=document.getElementById('presence-indicator');
+        if(!el)return;
+        var viewers=d.viewers||[];
+        if(viewers.length){
+          el.style.display='block';
+          el.textContent=(viewers.length===1?'1 other person is':viewers.length+' other people are')+' currently viewing this: '+viewers.map(function(v){return v.userName}).join(', ');
+        } else {
+          el.style.display='none';
+        }
+      }).catch(function(){})
+    }
+    function pollChanges(){
+      fetch('/api/changes/'+entity+'/'+id+'/since/'+openedAt).then(function(r){return r.json()}).then(function(d){
+        if(d.changed){
+          var el=document.getElementById('stale-data-banner');
+          if(el)el.style.display='block';
+        }
+      }).catch(function(){})
+    }
+    heartbeat();pollPresence();pollChanges();
+    setInterval(heartbeat,10000);
+    setInterval(pollPresence,10000);
+    setInterval(pollChanges,8000);
+  })();`
   const bc = [{ href: '/', label: 'Dashboard' }, { href: `/${entityName}`, label: spec?.labelPlural || label }, { label: item.name || item.title || `#${item.id}` }]
-  return page(user, `${label} Detail`, bc, content, [script])
+  return page(user, `${label} Detail`, bc, content, [script, collabScript])
 }
 
 export function renderEntityForm(entityName, item, spec, user, isNew = false, refOptions = {}, templates = []) {

package/src/ui/page-handler.js

@@ -158,6 +158,19 @@ async function handleGenericEntityView(user, entityName, id, req) {
     const { daysUntilExpiry } = await import('@/lib/contract-expiry.js');
     resolvedItem = { ...resolvedItem, days_until_expiry: daysUntilExpiry(resolvedItem.end_date) };
   }
+  if (entityName === 'user') {
+    // Resource utilization reuses the same "sum grouped by owner" rollup
+    // shape as task/project total_hours above, just grouped by allocation
+    // rather than time entry -- no new aggregation logic, only overlapping
+    // (currently-active) allocations count toward the displayed total.
+    try {
+      const allocations = await list('resource_allocation', { user_id: id });
+      const nowTs = Math.floor(Date.now() / 1000);
+      const activeAllocations = allocations.filter(a => Number(a.start_date) <= nowTs && nowTs <= Number(a.end_date));
+      const allocatedHoursPerWeek = activeAllocations.reduce((sum, a) => sum + (Number(a.allocated_hours_per_week) || 0), 0);
+      resolvedItem = { ...resolvedItem, allocated_hours_per_week: allocatedHoursPerWeek, weekly_capacity_hours: 40 };
+    } catch { resolvedItem = { ...resolvedItem, allocated_hours_per_week: 0, weekly_capacity_hours: 40 }; }
+  }
   // get(...,{user}) above already enforced row/org access for this exact
   // record (a denied/absent record returns null before this point), so
   // fetching its audit trail here is scoped by construction -- there is no