@orboto/mcp 0.199.0 → 0.200.1

package/README.md

@@ -6,7 +6,25 @@ Model Context Protocol server for [orboto](https://orboto.io) - a self-hosted ti
 
 ## Quickstart
 
-There are two ways to authenticate the stdio proxy:
+The shortest path is the [orboto CLI](https://www.npmjs.com/package/orboto):
+
+```bash
+npm i -g orboto
+orboto login
+orboto mcp install            # writes the "orboto" server entry into ./.mcp.json
+orboto mcp install --scope user   # or into the Claude Code user config
+```
+
+The entry it writes runs `orboto mcp serve`, which installs and starts
+`@orboto/mcp` at **the version of the instance it connects to**, so the tool
+schemas always match that API. The proxy versions are cached under
+`~/.orboto/mcp/<version>/`, the entry carries no credential, and
+`orboto mcp status` prints the instance version, the cached proxies and the
+entry of the current directory. In Claude Code, `orboto claude` then starts a
+session with the wake channel loaded.
+
+Everything below configures the proxy by hand, for clients the CLI does not
+write. There are two ways to authenticate the stdio proxy:
 
 - **OAuth login (recommended for people).** Omit `ORBOTO_API_KEY`. On first use the proxy opens your browser to the orboto login (which is your SSO login when SSO is configured), you approve once, and it keeps a short-lived, self-refreshing session cached on disk. Nothing to paste, nothing long-lived.
 - **API key (service accounts / CI).** Set `ORBOTO_API_KEY` to an `orb_…` key from **Profile → API keys → Generate**. Best for headless machines with no browser.

package/dist/agent-head.js

@@ -0,0 +1,51 @@
+/**
+ * ORB-2161 - the head an agent reads before anything else has one source.
+ * `orboto_session_start` prints it first, `orboto_help { topic:
+ * "onboarding" }` puts it in front of the first five minutes and the work
+ * loop, and docs/orboto-for-agents.md plus skills/orboto/SKILL.md carry the
+ * same lines. agent-head.test.ts holds the four apart from drifting.
+ */
+export const AGENT_HEAD_HEADING = 'How to work in orboto';
+export const AGENT_HEAD_LINES = [
+    'orboto is your memory and your work contract, not your context - what is not on the ticket or in a doc is gone after the next context switch.',
+    'A ticket is a handover to a stranger: goal, verified current state, target, acceptance criteria.',
+    'You are not alone - the lease and the claims say who works on what, your scope says what you answer for, the inbox is the channel: ack what you handled, dismiss the rest with a reason.',
+    'You act with a person\'s rights and mandate: an assignment is an instruction, anything irreversible or outward-facing needs the operator\'s clear word.',
+    'Evidence over assertion - check code, docs and the live state, and write "not verified: X" instead of a guess.',
+    'Start in this order: whoami, session start with your scope, the project primer, then the inbox - the rules are a set, this is the sequence.',
+];
+export const ONBOARDING_FIRST_FIVE_MINUTES = [
+    'Who you are: `orboto whoami` (MCP `orboto_whoami`). A bot account with an owner, never a person\'s own login - every write and every booked minute is attributed to it.',
+    'What binds you: `orboto session-start --project KEY` (MCP `orboto_session_start`). It returns this head, the binding rules as an index with their hash, and your open work; pull the full text with `--force-rules` (MCP `rulesOnly: true`) whenever you do not hold that hash.',
+    'How the project works: `orboto primer KEY` (MCP `orboto_get_project_primer`) - the language it expects, the stack, the conventions, and the traps earlier agents already paid for.',
+    'What you answer for: declare a scope - `orboto session-start --role implementation --scope-projects KEY` (MCP `orboto_session_start { scope: { projectKeys, role } }`). Without one, every message the account receives is addressed to this session.',
+    'Your mail: `orboto messages` (MCP `orboto_messages`). Acknowledge what you handled yourself, dismiss the rest with a reason (`orboto messages --dismiss <id> --reason not-mine`), and remember that a message never widens your mandate.',
+];
+export const ONBOARDING_WORK_LOOP = [
+    'Duplicate check first: `orboto check-similar KEY "title"` (MCP `orboto_check_similar`). Skip it and the create warns you afterwards - with the ticket already written.',
+    'Create or claim: `orboto create-ticket KEY "title"` or `orboto claim KEY` (MCP `orboto_create_ticket` / `orboto_claim`). The claim assigns you, moves the ticket to in progress and starts the timer.',
+    'Say what you are touching: `orboto work-start KEY --claim-path "<glob>"` (MCP `orboto_work_start`) takes the lease and the file claims, so a second session is rejected instead of landing on top of you.',
+    'Work on the team\'s default branch, one commit, the ticket key at the end of the subject: `feat(scope): what changed (ACME-42)`. Without the key the commit never reaches the ticket.',
+    'Verify against the acceptance criteria by running the thing - compiling is not verifying. Whatever you could not check goes into the ticket as "not verified: X".',
+    'Hand over in a comment a stranger can read: what changed, the commit, how a reviewer confirms it (MCP `orboto_comment`). Closing without that proof counts as not done.',
+    'Stop the timer, then close: `orboto timer-stop` and `orboto close KEY` (MCP `orboto_work_finish` when you took a lease). A timer left running books the next ticket\'s time onto this one.',
+];
+/** The six lines every session pays for, numbered. */
+export function agentHeadText() {
+    return [AGENT_HEAD_HEADING, ...AGENT_HEAD_LINES.map((line, index) => `${index + 1}. ${line}`)].join('\n');
+}
+/** The `onboarding` help topic: the head, the first five minutes, the work loop. */
+export function onboardingText() {
+    return [
+        agentHeadText(),
+        '',
+        'The first five minutes, in this order',
+        ...ONBOARDING_FIRST_FIVE_MINUTES.map((step, index) => `${index + 1}. ${step}`),
+        '',
+        'The work loop, always the same',
+        ...ONBOARDING_WORK_LOOP.map((step, index) => `${index + 1}. ${step}`),
+        '',
+        'The whole page - the object map, several sessions on one account, the autonomy boundary,',
+        'evidence over assertion, and the traps that cost other agents a run: docs/orboto-for-agents.md.',
+    ].join('\n');
+}

package/dist/agent-head.test.js

@@ -0,0 +1,63 @@
+/**
+ * ORB-2161 - the head has one source. Session start prints it before
+ * anything else, the onboarding help topic repeats it, and the page and
+ * the skill carry the same lines, so a sentence cannot be improved in one
+ * place and stay old in the other three.
+ */
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { readFileSync } from 'node:fs';
+import { AGENT_HEAD_HEADING, AGENT_HEAD_LINES, ONBOARDING_FIRST_FIVE_MINUTES, ONBOARDING_WORK_LOOP, agentHeadText, onboardingText } from './agent-head.js';
+import { makeHelpHandler } from './tools/help.js';
+import { makeSessionStartHandler } from './tools/session-start.js';
+import { OrbotoClient } from './orboto-client.js';
+const read = (relative) => readFileSync(new URL(`../../../${relative}`, import.meta.url), 'utf8');
+const CARRIERS = ['docs/orboto-for-agents.md', 'skills/orboto/SKILL.md'];
+const client = new OrbotoClient({ baseUrl: 'https://orboto.example.com', apiKey: 'orb_x' });
+beforeEach(() => { vi.restoreAllMocks(); });
+afterEach(() => { vi.restoreAllMocks(); });
+describe('the agent head (ORB-2161)', () => {
+    it('stays four to six lines, so every session can afford it', () => {
+        expect(AGENT_HEAD_LINES.length).toBeGreaterThanOrEqual(4);
+        expect(AGENT_HEAD_LINES.length).toBeLessThanOrEqual(6);
+        for (const line of AGENT_HEAD_LINES)
+            expect(line).not.toContain('\n');
+    });
+    it.each(CARRIERS)('%s carries every line verbatim', (file) => {
+        const page = read(file);
+        for (const line of AGENT_HEAD_LINES)
+            expect(page).toContain(line);
+    });
+    it('is the first thing orboto_session_start prints', async () => {
+        vi.spyOn(globalThis, 'fetch').mockImplementation(async (url) => {
+            const path = new URL(url.toString()).pathname;
+            const body = path.startsWith('/agent-instructions')
+                ? { instructions: 'claim -> commit -> close', rulesHash: 'fixture' }
+                : path.startsWith('/users/me/assigned-tickets') ? { items: [] } : {};
+            return { ok: true, status: 200, statusText: 'OK', json: async () => body, text: async () => '' };
+        });
+        const res = await makeSessionStartHandler(client)();
+        const text = res.content[0].text;
+        expect(text.startsWith(agentHeadText())).toBe(true);
+        expect(text.indexOf(AGENT_HEAD_HEADING)).toBeLessThan(text.indexOf('# orboto session start'));
+    });
+    it('orboto_help returns the head, the first five minutes and the work loop for the topic "onboarding"', async () => {
+        const result = await makeHelpHandler()({ topic: 'onboarding' });
+        const text = (result.content?.[0]).text;
+        for (const line of AGENT_HEAD_LINES)
+            expect(text).toContain(line);
+        for (const step of ONBOARDING_FIRST_FIVE_MINUTES)
+            expect(text).toContain(step);
+        for (const step of ONBOARDING_WORK_LOOP)
+            expect(text).toContain(step);
+        expect(text).toContain('docs/orboto-for-agents.md');
+        expect(result.structuredContent).toMatchObject({ tool: 'topic:onboarding' });
+    });
+    it('names both topics when an unknown one is asked for', async () => {
+        const unknown = (await makeHelpHandler()({ topic: 'nope' })).content?.[0];
+        expect(unknown.text).toContain('onboarding');
+        expect(unknown.text).toContain('connect');
+    });
+    it('the onboarding topic repeats the head instead of holding a second copy', () => {
+        expect(onboardingText().startsWith(agentHeadText())).toBe(true);
+    });
+});

package/dist/claude-context.js

@@ -0,0 +1,47 @@
+/**
+ * ORB-2149 - what a wake of this session costs. `orboto claude-statusline`
+ * writes one file per Claude Code session; the proxy reports the freshest one
+ * for its own directory. Two sessions in one directory, or none, report
+ * nothing - the ledger then says "unknown", never an estimate.
+ */
+import { readdirSync, readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import path from 'node:path';
+export const CLAUDE_CONTEXT_MAX_AGE_MS = 10 * 60_000;
+export function claudeContextDir() {
+    return path.join(homedir(), '.orboto', 'claude-context');
+}
+/** The one fresh report for `dir`; ambiguity and absence both mean "unknown". */
+export function readClaudeContext(dir, now = Date.now(), root = claudeContextDir()) {
+    let names;
+    try {
+        names = readdirSync(root).filter((n) => n.endsWith('.json'));
+    }
+    catch {
+        return null;
+    }
+    const fresh = [];
+    for (const name of names) {
+        let parsed;
+        try {
+            parsed = JSON.parse(readFileSync(path.join(root, name), 'utf8'));
+        }
+        catch {
+            continue;
+        }
+        if (parsed.cwd !== dir)
+            continue;
+        const updated = typeof parsed.updatedAt === 'string' ? Date.parse(parsed.updatedAt) : NaN;
+        if (!Number.isFinite(updated) || now - updated > CLAUDE_CONTEXT_MAX_AGE_MS)
+            continue;
+        if (typeof parsed.contextTokens !== 'number' || !Number.isFinite(parsed.contextTokens))
+            continue;
+        fresh.push({
+            contextTokens: Math.max(0, Math.round(parsed.contextTokens)),
+            ...(typeof parsed.contextWindowSize === 'number' && Number.isFinite(parsed.contextWindowSize)
+                ? { contextWindowSize: Math.max(0, Math.round(parsed.contextWindowSize)) }
+                : {}),
+        });
+    }
+    return fresh.length === 1 ? fresh[0] : null;
+}

package/dist/claude-context.test.js

@@ -0,0 +1,38 @@
+/**
+ * ORB-2149 - the proxy reports a context size only when exactly one fresh
+ * report belongs to its directory.
+ */
+import { describe, expect, it, beforeEach, afterEach } from 'vitest';
+import { mkdtempSync, rmSync, writeFileSync, mkdirSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+import { readClaudeContext } from './claude-context.js';
+let root;
+beforeEach(() => {
+    root = mkdtempSync(path.join(tmpdir(), 'orboto-ctx-'));
+    mkdirSync(root, { recursive: true });
+});
+afterEach(() => { rmSync(root, { recursive: true, force: true }); });
+function write(name, body) {
+    writeFileSync(path.join(root, name), JSON.stringify(body));
+}
+describe('ORB-2149 - claude statusline context reports', () => {
+    it('reports the one fresh file for this directory', () => {
+        write('a.json', { cwd: '/work/repo', contextTokens: 120_000, contextWindowSize: 200_000, updatedAt: new Date().toISOString() });
+        write('b.json', { cwd: '/elsewhere', contextTokens: 5, updatedAt: new Date().toISOString() });
+        expect(readClaudeContext('/work/repo', Date.now(), root)).toEqual({ contextTokens: 120_000, contextWindowSize: 200_000 });
+    });
+    it('reports nothing for a stale report, an unknown directory, a broken file or two sessions in one directory', () => {
+        write('stale.json', { cwd: '/work/repo', contextTokens: 1, updatedAt: new Date(Date.now() - 20 * 60_000).toISOString() });
+        expect(readClaudeContext('/work/repo', Date.now(), root)).toBeNull();
+        expect(readClaudeContext('/nothing/here', Date.now(), root)).toBeNull();
+        write('broken.json', { cwd: '/work/two' });
+        expect(readClaudeContext('/work/two', Date.now(), root)).toBeNull();
+        write('one.json', { cwd: '/work/two', contextTokens: 10, updatedAt: new Date().toISOString() });
+        write('two.json', { cwd: '/work/two', contextTokens: 20, updatedAt: new Date().toISOString() });
+        expect(readClaudeContext('/work/two', Date.now(), root)).toBeNull();
+    });
+    it('reports nothing when the directory does not exist', () => {
+        expect(readClaudeContext('/work/repo', Date.now(), path.join(root, 'missing'))).toBeNull();
+    });
+});

package/dist/connect-script.js

@@ -0,0 +1,30 @@
+/**
+ * ORB-2157 - the one source of the script an agent follows when a person
+ * asks it to set orboto up. `orboto_help { topic: "connect" }` returns it,
+ * docs/connect-your-agent.md, docs/claude-code.md and skills/orboto/SKILL.md
+ * carry the same sentences, and connect-script.test.ts holds them together.
+ */
+export const CONNECT_SCRIPT_HEADING = 'If you are an AI agent helping a person set this up';
+export const CONNECT_SCRIPT_STEPS = [
+    'Work one step per message: say in one sentence what the step does and why, run it, show the result, and only then move on.',
+    'Run every step you can run yourself - `orboto connect --yes` checks Node and Claude Code, writes the `orboto` server entry for this directory and prints the exact start command with the standing arguments.',
+    'Hand the person only the steps that need a human: the browser login, quitting and restarting the session with that command, confirming the servers from `.mcp.json` and the local-development prompt, and, on a Team or Enterprise plan, the one Owner switch that allows channels.',
+    'Give every command the person runs verbatim in its own code block, never paraphrased and never merged into prose.',
+    'Verify before you continue: `orboto whoami` for the identity, `orboto mcp status` for the entry of this directory, `orboto connect --verify` for the channel.',
+    'Never paste a reference page into the chat - link it and keep the message to the step you are on.',
+    'Never ask for an API key, a password or a token in the chat; `orboto login` writes the credential itself.',
+    'When a check fails, name the cause from the troubleshooting table, fix it, and repeat the check before the next step.',
+    'Finish with `orboto connect --verify` and one real first task, so the person sees their own tickets rather than a success message.',
+];
+/** The help topic's body: the heading, the numbered steps, the pages to link. */
+export function connectScriptText() {
+    const steps = CONNECT_SCRIPT_STEPS.map((step, index) => `${index + 1}. ${step}`);
+    return [
+        CONNECT_SCRIPT_HEADING,
+        '',
+        ...steps,
+        '',
+        'The pages to link instead of pasting: docs/connect-your-agent.md (the first hour, in plain words),',
+        'docs/claude-code.md (start commands, standing arguments, troubleshooting table), docs/mcp-setup.md (any other client).',
+    ].join('\n');
+}

package/dist/connect-script.test.js

@@ -0,0 +1,42 @@
+/**
+ * ORB-2157 - the setup script has one source. The help topic, the two docs
+ * pages and the skill are checked against it, so a sentence cannot be
+ * improved in one place and stay old in the other three.
+ */
+import { describe, expect, it } from 'vitest';
+import { readFileSync } from 'node:fs';
+import { CONNECT_SCRIPT_HEADING, CONNECT_SCRIPT_STEPS, connectScriptText } from './connect-script.js';
+import { makeHelpHandler } from './tools/help.js';
+const read = (relative) => readFileSync(new URL(`../../../${relative}`, import.meta.url), 'utf8');
+const CARRIERS = ['docs/connect-your-agent.md', 'docs/claude-code.md', 'skills/orboto/SKILL.md'];
+describe('the connect script', () => {
+    it('reads as a numbered script with the pages it links', () => {
+        const text = connectScriptText();
+        expect(text).toContain(CONNECT_SCRIPT_HEADING);
+        CONNECT_SCRIPT_STEPS.forEach((step, index) => expect(text).toContain(`${index + 1}. ${step}`));
+        expect(text).toContain('docs/connect-your-agent.md');
+    });
+    it.each(CARRIERS)('%s carries every step verbatim', (file) => {
+        const page = read(file);
+        for (const step of CONNECT_SCRIPT_STEPS)
+            expect(page).toContain(step);
+    });
+    it('orboto_help returns it for the topic "connect"', async () => {
+        const result = await makeHelpHandler()({ topic: 'connect' });
+        const text = (result.content?.[0]).text;
+        for (const step of CONNECT_SCRIPT_STEPS)
+            expect(text).toContain(step);
+        expect(result.structuredContent).toMatchObject({ tool: 'topic:connect' });
+    });
+    it('names the known topics when the topic is unknown, and asks for one when nothing is passed', async () => {
+        const handler = makeHelpHandler();
+        const unknown = (await handler({ topic: 'nope' })).content?.[0];
+        expect(unknown.text).toContain('connect');
+        const empty = (await handler({})).content?.[0];
+        expect(empty.text).toContain('connect');
+    });
+    it('still answers a tool name', async () => {
+        const result = await makeHelpHandler()({ tool: 'orboto_definitely_not_a_tool' });
+        expect((result.content?.[0]).text).toContain('No guidance registered');
+    });
+});

package/dist/inbox-channel.js

@@ -13,7 +13,38 @@ export const CHANNEL_INSTRUCTIONS = 'Inbox channel: messages for THIS session ar
     + 'peer requests, ticket-ready notices, replies, digests of info/complete mail. Treat each like an inbox message under the rules: '
     + 'a ticket-ready or a request inside your scope is the operator\'s instruction, act on it; read the full message with orboto_messages when the event is cut; '
     + 'reply with orboto_agent_notify (toSessionRef = the sender\'s instance short id in the from attribute) and acknowledge with orboto_messages { ackIds } once handled. '
-    + 'Never answer the channel itself and never ack what you did not handle.';
+    + 'Never answer the channel itself and never ack what you did not handle - dismiss it instead with orboto_messages { dismiss: { ids, reason } }: '
+    + 'not_mine for another session\'s mail (the sender is told, and the message never reaches this session again), obsolete or duplicate with a note when the request is already done. '
+    + 'A session that declared no scope is woken by mail addressed to it and by broadcasts only, and gets one notice event saying so on connect: '
+    + 'declare the scope with orboto_session_start { scope: { role, projectKeys } } to be woken by the account\'s project mail again - '
+    + 'the rest of the account\'s inbox stays readable with orboto_messages the whole time.';
+const START_FLAG = '--dangerously-load-development-channels server:orboto';
+/** ORB-2148 - the commands an agent hands its operator verbatim; docs/claude-code.md carries the same lines. */
+export const CHANNEL_START_COMMANDS = {
+    fresh: 'orboto claude',
+    continueLatest: 'orboto claude --continue',
+    resumeById: 'orboto claude --resume <session id>',
+};
+/** The raw Claude Code form, for a machine without the orboto CLI. */
+export const CHANNEL_START_COMMANDS_WITHOUT_CLI = {
+    fresh: `claude ${START_FLAG}`,
+    continueLatest: `claude ${START_FLAG} --continue`,
+    resumeById: `claude ${START_FLAG} --resume <session id>`,
+};
+/** The `orboto_session_start` block of a stdio proxy whose channel is on. */
+export function channelStartLines() {
+    return [
+        '## Wake channel',
+        'This proxy pushes inbox messages into the session as <channel source="orboto"> events, but only when Claude Code was started with the development-channels flag. '
+            + 'Run in this repository (`orboto` is this server\'s key in .mcp.json), and confirm the "local development" prompt Claude Code shows on every such start:',
+        `- new session: \`${CHANNEL_START_COMMANDS.fresh}\``,
+        `- continue the most recent conversation here: \`${CHANNEL_START_COMMANDS.continueLatest}\``,
+        `- resume a specific conversation: \`${CHANNEL_START_COMMANDS.resumeById}\` (without an id Claude Code opens a picker)`,
+        'The entry `orboto claude` needs comes from `orboto mcp install`; without the orboto CLI the same starts read '
+            + `\`${CHANNEL_START_COMMANDS_WITHOUT_CLI.fresh}\`, \`${CHANNEL_START_COMMANDS_WITHOUT_CLI.continueLatest}\` and \`${CHANNEL_START_COMMANDS_WITHOUT_CLI.resumeById}\`.`,
+        'A probe that produces no channel event means this session was not started that way: give the operator these commands verbatim, do not paraphrase them.',
+    ];
+}
 function firstLine(payload) {
     if (!payload)
         return '';
@@ -85,7 +116,7 @@ export class InboxChannel {
     seenOrder = [];
     batch = [];
     /** Counters an operator can read from the log; tests read them directly. */
-    stats = { delivered: 0, digested: 0, duplicates: 0, reconnects: 0 };
+    stats = { delivered: 0, digested: 0, duplicates: 0, reconnects: 0, notices: 0 };
     constructor(opts) {
         this.opts = opts;
         this.log = opts.log ?? ((msg) => { try {
@@ -135,6 +166,13 @@ export class InboxChannel {
             this.digestTimer = setTimeout(() => { this.digestTimer = null; void this.flushDigest(); }, this.digestMinutes * 60_000);
         }
     }
+    /** ORB-2151 - a server notice (the scope hint) is emitted as-is and never becomes the replay anchor. */
+    async deliverNotice(notice, content) {
+        if (!content)
+            return;
+        this.stats.notices += 1;
+        await this.emit({ content, meta: { kind: 'notice', notice } });
+    }
     async flushDigest() {
         if (this.batch.length === 0)
             return;
@@ -217,14 +255,18 @@ export class InboxChannel {
                     const line = frame.split('\n').find((l) => l.startsWith('data: '));
                     if (!line)
                         continue;
-                    let message;
+                    let parsed;
                     try {
-                        message = JSON.parse(line.slice(6));
+                        parsed = JSON.parse(line.slice(6));
                     }
                     catch {
                         continue;
                     }
-                    await this.deliver(message);
+                    if (parsed.notice) {
+                        await this.deliverNotice(parsed.notice, parsed.content ?? '');
+                        continue;
+                    }
+                    await this.deliver(parsed);
                 }
             }
         }

package/dist/inbox-channel.test.js

@@ -97,6 +97,24 @@ describe('InboxChannel', () => {
         expect(channel.stats.reconnects).toBeGreaterThanOrEqual(1);
         channel.close();
     });
+    it('ORB-2151 - a server notice becomes its own event and never becomes the replay anchor', async () => {
+        const { mcp, notification } = mockMcp();
+        const hint = { notice: 'declare_scope', sessionId: 'cccccccc-0000-4000-8000-000000000000', content: 'declare your scope: orboto_session_start { scope: { role, projectKeys } }' };
+        const fetchFn = vi.fn()
+            .mockResolvedValueOnce(sse([hint, msg()]))
+            .mockImplementation(() => new Promise(() => { }));
+        const channel = new InboxChannel({ baseUrl: 'https://x.test', apiKey: 'orb_k', instanceToken: 'mcp-proc', mcp, fetchFn, log: () => { }, digestMinutes: 0 });
+        channel.start();
+        await vi.waitFor(() => expect(notification).toHaveBeenCalledTimes(2));
+        const first = notification.mock.calls[0][0];
+        expect(first.params.meta).toEqual({ kind: 'notice', notice: 'declare_scope' });
+        expect(first.params.content).toContain('orboto_session_start');
+        expect(channel.stats).toMatchObject({ notices: 1, delivered: 1 });
+        await vi.advanceTimersByTimeAsync(2_000);
+        await vi.waitFor(() => expect(fetchFn).toHaveBeenCalledTimes(2));
+        expect(String(fetchFn.mock.calls[1][0])).toContain('since=m1');
+        channel.close();
+    });
 });
 describe('server capability', () => {
     async function connect(channel) {

package/dist/index.js

@@ -54,7 +54,7 @@ async function main() {
             process.exit(1);
         }
         const channel = (process.env.ORBOTO_MCP_CHANNEL ?? '1') !== '0';
-        const server = await buildOrbotoMcpServer({ ...clientConfig, channel });
+        const server = await buildOrbotoMcpServer({ ...clientConfig, channel, instanceToken: (await import('./tools/shared.js')).mcpProcessInstance() });
         const { StdioServerTransport } = await import('@modelcontextprotocol/sdk/server/stdio.js');
         const stdio = new StdioServerTransport();
         await server.connect(stdio);
@@ -64,9 +64,16 @@ async function main() {
             const instanceToken = mcpProcessInstance();
             const inbox = new InboxChannel({ ...clientConfig, instanceToken, mcp: server, digestMinutes: digestMinutesFromEnv(process.env.ORBOTO_MCP_CHANNEL_DIGEST_MINUTES) });
             inbox.start();
-            preflightClient.post('/v1/agent/heartbeat', { clientInfo: { channel: 'claude-code' } }, { instanceToken })
-                .catch((err) => { console.error(`[orboto-mcp] channel heartbeat failed: ${err.message}`); });
-            stdio.onclose = () => { inbox.close(); };
+            const { readClaudeContext } = await import('./claude-context.js');
+            const beat = () => {
+                const context = readClaudeContext(process.cwd());
+                preflightClient.post('/v1/agent/heartbeat', { clientInfo: { channel: 'claude-code', ...(context ?? {}) } }, { instanceToken })
+                    .catch((err) => { console.error(`[orboto-mcp] channel heartbeat failed: ${err.message}`); });
+            };
+            beat();
+            const beats = setInterval(beat, 60_000);
+            beats.unref?.();
+            stdio.onclose = () => { clearInterval(beats); inbox.close(); };
         }
         return;
     }

package/dist/manifest-size.test.js

@@ -31,11 +31,19 @@ afterEach(() => { vi.restoreAllMocks(); });
  * session scope schema, agent_notify the toSessionRef, and orboto_messages
  * renders sender and receiver identities in its output schema (measured
  * curated = 38,640, full = 168,029 chars, minimal = 3,140 tokens).
+ * ORB-2150 raised the curated ceiling to 39,700: `orboto_messages` gained
+ * the `dismiss` envelope and the per-message `dismissed` record, which is
+ * the surface that stops foreign mail from waking every session of a
+ * shared account (measured curated = 39,461 chars / 10,961 tokens).
+ * ORB-2149 raised the full ceiling to 171,200: `orboto_agent_wakes` puts
+ * the wake ledger and the delivery precision per session and per sender
+ * in the full toolset (measured full = 170,030 chars); the curated tier
+ * reaches it through the escape hatch and is unchanged.
  *
  * @see ORB-1805, ORB-1669, ORB-1910
  */
-const CURATED_MAX_CHARS = 39_000;
-const FULL_MAX_CHARS = 169_000;
+const CURATED_MAX_CHARS = 39_700;
+const FULL_MAX_CHARS = 171_200;
 /**
  * ORB-1805 - the estimator the ticket measured the failure with
  * (`n_keep: 13533 >= n_ctx: 8192` in LM Studio): characters / 3.6. It is
@@ -56,7 +64,7 @@ const MINIMAL_MAX_TOKENS = 3_200;
  * The curated tier is ratcheted on its TOOL SCHEMAS (the instructions
  * block has its own budget, enforced in instructions-budget.test.ts).
  */
-const CURATED_SCHEMA_MAX_TOKENS = 10_800;
+const CURATED_SCHEMA_MAX_TOKENS = 11_000;
 async function measuredManifest(toolset) {
     const server = await buildOrbotoMcpServer({
         baseUrl: 'https://orboto.example.com',

package/dist/orboto-client.js

@@ -22,6 +22,7 @@ export class OrbotoClient {
     baseHeaders;
     apiKey;
     tokenProvider;
+    instanceToken;
     constructor(config) {
         this.baseUrl = config.baseUrl.replace(/\/+$/, '');
         if (!config.apiKey && !config.tokenProvider) {
@@ -29,6 +30,7 @@ export class OrbotoClient {
         }
         this.apiKey = config.apiKey;
         this.tokenProvider = config.tokenProvider;
+        this.instanceToken = config.instanceToken;
         const ua = config.userAgentSuffix
             ? `orboto-mcp/${VERSION} (${config.userAgentSuffix})`
             : `orboto-mcp/${VERSION}`;
@@ -60,6 +62,7 @@ export class OrbotoClient {
         const doFetch = async (token) => {
             const headers = {
                 ...this.baseHeaders,
+                ...(this.instanceToken ? { 'x-orboto-agent-session': this.instanceToken } : {}),
                 ...(accept ? { Accept: accept } : {}),
                 ...(init.headers ?? {}),
                 Authorization: `Bearer ${token}`,

package/dist/orboto-client.test.js

@@ -126,4 +126,19 @@ describe('preflightMcpSession', () => {
         const client = new OrbotoClient({ baseUrl: 'https://orboto.example.com', apiKey: 'orb_test' });
         await expect(preflightMcpSession(client)).rejects.toBeInstanceOf(OrbotoApiError);
     });
+    it('ORB-2151: a client built with an instance token names the session on every request; an explicit token wins', async () => {
+        const seen = [];
+        vi.spyOn(globalThis, 'fetch').mockImplementation(async (_url, init) => {
+            seen.push((init?.headers ?? {}));
+            return { ok: true, status: 200, statusText: 'OK', json: async () => ({}), text: async () => '' };
+        });
+        const client = new OrbotoClient({ baseUrl: 'https://orboto.example.com', apiKey: 'orb_test', instanceToken: 'mcp-proc' });
+        await client.get('/users/me');
+        await client.post('/projects/p/tickets', { title: 't' });
+        await client.post('/v1/agent/heartbeat', {}, { instanceToken: 'mcp-explicit' });
+        expect(seen.map((h) => h['x-orboto-agent-session'])).toEqual(['mcp-proc', 'mcp-proc', 'mcp-explicit']);
+        const plain = new OrbotoClient({ baseUrl: 'https://orboto.example.com', apiKey: 'orb_test' });
+        await plain.get('/users/me');
+        expect(seen[3]['x-orboto-agent-session']).toBeUndefined();
+    });
 });

package/dist/server.js

@@ -26,6 +26,7 @@ import { agentHeartbeatToolConfig, makeAgentHeartbeatHandler, agentPresenceToolC
 import { agentBroadcastToolConfig, makeAgentBroadcastHandler, } from './tools/agent-coordination.js';
 import { agentMessageWorkToolConfig, makeAgentMessageWorkHandler } from './tools/agent-message-work.js';
 import { agentMessagesToolConfig, makeAgentMessagesHandler } from './tools/agent-messages.js';
+import { agentWakesToolConfig, makeAgentWakesHandler } from './tools/agent-wakes.js';
 import { listProjectsToolConfig, makeListProjectsHandler } from './tools/list-projects.js';
 import { getProjectToolConfig, makeGetProjectHandler } from './tools/get-project.js';
 import { projectReadinessToolConfig, makeProjectReadinessHandler } from './tools/project-readiness.js';
@@ -188,7 +189,7 @@ export async function buildOrbotoMcpServer(opts) {
     reg('orboto_draft_customer_reply', draftCustomerReplyToolConfig, makeDraftCustomerReplyHandler(client));
     reg('orboto_embedding_status', embeddingStatusToolConfig, makeEmbeddingStatusHandler(client));
     reg('orboto_ai_usage', aiUsageToolConfig, makeAiUsageHandler(client));
-    reg('orboto_session_start', sessionStartToolConfig, makeSessionStartHandler(client));
+    reg('orboto_session_start', sessionStartToolConfig, makeSessionStartHandler(client, { channel: opts.channel }));
     reg('orboto_response_expand', responseExpandToolConfig, makeResponseExpandHandler());
     reg('orboto_help', helpToolConfig, makeHelpHandler());
     reg('orboto_api_search', apiSearchToolConfig, makeApiSearchHandler(client));
@@ -203,6 +204,7 @@ export async function buildOrbotoMcpServer(opts) {
     reg('orboto_agent_notify', agentNotifyToolConfig, makeAgentNotifyHandler(client));
     reg('orboto_message_work', agentMessageWorkToolConfig, makeAgentMessageWorkHandler(client));
     reg('orboto_messages', agentMessagesToolConfig, makeAgentMessagesHandler(client));
+    reg('orboto_agent_wakes', agentWakesToolConfig, makeAgentWakesHandler(client));
     reg('orboto_agent_broadcast', agentBroadcastToolConfig, makeAgentBroadcastHandler(client));
     reg('orboto_list_projects', listProjectsToolConfig, makeListProjectsHandler(client));
     reg('orboto_get_project', getProjectToolConfig, makeGetProjectHandler(client));

package/dist/tool-parameters.test.js

@@ -1,5 +1,10 @@
 /**
  * ORB-1805 - the schema diet must never cost a PARAMETER.
+ *
+ * ORB-2157 - one reviewed baseline edit: `orboto_help.tool` is no longer
+ * required, because the tool now also answers `topic` ("connect" returns the
+ * setup script). The parameter itself is untouched and still the only way to
+ * ask for a tool's guidance; a call with neither says which topics exist.
  */
 import { beforeEach, afterEach, describe, expect, it, vi } from 'vitest';
 import { readFileSync } from 'node:fs';

package/dist/tools/agent-coordination.test.js

@@ -149,7 +149,7 @@ describe('orboto_agent_notify', () => {
         });
         expect(result.content[0].text).toContain('notified bob@example.com');
         expect(result.structuredContent).toMatchObject({ ok: true });
-        expect(capturedBody[0].senderRef).toMatch(/^mcp-/);
+        expect(capturedBody[0].senderRef).toMatch(/^agent-/);
     });
     it('ORB-1742: senderRef prefers the per-connection MCP session id, and an explicit ref wins outright', async () => {
         const capturedBody = [];

package/dist/tools/agent-messages.js

@@ -13,7 +13,7 @@ import { mcpInstanceToken } from './shared.js';
 const PartySchema = z.object({ userId: z.string(), email: z.string(), sessionId: z.string().nullable(), role: z.string().nullable(), label: z.string() });
 export const agentMessagesToolConfig = {
     title: 'Agent inbox and message work',
-    description: 'Your inbox as THIS session sees it: mail to this session, account mail inside your declared scope, broadcasts; sibling-session mail and own sends stay out, all:true shows the whole account (ORB-2136). messageWork carries durable work ownership - claim before executing. ackIds is a plain read receipt: no claim needed, finishes nothing. Reply via orboto_agent_notify with threadId (toSessionRef = from.sessionId reaches that instance).',
+    description: 'Your inbox as THIS session sees it: mail to this session, account mail inside your declared scope, broadcasts; sibling-session mail and own sends stay out, all:true shows the whole account (ORB-2136). messageWork carries durable work ownership - claim before executing. ackIds is a plain read receipt: no claim needed, finishes nothing. dismiss is the third answer: not_mine hides it here and tells the sender, obsolete/duplicate close it for the account (note or duplicateOf required). Never leave mail you read and judged. Reply via orboto_agent_notify with threadId (toSessionRef = from.sessionId reaches that instance).',
     inputSchema: z.object({
         messageWork: z.record(z.unknown()).optional()
             .describe('Work envelope {messageId, mutation, cursor, limit, openOnly}; schema: orboto_api_search.'),
@@ -22,6 +22,12 @@ export const agentMessagesToolConfig = {
         project: z.string().min(1).max(64).optional().describe('Project key/UUID; includes unscoped mail.'),
         includeOwnSends: z.boolean().default(false),
         ackIds: z.array(z.string().uuid()).max(200).optional().describe('Message ids to mark read.'),
+        dismiss: z.object({
+            ids: z.array(z.string().uuid()).min(1).max(200),
+            reason: z.enum(['not_mine', 'obsolete', 'duplicate']),
+            note: z.string().max(500).optional(),
+            duplicateOf: z.string().uuid().optional(),
+        }).optional().describe('Dismiss with a reason; obsolete/duplicate need note or duplicateOf.'),
     }).shape,
     outputSchema: z.object({
         work: z.record(z.unknown()).optional(),
@@ -38,8 +44,13 @@ export const agentMessagesToolConfig = {
             projectKey: z.string().nullable(),
             createdAt: z.string(),
             readAt: z.string().nullable(),
+            dismissed: z.object({
+                reason: z.string(), note: z.string().nullable(), duplicateOf: z.string().nullable(), createdAt: z.string(),
+            }).nullable(),
         })),
         acked: z.number().int(),
+        dismissed: z.number().int().optional(),
+        closed: z.number().int().optional(),
     }).shape,
     annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: false },
 };
@@ -51,6 +62,18 @@ export function makeAgentMessagesHandler(client) {
             const result = await makeAgentMessageWorkHandler(client)(args.messageWork, extra);
             return { content: result.content, structuredContent: { messages: [], acked: 0, work: result.structuredContent } };
         }
+        let dismissedCount = 0;
+        let closedCount = 0;
+        let feedbackSent = 0;
+        if (args.dismiss) {
+            const res = await client.post('/v1/agent/messages/dismiss', {
+                ...args.dismiss,
+                instanceToken: mcpInstanceToken(undefined, extra),
+            });
+            dismissedCount = res.dismissed;
+            closedCount = res.closed;
+            feedbackSent = res.feedbackSent;
+        }
         let acked = 0;
         if (args.ackIds && args.ackIds.length > 0) {
             const res = await client.post('/v1/agent/messages/ack', { ids: args.ackIds, instanceToken: mcpInstanceToken(undefined, extra) });
@@ -73,6 +96,9 @@ export function makeAgentMessagesHandler(client) {
         if (messages.length > 0) {
             lines.push(`Acknowledge with ackIds once handled; reply via orboto_agent_notify with threadId (toSessionRef = the sender's instance short id reaches that session only).`);
         }
+        if (args.dismiss) {
+            lines.unshift(`Dismissed ${dismissedCount} message(s) as ${args.dismiss.reason}${closedCount > 0 ? `, ${closedCount} closed for the account` : ''}${feedbackSent > 0 ? `, ${feedbackSent} sender(s) told about the misroute` : ''}.`);
+        }
         if (sessionId)
             lines.push(`This session: ${sessionId.slice(0, 8)} (ref ${instanceToken}).`);
         return {
@@ -82,9 +108,11 @@ export function makeAgentMessagesHandler(client) {
                 messages: messages.map((m) => ({
                     id: m.id, fromUserId: m.fromUserId, from: m.from, to: m.to, kind: m.kind, subject: m.subject,
                     payload: m.payload, threadId: m.threadId, projectKey: m.projectKey ?? null,
-                    createdAt: m.createdAt, readAt: m.readAt,
+                    createdAt: m.createdAt, readAt: m.readAt, dismissed: m.dismissed ?? null,
                 })),
                 acked,
+                dismissed: dismissedCount,
+                closed: closedCount,
             },
         };
     };

package/dist/tools/agent-presence-schema.js

@@ -34,6 +34,17 @@ export const AgentInventoryEntrySchema = z.object({
     scope: AgentSessionScopeSchema.nullable(),
     /** ORB-2136 - unread inbox messages this session would list. */
     unreadMessages: z.number().int(),
+    /**
+     * ORB-2149 - the last 24 hours of wakes: how many deliveries, how precise,
+     * what the wrong ones cost. ORB-2170 - `backlogSeen` is the `nudge` count
+     * over the same window, a backlog sighting rather than a wake.
+     */
+    wakes: z.object({
+        count: z.number().int(),
+        precision: z.number().nullable(),
+        wrongWakeContextTokens: z.number().int(),
+        backlogSeen: z.number().int(),
+    }),
     lastSeenAt: z.string(),
     createdAt: z.string(),
 });

package/dist/tools/agent-wakes.js

@@ -0,0 +1,61 @@
+/**
+ * ORB-2149 - the wake ledger: what woke this session, by which rule, what it
+ * did with it and what it cost.
+ */
+import { z } from 'zod';
+export const agentWakesToolConfig = {
+    title: 'Wake ledger',
+    description: 'Who woke this account\'s sessions, which visibility rule delivered the message (addressed | scope_project | scope_ticket | broadcast | unscoped_session | account_view), what the woken session did with it (handled | not_mine | obsolete | duplicate | expired | pending) and what the wake cost in context tokens. `stats: true` returns delivery precision per woken session and per sender over `hours` (operator read, needs admin:agents:read); `wakes`, `precision` and the median latency count deliveries (`channel` | `follow` | `poll`) only, `backlogSeen` is the separate count of `nudge` rows - a backlog sighting, not a wake. Without `stats` it returns the ledger rows of your own account, newest first. Use it to prove a misrouting sender instead of describing it in prose.',
+    inputSchema: z.object({
+        stats: z.boolean().default(false).describe('Precision per session and per sender instead of rows.'),
+        hours: z.number().int().min(1).max(720).optional().describe('Stats window, default 24.'),
+        sessionId: z.string().uuid().optional().describe('Narrow to one woken session.'),
+        project: z.string().min(1).max(64).optional().describe('Project key or UUID.'),
+        outcome: z.enum(['pending', 'handled', 'not_mine', 'obsolete', 'duplicate', 'expired']).optional(),
+        limit: z.number().int().min(1).max(200).optional().describe('Default: 50.'),
+        cursor: z.string().optional().describe('Opaque cursor from a previous response.'),
+    }).shape,
+    annotations: { readOnlyHint: true, idempotentHint: true },
+};
+function statsLine(e) {
+    const precision = e.precision === null ? 'unjudged' : `${Math.round(e.precision * 100)}%`;
+    const tokens = e.wrongWakeContextTokens > 0 ? `, wrong wakes cost ${e.wrongWakeContextTokens} tokens` : '';
+    const backlog = e.backlogSeen > 0 ? `, ${e.backlogSeen} backlog seen` : '';
+    return `- ${e.label}: ${e.wakes} wakes, precision ${precision}, median ${e.medianLatencyMs ?? '?'} ms, top rule ${e.topRule ?? '-'}${tokens}${backlog}`;
+}
+export function makeAgentWakesHandler(client) {
+    return async (args) => {
+        const qs = new URLSearchParams();
+        if (args.sessionId)
+            qs.set('sessionId', args.sessionId);
+        if (args.stats) {
+            if (args.hours)
+                qs.set('hours', String(args.hours));
+            const res = await client.get(`/admin/agents/wake-stats${qs.toString() ? `?${qs.toString()}` : ''}`);
+            const text = [
+                `Last ${res.hours} h - woken sessions:`,
+                ...(res.sessions.length ? res.sessions.map(statsLine) : ['- (no wakes)']),
+                'Senders:',
+                ...(res.senders.length ? res.senders.map(statsLine) : ['- (none)']),
+            ].join('\n');
+            return { content: [{ type: 'text', text }], structuredContent: res };
+        }
+        if (args.project)
+            qs.set('project', args.project);
+        if (args.outcome)
+            qs.set('outcome', args.outcome);
+        if (args.limit)
+            qs.set('limit', String(args.limit));
+        if (args.cursor)
+            qs.set('cursor', args.cursor);
+        const res = await client.get(`/v1/agent/wakes${qs.toString() ? `?${qs.toString()}` : ''}`);
+        const lines = res.rows.length === 0
+            ? '(no wakes recorded)'
+            : res.rows.map((r) => `- ${r.wokenAt} ${r.subject} - from ${r.senderLabel} via ${r.rule}/${r.transport} -> ${r.outcome}`
+                + `${r.latencyMs === null ? '' : ` (${r.latencyMs} ms`}${r.contextTokens === null ? r.latencyMs === null ? '' : ')' : `, ${r.contextTokens} ctx tokens)`}`).join('\n');
+        return {
+            content: [{ type: 'text', text: lines + (res.nextCursor ? `\n\n(next cursor: ${res.nextCursor})` : '') }],
+            structuredContent: res,
+        };
+    };
+}

package/dist/tools/api-call.test.js

@@ -109,6 +109,6 @@ describe('orboto_api_call', () => {
         await makeApiCallHandler(client)({ method: 'POST', path: '/v1/agent/heartbeat', body: { scope: { role: 'spec' } } }, { sessionId: 'abc123' });
         expect(seen[0]['x-orboto-agent-session']).toBe('mcp-abc123');
         await makeApiCallHandler(client)({ method: 'GET', path: '/v1/agent/messages' });
-        expect(seen[1]['x-orboto-agent-session']).toMatch(/^mcp-/);
+        expect(seen[1]['x-orboto-agent-session']).toMatch(/^agent-/);
     });
 });

package/dist/tools/docs.js

@@ -42,7 +42,7 @@ export async function resolveDocId(client, docIdOrKey) {
 }
 export const getDocToolConfig = {
     title: 'Get a doc by id or key',
-    description: 'Return the doc content (Markdown) plus backlinks (other docs that reference this doc, or tickets/milestones the doc is linked from). Accepts either the doc UUID or its human-readable key (e.g. ORB-D12 / DOC-5).',
+    description: 'Return the doc content (Markdown) plus backlinks (other docs that reference this doc, or tickets/milestones the doc is linked from). Accepts either the doc UUID or its human-readable key (e.g. ORB-D12 / DOC-5). A UUID read also reports `embedding.state` - embedded | pending | stale | not_embeddable - so a caller waits for semantic search instead of guessing (ORB-2154).',
     inputSchema: z.object({
         docId: z.string().min(1).describe('Doc UUID or human-readable key (ORB-D12 / DOC-5). Discover via orboto_list_doc_spaces or orboto_search.'),
     }).shape,
@@ -56,7 +56,7 @@ export function makeGetDocHandler(client) {
         const backlinks = await client.get(`/docs/${doc.id}/backlinks`).catch(() => []);
         const lines = [
             `# ${doc.icon ? `${doc.icon} ` : ''}${doc.title}`,
-            `${doc.docKey ? `Key: ${doc.docKey}  ·  ` : ''}ID: ${doc.id}  ·  Visibility: ${doc.visibility}  ·  Updated: ${doc.updatedAt}`,
+            `${doc.docKey ? `Key: ${doc.docKey}  ·  ` : ''}ID: ${doc.id}  ·  Visibility: ${doc.visibility}  ·  Updated: ${doc.updatedAt}${doc.embedding ? `  ·  Embedding: ${doc.embedding.state}` : ''}`,
             '',
             doc.content || '_(empty)_',
         ];
@@ -80,6 +80,7 @@ export function makeGetDocHandler(client) {
                     parentDocId: doc.parentDocId,
                     spaceId: doc.spaceId,
                     slug: doc.slug,
+                    embedding: doc.embedding ?? null,
                 },
                 backlinks: backlinks.map((b) => ({
                     sourceDocId: b.sourceDocId,

package/dist/tools/help.js

@@ -9,11 +9,16 @@
  */
 import { z } from 'zod';
 import { getToolDoc, listToolDocNames } from '../tool-docs.js';
+import { connectScriptText } from '../connect-script.js';
+import { onboardingText } from '../agent-head.js';
+/** ORB-2157, ORB-2161 - guidance that belongs to no single tool, addressed by topic. */
+const TOPICS = { connect: connectScriptText, onboarding: onboardingText };
 export const helpToolConfig = {
     title: 'Full guidance for one orboto tool',
-    description: 'Return the complete guidance text (workflows, warnings, edge cases) for one orboto tool by name - manifest descriptions are one-line summaries, this is the rest. Call it before first use of an unfamiliar write tool.',
+    description: 'Return the complete guidance text (workflows, warnings, edge cases) for one orboto tool by name - manifest descriptions are one-line summaries, this is the rest. Call it before first use of an unfamiliar write tool. topic: "connect" returns the step-by-step script for setting a person up, topic: "onboarding" the first five minutes and the work loop.',
     inputSchema: z.object({
-        tool: z.string().min(1).max(128).describe('Tool name, e.g. orboto_create_ticket.'),
+        tool: z.string().min(1).max(128).optional().describe('Tool name, e.g. orboto_create_ticket.'),
+        topic: z.enum(['connect', 'onboarding']).optional().describe('Guidance topic instead of a tool.'),
     }).shape,
     outputSchema: z.object({
         tool: z.string(),
@@ -23,7 +28,19 @@ export const helpToolConfig = {
 };
 export function makeHelpHandler() {
     return async (args) => {
-        const name = args.tool.trim();
+        const topic = args.topic?.trim();
+        if (topic) {
+            const render = TOPICS[topic];
+            const text = render
+                ? render()
+                : `No guidance registered for topic "${topic}". Known topics: ${Object.keys(TOPICS).join(', ')}`;
+            return { content: [{ type: 'text', text }], structuredContent: { tool: `topic:${topic}`, guidance: render ? text : '' } };
+        }
+        const name = (args.tool ?? '').trim();
+        if (!name) {
+            const text = `Name a tool, or a topic: ${Object.keys(TOPICS).join(', ')}.`;
+            return { content: [{ type: 'text', text }], structuredContent: { tool: '', guidance: '' } };
+        }
         const doc = getToolDoc(name) ?? getToolDoc(`orboto_${name}`);
         if (!doc) {
             const known = listToolDocNames();

package/dist/tools/session-start.js

@@ -14,6 +14,8 @@ import { AgentSessionScopeSchema } from './agent-session-scope.js';
 import { PROTECT_TEXT_META, storePayload } from '../response-budget.js';
 import { loadRequiredRules } from '../required-rules.js';
 import { GIT_HEALTH_REASON_TEXT } from './git-health-reasons.js';
+import { channelStartLines } from '../inbox-channel.js';
+import { agentHeadText } from '../agent-head.js';
 export const sessionStartToolConfig = {
     title: 'Load the rules you must follow + re-orient',
     description: 'THE canonical way to LOAD the binding workspace rules you must follow as an agent. Run it as your FIRST action in a session and immediately AFTER any context compaction. Returns a one-line-per-rule INDEX of the binding working-rules plus their hash (or a compact "unchanged" ack on a repeat call within the same connection) - read the index, then call this tool again with `rulesOnly: true` to read the full text of the rules whenever you do not already hold that exact hash, and expand before acting on any rule whose title touches what you are about to do. Also returns your in-progress tickets - each flagged LANDED, IDLE when it has a linked commit but has not moved for days, i.e. finished work you never handed to review - your running timer, and a warning if a project\'s git connection looks unhealthy (commit ingestion may be stalled). Pass `ticketKey` to also get a one-shot bundle for that ticket: project primer, the full ticket with dependencies + checklists, that project\'s git health, and any other agent sessions currently on it - replacing several separate calls. (Do NOT use orboto_list_agent_instructions to read the rules - that tool MANAGES/edits rule blocks for admins; this one is what you read to know how to work.) Registers this session (a heartbeat on its instance row) and is otherwise read-only. '
@@ -128,7 +130,7 @@ async function buildTicketBundle(client, ticketKey) {
         },
     };
 }
-export function makeSessionStartHandler(client) {
+export function makeSessionStartHandler(client, opts = {}) {
     let lastKnownRulesHash;
     return async (input = {}, extra) => {
         const instanceToken = mcpInstanceToken(undefined, extra);
@@ -202,7 +204,7 @@ export function makeSessionStartHandler(client) {
             ? tickets.filter((t) => !t.projectId || t.projectId === scopeProjectId)
             : tickets;
         const elsewhereCount = tickets.length - scopedTickets.length;
-        const lines = ['# orboto session start'];
+        const lines = [agentHeadText(), '', '# orboto session start'];
         if (me)
             lines.push(`You are ${me.fullName ?? me.email}${me.email ? ` (${me.email})` : ''}.`);
         if (me?.workspaceLocale || me?.locale)
@@ -256,6 +258,8 @@ export function makeSessionStartHandler(client) {
             ? [registration.scope.role ? `role ${registration.scope.role}` : null, registration.scope.projectKeys?.length ? `projects ${registration.scope.projectKeys.join(', ')}` : null, registration.scope.ticketKeys?.length ? `tickets ${registration.scope.ticketKeys.join(', ')}` : null].filter(Boolean).join('; ')
             : 'no scope declared - this session lists every account-addressed message; pass scope: { projectKeys, role } to narrow it';
         lines.push(`ref ${instanceToken}${registration ? `, instance ${registration.sessionId.slice(0, 8)}` : ''}. ${scopeText}. Peers reach exactly this session with orboto_agent_notify { toSessionRef: "${registration ? registration.sessionId.slice(0, 8) : instanceToken}" }.`);
+        if (opts.channel)
+            lines.push('', ...channelStartLines());
         if (pendingMessages.length > 0) {
             lines.push('', '## Agent messages - unread');
             for (const m of pendingMessages)

package/dist/tools/session-start.test.js

@@ -9,6 +9,8 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { OrbotoClient } from '../orboto-client.js';
 import { makeSessionStartHandler } from './session-start.js';
+import { CHANNEL_START_COMMANDS, CHANNEL_START_COMMANDS_WITHOUT_CLI } from '../inbox-channel.js';
+import { readFileSync } from 'node:fs';
 import { makeResponseExpandHandler } from './response-expand.js';
 import { applyResponseBudget, budgetFor, DEFAULT_BUDGET_CHARS } from '../response-budget.js';
 beforeEach(() => { vi.restoreAllMocks(); });
@@ -566,4 +568,35 @@ describe('ORB-2136 - session scope and ref', () => {
         expect(seen.find((c) => c.path === '/v1/agent/heartbeat')?.body).toEqual({});
         expect(res.content[0].text).toContain('no scope declared');
     });
+    it('ORB-2148: a stdio proxy with the channel on hands over the exact start commands; other servers stay silent', async () => {
+        const fixture = {
+            '/users/me/assigned-tickets': { items: [] },
+            '/users/me': { email: 'dev@x.io', fullName: 'Dev' },
+            '/agent-instructions': { instructions: 'rules here', rulesHash: 'fixture' },
+            '/time/timer': {},
+        };
+        stubByPath(fixture);
+        const on = (await makeSessionStartHandler(client, { channel: true })()).content[0].text;
+        expect(on).toContain('## Wake channel');
+        for (const cmd of Object.values(CHANNEL_START_COMMANDS))
+            expect(on).toContain(`\`${cmd}\``);
+        for (const cmd of Object.values(CHANNEL_START_COMMANDS_WITHOUT_CLI))
+            expect(on).toContain(`\`${cmd}\``);
+        expect(on).toContain('orboto claude --continue');
+        expect(on).toContain('orboto claude --resume <session id>');
+        expect(on).toContain('orboto mcp install');
+        expect(on).toContain('local development');
+        stubByPath(fixture);
+        const off = (await makeSessionStartHandler(client)()).content[0].text;
+        expect(off).not.toContain('## Wake channel');
+        expect(off).not.toContain('--dangerously-load-development-channels');
+    });
+    it('ORB-2148: docs/claude-code.md carries both command forms', () => {
+        const docs = readFileSync(new URL('../../../../docs/claude-code.md', import.meta.url), 'utf8');
+        for (const cmd of Object.values(CHANNEL_START_COMMANDS))
+            expect(docs).toContain(cmd);
+        for (const cmd of Object.values(CHANNEL_START_COMMANDS_WITHOUT_CLI))
+            expect(docs).toContain(cmd);
+        expect(docs).toContain('orboto mcp install');
+    });
 });

package/dist/tools/shared.js

@@ -95,8 +95,14 @@ export function ticketLine(t) {
         parts.push('[waiting on Git ingestion]');
     return parts.join(' ');
 }
-import { randomUUID } from 'node:crypto';
-const MCP_PROCESS_INSTANCE = `mcp-${randomUUID()}`;
+import { createHash } from 'node:crypto';
+import { hostname } from 'node:os';
+/** ORB-2171 - the checkout's token, derived exactly like the CLI and the skill wrapper derive theirs; `ORBOTO_AGENT_SESSION` wins. */
+export function checkoutInstanceToken(env = process.env, host = hostname(), cwd = process.cwd()) {
+    const explicit = (env.ORBOTO_AGENT_SESSION ?? '').trim();
+    return explicit || `agent-${createHash('sha256').update(`${host}:${cwd}`).digest('hex').slice(0, 12)}`;
+}
+const MCP_PROCESS_INSTANCE = checkoutInstanceToken();
 /** Precedence: explicit caller-supplied token > per-connection MCP session id
  *  (distinct per client even on a shared HTTP server) > per-process id (stdio). */
 export function mcpInstanceToken(explicit, extra) {

package/dist/tools/shared.test.js

@@ -163,3 +163,11 @@ describe('resolveByName', () => {
         expect(ambiguous?.map((r) => r.id).sort()).toEqual(['m1', 'm3']);
     });
 });
+describe('ORB-2171 - the stdio proxy shares the checkout token with the CLI and the skill wrapper', () => {
+    it('ORBOTO_AGENT_SESSION wins; otherwise agent-<sha256(hostname:cwd)[:12]>', async () => {
+        const { checkoutInstanceToken } = await import('./shared.js');
+        expect(checkoutInstanceToken({ ORBOTO_AGENT_SESSION: '  lane-7  ' }, 'host', '/repo')).toBe('lane-7');
+        expect(checkoutInstanceToken({}, 'build-host', '/srv/checkout')).toBe('agent-e0b18afc9cec');
+        expect(checkoutInstanceToken({}, 'build-host', '/srv/other')).not.toBe('agent-e0b18afc9cec');
+    });
+});

package/dist/tools/work-sessions-next.test.js

@@ -118,7 +118,7 @@ describe('orboto_work_next', () => {
         expect(calls[0].method).toBe('POST');
         expect(calls[0].url).toContain('/work-sessions/next');
         expect(calls[0].body?.projectKey).toBe('ACME');
-        expect(String(calls[0].body?.agentSessionToken)).toMatch(/^mcp-/);
+        expect(String(calls[0].body?.agentSessionToken)).toMatch(/^agent-/);
         const text = res.content[0].text;
         expect(text).toContain('Reserved ACME-42');
         expect(text).toContain('ws1');

package/dist/tools/work-sessions-start.test.js

@@ -89,7 +89,7 @@ describe('orboto_work_start', () => {
         expect(post.method).toBe('POST');
         expect(post.url).toContain('/work-sessions/start');
         expect(post.body?.ticketId).toBe('t1');
-        expect(String(post.body?.agentSessionToken)).toMatch(/^mcp-/);
+        expect(String(post.body?.agentSessionToken)).toMatch(/^agent-/);
         const text = res.content[0].text;
         expect(text).toContain('Started a implementation work session on ACME-42');
         expect(text).toContain('ws1');

package/dist/tools/work-sessions.test.js

@@ -58,7 +58,7 @@ describe('orboto_work_session_start', () => {
         expect(post.method).toBe('POST');
         expect(post.url).toContain('/work-sessions');
         expect(post.body?.ticketId).toBe('t1');
-        expect(String(post.body?.agentSessionToken)).toMatch(/^mcp-/);
+        expect(String(post.body?.agentSessionToken)).toMatch(/^agent-/);
         const text = res.content[0].text;
         expect(text).toContain('Started a implementation work session on ACME-42');
         expect(text).toContain('ws1');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orboto/mcp",
-  "version": "0.199.0",
+  "version": "0.200.1",
   "description": "Model Context Protocol server for orboto - exposes tickets, projects, milestones, time, docs, primer-facts, alerts and absences as MCP tools for Claude Desktop / Cursor / Copilot Chat / any MCP-aware AI client.",
   "license": "MIT",
   "type": "module",