atris 3.11.0 → 3.12.1

package/atris/skills/atris-feedback/SKILL.md

@@ -0,0 +1,108 @@
+---
+name: atris-feedback
+description: Submit, list, resolve, close, or delete Atris customer feedback. Use when user types /feedback or asks to triage the feedback queue.
+version: 1.0.0
+tags:
+  - feedback
+  - customer
+  - admin
+---
+
+# Feedback
+
+One skill for everything: submit feedback, view the queue, resolve/close/delete items.
+
+## Parse the input
+
+- `/feedback` (no args) → show the queue
+- `/feedback <message>` → submit new feedback
+- `/feedback resolve <id> <resolution>` → mark as resolved, notify customer
+- `/feedback close <id>` → close as wontfix/duplicate
+- `/feedback delete <id>` → remove from queue
+
+## Preferred path: the Atris CLI
+
+The `atris` CLI wraps every feedback operation against the production API and
+handles auth from the user's login. Use it first — it's the canonical,
+audited path and works without needing AWS credentials.
+
+```bash
+atris feedback                              # list queue
+atris feedback "the calendar hangs"         # submit
+atris feedback resolve abc123 "fixed"       # mark resolved
+atris feedback close abc123                 # close as wontfix
+atris feedback delete abc123                # delete
+```
+
+IDs can be short (first 8 chars of the UUID) — the CLI resolves the prefix
+against the live list before acting.
+
+If `atris` is not on PATH, it lives at `~/arena/atris-cli/bin/atris.js`.
+
+## Fallback: direct API / DynamoDB
+
+Only use this path if the CLI is unavailable (stale install, broken login).
+
+### Setup
+
+```bash
+cd ~/arena/atrisos-backend && source venv/bin/activate
+```
+
+```python
+from dotenv import load_dotenv; load_dotenv('backend/.env')
+import boto3
+table = boto3.resource('dynamodb', region_name='us-east-1').Table('atris_feedback')
+```
+
+### Submit
+
+```bash
+curl -s -X POST "https://api.atris.ai/api/feedback" \
+  -H "Content-Type: application/json" \
+  -H "X-Feedback-Key: $FEEDBACK_API_KEY" \
+  -d '{"message": "THE_MESSAGE", "source": "cli", "context": {"user_email": "GIT_EMAIL"}}'
+```
+
+Confirm: `Feedback submitted (id: abc123)`
+
+### Resolve
+
+```python
+table.update_item(
+    Key={'id': FULL_ID},
+    UpdateExpression='SET #s = :s, resolution = :r, resolved_at = :t',
+    ExpressionAttributeNames={'#s': 'status'},
+    ExpressionAttributeValues={':s': 'resolved', ':r': RESOLUTION, ':t': NOW},
+)
+```
+
+Print: `Resolved abc123: <resolution>`
+
+### Close
+
+Same as resolve but `status = 'closed'`, no resolution text needed.
+
+### Delete
+
+```python
+table.delete_item(Key={'id': FULL_ID})
+```
+
+Print: `Deleted abc123`
+
+### ID matching
+
+Users type short IDs (first 8 chars). Scan the table and match by prefix
+to find the full UUID.
+
+## Security
+
+- NEVER include API keys, tokens, or secrets in feedback messages
+- Server-side sanitization strips them anyway (double protection)
+- Max 2000 chars per message
+
+## Output
+
+Always print the result directly as text. Never leave it inside a tool
+call expansion.

package/bin/atris.js

@@ -328,8 +328,11 @@ function showHelp() {
   console.log('  plugin info         - Preview what will be included');
   console.log('');
   console.log('Feedback:');
-  console.log('  feedback "msg"      - Submit feedback');
-  console.log('  feedback            - List your feedback');
+  console.log('  feedback "msg"             - Submit feedback');
+  console.log('  feedback                   - List feedback queue');
+  console.log('  feedback resolve <id> "<note>" - Mark resolved (admin)');
+  console.log('  feedback close <id>        - Close as wontfix (admin)');
+  console.log('  feedback delete <id>       - Delete feedback (admin)');
   console.log('');
   console.log('Other:');
   console.log('  version    - Show Atris version');

package/commands/feedback.js

@@ -2,9 +2,15 @@
  * Feedback command for Atris CLI
  *
  * Usage:
- *   atris feedback "message here"  - Submit feedback
- *   atris feedback                 - List your feedback
- *   atris feedback list            - List your feedback
+ *   atris feedback "message here"              Submit feedback
+ *   atris feedback                              List feedback
+ *   atris feedback list                         List feedback
+ *   atris feedback resolve <id> "<resolution>"  Mark resolved (admin)
+ *   atris feedback close <id>                   Close as wontfix (admin)
+ *   atris feedback delete <id>                  Delete feedback (admin)
+ *
+ * IDs may be the first 8 chars of the UUID — the CLI resolves the prefix
+ * against the live list before making the write request.
  */
 
 const fs = require('fs');
@@ -21,40 +27,17 @@ function getAuth() {
   return { token: creds.token, email: creds.email || 'unknown' };
 }
 
-function getBusinessId() {
-  // 1. Check .atris/business.json in current directory
-  const bizFile = path.join(process.cwd(), '.atris', 'business.json');
-  if (fs.existsSync(bizFile)) {
-    try {
-      const biz = JSON.parse(fs.readFileSync(bizFile, 'utf8'));
-      if (biz.business_id) return biz.business_id;
-    } catch {}
-  }
-
-  // 2. Check ~/.atris/businesses.json (first connected business)
-  const home = require('os').homedir();
-  const globalBizFile = path.join(home, '.atris', 'businesses.json');
-  if (fs.existsSync(globalBizFile)) {
-    try {
-      const businesses = JSON.parse(fs.readFileSync(globalBizFile, 'utf8'));
-      const slugs = Object.keys(businesses);
-      if (slugs.length > 0 && businesses[slugs[0]].business_id) {
-        return businesses[slugs[0]].business_id;
-      }
-    } catch {}
-  }
-
-  return null;
-}
-
-async function submitFeedback(message) {
+async function submitFeedback(message, opts = {}) {
   if (!message) {
-    console.error('Usage: atris feedback "your message here"');
+    console.error('Usage: atris feedback "your message here" [--business <slug|id>]');
     process.exit(1);
   }
 
   const { token } = getAuth();
-  const businessId = getBusinessId();
+  // Only attach business_id when the user explicitly asked for it via --business.
+  // Auto-scoping to "first business in businesses.json" silently hid feedback
+  // from every other workspace the user belongs to.
+  const businessId = opts.businessId || null;
 
   const body = {
     message,
@@ -81,70 +64,239 @@ async function submitFeedback(message) {
   }
 }
 
+async function fetchFeedbackItems({ token, businessId, limit = 100, status = null } = {}) {
+  let url = `/feedback?limit=${limit}`;
+  if (businessId) url += `&business_id=${businessId}`;
+  if (status) url += `&status=${encodeURIComponent(status)}`;
+
+  const result = await apiRequestJson(url, { method: 'GET', token });
+  if (!result.ok) {
+    console.error(`Error: ${result.error || 'Failed to fetch feedback'}`);
+    process.exit(1);
+  }
+  return result.data?.feedback || [];
+}
+
 async function listFeedback() {
   const { token } = getAuth();
-  const businessId = getBusinessId();
+  // Do NOT auto-scope by business: admins expect to see the full queue.
+  // The API already scopes non-admins to their own businesses server-side.
+  const items = await fetchFeedbackItems({ token, limit: 20 });
 
-  let url = '/feedback?limit=20';
-  if (businessId) {
-    url += `&business_id=${businessId}`;
+  if (items.length === 0) {
+    console.log('No feedback found.');
+    return;
+  }
+
+  console.log(`Feedback Queue (${items.length} item${items.length !== 1 ? 's' : ''})\n`);
+
+  items.forEach((item, idx) => {
+    const status = (item.status || 'open').toUpperCase();
+    const shortId = (item.id || '').substring(0, 8);
+    const msg = item.message || '';
+    const preview = msg.length > 120 ? msg.substring(0, 120) + '...' : msg;
+    const date = item.created_at
+      ? new Date(item.created_at).toLocaleDateString('en-US', { month: 'short', day: 'numeric' })
+      : '';
+    const fromEmail = item.context?.user_email || item.user_id || '';
+
+    console.log(`${idx + 1}. [${status}] id:${shortId}${date ? '  ' + date : ''}`);
+    console.log(`   "${preview}"`);
+    if (fromEmail) console.log(`   from: ${fromEmail}`);
+    if (item.resolution) console.log(`   resolution: ${item.resolution}`);
+    console.log('');
+  });
+}
+
+/**
+ * Resolve a short ID prefix (or full UUID) to the full UUID by scanning
+ * the list endpoint. Returns null if no unique match found.
+ */
+async function resolveIdPrefix(prefix, { token, businessId }) {
+  if (!prefix) return { error: 'ID required' };
+  // If it looks like a full UUID, trust it
+  if (prefix.length >= 32) return { id: prefix };
+
+  const items = await fetchFeedbackItems({ token, businessId, limit: 200 });
+  const matches = items.filter(it => (it.id || '').startsWith(prefix));
+
+  if (matches.length === 0) return { error: `No feedback matches id prefix "${prefix}"` };
+  if (matches.length > 1) {
+    return {
+      error: `Ambiguous id "${prefix}" — matches ${matches.length} items. Use a longer prefix.`,
+    };
   }
+  return { id: matches[0].id, item: matches[0] };
+}
+
+async function resolveFeedback(idPrefix, resolution) {
+  if (!idPrefix || !resolution) {
+    console.error('Usage: atris feedback resolve <id> "<resolution>"');
+    process.exit(1);
+  }
+  const { token } = getAuth();
 
-  const result = await apiRequestJson(url, {
-    method: 'GET',
+  const lookup = await resolveIdPrefix(idPrefix, { token });
+  if (lookup.error) {
+    console.error(`Error: ${lookup.error}`);
+    process.exit(1);
+  }
+
+  const result = await apiRequestJson(`/feedback/${lookup.id}`, {
+    method: 'PATCH',
     token,
+    body: { status: 'resolved', resolution },
   });
 
   if (!result.ok) {
-    console.error(`Error: ${result.error || 'Failed to fetch feedback'}`);
+    console.error(`Error: ${result.error || 'Failed to resolve feedback'}`);
     process.exit(1);
   }
+  console.log(`Resolved ${lookup.id.substring(0, 8)}: ${resolution}`);
+}
 
-  const items = result.data?.feedback || [];
+async function closeFeedback(idPrefix) {
+  if (!idPrefix) {
+    console.error('Usage: atris feedback close <id>');
+    process.exit(1);
+  }
+  const { token } = getAuth();
 
-  if (items.length === 0) {
-    console.log('No feedback found.');
-    return;
+  const lookup = await resolveIdPrefix(idPrefix, { token });
+  if (lookup.error) {
+    console.error(`Error: ${lookup.error}`);
+    process.exit(1);
+  }
+
+  const result = await apiRequestJson(`/feedback/${lookup.id}`, {
+    method: 'PATCH',
+    token,
+    body: { status: 'closed' },
+  });
+
+  if (!result.ok) {
+    console.error(`Error: ${result.error || 'Failed to close feedback'}`);
+    process.exit(1);
   }
+  console.log(`Closed ${lookup.id.substring(0, 8)}`);
+}
 
-  console.log(`${items.length} feedback item${items.length !== 1 ? 's' : ''}:\n`);
+async function deleteFeedback(idPrefix) {
+  if (!idPrefix) {
+    console.error('Usage: atris feedback delete <id>');
+    process.exit(1);
+  }
+  const { token } = getAuth();
 
-  for (const item of items) {
-    const date = item.created_at
-      ? new Date(item.created_at).toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' })
-      : '';
-    const status = item.status || 'open';
-    const msg = item.message || '';
-    const preview = msg.length > 80 ? msg.substring(0, 80) + '...' : msg;
-
-    console.log(`  [${status}] ${preview}`);
-    if (date || item.id) {
-      const parts = [];
-      if (date) parts.push(date);
-      if (item.id) parts.push(item.id.substring(0, 8));
-      console.log(`         ${parts.join('  ')}`);
+  const lookup = await resolveIdPrefix(idPrefix, { token });
+  if (lookup.error) {
+    console.error(`Error: ${lookup.error}`);
+    process.exit(1);
+  }
+
+  const result = await apiRequestJson(`/feedback/${lookup.id}`, {
+    method: 'DELETE',
+    token,
+  });
+
+  if (!result.ok) {
+    console.error(`Error: ${result.error || 'Failed to delete feedback'}`);
+    process.exit(1);
+  }
+  console.log(`Deleted ${lookup.id.substring(0, 8)}`);
+}
+
+function printHelp() {
+  console.log('');
+  console.log('Usage:');
+  console.log('  atris feedback "message"               Submit feedback (global)');
+  console.log('  atris feedback "msg" --business <slug> Submit feedback tagged to a business');
+  console.log('  atris feedback                         List feedback');
+  console.log('  atris feedback list                    List feedback');
+  console.log('  atris feedback resolve <id> "<note>"   Mark resolved (admin)');
+  console.log('  atris feedback close <id>              Close as wontfix (admin)');
+  console.log('  atris feedback delete <id>             Delete feedback (admin)');
+  console.log('');
+  console.log('IDs may be the first 8 chars of the UUID.');
+  console.log('Business slugs come from ~/.atris/businesses.json (e.g. pallet, atris-labs-1).');
+  console.log('');
+}
+
+function resolveBusinessArg(value) {
+  if (!value) return null;
+  // Full UUID — trust it
+  if (/^[0-9a-f-]{32,}$/i.test(value)) return value;
+  // Otherwise treat as slug and look up in ~/.atris/businesses.json
+  const home = require('os').homedir();
+  const file = path.join(home, '.atris', 'businesses.json');
+  if (!fs.existsSync(file)) return null;
+  try {
+    const map = JSON.parse(fs.readFileSync(file, 'utf8'));
+    const hit = map[value] || Object.values(map).find(b => b.slug === value);
+    return hit ? hit.business_id : null;
+  } catch {
+    return null;
+  }
+}
+
+function extractFlag(args, ...names) {
+  // Returns [value, remainingArgs]. Supports "--flag val" and "--flag=val".
+  const remaining = [];
+  let value = null;
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i];
+    const eq = a.indexOf('=');
+    const key = eq >= 0 ? a.slice(0, eq) : a;
+    if (names.includes(key)) {
+      value = eq >= 0 ? a.slice(eq + 1) : args[++i];
+    } else {
+      remaining.push(a);
     }
-    console.log('');
   }
+  return [value, remaining];
 }
 
 async function feedbackCommand() {
-  const subcommand = process.argv[3];
+  const rawArgs = process.argv.slice(3);
+  const [businessArg, args] = extractFlag(rawArgs, '--business', '-b');
+  const businessId = resolveBusinessArg(businessArg);
+  if (businessArg && !businessId) {
+    console.error(`Error: unknown business "${businessArg}". Check ~/.atris/businesses.json`);
+    process.exit(1);
+  }
+
+  const subcommand = args[0];
 
   if (!subcommand || subcommand === 'list') {
     await listFeedback();
-  } else if (subcommand === '--help' || subcommand === '-h') {
-    console.log('');
-    console.log('Usage:');
-    console.log('  atris feedback "message"   Submit feedback');
-    console.log('  atris feedback             List your feedback');
-    console.log('  atris feedback list        List your feedback');
-    console.log('');
-  } else {
-    // Everything else is a feedback message
-    const message = process.argv.slice(3).join(' ');
-    await submitFeedback(message);
+    return;
   }
+
+  if (subcommand === '--help' || subcommand === '-h' || subcommand === 'help') {
+    printHelp();
+    return;
+  }
+
+  if (subcommand === 'resolve') {
+    const id = args[1];
+    const resolution = args.slice(2).join(' ');
+    await resolveFeedback(id, resolution);
+    return;
+  }
+
+  if (subcommand === 'close') {
+    await closeFeedback(args[1]);
+    return;
+  }
+
+  if (subcommand === 'delete') {
+    await deleteFeedback(args[1]);
+    return;
+  }
+
+  // Everything else is a feedback message
+  const message = args.join(' ');
+  await submitFeedback(message, { businessId });
 }
 
 module.exports = { feedbackCommand };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atris",
-  "version": "3.11.0",
+  "version": "3.12.1",
   "description": "Atris — an operating system for intelligence. Integrates with any agent.",
   "main": "bin/atris.js",
   "bin": {