tomo-ai 0.8.2 → 0.8.4

package/CHANGELOG.md

@@ -1,6 +1,54 @@
 # Changelog
 
-## Unreleased
+## 0.8.4 (2026-06-19)
+
+### Features
+
+- **`/summon` — pull your main session into a group chat.** A configured identity's owner can `/summon` in an allowlisted group so the group's messages run on their unified `dm:` session (full personal context) until `/dismiss` or after `summonExpiryMinutes` of group inactivity (default 60; `0` disables, `TOMO_SUMMON_EXPIRY_MINUTES` to override). Turn output stays in the owner's private DM — group-facing replies require an explicit `send_message` direct-mode call — so private context never auto-posts to the group. Summon state is persisted across daemon restarts, lapses lazily, and an audience-switch note is injected when a `dm:` session's inbound audience flips between private DM and a summoned group.
+- **Configurable continuity heartbeat.** The continuity heartbeat interval is no longer hardcoded and can be tuned via config.
+- **`pet_status` chat command** (#157). Surface the virtual pet's current state directly from chat.
+- **Message steering on by default** (#150). `steering` now defaults to on (`TOMO_STEERING=false` to opt out), and direct sends were cleaned up alongside it.
+
+### Bug fixes
+
+- **`/summon` no longer emits a spurious "expired — handed back" notice on re-summon** (#160). The "already summoned?" guard read (also used by `/status` and `/dismiss`) lazily expired a lapsed summon and fired the group-facing handback notice, so re-summoning a group whose previous summon had gone stale posted a contradictory pair of messages. The handback notice now fires only on the real group-message routing path; guard reads still clear the `dm:` session's stale "summoned" context, but silently.
+- **Session timeout recovery and LCM typing fixes** (#155).
+- **iMessage typing-indicator lifecycle fix** (#154). The typing indicator is started and cleared correctly across the message lifecycle.
+- **`send_message` MEDIA/STICKER tag parsing in direct mode** (#147). Attachment tags are now parsed in direct sends, with regression coverage.
+- **Virtual pet hunger pacing tuned** (#149).
+
+### Other
+
+- Internal refactor: extracted inbound batching and chat-command handling out of the `Agent` class (#145).
+- Bump `@anthropic-ai/claude-agent-sdk` `0.3.168` → `0.3.177` → `0.3.181` (#159, #153).
+- Bump dev-dependencies group (#152).
+
+## 0.8.3 (2026-06-11)
+
+### Features
+
+- **Message steering** (#142). New optional `steering` config (`TOMO_STEERING=false` to opt out, default on) lets user messages that arrive during an in-flight tool-using turn bypass the per-session queue and inject at the next tool-call boundary. If the current turn has no boundary left, the message runs as the next follow-up turn. Cron, continuity, and other system-originated turns continue to queue normally.
+
+### Bug fixes
+
+- **Six high-severity fixes from a codebase review** (#140):
+  - Fresh installs no longer crash on every CLI command (including `tomo init` and `--help`) when no channel is configured — channel validation moved from config load to daemon startup, and `tomo start` now validates before spawning the background child instead of printing "started" while the daemon silently dies.
+  - The iMessage webhook server binds `127.0.0.1` instead of all interfaces and caps request bodies at 1 MB; the webhook is also registered as the literal `127.0.0.1` (BlueBubbles could resolve `localhost` to `::1` and get connection refused), with stale `localhost`-form registrations from earlier versions cleaned up on upgrade.
+  - The cron scheduler no longer re-fires a due job on every 30s poll while a long agent run is still in flight (re-entrancy guard on `tick()`), and tick errors are caught instead of becoming unhandled rejections.
+  - Telegram streaming no longer silently drops content when a send/edit fails: progress is only advanced on success, the final flush retries with backoff, blocks over 4096 chars roll over into a new message, and `send()` chunks long text like iMessage does.
+  - `tomo backup restore` no longer deletes the preserved `.claude` directory along with the workspace tree; the backup's custom skills are merged in without overwriting live ones.
+  - The LCM compact nudge goes through the per-session queue instead of a fire-and-forget run that could overlap the next user message.
+- **Multi-process race and atomic-write fixes** (#141). The daemon and CLI commands (`tomo cron add`, `tomo sessions clear`, `tomo config`, `tomo lcm prune-tools`) mutate the same files and could clobber each other:
+  - `SessionStore` registry mutators and list APIs reload from disk before acting, so CLI-side changes are no longer reverted by the daemon's next stale save.
+  - `CronStore.markRun`/`remove` reload before saving, so a job added while the daemon executes another job is no longer silently deleted.
+  - The MCP OAuth token store, pet store, and SDK session repair now write atomically (temp + rename) — a crash mid-write previously left truncated JSON that could permanently discard every MCP server's refresh token.
+  - `tomo lcm prune-tools` rewrites the live SDK JSONL with the same concurrent-append-safe machinery as compaction, instead of a plain read/write that could truncate events the SDK was appending mid-prune.
+
+### Other
+
+- Raise minimum Node version to 22.12 (#139).
+- Internal cleanup: extracted shared `fs-utils`, `jsonl`, and session-key helpers (#138).
+- Bump `commander` 14.0.3 → 15.0.0 (#123).
 
 ## 0.8.2 (2026-06-08)
 

package/README.md

@@ -31,7 +31,7 @@ That's it. Open Telegram and message your bot.
 
 ## Requirements
 
-- Node.js 22+
+- Node.js 22.12+
 - [Claude Code](https://claude.com/claude-code) installed. Authenticate Claude Code for direct Claude models, or configure a LiteLLM gateway for non-Claude backends.
 - At least one channel:
   - **Telegram** — bot token from [@BotFather](https://t.me/BotFather)
@@ -61,6 +61,7 @@ tomo sessions clear    # Reset all sessions
 | `/model` | Switch model (Claude aliases or LiteLLM `provider/model` names) |
 | `/restore` | Restore `config.json` from `config.json.bak` and restart |
 | `/status` | Show session info (model, channel, message count) |
+| `/pet` | Check Tomo's pet's mood, growth stage, and stats |
 
 ## Features
 
@@ -226,6 +227,7 @@ Run `tomo config` for interactive setup, or edit `~/.tomo/config.json` directly:
   "maxTurns": 50,
   "saveInboundImages": true,
   "continuity": true,
+  "continuityIntervalMinutes": 55,
   "continuityScript": {
     "path": "~/bin/tomo-continuity.sh",
     "timeoutMs": 30000,
@@ -246,12 +248,16 @@ Environment variables override config file values:
 |----------|-------------|
 | `TELEGRAM_BOT_TOKEN` | Override Telegram token |
 | `IMESSAGE_URL` | Override BlueBubbles URL |
+| `IMESSAGE_TYPING_START_DELAY_MS` | Delay before showing iMessage typing for ordinary turns (default: `1200`) |
+| `IMESSAGE_PASSIVE_TYPING_START_DELAY_MS` | Delay before showing iMessage typing for passive iMessage group turns (default: `4000`) |
 | `CLAUDE_MODEL` | Override model |
 | `TOMO_LITELLM_BASE_URL` | Route Claude Agent SDK model calls through a LiteLLM proxy |
 | `TOMO_LITELLM_API_KEY` | API key sent to the LiteLLM proxy as `ANTHROPIC_API_KEY` |
 | `TOMO_LITELLM_MODE` | Optional LiteLLM mode: `anthropic-compatible` or `chatgpt-subscription` |
 | `TOMO_WORKSPACE` | Override workspace directory |
 | `TOMO_MAX_TURNS` | Override per-turn tool-use ceiling (default: `50`) |
+| `TOMO_STEERING` | Override message steering. Defaults to `true`; set `false` to keep mid-turn messages queued. |
+| `TOMO_CONTINUITY_INTERVAL_MINUTES` | Override scheduled continuity heartbeat interval (default: `55`, minimum: `1`) |
 | `TOMO_CONTINUITY_SCRIPT` | Override the optional continuity script path |
 | `TOMO_CONTINUITY_SCRIPT_TIMEOUT_MS` | Override continuity script timeout (default: `30000`) |
 | `TOMO_CONTINUITY_SCRIPT_MAX_OUTPUT_CHARS` | Override continuity script stdout/stderr cap (default: `8000`) |
@@ -259,6 +265,10 @@ Environment variables override config file values:
 
 `continuityScript` can also be a simple path string, e.g. `"continuityScript": "~/bin/tomo-continuity.sh"`. Relative paths resolve under `~/.tomo`; the script runs once per scheduled heartbeat and manual `tomo continuity` trigger, and its stdout/stderr or failure status is appended to the normal continuity prompt.
 
+### Steering
+
+By default, messages you send while Tomo is mid-task are steered into the in-flight turn at the next tool-call boundary — so "stop", "wait", or extra context reaches the model immediately instead of waiting for the current turn to finish. If the turn has no tool calls left, the message runs as its own follow-up turn right after. iMessage fragment settling still applies before injection; system-originated turns (cron, continuity) keep their normal queued behavior. Set `"steering": false` or `TOMO_STEERING=false` to keep mid-turn messages queued behind the active turn.
+
 ### LiteLLM / ChatGPT Subscription Models
 
 Tomo still runs through Claude Agent SDK, but you can point the SDK at a local LiteLLM proxy and select a LiteLLM model name such as `chatgpt/gpt-5.5`. This keeps Tomo's Claude SDK sessions, memory, workspace, MCP tools, and LCM behavior while LiteLLM translates Anthropic `/v1/messages` streaming calls to the ChatGPT subscription backend.

package/defaults/AGENT.md

@@ -24,3 +24,16 @@ Call `list_sessions` first if you're unsure which group to address. For normal i
 You also have `rename_group_chat` for changing the real title of a Telegram or iMessage group. Only use it when the user explicitly asks to rename a group, and pass a group session key from `list_sessions`.
 
 You also have `react_to_latest_message` for reacting/tapbacking to the latest inbound message Tomo has seen in a session. Latest-message state is in-memory since startup; if the tool says none is known, wait for a new inbound message. Usually pass the current Session key.
+
+## Summoned Groups
+
+The user can run `/summon` in a group chat to temporarily route that group's messages into this session (until `/dismiss`, or automatically after a period of group inactivity). Summoned messages arrive tagged like `[group "Title"] Sender: ...`.
+
+How to reply to a summoned group message:
+
+- **To the group**: call `send_message` with the group's session key and mode `direct`. Compose the message yourself — you are the session with the context. Never use `delegate` for a summoned group; that wakes the group's own session, which is exactly what summoning bypasses.
+- **To the user privately**: plain text replies in a summoned turn go to the user's private DM, not the group. Use that only for side-notes worth telling them privately; otherwise end the turn with `NO_REPLY`.
+- Match the group's tone and reply like a participant — short, no headers, address people by name when natural. Not every message needs a group reply; stay silent (`NO_REPLY`, no tool call) for chatter that isn't for you.
+- The harness flags audience changes (`[System: audience switched ...]`) whenever consecutive messages hop between the private DM and a group, or between groups. Treat that as a hard reset of tone and privacy — trust the tags over conversational momentum.
+
+Everyone in the group can read what you send it. Keep private memories and DM context out of group-facing messages — being summoned shares your judgment and knowledge, not the user's private life.

package/defaults/CONTINUITY.md

@@ -4,7 +4,7 @@ Read this file when a continuity heartbeat fires. This is your guide for free ti
 
 ## What is this?
 
-The system sends you a heartbeat every ~55 minutes. This is not a user message — it's the harness giving you unstructured time. Use it however you want.
+By default, the system sends you a heartbeat every ~55 minutes. This is not a user message — it's the harness giving you unstructured time. Use it however you want.
 
 ## Ideas for free time
 

package/defaults/skills/system/CONFIG.md

@@ -11,6 +11,7 @@ Before direct edits, copy `~/.tomo/config.json` to `~/.tomo/config.json.bak`. Ch
   "model": "claude-sonnet-4-6[1m]",
   "city": "Seattle",
   "continuity": false,
+  "continuityIntervalMinutes": 55,
   "continuityScript": {
     "path": "~/bin/tomo-continuity.sh",
     "timeoutMs": 30000,
@@ -79,6 +80,7 @@ Before direct edits, copy `~/.tomo/config.json` to `~/.tomo/config.json.bak`. Ch
 | `model` | string | Claude model IDs/aliases, or a LiteLLM `provider/model` name such as `chatgpt/gpt-5.5`. Default model for every session. |
 | `city` | string \| null | Any city name (e.g. `"Seattle"`). Used for weather in continuity pings. `null` or missing = no weather. |
 | `continuity` | boolean | `true` / `false`. Enables periodic proactive heartbeats. Off by default. |
+| `continuityIntervalMinutes` | number | Optional. Minutes between scheduled continuity heartbeats. Default `55`; minimum `1`. Ignored for manual `tomo continuity` triggers. |
 | `continuityScript` | string \| object \| null | Optional script run once per scheduled continuity heartbeat and manual `tomo continuity` trigger before the prompt is sent to Tomo. Use a string path (`"~/bin/tomo-continuity.sh"`) or `{ "path": "...", "timeoutMs": 30000, "maxOutputChars": 8000 }`. Relative paths resolve under `~/.tomo`; `~`, `$VAR`, and `${VAR}` expand. The script runs as the Tomo OS user with `TOMO_CONTINUITY=true`; stdout/stderr are appended to the heartbeat prompt and capped separately by `maxOutputChars`. Non-zero exits, missing files, and timeouts are passed to Tomo as script status instead of aborting the heartbeat. |
 | `groupSecret` | string \| null | Passphrase users send in a group chat to activate Tomo there. `null` disables group chats entirely. |
 | `channels.telegram.token` | string | BotFather token (`123456:...`). Required to enable the Telegram channel. |
@@ -96,6 +98,7 @@ Before direct edits, copy `~/.tomo/config.json` to `~/.tomo/config.json.bak`. Ch
 | `litellm.baseUrl` | string | Optional LiteLLM proxy base URL, e.g. `http://localhost:4000`. When set, Tomo still uses Claude Agent SDK but sends SDK model calls to the proxy via `ANTHROPIC_BASE_URL`. |
 | `litellm.apiKey` | string | LiteLLM proxy key sent as `ANTHROPIC_API_KEY`. This is the proxy key, not an Anthropic key. For ChatGPT subscription models, LiteLLM owns the OAuth device flow and token storage. |
 | `maxTurns` | number | Max agent turns per single user message (one turn ≈ one tool-use round). Default `50`. Raise if you see "max turns exceeded" on long tool chains. |
+| `steering` | boolean | Optional. Default `true`. User messages that arrive while a turn is in flight bypass the per-session queue and are injected at the next tool-call boundary. If the current turn has no boundary left, the message runs as a follow-up turn. Cron, continuity, and other system-originated turns still queue normally. Set `false` or `TOMO_STEERING=false` to keep mid-turn messages queued behind the active turn. |
 | `mcpServers` | object | External MCP servers keyed by server name. Supports stdio (`command`, `args`, `env`), HTTP (`type: "http"`, `url`, `headers`), and SSE (`type: "sse"`, `url`, `headers`). Environment variables like `${HOME}` expand in `url`, `headers`, `env`, and `args`. |
 | `mcpServers.<name>.oauth` | object | Optional harness-managed OAuth for HTTP/SSE MCP servers. Supports `authorizationServer` (optional; omitted = discover from the MCP server), `clientId` (optional if dynamic registration is available), `scopes`, `tokenStoreKey`, `redirectUri`, and `clientName`. Tokens are stored outside agent context in `workspace/secrets/mcp-oauth.json` (`0600`). |
 | `mcpAllowedTools` | string[] | Auto-allowed external MCP tools. If omitted, Tomo defaults to `mcp__<server>__*` for every configured external server. Set this to narrow tool access, e.g. `["mcp__github__list_issues"]`. |
@@ -132,5 +135,5 @@ Start it with `litellm --config ~/litellm-chatgpt.yaml`, then set Tomo's model t
 ## Requirements and overrides
 
 - **At least one channel must be configured** — either `channels.telegram.token` or `channels.imessage.url`. Startup fails otherwise.
-- **Env vars override file values** where they exist: `TELEGRAM_BOT_TOKEN`, `IMESSAGE_URL`, `IMESSAGE_PASSWORD`, `IMESSAGE_WEBHOOK_PORT`, `CLAUDE_MODEL`, `TOMO_LITELLM_BASE_URL`, `TOMO_LITELLM_API_KEY`, `TOMO_LITELLM_MODE`, `TOMO_CITY`, `TOMO_CONTINUITY`, `TOMO_WORKSPACE`, `SESSIONS_DIR`, `HISTORY_LIMIT`, `TOMO_MAX_TURNS`.
+- **Env vars override file values** where they exist: `TELEGRAM_BOT_TOKEN`, `IMESSAGE_URL`, `IMESSAGE_PASSWORD`, `IMESSAGE_WEBHOOK_PORT`, `CLAUDE_MODEL`, `TOMO_LITELLM_BASE_URL`, `TOMO_LITELLM_API_KEY`, `TOMO_LITELLM_MODE`, `TOMO_CITY`, `TOMO_CONTINUITY`, `TOMO_CONTINUITY_INTERVAL_MINUTES`, `TOMO_WORKSPACE`, `SESSIONS_DIR`, `HISTORY_LIMIT`, `TOMO_MAX_TURNS`, `TOMO_STEERING`.
 - `workspaceDir`, `sessionsDir`, `historyLimit` are env-only — they're not read from the JSON file.

package/defaults/skills/system/SKILL.md

@@ -72,6 +72,9 @@ Before changing `~/.tomo/config.json` directly, copy the current file to `~/.tom
 ### Streaming
 Responses stream to Telegram in real-time — messages update every 1.5s as tokens arrive.
 
+### Message steering
+By default, user messages that arrive during a long tool-using turn are injected into the in-flight turn at the next tool-call boundary instead of waiting behind it. Use this to treat mid-task corrections like "stop", "wait", or added context as immediately relevant. If there is no remaining tool boundary, the message runs as the next follow-up turn. Cron, continuity, and other system-originated turns still queue normally. Set `steering: false` in `~/.tomo/config.json` to keep mid-turn user messages queued.
+
 ### MEDIA: tag
 To send an image/file to the user, include `MEDIA:/path/to/file.png` in your response. The harness strips it from text and sends the file. Text before/after becomes the caption.
 

package/dist/agent/audience.d.ts

@@ -0,0 +1,19 @@
+/** Audience identifier for an inbound message on a unified dm: session —
+ *  "dm" for private messages, the raw "<channel>:<chatId>" key for (summoned)
+ *  group messages. */
+export declare function audienceOf(channelName: string, message: {
+    isGroup?: boolean;
+    chatId: string;
+}): string;
+/**
+ * Note injected when a dm session's inbound audience changes (private DM ↔
+ * summoned group, or between two summoned groups). The per-message
+ * [group ...] tags say where each message came FROM; this says the audience
+ * CHANGED — the moment when tone or private context is most likely to be
+ * carried across by mistake. Returns "" when nothing changed.
+ *
+ * `audiences` lists this turn's inbound audiences in order (one entry for a
+ * single message; several for a coalesced batch, which can mix audiences).
+ */
+export declare function audienceSwitchNote(prev: string | undefined, audiences: string[], label: (audience: string) => string): string;
+//# sourceMappingURL=audience.d.ts.map

package/dist/agent/audience.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"audience.d.ts","sourceRoot":"","sources":["../../src/agent/audience.ts"],"names":[],"mappings":"AAAA;;sBAEsB;AACtB,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAEtG;AAED;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,SAAS,EAAE,MAAM,EAAE,EACnB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,GAClC,MAAM,CAQR"}

package/dist/agent/audience.js

@@ -0,0 +1,28 @@
+/** Audience identifier for an inbound message on a unified dm: session —
+ *  "dm" for private messages, the raw "<channel>:<chatId>" key for (summoned)
+ *  group messages. */
+export function audienceOf(channelName, message) {
+    return message.isGroup ? `${channelName}:${message.chatId}` : "dm";
+}
+/**
+ * Note injected when a dm session's inbound audience changes (private DM ↔
+ * summoned group, or between two summoned groups). The per-message
+ * [group ...] tags say where each message came FROM; this says the audience
+ * CHANGED — the moment when tone or private context is most likely to be
+ * carried across by mistake. Returns "" when nothing changed.
+ *
+ * `audiences` lists this turn's inbound audiences in order (one entry for a
+ * single message; several for a coalesced batch, which can mix audiences).
+ */
+export function audienceSwitchNote(prev, audiences, label) {
+    if (audiences.length === 0)
+        return "";
+    const distinct = [...new Set(audiences)];
+    if (distinct.length > 1) {
+        return `[System: audience check — the messages below span ${distinct.map(label).join(" and ")}. Mind each message's tag when replying; group replies only via send_message.]`;
+    }
+    if (prev === undefined || distinct[0] === prev)
+        return "";
+    return `[System: audience switched — the previous message in this session was from ${label(prev)}; this one is from ${label(distinct[0])}. Re-anchor tone and privacy to the new audience.]`;
+}
+//# sourceMappingURL=audience.js.map

package/dist/agent/audience.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"audience.js","sourceRoot":"","sources":["../../src/agent/audience.ts"],"names":[],"mappings":"AAAA;;sBAEsB;AACtB,MAAM,UAAU,UAAU,CAAC,WAAmB,EAAE,OAA8C;IAC5F,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,WAAW,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AACrE,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,kBAAkB,CAChC,IAAwB,EACxB,SAAmB,EACnB,KAAmC;IAEnC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACtC,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IACzC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,OAAO,qDAAqD,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,gFAAgF,CAAC;IAChL,CAAC;IACD,IAAI,IAAI,KAAK,SAAS,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI;QAAE,OAAO,EAAE,CAAC;IAC1D,OAAO,8EAA8E,KAAK,CAAC,IAAI,CAAC,sBAAsB,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,oDAAoD,CAAC;AAC/L,CAAC"}

package/dist/agent/commands.d.ts

@@ -0,0 +1,36 @@
+import type { Channel } from "../channels/types.js";
+import type { IdentityRouter } from "../router.js";
+import type { SessionStore } from "../sessions/index.js";
+/** Back up ~/.tomo/config.json before a programmatic rewrite. */
+export declare function backupConfigFile(): void;
+export interface ChatCommandDeps {
+    router: IdentityRouter;
+    sessions: SessionStore;
+    /** Shared with the Agent — per-session model overrides read at session create time. */
+    modelOverrides: Map<string, string>;
+    closeLiveSession(key: string): void;
+    isSessionLive(key: string): boolean;
+    queuePendingNote(sessionKey: string, note: string): void;
+}
+/**
+ * Handles slash commands typed in chat (/new, /model, /status, /pet, /restore).
+ * Wired to Channel.onCommand by the Agent.
+ */
+export declare class ChatCommandHandler {
+    private readonly deps;
+    private restoringConfig;
+    constructor(deps: ChatCommandDeps);
+    /** True once /restore has begun — the Agent drops inbound messages until restart. */
+    get isRestoring(): boolean;
+    handle(channel: Channel, command: string, chatId: string, senderName: string, args?: string, senderId?: string): Promise<void>;
+    /**
+     * /summon pulls the owner's main dm: session into a group: subsequent group
+     * messages run on the dm session (full personal context) while turn output
+     * still goes to the owner's private DM. Group-facing replies require an
+     * explicit send_message direct tool call to the raw group session key.
+     */
+    private handleSummonCommand;
+    private persistModelOverride;
+    private restoreConfigAndRestart;
+}
+//# sourceMappingURL=commands.d.ts.map

package/dist/agent/commands.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/agent/commands.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAYzD,iEAAiE;AACjE,wBAAgB,gBAAgB,IAAI,IAAI,CAGvC;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,cAAc,CAAC;IACvB,QAAQ,EAAE,YAAY,CAAC;IACvB,uFAAuF;IACvF,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IACpC,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1D;AAED;;;GAGG;AACH,qBAAa,kBAAkB;IAGjB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAFjC,OAAO,CAAC,eAAe,CAAS;gBAEH,IAAI,EAAE,eAAe;IAElD,qFAAqF;IACrF,IAAI,WAAW,IAAI,OAAO,CAEzB;IAEK,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwJpI;;;;;OAKG;YACW,mBAAmB;IA8DjC,OAAO,CAAC,oBAAoB;YAed,uBAAuB;CAoCtC"}

package/dist/agent/commands.js

@@ -0,0 +1,260 @@
+import { spawn } from "node:child_process";
+import { copyFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { config, CONFIG_BACKUP_PATH, CONFIG_PATH, RESTART_REASON_FILE } from "../config.js";
+import { backupFileIfExistsSync, writeJsonAtomicSync } from "../fs-utils.js";
+import { isGroupSessionKey } from "../sessions/keys.js";
+import { MODEL_ALIASES, isLiteLlmProviderModel, modelHelpText, resolveModelName } from "../models.js";
+import { CHATGPT_SUBSCRIPTION_DEFAULT_MODEL, CHATGPT_SUBSCRIPTION_MODE, isChatGptSubscriptionModel, liteLlmModeLabel, } from "../litellm.js";
+import { log } from "../logger.js";
+import { PetStore } from "../mcp/pet-store.js";
+/** Back up ~/.tomo/config.json before a programmatic rewrite. */
+export function backupConfigFile() {
+    mkdirSync(dirname(CONFIG_BACKUP_PATH), { recursive: true });
+    backupFileIfExistsSync(CONFIG_PATH, CONFIG_BACKUP_PATH);
+}
+/**
+ * Handles slash commands typed in chat (/new, /model, /status, /pet, /restore).
+ * Wired to Channel.onCommand by the Agent.
+ */
+export class ChatCommandHandler {
+    deps;
+    restoringConfig = false;
+    constructor(deps) {
+        this.deps = deps;
+    }
+    /** True once /restore has begun — the Agent drops inbound messages until restart. */
+    get isRestoring() {
+        return this.restoringConfig;
+    }
+    async handle(channel, command, chatId, senderName, args, senderId) {
+        const { sessionKey: key } = this.deps.router.resolve(channel.name, chatId, false);
+        if (this.restoringConfig) {
+            await channel.send({ chatId, text: "Restore is already in progress. Restarting Tomo..." });
+            return;
+        }
+        if (command === "summon" || command === "dismiss") {
+            await this.handleSummonCommand(channel, command, chatId, senderName, senderId);
+            return;
+        }
+        if (command === "new") {
+            this.deps.closeLiveSession(key);
+            this.deps.sessions.clearSdkSessionId(key);
+            log.info({ channel: channel.name, chatId, sender: senderName }, "New session started via /new");
+            await channel.send({ chatId, text: "New session started." });
+            return;
+        }
+        if (command === "model") {
+            const arg = args?.trim();
+            if (!arg) {
+                const current = this.deps.modelOverrides.get(key) ?? config.model;
+                const lines = [`Current: ${current}`, "", "Switch with: /model <name>", ""];
+                for (const [shortName, fullName] of Object.entries(MODEL_ALIASES)) {
+                    const marker = fullName === current ? " (active)" : "";
+                    lines.push(`  ${shortName} — ${fullName}${marker}`);
+                }
+                if (config.litellm?.baseUrl) {
+                    lines.push("");
+                    lines.push(`LiteLLM gateway models are also accepted, e.g. ${CHATGPT_SUBSCRIPTION_DEFAULT_MODEL}`);
+                }
+                await channel.send({ chatId, text: lines.join("\n") });
+                return;
+            }
+            const resolved = resolveModelName(arg);
+            if (!resolved) {
+                await channel.send({ chatId, text: `Unknown model "${arg}". Use ${modelHelpText()}.` });
+                return;
+            }
+            if (isLiteLlmProviderModel(resolved)) {
+                if (!config.litellm?.baseUrl) {
+                    await channel.send({
+                        chatId,
+                        text: `"${resolved}" needs a LiteLLM gateway. Run \`tomo config\` → LiteLLM gateway to set one up first.`,
+                    });
+                    return;
+                }
+                if (config.litellm.mode === CHATGPT_SUBSCRIPTION_MODE && !isChatGptSubscriptionModel(resolved)) {
+                    await channel.send({
+                        chatId,
+                        text: `The configured ChatGPT subscription gateway only routes chatgpt/* models, e.g. ${CHATGPT_SUBSCRIPTION_DEFAULT_MODEL}.`,
+                    });
+                    return;
+                }
+            }
+            this.deps.modelOverrides.set(key, resolved);
+            this.persistModelOverride(key, resolved);
+            // Model changes require a fresh SDK child process, but keep the SDK
+            // session ID so continuity survives switching between Claude and LiteLLM.
+            // getOrCreateLiveSession repairs provider-specific JSONL quirks before
+            // resuming.
+            this.deps.closeLiveSession(key);
+            log.info({ channel: channel.name, chatId, model: resolved }, "Model switched via /model");
+            await channel.send({ chatId, text: `Switched to ${resolved}` });
+            return;
+        }
+        if (command === "restore") {
+            await this.restoreConfigAndRestart(channel, chatId);
+            return;
+        }
+        if (command === "pet") {
+            const store = new PetStore(join(config.tomoHome, "data", "pet.json"));
+            let pet = store.load();
+            if (!pet) {
+                await channel.send({ chatId, text: "Tomo doesn't have a pet yet. Ask Tomo to hatch one!" });
+                return;
+            }
+            pet = store.tick(pet);
+            store.save(pet);
+            const ageDays = Math.max(0, Math.floor((Date.now() - new Date(pet.born_at).getTime()) / (24 * 60 * 60 * 1000)));
+            const dayLabel = ageDays === 1 ? "day" : "days";
+            const lines = [
+                `🐾 ${pet.name} the ${pet.species}`,
+                `Stage: ${pet.stage} · Age: ${ageDays} ${dayLabel} · Mood: ${store.computeMood(pet)}`,
+                `Hunger: ${Math.round(pet.hunger)}/100 · Happiness: ${Math.round(pet.happiness)}/100`,
+                `Energy: ${Math.round(pet.energy)}/100 · Health: ${Math.round(pet.health)}/100`,
+                `Bond: ${store.effectiveAffection(pet)} · Care mistakes: ${pet.care_mistakes}`,
+            ];
+            if (pet.sleeping && pet.sleep_until) {
+                lines.push(`Sleeping until: ${new Date(pet.sleep_until).toLocaleString()}`);
+            }
+            else if (pet.recovering) {
+                lines.push("Recovering: yes");
+            }
+            await channel.send({ chatId, text: lines.join("\n") });
+            return;
+        }
+        if (command === "status") {
+            const model = this.deps.modelOverrides.get(key) ?? config.model;
+            const session = this.deps.sessions.get(key);
+            const entry = this.deps.sessions.getEntry(key);
+            const lines = [];
+            lines.push(`Session: ${key}`);
+            lines.push(`Channel: ${channel.name}`);
+            const summoned = this.deps.router.getSummonedIdentity(channel.name, chatId);
+            if (summoned)
+                lines.push(`Summoned: messages route to dm:${summoned} (/dismiss to hand back)`);
+            lines.push(`Model: ${model}`);
+            if (config.litellm?.baseUrl) {
+                lines.push(`Gateway: LiteLLM (${liteLlmModeLabel(config.litellm.mode)})`);
+            }
+            lines.push(`Live: ${this.deps.isSessionLive(key) ? "yes" : "no"}`);
+            const msgCount = session.messages.filter((m) => m.role === "user").length;
+            lines.push(`Messages: ${msgCount} user turns`);
+            if (session.createdAt) {
+                lines.push(`Created: ${new Date(session.createdAt).toLocaleString()}`);
+            }
+            if (session.updatedAt) {
+                lines.push(`Last active: ${new Date(session.updatedAt).toLocaleString()}`);
+            }
+            if (entry?.stats) {
+                const s = entry.stats;
+                lines.push("");
+                lines.push(`Queries: ${s.totalQueries}`);
+                lines.push(`Cost: $${s.totalCostUsd.toFixed(4)}`);
+                lines.push(`Tokens: ${s.totalInputTokens.toLocaleString()} in / ${s.totalOutputTokens.toLocaleString()} out`);
+                if (s.contextMax > 0) {
+                    const pct = ((s.contextUsed / s.contextMax) * 100).toFixed(0);
+                    lines.push(`Context: ${pct}% (${s.contextUsed.toLocaleString()} / ${s.contextMax.toLocaleString()})`);
+                }
+            }
+            await channel.send({ chatId, text: lines.join("\n") });
+            return;
+        }
+    }
+    /**
+     * /summon pulls the owner's main dm: session into a group: subsequent group
+     * messages run on the dm session (full personal context) while turn output
+     * still goes to the owner's private DM. Group-facing replies require an
+     * explicit send_message direct tool call to the raw group session key.
+     */
+    async handleSummonCommand(channel, command, chatId, senderName, senderId) {
+        const rawKey = `${channel.name}:${chatId}`;
+        if (!isGroupSessionKey(rawKey)) {
+            await channel.send({ chatId, text: `/${command} only works in group chats.` });
+            return;
+        }
+        if (!this.deps.router.isAllowed(channel.name, chatId)) {
+            log.debug({ channel: channel.name, chatId }, `/${command} blocked (group not in allowlist)`);
+            return;
+        }
+        const groupLabel = this.deps.sessions.getEntry(rawKey)?.chatTitle ?? rawKey;
+        if (command === "dismiss") {
+            const summoned = this.deps.router.getSummonedIdentity(channel.name, chatId);
+            if (!summoned) {
+                await channel.send({ chatId, text: "No main session is summoned here." });
+                return;
+            }
+            this.deps.router.dismissGroup(channel.name, chatId);
+            this.deps.queuePendingNote(`dm:${summoned}`, `[System: You have been dismissed from the group "${groupLabel}" — its messages no longer reach this session, and the group's own Tomo session has taken back over.]`);
+            await channel.send({ chatId, text: "Handed back to this group's own Tomo session." });
+            return;
+        }
+        const identity = senderId ? this.deps.router.identityForSender(channel.name, senderId) : undefined;
+        if (!identity) {
+            log.info({ channel: channel.name, chatId, sender: senderName }, "/summon refused (sender is not a configured identity)");
+            await channel.send({ chatId, text: "Only the owner of a configured identity can summon their main session." });
+            return;
+        }
+        const already = this.deps.router.getSummonedIdentity(channel.name, chatId);
+        if (already) {
+            await channel.send({ chatId, text: `Main session dm:${already} is already summoned here. /dismiss first to hand back.` });
+            return;
+        }
+        this.deps.router.summonGroup(channel.name, chatId, identity.name);
+        const expiryNote = config.summonExpiryMinutes > 0
+            ? ` or after ${config.summonExpiryMinutes} minutes of group inactivity`
+            : "";
+        this.deps.queuePendingNote(`dm:${identity.name.toLowerCase()}`, `[System: ${identity.name} summoned you into the group chat "${groupLabel}" (${rawKey}). Until dismissed${expiryNote}, messages from that group arrive in this session tagged [group ...] with the sender's name. To reply in the group, call send_message with mode "direct" and target "${rawKey}" — compose the reply yourself, with your context. Plain text you output goes to ${identity.name}'s private DM, not the group. Everyone in the group can read what you send it — keep private memory and DM context out of group-facing messages.]`);
+        log.info({ channel: channel.name, chatId, identity: identity.name, sender: senderName }, "Group summoned via /summon");
+        await channel.send({
+            chatId,
+            text: `${identity.name}'s main Tomo session is now handling this group. /dismiss hands back to the group's own session${expiryNote ? `; it also hands back automatically after ${config.summonExpiryMinutes}m of inactivity` : ""}.`,
+        });
+    }
+    persistModelOverride(key, model) {
+        config.sessionModelOverrides[key] = model;
+        const cfg = existsSync(CONFIG_PATH)
+            ? JSON.parse(readFileSync(CONFIG_PATH, "utf-8"))
+            : {};
+        const overrides = (cfg.sessionModelOverrides ?? {});
+        overrides[key] = model;
+        cfg.sessionModelOverrides = overrides;
+        mkdirSync(dirname(CONFIG_PATH), { recursive: true });
+        backupConfigFile();
+        writeJsonAtomicSync(CONFIG_PATH, cfg);
+    }
+    async restoreConfigAndRestart(channel, chatId) {
+        if (!existsSync(CONFIG_BACKUP_PATH)) {
+            await channel.send({ chatId, text: "No config backup found at ~/.tomo/config.json.bak." });
+            return;
+        }
+        try {
+            mkdirSync(dirname(CONFIG_PATH), { recursive: true });
+            copyFileSync(CONFIG_BACKUP_PATH, CONFIG_PATH);
+            const reason = "Restored ~/.tomo/config.json from ~/.tomo/config.json.bak";
+            mkdirSync(dirname(RESTART_REASON_FILE), { recursive: true });
+            writeFileSync(RESTART_REASON_FILE, reason, "utf-8");
+            this.restoringConfig = true;
+            await channel.send({ chatId, text: "Restored config.json from config.json.bak. Restarting Tomo..." });
+            if (process.env.NODE_ENV === "test")
+                return;
+            setTimeout(() => {
+                const cli = process.argv[1];
+                if (!cli) {
+                    process.kill(process.pid, "SIGTERM");
+                    return;
+                }
+                const child = spawn(process.execPath, [cli, "restart"], {
+                    detached: true,
+                    stdio: "ignore",
+                });
+                child.unref();
+            }, 100);
+        }
+        catch (err) {
+            const detail = err instanceof Error ? err.message : String(err);
+            await channel.send({ chatId, text: `[error] restore failed: ${detail}` });
+        }
+    }
+}
+//# sourceMappingURL=commands.js.map

package/dist/agent/commands.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/agent/commands.ts"],"names":[],"mappings":"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"}

package/dist/agent/inbound-batcher.d.ts

@@ -0,0 +1,54 @@
+import type { Channel, IncomingMessage } from "../channels/types.js";
+import type { SessionResolution } from "../router.js";
+export interface InboundItem {
+    channel: Channel;
+    message: IncomingMessage;
+    /** Resolution captured at receipt time so delayed batches cannot re-route. */
+    resolution: SessionResolution;
+}
+/**
+ * The narrow surface the batcher needs from the Agent. Kept minimal so the
+ * settle/coalesce state machine can be unit-tested without a full Agent.
+ */
+export interface InboundBatcherHost {
+    /** Serialize a task on the session's FIFO queue (all ingress paths share it). */
+    enqueueForSession(sessionKey: string, task: () => Promise<void>): Promise<unknown>;
+    /** Hand a drained batch (1+ messages) to the turn pipeline. */
+    processInboundItems(items: InboundItem[], steer?: boolean): Promise<void>;
+    /** Is a live turn currently in flight on this session? (steering target check) */
+    hasBusyLiveSession(sessionKey: string): boolean;
+}
+/**
+ * Per-session inbound message batching. Messages that pile up behind an
+ * in-flight turn are merged into a single follow-up turn so the agent sees
+ * them together (e.g. "do X" → "wait" → "nevermind" all become one prompt).
+ * iMessage additionally gets a settle window so provider-side fragments
+ * coalesce before they reach the model.
+ */
+export declare class InboundBatcher {
+    private readonly host;
+    private pendingBatches;
+    private pendingBatchSettleUntil;
+    private pendingBatchSettleStartedAt;
+    private pendingBatchDrainScheduled;
+    private lastImessageReceiptAt;
+    constructor(host: InboundBatcherHost);
+    /**
+     * Queue a message for its session. For DMs and passive groups
+     * (`canCoalesce`), messages that arrive in quick succession are coalesced
+     * into one turn. Mention-required groups bypass coalescing because
+     * per-message mention filtering would be lost.
+     *
+     * Fire-and-forget: returns as soon as the message is queued, NOT when the
+     * SDK turn completes. If a caller (e.g. a channel adapter) awaits this,
+     * that's fine — they don't block the next ingress on an in-flight turn,
+     * which is what lets rapid messages pile up for the queue to coalesce.
+     */
+    enqueue(sessionKey: string, channel: Channel, message: IncomingMessage, canCoalesce: boolean, resolution: SessionResolution): void;
+    private settleMs;
+    private maxSettleMs;
+    private logImessageReceipt;
+    private waitForBatchSettle;
+    private drainPendingBatch;
+}
+//# sourceMappingURL=inbound-batcher.d.ts.map

package/dist/agent/inbound-batcher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inbound-batcher.d.ts","sourceRoot":"","sources":["../../src/agent/inbound-batcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtD,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,eAAe,CAAC;IACzB,8EAA8E;IAC9E,UAAU,EAAE,iBAAiB,CAAC;CAC/B;AAED;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,iFAAiF;IACjF,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACnF,+DAA+D;IAC/D,mBAAmB,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,kFAAkF;IAClF,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;CACjD;AAED;;;;;;GAMG;AACH,qBAAa,cAAc;IASb,OAAO,CAAC,QAAQ,CAAC,IAAI;IANjC,OAAO,CAAC,cAAc,CAAoC;IAC1D,OAAO,CAAC,uBAAuB,CAA6B;IAC5D,OAAO,CAAC,2BAA2B,CAA6B;IAChE,OAAO,CAAC,0BAA0B,CAAqB;IACvD,OAAO,CAAC,qBAAqB,CAA6B;gBAE7B,IAAI,EAAE,kBAAkB;IAErD;;;;;;;;;;OAUG;IACH,OAAO,CACL,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,OAAO,EACpB,UAAU,EAAE,iBAAiB,GAC5B,IAAI;IA2DP,OAAO,CAAC,QAAQ;IAMhB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,kBAAkB;YA0BZ,kBAAkB;YAYlB,iBAAiB;CAyBhC"}