npm - claudity - Versions diffs - 1.1.0 → 1.2.0 - Mend

claudity 1.1.0 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

package/install.sh +6 -1
package/package.json +1 -1
package/public/css/style.css +74 -7
package/public/index.html +20 -2
package/public/js/app.js +50 -31
package/src/db.js +20 -0
package/src/routes/api.js +21 -3
package/src/services/auth.js +26 -3
package/src/services/chat.js +49 -63
package/src/services/claude.js +110 -35
package/src/services/discord.js +30 -7
package/src/services/imessage.js +9 -1
package/src/services/signal.js +10 -1
package/src/services/slack.js +33 -5
package/src/services/telegram.js +31 -5
package/src/services/tools.js +1 -1
package/src/services/whatsapp.js +15 -5
package/.github/workflows/publish.yml +0 -18

package/install.sh CHANGED Viewed

@@ -326,8 +326,13 @@ step "setting up auto-start"
 PLIST_NAME="ai.claudity.server"
 PLIST_PATH="$HOME/Library/LaunchAgents/${PLIST_NAME}.plist"
 NODE_PATH="$(which node)"
+CLAUDE_PATH="$(which claude 2>/dev/null || echo "")"
 mkdir -p "$INSTALL_DIR/data"
+PLIST_PATH_DIRS="/usr/local/bin:/opt/homebrew/bin:/usr/bin:/bin"
+[ -n "$NODE_PATH" ] && PLIST_PATH_DIRS="$(dirname "$NODE_PATH"):${PLIST_PATH_DIRS}"
+[ -n "$CLAUDE_PATH" ] && PLIST_PATH_DIRS="$(dirname "$CLAUDE_PATH"):${PLIST_PATH_DIRS}"
 launchctl bootout "gui/$(id -u)/${PLIST_NAME}" 2>/dev/null || true
 cat > "$PLIST_PATH" <<PLIST
@@ -355,7 +360,7 @@ cat > "$PLIST_PATH" <<PLIST
   <key>EnvironmentVariables</key>
   <dict>
     <key>PATH</key>
-    <string>/usr/local/bin:/opt/homebrew/bin:/usr/bin:/bin</string>
+    <string>${PLIST_PATH_DIRS}</string>
   </dict>
 </dict>
 </plist>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "claudity",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "evolving agents that live where you chat ★ powered by claude code",
   "main": "src/index.js",
   "bin": {

package/public/css/style.css CHANGED Viewed

@@ -765,13 +765,6 @@ div[aria-label="messages"] > div[data-activity] [data-status] {
   font-size: 11px;
 }
-div[aria-label="messages"] > div[data-activity] [data-summary] {
-  color: var(--accent);
-  font-size: 11px;
-  margin-top: 4px;
-  opacity: 0.7;
-}
 div[aria-label="messages"] > div[data-activity] [data-stop] {
   background: transparent;
   border: 1px solid var(--bg-hover);
@@ -790,6 +783,12 @@ div[aria-label="messages"] > div[data-activity] [data-stop]:hover {
   color: var(--danger);
 }
+div[aria-label="messages"] > div[data-activity] [data-watchdog-warn] {
+  color: #f59e0b;
+  font-size: 11px;
+  margin: 0.3rem 0 0;
+}
 div[aria-label="messages"] > div[data-role="system"] {
   color: var(--muted);
   font-size: 11px;
@@ -797,6 +796,69 @@ div[aria-label="messages"] > div[data-role="system"] {
   font-style: italic;
 }
+[data-usage-bar] {
+  display: flex;
+  gap: 1.5rem;
+  padding: 0.5rem 1.5rem;
+  font-size: 10px;
+  color: var(--muted);
+  font-variant-numeric: tabular-nums;
+  flex-shrink: 0;
+  border-top: 1px solid var(--bg-raised);
+}
+[data-usage-bar][hidden] {
+  display: none;
+}
+[data-usage-bar] > div {
+  flex: 1;
+  min-width: 0;
+}
+[data-usage-bar] [data-quota-header] {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 3px;
+}
+[data-usage-bar] [data-quota-header] span:first-child {
+  color: var(--white);
+  font-weight: 600;
+}
+[data-usage-bar] [data-quota-pct] {
+  color: var(--white);
+}
+[data-usage-bar] [data-quota-track] {
+  height: 6px;
+  background: var(--bg-raised);
+  border-radius: 3px;
+  overflow: hidden;
+}
+[data-usage-bar] [data-quota-fill] {
+  height: 100%;
+  border-radius: 3px;
+  background: var(--accent);
+  transition: width 0.4s ease, background 0.3s;
+  width: 0%;
+}
+[data-usage-bar] [data-quota-fill][data-warn] {
+  background: var(--amber);
+}
+[data-usage-bar] [data-quota-fill][data-danger] {
+  background: var(--danger);
+}
+[data-usage-bar] [data-quota-reset] {
+  margin-top: 2px;
+  font-size: 9px;
+}
 form[aria-label="input"] {
   display: flex;
   gap: 0.5rem;
@@ -1493,6 +1555,11 @@ dialog[aria-label="connection"] footer button[data-disconnect]:hover {
     max-width: 95%;
   }
+  [data-usage-bar] {
+    padding: 0.5rem 0.75rem;
+    gap: 0.75rem;
+  }
   form[aria-label="input"] {
     padding: 0.5rem 0.75rem 0.75rem;
   }

package/public/index.html CHANGED Viewed

@@ -8,7 +8,7 @@
   <meta name="theme-color" content="#000000">
   <meta name="color-scheme" content="dark">
   <link rel="icon" href="/favicon.svg" type="image/svg+xml">
-  <link rel="stylesheet" href="css/style.css?cb=12">
+  <link rel="stylesheet" href="css/style.css?cb=20">
 </head>
 <body>
   <button type="button" aria-label="menu" aria-expanded="false" aria-controls="agent-nav" title="menu" data-action="toggle-nav">
@@ -114,6 +114,24 @@
       <div aria-label="messages" role="log" aria-live="polite"></div>
+      <div data-usage-bar hidden>
+        <div data-quota-session>
+          <div data-quota-header><span>session</span><span data-quota-pct>0%</span></div>
+          <div data-quota-track><div data-quota-fill></div></div>
+          <div data-quota-reset></div>
+        </div>
+        <div data-quota-weekly>
+          <div data-quota-header><span>weekly</span><span data-quota-pct>0%</span></div>
+          <div data-quota-track><div data-quota-fill></div></div>
+          <div data-quota-reset></div>
+        </div>
+        <div data-quota-overage>
+          <div data-quota-header><span>extra usage</span><span data-quota-pct>0%</span></div>
+          <div data-quota-track><div data-quota-fill></div></div>
+          <div data-quota-reset></div>
+        </div>
+      </div>
       <form aria-label="input">
         <textarea placeholder="say something..." rows="1" aria-label="message"></textarea>
         <button type="submit" aria-label="send message" title="send message">
@@ -257,6 +275,6 @@
     </footer>
   </dialog>
-  <script src="js/app.js?cb=12"></script>
+  <script src="js/app.js?cb=20"></script>
 </body>
 </html>

package/public/js/app.js CHANGED Viewed

@@ -2,6 +2,7 @@ let agents = [];
 let activeAgent = null;
 let eventSource = null;
 let connectionsPoller = null;
+let cachedQuota = null;
 async function api(method, path, body) {
   const opts = { method, headers: { 'content-type': 'application/json' } };
@@ -34,6 +35,7 @@ const chatInput = $('form[aria-label="input"] textarea');
 const chatSubmit = $('form[aria-label="input"] button[type="submit"]');
 const connectionsBtn = $('button[data-action="connections"]');
 const platformsDiv = $('[data-platforms]');
+const usageBar = $('[data-usage-bar]');
 const iconRobot = '<svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M352 0c0-17.7-14.3-32-32-32S288-17.7 288 0l0 64-96 0c-53 0-96 43-96 96l0 224c0 53 43 96 96 96l256 0c53 0 96-43 96-96l0-224c0-53-43-96-96-96l-96 0 0-64zM160 368c0-13.3 10.7-24 24-24l32 0c13.3 0 24 10.7 24 24s-10.7 24-24 24l-32 0c-13.3 0-24-10.7-24-24zm120 0c0-13.3 10.7-24 24-24l32 0c13.3 0 24 10.7 24 24s-10.7 24-24 24l-32 0c-13.3 0-24-10.7-24-24zm120 0c0-13.3 10.7-24 24-24l32 0c13.3 0 24 10.7 24 24s-10.7 24-24 24l-32 0c-13.3 0-24-10.7-24-24zM224 176a48 48 0 1 1 0 96 48 48 0 1 1 0-96zm144 48a48 48 0 1 1 96 0 48 48 0 1 1 -96 0zM64 224c0-17.7-14.3-32-32-32S0 206.3 0 224l0 96c0 17.7 14.3 32 32 32s32-14.3 32-32l0-96zm544-32c-17.7 0-32 14.3-32 32l0 96c0 17.7 14.3 32 32 32s32-14.3 32-32l0-96c0-17.7-14.3-32-32-32z"/></svg>';
@@ -144,6 +146,44 @@ function esc(str) {
   return el.innerHTML;
 }
+function formatReset(ts) {
+  if (!ts) return '';
+  const d = new Date(ts * 1000);
+  const now = new Date();
+  const sameDay = d.toDateString() === now.toDateString();
+  const time = d.toLocaleTimeString([], { hour: 'numeric', minute: '2-digit' });
+  if (sameDay) return `resets ${time}`;
+  const date = d.toLocaleDateString([], { month: 'short', day: 'numeric' });
+  return `resets ${date} ${time}`;
+}
+function updateQuotaBar(container, util, reset) {
+  const pct = Math.floor(util * 100);
+  const fill = container.querySelector('[data-quota-fill]');
+  container.querySelector('[data-quota-pct]').textContent = pct + '%';
+  fill.style.width = pct + '%';
+  delete fill.dataset.warn;
+  delete fill.dataset.danger;
+  if (pct >= 90) fill.dataset.danger = '';
+  else if (pct >= 70) fill.dataset.warn = '';
+  container.querySelector('[data-quota-reset]').textContent = formatReset(reset);
+}
+function applyQuota(data) {
+  if (!data || !data.available) return;
+  if (data.session) updateQuotaBar($('[data-quota-session]', usageBar), data.session.utilization, data.session.reset);
+  if (data.weekly) updateQuotaBar($('[data-quota-weekly]', usageBar), data.weekly.utilization, data.weekly.reset);
+  if (data.overage) updateQuotaBar($('[data-quota-overage]', usageBar), data.overage.utilization, data.overage.reset);
+}
+async function fetchQuota() {
+  try {
+    const data = await api('GET', '/api/quota');
+    cachedQuota = data;
+    applyQuota(data);
+  } catch {}
+}
 function renderMarkdown(text) {
   let html = esc(text);
   html = html.replace(/```(\w*)\n([\s\S]*?)```/g, '<pre><code>$2</code></pre>');
@@ -248,6 +288,9 @@ async function selectAgent(id) {
   chatInput.value = '';
   chatSubmit.disabled = false;
+  usageBar.hidden = false;
+  if (cachedQuota) applyQuota(cachedQuota);
+  fetchQuota();
   try {
     const messages = await api('GET', `/api/agents/${id}/messages`);
@@ -400,7 +443,7 @@ function stopActivityTimer() {
 }
 function updateToolStatus(toolName) {
-  if (toolName !== currentToolName) { if (currentToolName !== null) toolStartTime = Date.now(); }
+  if (toolName !== currentToolName) toolStartTime = Date.now();
   currentToolName = toolName;
   const activity = showActivity();
   if (!activity) return;
@@ -421,20 +464,7 @@ function updateToolStatus(toolName) {
   scrollToBottom();
 }
-function updateStatusSummary(summary) {
-  const activity = showActivity();
-  if (!activity) return;
-  let el = activity.querySelector('[data-summary]');
-  if (!el) {
-    el = document.createElement('p');
-    el.dataset.summary = '';
-    activity.appendChild(el);
-  }
-  el.textContent = summary;
-  const dots = activity.querySelector('[data-dots]');
-  if (dots) dots.remove();
-  scrollToBottom();
-}
 function connectSSE(agentId) {
   if (eventSource) eventSource.close();
@@ -461,15 +491,6 @@ function connectSSE(agentId) {
     } catch {}
   });
-  eventSource.addEventListener('ack_message', (e) => {
-    try {
-      clearActivity();
-      const data = JSON.parse(e.data);
-      appendMessage('assistant', data.content);
-      scrollToBottom();
-    } catch {}
-  });
   eventSource.addEventListener('intermediate', (e) => {
     try {
       const data = JSON.parse(e.data);
@@ -486,13 +507,6 @@ function connectSSE(agentId) {
     } catch {}
   });
-  eventSource.addEventListener('status_update', (e) => {
-    try {
-      const data = JSON.parse(e.data);
-      updateStatusSummary(data.summary);
-    } catch {}
-  });
   eventSource.addEventListener('assistant_message', (e) => {
     try {
       clearActivity();
@@ -503,6 +517,10 @@ function connectSSE(agentId) {
     } catch {}
   });
+  eventSource.addEventListener('usage', () => {
+    fetchQuota();
+  });
   eventSource.addEventListener('user_message', (e) => {
     try {
       const data = JSON.parse(e.data);
@@ -1335,6 +1353,7 @@ async function init() {
     agents = await api('GET', '/api/agents');
     renderAgents();
     showSection('empty');
+    fetchQuota();
   } catch {
     showSection('setup');
   }

package/src/db.js CHANGED Viewed

@@ -107,6 +107,23 @@ db.exec(`
   )
 `);
+db.exec(`
+  create table if not exists token_usage (
+    id text primary key,
+    agent_id text not null,
+    input_tokens integer not null default 0,
+    output_tokens integer not null default 0,
+    cache_read_tokens integer not null default 0,
+    cache_write_tokens integer not null default 0,
+    created_at datetime default current_timestamp,
+    foreign key (agent_id) references agents(id) on delete cascade
+  )
+`);
+try {
+  db.exec('create index if not exists idx_token_usage_agent on token_usage(agent_id)');
+} catch {}
 const stmts = {
   getConfig: db.prepare('select value from config where key = ?'),
   setConfig: db.prepare('insert into config (key, value, updated_at) values (?, ?, current_timestamp) on conflict(key) do update set value = excluded.value, updated_at = current_timestamp'),
@@ -157,6 +174,9 @@ const stmts = {
   getSession: db.prepare('select * from sessions where agent_id = ?'),
   upsertSession: db.prepare('insert into sessions (agent_id, session_id, prompt_hash, updated_at) values (?, ?, ?, current_timestamp) on conflict(agent_id) do update set session_id = excluded.session_id, prompt_hash = excluded.prompt_hash, updated_at = current_timestamp'),
   deleteSession: db.prepare('delete from sessions where agent_id = ?'),
+  createUsage: db.prepare('insert into token_usage (id, agent_id, input_tokens, output_tokens, cache_read_tokens, cache_write_tokens) values (?, ?, ?, ?, ?, ?)'),
+  agentUsageTotals: db.prepare('select coalesce(sum(input_tokens), 0) as input_tokens, coalesce(sum(output_tokens), 0) as output_tokens, coalesce(sum(cache_read_tokens), 0) as cache_read_tokens, coalesce(sum(cache_write_tokens), 0) as cache_write_tokens from token_usage where agent_id = ?'),
 };
 module.exports = { db, stmts };

package/src/routes/api.js CHANGED Viewed

@@ -3,6 +3,7 @@ const { v4: uuid } = require('uuid');
 const { stmts } = require('../db');
 const auth = require('../services/auth');
 const chat = require('../services/chat');
+const claude = require('../services/claude');
 const workspace = require('../services/workspace');
 const heartbeat = require('../services/heartbeat');
@@ -121,6 +122,23 @@ router.delete('/agents/:id/messages', (req, res) => {
   res.json({ cleared: true });
 });
+router.get('/agents/:id/usage', (req, res) => {
+  const agent = stmts.getAgent.get(req.params.id);
+  if (!agent) return res.status(404).json({ error: 'agent not found' });
+  const totals = stmts.agentUsageTotals.get(req.params.id);
+  res.json(totals);
+});
+router.get('/quota', async (req, res) => {
+  try {
+    const quota = await claude.probeQuota();
+    if (!quota) return res.json({ available: false });
+    res.json({ available: true, ...quota });
+  } catch {
+    res.json({ available: false });
+  }
+});
 router.post('/agents/:id/stop', (req, res) => {
   const stopped = chat.stopAgent(req.params.id);
   res.json({ stopped });
@@ -156,13 +174,13 @@ router.get('/agents/:id/stream', (req, res) => {
     const elapsed = activity ? Math.floor((Date.now() - activity.startTime) / 1000) : 0;
     res.write(`event: typing\ndata: ${JSON.stringify({ active: true, elapsed })}\n\n`);
     if (activity) {
+      if (activity.intermediateText) {
+        res.write(`event: intermediate\ndata: ${JSON.stringify({ content: activity.intermediateText, elapsed })}\n\n`);
+      }
       if (activity.tool) {
         const toolElapsed = activity.toolStartTime ? Math.floor((Date.now() - activity.toolStartTime) / 1000) : 0;
         res.write(`event: tool_call\ndata: ${JSON.stringify({ name: activity.tool, elapsed, toolElapsed })}\n\n`);
       }
-      if (activity.summary) {
-        res.write(`event: status_update\ndata: ${JSON.stringify({ summary: activity.summary, elapsed, tool: activity.tool || 'thinking' })}\n\n`);
-      }
     }
   }

package/src/services/auth.js CHANGED Viewed

@@ -4,6 +4,21 @@ const { stmts } = require('../db');
 let cachedCredentials = null;
 function readKeychain() {
+  const accounts = [process.env.USER, 'Claude Code'];
+  for (const acct of accounts) {
+    try {
+      const raw = execSync(
+        `security find-generic-password -s "Claude Code-credentials" -a "${acct}" -w`,
+        { encoding: 'utf8', timeout: 5000 }
+      ).trim();
+      const parsed = JSON.parse(raw);
+      const creds = parsed.claudeAiOauth || parsed;
+      if (creds.accessToken && creds.accessToken.startsWith('sk-ant-')) {
+        cachedCredentials = creds;
+        return creds;
+      }
+    } catch {}
+  }
   try {
     const raw = execSync(
       'security find-generic-password -s "Claude Code-credentials" -w',
@@ -64,10 +79,18 @@ function getAuthStatus() {
 }
 function getHeaders() {
-  const token = getAccessToken();
-  if (!token) return null;
+  const apiKey = getApiKey();
+  if (apiKey) {
+    return {
+      'x-api-key': apiKey,
+      'content-type': 'application/json',
+      'anthropic-version': '2023-06-01'
+    };
+  }
+  const creds = cachedCredentials || readKeychain();
+  if (!creds || !creds.accessToken) return null;
   return {
-    'x-api-key': token,
+    'authorization': `Bearer ${creds.accessToken}`,
     'content-type': 'application/json',
     'anthropic-version': '2023-06-01'
   };

package/src/services/chat.js CHANGED Viewed

@@ -100,7 +100,7 @@ your memories are automatically extracted from conversations and written to dail
 your workspace is at data/agents/${workspace.sanitizeName(agent.name)}/. you can read and write your own files using read_workspace and write_workspace. your soul, identity, memory, and heartbeat files are yours to evolve.
-when using tools, just use them naturally as part of the conversation - no need to announce plans or ask permission. when interacting with external platforms, read their documentation first to understand the api.
+always tell the user what you're about to do before doing it. share your plan, intention, or approach in natural language first, then use tools to execute. don't ask permission - just say what you're doing and do it. when interacting with external platforms, read their documentation first to understand the api.
 if the user asks you to do something repeatedly or on a schedule, use the schedule_task tool to set it up. you will receive scheduled reminders as messages and should act on them autonomously.
@@ -137,7 +137,6 @@ async function handleMessage(agentId, userContent, options = {}) {
   if (!agent) throw new Error('agent not found');
   const isHeartbeat = !!options.heartbeat;
-  const isScheduled = typeof userContent === 'string' && userContent.startsWith('[scheduled reminder]');
   if (!isHeartbeat) {
     const userMsgId = uuid();
@@ -147,29 +146,12 @@ async function handleMessage(agentId, userContent, options = {}) {
   if (!isHeartbeat) {
     processingAgents.add(agentId);
-    agentActivity.set(agentId, { startTime: Date.now(), tool: null, toolStartTime: null, summary: null });
+    agentActivity.set(agentId, { startTime: Date.now(), tool: null, toolStartTime: null, intermediateText: null });
     emit(agentId, 'typing', { active: true });
   }
-  let responseComplete = false;
   const startTime = Date.now();
   let lastToolName = null;
-  let statusInterval = null;
-  if (!isHeartbeat) {
-    statusInterval = setInterval(async () => {
-      const elapsed = Math.floor((Date.now() - startTime) / 1000);
-      const tool = lastToolName || 'thinking';
-      try {
-        const summary = await claude.generateStatus(tool, elapsed, agent.name);
-        if (summary) {
-          const state = agentActivity.get(agentId);
-          if (state) state.summary = summary;
-          emit(agentId, 'status_update', { elapsed, summary, tool });
-        }
-      } catch {}
-    }, 60000);
-  }
   const systemPrompt = buildSystemPrompt(agent);
   const toolDefs = tools.getAllToolDefinitions();
@@ -184,26 +166,37 @@ async function handleMessage(agentId, userContent, options = {}) {
   let allToolCalls = [];
   let intermediateTexts = [];
-  const wantsAck = !isHeartbeat && !isScheduled && !isBootstrap;
-  const ackPromise = wantsAck
-    ? claude.generateQuickAck(userContent, agent.name).catch(() => null)
-    : Promise.resolve(null);
+  const totalUsage = { input_tokens: 0, output_tokens: 0, cache_read_tokens: 0, cache_write_tokens: 0 };
   const onEvent = !isHeartbeat ? (event) => {
-    if (event.type === 'assistant' && event.message && event.message.content) {
-      const elapsed = Math.floor((Date.now() - startTime) / 1000);
-      for (const block of event.message.content) {
-        if (block.type === 'tool_use') {
-          lastToolName = block.name;
-          const state = agentActivity.get(agentId);
-          if (state) { state.tool = block.name; state.toolStartTime = Date.now(); }
-          emit(agentId, 'tool_call', { name: block.name, input: block.input, elapsed });
+    if (event.type !== 'assistant' || !event.message?.content) return;
+    const elapsed = Math.floor((Date.now() - startTime) / 1000);
+    for (const block of event.message.content) {
+      if (block.type === 'tool_use') {
+        lastToolName = block.name;
+        const state = agentActivity.get(agentId);
+        if (state) { state.tool = block.name; state.toolStartTime = Date.now(); }
+        emit(agentId, 'tool_call', { name: block.name, input: block.input, elapsed });
+      } else if (block.type === 'text' && block.text?.trim()) {
+        const text = block.text.trim();
+        const state = agentActivity.get(agentId);
+        if (state) state.intermediateText = text;
+        emit(agentId, 'intermediate', { content: text, elapsed });
+        if (options.onAck) {
+          try { options.onAck(text); } catch {}
         }
       }
     }
   } : null;
+  const ackThinking = (text) => {
+    if (options.onAck && text) {
+      try { options.onAck(text); } catch {}
+    }
+  };
   const mainPromise = claude.sendMessage({
     system: systemPrompt,
     messages,
@@ -217,30 +210,12 @@ async function handleMessage(agentId, userContent, options = {}) {
   });
   try {
-    let response;
-    if (wantsAck) {
-      const raceResult = await Promise.race([
-        mainPromise.then(r => ({ type: 'main', result: r })),
-        new Promise(resolve => setTimeout(() => resolve({ type: 'timeout' }), 8000))
-      ]);
-      if (raceResult.type === 'main') {
-        response = raceResult.result;
-      } else {
-        const quickAck = await ackPromise;
-        if (quickAck) {
-          const ackMsgId = uuid();
-          stmts.createMessage.run(ackMsgId, agentId, 'assistant', quickAck, null);
-          emit(agentId, 'typing', { active: false });
-          emit(agentId, 'ack_message', { content: quickAck });
-          if (options.onAck) options.onAck(quickAck);
-          emit(agentId, 'typing', { active: true });
-        }
-        response = await mainPromise;
-      }
-    } else {
-      response = await mainPromise;
+    let response = await mainPromise;
+    if (response.usage) {
+      totalUsage.input_tokens += response.usage.input_tokens;
+      totalUsage.output_tokens += response.usage.output_tokens;
+      totalUsage.cache_read_tokens += response.usage.cache_read_tokens;
+      totalUsage.cache_write_tokens += response.usage.cache_write_tokens;
     }
     while (claude.hasToolUse(response)) {
@@ -250,7 +225,10 @@ async function handleMessage(agentId, userContent, options = {}) {
       if (thinkingText) {
         intermediateTexts.push(thinkingText);
+        const state = agentActivity.get(agentId);
+        if (state) state.intermediateText = thinkingText;
         emit(agentId, 'intermediate', { content: thinkingText });
+        ackThinking(thinkingText);
       }
       messages.push({ role: 'assistant', content: response.content });
@@ -298,6 +276,12 @@ async function handleMessage(agentId, userContent, options = {}) {
         noBuiltinTools: isBootstrap,
         onEvent
       });
+      if (response.usage) {
+        totalUsage.input_tokens += response.usage.input_tokens;
+        totalUsage.output_tokens += response.usage.output_tokens;
+        totalUsage.cache_read_tokens += response.usage.cache_read_tokens;
+        totalUsage.cache_write_tokens += response.usage.cache_write_tokens;
+      }
     }
     let rawText = claude.extractText(response);
@@ -334,11 +318,9 @@ async function handleMessage(agentId, userContent, options = {}) {
       const stripped = responseText.replace(/\s+/g, ' ').trim();
       const isOk = stripped.includes('HEARTBEAT_OK') && stripped.length <= 300;
       if (isOk) {
-        responseComplete = true;
         return { id: null, content: responseText, suppressed: true };
       }
       stmts.createHeartbeatMessage.run(assistantMsgId, agentId, 'assistant', responseText, toolCallsJson);
-      responseComplete = true;
       emit(agentId, 'heartbeat_alert', {
         id: assistantMsgId,
         content: responseText,
@@ -349,6 +331,13 @@ async function handleMessage(agentId, userContent, options = {}) {
     stmts.createMessage.run(assistantMsgId, agentId, 'assistant', responseText, toolCallsJson);
+    if (totalUsage.input_tokens > 0 || totalUsage.output_tokens > 0) {
+      try {
+        stmts.createUsage.run(uuid(), agentId, totalUsage.input_tokens, totalUsage.output_tokens, totalUsage.cache_read_tokens, totalUsage.cache_write_tokens);
+      } catch {}
+      emit(agentId, 'usage', totalUsage);
+    }
     if (isBootstrap && stmts.getAgent.get(agentId)?.bootstrapped !== 0) {
       emit(agentId, 'bootstrap_complete', {});
     }
@@ -359,8 +348,6 @@ async function handleMessage(agentId, userContent, options = {}) {
       });
     }
-    if (statusInterval) clearInterval(statusInterval);
-    responseComplete = true;
     processingAgents.delete(agentId);
     agentActivity.delete(agentId);
     emit(agentId, 'typing', { active: false });
@@ -373,8 +360,6 @@ async function handleMessage(agentId, userContent, options = {}) {
     return { id: assistantMsgId, content: responseText, tool_calls: allToolCalls.length ? allToolCalls : null };
   } catch (err) {
-    if (statusInterval) clearInterval(statusInterval);
-    responseComplete = true;
     processingAgents.delete(agentId);
     agentActivity.delete(agentId);
     if (!isHeartbeat) emit(agentId, 'typing', { active: false });
@@ -392,6 +377,7 @@ function enqueueMessage(agentId, content, options = {}) {
       messageQueues.delete(agentId);
     }
   });
+  tracked.catch(() => {});
   messageQueues.set(agentId, tracked);
   return chained;
 }

package/src/services/claude.js CHANGED Viewed

@@ -10,6 +10,28 @@ const API_URL = 'https://api.anthropic.com/v1/messages';
 const MODEL = 'claude-opus-4-6';
 const activeProcesses = new Map();
+let supportsEffort = null;
+function checkEffortSupport() {
+  if (supportsEffort !== null) return supportsEffort;
+  try {
+    const { execSync } = require('child_process');
+    const help = execSync('claude --help 2>&1', { encoding: 'utf8' });
+    supportsEffort = help.includes('--effort');
+  } catch {
+    supportsEffort = false;
+  }
+  return supportsEffort;
+}
+function applyEffort(args, extraEnv, effort) {
+  if (checkEffortSupport()) {
+    args.push('--effort', effort);
+  } else {
+    const tokens = { low: '0', medium: '16000', high: '31999' };
+    extraEnv.MAX_THINKING_TOKENS = tokens[effort] || '31999';
+  }
+}
 function hashPrompt(str) {
   let h = 0;
   for (let i = 0; i < str.length; i++) {
@@ -143,9 +165,12 @@ function runCli(args, input, extraEnv = {}, agentId = null, onEvent = null) {
         }
       }
     });
-    proc.stderr.on('data', d => stderr += d);
+    proc.stderr.on('data', d => {
+      stderr += d;
+    });
     proc.on('close', code => {
+      try { fs.rmSync(cwd, { recursive: true, force: true }); } catch {}
       if (done) return;
       done = true;
       if (agentId) activeProcesses.delete(agentId);
@@ -169,6 +194,7 @@ function runCli(args, input, extraEnv = {}, agentId = null, onEvent = null) {
     });
     proc.on('error', err => {
+      clearInterval(idleCheck);
       if (done) return;
       done = true;
       reject(err);
@@ -191,9 +217,11 @@ async function sendViaCli({ system, messages, tools, maxTokens, agentId, model =
   let output;
   if (canResume) {
-    const args = ['-p', '--output-format', 'stream-json', '--verbose', '--effort', effort, '--dangerously-skip-permissions', '--setting-sources', '', '--resume', session.session_id];
+    const args = ['-p', '--output-format', 'stream-json', '--verbose', '--dangerously-skip-permissions', '--setting-sources', '', '--resume', session.session_id];
+    const extraEnv = {};
+    applyEffort(args, extraEnv, effort);
     try {
-      output = await runCli(args, promptText, {}, agentId, onEvent);
+      output = await runCli(args, promptText, extraEnv, agentId, onEvent);
       return processCliOutput(output, tools);
     } catch (err) {
       if (err.message === 'aborted') throw err;
@@ -216,14 +244,16 @@ async function sendCliFresh({ sysPrompt, messages, promptText, tools, agentId, c
   if (context) fullPrompt += `previous conversation:\n${context}\n\n`;
   fullPrompt += promptText;
-  const args = ['-p', '--output-format', 'stream-json', '--verbose', '--model', model, '--effort', effort, '--dangerously-skip-permissions', '--setting-sources', '', '--session-id', sessionId];
+  const args = ['-p', '--output-format', 'stream-json', '--verbose', '--model', model, '--dangerously-skip-permissions', '--setting-sources', '', '--session-id', sessionId];
+  const extraEnv = {};
+  applyEffort(args, extraEnv, effort);
   if (noBuiltinTools) args.push('--tools', '');
   if (sysPrompt) {
     args.push('--system-prompt', sysPrompt);
   }
   try {
-    const output = await runCli(args, fullPrompt, {}, agentId, onEvent);
+    const output = await runCli(args, fullPrompt, extraEnv, agentId, onEvent);
     if (agentId) {
       stmts.upsertSession.run(agentId, sessionId, currentHash);
@@ -233,9 +263,11 @@ async function sendCliFresh({ sysPrompt, messages, promptText, tools, agentId, c
   } catch (err) {
     if (err.message === 'aborted') throw err;
     if (isContextOverflow(err) && context) {
-      const retryArgs = ['-p', '--output-format', 'stream-json', '--verbose', '--model', model, '--effort', effort, '--dangerously-skip-permissions', '--setting-sources', '', '--session-id', randomUUID()];
+      const retryArgs = ['-p', '--output-format', 'stream-json', '--verbose', '--model', model, '--dangerously-skip-permissions', '--setting-sources', '', '--session-id', randomUUID()];
+      const retryEnv = {};
+      applyEffort(retryArgs, retryEnv, effort);
       if (sysPrompt) retryArgs.push('--system-prompt', sysPrompt);
-      const output = await runCli(retryArgs, promptText, {}, agentId);
+      const output = await runCli(retryArgs, promptText, retryEnv, agentId);
       return processCliOutput(output, tools);
     }
     throw err;
@@ -246,6 +278,13 @@ function processCliOutput(output, tools) {
   const parsed = parseCliOutput(output);
   if (!parsed) throw new Error('claude cli returned empty response');
+  const usage = parsed.usage ? {
+    input_tokens: parsed.usage.input_tokens || 0,
+    output_tokens: parsed.usage.output_tokens || 0,
+    cache_read_tokens: parsed.usage.cache_read_input_tokens || 0,
+    cache_write_tokens: parsed.usage.cache_creation_input_tokens || 0
+  } : null;
   if (parsed.is_error && parsed.num_turns === 0) {
     throw new Error('cli session error');
   }
@@ -254,23 +293,32 @@ function processCliOutput(output, tools) {
     const text = typeof parsed.result === 'string' && parsed.result.length > 0
       ? parsed.result
       : '';
-    return buildResponse(text, tools);
+    const resp = buildResponse(text, tools);
+    resp.usage = usage;
+    return resp;
   }
   if (parsed.result !== undefined && parsed.result !== null && parsed.result !== '') {
     const text = typeof parsed.result === 'string' ? parsed.result : JSON.stringify(parsed.result);
-    return buildResponse(text, tools);
+    const resp = buildResponse(text, tools);
+    resp.usage = usage;
+    return resp;
   }
   if (parsed.content) {
+    parsed.usage = usage;
     return parsed;
   }
   if (parsed.type === 'result') {
-    return buildResponse('', tools);
+    const resp = buildResponse('', tools);
+    resp.usage = usage;
+    return resp;
   }
-  return buildResponse(output, tools);
+  const resp = buildResponse(output, tools);
+  resp.usage = usage;
+  return resp;
 }
 function parseCliOutput(output) {
@@ -358,19 +406,6 @@ function hasToolUse(response) {
   return response.stop_reason === 'tool_use';
 }
-async function generateQuickAck(userContent, agentName) {
-  const args = ['-p', '--output-format', 'json', '--model', 'haiku', '--dangerously-skip-permissions', '--setting-sources', ''];
-  const prompt = `you are ${agentName}. the user just said: "${userContent}"\n\nacknowledge their message in one casual sentence - show you understood what they want and you're about to start. don't answer or attempt the task, just the acknowledgment. no quotes.`;
-  try {
-    const output = await runCli(args, prompt);
-    const parsed = parseCliOutput(output);
-    if (parsed && typeof parsed.result === 'string' && parsed.result.length > 0) {
-      return parsed.result.trim();
-    }
-  } catch {}
-  return null;
-}
 function abort(agentId) {
   const proc = activeProcesses.get(agentId);
   if (proc) {
@@ -381,18 +416,58 @@ function abort(agentId) {
   return false;
 }
-async function generateStatus(toolName, elapsedSeconds, agentName) {
-  const mins = Math.floor(elapsedSeconds / 60);
-  const args = ['-p', '--output-format', 'json', '--model', 'haiku', '--dangerously-skip-permissions', '--setting-sources', ''];
-  const prompt = `you are ${agentName}. you've been working for ${mins} minute${mins === 1 ? '' : 's'} and you're currently using ${toolName}. give a one-sentence first-person casual status update for your user. no quotes.`;
+async function probeQuota() {
+  const status = auth.getAuthStatus();
+  if (!status.authenticated) return null;
+  const headers = auth.getHeaders();
+  if (!headers) return null;
+  if (headers.authorization) headers['anthropic-beta'] = 'oauth-2025-04-20';
   try {
-    const output = await runCli(args, prompt);
-    const parsed = parseCliOutput(output);
-    if (parsed && typeof parsed.result === 'string' && parsed.result.length > 0) {
-      return parsed.result.trim().replace(/^["']|["']$/g, '');
+    const res = await fetch(API_URL, {
+      method: 'POST',
+      headers,
+      body: JSON.stringify({
+        model: MODEL,
+        max_tokens: 1,
+        messages: [{ role: 'user', content: 'quota' }]
+      })
+    });
+    res.text().catch(() => {});
+    const quota = {};
+    const h = res.headers;
+    const session = h.get('anthropic-ratelimit-unified-5h-utilization');
+    if (session !== null) {
+      quota.session = {
+        utilization: parseFloat(session),
+        reset: parseInt(h.get('anthropic-ratelimit-unified-5h-reset') || '0', 10)
+      };
     }
-  } catch {}
-  return null;
+    const weekly = h.get('anthropic-ratelimit-unified-7d-utilization');
+    if (weekly !== null) {
+      quota.weekly = {
+        utilization: parseFloat(weekly),
+        reset: parseInt(h.get('anthropic-ratelimit-unified-7d-reset') || '0', 10)
+      };
+    }
+    const overageUtil = h.get('anthropic-ratelimit-unified-overage-utilization');
+    if (overageUtil !== null) {
+      quota.overage = {
+        utilization: parseFloat(overageUtil),
+        reset: parseInt(h.get('anthropic-ratelimit-unified-overage-reset') || '0', 10)
+      };
+    }
+    if (!quota.session && !quota.weekly) return null;
+    return quota;
+  } catch {
+    return null;
+  }
 }
-module.exports = { sendMessage, extractText, extractToolUse, hasToolUse, generateQuickAck, generateStatus, abort };
+module.exports = { sendMessage, extractText, extractToolUse, hasToolUse, abort, probeQuota };

package/src/services/discord.js CHANGED Viewed

@@ -1,6 +1,7 @@
 const { Client, GatewayIntentBits, Partials } = require('discord.js');
 const MAX_RESPONSE_LENGTH = 1900;
+const EDIT_THROTTLE = 5000;
 let client = null;
 let typingTimer = null;
@@ -17,6 +18,10 @@ function parseMessage(text, botId) {
   return { agent: match[1].toLowerCase(), command: match[2].trim() };
 }
+function clamp(text) {
+  return text.length > MAX_RESPONSE_LENGTH ? text.slice(0, MAX_RESPONSE_LENGTH) + '...' : text;
+}
 function startTyping(channel) {
   channel.sendTyping().catch(() => {});
   typingTimer = setInterval(() => {
@@ -86,21 +91,39 @@ function start(config, callbacks) {
     log(`${parsed.agent}: ${parsed.command}`);
     startTyping(message.channel);
+    let statusReply = null;
+    let statusPromise = null;
+    let lastEditTime = 0;
     try {
       const result = await chatModule.enqueueMessage(agent.id, parsed.command, {
         onAck: (text) => {
-          stopTyping();
-          message.reply(text).catch(() => {});
-          startTyping(message.channel);
+          text = clamp(text);
+          if (!statusPromise) {
+            statusPromise = message.reply(text)
+              .then(sent => { statusReply = sent; })
+              .catch(() => {});
+          } else if (Date.now() - lastEditTime >= EDIT_THROTTLE) {
+            lastEditTime = Date.now();
+            statusPromise = statusPromise.then(() => {
+              if (statusReply) return statusReply.edit(text).catch(() => {});
+            });
+          }
         }
       });
       stopTyping();
       if (result && result.content) {
-        let text = result.content;
-        if (text.length > MAX_RESPONSE_LENGTH) {
-          text = text.slice(0, MAX_RESPONSE_LENGTH) + '...';
+        const text = clamp(result.content);
+        if (statusPromise) {
+          await statusPromise;
+          if (statusReply) {
+            await statusReply.edit(text).catch(() => {});
+          } else {
+            await message.reply(text);
+          }
+        } else {
+          await message.reply(text);
         }
-        await message.reply(text);
       }
     } catch (err) {
       stopTyping();

package/src/services/imessage.js CHANGED Viewed

@@ -155,11 +155,19 @@ function poll() {
 }
 async function handleCommand(agent, command, chatGuid) {
+  let lastAcked = null;
+  let lastAckTime = Date.now();
   try {
     const result = await chatModule.enqueueMessage(agent.id, command, {
-      onAck: (text) => sendMessage(chatGuid, text)
+      onAck: (text) => {
+        if (Date.now() - lastAckTime < 15000) return;
+        lastAckTime = Date.now();
+        lastAcked = text;
+        sendMessage(chatGuid, text);
+      }
     });
     if (result && result.content) {
+      if (lastAcked && (result.content === lastAcked || result.content.startsWith(lastAcked) || lastAcked.startsWith(result.content))) return;
       sendMessage(chatGuid, result.content);
     }
   } catch (err) {

package/src/services/signal.js CHANGED Viewed

@@ -83,10 +83,19 @@ function startDaemon(phone, onStatus, chatModule, stmts) {
         log(`${parsed.agent}: ${parsed.command}`);
+        let lastAcked = null;
+        let lastAckTime = Date.now();
         chatModule.enqueueMessage(agent.id, parsed.command, {
-          onAck: (ackText) => send(sender, ackText)
+          onAck: (ackText) => {
+            if (Date.now() - lastAckTime < 15000) return;
+            lastAckTime = Date.now();
+            lastAcked = ackText;
+            send(sender, ackText);
+          }
         }).then((result) => {
           if (result && result.content) {
+            if (lastAcked && (result.content === lastAcked || result.content.startsWith(lastAcked) || lastAcked.startsWith(result.content))) return;
             let reply = result.content;
             if (reply.length > MAX_RESPONSE_LENGTH) {
               reply = reply.slice(0, MAX_RESPONSE_LENGTH) + '...';

package/src/services/slack.js CHANGED Viewed

@@ -2,6 +2,7 @@ const { App, LogLevel } = require('@slack/bolt');
 const { WebClient } = require('@slack/web-api');
 const MAX_RESPONSE_LENGTH = 3000;
+const EDIT_THROTTLE = 5000;
 let app = null;
@@ -17,6 +18,10 @@ function parseMessage(text) {
   return { agent: match[1].toLowerCase(), command: match[2].trim() };
 }
+function clamp(text) {
+  return text.length > MAX_RESPONSE_LENGTH ? text.slice(0, MAX_RESPONSE_LENGTH) + '...' : text;
+}
 function start(config, callbacks) {
   const { onStatus } = callbacks || {};
   const { bot_token, app_token } = config || {};
@@ -63,16 +68,39 @@ function start(config, callbacks) {
         log(`${parsed.agent}: ${parsed.command}`);
+        let statusTs = null;
+        let statusChannel = null;
+        let statusPromise = null;
+        let lastEditTime = 0;
         try {
           const result = await chatModule.enqueueMessage(agent.id, parsed.command, {
-            onAck: (text) => say(text).catch(() => {})
+            onAck: (text) => {
+              text = clamp(text);
+              if (!statusPromise) {
+                statusPromise = say(text)
+                  .then(res => { statusTs = res.ts; statusChannel = res.channel; })
+                  .catch(() => {});
+              } else if (Date.now() - lastEditTime >= EDIT_THROTTLE) {
+                lastEditTime = Date.now();
+                statusPromise = statusPromise.then(() => {
+                  if (statusTs) return client.chat.update({ channel: statusChannel, ts: statusTs, text }).catch(() => {});
+                });
+              }
+            }
           });
           if (result && result.content) {
-            let text = result.content;
-            if (text.length > MAX_RESPONSE_LENGTH) {
-              text = text.slice(0, MAX_RESPONSE_LENGTH) + '...';
+            const text = clamp(result.content);
+            if (statusPromise) {
+              await statusPromise;
+              if (statusTs) {
+                await client.chat.update({ channel: statusChannel, ts: statusTs, text }).catch(() => {});
+              } else {
+                await say(text);
+              }
+            } else {
+              await say(text);
             }
-            await say(text);
           }
         } catch (err) {
           await say(`error: ${err.message}`);

package/src/services/telegram.js CHANGED Viewed

@@ -1,6 +1,7 @@
 const TelegramBot = require('node-telegram-bot-api');
 const MAX_RESPONSE_LENGTH = 4000;
+const EDIT_THROTTLE = 5000;
 let bot = null;
@@ -15,6 +16,10 @@ function parseMessage(text) {
   return { agent: match[1].toLowerCase(), command: match[2].trim() };
 }
+function clamp(text) {
+  return text.length > MAX_RESPONSE_LENGTH ? text.slice(0, MAX_RESPONSE_LENGTH) + '...' : text;
+}
 function start(config, callbacks) {
   const { onStatus } = callbacks || {};
   const { token } = config || {};
@@ -63,19 +68,40 @@ function start(config, callbacks) {
     log(`${parsed.agent}: ${parsed.command}`);
     bot.sendChatAction(msg.chat.id, 'typing').catch(() => {});
+    let statusMsgId = null;
+    let statusPromise = null;
+    let lastEditTime = 0;
     try {
       const result = await chatModule.enqueueMessage(agent.id, parsed.command, {
         onAck: (text) => {
-          bot.sendMessage(msg.chat.id, text, { reply_to_message_id: msg.message_id }).catch(() => {});
+          text = clamp(text);
+          if (!statusPromise) {
+            statusPromise = bot.sendMessage(msg.chat.id, text, { reply_to_message_id: msg.message_id })
+              .then(sent => { statusMsgId = sent.message_id; })
+              .catch(() => {});
+          } else if (Date.now() - lastEditTime >= EDIT_THROTTLE) {
+            lastEditTime = Date.now();
+            statusPromise = statusPromise.then(() => {
+              if (statusMsgId) return bot.editMessageText(text, { chat_id: msg.chat.id, message_id: statusMsgId }).catch(() => {});
+            });
+          }
           bot.sendChatAction(msg.chat.id, 'typing').catch(() => {});
         }
       });
       if (result && result.content) {
-        let text = result.content;
-        if (text.length > MAX_RESPONSE_LENGTH) {
-          text = text.slice(0, MAX_RESPONSE_LENGTH) + '...';
+        const text = clamp(result.content);
+        if (statusPromise) {
+          await statusPromise;
+          if (statusMsgId) {
+            await bot.editMessageText(text, { chat_id: msg.chat.id, message_id: statusMsgId }).catch(() => {});
+          } else {
+            await bot.sendMessage(msg.chat.id, text, { reply_to_message_id: msg.message_id });
+          }
+        } else {
+          await bot.sendMessage(msg.chat.id, text, { reply_to_message_id: msg.message_id });
         }
-        await bot.sendMessage(msg.chat.id, text, { reply_to_message_id: msg.message_id });
       }
     } catch (err) {
       bot.sendMessage(msg.chat.id, `error: ${err.message}`, { reply_to_message_id: msg.message_id }).catch(() => {});

package/src/services/tools.js CHANGED Viewed

@@ -353,7 +353,7 @@ async function spawnSubagent(input, context) {
   return new Promise((resolve) => {
     let done = false;
-    const args = ['-p', '--output-format', 'json', '--model', model, '--dangerously-skip-permissions'];
+    const args = ['-p', '--output-format', 'json', '--model', model, '--dangerously-skip-permissions', '--setting-sources', ''];
     const proc = spawn('claude', args, {
       stdio: ['pipe', 'pipe', 'pipe']
     });

package/src/services/whatsapp.js CHANGED Viewed

@@ -76,16 +76,26 @@ function start(config, callbacks) {
     log(`${parsed.agent}: ${parsed.command}`);
     busy = true;
+    let lastAcked = null;
+    let lastAckTime = Date.now();
     try {
       const result = await chatModule.enqueueMessage(agent.id, parsed.command, {
-        onAck: (text) => message.reply(text).catch(() => {})
+        onAck: (text) => {
+          if (Date.now() - lastAckTime < 15000) return;
+          lastAckTime = Date.now();
+          lastAcked = text;
+          message.reply(text).catch(() => {});
+        }
       });
       if (result && result.content) {
-        let text = result.content;
-        if (text.length > MAX_RESPONSE_LENGTH) {
-          text = text.slice(0, MAX_RESPONSE_LENGTH) + '...';
+        if (!(lastAcked && (result.content === lastAcked || result.content.startsWith(lastAcked) || lastAcked.startsWith(result.content)))) {
+          let text = result.content;
+          if (text.length > MAX_RESPONSE_LENGTH) {
+            text = text.slice(0, MAX_RESPONSE_LENGTH) + '...';
+          }
+          await message.reply(text);
         }
-        await message.reply(text);
       }
     } catch (err) {
       message.reply(`error: ${err.message}`).catch(() => {});

package/.github/workflows/publish.yml DELETED Viewed

@@ -1,18 +0,0 @@
-name: publish
-on:
-  release:
-    types: [published]
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          registry-url: https://registry.npmjs.org
-      - run: npm install
-      - run: npm publish --provenance --access public