@modesto_ma/dsh-guanxiang 0.2.0-beta.1 → 0.2.0-beta.2

package/src/index.ts

@@ -8,11 +8,13 @@
  * 改进时的 `guanxiang_propose_skill` 工具（经用户授权后把子 Agent 的 SKILL
  * 修改提议推送到新分支并创建合并请求）。应用仓库在设置
  * 面板中只填 git 地址，由插件拉取；应用描述来自各仓库的
- * `.dsh/guanxiang.yaml`。
+ * `.dsh/guanxiang.yaml`。另提供日志平台分析接口 `POST /open-api/logalyze`，
+ * 经 dsh-channels 的 `feishuTopics` 服务在飞书群话题中开始分析。
  *
  * @module dsh-guanxiang
  */
 
+import { mountAnalyzeRoute } from './analyze/server.ts'
 import { resolveConfig } from './config.ts'
 import type { HostContext } from './host.ts'
 import { GuanxiangService } from './service.ts'
@@ -32,7 +34,9 @@ export { ENTRY_SKILL_NAME, renderEntrySkill } from './skill/entry.ts'
 export { RepoRegistry } from './repos/registry.ts'
 export { readAppManifest, MANIFEST_PATH } from './repos/manifest.ts'
 export { GuanxiangService } from './service.ts'
-export { SETTINGS_ROUTE, STATE_ROUTE, SYNC_ROUTE } from './settings/contract.ts'
+export { ANALYZE_ROUTE, SETTINGS_ROUTE, STATE_ROUTE, SYNC_ROUTE } from './settings/contract.ts'
+export { analyzeRequestHash, parseAnalyzeRequest } from './analyze/contract.ts'
+export type { AnalyzeAccepted, AnalyzeRefused, AnalyzeRequest } from './analyze/contract.ts'
 
 /** Cordis plugin name. */
 export const name = 'guanxiang'
@@ -50,8 +54,9 @@ export interface GuanxiangPluginOptions extends ServiceOptions {
 }
 
 /**
- * Install the entry skill, the dispatch and SKILL proposal tools, and the settings routes, then
- * clone or update the configured repositories in the background.
+ * Install the entry skill, the dispatch and SKILL proposal tools, the settings
+ * routes, and the analyze route, then clone or update the configured
+ * repositories in the background.
  * @param ctx - plugin context.
  * @param config - loader-validated configuration.
  * @param options - test seams.
@@ -61,6 +66,7 @@ export function apply(ctx: HostContext, config?: unknown, options: GuanxiangPlug
   service.registerSkill()
   service.registerTool()
   mountSettingsRoutes(ctx, service)
+  mountAnalyzeRoute(ctx, service.analyzeGate())
   ctx.effect(() => {
     void service.boot().catch((error: unknown) => {
       ctx.logger?.error?.('guanxiang: 启动失败：%s', error instanceof Error ? error.message : String(error))

package/src/service.ts

@@ -9,13 +9,16 @@ import { z } from 'zod'
 import { applyOverlay, defaultsOf, describeIssue, editableSettingsSchema, expandHome } from './config.ts'
 import type { GuanxiangConfig, SettingsOverlay } from './config.ts'
 import { abortable } from './abort.ts'
+import type { AnalyzeGate } from './analyze/server.ts'
+import { FEISHU_TOPICS_SERVICE, lookupTopics } from './analyze/topics.ts'
 import { Dispatcher, isDelegatedAgent, isInside } from './dispatch/tool.ts'
 import type { HostApproval, HostContext, HostCredentials, ToolActivationContext, WorkingDirectoryService } from './host.ts'
 import { credentialEnvironment, credentialFor, isAcceptedToken, MAX_TOKEN_LENGTH } from './repos/credentials.ts'
 import { runGit } from './repos/git.ts'
 import type { GitRunner } from './repos/git.ts'
 import { RepoRegistry } from './repos/registry.ts'
-import type { CredentialsWire, EditableSettings, StateWire, TokenStatusWire } from './settings/contract.ts'
+import { ANALYZE_ROUTE } from './settings/contract.ts'
+import type { AnalyzeWire, CredentialsWire, EditableSettings, StateWire, TokenStatusWire } from './settings/contract.ts'
 import { diffOverlay, overriddenKeys } from './settings/overlay.ts'
 import type { OverlayStore } from './settings/overlay.ts'
 import { createEntrySkillProvider } from './skill/entry.ts'
@@ -47,6 +50,7 @@ export class GuanxiangService {
   private readonly skill: ReturnType<typeof createEntrySkillProvider>
   private active = true
   private readonly refreshWaitMs: number
+  private readonly analyzeTokenRef: string
   private readonly booted = Promise.withResolvers<void>()
 
   /**
@@ -63,6 +67,7 @@ export class GuanxiangService {
   ) {
     this.defaults = defaultsOf(config)
     this.refreshWaitMs = config.refreshWaitMs
+    this.analyzeTokenRef = config.analyzeTokenRef
     this.current = this.defaults
     const git = options.git ?? runGit
     this.registry = new RepoRegistry({
@@ -195,6 +200,33 @@ export class GuanxiangService {
       ...this.overlayError === undefined ? {} : { overlayError: this.overlayError },
       repos: this.registry.status(),
       credentials: await this.credentialsState(),
+      analyze: await this.analyzeState(),
+    }
+  }
+
+  /** @returns the analyze route's switch and bearer token, read per request. */
+  analyzeGate(): AnalyzeGate {
+    return {
+      enabled: () => this.current.analyze.enabled,
+      tokenEnv: () => this.analyzeTokenRef,
+      token: async () => {
+        try {
+          return (await this.credentialStore()?.resolve(this.analyzeTokenRef))?.value
+        } catch (error) {
+          this.ctx.logger?.warn?.('guanxiang: 读取分析接口令牌 %s 失败：%s', this.analyzeTokenRef, error instanceof Error ? error.message : String(error))
+          return undefined
+        }
+      },
+    }
+  }
+
+  private async analyzeState(): Promise<AnalyzeWire> {
+    const store = this.credentialStore()
+    return {
+      route: ANALYZE_ROUTE,
+      tokenEnv: this.analyzeTokenRef,
+      ...store === undefined ? {} : { token: await describeToken(store, this.analyzeTokenRef) },
+      topics: lookupTopics(this.ctx.get?.(FEISHU_TOPICS_SERVICE)).availability,
     }
   }
 
@@ -206,14 +238,7 @@ export class GuanxiangService {
     const store = this.credentialStore()
     if (store === undefined) return { available: false, tokens: [] }
     const names = [...new Set(this.current.gitCredentials.map(credential => credential.tokenEnv))]
-    const tokens = await Promise.all(names.map(async (tokenEnv): Promise<TokenStatusWire> => {
-      try {
-        const info = await store.describe(tokenEnv)
-        return { tokenEnv, configured: info.configured, ...info.source === undefined ? {} : { source: info.source }, writable: info.writable }
-      } catch (error) {
-        return { tokenEnv, configured: false, writable: false, error: error instanceof Error ? error.message : String(error) }
-      }
-    }))
+    const tokens = await Promise.all(names.map(tokenEnv => describeToken(store, tokenEnv)))
     return { available: true, tokens }
   }
 
@@ -237,10 +262,11 @@ export class GuanxiangService {
 
   /**
    * Store the token of one access-token configuration in DSH's credential
-   * store, then re-sync the repositories that use it.
+   * store, then re-sync the repositories that use it; or store the analyze
+   * API's bearer token (`analyzeTokenRef`), which applies from the next request.
    * @param raw - request body `{ tokenEnv, value }`.
    * @returns the new panel state.
-   * @throws SettingsError when the body is invalid, the name is not referenced by the saved settings, or no credential store is loaded.
+   * @throws SettingsError when the body is invalid, the name is neither referenced by the saved settings nor `analyzeTokenRef`, or no credential store is loaded.
    */
   async setToken(raw: unknown): Promise<StateWire> {
     const parsed = tokenSetSchema.safeParse(raw)
@@ -262,7 +288,7 @@ export class GuanxiangService {
   }
 
   private async writeToken(tokenEnv: string, value: string | undefined): Promise<StateWire> {
-    if (!this.current.gitCredentials.some(credential => credential.tokenEnv === tokenEnv)) throw new SettingsError(`${tokenEnv} 不是已保存的访问令牌配置引用的名称`)
+    if (tokenEnv !== this.analyzeTokenRef && !this.current.gitCredentials.some(credential => credential.tokenEnv === tokenEnv)) throw new SettingsError(`${tokenEnv} 不是已保存的访问令牌配置引用的名称`)
     const store = this.credentialStore()
     if (store === undefined) throw new SettingsError('当前 DSH 组合没有凭据服务（@deepseek-ai/dsh-credentials-local），无法保存令牌')
     if (value === undefined) await store.unset(tokenEnv)
@@ -329,3 +355,12 @@ export class GuanxiangService {
     this.skill.invalidate()
   }
 }
+
+async function describeToken(store: HostCredentials, tokenEnv: string): Promise<TokenStatusWire> {
+  try {
+    const info = await store.describe(tokenEnv)
+    return { tokenEnv, configured: info.configured, ...info.source === undefined ? {} : { source: info.source }, writable: info.writable }
+  } catch (error) {
+    return { tokenEnv, configured: false, writable: false, error: error instanceof Error ? error.message : String(error) }
+  }
+}

package/src/settings/contract.ts

@@ -11,9 +11,15 @@ export const STATE_ROUTE = '/guanxiang/state'
 export const SETTINGS_ROUTE = '/guanxiang/settings'
 /** POST：立即重新拉取全部仓库，或 body `{ url }` 指定的一个仓库。 */
 export const SYNC_ROUTE = '/guanxiang/sync'
-/** PUT：body `{ tokenEnv, value }` 把令牌存入 DSH 凭据库；DELETE：body `{ tokenEnv }` 删除已存的值。只接受已保存的访问令牌配置引用的名称。 */
+/** PUT：body `{ tokenEnv, value }` 把令牌存入 DSH 凭据库；DELETE：body `{ tokenEnv }` 删除已存的值。只接受已保存的访问令牌配置引用的名称和分析接口令牌的名称。 */
 export const TOKEN_ROUTE = '/guanxiang/token'
 
+/**
+ * POST：日志平台分析接口（Bearer 令牌鉴权，不走 DSH 登录）。它在 DSH 的
+ * `/api` 命名空间之外，网关可以把它和需要登录的 DSH 接口分开暴露。
+ */
+export const ANALYZE_ROUTE = '/open-api/logalyze'
+
 /** One configured application repository. */
 export interface RepoSpec {
   /** Git remote address, cloned with the host machine's existing git credentials or a matching {@link GitCredentialSpec}. */
@@ -57,6 +63,12 @@ export interface SkillUpdateSettings {
   maxFileBytes: number
 }
 
+/** The log-platform analyze API ({@link ANALYZE_ROUTE}). */
+export interface AnalyzeSettings {
+  /** Whether the API accepts requests; switched off it answers 404. */
+  enabled: boolean
+}
+
 /** The settings the Web panel can override; every field is required on the wire. */
 export interface EditableSettings {
   /** Absolute directory holding the cloned repositories (`~` expands to the home directory). */
@@ -75,10 +87,12 @@ export interface EditableSettings {
   download: DownloadSettings
   /** SKILL improvement proposals. */
   skillUpdates: SkillUpdateSettings
+  /** Log-platform analyze API. */
+  analyze: AnalyzeSettings
 }
 
 /** Keys of {@link EditableSettings}, in panel order. */
-export const EDITABLE_KEYS = ['reposDir', 'repos', 'gitCredentials', 'fetchIntervalMs', 'maxAppsPerRequest', 'dispatchTimeoutMs', 'download', 'skillUpdates'] as const satisfies readonly (keyof EditableSettings)[]
+export const EDITABLE_KEYS = ['reposDir', 'repos', 'gitCredentials', 'fetchIntervalMs', 'maxAppsPerRequest', 'dispatchTimeoutMs', 'download', 'skillUpdates', 'analyze'] as const satisfies readonly (keyof EditableSettings)[]
 
 /** One editable key. */
 export type EditableKey = (typeof EDITABLE_KEYS)[number]
@@ -146,6 +160,25 @@ export interface CredentialsWire {
   tokens: TokenStatusWire[]
 }
 
+/**
+ * Whether dsh-channels provides the `feishuTopics` service the analyze API
+ * posts through: `missing` while it is not loaded (or older than 0.8, which
+ * serves the API itself), `incompatible` when its contract version is not
+ * the one this plugin speaks.
+ */
+export type TopicsAvailability = 'ready' | 'missing' | 'incompatible'
+
+/** Analyze API view of the panel. */
+export interface AnalyzeWire {
+  /** Route the log platform posts to. */
+  route: string
+  /** Credential reference (`analyzeTokenRef`) holding the bearer token. */
+  tokenEnv: string
+  /** Token status; absent while the DSH composition has no credential store. */
+  token?: TokenStatusWire
+  topics: TopicsAvailability
+}
+
 /** `GET /guanxiang/state` response. */
 export interface StateWire {
   /** Effective settings: cordis.yml values with panel overrides applied. */
@@ -158,6 +191,7 @@ export interface StateWire {
   overlayError?: string
   repos: RepoStatusWire[]
   credentials: CredentialsWire
+  analyze: AnalyzeWire
 }
 
 /** Successful mutation response. */