@saluzi/saluzi-edu 0.2.63 → 0.2.64

package/dist/guide/guide-data.json

@@ -6061,6 +6061,10 @@
       "name": "SALUZI_BRIDGE_ALLOW_INSECURE_HTTP",
       "category": "other"
     },
+    {
+      "name": "SALUZI_BRIDGE_ATTACH_TIMEOUT_MS",
+      "category": "other"
+    },
     {
       "name": "SALUZI_BRIDGE_BASE_URL",
       "category": "bridge",
@@ -6079,10 +6083,18 @@
       "category": "bridge",
       "description": "worker 连接 RCS 的 token"
     },
+    {
+      "name": "SALUZI_BRIDGE_SESSION_ID",
+      "category": "other"
+    },
     {
       "name": "SALUZI_BRIDGE_SESSION_INGRESS_URL",
       "category": "other"
     },
+    {
+      "name": "SALUZI_BRIDGE_SESSION_MODE",
+      "category": "other"
+    },
     {
       "name": "SALUZI_BRIDGE_TEAM_ID",
       "category": "other"

package/dist/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saluzi/saluzi-edu",
-  "version": "0.2.63",
+  "version": "0.2.64",
   "description": "Saluzi CLI - interactive AI coding assistant in the terminal",
   "license": "MIT",
   "type": "module",

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

@@ -0,0 +1,183 @@
+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 webSessions from '../routes/web/sessions'
+import {
+  storeReset,
+  storeCreateEnvironment,
+  storeIssueAttachCode,
+  storeConsumeAttachCode,
+} 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'
+
+/**
+ * Session Attach P3 — one-time attach codes:
+ *
+ * - POST /web/sessions/:id/attach-code (session manager) mints a code.
+ * - POST /v1/sessions/attach-code/exchange redeems it WITHOUT manage
+ *   rights (the code IS the authorization) and dispatches the attach.
+ * - Codes are single-use; unknown/expired codes are rejected.
+ */
+
+function freshDb(): Database {
+  try {
+    resetDbSingleton()
+  } catch {}
+  const path = resolve(
+    tmpdir(),
+    `rcs-attach-code-${randomUUID().replace(/-/g, '').slice(0, 8)}.db`,
+  )
+  return initDatabase(path)
+}
+
+function createUser(db: Database): { id: string; username: string } {
+  const username = `user_${randomUUID().slice(0, 6)}`
+  const user = createUserDirectly(db, { username, role: 'member' })
+  return { id: user.id, username: user.username }
+}
+
+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)
+  app.route('/web', webSessions)
+  return app
+}
+
+describe('attach codes', () => {
+  let app: Hono
+  let db: Database
+  let owner: { id: string; username: string }
+  let envId: string
+  let sessionId: string
+
+  beforeEach(() => {
+    db = freshDb()
+    storeReset()
+    app = createApp()
+    owner = createUser(db)
+    const env = storeCreateEnvironment({
+      secret: 'test-api-key',
+      machineName: 'mac1',
+      ownerUserId: owner.id,
+    })
+    envId = env.id
+    const session = createSession({
+      environment_id: null,
+      title: 'Web session',
+      source: 'web',
+    })
+    sessionId = session.id
+    storeBindSession(sessionId, owner.id, 'user')
+  })
+
+  test('mint → exchange → attached, without manage rights on the redeemer', async () => {
+    const mint = await app.request(`/web/sessions/${sessionId}/attach-code`, {
+      method: 'POST',
+      headers: { Authorization: rctAuth(owner.id) },
+    })
+    expect(mint.status).toBe(201)
+    const { code, attach_command } = (await mint.json()) as {
+      code: string
+      attach_command: string
+    }
+    expect(code.startsWith('atc_')).toBe(true)
+    expect(attach_command).toContain(code)
+
+    // Redeem with a BARE admin API key (no user identity at all — the
+    // no-rights case the code flow exists for).
+    const exchange = await app.request('/v1/sessions/attach-code/exchange', {
+      method: 'POST',
+      headers: { ...JSON_HDRS, ...ADMIN_KEY },
+      body: JSON.stringify({ code, environment_id: envId }),
+    })
+    expect(exchange.status).toBe(200)
+    const body = (await exchange.json()) as {
+      status: string
+      session_id: string
+    }
+    expect(body.session_id).toBe(sessionId)
+  })
+
+  test('codes are single-use: second exchange → 403', async () => {
+    const { code } = (await (
+      await app.request(`/web/sessions/${sessionId}/attach-code`, {
+        method: 'POST',
+        headers: { Authorization: rctAuth(owner.id) },
+      })
+    ).json()) as { code: string }
+
+    const redeem = (codeValue: string) =>
+      app.request('/v1/sessions/attach-code/exchange', {
+        method: 'POST',
+        headers: { ...JSON_HDRS, ...ADMIN_KEY },
+        body: JSON.stringify({ code: codeValue, environment_id: envId }),
+      })
+
+    const first = await redeem(code)
+    expect(first.status).toBe(200)
+    const second = await redeem(code)
+    expect(second.status).toBe(403)
+    const body = (await second.json()) as { error: { type: string } }
+    expect(body.error.type).toBe('invalid_attach_code')
+  })
+
+  test('unknown and expired codes → 403 invalid_attach_code', async () => {
+    const res = await app.request('/v1/sessions/attach-code/exchange', {
+      method: 'POST',
+      headers: { ...JSON_HDRS, ...ADMIN_KEY },
+      body: JSON.stringify({
+        code: 'atc_nonexistent',
+        environment_id: envId,
+      }),
+    })
+    expect(res.status).toBe(403)
+    expect(((await res.json()) as { error: { type: string } }).error.type).toBe(
+      'invalid_attach_code',
+    )
+
+    const expired = storeIssueAttachCode(sessionId, -1000)
+    const res2 = await app.request('/v1/sessions/attach-code/exchange', {
+      method: 'POST',
+      headers: { ...JSON_HDRS, ...ADMIN_KEY },
+      body: JSON.stringify({ code: expired.code, environment_id: envId }),
+    })
+    expect(res2.status).toBe(403)
+  })
+
+  test('storeConsumeAttachCode: returns null for unknown, record for known', () => {
+    expect(storeConsumeAttachCode('atc_missing')).toBeNull()
+    const record = storeIssueAttachCode(sessionId)
+    expect(storeConsumeAttachCode(record.code)?.sessionId).toBe(sessionId)
+    // Consumed — second call fails.
+    expect(storeConsumeAttachCode(record.code)).toBeNull()
+  })
+
+  test('missing code or environment_id → 400', async () => {
+    const res = await app.request('/v1/sessions/attach-code/exchange', {
+      method: 'POST',
+      headers: { ...JSON_HDRS, ...ADMIN_KEY },
+      body: JSON.stringify({ environment_id: envId }),
+    })
+    expect(res.status).toBe(400)
+  })
+})

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

@@ -0,0 +1,213 @@
+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 v1Environments from '../routes/v1/environments'
+import webEnvironments from '../routes/web/environments'
+import {
+  storeReset,
+  storeCreateEnvironment,
+  storeGetEnvironment,
+  storeUpdateEnvironment,
+  storeListActiveEnvironmentsWithTeam,
+} from '../store'
+import { initDatabase, resetDbSingleton, getDb } from '../db/sqlite'
+import { issueSessionToken } from '../auth/session'
+import { createUserDirectly } from './helpers/fixtures'
+import { createSession, archiveSession } from '../services/session'
+import { storeBindSession } from '../store'
+
+/**
+ * Session Attach P2 — wait mode:
+ *
+ * - POST /v1/environments/bridge persists session_mode:'attach'.
+ * - GET /v1/environments/:id/assignment returns the first open non-ACP
+ *   session on the env (assigned:false until the Web UI binds one).
+ * - GET /web/environments surfaces attach_waiting for waiting workers.
+ */
+
+function freshDb(): Database {
+  try {
+    resetDbSingleton()
+  } catch {}
+  const path = resolve(
+    tmpdir(),
+    `rcs-attach-wait-${randomUUID().replace(/-/g, '').slice(0, 8)}.db`,
+  )
+  return initDatabase(path)
+}
+
+function createUser(db: Database): { id: string; username: string } {
+  const username = `user_${randomUUID().slice(0, 6)}`
+  const user = createUserDirectly(db, { username, role: 'member' })
+  return { id: user.id, username: user.username }
+}
+
+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/environments', v1Environments)
+  app.route('/web', webEnvironments)
+  return app
+}
+
+describe('Session Attach wait mode', () => {
+  let app: Hono
+  let db: Database
+  let owner: { id: string; username: string }
+
+  beforeEach(() => {
+    db = freshDb()
+    storeReset()
+    app = createApp()
+    owner = createUser(db)
+  })
+
+  test('POST /bridge with session_mode=attach persists the mode', async () => {
+    const res = await app.request('/v1/environments/bridge', {
+      method: 'POST',
+      headers: { ...JSON_HDRS, ...ADMIN_KEY, 'X-User-Id': owner.username },
+      body: JSON.stringify({ machine_name: 'mac1', session_mode: 'attach' }),
+    })
+    expect(res.status).toBe(200)
+    const envId = ((await res.json()) as { environment_id: string })
+      .environment_id
+    expect(storeGetEnvironment(envId)?.sessionMode).toBe('attach')
+  })
+
+  test('POST /bridge without session_mode stays create-mode', async () => {
+    const res = await app.request('/v1/environments/bridge', {
+      method: 'POST',
+      headers: { ...JSON_HDRS, ...ADMIN_KEY, 'X-User-Id': owner.username },
+      body: JSON.stringify({ machine_name: 'mac1' }),
+    })
+    expect(res.status).toBe(200)
+    const envId = ((await res.json()) as { environment_id: string })
+      .environment_id
+    expect(storeGetEnvironment(envId)?.sessionMode ?? null).toBeNull()
+  })
+
+  test('assignment: unassigned env → assigned:false', async () => {
+    const env = storeCreateEnvironment({
+      secret: 'test-api-key',
+      machineName: 'mac1',
+      ownerUserId: owner.id,
+      sessionMode: 'attach',
+    })
+    // Age the heartbeat past the disconnect timeout, then verify the poll
+    // refreshes it (P0-2: without this the disconnect monitor kills the
+    // waiting env after 5 minutes and the CLI dead-waits its deadline).
+    const stale = new Date(Date.now() - 10 * 60 * 1000)
+    storeUpdateEnvironment(env.id, { lastPollAt: stale })
+    const before = storeGetEnvironment(env.id)?.lastPollAt?.getTime()
+
+    const res = await app.request(`/v1/environments/${env.id}/assignment`, {
+      headers: { ...ADMIN_KEY },
+    })
+    expect(res.status).toBe(200)
+    expect(await res.json()).toEqual({ assigned: false })
+    const after = storeGetEnvironment(env.id)?.lastPollAt?.getTime()
+    expect(after).not.toBe(before)
+    expect(after ?? 0).toBeGreaterThan(stale.getTime())
+  })
+
+  test('assignment: session bound to the env (web attach) → assigned with session id', async () => {
+    const env = storeCreateEnvironment({
+      secret: 'test-api-key',
+      machineName: 'mac1',
+      ownerUserId: owner.id,
+      sessionMode: 'attach',
+    })
+    const session = createSession({
+      environment_id: env.id,
+      title: 'Team session',
+      source: 'web',
+    })
+    storeBindSession(session.id, owner.id, 'user')
+
+    const res = await app.request(`/v1/environments/${env.id}/assignment`, {
+      headers: { ...ADMIN_KEY },
+    })
+    expect(res.status).toBe(200)
+    const body = (await res.json()) as {
+      assigned: boolean
+      session_id?: string
+    }
+    expect(body.assigned).toBe(true)
+    expect(body.session_id).toBe(session.id)
+  })
+
+  test('assignment: archived sessions do not satisfy the assignment', async () => {
+    const env = storeCreateEnvironment({
+      secret: 'test-api-key',
+      machineName: 'mac1',
+      ownerUserId: owner.id,
+      sessionMode: 'attach',
+    })
+    const session = createSession({
+      environment_id: env.id,
+      title: 'Archived session',
+      source: 'web',
+    })
+    archiveSession(session.id)
+
+    const res = await app.request(`/v1/environments/${env.id}/assignment`, {
+      headers: { ...ADMIN_KEY },
+    })
+    expect(res.status).toBe(200)
+    expect(await res.json()).toEqual({ assigned: false })
+  })
+
+  test('assignment: unknown env → 404', async () => {
+    const res = await app.request('/v1/environments/env_missing/assignment', {
+      headers: { ...ADMIN_KEY },
+    })
+    expect(res.status).toBe(404)
+  })
+
+  test('web environments exposes attach_waiting for waiting workers', async () => {
+    storeCreateEnvironment({
+      secret: 'test-api-key',
+      machineName: 'waiting-cli',
+      ownerUserId: owner.id,
+      sessionMode: 'attach',
+    })
+    // A create-mode env with a bound session — never attach_waiting.
+    const busyEnv = storeCreateEnvironment({
+      secret: 'test-api-key',
+      machineName: 'busy-cli',
+      ownerUserId: owner.id,
+    })
+    createSession({
+      environment_id: busyEnv.id,
+      title: 's',
+      source: 'web',
+    })
+
+    const res = await app.request('/web/environments', {
+      headers: { Authorization: rctAuth(owner.id) },
+    })
+    expect(res.status).toBe(200)
+    const envs = (await res.json()) as Array<{
+      machine_name: string
+      attach_waiting?: boolean
+    }>
+    const waiting = envs.find(e => e.machine_name === 'waiting-cli')
+    const busy = envs.find(e => e.machine_name === 'busy-cli')
+    expect(waiting?.attach_waiting).toBe(true)
+    expect(busy?.attach_waiting ?? false).toBe(false)
+  })
+})