@zhin.js/host-http 1.2.1 → 1.2.2

package/src/console-rpc-extended/login-rpc.ts

@@ -1,39 +1,71 @@
-import type { ConsoleRpcExtendedCtx, ExtendedRpcResult } from './contracts.js';
+import { CONSOLE_LOGIN_UNSUPPORTED, LOGIN_RPC, type ConsoleLoginFlow } from '@zhin.js/console-protocol';
+import type { ConsoleEndpointLoginAccess, ConsoleLoginAssistPort, ConsoleRpcExtendedCtx, ExtendedRpcResult } from './contracts.js';
 import { strField } from './rpc-values.js';
 
-export function listLoginPending(ctx: ConsoleRpcExtendedCtx): ExtendedRpcResult {
+const NOT_WIRED = '登录辅助未接线（LoginAssist 未挂载）';
+/** `login.submit` with `wait: true` waits at most this long for the login result. */
+export const LOGIN_SUBMIT_WAIT_MS = 15_000;
+
+export function listLoginPending(d: Record<string, unknown>, ctx: ConsoleRpcExtendedCtx): ExtendedRpcResult {
   const assist = ctx.loginAssist;
-  if (!assist) return { error: '登录辅助未接线（LoginAssist 未挂载）' };
-  const tasks = assist.listPending().map((task) => ({
+  if (!assist) return { error: NOT_WIRED };
+  const scope = loginScope(d, ctx);
+  if ('error' in scope) return scope;
+  const tasks = assist.listPending().filter((task) => inScope(scope, task)).map((task) => ({
     id: task.id,
     adapter: task.adapter,
     endpointKey: task.endpointKey,
     ...(task.endpointIdentity ? { endpointIdentity: task.endpointIdentity } : {}),
     type: task.type,
-    payload: task.payload,
+    payload: canOperate(ctx, task) ? task.payload : eventSafeLoginPayload(task.payload),
     createdAt: task.createdAt,
     expiresAt: task.expiresAt,
+    ...(task.flowId ? { flowId: task.flowId } : {}),
+    ...(task.challengeId ? { challengeId: task.challengeId } : {}),
   }));
   return { data: { tasks, count: tasks.length } };
 }
 
-export function submitLogin(
+/**
+ * `login.submit { taskId, value, endpointIdentity?, adapter?, endpointKey?, wait? }`.
+ * `value` is a string (legacy) or `{ action, values }`. With `wait: true` the reply carries the login
+ * result (`{ accepted, outcome, flow }`) or `{ accepted, pending: true }` after 15 s; without it the
+ * legacy `{ success: true }` reply is unchanged.
+ */
+export async function submitLogin(
   d: Record<string, unknown>,
   ctx: ConsoleRpcExtendedCtx,
-): ExtendedRpcResult {
+): Promise<ExtendedRpcResult> {
   const assist = ctx.loginAssist;
-  if (!assist) return { error: '登录辅助未接线（LoginAssist 未挂载）' };
+  if (!assist) return { error: NOT_WIRED };
   const id = strField(d, 'taskId');
   if (!id) return { error: 'taskId is required' };
-  const raw = d.value ?? '';
-  const value = typeof raw === 'string' || (raw && typeof raw === 'object')
-    ? raw as string | Record<string, unknown>
-    : String(raw ?? '');
+  const value = readSubmitValue(d.value);
+  if (value === false) return { error: 'value must be a string or { action, values }' };
   const identity = readEndpointIdentity(d.endpointIdentity);
   if (identity === false) return { error: 'Invalid login Endpoint identity' };
-  const ok = identity ? assist.submit(id, value, identity) : assist.submit(id, value);
-  if (!ok) return { error: `login task not found: ${id}` };
-  return { data: { success: true } };
+  const target = checkTaskTarget(d, ctx, id);
+  if (target) return target;
+  try {
+    if (d.wait === true && assist.submitAndWait) {
+      const result = await assist.submitAndWait(id, value, {
+        ...(identity ? { endpointIdentity: identity } : {}),
+        timeoutMs: LOGIN_SUBMIT_WAIT_MS,
+      });
+      if (!result.accepted) return { error: `login task not found: ${id}` };
+      if (result.outcome) return { data: { accepted: true, outcome: result.outcome, ...(result.flow ? { flow: result.flow } : {}) } };
+      return { data: { accepted: true, pending: true, ...(result.flow ? { flow: result.flow } : {}) } };
+    }
+    const ok = identity ? assist.submit(id, value, identity) : assist.submit(id, value);
+    if (!ok) return { error: `login task not found: ${id}` };
+    return { data: { success: true } };
+  } catch (error) {
+    // LoginSubmissionError: the challenge stays open; its message never contains the value.
+    if (error instanceof Error && error.name === 'LoginSubmissionError') {
+      return { error: error.message, data: { code: (error as Error & { code?: string }).code ?? 'input_invalid' } };
+    }
+    throw error;
+  }
 }
 
 export function cancelLogin(
@@ -41,18 +73,219 @@ export function cancelLogin(
   ctx: ConsoleRpcExtendedCtx,
 ): ExtendedRpcResult {
   const assist = ctx.loginAssist;
-  if (!assist) return { error: '登录辅助未接线（LoginAssist 未挂载）' };
+  if (!assist) return { error: NOT_WIRED };
   const id = strField(d, 'taskId');
   if (!id) return { error: 'taskId is required' };
   const reason = strField(d, 'reason') || 'cancelled';
   const identity = readEndpointIdentity(d.endpointIdentity);
   if (identity === false) return { error: 'Invalid login Endpoint identity' };
+  const target = checkTaskTarget(d, ctx, id);
+  if (target) return target;
   const ok = identity ? assist.cancel(id, reason, identity) : assist.cancel(id, reason);
   if (!ok) return { error: `login task not found: ${id}` };
   return { data: { success: true } };
 }
 
-// ---------------------------------------------------------------- 社交读取
+/**
+ * `login.flow.list { adapter?, endpointKey? }`: latest flow per Endpoint. Live challenge material
+ * only for Endpoints the caller may operate; the event-safe form otherwise (ADR 0058 §8).
+ */
+export function listLoginFlows(d: Record<string, unknown>, ctx: ConsoleRpcExtendedCtx): ExtendedRpcResult {
+  const assist = ctx.loginAssist;
+  if (!assist) return { error: NOT_WIRED };
+  if (!assist.listFlows) return unsupported('login flows');
+  const scope = loginScope(d, ctx);
+  if ('error' in scope) return scope;
+  const flows = assist.listFlows().filter((flow) => inScope(scope, flow)).map((flow) => visibleFlow(assist, ctx, flow));
+  return { data: { flows, count: flows.length } };
+}
+
+/** `login.flow.get { flowId } | { adapter, endpointKey }` → `{ flow: … | null }`. */
+export function getLoginFlow(d: Record<string, unknown>, ctx: ConsoleRpcExtendedCtx): ExtendedRpcResult {
+  const assist = ctx.loginAssist;
+  if (!assist) return { error: NOT_WIRED };
+  if (!assist.getFlow || !assist.getFlowById) return unsupported('login flows');
+  const flowId = strField(d, 'flowId');
+  const scope = loginScope(d, ctx);
+  if ('error' in scope) return scope;
+  if (flowId) {
+    const flow = assist.getFlowById(flowId);
+    // A flow id names one Endpoint; a scoped caller cannot read another Endpoint's flow by id.
+    return { data: { flow: flow && inScope(scope, flow) ? visibleFlow(assist, ctx, flow) : null } };
+  }
+  if (!scope.adapter || !scope.endpointKey) return { error: 'flowId or adapter and endpointKey are required' };
+  const flow = assist.getFlow(scope.adapter, scope.endpointKey);
+  return { data: { flow: flow ? visibleFlow(assist, ctx, flow) : null } };
+}
+
+/** `login.relogin` / `login.refresh { adapter, endpointKey }` through the Endpoint's login port. */
+export async function controlLogin(
+  type: typeof LOGIN_RPC.RELOGIN | typeof LOGIN_RPC.REFRESH,
+  d: Record<string, unknown>,
+  ctx: ConsoleRpcExtendedCtx,
+): Promise<ExtendedRpcResult> {
+  const scope = loginScope(d, ctx);
+  if ('error' in scope) return scope;
+  const { adapter, endpointKey } = scope;
+  if (!adapter || !endpointKey) return { error: 'adapter and endpointKey are required' };
+  const relogin = type === LOGIN_RPC.RELOGIN;
+  const label = relogin ? 'relogin' : 'refresh challenge';
+  if (!ctx.withEndpointLogin) return unsupported(label);
+  const result = await ctx.withEndpointLogin(adapter, endpointKey, async (login: ConsoleEndpointLoginAccess) => {
+    const declared = relogin ? login.declaration?.relogin === true : login.declaration?.refreshQr === true;
+    const run = relogin ? login.control?.relogin : login.control?.refreshChallenge;
+    if (!declared || !run) return unsupported(label, adapter);
+    await run.call(login.control, {});
+    return { data: { accepted: true } } satisfies ExtendedRpcResult;
+  });
+  return result ?? { error: `Endpoint not found: ${adapter}/${endpointKey}` };
+}
+
+/**
+ * Audit detail of a login RPC reply: the result category only (never values, never messages).
+ * `undefined` for other RPCs.
+ */
+export function loginAuditDetail(type: unknown, data: unknown): Readonly<Record<string, string>> | undefined {
+  if (type !== LOGIN_RPC.SUBMIT && type !== LOGIN_RPC.CANCEL && type !== LOGIN_RPC.RELOGIN && type !== LOGIN_RPC.REFRESH) return undefined;
+  if (!data || typeof data !== 'object') return undefined;
+  const record = data as { outcome?: { result?: unknown; code?: unknown }; pending?: unknown; accepted?: unknown; success?: unknown; code?: unknown };
+  if (typeof record.code === 'string') return Object.freeze({ result: record.code });
+  if (record.outcome && typeof record.outcome.result === 'string') {
+    return Object.freeze({ result: record.outcome.result, ...(typeof record.outcome.code === 'string' ? { code: record.outcome.code } : {}) });
+  }
+  if (record.pending === true) return Object.freeze({ result: 'pending' });
+  if (record.accepted === true || record.success === true) return Object.freeze({ result: 'accepted' });
+  return undefined;
+}
+
+// ---------------------------------------------------------------- helpers
+
+function unsupported(what: string, adapter?: string): ExtendedRpcResult {
+  return {
+    error: `${CONSOLE_LOGIN_UNSUPPORTED}: ${adapter ? `${adapter} does not support ${what}` : `${what} not available on this host`}`,
+    data: { code: CONSOLE_LOGIN_UNSUPPORTED },
+  };
+}
+
+interface LoginScope { readonly adapter: string; readonly endpointKey: string }
+
+/**
+ * The Endpoint a login RPC is about: `adapter` / `endpointKey` read from `data` and the top level,
+ * exactly the fields the authorization map reads (ADR 0049). Sources that disagree, or a value that
+ * is not a string, are rejected. When the dispatcher admitted the caller only through an adapter /
+ * endpoint-scoped grant (`ctx.authorizedEndpoint`), the scope is that Endpoint and any other named
+ * target is rejected; global callers may omit it (`''` = no filter).
+ */
+function loginScope(d: Record<string, unknown>, ctx: ConsoleRpcExtendedCtx): LoginScope | { error: string } {
+  const sources = d.data && typeof d.data === 'object' && !Array.isArray(d.data)
+    ? [d.data as Record<string, unknown>, d]
+    : [d];
+  const read = (key: 'adapter' | 'endpointKey'): string | false => {
+    let found = '';
+    for (const source of sources) {
+      const value = source[key];
+      if (value === undefined || value === null || value === '') continue;
+      if (typeof value !== 'string') return false;
+      const text = value.trim();
+      if (!text) continue;
+      if (found && found !== text) return false;
+      found = text;
+    }
+    return found;
+  };
+  const adapter = read('adapter');
+  const endpointKey = read('endpointKey');
+  if (adapter === false || endpointKey === false) return { error: 'Conflicting login target (adapter / endpointKey)' };
+  const authorized = ctx.authorizedEndpoint;
+  if (!authorized) return { adapter, endpointKey };
+  if ((adapter && adapter !== authorized.adapter) || (endpointKey && endpointKey !== authorized.endpointKey)) {
+    return { error: 'Login target outside the authorized Endpoint' };
+  }
+  return { adapter: authorized.adapter, endpointKey: authorized.endpointKey };
+}
+
+/** The caller may handle this Endpoint's challenge (`endpoint.operate` there); no principal = trusted. */
+function canOperate(ctx: ConsoleRpcExtendedCtx, item: { readonly adapter: string; readonly endpointKey: string }): boolean {
+  return ctx.canOperateEndpoint ? ctx.canOperateEndpoint(item.adapter, item.endpointKey) : true;
+}
+
+/**
+ * A flow as this caller may see it: live for operators, otherwise the event-safe form (no QR image,
+ * sensitive blocks redacted, verification links dropped). A port without `eventSafeFlow` falls back
+ * to removing every challenge's media and blocks.
+ */
+function visibleFlow(assist: ConsoleLoginAssistPort, ctx: ConsoleRpcExtendedCtx, flow: ConsoleLoginFlow): ConsoleLoginFlow {
+  if (canOperate(ctx, flow)) return flow;
+  return assist.eventSafeFlow ? assist.eventSafeFlow(flow) : withoutChallengeMaterial(flow);
+}
+
+function withoutChallengeMaterial(flow: ConsoleLoginFlow): ConsoleLoginFlow {
+  if (!flow.steps.some((step) => step.challenge?.media || step.challenge?.blocks)) return flow;
+  return Object.freeze({
+    ...flow,
+    steps: Object.freeze(flow.steps.map((step) => {
+      if (!step.challenge || (!step.challenge.media && !step.challenge.blocks)) return step;
+      const { media, blocks: _blocks, ...challenge } = step.challenge;
+      return Object.freeze({
+        ...step,
+        challenge: Object.freeze({
+          ...challenge,
+          media: Object.freeze({
+            ...(media?.expiresAt !== undefined ? { expiresAt: media.expiresAt } : {}),
+            ...(media?.refreshable !== undefined ? { refreshable: media.refreshable } : {}),
+            ...(media?.qrImage ? { qrImageOmitted: true } : {}),
+            ...(media?.link || media?.captcha ? { linkOmitted: true } : {}),
+          }),
+        }),
+      });
+    })),
+  });
+}
+
+/**
+ * Legacy task payload without the QR image (`image`) and verification link (`url`, may carry a
+ * session id), marked `imageOmitted` / `urlOmitted` like the `endpoint.login.*` events.
+ */
+function eventSafeLoginPayload(payload: Record<string, unknown>): Record<string, unknown> {
+  // Allow-list: only the message survives; legacy adapters may put sid / ticket / device anywhere.
+  const safe: Record<string, unknown> = {};
+  if (typeof payload.message === 'string') safe.message = payload.message;
+  if (payload.image !== undefined) safe.imageOmitted = true;
+  if (payload.url !== undefined) safe.urlOmitted = true;
+  if (Object.keys(payload).some((key) => key !== 'message' && key !== 'image' && key !== 'url')) safe.fieldsOmitted = true;
+  return safe;
+}
+
+function inScope(scope: LoginScope, item: { readonly adapter: string; readonly endpointKey: string }): boolean {
+  return (!scope.adapter || item.adapter === scope.adapter) && (!scope.endpointKey || item.endpointKey === scope.endpointKey);
+}
+
+/** When the caller names an Endpoint, or was authorized for one, the task must belong to it. */
+function checkTaskTarget(d: Record<string, unknown>, ctx: ConsoleRpcExtendedCtx, id: string): ExtendedRpcResult | undefined {
+  const scope = loginScope(d, ctx);
+  if ('error' in scope) return scope;
+  if (!scope.adapter && !scope.endpointKey) return undefined;
+  const task = ctx.loginAssist?.listPending().find((item) => item.id === id);
+  if (!task || !inScope(scope, task)) return { error: `login task not found: ${id}` };
+  return undefined;
+}
+
+function readSubmitValue(raw: unknown): string | Record<string, unknown> | false {
+  if (raw === undefined || raw === null) return '';
+  if (typeof raw === 'string') return raw;
+  if (typeof raw === 'number' || typeof raw === 'boolean') return String(raw);
+  if (typeof raw !== 'object' || Array.isArray(raw)) return false;
+  const record = raw as Record<string, unknown>;
+  if (record.action === undefined) return record;
+  if (typeof record.action !== 'string' || !record.action || record.action.length > 64) return false;
+  if (record.values !== undefined && (!record.values || typeof record.values !== 'object' || Array.isArray(record.values))) return false;
+  const values: Record<string, string> = {};
+  for (const [key, item] of Object.entries((record.values ?? {}) as Record<string, unknown>)) {
+    if (typeof item !== 'string' && typeof item !== 'number') return false;
+    values[key] = String(item);
+  }
+  return { action: record.action, values };
+}
 
 function readEndpointIdentity(value: unknown): { readonly canonicalId: string; readonly instanceId: string; readonly epoch: number; readonly incarnationId: string } | false | undefined {
   if (value === undefined) return undefined;

package/src/console-rpc-handlers.ts

@@ -257,14 +257,71 @@ export async function dispatchHostResourceConsoleRpc(
       const page = positiveInteger(message.page, 1);
       const pageSize = Math.min(positiveInteger(message.pageSize, 50), 500);
       const where = recordField(message.where);
+      const order = recordField(message.orderBy);
+      if (message.orderBy !== undefined && message.orderBy !== null
+        && (!order || typeof order.column !== 'string' || (order.direction !== 'asc' && order.direction !== 'desc'))) {
+        errorReply(payloads, requestId, 'orderBy must be { column, direction: "asc" | "desc" }');
+        return true;
+      }
       if (!ctx.database) {
         emit({ requestId, data: { rows: [], total: 0, page, pageSize } });
         return true;
       }
       try {
-        emit({ requestId, data: await ctx.database.select(table, page, pageSize, where) });
+        const orderBy = order ? { column: order.column as string, direction: order.direction as 'asc' | 'desc' } : undefined;
+        emit({ requestId, data: await ctx.database.select(table, page, pageSize, where, orderBy) });
+      } catch (error) {
+        emit({ requestId, error: `Failed to select: ${errorMessage(error)}`, ...refusalData(error) });
+      }
+      return true;
+    }
+    case 'db:query': {
+      const sql = sqlField(message);
+      if (!sql) { errorReply(payloads, requestId, `sql is required (at most ${MAX_CONSOLE_SQL_LENGTH} characters)`); return true; }
+      if (!ctx.database?.query) { unsupportedDatabaseFeature(payloads, requestId, 'SQL query'); return true; }
+      try {
+        const maxRows = typeof message.maxRows === 'number' ? message.maxRows : undefined;
+        emit({ requestId, data: await ctx.database.query(sql, maxRows ? { maxRows } : undefined) });
+      } catch (error) {
+        emit({ requestId, error: errorMessage(error), ...refusalData(error) });
+      }
+      return true;
+    }
+    case 'db:execute': {
+      const sql = sqlField(message);
+      if (!sql) { errorReply(payloads, requestId, `sql is required (at most ${MAX_CONSOLE_SQL_LENGTH} characters)`); return true; }
+      if (!ctx.database?.execute) { unsupportedDatabaseFeature(payloads, requestId, 'SQL execution'); return true; }
+      try {
+        emit({ requestId, data: await ctx.database.execute(sql, { dryRun: message.dryRun === true }) });
+      } catch (error) {
+        emit({ requestId, error: errorMessage(error), ...refusalData(error) });
+      }
+      return true;
+    }
+    case 'db:schema:describe': {
+      const table = stringField(message, 'table');
+      if (!table) { errorReply(payloads, requestId, 'table is required'); return true; }
+      if (!ctx.database?.describe) { unsupportedDatabaseFeature(payloads, requestId, 'Schema inspection'); return true; }
+      try {
+        emit({ requestId, data: await ctx.database.describe(table) });
+      } catch (error) {
+        emit({ requestId, error: errorMessage(error), ...refusalData(error) });
+      }
+      return true;
+    }
+    case 'db:schema:preview':
+    case 'db:schema:apply': {
+      const change = recordField(message.change);
+      if (!change) { errorReply(payloads, requestId, 'change is required'); return true; }
+      const database = ctx.database;
+      if (!database?.previewSchema || !database.applySchema) { unsupportedDatabaseFeature(payloads, requestId, 'Schema editing'); return true; }
+      try {
+        const plan = type === 'db:schema:apply'
+          ? await database.applySchema(change, typeof message.confirm === 'string' ? message.confirm : undefined)
+          : await database.previewSchema(change);
+        emit({ requestId, data: plan });
       } catch (error) {
-        emit({ requestId, error: `Failed to select: ${errorMessage(error)}` });
+        emit({ requestId, error: errorMessage(error), ...refusalData(error) });
       }
       return true;
     }
@@ -532,6 +589,46 @@ export async function dispatchHostResourceConsoleRpc(
   }
 }
 
+/** Longest statement text the Console SQL editor sends. */
+export const MAX_CONSOLE_SQL_LENGTH = 100_000;
+
+function sqlField(message: RuntimeConsoleRpcMessage): string {
+  const value = message.sql;
+  return typeof value === 'string' && value.trim() && value.length <= MAX_CONSOLE_SQL_LENGTH ? value : '';
+}
+
+const REFUSAL_NAMES: ReadonlySet<string> = new Set(['ConsoleSqlRefusal', 'ConsoleSchemaRefusal', 'ConsoleSelectRefusal', 'SqliteQueryTimeoutError']);
+
+/**
+ * `data.code` of a refusal by the database port (`read_only`, `protected_table`, …), and the DDL a
+ * failed `db:schema:apply` attempted (`data.statements`, for the audit log).
+ */
+/** SQLSTATE of a driver error (PostgreSQL `code`, mysql2 `sqlState`), e.g. `42501` insufficient privilege. */
+function sqlStateOf(error: Error): string | undefined {
+  const record = error as { code?: unknown; sqlState?: unknown };
+  for (const candidate of [record.sqlState, record.code]) {
+    if (typeof candidate === 'string' && /^[0-9A-Z]{5}$/u.test(candidate)) return candidate;
+  }
+  return undefined;
+}
+
+function refusalData(error: unknown): { data?: { code?: string; statements?: readonly string[]; sqlState?: string } } {
+  if (!(error instanceof Error)) return {};
+  const attempted = (error as { statements?: unknown }).statements;
+  const statements = Array.isArray(attempted) && attempted.every(entry => typeof entry === 'string') ? { statements: attempted as string[] } : {};
+  if (error.name === 'GatewayOwnedTableError') return { data: { code: 'protected_table', ...statements } };
+  const code = (error as { code?: unknown }).code;
+  const refused = REFUSAL_NAMES.has(error.name) && typeof code === 'string';
+  // The server's SQLSTATE lets the Console explain e.g. 42501 from the restricted account (ADR 0059 §4).
+  const sqlState = refused ? undefined : sqlStateOf(error);
+  const data = { ...(refused ? { code } : {}), ...(sqlState ? { sqlState } : {}), ...statements };
+  return Object.keys(data).length ? { data } : {};
+}
+
+function unsupportedDatabaseFeature(payloads: RuntimeConsoleRpcReply[], requestId: number | string | undefined, feature: string): void {
+  payloads.push({ requestId, error: `${feature} is not supported by this database Host`, data: { code: 'unsupported' } });
+}
+
 export function stringField(message: RuntimeConsoleRpcMessage, key: string): string {
   const value = message[key];
   return typeof value === 'string' ? value.trim() : '';

package/src/console-rpc.ts

@@ -3,6 +3,7 @@ import type { DatabaseHostConsole } from '@zhin.js/plugin-runtime';
 import {
   CONFIG_PATCH_LIMITS,
   CONFIG_RPC,
+  grantsAllow,
   type ConsoleConfigPatchRequest,
   type ConsoleConfigPatchResult,
   type ConsoleConfigProjectPatchResult,
@@ -10,7 +11,7 @@ import {
   type ConsoleConfigExplanation,
   type ConsoleEndpointSummary,
 } from '@zhin.js/console-protocol';
-import { authorizeConsoleRpc, type ConsolePrincipal } from './access-control.js';
+import { authorizeConsoleRpc, principalAllows, type ConsolePrincipal } from './access-control.js';
 import { dispatchExtendedConsoleRpc, type ConsoleRpcExtendedCtx } from './console-rpc-extended/index.js';
 import { dispatchPluginConsoleRpc } from './console-plugin-rpc.js';
 import {
@@ -257,6 +258,21 @@ export function pickRpcReply(
   );
 }
 
+/**
+ * The Endpoint a principal was admitted for when only an adapter / endpoint-scoped grant covers the
+ * call (B-1): handlers must then stay inside it. `undefined` when a global grant covers it.
+ */
+function scopedAuthorizedEndpoint(
+  principal: ConsolePrincipal,
+  decision: Extract<ReturnType<typeof authorizeConsoleRpc>, { allowed: true }>,
+): ConsoleRpcExtendedCtx['authorizedEndpoint'] {
+  if (principal.kind === 'bootstrap' || !decision.permission || !decision.rule) return undefined;
+  if (grantsAllow(principal.grants, decision.permission)) return undefined;
+  const target = decision.rule.target;
+  if (target.kind !== 'endpoint') return undefined;
+  return Object.freeze({ adapter: target.adapter, endpointKey: target.endpoint });
+}
+
 export async function dispatchRuntimeConsoleRpc(
   message: RuntimeConsoleRpcMessage,
   ctx: RuntimeConsoleRpcContext,
@@ -268,12 +284,20 @@ export async function dispatchRuntimeConsoleRpc(
   const type = String(message.type ?? '');
   const requestId = message.requestId as number | string | undefined;
 
+  let authorizedEndpoint: ConsoleRpcExtendedCtx['authorizedEndpoint'];
+  let canOperateEndpoint: ConsoleRpcExtendedCtx['canOperateEndpoint'];
   if (ctx.principal) {
-    const decision = authorizeConsoleRpc(ctx.principal, message as Record<string, unknown>);
+    const principal = ctx.principal;
+    const decision = authorizeConsoleRpc(principal, message as Record<string, unknown>);
     if (!decision.allowed) {
       emit({ requestId, error: decision.error, code: decision.code });
       return payloads;
     }
+    authorizedEndpoint = scopedAuthorizedEndpoint(principal, decision);
+    // Same grant check the map applies to `login.submit` for that Endpoint (ADR 0058 §8).
+    canOperateEndpoint = (adapter, endpointKey) => principalAllows(
+      principal, 'endpoint.operate', Object.freeze({ kind: 'endpoint', adapter, endpoint: endpointKey }),
+    );
   }
 
   // Extended RPC surface (cron/schedule、endpoint 社交/inbox)
@@ -281,11 +305,16 @@ export async function dispatchRuntimeConsoleRpc(
     const extended = await dispatchExtendedConsoleRpc(
       type,
       message as Record<string, unknown>,
-      { ...ctx.extended, fullScope: ctx.authScope === 'full' },
+      {
+        ...ctx.extended,
+        fullScope: ctx.authScope === 'full',
+        ...(authorizedEndpoint ? { authorizedEndpoint } : {}),
+        ...(canOperateEndpoint ? { canOperateEndpoint } : {}),
+      },
     );
     if (extended !== undefined) {
       emit('error' in extended
-        ? { requestId, error: extended.error }
+        ? { requestId, error: extended.error, ...(extended.data !== undefined ? { data: extended.data } : {}) }
         : { requestId, data: extended.data });
       return payloads;
     }

package/src/index.ts

@@ -43,6 +43,7 @@ export {
   requestMeta,
   rpcAuditDetail,
   rpcAuditTarget,
+  type RpcAuditOptions,
   type ConsoleAccessProvider,
   type ConsoleAuditEntry,
   type ConsoleBootstrapPrincipal,
@@ -135,6 +136,10 @@ export {
   type ConsoleWorkroomProfileControlPort,
   type ConsoleWorkroomKnowledgeControlPort,
   type ExtendedRpcResult,
+  type ConsoleLoginAssistPort,
+  type ConsoleEndpointLoginAccess,
+  loginAuditDetail,
+  LOGIN_SUBMIT_WAIT_MS,
 } from './console-rpc-extended/index.js';
 export * from './host-installer.js';