atris 3.15.53 → 3.15.55

package/commands/computer.js

@@ -1126,15 +1126,35 @@ async function resolveComputerCommandContext(token, options = {}) {
       ? await resolveBusinessContextBySlug(token, options.businessSlug, { preferCache: true })
       : await resolveBusinessContext(token);
     if (!ctx?.businessId) return null;
+    const workspaceId = options.workspaceId
+      ? await resolveWorkspaceSelector(token, ctx, options.workspaceId)
+      : ctx.workspaceId;
     return {
       ...ctx,
-      workspaceId: options.workspaceId || ctx.workspaceId,
+      workspaceId,
     };
   }
 
   return resolveBusinessContext(token);
 }
 
+function looksLikeWorkspaceId(input) {
+  const value = String(input || '').trim();
+  if (!value) return false;
+  return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(value)
+    || /^ws-[a-z0-9_-]+$/i.test(value);
+}
+
+async function resolveWorkspaceSelector(token, ctx, input) {
+  const selector = String(input || '').trim();
+  if (!selector) return ctx.workspaceId;
+  if (selector === ctx.workspaceId || looksLikeWorkspaceId(selector)) return selector;
+
+  const workspaces = await listBusinessWorkspaces(token, ctx);
+  const workspace = resolveWorkspaceFromList(workspaces, selector);
+  return workspace?.id || selector;
+}
+
 async function resolveBusinessOwnerForCreate(token, businessSlug = null) {
   const wantedSlug = businessSlug ? String(businessSlug).trim() : null;
   if (wantedSlug) {

package/commands/integrations.js

@@ -5,7 +5,9 @@
  *   atris gmail inbox       - List recent emails
  *   atris gmail read <id>   - Read specific email
  *   atris calendar today    - Show today's events
+ *   atris calendar yesterday - Show yesterday's events
  *   atris calendar week     - Show this week's events
+ *   atris calendar date YYYY-MM-DD - Show events on a date
  *   atris twitter post      - Post a tweet (interactive)
  *   atris slack channels    - List Slack channels
  */
@@ -137,12 +139,63 @@ async function gmailCommand(subcommand, ...args) {
 // CALENDAR
 // ============================================================================
 
-async function calendarToday() {
+function localDayBounds(offsetDays = 0) {
+  const start = new Date();
+  start.setHours(0, 0, 0, 0);
+  start.setDate(start.getDate() + offsetDays);
+  const end = new Date(start);
+  end.setDate(end.getDate() + 1);
+  return { start, end };
+}
+
+function localDateBounds(dateText) {
+  if (!/^\d{4}-\d{2}-\d{2}$/.test(String(dateText || ''))) {
+    console.error('Usage: atris calendar date YYYY-MM-DD');
+    process.exit(1);
+  }
+  const start = new Date(`${dateText}T00:00:00`);
+  if (Number.isNaN(start.getTime())) {
+    console.error('Invalid date. Use YYYY-MM-DD.');
+    process.exit(1);
+  }
+  const end = new Date(start);
+  end.setDate(end.getDate() + 1);
+  return { start, end };
+}
+
+function formatCalendarEvents(label, events) {
+  if (events.length === 0) {
+    console.log(`No events ${label}. 🎉`);
+    return;
+  }
+
+  console.log('─'.repeat(50));
+
+  for (const event of events) {
+    const start = event.start?.dateTime || event.start?.date || '';
+    const time = start ? new Date(start).toLocaleTimeString('en-US', { hour: '2-digit', minute: '2-digit' }) : 'All day';
+    const title = event.summary || '(no title)';
+
+    console.log(`${time}  ${title}`);
+    if (event.location) {
+      console.log(`        📍 ${event.location}`);
+    }
+  }
+
+  console.log('─'.repeat(50));
+}
+
+async function calendarRange(label, { timeMin, timeMax, days } = {}) {
   const { token, email } = await getAuth();
 
-  console.log('📅 Today\'s events:\n');
+  console.log(`📅 ${label}:\n`);
 
-  const result = await apiRequestJson('/integrations/google-calendar/events/today', {
+  const params = new URLSearchParams();
+  if (timeMin) params.set('time_min', timeMin);
+  if (timeMax) params.set('time_max', timeMax);
+  if (days) params.set('days', String(days));
+  const suffix = params.toString() ? `?${params.toString()}` : '';
+  const result = await apiRequestJson(`/integrations/google-calendar/events${suffix}`, {
     method: 'GET',
     token,
   });
@@ -159,26 +212,25 @@ async function calendarToday() {
   }
 
   const events = result.data?.events || result.data || [];
+  formatCalendarEvents(label.toLowerCase(), events);
+}
 
-  if (events.length === 0) {
-    console.log('No events today. 🎉');
-    return;
-  }
-
-  console.log('─'.repeat(50));
+async function calendarToday() {
+  await calendarRange("Today's events", { days: 1 });
+}
 
-  for (const event of events) {
-    const start = event.start?.dateTime || event.start?.date || '';
-    const time = start ? new Date(start).toLocaleTimeString('en-US', { hour: '2-digit', minute: '2-digit' }) : 'All day';
-    const title = event.summary || '(no title)';
+async function calendarYesterday() {
+  const { start, end } = localDayBounds(-1);
+  await calendarRange("Yesterday's events", { timeMin: start.toISOString(), timeMax: end.toISOString() });
+}
 
-    console.log(`${time}  ${title}`);
-    if (event.location) {
-      console.log(`        📍 ${event.location}`);
-    }
-  }
+async function calendarWeek() {
+  await calendarRange("This week's events", { days: 7 });
+}
 
-  console.log('─'.repeat(50));
+async function calendarDate(dateText) {
+  const { start, end } = localDateBounds(dateText);
+  await calendarRange(`Events on ${dateText}`, { timeMin: start.toISOString(), timeMax: end.toISOString() });
 }
 
 async function calendarCommand(subcommand, ...args) {
@@ -186,13 +238,22 @@ async function calendarCommand(subcommand, ...args) {
     case 'today':
       await calendarToday();
       break;
+    case 'yesterday':
+    case 'yday':
+      await calendarYesterday();
+      break;
     case 'week':
-      console.log('Week view coming soon...');
+      await calendarWeek();
+      break;
+    case 'date':
+      await calendarDate(args[0]);
       break;
     default:
       console.log('Calendar commands:');
-      console.log('  atris calendar today    - Show today\'s events');
-      console.log('  atris calendar week     - Show this week\'s events');
+      console.log('  atris calendar today          - Show today\'s events');
+      console.log('  atris calendar yesterday      - Show yesterday\'s events');
+      console.log('  atris calendar week           - Show this week\'s events');
+      console.log('  atris calendar date YYYY-MM-DD - Show events on a date');
   }
 }
 

package/commands/xp.js

@@ -1727,10 +1727,34 @@ function loadLocalPayload(args) {
   return normalizeLocalScore(JSON.parse(result.stdout), workspace);
 }
 
-function publicAgentXp(value) {
+function earnedAgentXp(value) {
+  return Math.max(0, asNumber(value));
+}
+
+function currentFormScore(value) {
   return Math.max(0, Math.min(99, asNumber(value)));
 }
 
+function agentXpLevelProgress(totalXp) {
+  const levelXp = Math.max(0, asNumber(totalXp));
+  const level = levelFromXp(levelXp);
+  const currentLevelFloor = (level - 1) * LEVEL_XP;
+  const nextLevelXp = level * LEVEL_XP;
+  const xpIntoLevel = levelXp - currentLevelFloor;
+  return {
+    schema: 'atris.agentxp_level_progress.v1',
+    level,
+    stage: `Level ${level}`,
+    level_xp: levelXp,
+    current_level_floor: currentLevelFloor,
+    next_level_xp: nextLevelXp,
+    xp_into_level: xpIntoLevel,
+    xp_to_next: Math.max(0, nextLevelXp - levelXp),
+    progress_pct: Math.max(0, Math.min(99, Math.round((xpIntoLevel / LEVEL_XP) * 100))),
+    uncapped: true,
+  };
+}
+
 function verifiedProjection(projection) {
   return projection?.integrity_status === 'verified'
     && projection?.integrity?.status === 'verified';
@@ -1797,6 +1821,19 @@ function syncAttribution(workspaces) {
   };
 }
 
+function syncScopeFields(attribution = {}) {
+  const attributionScope = slugify(attribution.attribution_scope);
+  const orgId = String(attribution.business_id || attribution.business_slug || '').trim() || null;
+  const businessBound = Boolean(orgId) || attributionScope === 'business-bound' || attributionScope === 'multi-business';
+  return {
+    scope: businessBound ? 'org' : 'global',
+    org_id: orgId,
+    computer_id: String(attribution.workspace_id || attribution.computer || 'local').trim() || 'local',
+    visibility: businessBound ? 'internal' : 'public',
+    public_agentxp: !businessBound,
+  };
+}
+
 function credentialHandle(credentials) {
   return slugify(
     credentials?.username
@@ -1856,19 +1893,23 @@ function buildAgentXpSyncPacket(args = []) {
   const player = syncPlayer(args, projection);
   const workspaces = projectionWorkspaceSummaries(projection);
   const attribution = syncAttribution(workspaces);
+  const scopeFields = syncScopeFields(attribution);
   const totalXp = asNumber(projection.total_agent_xp ?? projection.agent_xp ?? projection.total_xp ?? projection.career_xp);
   const receiptsCount = asNumber(projection.receipts_count);
   const eligible = verifiedProjection(projection) && receiptsCount > 0 && totalXp > 0;
-  const publicXp = publicAgentXp(totalXp);
+  const publicXp = earnedAgentXp(totalXp);
+  const currentForm = currentFormScore(totalXp);
+  const levelProgress = agentXpLevelProgress(publicXp);
   const workspaceRootHash = sha256(workspaces.map(item => item.workspace_root_hash || item.name).sort().join(':'));
   const entry = {
     user_id: player,
     username: player,
     agent_xp: publicXp,
     career_xp: publicXp,
-    current_form: publicXp,
-    ovr: publicXp,
-    level: Math.max(1, asNumber(projection.level, 1)),
+    current_form: currentForm,
+    ovr: currentForm,
+    level: levelProgress.level,
+    level_progress: levelProgress,
     verified_receipts: receiptsCount,
     reviewed_tasks: receiptsCount,
     recent_verified_receipts: receiptsCount,
@@ -1883,12 +1924,17 @@ function buildAgentXpSyncPacket(args = []) {
     schema: 'atris.agentxp_sync_packet.v1',
     generated_at: new Date().toISOString(),
     workspace_root_hash: workspaceRootHash,
+    scope: scopeFields.scope,
+    org_id: scopeFields.org_id,
     attribution_scope: attribution.attribution_scope,
     business_id: attribution.business_id || null,
     workspace_id: attribution.workspace_id || null,
     business_slug: attribution.business_slug || null,
     workspace_template: attribution.workspace_template || null,
+    computer_id: scopeFields.computer_id,
     computer: attribution.computer || projection.workspace_name || workspaces[0]?.name || 'local',
+    visibility: scopeFields.visibility,
+    public_agentxp: scopeFields.public_agentxp,
     operator: player,
     privacy: {
       raw_proofs_included: false,
@@ -1903,12 +1949,17 @@ function buildAgentXpSyncPacket(args = []) {
     local_evidence: {
       schema: 'atris.agentxp_local_evidence.v1',
       workspace_root_hash: workspaceRootHash,
+      scope: scopeFields.scope,
+      org_id: scopeFields.org_id,
       attribution_scope: attribution.attribution_scope,
       business_id: attribution.business_id || null,
       workspace_id: attribution.workspace_id || null,
       business_slug: attribution.business_slug || null,
       workspace_template: attribution.workspace_template || null,
+      computer_id: scopeFields.computer_id,
       computer: attribution.computer || null,
+      visibility: scopeFields.visibility,
+      public_agentxp: scopeFields.public_agentxp,
       workspaces,
       verified_workspace_count: asNumber(projection.verified_workspace_count, verifiedProjection(projection) ? 1 : 0),
       receipts_count: receiptsCount,
@@ -1933,12 +1984,17 @@ function buildAgentXpSyncPacket(args = []) {
     gm_projection: {
       schema: 'atris.gm_xp_projection.v1',
       workspace_root_hash: workspaceRootHash,
+      scope: scopeFields.scope,
+      org_id: scopeFields.org_id,
       attribution_scope: attribution.attribution_scope,
       business_id: attribution.business_id || null,
       workspace_id: attribution.workspace_id || null,
       business_slug: attribution.business_slug || null,
       workspace_template: attribution.workspace_template || null,
+      computer_id: scopeFields.computer_id,
       computer: attribution.computer || null,
+      visibility: scopeFields.visibility,
+      public_agentxp: scopeFields.public_agentxp,
       operator: player,
       player_score: {
         agent_xp: totalXp,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atris",
-  "version": "3.15.53",
+  "version": "3.15.55",
   "main": "bin/atris.js",
   "bin": {
     "atris": "bin/atris.js",