@saluzi/saluzi-edu 0.2.63 → 0.2.64

package/packages/remote-control-server/src/__tests__/attach.test.ts

@@ -0,0 +1,521 @@
+import { describe, test, expect, beforeEach, mock } from 'bun:test'
+import { mockConfigModule } from './helpers/mock-config'
+
+// Mock config before any module imports
+mock.module('../config', () => mockConfigModule())
+
+import { Hono } from 'hono'
+import type { Database } from 'bun:sqlite'
+import { randomUUID } from 'node:crypto'
+import { tmpdir } from 'node:os'
+import { resolve } from 'node:path'
+import v1Sessions from '../routes/v1/sessions'
+import {
+  storeReset,
+  storeCreateEnvironment,
+  storeGetEnvironment,
+  storeRebindSessionEnvironment,
+  storeUpdateEnvironment,
+} from '../store'
+import { initDatabase, resetDbSingleton, getDb } from '../db/sqlite'
+import { issueSessionToken } from '../auth/session'
+import { createUserDirectly } from './helpers/fixtures'
+import { createSession } from '../services/session'
+import { storeBindSession } from '../store'
+import { createWorkItem } from '../services/work-dispatch'
+
+/**
+ * Session Attach endpoints (P1):
+ *
+ * - POST /v1/sessions/:id/attach — bind an existing session to a CLI env.
+ *   Ownership via canManageSession (G9), occupancy via work items, env
+ *   ownership + repl single-session cap enforced, idempotent re-entry.
+ * - GET /v1/sessions/attachable — manageable, non-ACP, open sessions.
+ * - GET /v1/sessions/:id/events — merged persisted + bus history for CLI
+ *   hydration (bridge auth, management rights required).
+ */
+
+function freshDb(): Database {
+  try {
+    resetDbSingleton()
+  } catch {}
+  const path = resolve(
+    tmpdir(),
+    `rcs-attach-${randomUUID().replace(/-/g, '').slice(0, 8)}.db`,
+  )
+  return initDatabase(path)
+}
+
+function createUser(
+  db: Database,
+  role = 'member',
+): { id: string; username: string } {
+  const username = `user_${randomUUID().slice(0, 6)}`
+  const user = createUserDirectly(db, { username, role })
+  return { id: user.id, username: user.username }
+}
+
+/** Bearer header with a SQLite rct_* token resolving to the users.id. */
+function rctAuth(userId: string): string {
+  return `Bearer ${issueSessionToken(userId, getDb()).accessToken}`
+}
+
+const ADMIN_KEY = { Authorization: 'Bearer test-api-key' }
+const JSON_HDRS = { 'Content-Type': 'application/json' }
+
+function createApp() {
+  const app = new Hono()
+  app.route('/v1/sessions', v1Sessions)
+  return app
+}
+
+interface World {
+  owner: { id: string; username: string }
+  stranger: { id: string; username: string }
+  envId: string
+  sessionId: string
+}
+
+/**
+ * Seed: owner user + own env (owner_user_id = owner) + own session bound to
+ * the owner and the env.
+ */
+function seedWorld(db: Database, envWorkerType = 'repl'): World {
+  const owner = createUser(db)
+  const stranger = createUser(db)
+  const env = storeCreateEnvironment({
+    secret: 'test-api-key',
+    machineName: 'mac1',
+    workerType: envWorkerType,
+    ownerUserId: owner.id,
+  })
+  const session = createSession({
+    environment_id: env.id,
+    title: 'Existing session',
+    source: 'web',
+  })
+  storeBindSession(session.id, owner.id, 'user')
+  return { owner, stranger, envId: env.id, sessionId: session.id }
+}
+
+describe('POST /v1/sessions/:id/attach', () => {
+  let app: Hono
+  let db: Database
+
+  beforeEach(() => {
+    db = freshDb()
+    storeReset()
+    app = createApp()
+  })
+
+  test('happy path: owner attaches own session to own env → 200 + work item + rebind', async () => {
+    const world = seedWorld(db)
+    const res = await app.request(`/v1/sessions/${world.sessionId}/attach`, {
+      method: 'POST',
+      headers: { ...JSON_HDRS, Authorization: rctAuth(world.owner.id) },
+      body: JSON.stringify({ environment_id: world.envId }),
+    })
+    expect(res.status).toBe(200)
+    const body = (await res.json()) as {
+      status: string
+      session_id: string
+      work_item_id: string
+      rebind: boolean
+    }
+    expect(body.status).toBe('attached')
+    expect(body.session_id).toBe(world.sessionId)
+    expect(body.work_item_id).toMatch(/^work_/)
+
+    // Rebind persisted to SQLite.
+    const row = db
+      .query('SELECT environment_id FROM sessions WHERE id = $id')
+      .get({ $id: world.sessionId }) as { environment_id: string }
+    expect(row.environment_id).toBe(world.envId)
+  })
+
+  test('idempotent re-entry: second attach on same env returns the existing work item', async () => {
+    const world = seedWorld(db)
+    const attach = () =>
+      app.request(`/v1/sessions/${world.sessionId}/attach`, {
+        method: 'POST',
+        headers: { ...JSON_HDRS, Authorization: rctAuth(world.owner.id) },
+        body: JSON.stringify({ environment_id: world.envId }),
+      })
+    const first = await attach()
+    expect(first.status).toBe(200)
+    const firstBody = (await first.json()) as { work_item_id: string }
+
+    const second = await attach()
+    expect(second.status).toBe(200)
+    const secondBody = (await second.json()) as {
+      work_item_id: string
+      idempotent: boolean
+    }
+    expect(secondBody.idempotent).toBe(true)
+    expect(secondBody.work_item_id).toBe(firstBody.work_item_id)
+  })
+
+  test('session_busy: active work item on a different env → 409', async () => {
+    const world = seedWorld(db)
+    const otherEnv = storeCreateEnvironment({
+      secret: 'test-api-key',
+      machineName: 'mac2',
+      ownerUserId: world.owner.id,
+    })
+    // A worker already holds the lease on the other env.
+    await createWorkItem(otherEnv.id, world.sessionId)
+
+    const res = await app.request(`/v1/sessions/${world.sessionId}/attach`, {
+      method: 'POST',
+      headers: { ...JSON_HDRS, Authorization: rctAuth(world.owner.id) },
+      body: JSON.stringify({ environment_id: world.envId }),
+    })
+    expect(res.status).toBe(409)
+    const body = (await res.json()) as { error: { type: string } }
+    expect(body.error.type).toBe('session_busy')
+  })
+
+  test('stale lease on a dead env does NOT occupy: crashed attach CLI is re-attachable', async () => {
+    const world = seedWorld(db)
+    const crashedEnv = storeCreateEnvironment({
+      secret: 'test-api-key',
+      machineName: 'crashed',
+      ownerUserId: world.owner.id,
+    })
+    // kill -9 before deregister: the acked item stays on the now-dead env.
+    // (The session itself is bound to world.envId — seedWorld — so a
+    // successful attach here proves the dead-env lease was not honored.)
+    await createWorkItem(crashedEnv.id, world.sessionId)
+    storeUpdateEnvironment(crashedEnv.id, { status: 'disconnected' })
+
+    const res = await app.request(`/v1/sessions/${world.sessionId}/attach`, {
+      method: 'POST',
+      headers: { ...JSON_HDRS, Authorization: rctAuth(world.owner.id) },
+      body: JSON.stringify({ environment_id: world.envId }),
+    })
+    expect(res.status).toBe(200)
+    const body = (await res.json()) as {
+      status: string
+      rebind: boolean
+      idempotent: boolean
+    }
+    expect(body.status).toBe('attached')
+    // Session already points at the target env — no rebind, and a FRESH work
+    // item (not the same-env idempotent path, which would return the dead
+    // env's stale item).
+    expect(body.rebind).toBe(false)
+    expect(body.idempotent).toBeUndefined()
+  })
+
+  test('idempotent re-entry bypasses manage-rights check (doReconnect re-bind)', async () => {
+    // Wait-mode scenario: a team admin bound the session to the caller's env;
+    // the caller itself has no manage rights. The re-bind after env loss must
+    // still succeed via the same-env idempotent path.
+    const world = seedWorld(db)
+    const admin = createUser(db, 'admin')
+    // Attach once WITH rights (owner) so a work item exists on world.envId.
+    const first = await app.request(`/v1/sessions/${world.sessionId}/attach`, {
+      method: 'POST',
+      headers: { ...JSON_HDRS, Authorization: rctAuth(world.owner.id) },
+      body: JSON.stringify({ environment_id: world.envId }),
+    })
+    expect(first.status).toBe(200)
+    void admin
+
+    // Re-entry as the STRANGER (no manage rights) but same env → 200.
+    // Note: env ownership also matches the stranger? No — the env belongs to
+    // owner; but the idempotent check runs BEFORE both the access and env
+    // ownership checks, so the re-entry returns the existing binding.
+    const second = await app.request(`/v1/sessions/${world.sessionId}/attach`, {
+      method: 'POST',
+      headers: { ...JSON_HDRS, Authorization: rctAuth(world.stranger.id) },
+      body: JSON.stringify({ environment_id: world.envId }),
+    })
+    expect(second.status).toBe(200)
+    const body = (await second.json()) as { idempotent: boolean }
+    expect(body.idempotent).toBe(true)
+  })
+
+  test("stranger's rct token → 403 (canManageSession, G9)", async () => {
+    const world = seedWorld(db)
+    const res = await app.request(`/v1/sessions/${world.sessionId}/attach`, {
+      method: 'POST',
+      headers: { ...JSON_HDRS, Authorization: rctAuth(world.stranger.id) },
+      body: JSON.stringify({ environment_id: world.envId }),
+    })
+    expect(res.status).toBe(403)
+  })
+
+  test('env owned by another user → 403 even for the session owner', async () => {
+    const world = seedWorld(db)
+    const foreignEnv = storeCreateEnvironment({
+      secret: 'test-api-key',
+      machineName: 'foreign',
+      ownerUserId: world.stranger.id,
+    })
+    const res = await app.request(`/v1/sessions/${world.sessionId}/attach`, {
+      method: 'POST',
+      headers: { ...JSON_HDRS, Authorization: rctAuth(world.owner.id) },
+      body: JSON.stringify({ environment_id: foreignEnv.id }),
+    })
+    expect(res.status).toBe(403)
+  })
+
+  test('unowned env → 409 environment_unowned (claim flow pending)', async () => {
+    const owner = createUser(db)
+    const env = storeCreateEnvironment({
+      secret: 'test-api-key',
+      machineName: 'unclaimed',
+    })
+    const session = createSession({
+      environment_id: null,
+      title: 'Web session',
+      source: 'web',
+    })
+    storeBindSession(session.id, owner.id, 'user')
+
+    const res = await app.request(`/v1/sessions/${session.id}/attach`, {
+      method: 'POST',
+      headers: { ...JSON_HDRS, Authorization: rctAuth(owner.id) },
+      body: JSON.stringify({ environment_id: env.id }),
+    })
+    expect(res.status).toBe(409)
+    const body = (await res.json()) as { error: { type: string } }
+    expect(body.error.type).toBe('environment_unowned')
+  })
+
+  test('archived session → 409 session_closed', async () => {
+    const world = seedWorld(db)
+    const { archiveSession } = await import('../services/session')
+    archiveSession(world.sessionId)
+
+    const res = await app.request(`/v1/sessions/${world.sessionId}/attach`, {
+      method: 'POST',
+      headers: { ...JSON_HDRS, Authorization: rctAuth(world.owner.id) },
+      body: JSON.stringify({ environment_id: world.envId }),
+    })
+    expect(res.status).toBe(409)
+    const body = (await res.json()) as { error: { type: string } }
+    expect(body.error.type).toBe('session_closed')
+  })
+
+  test('ACP session → 409 acp_session', async () => {
+    const world = seedWorld(db)
+    // ACP env with its own auto-created session.
+    const acpEnv = storeCreateEnvironment({
+      secret: 'test-api-key',
+      machineName: 'acp-agent',
+      workerType: 'acp',
+      ownerUserId: world.owner.id,
+    })
+    const acpSession = createSession({
+      environment_id: acpEnv.id,
+      title: 'ACP Agent',
+      source: 'acp',
+    })
+    storeBindSession(acpSession.id, world.owner.id, 'user')
+
+    const res = await app.request(`/v1/sessions/${acpSession.id}/attach`, {
+      method: 'POST',
+      headers: { ...JSON_HDRS, Authorization: rctAuth(world.owner.id) },
+      body: JSON.stringify({ environment_id: world.envId }),
+    })
+    expect(res.status).toBe(409)
+    const body = (await res.json()) as { error: { type: string } }
+    expect(body.error.type).toBe('acp_session')
+  })
+
+  test('repl env at capacity → 409 worker_at_capacity', async () => {
+    const world = seedWorld(db)
+    // A second open session already lives on the repl env.
+    const other = createSession({
+      environment_id: world.envId,
+      title: 'Other session',
+      source: 'web',
+    })
+    storeBindSession(other.id, world.owner.id, 'user')
+
+    const res = await app.request(`/v1/sessions/${world.sessionId}/attach`, {
+      method: 'POST',
+      headers: { ...JSON_HDRS, Authorization: rctAuth(world.owner.id) },
+      body: JSON.stringify({ environment_id: world.envId }),
+    })
+    expect(res.status).toBe(409)
+    const body = (await res.json()) as { error: { type: string } }
+    expect(body.error.type).toBe('worker_at_capacity')
+  })
+
+  test('missing environment_id → 400', async () => {
+    const world = seedWorld(db)
+    const res = await app.request(`/v1/sessions/${world.sessionId}/attach`, {
+      method: 'POST',
+      headers: { ...JSON_HDRS, Authorization: rctAuth(world.owner.id) },
+      body: JSON.stringify({}),
+    })
+    expect(res.status).toBe(400)
+  })
+
+  test('unknown session id → 404', async () => {
+    const world = seedWorld(db)
+    const res = await app.request(`/v1/sessions/ses_does_not_exist/attach`, {
+      method: 'POST',
+      headers: { ...JSON_HDRS, Authorization: rctAuth(world.owner.id) },
+      body: JSON.stringify({ environment_id: world.envId }),
+    })
+    expect(res.status).toBe(404)
+  })
+})
+
+describe('GET /v1/sessions/attachable', () => {
+  let app: Hono
+  let db: Database
+
+  beforeEach(() => {
+    db = freshDb()
+    storeReset()
+    app = createApp()
+  })
+
+  test('returns own manageable sessions, excludes ACP and closed', async () => {
+    const world = seedWorld(db)
+    // ACP session on an acp env — must be excluded.
+    const acpEnv = storeCreateEnvironment({
+      secret: 'test-api-key',
+      workerType: 'acp',
+      ownerUserId: world.owner.id,
+    })
+    createSession({ environment_id: acpEnv.id, title: 'ACP', source: 'acp' })
+    // Stranger's session — must be excluded.
+    createSession({
+      environment_id: null,
+      title: 'Stranger session',
+      source: 'web',
+    })
+
+    const res = await app.request('/v1/sessions/attachable', {
+      headers: { Authorization: rctAuth(world.owner.id) },
+    })
+    expect(res.status).toBe(200)
+    const list = (await res.json()) as Array<{ id: string; source: string }>
+    expect(list).toHaveLength(1)
+    expect(list[0]!.id).toBe(world.sessionId)
+    expect(list[0]!.source).toBe('web')
+  })
+
+  test('bare admin API key sees all non-ACP sessions', async () => {
+    const world = seedWorld(db)
+    const res = await app.request('/v1/sessions/attachable', {
+      headers: { ...ADMIN_KEY },
+    })
+    expect(res.status).toBe(200)
+    const list = (await res.json()) as Array<{ id: string }>
+    expect(list.some(s => s.id === world.sessionId)).toBe(true)
+  })
+})
+
+describe('GET /v1/sessions/:id/events (bridge auth)', () => {
+  let app: Hono
+  let db: Database
+
+  beforeEach(() => {
+    db = freshDb()
+    storeReset()
+    app = createApp()
+  })
+
+  test('merges bus events chronologically for the session manager', async () => {
+    const world = seedWorld(db)
+    const { publishSessionEvent: publish } = await import(
+      '../services/transport'
+    )
+    publish(
+      world.sessionId,
+      'user',
+      {
+        type: 'user',
+        uuid: 'u-1',
+        message: { role: 'user', content: 'hello' },
+      },
+      'inbound',
+    )
+    publish(
+      world.sessionId,
+      'assistant',
+      {
+        type: 'assistant',
+        uuid: 'a-1',
+        message: { role: 'assistant', content: [{ type: 'text', text: 'hi' }] },
+      },
+      'inbound',
+    )
+
+    const res = await app.request(`/v1/sessions/${world.sessionId}/events`, {
+      headers: { Authorization: rctAuth(world.owner.id) },
+    })
+    expect(res.status).toBe(200)
+    const body = (await res.json()) as {
+      events: Array<{ type: string; payload: { uuid?: string } }>
+    }
+    const kinds = body.events.map(e => e.type)
+    expect(kinds).toContain('user')
+    expect(kinds).toContain('assistant')
+    const userEvent = body.events.find(e => e.type === 'user')
+    expect(userEvent?.payload.uuid).toBe('u-1')
+  })
+
+  test("stranger's rct token → 403", async () => {
+    const world = seedWorld(db)
+    const res = await app.request(`/v1/sessions/${world.sessionId}/events`, {
+      headers: { Authorization: rctAuth(world.stranger.id) },
+    })
+    expect(res.status).toBe(403)
+  })
+
+  test('env-owner relaxation: caller owning the bound env can read events (wait-mode hydration)', async () => {
+    // P0-1b: a team admin binds a session to someone else's CLI env; that
+    // CLI (no manage rights on the session) must still hydrate.
+    const world = seedWorld(db)
+    const cliOwner = createUser(db)
+    // Re-point the session to the CLI owner's env via attach (admin mints).
+    const cliEnv = storeCreateEnvironment({
+      secret: 'test-api-key',
+      machineName: 'cli-worker',
+      ownerUserId: cliOwner.id,
+    })
+    const { storeRebindSessionEnvironment: rebind } = await import('../store')
+    rebind(world.sessionId, cliEnv.id)
+
+    const res = await app.request(`/v1/sessions/${world.sessionId}/events`, {
+      headers: { Authorization: rctAuth(cliOwner.id) },
+    })
+    expect(res.status).toBe(200)
+  })
+})
+
+describe('storeRebindSessionEnvironment', () => {
+  test('re-points the session and persists the change', () => {
+    const db = freshDb()
+    storeReset()
+    const world = seedWorld(db)
+    const newEnv = storeCreateEnvironment({
+      secret: 'test-api-key',
+      machineName: 'mac2',
+      ownerUserId: world.owner.id,
+    })
+
+    expect(storeRebindSessionEnvironment(world.sessionId, newEnv.id)).toBe(true)
+
+    const record = storeGetEnvironment(newEnv.id)
+    expect(record).toBeDefined()
+    const row = db
+      .query('SELECT environment_id FROM sessions WHERE id = $id')
+      .get({ $id: world.sessionId }) as { environment_id: string }
+    expect(row.environment_id).toBe(newEnv.id)
+  })
+
+  test('returns false for unknown sessions', () => {
+    const db = freshDb()
+    storeReset()
+    expect(storeRebindSessionEnvironment('ses_missing', 'env_x')).toBe(false)
+  })
+})

package/packages/remote-control-server/src/auth/bridge-auth.ts

@@ -0,0 +1,76 @@
+import type { Context, Next } from 'hono'
+import { apiKeyAuth, extractBearerToken } from './middleware'
+import { validateApiKey } from './api-key'
+import { resolveToken } from './token'
+import { resolveSessionToken } from './session'
+import { getDb } from '../db/sqlite'
+
+/**
+ * Combined auth for bridge endpoints: accepts session tokens (rct_*),
+ * in-memory issueToken tokens, or admin API keys. Also falls back to
+ * apiKeyAuth's X-Username header support for CLI bridges.
+ *
+ * Extracted from routes/v1/environments.ts so the v1 sessions attach
+ * endpoints (POST /:id/attach, GET /attachable, GET /:id/events) share the
+ * exact same identity semantics as environment registration — attach must
+ * resolve the caller to the same identity the env was registered under.
+ */
+export async function bridgeAuth(c: Context, next: Next) {
+  const bearer = extractBearerToken(c)
+  if (bearer) {
+    // Admin API key
+    if (validateApiKey(bearer)) {
+      c.set('userId', c.req.header('X-Username') || c.req.query('username'))
+      c.set('isApiAdmin', true)
+      await next()
+      return
+    }
+    // In-memory token
+    const username = resolveToken(bearer)
+    if (username) {
+      c.set('userId', username)
+      await next()
+      return
+    }
+    // SQLite session token
+    try {
+      const db = getDb()
+      const userId = resolveSessionToken(bearer, db)
+      if (userId) {
+        c.set('userId', userId)
+        await next()
+        return
+      }
+    } catch (err) {
+      console.error('[bridge] DB error during session token resolution:', err)
+      return c.json({ error: 'Database unavailable' }, 503)
+    }
+  }
+  // Fall back to apiKeyAuth (handles X-Username + API key from body/header)
+  return apiKeyAuth(c, next)
+}
+
+/**
+ * Resolve a userId value (UUID or username) to a users.id UUID.
+ * Returns null if no matching user exists.
+ *
+ * bridgeAuth's three token paths return different userId shapes:
+ * - resolveSessionToken (rct_* SQLite token) → users.id (UUID)
+ * - resolveToken (in-memory token) → username (string)
+ * - validateApiKey + X-Username → X-Username header value (arbitrary string)
+ *
+ * Only UUIDs that exist in the users table can become env owners / session
+ * managers, so a client-controlled X-Username value can't create an owner
+ * for a non-existent user — resolveUserIdUuid is the safety gate.
+ */
+export function resolveUserIdUuid(
+  db: ReturnType<typeof getDb>,
+  value: string,
+): string | null {
+  const row = db
+    .query(
+      'SELECT id FROM users WHERE id = $value OR username = $value LIMIT 1',
+    )
+    .get({ $value: value }) as { id: string } | null
+  return row?.id ?? null
+}

package/packages/remote-control-server/src/db/rcs-schema.sql

@@ -90,7 +90,8 @@ CREATE TABLE IF NOT EXISTS environments (
   created_at TEXT NOT NULL,
   owner_user_id TEXT,
   claim_token TEXT,
-  claim_expires_at TEXT
+  claim_expires_at TEXT,
+  session_mode TEXT
 );
 
 CREATE TABLE IF NOT EXISTS sessions (

package/packages/remote-control-server/src/db/sqlite.ts

@@ -208,6 +208,7 @@ function migrateEnvironmentsColumns(db: Database): void {
   addIfMissing('owner_user_id', 'TEXT')
   addIfMissing('claim_token', 'TEXT')
   addIfMissing('claim_expires_at', 'TEXT')
+  addIfMissing('session_mode', 'TEXT')
 }
 
 /**