@zhin.js/host-http 1.2.1 → 1.3.0

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-extended/schedule-rpc.ts

@@ -6,7 +6,32 @@ const CRON_NOT_WIRED =
   '持久化调度未接线：当前 Plugin Runtime ScheduleHost 仅支持插件注册的内存任务（list），' +
   '不支持 add/remove/pause/resume（需要 @zhin.js/agent 持久化调度引擎）';
 
-export function listSchedule(ctx: ConsoleScheduleListCtx): Promise<ExtendedRpcResult> | ExtendedRpcResult {
+/** `titleI18n[locale]` → `titleI18n[language]` → `title`. */
+function localizedTitle(job: ScheduleJobRow, locale: string | undefined): string | undefined {
+  const map = job.titleI18n && typeof job.titleI18n === 'object' ? job.titleI18n : undefined;
+  if (locale && map) {
+    const exact = map[locale];
+    if (typeof exact === 'string' && exact.trim()) return exact.trim();
+    const language = locale.split('-')[0]!;
+    const byLanguage = map[language];
+    if (typeof byLanguage === 'string' && byLanguage.trim()) return byLanguage.trim();
+  }
+  return typeof job.title === 'string' && job.title.trim() ? job.title.trim() : undefined;
+}
+
+function lastRunFields(job: ScheduleJobRow): Record<string, unknown> {
+  const run = job.lastRun;
+  if (!run || typeof run !== 'object' || typeof run.startedAt !== 'number') return {};
+  return {
+    lastExecutedAt: run.startedAt,
+    ...(typeof run.finishedAt === 'number' ? { lastFinishedAt: run.finishedAt, lastDurationMs: Math.max(0, run.finishedAt - run.startedAt) } : {}),
+    lastStatus: run.status === 'failed' ? 'failed' : 'succeeded',
+    ...(run.status === 'failed' && typeof run.error === 'string' ? { lastError: run.error } : {}),
+  };
+}
+
+export function listSchedule(ctx: ConsoleScheduleListCtx, d: Record<string, unknown> = {}): Promise<ExtendedRpcResult> | ExtendedRpcResult {
+  const locale = typeof d.locale === 'string' && d.locale.trim() ? d.locale.trim() : undefined;
   const host = ctx.scheduleHost as { list?: () => unknown } | undefined;
   if (!host || typeof host.list !== 'function') {
     return { error: '调度服务未配置（scheduleHost 未挂载）' };
@@ -18,17 +43,26 @@ export function listSchedule(ctx: ConsoleScheduleListCtx): Promise<ExtendedRpcRe
         !!job && typeof job === 'object'
         && typeof (job as ScheduleJobRow).id === 'string'
         && typeof (job as ScheduleJobRow).cron === 'string')
-      .map((job) => ({
+      .map((job) => {
+        const title = localizedTitle(job, locale);
+        return {
         id: job.id,
         cron: job.cron,
         ...(typeof job.description === 'string' ? { description: job.description } : {}),
+        // #1250: plugin polling is not a user reminder; title is localized, displayName never falls back to a bare id when a title exists.
+        kind: job.kind === 'user-task' ? 'user-task' : 'plugin-internal',
+        ...(title ? { title } : {}),
+        ...(job.titleI18n && typeof job.titleI18n === 'object' ? { titleI18n: job.titleI18n } : {}),
+        displayName: title ?? (typeof job.description === 'string' && job.description ? job.description : job.id),
+        ...lastRunFields(job),
         // console cron 页渲染字段（由 schedule host 提供时透传）
         expression: (job as { expression?: string }).expression ?? job.cron,
         running: (job as { running?: boolean }).running ?? true,
         ...((job as { plugin?: string }).plugin ? { plugin: (job as { plugin?: string }).plugin } : {}),
         ...((job as { nextExecution?: number }).nextExecution
           ? { nextExecution: (job as { nextExecution?: number }).nextExecution } : {}),
-      }));
+        };
+      });
     return listPersistentJobs(ctx).then((persistent) => ({ data: { memory, persistent, capabilities: { persistent: !!ctx.resolveScheduleEngine?.() && ctx.fullScope } } })).catch((error) => ({ error: errorMessage(error) }));
   } catch (error) {
     return { error: errorMessage(error) };
@@ -50,10 +84,14 @@ async function listPersistentJobs(ctx: ConsoleRpcExtendedCtx): Promise<Record<st
       prompt: (job.action as { prompt?: string } | undefined)?.prompt ?? '',
       enabled: job.enabled !== false,
       source: job.source ?? 'manual',
+      // Persistent jobs are created by a person or on their behalf by the Agent.
+      kind: 'user-task',
       createdAt: (job as { createdAt?: number }).createdAt,
       nextExecution: (job.state as { nextRunAtMs?: number } | undefined)?.nextRunAtMs,
       ...((job.notify as { target?: unknown } | undefined)?.target
         ? { context: { target: (job.notify as { target?: unknown }).target } } : {}),
+      // #1250: the resolved delivery target; `resolved: false` = results cannot be delivered.
+      ...(ctx.describeScheduleTarget ? { target: ctx.describeScheduleTarget(job.notify) } : {}),
       lastExecutedAt: (job.state as { lastExecutedAt?: number } | undefined)?.lastExecutedAt,
       lastStatus: (job.state as { lastStatus?: string } | undefined)?.lastStatus,
     }));
@@ -62,6 +100,22 @@ async function listPersistentJobs(ctx: ConsoleRpcExtendedCtx): Promise<Record<st
   }
 }
 
+/** The account (`adapter` / `endpoint`) a schedule delivery target sends from, if it names one. */
+function deliveryAccount(target: unknown): { adapter: string; endpoint: string } | undefined {
+  if (typeof target === 'string') {
+    // `<adapter>:<endpoint>:<kind>:<id>`
+    const [adapter, endpoint] = target.split(':');
+    return adapter && endpoint ? { adapter, endpoint } : undefined;
+  }
+  if (!target || typeof target !== 'object') return undefined;
+  const scene = (target as { scene?: unknown }).scene;
+  if (!scene || typeof scene !== 'object') return undefined;
+  const { platform, endpointKey } = scene as { platform?: unknown; endpointKey?: unknown };
+  return typeof platform === 'string' && platform && typeof endpointKey === 'string' && endpointKey
+    ? { adapter: platform, endpoint: endpointKey }
+    : undefined;
+}
+
 export async function addCron(
   d: Record<string, unknown>,
   ctx: ConsoleRpcExtendedCtx,
@@ -80,6 +134,16 @@ export async function addCron(
   const label = typeof d.label === 'string' && d.label.trim() ? d.label.trim() : undefined;
   const context = (d.context ?? {}) as Record<string, unknown>;
   const target = context.target ?? context.channel;
+  // A delivery target sends to that account on every run: `endpoint.operate` there, like
+  // `/message/send`, on top of `ops.schedule.write` (absent check = trusted in-process caller).
+  if (target && ctx.canOperateEndpoint) {
+    const account = deliveryAccount(target);
+    if (!account || !ctx.canOperateEndpoint(account.adapter, account.endpoint)) {
+      return { error: account
+        ? `没有向该账号投递的权限：需要 ${account.adapter} / ${account.endpoint} 上的 endpoint.operate`
+        : '投递目标需要指明账号（scene.platform 与 scene.endpointKey）' };
+    }
+  }
   const job = {
     id: `console-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 7)}`,
     ...(label ? { label } : {}),