codeply-cli 0.5.1 → 0.5.2

package/lib/arity-table.json

@@ -1,138 +1,138 @@
-{
- "cat": 1,
- "cd": 1,
- "chmod": 1,
- "chown": 1,
- "cp": 1,
- "echo": 1,
- "env": 1,
- "export": 1,
- "grep": 1,
- "kill": 1,
- "killall": 1,
- "ln": 1,
- "ls": 1,
- "mkdir": 1,
- "mv": 1,
- "ps": 1,
- "pwd": 1,
- "rm": 1,
- "rmdir": 1,
- "sleep": 1,
- "source": 1,
- "tail": 1,
- "touch": 1,
- "unset": 1,
- "which": 1,
- "aws": 3,
- "az": 3,
- "bazel": 2,
- "brew": 2,
- "bun": 2,
- "bun run": 3,
- "bun x": 3,
- "cargo": 2,
- "cargo add": 3,
- "cargo run": 3,
- "cdk": 2,
- "cf": 2,
- "cmake": 2,
- "composer": 2,
- "consul": 2,
- "consul kv": 3,
- "crictl": 2,
- "deno": 2,
- "deno task": 3,
- "doctl": 3,
- "docker": 2,
- "docker builder": 3,
- "docker compose": 3,
- "docker container": 3,
- "docker image": 3,
- "docker network": 3,
- "docker volume": 3,
- "eksctl": 2,
- "eksctl create": 3,
- "firebase": 2,
- "flyctl": 2,
- "gcloud": 3,
- "gh": 3,
- "git": 2,
- "git config": 3,
- "git remote": 3,
- "git stash": 3,
- "go": 2,
- "gradle": 2,
- "helm": 2,
- "heroku": 2,
- "hugo": 2,
- "ip": 2,
- "ip addr": 3,
- "ip link": 3,
- "ip netns": 3,
- "ip route": 3,
- "kind": 2,
- "kind create": 3,
- "kubectl": 2,
- "kubectl kustomize": 3,
- "kubectl rollout": 3,
- "kustomize": 2,
- "make": 2,
- "mc": 2,
- "mc admin": 3,
- "minikube": 2,
- "mongosh": 2,
- "mysql": 2,
- "mvn": 2,
- "ng": 2,
- "npm": 2,
- "npm exec": 3,
- "npm init": 3,
- "npm run": 3,
- "npm view": 3,
- "nvm": 2,
- "nx": 2,
- "openssl": 2,
- "openssl req": 3,
- "openssl x509": 3,
- "pip": 2,
- "pipenv": 2,
- "pnpm": 2,
- "pnpm dlx": 3,
- "pnpm exec": 3,
- "pnpm run": 3,
- "poetry": 2,
- "podman": 2,
- "podman container": 3,
- "podman image": 3,
- "psql": 2,
- "pulumi": 2,
- "pulumi stack": 3,
- "pyenv": 2,
- "python": 2,
- "rake": 2,
- "rbenv": 2,
- "redis-cli": 2,
- "rustup": 2,
- "serverless": 2,
- "sfdx": 3,
- "skaffold": 2,
- "sls": 2,
- "sst": 2,
- "swift": 2,
- "systemctl": 2,
- "terraform": 2,
- "terraform workspace": 3,
- "tmux": 2,
- "turbo": 2,
- "ufw": 2,
- "vault": 2,
- "vault auth": 3,
- "vault kv": 3,
- "vercel": 2,
- "volta": 2,
- "wp": 2,
- "yarn": 2,
- "yarn dlx": 3,
- "yarn run": 3
-}
+{
+ "cat": 1,
+ "cd": 1,
+ "chmod": 1,
+ "chown": 1,
+ "cp": 1,
+ "echo": 1,
+ "env": 1,
+ "export": 1,
+ "grep": 1,
+ "kill": 1,
+ "killall": 1,
+ "ln": 1,
+ "ls": 1,
+ "mkdir": 1,
+ "mv": 1,
+ "ps": 1,
+ "pwd": 1,
+ "rm": 1,
+ "rmdir": 1,
+ "sleep": 1,
+ "source": 1,
+ "tail": 1,
+ "touch": 1,
+ "unset": 1,
+ "which": 1,
+ "aws": 3,
+ "az": 3,
+ "bazel": 2,
+ "brew": 2,
+ "bun": 2,
+ "bun run": 3,
+ "bun x": 3,
+ "cargo": 2,
+ "cargo add": 3,
+ "cargo run": 3,
+ "cdk": 2,
+ "cf": 2,
+ "cmake": 2,
+ "composer": 2,
+ "consul": 2,
+ "consul kv": 3,
+ "crictl": 2,
+ "deno": 2,
+ "deno task": 3,
+ "doctl": 3,
+ "docker": 2,
+ "docker builder": 3,
+ "docker compose": 3,
+ "docker container": 3,
+ "docker image": 3,
+ "docker network": 3,
+ "docker volume": 3,
+ "eksctl": 2,
+ "eksctl create": 3,
+ "firebase": 2,
+ "flyctl": 2,
+ "gcloud": 3,
+ "gh": 3,
+ "git": 2,
+ "git config": 3,
+ "git remote": 3,
+ "git stash": 3,
+ "go": 2,
+ "gradle": 2,
+ "helm": 2,
+ "heroku": 2,
+ "hugo": 2,
+ "ip": 2,
+ "ip addr": 3,
+ "ip link": 3,
+ "ip netns": 3,
+ "ip route": 3,
+ "kind": 2,
+ "kind create": 3,
+ "kubectl": 2,
+ "kubectl kustomize": 3,
+ "kubectl rollout": 3,
+ "kustomize": 2,
+ "make": 2,
+ "mc": 2,
+ "mc admin": 3,
+ "minikube": 2,
+ "mongosh": 2,
+ "mysql": 2,
+ "mvn": 2,
+ "ng": 2,
+ "npm": 2,
+ "npm exec": 3,
+ "npm init": 3,
+ "npm run": 3,
+ "npm view": 3,
+ "nvm": 2,
+ "nx": 2,
+ "openssl": 2,
+ "openssl req": 3,
+ "openssl x509": 3,
+ "pip": 2,
+ "pipenv": 2,
+ "pnpm": 2,
+ "pnpm dlx": 3,
+ "pnpm exec": 3,
+ "pnpm run": 3,
+ "poetry": 2,
+ "podman": 2,
+ "podman container": 3,
+ "podman image": 3,
+ "psql": 2,
+ "pulumi": 2,
+ "pulumi stack": 3,
+ "pyenv": 2,
+ "python": 2,
+ "rake": 2,
+ "rbenv": 2,
+ "redis-cli": 2,
+ "rustup": 2,
+ "serverless": 2,
+ "sfdx": 3,
+ "skaffold": 2,
+ "sls": 2,
+ "sst": 2,
+ "swift": 2,
+ "systemctl": 2,
+ "terraform": 2,
+ "terraform workspace": 3,
+ "tmux": 2,
+ "turbo": 2,
+ "ufw": 2,
+ "vault": 2,
+ "vault auth": 3,
+ "vault kv": 3,
+ "vercel": 2,
+ "volta": 2,
+ "wp": 2,
+ "yarn": 2,
+ "yarn dlx": 3,
+ "yarn run": 3
+}

package/lib/arity.js

@@ -1,70 +1,70 @@
-/**
- * How many words name a shell command, so "always allow" can be scoped to
- * `npm run dev` or `git checkout` instead of every command there is.
- *
- * The ARITY table and the prefix() rule are from opencode
- * (packages/opencode/src/permission/arity.ts), MIT License,
- * Copyright (c) 2025 opencode - https://github.com/sst/opencode
- * Command splitting and tokenizing below are Codeply's own.
- */
-
-const ARITY = require('./arity-table.json');
-
-// "Always allow node" would allow every script there is. For interpreters the
-// script (or module) is part of the name: `node server.js`, `python app.py`.
-const INTERPRETERS = new Set(['node', 'python', 'python3', 'py', 'deno', 'bun', 'ruby', 'php', 'perl', 'bash', 'sh', 'zsh', 'powershell', 'pwsh', 'cmd', 'tsx', 'ts-node']);
-
-/** Longest listed prefix wins; unlisted commands are named by their first word. */
-function prefix(tokens) {
-  if (tokens.length && INTERPRETERS.has(tokens[0]) && !ARITY[tokens.slice(0, 2).join(' ')]) return tokens.slice(0, 2);
-  for (let len = tokens.length; len > 0; len--) {
-    const arity = ARITY[tokens.slice(0, len).join(' ')];
-    if (arity !== undefined) return tokens.slice(0, arity);
-  }
-  return tokens.slice(0, 1);
-}
-
-/** Split a command line into its separate commands (&&, ||, ;, |, newlines). Quotes are respected. */
-function splitCommands(line) {
-  const out = [];
-  let cur = '';
-  let quote = null;
-  for (let i = 0; i < line.length; i++) {
-    const c = line[i];
-    const n = line[i + 1];
-    if (quote) { cur += c; if (c === quote) quote = null; continue; }
-    if (c === '"' || c === "'") { quote = c; cur += c; continue; }
-    if ((c === '&' && n === '&') || (c === '|' && n === '|')) { out.push(cur); cur = ''; i++; continue; }
-    if (c === ';' || c === '|' || c === '\n' || c === '&') { out.push(cur); cur = ''; continue; }
-    cur += c;
-  }
-  out.push(cur);
-  return out.map((s) => s.trim()).filter(Boolean);
-}
-
-/** Words of one command, without leading VAR=value assignments or flags. */
-function tokenize(cmd) {
-  const words = cmd.match(/"[^"]*"|'[^']*'|\S+/g) || [];
-  const clean = words.map((w) => w.replace(/^["']|["']$/g, ''));
-  let i = 0;
-  while (i < clean.length && /^[A-Za-z_][A-Za-z0-9_]*=/.test(clean[i])) i++;
-  const rest = clean.slice(i).filter((w) => !w.startsWith('-'));
-  // A path to a program is still that program: C:\tools\git.exe -> git
-  if (rest.length) rest[0] = rest[0].split(/[\\/]/).pop().replace(/\.(exe|cmd|bat|ps1)$/i, '').toLowerCase();
-  return rest;
-}
-
-/**
- * The permission patterns a command line needs, one per command in it:
- *   'npm run dev && git status'  ->  ['npm run dev', 'git status']
- * Subshells, backticks and redirections into files return null: too dynamic
- * (or too destructive) to approve by name alone.
- */
-function commandPatterns(line) {
-  const text = String(line || '');
-  if (/\$\(|`|>/.test(text)) return null;
-  const pats = splitCommands(text).map((c) => prefix(tokenize(c)).join(' ')).filter(Boolean);
-  return pats.length ? [...new Set(pats)] : null;
-}
-
-module.exports = { commandPatterns, prefix, tokenize, splitCommands };
+/**
+ * How many words name a shell command, so "always allow" can be scoped to
+ * `npm run dev` or `git checkout` instead of every command there is.
+ *
+ * The ARITY table and the prefix() rule are from opencode
+ * (packages/opencode/src/permission/arity.ts), MIT License,
+ * Copyright (c) 2025 opencode - https://github.com/sst/opencode
+ * Command splitting and tokenizing below are Codeply's own.
+ */
+
+const ARITY = require('./arity-table.json');
+
+// "Always allow node" would allow every script there is. For interpreters the
+// script (or module) is part of the name: `node server.js`, `python app.py`.
+const INTERPRETERS = new Set(['node', 'python', 'python3', 'py', 'deno', 'bun', 'ruby', 'php', 'perl', 'bash', 'sh', 'zsh', 'powershell', 'pwsh', 'cmd', 'tsx', 'ts-node']);
+
+/** Longest listed prefix wins; unlisted commands are named by their first word. */
+function prefix(tokens) {
+  if (tokens.length && INTERPRETERS.has(tokens[0]) && !ARITY[tokens.slice(0, 2).join(' ')]) return tokens.slice(0, 2);
+  for (let len = tokens.length; len > 0; len--) {
+    const arity = ARITY[tokens.slice(0, len).join(' ')];
+    if (arity !== undefined) return tokens.slice(0, arity);
+  }
+  return tokens.slice(0, 1);
+}
+
+/** Split a command line into its separate commands (&&, ||, ;, |, newlines). Quotes are respected. */
+function splitCommands(line) {
+  const out = [];
+  let cur = '';
+  let quote = null;
+  for (let i = 0; i < line.length; i++) {
+    const c = line[i];
+    const n = line[i + 1];
+    if (quote) { cur += c; if (c === quote) quote = null; continue; }
+    if (c === '"' || c === "'") { quote = c; cur += c; continue; }
+    if ((c === '&' && n === '&') || (c === '|' && n === '|')) { out.push(cur); cur = ''; i++; continue; }
+    if (c === ';' || c === '|' || c === '\n' || c === '&') { out.push(cur); cur = ''; continue; }
+    cur += c;
+  }
+  out.push(cur);
+  return out.map((s) => s.trim()).filter(Boolean);
+}
+
+/** Words of one command, without leading VAR=value assignments or flags. */
+function tokenize(cmd) {
+  const words = cmd.match(/"[^"]*"|'[^']*'|\S+/g) || [];
+  const clean = words.map((w) => w.replace(/^["']|["']$/g, ''));
+  let i = 0;
+  while (i < clean.length && /^[A-Za-z_][A-Za-z0-9_]*=/.test(clean[i])) i++;
+  const rest = clean.slice(i).filter((w) => !w.startsWith('-'));
+  // A path to a program is still that program: C:\tools\git.exe -> git
+  if (rest.length) rest[0] = rest[0].split(/[\\/]/).pop().replace(/\.(exe|cmd|bat|ps1)$/i, '').toLowerCase();
+  return rest;
+}
+
+/**
+ * The permission patterns a command line needs, one per command in it:
+ *   'npm run dev && git status'  ->  ['npm run dev', 'git status']
+ * Subshells, backticks and redirections into files return null: too dynamic
+ * (or too destructive) to approve by name alone.
+ */
+function commandPatterns(line) {
+  const text = String(line || '');
+  if (/\$\(|`|>/.test(text)) return null;
+  const pats = splitCommands(text).map((c) => prefix(tokenize(c)).join(' ')).filter(Boolean);
+  return pats.length ? [...new Set(pats)] : null;
+}
+
+module.exports = { commandPatterns, prefix, tokenize, splitCommands };

package/lib/auth.mjs

@@ -1,6 +1,6 @@
-import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
-
-const auth = require('./auth.js');
-export default auth;
-export const { SUPABASE_URL, SUPABASE_ANON_KEY, getClient, login, logout, getSession, getAccessToken } = auth;
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+
+const auth = require('./auth.js');
+export default auth;
+export const { SUPABASE_URL, SUPABASE_ANON_KEY, getClient, login, logout, getSession, getAccessToken } = auth;

package/lib/bots.js

@@ -58,10 +58,44 @@ const APPROVALS = {
   edit_files: { label: 'Editing files', tools: ['write_file', 'edit_file', 'apply_patch', 'fetch_image'] },
   run_commands: { label: 'Running commands', tools: ['run'] },
   send: { label: 'Sending anything (email, Slack)', tools: ['gmail_send', 'slack_post_message'] },
-  publish: { label: 'Deploying or publishing', tools: ['vercel_deploy', 'github_create_repo', 'vercel_api'] },
-  databases: { label: 'Changing databases or cloud projects', tools: ['supabase_create_project', 'supabase_delete_project', 'supabase_api', 'supabase_sql'] },
+  publish: { label: 'Deploying or publishing', tools: ['vercel_deploy', 'github_create_repo', 'vercel_api', 'publish_deploy', 'publish_github'] },
+  databases: { label: 'Changing databases or cloud projects', tools: ['supabase_create_project', 'supabase_delete_project', 'supabase_api', 'supabase_sql', 'supabase_setup', 'supabase_schema'] },
+  calendar: { label: 'Adding to your calendar', tools: ['calendar_add'] },
 };
 const ALL_APPROVALS = Object.keys(APPROVALS);
+// The categories bots were saved with before `calendar` existed. A bot saved
+// back then never chose about the newer ones, so it asks for them (listBots).
+const FIRST_APPROVALS = ['edit_files', 'run_commands', 'send', 'publish', 'databases'];
+
+// Always on (mail-watch.js): the bot watches in the background, with no model
+// calls until something important arrives. What it can watch, and how it
+// reaches the user when it finds something.
+const WATCH_SOURCES = { gmail: 'Gmail inbox' };
+const REACH = {
+  message: 'Message me in Craft',
+  push: 'Notify my phone',
+  call: 'Call me when it is very important',
+};
+const HHMM = /^([01]\d|2[0-3]):[0-5]\d$/;
+
+function normalizeAlwaysOn(a) {
+  a = a && typeof a === 'object' ? a : {};
+  const q = a.quiet && typeof a.quiet === 'object' ? a.quiet : {};
+  const watch = (Array.isArray(a.watch) ? a.watch : ['gmail']).filter((k) => WATCH_SOURCES[k]);
+  return {
+    on: !!a.on,
+    watch: watch.length ? [...new Set(watch)] : ['gmail'],
+    reach: REACH[a.reach] ? a.reach : 'push',
+    // Draft a reply in Gmail for important mail (one model call each). Off = just tell me.
+    draft: a.draft !== false,
+    quiet: { on: q.on !== false, from: HHMM.test(q.from) ? q.from : '22:00', to: HHMM.test(q.to) ? q.to : '07:00' },
+    // Keep watching from Codeply's server while this PC is off (stores the Gmail sign-in there, encrypted).
+    cloud: !!a.cloud,
+    // "Call me when X emails me" (watch_email): sender, call or text, once unless repeat.
+    alerts: (Array.isArray(a.alerts) ? a.alerts : []).filter((x) => x && typeof x.from === 'string' && x.from.trim())
+      .slice(-20).map((x) => ({ from: x.from.trim().toLowerCase().slice(0, 200), how: x.how === 'call' ? 'call' : 'text', note: String(x.note || '').slice(0, 200), repeat: !!x.repeat, at: Number(x.at) || Date.now() })),
+  };
+}
 
 // Kept in sync with bot-avatar.js (the renderer). The engine only validates.
 const AVATAR_KEYS = {
@@ -115,7 +149,7 @@ const TEMPLATES = [
     specialty: 'Breaks a big goal into steps and gets the right teammate on each one',
     instructions: 'Restate the objective in one line. Split it into a few small steps. Hand each step to the teammate whose domain fits, one at a time, with only the context they need. Read every result critically before moving on, redo or adjust when something is off, and finish with one merged answer that says what was done and what is left.',
     tone: { preset: 'friendly', custom: '' },
-    approval: ['edit_files', 'run_commands', 'send', 'publish', 'databases'],
+    approval: ['edit_files', 'run_commands', 'send', 'publish', 'databases', 'calendar'],
     avatar: { shape: 'burst9', eyes: 'pills', color: 'graphite' },
   },
   {
@@ -123,7 +157,7 @@ const TEMPLATES = [
     specialty: 'Research: finds facts, docs and prior art, and cites where they came from',
     instructions: 'Search the project and the web, read the primary source, and report what you found with links or file paths. Separate facts from guesses. Never change files.',
     tone: { preset: 'professional', custom: '' }, sources: 'Official docs first, then the project itself, then reputable articles.',
-    approval: ['edit_files', 'run_commands', 'send', 'publish', 'databases'],
+    approval: ['edit_files', 'run_commands', 'send', 'publish', 'databases', 'calendar'],
     avatar: { shape: 'drop', eyes: 'big', color: 'blue' },
   },
   {
@@ -131,7 +165,7 @@ const TEMPLATES = [
     specialty: 'Outreach: drafts emails, posts and messages that sound like the user',
     instructions: 'Write drafts the user can send as is: clear subject, short body, one ask. Match their voice from earlier messages. Never send anything yourself without the user saying yes.',
     tone: { preset: 'friendly', custom: '' },
-    approval: ['edit_files', 'run_commands', 'send', 'publish', 'databases'],
+    approval: ['edit_files', 'run_commands', 'send', 'publish', 'databases', 'calendar'],
     avatar: { shape: 'cloud', eyes: 'happy', color: 'pink', cheeks: true },
   },
   {
@@ -139,7 +173,7 @@ const TEMPLATES = [
     specialty: 'Analysis: digs into code, data and numbers and explains what they mean',
     instructions: 'Read the real code or data before concluding anything. Show the key numbers, the reasoning, and a clear recommendation. Say how sure you are.',
     tone: { preset: 'direct', custom: '' },
-    approval: ['edit_files', 'run_commands', 'send', 'publish', 'databases'],
+    approval: ['edit_files', 'run_commands', 'send', 'publish', 'databases', 'calendar'],
     avatar: { shape: 'squircle', eyes: 'ovals', color: 'teal', glasses: 'round' },
   },
   {
@@ -147,7 +181,7 @@ const TEMPLATES = [
     specialty: 'Reporting: turns results into short, skimmable summaries and status updates',
     instructions: 'Lead with the outcome, then 3 to 5 bullets, then next steps. Plain words, no jargon, nothing invented.',
     tone: { preset: 'concise', custom: '' },
-    approval: ['edit_files', 'run_commands', 'send', 'publish', 'databases'],
+    approval: ['edit_files', 'run_commands', 'send', 'publish', 'databases', 'calendar'],
     avatar: { shape: 'star', eyes: 'dots', color: 'orange', accessory: 'sprout' },
   },
   {
@@ -155,7 +189,7 @@ const TEMPLATES = [
     specialty: 'Execution: writes and changes code, runs the checks, ships the change',
     instructions: 'Make the smallest change that does the job, in the project\'s own style. Run the relevant check after every change and report what really happened.',
     tone: { preset: 'concise', custom: '' },
-    approval: ['run_commands', 'send', 'publish', 'databases'],
+    approval: ['run_commands', 'send', 'publish', 'databases', 'calendar'],
     avatar: { shape: 'burst7', eyes: 'sleepy', color: 'red', accessory: 'antenna' },
   },
   {
@@ -163,7 +197,7 @@ const TEMPLATES = [
     specialty: 'Monitoring: checks that things still work and flags what changed or broke',
     instructions: 'Run the checks, compare with what was expected, and report only what changed or failed, with the exact error. Suggest the next step, do not fix it yourself.',
     tone: { preset: 'direct', custom: '' },
-    approval: ['edit_files', 'send', 'publish', 'databases'],
+    approval: ['edit_files', 'send', 'publish', 'databases', 'calendar'],
     avatar: { shape: 'burst12', eyes: 'sparkle', color: 'purple', accessory: 'halo' },
   },
 ];
@@ -199,9 +233,12 @@ function normalizeBot(input, existing) {
     tone: { preset: TONES[tone.preset] ? tone.preset : 'friendly', custom: clip(tone.custom, 400) },
     sources: clip(b.sources, 2000),
     approval: Array.isArray(b.approval) ? [...new Set(b.approval.filter((k) => APPROVALS[k]))] : ALL_APPROVALS.slice(),
+    // Which categories existed when the user last chose; newer ones default to asking.
+    approvalSeen: ALL_APPROVALS.slice(),
     avatar: normalizeAvatar(b.avatar),
     // The voice it speaks with on calls (a Deepgram, Edge or Kokoro voice id; '' = pick one).
     voice: typeof b.voice === 'string' && /^[\w.-]{0,80}$/.test(b.voice) ? b.voice : '',
+    alwaysOn: normalizeAlwaysOn(b.alwaysOn),
     memory: cleanMemory(b.memory),
     // Experience (learned on the job, see reflectOnRun): lessons, playbooks, tool tips, open threads.
     lessons: cleanLessons(b.lessons),
@@ -235,6 +272,10 @@ function listBots() {
   for (const f of files) {
     try {
       const raw = JSON.parse(fs.readFileSync(path.join(botsDir(), f), 'utf8'));
+      if (Array.isArray(raw.approval)) {
+        const seen = Array.isArray(raw.approvalSeen) ? raw.approvalSeen : FIRST_APPROVALS;
+        for (const k of ALL_APPROVALS) if (!seen.includes(k) && !raw.approval.includes(k)) raw.approval.push(k);
+      }
       const bot = normalizeBot(raw, { id: f.replace(/\.json$/, ''), createdAt: raw.createdAt });
       bot.updatedAt = Number(raw.updatedAt) || bot.updatedAt;
       out.push(bot);
@@ -641,10 +682,29 @@ const ASK_BOT_FORMAT = `To ask a teammate, write:
 <codeply:ask_bot>
 <bot>Name</bot>
 <task>
-The one task, with every bit of context they need (they see nothing else).
+The one task, with every bit of context they need. Spell out the concrete details: email addresses, names, subjects, dates, file paths. Never write "the email from earlier" or "what they told you".
 </task>
 </codeply:ask_bot>`;
 
+const PHONE_RULES = `YOUR LINE TO THE USER'S PHONE
+You can reach the user on their phone with reach_me, and watch their inbox with watch_email (it keeps watching in the background).
+- Urgent or time critical, or they asked for a call: reach_me with how=call (the phone rings and you speak).
+- Anything else worth their attention: how=text (a notification).
+- "Tell me / call me when X emails me": watch_email with from=X and how=call or text. Do not say you cannot run in the background.
+- A reminder at a time: reach_me with at set to that time.
+- "Have Shella call me": reach_me with bot set to that bot's name, so the call comes from them.`;
+const PHONE_FORMAT = `To reach the phone or watch for an email, write:
+<codeply:reach_me>
+<how>call</how>
+<message>Your Vercel deploy just failed on main.</message>
+<at>17:30</at>
+<bot>(optional: the bot it comes from)</bot>
+</codeply:reach_me>
+<codeply:watch_email>
+<from>someone@example.com</from>
+<how>call</how>
+</codeply:watch_email>`;
+
 const VERIFY_RULES = `BEFORE YOU SAY IT IS DONE
 - Base every claim on what your tools actually returned in this run.
 - Check the deliverable exists (the file is written, the message is sent, the command passed) before you say so.
@@ -707,9 +767,10 @@ function buildBotPrompt(bot, o = {}) {
   parts.push(`APPROVAL BOUNDARY\n${approvalLine(bot)}`);
   const memory = (bot.memory || []).slice(-MAX_MEMORY);
   if (memory.length) {
-    parts.push(`WHAT YOU HAVE LEARNED ABOUT THIS USER\nFollow these unless the user says otherwise now:\n${memory.map((m) => `- ${m.fact}`).join('\n')}`);
+    parts.push(`WHAT YOU HAVE LEARNED ABOUT THIS USER\nBackground only. The current request and the recent chat always win: never assume an old item here is what the user means now (an older email, project or task). If the request is unclear, say which one you picked, or ask.\n${memory.map((m) => `- ${m.fact}`).join('\n')}`);
   }
   parts.push(...experienceParts(bot, o.request));
+  if (require('./reach.js').available()) parts.push(o.native ? PHONE_RULES : `${PHONE_RULES}\n\n${PHONE_FORMAT}`);
   parts.push(VERIFY_RULES);
   if (o.askedBy) {
     parts.push(`DELEGATED TASK\n${o.askedBy} asked you to do one task. You only see that task, not the rest of the conversation. Do it fully with your tools, then reply in this shape:\nSummary: <one sentence with the outcome>\n<the details: findings, what you changed, anything ${o.askedBy} must know or check>`);
@@ -728,7 +789,10 @@ function buildBotPrompt(bot, o = {}) {
 function teamPrompt(team, o = {}) {
   const roster = rosterLines(team, null);
   if (!roster.length) return '';
-  return `BOTS\nThe user has these bots. When they ask for one by name, or a part of the work is clearly a bot's specialty, you can hand it that part with ask_bot. Only one bot runs at a time, and you wait for its answer.\n${roster.join('\n')}${o.native ? '' : `\n\n${ASK_BOT_FORMAT}`}`;
+  const phone = require('./reach.js').available()
+    ? `\n\nWhen the user asks a bot to call or text them ("tell Shella to call me"), do it yourself with reach_me and bot set to that bot's name, so it comes from that bot. ${o.native ? '' : PHONE_FORMAT}`
+    : '';
+  return `BOTS\nThe user has these bots. When they ask for one by name, or a part of the work is clearly a bot's specialty, you can hand it that part with ask_bot. Only one bot runs at a time, and you wait for its answer.\n${roster.join('\n')}${o.native ? '' : `\n\n${ASK_BOT_FORMAT}`}${phone}`;
 }
 
 /** Which approval category a tool falls into, or null. */
@@ -887,7 +951,7 @@ function fromDescription(json, description) {
   for (const k of ['name', 'specialty', 'instructions', 'sources']) draft[k] = noDash(draft[k]);
   draft.tone.custom = noDash(draft.tone.custom);
   // Irreversible actions always stay behind approval, whatever the model said.
-  for (const k of ['send', 'publish', 'databases']) if (!draft.approval.includes(k)) draft.approval.push(k);
+  for (const k of ['send', 'publish', 'databases', 'calendar']) if (!draft.approval.includes(k)) draft.approval.push(k);
   delete draft.id; delete draft.memory; delete draft.createdAt; delete draft.updatedAt;
   delete draft.lessons; delete draft.playbooks; delete draft.toolTips; delete draft.openThreads;
   return draft;
@@ -954,7 +1018,7 @@ async function voiceTurn({ bot, team, turns, recentChat, runAgent, route, cwd, s
   if (!userMessage) return { text: '' };
   const extra = recentChat ? `\n\nRECENT CHAT BEFORE THIS CALL\n${recentChat}` : '';
   const run = runAgent({
-    userMessage, history, mode: 'Build', cwd, signal, route, maxSteps, approve,
+    userMessage, history, mode: 'Build', cwd, signal, route, maxSteps, approve, botId: bot.id,
     botPrompt: () => `${buildBotPrompt(bot, { team, request: userMessage })}\n\n${VOICE_RULES}${extra}`,
   });
   let reply = '';
@@ -981,7 +1045,8 @@ function runStep(ev) {
 
 /** What the call screen says while a tool runs. */
 const CALL_STEP = {
-  gmail_search: 'Checking your email', gmail_send: 'Sending the email', web_search: 'Searching the web', web_fetch: 'Reading a page',
+  gmail_search: 'Checking your email', gmail_send: 'Sending the email', gmail_draft: 'Saving a draft', drafts_list: 'Looking at your drafts',
+  calendar_list: 'Checking your calendar', calendar_add: 'Adding it to your calendar', web_search: 'Searching the web', image_search: 'Looking for images', reach_me: 'Reaching your phone', watch_email: 'Setting an email alert', web_fetch: 'Reading a page',
   read_file: 'Reading a file', write_file: 'Writing a file', edit_file: 'Editing a file', apply_patch: 'Editing files', run: 'Running a command',
   search: 'Searching your files', list_dir: 'Looking through files', slack_post_message: 'Posting to Slack', browser_check: 'Checking the page',
   ask_bot: 'Asking a teammate', todo: 'Planning',
@@ -990,8 +1055,8 @@ const callStepLabel = (name) => CALL_STEP[name] || 'Working on it';
 
 module.exports = {
   VOICE_RULES, VOICE_RULES_NO_TOOLS, spoken, callTurns, voiceTurn, callStepLabel,
-  MAX_MEMORY, MAX_DEPTH, ROLES, TONES, APPROVALS, AVATAR_KEYS, TEMPLATES,
-  botsDir, setBotsDir, normalizeBot, normalizeAvatar,
+  MAX_MEMORY, MAX_DEPTH, ROLES, TONES, APPROVALS, AVATAR_KEYS, TEMPLATES, WATCH_SOURCES, REACH,
+  botsDir, setBotsDir, normalizeBot, normalizeAvatar, normalizeAlwaysOn,
   listBots, getBot, findBot, createBot, createFromTemplate, updateBot, removeBot,
   mergeMemory, addMemory, forget, clearMemory, learnFromTurn,
   MAX_LESSONS, MAX_PLAYBOOKS, MAX_TOOL_TIPS, MAX_OPEN_THREADS,