claudity 1.0.0 → 1.1.0

package/src/routes/api.js

@@ -15,7 +15,7 @@ router.get('/auth/status', (req, res) => {
 router.post('/auth/api-key', (req, res) => {
   const { key } = req.body;
   if (!key) return res.status(400).json({ error: 'key required' });
-  if (!key.startsWith('sk-ant-api')) return res.status(400).json({ error: 'invalid api key — must start with sk-ant-api. setup tokens and oauth tokens are not supported here. run claude setup-token instead.' });
+  if (!key.startsWith('sk-ant-api')) return res.status(400).json({ error: 'invalid api key - must start with sk-ant-api. setup tokens and oauth tokens are not supported here. run claude setup-token instead.' });
   auth.setApiKey(key);
   res.json({ saved: true });
 });
@@ -23,12 +23,12 @@ router.post('/auth/api-key', (req, res) => {
 router.post('/auth/setup-token', (req, res) => {
   const { token } = req.body;
   if (!token) return res.status(400).json({ error: 'token required' });
-  if (!token.startsWith('sk-ant-oat')) return res.status(400).json({ error: 'invalid setup token — must start with sk-ant-oat. if you have an api key, use the api key option instead.' });
+  if (!token.startsWith('sk-ant-oat')) return res.status(400).json({ error: 'invalid setup token - must start with sk-ant-oat. if you have an api key, use the api key option instead.' });
   try {
     auth.writeSetupToken(token);
     const status = auth.getAuthStatus();
     if (status.authenticated) return res.json({ saved: true });
-    return res.status(400).json({ error: 'token saved to keychain but authentication failed — token may be invalid or expired' });
+    return res.status(400).json({ error: 'token saved to keychain but authentication failed - token may be invalid or expired' });
   } catch (err) {
     return res.status(500).json({ error: 'failed to write to keychain: ' + err.message });
   }
@@ -44,14 +44,14 @@ router.get('/agents', (req, res) => {
 });
 
 router.post('/agents', (req, res) => {
-  const { name, is_default, model, thinking } = req.body;
+  const { name, is_default, model, effort } = req.body;
   if (!name) return res.status(400).json({ error: 'name required' });
   const id = uuid();
   try {
     stmts.createAgent.run(id, name);
     stmts.setBootstrapped.run(0, id);
     if (model) stmts.setModel.run(model, id);
-    if (thinking) stmts.setThinking.run(thinking, id);
+    if (effort) stmts.setEffort.run(effort, id);
     if (is_default) {
       stmts.clearDefaultAgent.run();
       stmts.setDefaultAgent.run(id);
@@ -89,7 +89,7 @@ router.patch('/agents/:id', (req, res) => {
     heartbeat.updateInterval(req.params.id, req.body.heartbeat_interval);
   }
   if (req.body.model) stmts.setModel.run(req.body.model, req.params.id);
-  if (req.body.thinking) stmts.setThinking.run(req.body.thinking, req.params.id);
+  if (req.body.effort) stmts.setEffort.run(req.body.effort, req.params.id);
   if ('show_heartbeat' in req.body) stmts.setShowHeartbeat.run(req.body.show_heartbeat ? 1 : 0, req.params.id);
   res.json(stmts.getAgent.get(req.params.id));
 });
@@ -121,6 +121,11 @@ router.delete('/agents/:id/messages', (req, res) => {
   res.json({ cleared: true });
 });
 
+router.post('/agents/:id/stop', (req, res) => {
+  const stopped = chat.stopAgent(req.params.id);
+  res.json({ stopped });
+});
+
 router.post('/agents/:id/chat', (req, res) => {
   const agent = stmts.getAgent.get(req.params.id);
   if (!agent) return res.status(404).json({ error: 'agent not found' });
@@ -147,7 +152,18 @@ router.get('/agents/:id/stream', (req, res) => {
   res.write(`event: connected\ndata: ${JSON.stringify({ agent_id: req.params.id })}\n\n`);
 
   if (chat.isProcessing(req.params.id)) {
-    res.write(`event: typing\ndata: ${JSON.stringify({ active: true })}\n\n`);
+    const activity = chat.getActivity(req.params.id);
+    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.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`);
+      }
+    }
   }
 
   chat.addStream(req.params.id, res);

package/src/services/chat.js

@@ -8,6 +8,7 @@ const workspace = require('./workspace');
 const agentStreams = new Map();
 const messageQueues = new Map();
 const processingAgents = new Set();
+const agentActivity = new Map();
 
 function addStream(agentId, res) {
   if (!agentStreams.has(agentId)) agentStreams.set(agentId, []);
@@ -84,28 +85,28 @@ your workspace is at data/agents/${workspace.sanitizeName(agent.name)}/. use wri
 
   if (dailyLogs) prompt += `recent context:\n${dailyLogs}\n\n`;
 
-  prompt += `adapt your tone and style naturally to match whoever you are talking to. be personable. you are not a task executor — you are a conversational agent who can also get things done when asked.
+  prompt += `adapt your tone and style naturally to match whoever you are talking to. be personable. you are not a task executor - you are a conversational agent who can also get things done when asked.
 
-you have full machine access — bash, file read/write/edit, glob, grep — all available as built-in tools in your environment. use them freely to accomplish tasks: run commands, read/write files, explore the filesystem, execute scripts, etc.
+you have full machine access - bash, file read/write/edit, glob, grep - all available as built-in tools in your environment. use them freely to accomplish tasks: run commands, read/write files, explore the filesystem, execute scripts, etc.
 
 available claudity tools:
 ${toolList}
 
 use spawn_subagent to offload complex or time-consuming work (writing code, running multi-step commands, analysis) to an ephemeral subprocess. the subagent has full machine access but no claudity tools or memory.
 
-use delegate to collaborate with other agents — send a message to another agent by name and get their response. useful when a task falls in another agent's domain.
+use delegate to collaborate with other agents - send a message to another agent by name and get their response. useful when a task falls in another agent's domain.
 
 your memories are automatically extracted from conversations and written to daily logs. use the remember tool for critical standing instructions or preferences you must never lose.
 
 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.
+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.
 
 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.
 
-when you receive a [scheduled reminder], just do the thing — no need to announce that it was a reminder. act naturally.
+when you receive a [scheduled reminder], just do the thing - no need to announce that it was a reminder. act naturally.
 
-CRITICAL: users cannot see tool results. they only see your final text response. when you use tools, you MUST include every key detail from the results — urls, links, claim links, confirmation codes, registration links, usernames, error messages, anything actionable. if you don't include it in your response, the user will never see it. never summarize away actionable information.
+CRITICAL: users cannot see tool results. they only see your final text response. when you use tools, you MUST include every key detail from the results - urls, links, claim links, confirmation codes, registration links, usernames, error messages, anything actionable. if you don't include it in your response, the user will never see it. never summarize away actionable information.
 
 you know nothing about the user until they tell you. do not infer, guess, or use any username, file path, hostname, or environment variable to identify them. if you see a username in a path or system info, ignore it completely. never address the user by name until they introduce themselves.`;
 
@@ -146,17 +147,36 @@ async function handleMessage(agentId, userContent, options = {}) {
 
   if (!isHeartbeat) {
     processingAgents.add(agentId);
+    agentActivity.set(agentId, { startTime: Date.now(), tool: null, toolStartTime: null, summary: 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();
   const isBootstrap = agent.bootstrapped === 0;
   const sessionAgentId = (!isBootstrap && !isHeartbeat) ? agentId : null;
   const model = agent.model || 'opus';
-  const thinking = (isBootstrap || isHeartbeat) ? 'low' : (agent.thinking || 'high');
+  const effort = (isBootstrap || isHeartbeat) ? 'low' : (agent.effort || 'high');
 
   let messages = isHeartbeat
     ? [{ role: 'user', content: userContent }]
@@ -165,11 +185,25 @@ async function handleMessage(agentId, userContent, options = {}) {
   let allToolCalls = [];
   let intermediateTexts = [];
 
-  const wantsAck = !isHeartbeat && !isScheduled && agent.bootstrapped !== 0;
+  const wantsAck = !isHeartbeat && !isScheduled && !isBootstrap;
   const ackPromise = wantsAck
     ? claude.generateQuickAck(userContent, agent.name).catch(() => null)
     : Promise.resolve(null);
 
+  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 });
+        }
+      }
+    }
+  } : null;
+
   const mainPromise = claude.sendMessage({
     system: systemPrompt,
     messages,
@@ -177,8 +211,9 @@ async function handleMessage(agentId, userContent, options = {}) {
     maxTokens: 4096,
     agentId: sessionAgentId,
     model,
-    thinking,
-    noBuiltinTools: isBootstrap
+    effort,
+    noBuiltinTools: isBootstrap,
+    onEvent
   });
 
   try {
@@ -223,7 +258,9 @@ async function handleMessage(agentId, userContent, options = {}) {
       const toolResults = [];
 
       for (const call of calls) {
-        emit(agentId, 'tool_call', { name: call.name, input: call.input });
+        lastToolName = call.name;
+        const elapsed = Math.floor((Date.now() - startTime) / 1000);
+        emit(agentId, 'tool_call', { name: call.name, input: call.input, elapsed });
 
         try {
           const result = await tools.executeTool(call.name, call.input, { agentId });
@@ -257,8 +294,9 @@ async function handleMessage(agentId, userContent, options = {}) {
         maxTokens: 4096,
         agentId: sessionAgentId,
         model,
-        thinking,
-        noBuiltinTools: isBootstrap
+        effort,
+        noBuiltinTools: isBootstrap,
+        onEvent
       });
     }
 
@@ -311,13 +349,8 @@ async function handleMessage(agentId, userContent, options = {}) {
 
     stmts.createMessage.run(assistantMsgId, agentId, 'assistant', responseText, toolCallsJson);
 
-    if (isBootstrap && stmts.getAgent.get(agentId)?.bootstrapped === 0) {
-      const msgCount = stmts.listMessages.all(agentId).filter(m => m.role === 'user').length;
-      if (msgCount >= 4) {
-        stmts.setBootstrapped.run(1, agentId);
-        workspace.deleteFile(agent.name, 'BOOTSTRAP.md');
-        emit(agentId, 'bootstrap_complete', {});
-      }
+    if (isBootstrap && stmts.getAgent.get(agentId)?.bootstrapped !== 0) {
+      emit(agentId, 'bootstrap_complete', {});
     }
 
     if (!isHeartbeat) {
@@ -326,8 +359,10 @@ async function handleMessage(agentId, userContent, options = {}) {
       });
     }
 
+    if (statusInterval) clearInterval(statusInterval);
     responseComplete = true;
     processingAgents.delete(agentId);
+    agentActivity.delete(agentId);
     emit(agentId, 'typing', { active: false });
     emit(agentId, 'assistant_message', {
       id: assistantMsgId,
@@ -338,10 +373,13 @@ 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 });
-    if (!isHeartbeat) emit(agentId, 'error', { error: err.message });
+    if (!isHeartbeat && err.message !== 'aborted') emit(agentId, 'error', { error: err.message });
+    if (err.message === 'aborted') return;
     throw err;
   }
 }
@@ -362,4 +400,18 @@ function isProcessing(agentId) {
   return processingAgents.has(agentId);
 }
 
-module.exports = { handleMessage, enqueueMessage, addStream, removeStream, emit, isProcessing };
+function stopAgent(agentId) {
+  if (!processingAgents.has(agentId)) return false;
+  claude.abort(agentId);
+  processingAgents.delete(agentId);
+  agentActivity.delete(agentId);
+  emit(agentId, 'typing', { active: false });
+  emit(agentId, 'stopped', {});
+  return true;
+}
+
+function getActivity(agentId) {
+  return agentActivity.get(agentId) || null;
+}
+
+module.exports = { handleMessage, enqueueMessage, addStream, removeStream, emit, isProcessing, stopAgent, getActivity };

package/src/services/claude.js

@@ -8,6 +8,7 @@ const { stmts } = require('../db');
 
 const API_URL = 'https://api.anthropic.com/v1/messages';
 const MODEL = 'claude-opus-4-6';
+const activeProcesses = new Map();
 
 function hashPrompt(str) {
   let h = 0;
@@ -17,24 +18,20 @@ function hashPrompt(str) {
   return h.toString(36);
 }
 
-function invalidateSession(agentId) {
-  stmts.deleteSession.run(agentId);
-}
-
 function isContextOverflow(err) {
   const msg = (err.message || '').toLowerCase();
   return msg.includes('context') || msg.includes('overflow') || msg.includes('too long') || msg.includes('token limit');
 }
 
-async function sendMessage({ system, messages, tools, maxTokens = 4096, agentId, model = 'opus', thinking = 'high', noBuiltinTools = false }) {
+async function sendMessage({ system, messages, tools, maxTokens = 4096, agentId, model = 'opus', effort = 'high', noBuiltinTools = false, onEvent = null }) {
   const status = auth.getAuthStatus();
-  if (!status.authenticated) throw new Error('not authenticated — run claude setup-token');
+  if (!status.authenticated) throw new Error('not authenticated - run claude setup-token');
 
   if (status.mode === 'api_key') {
     return sendViaApi({ system, messages, tools, maxTokens });
   }
 
-  return sendViaCli({ system, messages, tools, maxTokens, agentId, model, thinking, noBuiltinTools });
+  return sendViaCli({ system, messages, tools, maxTokens, agentId, model, effort, noBuiltinTools, onEvent });
 }
 
 async function sendViaApi({ system, messages, tools, maxTokens }) {
@@ -110,40 +107,62 @@ function buildContext(messages) {
   }).filter(Boolean).join('\n\n');
 }
 
-function runCli(args, input, timeoutMs = 300000, extraEnv = {}) {
+function runCli(args, input, extraEnv = {}, agentId = null, onEvent = null) {
   return new Promise((resolve, reject) => {
     let done = false;
     const env = { ...process.env, ...extraEnv };
+    delete env.CLAUDECODE;
     const cwd = fs.mkdtempSync(path.join(os.tmpdir(), 'claudity-'));
     const proc = spawn('claude', args, {
       stdio: ['pipe', 'pipe', 'pipe'],
-      timeout: timeoutMs,
       cwd,
       env
     });
 
-    const fallback = setTimeout(() => {
-      if (!done) {
-        done = true;
-        proc.kill();
-        reject(new Error('claude cli timed out'));
-      }
-    }, timeoutMs + 10000);
+    if (agentId) activeProcesses.set(agentId, proc);
 
     let stdout = '';
     let stderr = '';
-
-    proc.stdout.on('data', d => stdout += d);
+    let lastResult = null;
+    let buffer = '';
+
+    proc.stdout.on('data', d => {
+      const chunk = d.toString();
+      stdout += chunk;
+      if (onEvent) {
+        buffer += chunk;
+        const lines = buffer.split('\n');
+        buffer = lines.pop();
+        for (const line of lines) {
+          if (!line.trim()) continue;
+          try {
+            const event = JSON.parse(line);
+            if (event.type === 'result') lastResult = line;
+            onEvent(event);
+          } catch {}
+        }
+      }
+    });
     proc.stderr.on('data', d => stderr += d);
 
     proc.on('close', code => {
       if (done) return;
       done = true;
-      clearTimeout(fallback);
-      if (stdout.trim()) {
+      if (agentId) activeProcesses.delete(agentId);
+      if (onEvent && lastResult) {
+        resolve(lastResult);
+      } else if (onEvent && !lastResult) {
+        if (code === null) {
+          reject(new Error('aborted'));
+        } else {
+          reject(new Error(`claude cli exited with code ${code}${stderr.trim() ? ': ' + stderr.trim() : ''}`));
+        }
+      } else if (stdout.trim()) {
         resolve(stdout.trim());
-      } else if (code !== 0) {
-        reject(new Error(`claude cli exited ${code}: ${stderr.trim()}`));
+      } else if (code !== 0 && code !== null) {
+        reject(new Error(`claude cli exited with code ${code}${stderr.trim() ? ': ' + stderr.trim() : ''}`));
+      } else if (code === null) {
+        reject(new Error('claude cli process was terminated unexpectedly - try again'));
       } else {
         resolve('');
       }
@@ -152,7 +171,6 @@ function runCli(args, input, timeoutMs = 300000, extraEnv = {}) {
     proc.on('error', err => {
       if (done) return;
       done = true;
-      clearTimeout(fallback);
       reject(err);
     });
 
@@ -161,13 +179,11 @@ function runCli(args, input, timeoutMs = 300000, extraEnv = {}) {
   });
 }
 
-async function sendViaCli({ system, messages, tools, maxTokens, agentId, model = 'opus', thinking = 'high', noBuiltinTools = false }) {
+async function sendViaCli({ system, messages, tools, maxTokens, agentId, model = 'opus', effort = 'high', noBuiltinTools = false, onEvent = null }) {
   const lastUserMsg = messages.filter(m => m.role === 'user').pop();
   const promptText = buildPromptText(lastUserMsg);
   const sysPrompt = buildFullSysPrompt(system, tools);
   const currentHash = hashPrompt(sysPrompt);
-  const thinkingTokens = { low: '0', medium: '16000', high: '31999' };
-  const extraEnv = { MAX_THINKING_TOKENS: thinkingTokens[thinking] || '31999' };
 
   const session = agentId ? stmts.getSession.get(agentId) : null;
   const canResume = session && session.prompt_hash === currentHash;
@@ -175,24 +191,24 @@ async function sendViaCli({ system, messages, tools, maxTokens, agentId, model =
   let output;
 
   if (canResume) {
-    const args = ['-p', '--output-format', 'json', '--dangerously-skip-permissions', '--setting-sources', '', '--resume', session.session_id];
+    const args = ['-p', '--output-format', 'stream-json', '--verbose', '--effort', effort, '--dangerously-skip-permissions', '--setting-sources', '', '--resume', session.session_id];
     try {
-      output = await runCli(args, promptText, 300000, extraEnv);
+      output = await runCli(args, promptText, {}, agentId, onEvent);
+      return processCliOutput(output, tools);
     } catch (err) {
+      if (err.message === 'aborted') throw err;
       stmts.deleteSession.run(agentId);
       if (isContextOverflow(err)) {
-        return sendCliFresh({ sysPrompt, messages: [messages[messages.length - 1]], promptText, tools, agentId, currentHash, model, extraEnv, noBuiltinTools });
+        return sendCliFresh({ sysPrompt, messages: [messages[messages.length - 1]], promptText, tools, agentId, currentHash, model, effort, noBuiltinTools, onEvent });
       }
-      return sendCliFresh({ sysPrompt, messages, promptText, tools, agentId, currentHash, model, extraEnv, noBuiltinTools });
+      return sendCliFresh({ sysPrompt, messages, promptText, tools, agentId, currentHash, model, effort, noBuiltinTools, onEvent });
     }
-  } else {
-    return sendCliFresh({ sysPrompt, messages, promptText, tools, agentId, currentHash, model, extraEnv, noBuiltinTools });
   }
 
-  return processCliOutput(output, tools);
+  return sendCliFresh({ sysPrompt, messages, promptText, tools, agentId, currentHash, model, effort, noBuiltinTools, onEvent });
 }
 
-async function sendCliFresh({ sysPrompt, messages, promptText, tools, agentId, currentHash, model = 'opus', extraEnv = {}, noBuiltinTools = false }) {
+async function sendCliFresh({ sysPrompt, messages, promptText, tools, agentId, currentHash, model = 'opus', effort = 'high', noBuiltinTools = false, onEvent = null }) {
   const sessionId = randomUUID();
   const context = buildContext(messages);
 
@@ -200,14 +216,14 @@ 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', 'json', '--model', model, '--dangerously-skip-permissions', '--setting-sources', '', '--session-id', sessionId];
+  const args = ['-p', '--output-format', 'stream-json', '--verbose', '--model', model, '--effort', effort, '--dangerously-skip-permissions', '--setting-sources', '', '--session-id', sessionId];
   if (noBuiltinTools) args.push('--tools', '');
   if (sysPrompt) {
     args.push('--system-prompt', sysPrompt);
   }
 
   try {
-    const output = await runCli(args, fullPrompt, 300000, extraEnv);
+    const output = await runCli(args, fullPrompt, {}, agentId, onEvent);
 
     if (agentId) {
       stmts.upsertSession.run(agentId, sessionId, currentHash);
@@ -215,10 +231,11 @@ async function sendCliFresh({ sysPrompt, messages, promptText, tools, agentId, c
 
     return processCliOutput(output, tools);
   } catch (err) {
+    if (err.message === 'aborted') throw err;
     if (isContextOverflow(err) && context) {
-      const retryArgs = ['-p', '--output-format', 'json', '--model', model, '--dangerously-skip-permissions', '--setting-sources', '', '--session-id', randomUUID()];
+      const retryArgs = ['-p', '--output-format', 'stream-json', '--verbose', '--model', model, '--effort', effort, '--dangerously-skip-permissions', '--setting-sources', '', '--session-id', randomUUID()];
       if (sysPrompt) retryArgs.push('--system-prompt', sysPrompt);
-      const output = await runCli(retryArgs, promptText, 300000, extraEnv);
+      const output = await runCli(retryArgs, promptText, {}, agentId);
       return processCliOutput(output, tools);
     }
     throw err;
@@ -229,6 +246,10 @@ function processCliOutput(output, tools) {
   const parsed = parseCliOutput(output);
   if (!parsed) throw new Error('claude cli returned empty response');
 
+  if (parsed.is_error && parsed.num_turns === 0) {
+    throw new Error('cli session error');
+  }
+
   if (parsed.is_error || parsed.subtype === 'error_max_turns') {
     const text = typeof parsed.result === 'string' && parsed.result.length > 0
       ? parsed.result
@@ -339,9 +360,9 @@ function hasToolUse(response) {
 
 async function generateQuickAck(userContent, agentName) {
   const args = ['-p', '--output-format', 'json', '--model', 'haiku', '--dangerously-skip-permissions', '--setting-sources', ''];
-  const prompt = `you are ${agentName}, an ai agent. the user just sent you this message:\n\n"${userContent}"\n\nyou are about to start working on this. generate a short casual acknowledgment (1 sentence, all lowercase) that shows you read their message and are about to get on it. DO NOT answer their question or attempt the task. just acknowledge it like "sounds good, let me look into that" or "ooh nice, give me a sec to work on that" — reference what they asked about naturally but don't provide any actual content or answers. just the acknowledgment, nothing else.`;
+  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, 15000);
+    const output = await runCli(args, prompt);
     const parsed = parseCliOutput(output);
     if (parsed && typeof parsed.result === 'string' && parsed.result.length > 0) {
       return parsed.result.trim();
@@ -350,4 +371,28 @@ async function generateQuickAck(userContent, agentName) {
   return null;
 }
 
-module.exports = { sendMessage, extractText, extractToolUse, hasToolUse, invalidateSession, generateQuickAck };
+function abort(agentId) {
+  const proc = activeProcesses.get(agentId);
+  if (proc) {
+    proc.kill();
+    activeProcesses.delete(agentId);
+    return true;
+  }
+  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.`;
+  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, '');
+    }
+  } catch {}
+  return null;
+}
+
+module.exports = { sendMessage, extractText, extractToolUse, hasToolUse, generateQuickAck, generateStatus, abort };

package/src/services/connections.js

@@ -19,7 +19,7 @@ function log(msg) {
 function onStatus(platform) {
   return (status, detail) => {
     stmts.updateConnectionStatus.run(status, detail || null, platform);
-    log(`${platform}: ${status}${detail ? ' — ' + detail : ''}`);
+    log(`${platform}: ${status}${detail ? ' - ' + detail : ''}`);
   };
 }
 

package/src/services/imessage.js

@@ -113,7 +113,7 @@ end tell`;
 function deleteResponseEcho(afterRowId, text) {
   try {
     const echo = db.prepare(
-      "select m.ROWID from message m where m.is_from_me = 0 and m.ROWID > ? and m.text = ?"
+      "select m.ROWID from message m where m.is_from_me = 1 and m.ROWID > ? and m.text = ?"
     ).get(afterRowId, text);
 
     if (echo) {
@@ -134,7 +134,8 @@ function poll() {
     }
 
     if (!msg.text) continue;
-    if (recentSent.has(msg.text)) continue;
+    const msgText = msg.text.length > MAX_RESPONSE_LENGTH ? msg.text.slice(0, MAX_RESPONSE_LENGTH) + '...' : msg.text;
+    if (recentSent.has(msg.text) || recentSent.has(msgText)) continue;
 
     const { stmts } = require('../db');
     let parsed = parseMessage(msg.text);

package/src/services/memory.js

@@ -139,7 +139,7 @@ function startConsolidation() {
         if (memories.length < 5) continue;
 
         const memoryList = memories.map(m => `- ${m.summary}`).join('\n');
-        const systemPrompt = `you are a memory consolidation tool. your ONLY job is to deduplicate and clean up a list of factual memories. output ONLY a bullet list — one fact per line, each starting with "- ". do NOT add commentary, explanations, confirmations, or any text that is not a memory. do NOT say "done" or "here is your list" or anything like that. just output the cleaned list.`;
+        const systemPrompt = `you are a memory consolidation tool. your ONLY job is to deduplicate and clean up a list of factual memories. output ONLY a bullet list - one fact per line, each starting with "- ". do NOT add commentary, explanations, confirmations, or any text that is not a memory. do NOT say "done" or "here is your list" or anything like that. just output the cleaned list.`;
 
         const result = await callLightweight(memoryList, systemPrompt);
         if (!result || result.trim().toLowerCase() === 'none') continue;
@@ -153,7 +153,7 @@ function startConsolidation() {
 
         if (lines.length === 0) continue;
         if (lines.length < memories.length * 0.3) {
-          console.log(`[memory] skipping consolidation for ${agent.name} — output too small (${lines.length} vs ${memories.length})`);
+          console.log(`[memory] skipping consolidation for ${agent.name} - output too small (${lines.length} vs ${memories.length})`);
           continue;
         }
 

package/src/services/signal.js

@@ -66,7 +66,6 @@ function startDaemon(phone, onStatus, chatModule, stmts) {
         }
 
         if (!text || !sender) continue;
-        if (!sender) continue;
 
         let parsed = parseMessage(text);
         let agent;
@@ -191,7 +190,7 @@ function startLinking(onStatus, chatModule, stmts, updateConfig) {
 
     if (!linked) {
       log(`link process exited with code ${code}`);
-      if (onStatus) onStatus('error', 'linking failed — scan the qr code within 60 seconds');
+      if (onStatus) onStatus('error', 'linking failed - scan the qr code within 60 seconds');
     }
   });
 
@@ -204,7 +203,7 @@ function start(config, callbacks) {
   const { onStatus } = callbacks || {};
 
   if (!signalCliAvailable()) {
-    if (onStatus) onStatus('error', 'signal-cli not found — install with: brew install signal-cli');
+    if (onStatus) onStatus('error', 'signal-cli not found - install with: brew install signal-cli');
     return;
   }