fix: enforce Tess session ownership scope (#715)

2026-07-12 22:14:17 +00:00
parent ca9c2b5c23
commit 353e43c947
13 changed files with 750 additions and 145 deletions
--- a/apps/gateway/src/commands/command-executor-p8012.spec.ts
+++ b/apps/gateway/src/commands/command-executor-p8012.spec.ts
@@ -89,6 +89,7 @@ function buildService(): CommandExecutorService {
 describe('CommandExecutorService — P8-012 commands', () => {
  let service: CommandExecutorService;
  const userId = 'user-123';
+  const userScope = { userId, tenantId: userId };
  const conversationId = 'conv-456';

  beforeEach(() => {
@@ -99,7 +100,7 @@ describe('CommandExecutorService — P8-012 commands', () => {
  // /provider login — missing provider name
  it('/provider login with no provider name returns usage error', async () => {
    const payload: SlashCommandPayload = { command: 'provider', args: 'login', conversationId };
-    const result = await service.execute(payload, userId);
+    const result = await service.execute(payload, userScope);
    expect(result.success).toBe(false);
    expect(result.message).toContain('Usage: /provider login');
    expect(result.command).toBe('provider');
@@ -112,7 +113,7 @@ describe('CommandExecutorService — P8-012 commands', () => {
      args: 'login anthropic',
      conversationId,
    };
-    const result = await service.execute(payload, userId);
+    const result = await service.execute(payload, userScope);
    expect(result.success).toBe(true);
    expect(result.command).toBe('provider');
    expect(result.message).toContain('anthropic');
@@ -138,7 +139,7 @@ describe('CommandExecutorService — P8-012 commands', () => {
  // /provider with no args — returns usage
  it('/provider with no args returns usage message', async () => {
    const payload: SlashCommandPayload = { command: 'provider', conversationId };
-    const result = await service.execute(payload, userId);
+    const result = await service.execute(payload, userScope);
    expect(result.success).toBe(true);
    expect(result.message).toContain('Usage: /provider');
  });
@@ -146,7 +147,7 @@ describe('CommandExecutorService — P8-012 commands', () => {
  // /provider list
  it('/provider list returns success', async () => {
    const payload: SlashCommandPayload = { command: 'provider', args: 'list', conversationId };
-    const result = await service.execute(payload, userId);
+    const result = await service.execute(payload, userScope);
    expect(result.success).toBe(true);
    expect(result.command).toBe('provider');
  });
@@ -154,7 +155,7 @@ describe('CommandExecutorService — P8-012 commands', () => {
  // /provider logout with no name — usage error
  it('/provider logout with no name returns error', async () => {
    const payload: SlashCommandPayload = { command: 'provider', args: 'logout', conversationId };
-    const result = await service.execute(payload, userId);
+    const result = await service.execute(payload, userScope);
    expect(result.success).toBe(false);
    expect(result.message).toContain('Usage: /provider logout');
  });
@@ -166,7 +167,7 @@ describe('CommandExecutorService — P8-012 commands', () => {
      args: 'unknown',
      conversationId,
    };
-    const result = await service.execute(payload, userId);
+    const result = await service.execute(payload, userScope);
    expect(result.success).toBe(false);
    expect(result.message).toContain('Unknown subcommand');
  });
@@ -174,7 +175,7 @@ describe('CommandExecutorService — P8-012 commands', () => {
  // /mission status
  it('/mission status returns stub message', async () => {
    const payload: SlashCommandPayload = { command: 'mission', args: 'status', conversationId };
-    const result = await service.execute(payload, userId);
+    const result = await service.execute(payload, userScope);
    expect(result.success).toBe(true);
    expect(result.command).toBe('mission');
    expect(result.message).toContain('Mission status');
@@ -183,7 +184,7 @@ describe('CommandExecutorService — P8-012 commands', () => {
  // /mission with no args
  it('/mission with no args returns status stub', async () => {
    const payload: SlashCommandPayload = { command: 'mission', conversationId };
-    const result = await service.execute(payload, userId);
+    const result = await service.execute(payload, userScope);
    expect(result.success).toBe(true);
    expect(result.message).toContain('Mission status');
  });
@@ -195,7 +196,7 @@ describe('CommandExecutorService — P8-012 commands', () => {
      args: 'set my-mission-123',
      conversationId,
    };
-    const result = await service.execute(payload, userId);
+    const result = await service.execute(payload, userScope);
    expect(result.success).toBe(true);
    expect(result.message).toContain('my-mission-123');
  });
@@ -203,7 +204,7 @@ describe('CommandExecutorService — P8-012 commands', () => {
  // /agent list
  it('/agent list returns stub message', async () => {
    const payload: SlashCommandPayload = { command: 'agent', args: 'list', conversationId };
-    const result = await service.execute(payload, userId);
+    const result = await service.execute(payload, userScope);
    expect(result.success).toBe(true);
    expect(result.command).toBe('agent');
    expect(result.message).toContain('agent');
@@ -212,7 +213,7 @@ describe('CommandExecutorService — P8-012 commands', () => {
  // /agent with no args
  it('/agent with no args returns usage', async () => {
    const payload: SlashCommandPayload = { command: 'agent', conversationId };
-    const result = await service.execute(payload, userId);
+    const result = await service.execute(payload, userScope);
    expect(result.success).toBe(true);
    expect(result.message).toContain('Usage: /agent');
  });
@@ -224,7 +225,7 @@ describe('CommandExecutorService — P8-012 commands', () => {
      args: 'my-agent-id',
      conversationId,
    };
-    const result = await service.execute(payload, userId);
+    const result = await service.execute(payload, userScope);
    expect(result.success).toBe(true);
    expect(result.message).toContain('my-agent-id');
  });
@@ -232,7 +233,7 @@ describe('CommandExecutorService — P8-012 commands', () => {
  // /prdy
  it('/prdy returns PRD wizard message', async () => {
    const payload: SlashCommandPayload = { command: 'prdy', conversationId };
-    const result = await service.execute(payload, userId);
+    const result = await service.execute(payload, userScope);
    expect(result.success).toBe(true);
    expect(result.command).toBe('prdy');
    expect(result.message).toContain('mosaic prdy');
@@ -241,7 +242,7 @@ describe('CommandExecutorService — P8-012 commands', () => {
  // /tools
  it('/tools returns tools stub message', async () => {
    const payload: SlashCommandPayload = { command: 'tools', conversationId };
-    const result = await service.execute(payload, userId);
+    const result = await service.execute(payload, userScope);
    expect(result.success).toBe(true);
    expect(result.command).toBe('tools');
    expect(result.message).toContain('tools');
--- a/apps/gateway/src/commands/command-executor.service.ts
+++ b/apps/gateway/src/commands/command-executor.service.ts
@@ -3,6 +3,7 @@ import type { QueueHandle } from '@mosaicstack/queue';
 import type { Brain } from '@mosaicstack/brain';
 import type { SlashCommandPayload, SlashCommandResultPayload } from '@mosaicstack/types';
 import { AgentService } from '../agent/agent.service.js';
+import type { ActorTenantScope } from '../auth/session-scope.js';
 import { ChatGateway } from '../chat/chat.gateway.js';
 import { SessionGCService } from '../gc/session-gc.service.js';
 import { SystemOverrideService } from '../preferences/system-override.service.js';
@@ -34,8 +35,12 @@ export class CommandExecutorService {
    private readonly mcpClient: McpClientService | null,
  ) {}

-  async execute(payload: SlashCommandPayload, userId: string): Promise<SlashCommandResultPayload> {
+  async execute(
+    payload: SlashCommandPayload,
+    scope: ActorTenantScope,
+  ): Promise<SlashCommandResultPayload> {
    const { command, args, conversationId } = payload;
+    const userId = scope.userId;

    const def = this.registry.getManifest().commands.find((c) => c.name === command);
    if (!def) {
@@ -50,11 +55,11 @@ export class CommandExecutorService {
    try {
      switch (command) {
        case 'model':
-          return await this.handleModel(args ?? null, conversationId);
+          return await this.handleModel(args ?? null, conversationId, scope);
        case 'thinking':
          return await this.handleThinking(args ?? null, conversationId);
        case 'system':
-          return await this.handleSystem(args ?? null, conversationId);
+          return await this.handleSystem(args ?? null, conversationId, scope);
        case 'new':
          return {
            command,
@@ -94,7 +99,7 @@ export class CommandExecutorService {
          };
        }
        case 'agent':
-          return await this.handleAgent(args ?? null, conversationId, userId);
+          return await this.handleAgent(args ?? null, conversationId, scope);
        case 'provider':
          return await this.handleProvider(args ?? null, userId, conversationId);
        case 'mission':
@@ -146,10 +151,11 @@ export class CommandExecutorService {
  private async handleModel(
    args: string | null,
    conversationId: string,
+    scope: ActorTenantScope,
  ): Promise<SlashCommandResultPayload> {
    if (!args || args.trim().length === 0) {
      // Show current override or usage hint
-      const currentOverride = this.chatGateway?.getModelOverride(conversationId);
+      const currentOverride = this.chatGateway?.getModelOverride(conversationId, scope);
      if (currentOverride) {
        return {
          command: 'model',
@@ -171,7 +177,7 @@ export class CommandExecutorService {

    // /model clear removes the override and re-enables automatic routing
    if (modelName === 'clear') {
-      this.chatGateway?.setModelOverride(conversationId, null);
+      this.chatGateway?.setModelOverride(conversationId, null, scope);
      return {
        command: 'model',
        conversationId,
@@ -181,9 +187,9 @@ export class CommandExecutorService {
    }

    // Set the sticky per-session override (M4-007)
-    this.chatGateway?.setModelOverride(conversationId, modelName);
+    this.chatGateway?.setModelOverride(conversationId, modelName, scope);

-    const session = this.agentService.getSession(conversationId);
+    const session = this.agentService.getSession(conversationId, scope);
    if (!session) {
      return {
        command: 'model',
@@ -224,10 +230,11 @@ export class CommandExecutorService {
  private async handleSystem(
    args: string | null,
    conversationId: string,
+    scope: ActorTenantScope,
  ): Promise<SlashCommandResultPayload> {
    if (!args || args.trim().length === 0) {
      // Clear the override when called with no args
-      await this.systemOverride.clear(conversationId);
+      await this.systemOverride.clear(conversationId, scope);
      return {
        command: 'system',
        conversationId,
@@ -236,7 +243,7 @@ export class CommandExecutorService {
      };
    }

-    await this.systemOverride.set(conversationId, args.trim());
+    await this.systemOverride.set(conversationId, args.trim(), scope);
    return {
      command: 'system',
      conversationId,
@@ -248,8 +255,9 @@ export class CommandExecutorService {
  private async handleAgent(
    args: string | null,
    conversationId: string,
-    userId: string,
+    scope: ActorTenantScope,
  ): Promise<SlashCommandResultPayload> {
+    const userId = scope.userId;
    if (!args) {
      return {
        command: 'agent',
@@ -338,11 +346,14 @@ export class CommandExecutorService {
        conversationId,
        agentConfig.id,
        agentConfig.name,
+        scope,
        agentConfig.model ?? undefined,
      );

      // Broadcast updated session:info so TUI TopBar reflects new agent/model
-      this.chatGateway?.broadcastSessionInfo(conversationId, { agentName: agentConfig.name });
+      this.chatGateway?.broadcastSessionInfo(conversationId, scope, {
+        agentName: agentConfig.name,
+      });

      this.logger.log(
        `Agent switched to "${agentConfig.name}" (${agentConfig.id}) for conversation ${conversationId} (M5-003)`,
--- a/apps/gateway/src/commands/commands.integration.spec.ts
+++ b/apps/gateway/src/commands/commands.integration.spec.ts
@@ -159,6 +159,7 @@ describe('CommandExecutorService — integration', () => {
  let registry: CommandRegistryService;
  let executor: CommandExecutorService;
  const userId = 'user-integ-001';
+  const userScope = { userId, tenantId: userId };
  const conversationId = 'conv-integ-001';

  beforeEach(() => {
@@ -170,7 +171,7 @@ describe('CommandExecutorService — integration', () => {
  // Unknown command returns error
  it('unknown command returns success:false with descriptive message', async () => {
    const payload: SlashCommandPayload = { command: 'nonexistent', conversationId };
-    const result = await executor.execute(payload, userId);
+    const result = await executor.execute(payload, userScope);
    expect(result.success).toBe(false);
    expect(result.message).toContain('nonexistent');
    expect(result.command).toBe('nonexistent');
@@ -179,7 +180,7 @@ describe('CommandExecutorService — integration', () => {
  // /gc handler calls SessionGCService.sweepOrphans (admin-only, no userId arg)
  it('/gc calls SessionGCService.sweepOrphans without arguments', async () => {
    const payload: SlashCommandPayload = { command: 'gc', conversationId };
-    const result = await executor.execute(payload, userId);
+    const result = await executor.execute(payload, userScope);
    expect(mockSessionGC.sweepOrphans).toHaveBeenCalledWith();
    expect(result.success).toBe(true);
    expect(result.message).toContain('GC sweep complete');
@@ -190,8 +191,8 @@ describe('CommandExecutorService — integration', () => {
  it('/system with text calls SystemOverrideService.set', async () => {
    const override = 'You are a helpful assistant.';
    const payload: SlashCommandPayload = { command: 'system', args: override, conversationId };
-    const result = await executor.execute(payload, userId);
-    expect(mockSystemOverride.set).toHaveBeenCalledWith(conversationId, override);
+    const result = await executor.execute(payload, userScope);
+    expect(mockSystemOverride.set).toHaveBeenCalledWith(conversationId, override, userScope);
    expect(result.success).toBe(true);
    expect(result.message).toContain('override set');
  });
@@ -199,8 +200,8 @@ describe('CommandExecutorService — integration', () => {
  // /system with no args clears the override
  it('/system with no args calls SystemOverrideService.clear', async () => {
    const payload: SlashCommandPayload = { command: 'system', conversationId };
-    const result = await executor.execute(payload, userId);
-    expect(mockSystemOverride.clear).toHaveBeenCalledWith(conversationId);
+    const result = await executor.execute(payload, userScope);
+    expect(mockSystemOverride.clear).toHaveBeenCalledWith(conversationId, userScope);
    expect(result.success).toBe(true);
    expect(result.message).toContain('cleared');
  });
@@ -212,7 +213,7 @@ describe('CommandExecutorService — integration', () => {
      args: 'claude-3-opus',
      conversationId,
    };
-    const result = await executor.execute(payload, userId);
+    const result = await executor.execute(payload, userScope);
    expect(result.success).toBe(true);
    expect(result.command).toBe('model');
    expect(result.message).toContain('claude-3-opus');
@@ -221,7 +222,7 @@ describe('CommandExecutorService — integration', () => {
  // /thinking with valid level returns success
  it('/thinking with valid level returns success', async () => {
    const payload: SlashCommandPayload = { command: 'thinking', args: 'high', conversationId };
-    const result = await executor.execute(payload, userId);
+    const result = await executor.execute(payload, userScope);
    expect(result.success).toBe(true);
    expect(result.message).toContain('high');
  });
@@ -229,7 +230,7 @@ describe('CommandExecutorService — integration', () => {
  // /thinking with invalid level returns usage message
  it('/thinking with invalid level returns usage message', async () => {
    const payload: SlashCommandPayload = { command: 'thinking', args: 'invalid', conversationId };
-    const result = await executor.execute(payload, userId);
+    const result = await executor.execute(payload, userScope);
    expect(result.success).toBe(true);
    expect(result.message).toContain('Usage:');
  });
@@ -237,7 +238,7 @@ describe('CommandExecutorService — integration', () => {
  // /new command returns success
  it('/new returns success', async () => {
    const payload: SlashCommandPayload = { command: 'new', conversationId };
-    const result = await executor.execute(payload, userId);
+    const result = await executor.execute(payload, userScope);
    expect(result.success).toBe(true);
    expect(result.command).toBe('new');
  });
@@ -245,7 +246,7 @@ describe('CommandExecutorService — integration', () => {
  // /reload without reloadService returns failure
  it('/reload without ReloadService returns failure', async () => {
    const payload: SlashCommandPayload = { command: 'reload', conversationId };
-    const result = await executor.execute(payload, userId);
+    const result = await executor.execute(payload, userScope);
    expect(result.success).toBe(false);
    expect(result.message).toContain('ReloadService');
  });
@@ -255,7 +256,7 @@ describe('CommandExecutorService — integration', () => {
  for (const cmd of stubCommands) {
    it(`/${cmd} returns success (stub)`, async () => {
      const payload: SlashCommandPayload = { command: cmd, conversationId };
-      const result = await executor.execute(payload, userId);
+      const result = await executor.execute(payload, userScope);
      expect(result.success).toBe(true);
      expect(result.command).toBe(cmd);
    });