@modesto_ma/dsh-channels 0.5.0-beta.7 → 0.6.0

package/src/service.ts

@@ -57,8 +57,7 @@ import type {
 } from './domain.ts'
 import { RouteStore } from './session/routes.ts'
 import { AnalyzeLauncher } from './analyze/launcher.ts'
-import { startAnalyzeServer } from './analyze/server.ts'
-import type { AnalyzeServer } from './analyze/server.ts'
+import type { AnalyzeHandler } from './analyze/server.ts'
 import { InflightRepair } from './session/repair.ts'
 import { SessionManager } from './session/manager.ts'
 import type { LiveAgent, RenewCommit } from './session/manager.ts'
@@ -313,10 +312,6 @@ export class FeishuService {
   private readonly inbound: InboundRouter
   /** Log-platform analyze API business side (requests → shared analysis topics). */
   private readonly analyzeLauncher: AnalyzeLauncher
-  /** Bound analyze listener while connected with `analyzeListen` set. */
-  private analyzeServer: AnalyzeServer | undefined
-  /** Why the analyze listener could not bind at the last connect. */
-  private analyzeListenError: string | undefined
   /** Agent/session lifecycle: live registry, resume, presets, renew. */
   private readonly sessions: SessionManager
   /**
@@ -980,6 +975,8 @@ export class FeishuService {
     }
   }
 
+  /** The analyze API's business side, for the Web route. */
+  analyzeHandler(): AnalyzeHandler { return this.analyzeLauncher }
   isRunning(): boolean { return this.started }
   isRestarting(): boolean { return this.restarting }
   /** True while the panel's explicit connect action is in flight. */
@@ -1660,9 +1657,9 @@ export class FeishuService {
     // Background: the results only feed the panel and the log.
     void this.runScopeCheck(channel, appId, ownerLookup)
     if (this.config.slashCommandPanel) void this.runSlashCommandSync(channel)
-    // Before the listener opens, so every `running` record left is a previous instance's.
+    // Before admission opens, so every `running` record left is a previous instance's.
     await this.analyzeLauncher.markInterrupted()
-    await this.openAnalyzeListener()
+    this.analyzeLauncher.open()
     // Repair cards a previous instance left mid-flight (best-effort, background).
     void this.repair.repairAll().catch((error: unknown) => {
       this.ctx.logger?.warn?.('dsh-channels: inflight repair failed: %s', String(error))
@@ -1720,37 +1717,13 @@ export class FeishuService {
     )
   }
 
-  /**
-   * Bind the analyze listener when `analyzeListen` is set. A bind failure is
-   * logged and folded into the health snapshot (panel reasons, `/health`); the Feishu connection stays up.
-   */
-  private async openAnalyzeListener(): Promise<void> {
-    this.analyzeListenError = undefined
-    const listen = this.config.analyzeListen
-    if (listen === undefined) return
-    try {
-      this.analyzeServer = await startAnalyzeServer(
-        listen,
-        this.analyzeLauncher,
-        (message, ...args) => this.ctx.logger?.warn?.(message, ...args),
-      )
-      console.info('[dsh-channels] 日志分析接口已监听', listen)
-    } catch (error) {
-      this.analyzeListenError = messageOf(error)
-      this.ctx.logger?.error?.('dsh-channels: analyze listener on %s failed: %s', listen, this.analyzeListenError)
-      console.error('[dsh-channels] 日志分析接口监听失败:', listen, error)
-    }
-  }
-
   /** Tear down: close the connection and dispose all live agents. */
   async shutdown(): Promise<void> {
     // Close admission first. In-flight Host commands receive cancellation
     // before their Agent/channel/storage dependencies are disposed, while
     // already queued route operations observe `started === false` and retire.
     this.started = false
-    const analyzeServer = this.analyzeServer
-    this.analyzeServer = undefined
-    await analyzeServer?.close()
+    this.analyzeLauncher.close()
     await this.analyzeLauncher.drain()
     for (const controller of this.commandControllers) controller.abort()
     await Promise.allSettled([...this.commandOperations])
@@ -2488,8 +2461,15 @@ export class FeishuService {
     modelAdmission: ModelAdmission | undefined
   }): Promise<void> {
     const { spec, msg, current, live, result, compactBefore, renewAdmission, effortAdmission, modelAdmission } = input
-    if (spec.name === 'effort') effortAdmission?.controller.sync(live.agent.session.snapshotEvents())
-    if (spec.name === 'model') modelAdmission?.controller.sync(live.agent.session.snapshotEvents())
+    // A settled switch (not a bare view) reconciles the Agent's selection even
+    // when the folded policy looks unchanged, e.g. a reset after restart.
+    const reconcile = !input.bare && result.kind === 'success' ? spec.name : undefined
+    if (spec.name === 'effort') {
+      effortAdmission?.controller.sync(live.agent.session.snapshotEvents(), live.agent, reconcile === 'effort' ? 'effort' : undefined)
+    }
+    if (spec.name === 'model') {
+      modelAdmission?.controller.sync(live.agent.session.snapshotEvents(), live.agent, reconcile === 'model' ? 'model' : undefined)
+    }
     if (input.bare && result.kind === 'success') {
       const picker = spec.name === 'model' && modelAdmission !== undefined
         ? await this.modelPicker(current, live, modelAdmission)
@@ -2710,7 +2690,6 @@ export class FeishuService {
       routeCount: this.routes.size(),
       liveAgentCount: this.sessions.liveCount(),
       inflightTurnCount,
-      ...(this.analyzeListenError === undefined ? {} : { analyzeListenError: this.analyzeListenError }),
     })
   }
 
@@ -3102,11 +3081,12 @@ function currentModelRoute(
   controller: RequestPolicyController,
 ): { provider: string | undefined; model: string | undefined } {
   const state = controller.state
+  const selected = live.agent.model?.current()
   const header = live.agent.session.requestHeader?.()?.config
   return {
-    provider: state.effectiveModel?.provider
+    provider: state.effectiveModel?.provider ?? selected?.provider
       ?? (typeof header?.provider === 'string' && header.provider !== '' ? header.provider : undefined),
-    model: state.effectiveModel?.model
+    model: state.effectiveModel?.model ?? selected?.model
       ?? (typeof header?.model === 'string' && header.model !== '' ? header.model : undefined),
   }
 }

package/src/session/manager.ts

@@ -207,7 +207,7 @@ export class SessionManager {
 
   /** Borrow one foreign live agent and mount this channel's scoped policy. */
   private async borrow(sessionId: string, agent: Agent): Promise<LiveAgent> {
-    const borrowed = borrowLiveAgent(agent, this.mountRequestPolicy(agent.ctx, agent.session))
+    const borrowed = borrowLiveAgent(agent, this.mountRequestPolicy(agent.ctx, agent))
     this.live.set(sessionId, borrowed)
     // Best-effort tool backfill (D7): the foreign owner may have composed the
     // session without this plugin's setup (web UI resolver, previous plugin
@@ -253,13 +253,13 @@ export class SessionManager {
   }
 
   /** Mount one mutable Session-aware request policy outside every other wrapper. */
-  mountRequestPolicy(agentCtx: AgentContext, session?: Session): () => void {
+  mountRequestPolicy(agentCtx: AgentContext, agent?: Agent): () => void {
     const controller = installRequestPolicy(agentCtx, {
       effort: this.deps.config.reasoningEffort,
       provider: this.deps.config.provider,
       model: this.deps.config.model,
     })
-    if (session !== undefined) controller.sync(session.snapshotEvents())
+    if (agent !== undefined) controller.sync(agent.session.snapshotEvents(), agent)
     this.policies.set(agentCtx, controller)
     return () => {
       controller.dispose()
@@ -273,7 +273,7 @@ export class SessionManager {
     if (controller === undefined) {
       throw new Error('dsh-channels: request policy is not mounted for this Agent')
     }
-    controller.sync(agent.session.snapshotEvents())
+    controller.sync(agent.session.snapshotEvents(), agent)
     return controller
   }
 

package/src/session/request-policy.ts

@@ -7,6 +7,12 @@
  * rewrite the request after `next()` resolves. The outer channel wrapper
  * therefore writes last.
  *
+ * DSH 0.2.2 moved model choice onto the Agent (`agent.model`) and fails a
+ * step whose `agent/request` listener changes provider, model, or reasoning
+ * effort. On such hosts the waterfall passes the request through and `sync`
+ * records the effective policy with `agent.model.select()` instead; DSH 0.2.1
+ * hosts (no `agent.model`) keep the waterfall override.
+ *
  * Session overrides are recovered from successful command lifecycles
  * (`/effort`, `/model`). Reusing Harness' durable `command/run` /
  * `command/done` pair avoids inventing an out-of-repo Session event that
@@ -15,7 +21,7 @@
  * @module dsh-channels/session/request-policy
  */
 
-import type { AgentContext, CommandId, SessionEvent } from '../dsh-types.ts'
+import type { Agent, AgentContext, AgentModel, CommandId, SessionEvent } from '../dsh-types.ts'
 
 /** A model selection override: a bare model keeps the composed provider. */
 export interface ModelOverride {
@@ -51,8 +57,16 @@ export interface RequestPolicyState {
 
 export interface RequestPolicyController {
   readonly state: RequestPolicyState
-  /** Re-fold the durable log after resume or a settled command lifecycle. */
-  sync(events: readonly SessionEvent[]): void
+  /**
+   * Re-fold the durable log after resume or a settled command lifecycle.
+   * With an `agent` whose host owns model selection, a changed policy is
+   * recorded through `agent.model.select()` for the next step. `reconcile`
+   * names a just-settled `/effort` or `/model` switch: the policy is recorded
+   * even when this controller saw no change, so a reset also clears a
+   * selection persisted before the controller existed (earlier plugin
+   * instance or since-removed config default).
+   */
+  sync(events: readonly SessionEvent[], agent?: Agent, reconcile?: 'effort' | 'model'): void
   /** Remove only this controller's Agent-scoped request wrapper. */
   dispose(): void
 }
@@ -134,6 +148,39 @@ export function foldModelOverride(events: readonly SessionEvent[]): ModelOverrid
   return foldRequestPolicy(events).model
 }
 
+/** Policy values last recorded through `agent.model`, compared to skip no-op selections. */
+interface AppliedPolicy {
+  readonly effort: string | undefined
+  readonly model: ModelOverride | undefined
+}
+
+function sameModel(left: ModelOverride | undefined, right: ModelOverride | undefined): boolean {
+  return left?.provider === right?.provider && left?.model === right?.model
+}
+
+/**
+ * Record one effective policy as the Agent's next-step selection. A policy
+ * without a model keeps the current route, except right after a model
+ * override is cleared, when the Agent's live options (deployment default)
+ * supply it again. Without a resolvable provider and model nothing is recorded.
+ */
+function selectPolicy(
+  model: AgentModel,
+  agent: Agent,
+  effort: string | undefined,
+  target: ModelOverride | undefined,
+  modelCleared: boolean,
+): void {
+  const current = model.current()
+  const base = modelCleared && agent.options.provider !== undefined && agent.options.model !== undefined
+    ? { provider: agent.options.provider, model: agent.options.model }
+    : current
+  const provider = target?.provider ?? base?.provider
+  const modelId = target?.model ?? base?.model
+  if (provider === undefined || provider === '' || modelId === undefined || modelId === '') return
+  model.select({ provider, model: modelId, ...(effort === undefined ? {} : { reasoningEffort: effort }) })
+}
+
 /** Install the mutable request policy outside every other request wrapper. */
 export function installRequestPolicy(
   agentCtx: AgentContext,
@@ -142,12 +189,16 @@ export function installRequestPolicy(
   let effortOverride: string | undefined
   let modelOverride: ModelOverride | undefined
   let disposed = false
+  /** Last policy recorded through `agent.model`; undefined until the first selecting sync. */
+  let applied: AppliedPolicy | undefined
   const configuredModel: ModelOverride | undefined = config.provider !== undefined && config.model !== undefined
     ? { provider: config.provider, model: config.model }
     : undefined
 
-  const disposeListener = agentCtx.on('agent/request', async (_payload, next) => {
+  const disposeListener = agentCtx.on('agent/request', async (payload, next) => {
     const request = await next()
+    // Hosts that own model selection reject a changed route or effort here.
+    if (payload.agent?.model !== undefined) return request
     const effort = effortOverride ?? config.effort
     const model = modelOverride ?? configuredModel
     if (effort === undefined && model === undefined) return request
@@ -178,10 +229,18 @@ export function installRequestPolicy(
           : configuredModel !== undefined ? 'config' : 'deployment-default',
       }
     },
-    sync(events) {
+    sync(events, agent, reconcile) {
       const folded = foldRequestPolicy(events)
       effortOverride = folded.effort
       modelOverride = folded.model
+      const model = agent?.model
+      if (agent === undefined || model === undefined || disposed) return
+      const next: AppliedPolicy = { effort: effortOverride ?? config.effort, model: modelOverride ?? configuredModel }
+      const previous = applied ?? { effort: undefined, model: undefined }
+      applied = next
+      if (reconcile === undefined && previous.effort === next.effort && sameModel(previous.model, next.model)) return
+      const modelCleared = next.model === undefined && (reconcile === 'model' || previous.model !== undefined)
+      selectPolicy(model, agent, next.effort, next.model, modelCleared)
     },
     dispose() {
       if (disposed) return

package/src/settings/contract.ts

@@ -7,29 +7,45 @@
  * @module dsh-channels/settings/contract
  */
 
-/** Same-origin routes the settings panel talks to. */
-export const STATUS_ROUTE = '/dsh-channels/status'
-export const PANEL_ROUTE = '/dsh-channels/panel'
-export const CONFIG_ROUTE = '/dsh-channels/config'
-export const CREDENTIALS_ROUTE = '/dsh-channels/credentials'
+/**
+ * Settings panel routes: exact DSH `/api` Fetch routes named
+ * `/api/dsh-channels.<method>`. Reads are GET; every write is POST, because
+ * DSH exact `/api` routes accept only GET, HEAD, and POST.
+ */
+export const STATUS_ROUTE = '/api/dsh-channels.status'
+export const PANEL_ROUTE = '/api/dsh-channels.panel'
+/** Persist a partial config edit (POST, body `{ values }`). */
+export const SAVE_CONFIG_ROUTE = '/api/dsh-channels.saveConfig'
+/** Drop every Web override (POST, no body). */
+export const CLEAR_CONFIG_ROUTE = '/api/dsh-channels.clearConfig'
+/** Store credential values (POST, body `SaveCredentialsRequest`). */
+export const SAVE_CREDENTIALS_ROUTE = '/api/dsh-channels.saveCredentials'
+/** Remove one stored credential (POST, body `{ field }`). */
+export const CLEAR_CREDENTIAL_ROUTE = '/api/dsh-channels.clearCredential'
 /**
  * Connection lifecycle action (POST). While the channel runs it restarts the
  * long connection; while it is stopped it opens one — so the panel has exactly
  * one "connect / reconnect" button. Credentials are resolved again either way.
  */
-export const RECONNECT_ROUTE = '/dsh-channels/reconnect'
+export const RECONNECT_ROUTE = '/api/dsh-channels.reconnect'
 /** 模型/推理档位/预设选择器的宿主目录（provider → model → effort 级联刷新）。 */
-export const CATALOG_ROUTE = '/dsh-channels/catalog'
-/** 访问与授权只读快照（GET/HEAD）：准入模式、管理员、群/用户/知识库白名单、待处理申请。 */
-export const ACCESS_ROUTE = '/dsh-channels/access'
-/** 群白名单增删（POST/DELETE，body `{ chatId, name? }` / `{ chatId }`）。 */
-export const ACCESS_GROUPS_ROUTE = '/dsh-channels/access/groups'
-/** 用户白名单增删（POST/DELETE，body `{ userId, name? }` / `{ userId }`）。 */
-export const ACCESS_USERS_ROUTE = '/dsh-channels/access/users'
-/** 知识库白名单增删（POST/DELETE，body `{ userId, name? }` / `{ userId }`）。 */
-export const ACCESS_WIKI_USERS_ROUTE = '/dsh-channels/access/wiki-users'
+export const CATALOG_ROUTE = '/api/dsh-channels.catalog'
+/** 访问与授权只读快照（GET）：准入模式、管理员、群/用户/知识库白名单、待处理申请。 */
+export const ACCESS_ROUTE = '/api/dsh-channels.access'
+/** 授权一个群（POST，body `{ chatId, name? }`）。 */
+export const ADD_ACCESS_GROUP_ROUTE = '/api/dsh-channels.addAccessGroup'
+/** 撤销一个群（POST，body `{ chatId }`）。 */
+export const REMOVE_ACCESS_GROUP_ROUTE = '/api/dsh-channels.removeAccessGroup'
+/** 用户白名单添加（POST，body `{ userId, name? }`）。 */
+export const ADD_ACCESS_USER_ROUTE = '/api/dsh-channels.addAccessUser'
+/** 用户白名单移除（POST，body `{ userId }`）。 */
+export const REMOVE_ACCESS_USER_ROUTE = '/api/dsh-channels.removeAccessUser'
+/** 知识库白名单添加（POST，body `{ userId, name? }`）。 */
+export const ADD_WIKI_USER_ROUTE = '/api/dsh-channels.addWikiUser'
+/** 知识库白名单移除（POST，body `{ userId }`）。 */
+export const REMOVE_WIKI_USER_ROUTE = '/api/dsh-channels.removeWikiUser'
 /** 结算一条待处理授权申请（POST，body `{ token, decision }`）。 */
-export const ACCESS_REQUESTS_ROUTE = '/dsh-channels/access/requests'
+export const RESOLVE_ACCESS_REQUEST_ROUTE = '/api/dsh-channels.resolveAccessRequest'
 /**
  * 打开宿主机的系统目录选择框（POST，无请求体），返回绝对路径。
  *
@@ -37,9 +53,9 @@ export const ACCESS_REQUESTS_ROUTE = '/dsh-channels/access/requests'
  * 会注册实际选择逻辑；远程/无头会话的 browse 后端不可用，面板不下发
  * [`EditableFieldWire.browse`]，保留手写输入。
  */
-export const PICK_DIRECTORY_ROUTE = '/dsh-channels/pick-directory'
-/** 会话的飞书来源（GET/HEAD，`?sessionId=`）：对话右侧栏「飞书来源」标签与会话头部入口使用。 */
-export const SESSION_ORIGIN_ROUTE = '/dsh-channels/session-origin'
+export const PICK_DIRECTORY_ROUTE = '/api/dsh-channels.pickDirectory'
+/** 会话的飞书来源（GET，`?sessionId=`）：对话右侧栏「飞书来源」标签与会话头部入口使用。 */
+export const SESSION_ORIGIN_ROUTE = '/api/dsh-channels.sessionOrigin'
 
 /** Where one Feishu-routed Session came from; names are resolved live and may be absent. */
 export interface SessionOriginWire {
@@ -76,7 +92,7 @@ export interface SessionOriginWire {
  * names and avatars for the users and chats the panel shows. At most
  * {@link PROFILES_MAX_IDS} ids per list.
  */
-export const PROFILES_ROUTE = '/dsh-channels/profiles'
+export const PROFILES_ROUTE = '/api/dsh-channels.profiles'
 
 /** Most `user_id`s, and separately most `chat_id`s, one profiles request may name. */
 export const PROFILES_MAX_IDS = 200
@@ -111,7 +127,7 @@ export interface SessionOriginResponse {
  * `cordis.patch.yml`（见 README「Web 设置面板」）。
  *
  * 刻意不包含 `appId` / `appSecret`：它们是**凭据引用名**，面板改为直接
- * 编辑引用背后的值（`PUT /dsh-channels/credentials`，经 DSH 凭据服务写入），
+ * 编辑引用背后的值（`POST /api/dsh-channels.saveCredentials`，经 DSH 凭据服务写入），
  * 因此不会落进覆盖层文件。
  *
  * `baseDir`（工作区根目录 = 模型/工具产生文件的落点）可覆盖，但面板只接受
@@ -172,7 +188,7 @@ export const EDITABLE_KEYS = [
   'feishuTools.wikiWrite',
   'wikiRoots',
   // 日志平台分析接口（访问令牌是凭据引用 analyzeToken，值写在 DSH 凭据里）
-  'analyzeListen',
+  'analyzeEnabled',
   // 日志
   'loggerLevel',
 ] as const
@@ -187,7 +203,6 @@ export const RESTART_KEYS = [
   'dmMode',
   'requireMention',
   'slashCommandPanel',
-  'analyzeListen',
   'refreshMs',
   'statusRefreshMs',
   'loggerLevel',
@@ -305,7 +320,7 @@ export interface SelectCatalogWire {
   help?: string
 }
 
-/** `GET /dsh-channels/catalog` payload: the model-facing selector catalog. */
+/** `GET /api/dsh-channels.catalog` payload: the model-facing selector catalog. */
 export interface CatalogWire {
   provider: SelectCatalogWire
   model: SelectCatalogWire
@@ -499,7 +514,7 @@ export interface AccessRequestWire {
 }
 
 /**
- * `GET /dsh-channels/access` payload: admission mode, the administrator
+ * `GET /api/dsh-channels.access` payload: admission mode, the administrator
  * reference, the group, user, and wiki whitelists, and the still-pending
  * authorization requests.
  */
@@ -528,12 +543,12 @@ export interface AccessWire {
   requests: AccessRequestWire[]
 }
 
-/** Write responses for every `/dsh-channels/access*` mutation. */
+/** Write responses for every access mutation route. */
 export type AccessMutationResponse =
   | { ok: true; access: AccessWire }
   | { ok: false; error: string }
 
-/** `GET /dsh-channels/panel` payload. */
+/** `GET /api/dsh-channels.panel` payload. */
 export interface PanelWire {
   status: ChannelStatusWire
   config: PanelConfigWire
@@ -542,7 +557,7 @@ export interface PanelWire {
 }
 
 /**
- * `POST /dsh-channels/pick-directory` response. `canceled` is a normal
+ * `POST /api/dsh-channels.pickDirectory` response. `canceled` is a normal
  * outcome (the operator dismissed the OS dialog), not an error; `path` is an
  * absolute directory the Host's native chooser returned.
  */
@@ -551,7 +566,7 @@ export type PickDirectoryResponse =
   | { ok: true; canceled: true }
   | { ok: false; error: string }
 
-/** `PUT /dsh-channels/config` body. */
+/** `POST /api/dsh-channels.saveConfig` body. */
 export interface SaveConfigRequest {
   values: EditableValues
 }
@@ -567,30 +582,30 @@ export interface FieldIssueWire {
   index?: number
 }
 
-/** `PUT /dsh-channels/config` response. */
+/** `POST /api/dsh-channels.saveConfig` response. */
 export type SaveConfigResponse =
   | { ok: true; panel: PanelWire; clearedKeys: EditableKey[] }
   | { ok: false; error: string; issues?: FieldIssueWire[] }
 
-/** `POST /dsh-channels/reconnect` response. */
+/** `POST /api/dsh-channels.reconnect` response. */
 export type ReconnectResponse =
   | { ok: true; panel: PanelWire }
   /** `unconfigured` tells the panel to route the user to the credentials form. */
   | { ok: false; error: string; unconfigured?: boolean }
 
-/** `DELETE /dsh-channels/config` response. */
+/** `POST /api/dsh-channels.clearConfig` response. */
 export type ClearConfigResponse =
   | { ok: true; panel: PanelWire }
   | { ok: false; error: string }
 
-/** `PUT /dsh-channels/credentials` body: only provided, non-empty values are written. */
+/** `POST /api/dsh-channels.saveCredentials` body: only provided, non-empty values are written. */
 export interface SaveCredentialsRequest {
   appId?: string
   appSecret?: string
   analyzeToken?: string
 }
 
-/** `DELETE /dsh-channels/credentials` body. */
+/** `POST /api/dsh-channels.clearCredential` body. */
 export interface ClearCredentialRequest {
   field: CredentialField
 }