@orboto/mcp 0.197.0 → 0.198.0

package/dist/manifest-size.test.js

@@ -27,11 +27,15 @@ afterEach(() => { vi.restoreAllMocks(); });
  * grow every session's connect cost. ORB-2132 raised the full ceiling by
  * 2,000 chars because the agent_presence output schema now carries kind,
  * actsAs, projects and connections (measured full = 165,759 chars).
+ * ORB-2136 raised all three: session_start and agent_heartbeat carry the
+ * 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).
  *
  * @see ORB-1805, ORB-1669, ORB-1910
  */
-const CURATED_MAX_CHARS = 37_500;
-const FULL_MAX_CHARS = 167_000;
+const CURATED_MAX_CHARS = 39_000;
+const FULL_MAX_CHARS = 169_000;
 /**
  * ORB-1805 - the estimator the ticket measured the failure with
  * (`n_keep: 13533 >= n_ctx: 8192` in LM Studio): characters / 3.6. It is
@@ -47,12 +51,12 @@ const estTokens = (chars) => Math.round(chars / CHARS_PER_TOKEN);
  * left for the conversation. 3,000 was the ticket's number; 3,100 since
  * ORB-1669 added the annotations block to every tool (+688 chars).
  */
-const MINIMAL_MAX_TOKENS = 3_100;
+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_450;
+const CURATED_SCHEMA_MAX_TOKENS = 10_800;
 async function measuredManifest(toolset) {
     const server = await buildOrbotoMcpServer({
         baseUrl: 'https://orboto.example.com',

package/dist/orboto-client.js

@@ -83,11 +83,11 @@ export class OrbotoClient {
         const res = await this.authedFetch(this.fullUrl(path), { method: 'GET', signal: options.signal, ...(options.instanceToken ? { headers: { 'x-orboto-agent-session': options.instanceToken } } : {}) });
         return (await res.json());
     }
-    /** POST a JSON body. */
-    async post(path, body) {
+    /** POST a JSON body. `instanceToken` sends `x-orboto-agent-session` so the api attributes the call to this MCP session (ORB-2136). */
+    async post(path, body, options = {}) {
         const res = await this.authedFetch(this.fullUrl(path), {
             method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
+            headers: { 'Content-Type': 'application/json', ...(options.instanceToken ? { 'x-orboto-agent-session': options.instanceToken } : {}) },
             body: JSON.stringify(body),
         });
         if (res.status === 204)

package/dist/tools/agent-coordination.js

@@ -6,11 +6,13 @@
 import { z } from 'zod';
 import { AgentInventoryEntrySchema, AgentInventoryKindSchema } from './agent-presence-schema.js';
 import { mcpInstanceToken } from './shared.js';
+import { AgentSessionScopeSchema } from './agent-session-scope.js';
 export const agentHeartbeatToolConfig = {
     title: 'Agent heartbeat (Multi-Agent Coordination)',
-    description: 'Register or refresh this agent\'s presence with status detail. A live connection already counts as online (an open MCP event stream, `orboto messages --follow`, the agent WebSocket) - the heartbeat adds status: idle (default) | working (+workingOnTicketId) | blocked, capabilities (free-form strings for operator filters) and clientInfo.name (the runtime), and is the only presence path for turn-based clients without a standing connection. Rows older than 90 s count as offline; persist the returned sessionToken and send it on later heartbeats.',
+    description: 'Register or refresh this agent\'s presence with status detail. A live connection already counts as online (an open MCP event stream, `orboto messages --follow`, the agent WebSocket) - the heartbeat adds status: idle (default) | working (+workingOnTicketId) | blocked, capabilities (free-form strings for operator filters) and clientInfo.name (the runtime), and is the only presence path for turn-based clients without a standing connection. Rows older than 90 s count as offline; persist the returned sessionToken and send it on later heartbeats. `scope` { projectKeys, ticketKeys, role } declares this session\'s responsibility (ORB-2136); an empty object clears it.',
     inputSchema: z.object({
         sessionToken: z.string().nullable().optional(),
+        scope: AgentSessionScopeSchema.optional(),
         status: z.enum(['idle', 'working', 'blocked']).optional(),
         workingOnTicketId: z.string().uuid().nullable().optional(),
         capabilities: z.array(z.string()).optional(),
@@ -24,15 +26,17 @@ export const agentHeartbeatToolConfig = {
     outputSchema: z.object({
         sessionToken: z.string(),
         sessionId: z.string().uuid(),
+        scope: AgentSessionScopeSchema.nullable(),
     }).shape,
     annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: true },
 };
 export function makeAgentHeartbeatHandler(client) {
-    return async (args) => {
-        const res = await client.post('/v1/agent/heartbeat', args);
+    return async (args, extra) => {
+        const res = await client.post('/v1/agent/heartbeat', args, { instanceToken: mcpInstanceToken(undefined, extra) });
+        const scope = res.scope ? ` scope=${JSON.stringify(res.scope)}` : '';
         return {
-            content: [{ type: 'text', text: `heartbeat ack - sessionToken=${res.sessionToken.slice(0, 8)}…` }],
-            structuredContent: { sessionToken: res.sessionToken, sessionId: res.sessionId },
+            content: [{ type: 'text', text: `heartbeat ack - sessionToken=${res.sessionToken.slice(0, 8)}… session ${res.sessionId.slice(0, 8)}${scope}` }],
+            structuredContent: { sessionToken: res.sessionToken, sessionId: res.sessionId, scope: res.scope ?? null },
         };
     };
 }
@@ -80,7 +84,7 @@ export function makeAgentPresenceHandler(client) {
 }
 export const agentNotifyToolConfig = {
     title: 'Notify another agent / user',
-    description: 'Send a fire-and-forget message to a user (bot or human) by email; it lands in their inbox (orboto_messages) and, for humans, in-app. kind: info | request (answer expected) | complete (sub-task done) | error. payload: free-form JSON; threadId links a reply to the message it answers.',
+    description: 'Send a fire-and-forget message to a user (bot or human) by email; it lands in their inbox (orboto_messages) and, for humans, in-app. kind: info | request (answer expected) | complete (sub-task done) | error. payload: free-form JSON; threadId links a reply to the message it answers. toSessionRef (instance short id, session ref or id) reaches ONE session of the account; project scopes an account message to sessions declared on it (ORB-2136).',
     inputSchema: z.object({
         targetEmail: z.string().email(),
         kind: z.enum(['info', 'request', 'complete', 'error']).default('info'),
@@ -89,10 +93,12 @@ export const agentNotifyToolConfig = {
         threadId: z.string().uuid().optional(),
         project: z.string().min(1).max(64).optional().describe('Project key or UUID: scope the message to the recipient session working that project.'),
         senderRef: z.string().min(1).max(128).optional().describe('Sender-session ref for self-echo exclusion; defaults to this MCP session.'),
+        toSessionRef: z.string().min(1).max(200).optional(),
     }).shape,
     outputSchema: z.object({
         ok: z.literal(true),
         messageId: z.string().uuid(),
+        toSessionId: z.string().uuid().nullable(),
     }).shape,
     annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false },
 };
@@ -123,10 +129,11 @@ export function makeAgentBroadcastHandler(client) {
 export function makeAgentNotifyHandler(client) {
     return async (args, extra) => {
         const senderRef = mcpInstanceToken(args.senderRef, extra);
-        const res = await client.post('/v1/agent/notify', { ...args, senderRef });
+        const res = await client.post('/v1/agent/notify', { ...args, senderRef }, { instanceToken: mcpInstanceToken(undefined, extra) });
+        const target = res.toSessionId ? `${args.targetEmail} session ${res.toSessionId.slice(0, 8)}` : args.targetEmail;
         return {
-            content: [{ type: 'text', text: `notified ${args.targetEmail} (message ${res.messageId} - delivered live if connected, waits in their inbox otherwise)` }],
-            structuredContent: { ok: true, messageId: res.messageId },
+            content: [{ type: 'text', text: `notified ${target} (message ${res.messageId} - delivered live if connected, waits in their inbox otherwise)` }],
+            structuredContent: { ok: true, messageId: res.messageId, toSessionId: res.toSessionId ?? null },
         };
     };
 }

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

@@ -186,3 +186,50 @@ describe('orboto_messages (ORB-1742 self-echo exclusion)', () => {
         expect(urls[1]).not.toContain('excludeRef');
     });
 });
+describe('ORB-2136 - session addressing', () => {
+    it('agent_notify forwards toSessionRef and sends this MCP session as x-orboto-agent-session', async () => {
+        const seen = [];
+        vi.spyOn(globalThis, 'fetch').mockImplementation(async (_url, init) => {
+            seen.push({ body: JSON.parse(init?.body ?? '{}'), headers: (init?.headers ?? {}) });
+            return { ok: true, status: 200, statusText: 'OK', json: async () => ({ ok: true, messageId: '00000000-0000-4000-8000-000000000000', toSessionId: 'cbb52195-0000-4000-8000-000000000000' }), text: async () => '' };
+        });
+        const result = await makeAgentNotifyHandler(client)({ targetEmail: 'bob@example.com', subject: 'hi', toSessionRef: 'cbb52195' }, { sessionId: 'abc123' });
+        expect(seen[0].body).toMatchObject({ toSessionRef: 'cbb52195', senderRef: 'mcp-abc123' });
+        expect(seen[0].headers['x-orboto-agent-session']).toBe('mcp-abc123');
+        expect(result.content[0].text).toContain('bob@example.com session cbb52195');
+        expect(result.structuredContent).toMatchObject({ toSessionId: 'cbb52195-0000-4000-8000-000000000000' });
+    });
+    it('orboto_messages identifies this session on the fetch and renders sender and receiver identities', async () => {
+        const seen = [];
+        vi.spyOn(globalThis, 'fetch').mockImplementation(async (url, init) => {
+            seen.push({ url: String(url), headers: (init?.headers ?? {}) });
+            return {
+                ok: true, status: 200, statusText: 'OK',
+                json: async () => ({ sessionId: 'cbb52195-0000-4000-8000-000000000000', messages: [{
+                            id: 'm1', fromUserId: 'u1', toUserId: 'u2', fromSessionId: 's1', toSessionId: 's2',
+                            from: { userId: 'u1', email: 'spec@orboto.io', sessionId: 's1', role: 'spec', label: 'spec@orboto.io (spec, s1)' },
+                            to: { userId: 'u2', email: 'claude@orboto.io', sessionId: 's2', role: 'integrator', label: 'claude@orboto.io (integrator, s2)' },
+                            kind: 'request', subject: 'ticket-ready:ORB-1', payload: null, threadId: null, projectKey: 'ORB', createdAt: 'now', deliveredAt: null, readAt: null,
+                        }] }),
+                text: async () => '',
+            };
+        });
+        const result = await makeAgentMessagesHandler(client)({}, { sessionId: 'abc123' });
+        expect(seen[0].headers['x-orboto-agent-session']).toBe('mcp-abc123');
+        const text = result.content[0].text;
+        expect(text).toContain('from spec@orboto.io (spec, s1) to claude@orboto.io (integrator, s2)');
+        expect(text).toContain('This session: cbb52195 (ref mcp-abc123)');
+        expect(result.structuredContent).toMatchObject({ sessionId: 'cbb52195-0000-4000-8000-000000000000', messages: [{ from: { role: 'spec' }, to: { sessionId: 's2' } }] });
+    });
+    it('agent_heartbeat carries the scope and the session header', async () => {
+        const seen = [];
+        vi.spyOn(globalThis, 'fetch').mockImplementation(async (_url, init) => {
+            seen.push({ body: JSON.parse(init?.body ?? '{}'), headers: (init?.headers ?? {}) });
+            return { ok: true, status: 200, statusText: 'OK', json: async () => ({ sessionToken: 'mcp-abc123', sessionId: 'cbb52195-0000-4000-8000-000000000000', scope: { role: 'integrator', projectKeys: ['ORB'] } }), text: async () => '' };
+        });
+        const result = await makeAgentHeartbeatHandler(client)({ scope: { role: 'integrator', projectKeys: ['orb'] } }, { sessionId: 'abc123' });
+        expect(seen[0].body).toMatchObject({ scope: { role: 'integrator', projectKeys: ['orb'] } });
+        expect(seen[0].headers['x-orboto-agent-session']).toBe('mcp-abc123');
+        expect(result.structuredContent).toMatchObject({ scope: { role: 'integrator', projectKeys: ['ORB'] } });
+    });
+});

package/dist/tools/agent-messages.js

@@ -10,9 +10,10 @@
 import { z } from 'zod';
 import { makeAgentMessageWorkHandler } from './agent-message-work.js';
 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. 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.',
+    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).',
     inputSchema: z.object({
         messageWork: z.record(z.unknown()).optional()
             .describe('Work envelope {messageId, mutation, cursor, limit, openOnly}; schema: orboto_api_search.'),
@@ -24,9 +25,12 @@ export const agentMessagesToolConfig = {
     }).shape,
     outputSchema: z.object({
         work: z.record(z.unknown()).optional(),
+        sessionId: z.string().nullable().optional(),
         messages: z.array(z.object({
             id: z.string(),
             fromUserId: z.string(),
+            from: PartySchema,
+            to: PartySchema,
             kind: z.string(),
             subject: z.string(),
             payload: z.record(z.string(), z.unknown()).nullable(),
@@ -59,21 +63,24 @@ export function makeAgentMessagesHandler(client) {
             q.set('limit', String(args.limit));
         if (args.project)
             q.set('project', args.project);
-        if (!args.includeOwnSends) {
-            q.set('excludeRef', mcpInstanceToken(undefined, extra));
-        }
-        const { messages } = await client.get(`/v1/agent/messages${q.toString() ? `?${q.toString()}` : ''}`);
+        const instanceToken = mcpInstanceToken(undefined, extra);
+        if (!args.includeOwnSends)
+            q.set('excludeRef', instanceToken);
+        const { messages, sessionId } = await client.get(`/v1/agent/messages${q.toString() ? `?${q.toString()}` : ''}`, { instanceToken });
         const lines = messages.length === 0
             ? [acked > 0 ? `Acknowledged ${acked} message(s). Inbox empty.` : 'Inbox empty.']
-            : messages.map((m) => `[${m.kind}]${m.projectKey ? ` [${m.projectKey}]` : ''} ${m.subject} (from ${m.fromUserId}, ${m.createdAt}, id ${m.id}${m.threadId ? `, thread ${m.threadId}` : ''})${m.payload ? ` payload: ${JSON.stringify(m.payload)}` : ''}`);
+            : messages.map((m) => `[${m.kind}]${m.projectKey ? ` [${m.projectKey}]` : ''} ${m.subject} (from ${m.from?.label ?? m.fromUserId} to ${m.to?.label ?? m.toUserId}, ${m.createdAt}, id ${m.id}${m.threadId ? `, thread ${m.threadId}` : ''})${m.payload ? ` payload: ${JSON.stringify(m.payload)}` : ''}`);
         if (messages.length > 0) {
-            lines.push(`Acknowledge with ackIds once handled; reply via orboto_agent_notify with threadId.`);
+            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 (sessionId)
+            lines.push(`This session: ${sessionId.slice(0, 8)} (ref ${instanceToken}).`);
         return {
             content: [{ type: 'text', text: lines.join('\n') }],
             structuredContent: {
+                sessionId: sessionId ?? null,
                 messages: messages.map((m) => ({
-                    id: m.id, fromUserId: m.fromUserId, kind: m.kind, subject: m.subject,
+                    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,
                 })),

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

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import { AgentSessionScopeSchema } from './agent-session-scope.js';
 const WorkSessionResourceClaimSchema = z.object({
     kind: z.enum(['path', 'named']), value: z.string().min(1).max(500), mode: z.enum(['read', 'write']),
     state: z.enum(['granted', 'waiting']).optional(), requestedAt: z.string().optional(),
@@ -29,6 +30,10 @@ export const AgentInventoryEntrySchema = z.object({
     })),
     capabilities: z.array(z.string()),
     clientInfo: z.record(z.string(), z.string()),
+    /** ORB-2136 - the scope the session declared; null when it declared none. */
+    scope: AgentSessionScopeSchema.nullable(),
+    /** ORB-2136 - unread inbox messages this session would list. */
+    unreadMessages: z.number().int(),
     lastSeenAt: z.string(),
     createdAt: z.string(),
 });

package/dist/tools/agent-session-scope.js

@@ -0,0 +1,8 @@
+import { z } from 'zod';
+/** ORB-2136 - standalone mirror of `@orboto/shared-schema` agent-session-scope (the MCP package does not depend on it). */
+export const AgentSessionRoleSchema = z.enum(['integrator', 'lead', 'worker', 'spec', 'review', 'coordinator']);
+export const AgentSessionScopeSchema = z.object({
+    projectKeys: z.array(z.string()).optional(),
+    ticketKeys: z.array(z.string()).optional(),
+    role: AgentSessionRoleSchema.optional(),
+});

package/dist/tools/session-start.js

@@ -9,14 +9,15 @@
  * @see ORB-1605, ORB-1607, ORB-1818
  */
 import { z } from 'zod';
-import { resolveTicketByKey, applyAgentProfile } from './shared.js';
+import { resolveTicketByKey, applyAgentProfile, mcpInstanceToken } from './shared.js';
+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';
 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.) Read-only; no side effects. '
-        + '**Parameters.** `rulesOnly: true` returns ONLY the complete rules text (nothing else) and is never truncated - the cheapest way to read the rules the index listed. `projectId` adds that project\'s rules on top of the workspace + personal ones. `ticketKey` ("ACME-42") bundles that ticket\'s primer, full detail, dependencies, checklists, git health and other active agent sessions into the same response. `forceRules: true` returns the full rules text inline with the rest of the digest even when this connection already delivered them - use it whenever the rules are NOT in your context right now: after a compaction, a /clear, or a fresh agent taking over an existing connection. `agentKind` (coding, orchestrator, reviewer, runner) and `modelTier` (frontier, standard, small) are your self-declared classification; rule blocks and per-tier rule text are targeted by them.',
+    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. '
+        + '**Parameters.** `rulesOnly: true` returns ONLY the complete rules text (nothing else) and is never truncated - the cheapest way to read the rules the index listed. `projectId` adds that project\'s rules on top of the workspace + personal ones. `ticketKey` ("ACME-42") bundles that ticket\'s primer, full detail, dependencies, checklists, git health and other active agent sessions into the same response. `forceRules: true` returns the full rules text inline with the rest of the digest even when this connection already delivered them - use it whenever the rules are NOT in your context right now: after a compaction, a /clear, or a fresh agent taking over an existing connection. `agentKind` (coding, orchestrator, reviewer, runner) and `modelTier` (frontier, standard, small) are your self-declared classification; rule blocks and per-tier rule text are targeted by them. `scope` { projectKeys, ticketKeys, role } declares this session\'s responsibility; the returned session.ref is what peers pass as toSessionRef (ORB-2136).',
     inputSchema: z.object({
         projectId: z.string().uuid().optional().describe('Also load this project\'s rules.'),
         ticketKey: z.string().min(3).optional().describe('Ticket key ("ACME-42") - bundles that ticket\'s full context.'),
@@ -24,8 +25,9 @@ export const sessionStartToolConfig = {
         rulesOnly: z.boolean().optional().describe('Return ONLY the complete rules text.'),
         agentKind: z.string().min(1).max(32).optional().describe('coding | orchestrator | reviewer | runner.'),
         modelTier: z.string().min(1).max(32).optional().describe('frontier | standard | small.'),
+        scope: AgentSessionScopeSchema.optional(),
     }).shape,
-    annotations: { readOnlyHint: true, idempotentHint: true },
+    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: true },
 };
 const MAX_GIT_HEALTH_PROJECTS = 8;
 /** ORB-1607 - build the `--ticket` one-shot bundle. Never throws: an
@@ -128,7 +130,8 @@ async function buildTicketBundle(client, ticketKey) {
 }
 export function makeSessionStartHandler(client) {
     let lastKnownRulesHash;
-    return async (input = {}) => {
+    return async (input = {}, extra) => {
+        const instanceToken = mcpInstanceToken(undefined, extra);
         const rulesParams = new URLSearchParams();
         if (input.projectId)
             rulesParams.set('projectId', input.projectId);
@@ -163,16 +166,19 @@ export function makeSessionStartHandler(client) {
                 },
             };
         }
+        const registration = await client.post('/v1/agent/heartbeat', input.scope !== undefined ? { scope: input.scope } : {}, { instanceToken })
+            .then((r) => (r && typeof r.sessionId === 'string' ? { sessionId: r.sessionId, scope: r.scope ?? null } : null))
+            .catch(() => null);
         const [me, rules, assigned, timer, inboxRaw] = await Promise.all([
             client.get('/users/me').catch(() => null),
             loadRequiredRules(client, rulesPath, rulesParams.get('knownRulesHash') ?? undefined),
             client.get('/users/me/assigned-tickets?statuses=IN_PROGRESS,IN_REVIEW&limit=20').catch(() => ({ items: [] })),
             client.get('/time/timer').catch(() => null),
-            client.get('/v1/agent/messages?limit=10')
+            client.get('/v1/agent/messages?limit=10', { instanceToken })
                 .then((r) => (Array.isArray(r?.messages) ? r.messages : []))
                 .catch(() => []),
         ]);
-        const pendingMessages = inboxRaw.map((m) => ({ id: m.id, fromUserId: m.fromUserId, kind: m.kind, subject: m.subject, createdAt: m.createdAt }));
+        const pendingMessages = inboxRaw.map((m) => ({ id: m.id, fromUserId: m.fromUserId, from: m.from?.label ?? m.fromUserId, kind: m.kind, subject: m.subject, createdAt: m.createdAt }));
         const tickets = Array.isArray(assigned) ? assigned : (assigned?.items ?? []);
         const projectIds = [...new Set(tickets.map((t) => t.projectId).filter((id) => !!id))].slice(0, MAX_GIT_HEALTH_PROJECTS);
         const gitHealthByProject = await Promise.all(projectIds.map(async (projectId) => ({
@@ -245,10 +251,15 @@ export function makeSessionStartHandler(client) {
         }
         lines.push('', '## Timer');
         lines.push(timer?.ticketId ? `Running on ${timer.ticketKey ?? timer.ticketId} since ${timer.startedAt ?? 'earlier'}.` : 'No timer running.');
+        lines.push('', '## This session');
+        const scopeText = registration?.scope
+            ? [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 (pendingMessages.length > 0) {
             lines.push('', '## Agent messages - unread');
             for (const m of pendingMessages)
-                lines.push(`- [${m.kind}] ${m.subject} (from ${m.fromUserId}, ${m.createdAt}, id ${m.id})`);
+                lines.push(`- [${m.kind}] ${m.subject} (from ${m.from}, ${m.createdAt}, id ${m.id})`);
             lines.push('Handle them, then acknowledge via orboto_messages { ackIds: [...] }; reply via orboto_agent_notify with threadId.');
         }
         if (bundle)
@@ -274,6 +285,7 @@ export function makeSessionStartHandler(client) {
                 })),
                 ...(elsewhereCount > 0 ? { inProgressElsewhereCount: elsewhereCount } : {}),
                 timer: timer?.ticketId ? { ticketKey: timer.ticketKey ?? null, startedAt: timer.startedAt ?? null } : null,
+                session: { ref: instanceToken, id: registration?.sessionId ?? null, scope: registration?.scope ?? null },
                 gitHealth: {
                     unhealthy: gitHealthWithConnections
                         .map((p) => ({ projectId: p.projectId, connections: p.connections.filter((c) => !c.healthy) }))

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

@@ -523,3 +523,47 @@ describe('ORB-1818 - rules index instead of the full rule text', () => {
         expect(res.content[0].text).toContain(RULES_TEXT);
     });
 });
+describe('ORB-2136 - session scope and ref', () => {
+    it('registers the scope on this MCP session via heartbeat with the session header and reports the session ref', async () => {
+        const seen = [];
+        vi.spyOn(globalThis, 'fetch').mockImplementation(async (url, init) => {
+            const u = new URL(url.toString());
+            const path = u.pathname + u.search;
+            seen.push({ path, headers: (init?.headers ?? {}), body: init?.body ? JSON.parse(init.body) : undefined });
+            const map = {
+                '/v1/agent/heartbeat': { sessionToken: 'mcp-abc123', sessionId: 'cbb52195-0000-4000-8000-000000000000', scope: { role: 'integrator', projectKeys: ['ORB'] } },
+                '/users/me/assigned-tickets': { items: [] },
+                '/users/me': { email: 'dev@x.io', fullName: 'Dev' },
+                '/agent-instructions': { instructions: 'rules here', rulesHash: 'fixture' },
+                '/time/timer': {},
+                '/v1/agent/messages': { sessionId: 'cbb52195-0000-4000-8000-000000000000', messages: [{ id: 'm1', fromUserId: 'u1', from: { label: 'spec@orboto.io (spec, s1)' }, kind: 'request', subject: 'ticket-ready:ORB-1', createdAt: 'now' }] },
+            };
+            const key = Object.keys(map).find((k) => path.startsWith(k));
+            return { ok: true, status: 200, statusText: 'OK', json: async () => (key ? map[key] : {}), text: async () => '' };
+        });
+        const res = await makeSessionStartHandler(client)({ scope: { role: 'integrator', projectKeys: ['orb'] } }, { sessionId: 'abc123' });
+        const beat = seen.find((c) => c.path === '/v1/agent/heartbeat');
+        expect(beat?.headers['x-orboto-agent-session']).toBe('mcp-abc123');
+        expect(beat?.body).toEqual({ scope: { role: 'integrator', projectKeys: ['orb'] } });
+        expect(seen.find((c) => c.path.startsWith('/v1/agent/messages'))?.headers['x-orboto-agent-session']).toBe('mcp-abc123');
+        const text = res.content[0].text;
+        expect(text).toContain('ref mcp-abc123, instance cbb52195. role integrator; projects ORB');
+        expect(text).toContain('toSessionRef: "cbb52195"');
+        expect(text).toContain('from spec@orboto.io (spec, s1)');
+        expect(res.structuredContent).toMatchObject({ session: { ref: 'mcp-abc123', id: 'cbb52195-0000-4000-8000-000000000000', scope: { role: 'integrator', projectKeys: ['ORB'] } } });
+    });
+    it('without a scope the heartbeat body stays empty and the digest says no scope is declared', async () => {
+        const seen = [];
+        vi.spyOn(globalThis, 'fetch').mockImplementation(async (url, init) => {
+            const u = new URL(url.toString());
+            seen.push({ path: u.pathname, body: init?.body ? JSON.parse(init.body) : undefined });
+            const body = u.pathname === '/v1/agent/heartbeat'
+                ? { sessionToken: 'x', sessionId: 'cbb52195-0000-4000-8000-000000000000', scope: null }
+                : u.pathname === '/agent-instructions' ? { instructions: 'rules here', rulesHash: 'fixture' } : {};
+            return { ok: true, status: 200, statusText: 'OK', json: async () => body, text: async () => '' };
+        });
+        const res = await makeSessionStartHandler(client)({}, { sessionId: 'abc123' });
+        expect(seen.find((c) => c.path === '/v1/agent/heartbeat')?.body).toEqual({});
+        expect(res.content[0].text).toContain('no scope declared');
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orboto/mcp",
-  "version": "0.197.0",
+  "version": "0.198.0",
   "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",