@mhfire/dsh-im-bridge 0.3.0 → 0.4.2

package/src/index.ts

@@ -31,6 +31,36 @@ import {
   WecomSessionReject,
   type WecomSessionRef,
 } from './session-key.ts'
+import {
+  ALLOW_FROM_REQUIRED_MESSAGE,
+  IM_BRIDGE_RPC_CHANNEL,
+  INSTALL_SKILLS_ENDPOINT,
+  SKILLS_RPC_UNAVAILABLE_MESSAGE,
+  WECOM_CLI_NO_OFFICE_PROMPT,
+  WECOM_CLI_PROMPT,
+  WECOM_CLI_TOOL_NAME,
+  WORKSPACE_WECOMCLI_LEAK_MESSAGE,
+  authInitHint,
+  countWecomcliSkills,
+  countWorkspaceWecomcliLeaks,
+  ensureConfigDir,
+  ensureOnPath,
+  installOfficialWecomSkills,
+  loadWecomSkills,
+  probeAuth,
+  registerWecomCliTool,
+  registerWecomOfficeSkills,
+  resolveConfigDir,
+  resolveSkillsDir,
+  resolveWecomBin,
+  senderHasOfficeAccess,
+  shouldEnableWecomCli,
+  shouldInjectWecomOfficeSkills,
+  skillsInstallHint,
+  trySeedAuth,
+  type InstallWecomSkillsResult,
+  type WecomSkill,
+} from './wecom-cli.ts'
 import {
   DEFAULT_THINKING,
   footerOf,
@@ -81,6 +111,25 @@ const ThinkingSchema = z.object({
   outputSpin: z.array(String).default(DEFAULT_THINKING.outputSpin),
 })
 
+const WecomCliSchema = z.object({
+  enabled: z.boolean().default(false),
+  skillsDir: z.string().default(''),
+  configDir: z.string().default(''),
+  allowFrom: z.array(String).default([]),
+})
+
+/** Optional wecom-cli office skills (mail, calendar, docs, …). */
+export interface WecomCliConfig {
+  /** Explicit opt-in; off by default because it shares the authorized identity. */
+  enabled: boolean
+  /** Skills root; empty = `$DSH_HOME/wecom-cli-skills`. */
+  skillsDir: string
+  /** Credential directory; empty = `<workspace>/.dsh/wecom-cli`. */
+  configDir: string
+  /** Office-command userid list; empty skips PATH / auth. Independent of chat `allowFrom`. */
+  allowFrom: string[]
+}
+
 /** Plugin config: secrets come from the profile patch or Settings. */
 export interface Config {
   botId: string
@@ -99,6 +148,7 @@ export interface Config {
   thinking: ThinkingConfig
   deniedMessage: string
   welcomeMessage: string
+  wecomCli: WecomCliConfig
 }
 
 /** Schemastery schema for the composition entry and settings namespace. */
@@ -119,6 +169,7 @@ export const Config: z<Config> = z.object({
   thinking: ThinkingSchema.default(DEFAULT_THINKING),
   deniedMessage: z.string().default('无权访问本服务'),
   welcomeMessage: z.string().default('👋 办公助手已就绪。直接发消息即可，例如查文件、整理文档、查资料或处理日常事务。'),
+  wecomCli: WecomCliSchema.default({ enabled: false, skillsDir: '', configDir: '', allowFrom: [] }),
 })
 
 interface LoggedEvent {
@@ -153,6 +204,7 @@ interface ChunkData {
 interface LiveAgent {
   whenIdle(): Promise<void>
   followup(message: unknown): void
+  ctx: Context
   session: {
     seq: number
     events: readonly LoggedEvent[]
@@ -164,6 +216,14 @@ interface ChatState {
   agent?: LiveAgent
   sessionId?: string
   kind?: 'single' | 'group'
+  /** True when the current inbound sender is on `wecomCli.allowFrom`. */
+  office: boolean
+  /** Prompt sections already registered on this Agent. */
+  wecomPromptInstalled: boolean
+  /** wecomcli-* already registered on this Agent. */
+  officeSkillsRegistered: boolean
+  /** The gated `wecom_cli` tool already registered on this Agent. */
+  officeToolRegistered: boolean
   queue: Promise<unknown>
   lastActivity: string
   activityClearAt: number
@@ -175,6 +235,10 @@ interface ChatState {
 /** Placeholder Map value so later messages on the same key share one queue. */
 function emptyChatState(): ChatState {
   return {
+    office: false,
+    wecomPromptInstalled: false,
+    officeSkillsRegistered: false,
+    officeToolRegistered: false,
     queue: Promise.resolve(),
     lastActivity: '',
     activityClearAt: 0,
@@ -184,6 +248,20 @@ function emptyChatState(): ChatState {
   }
 }
 
+/** Duck-typed Connection RPC result (no apiproxy import). */
+type SkillsRpcResult =
+  | { ok: true; value: InstallWecomSkillsResult }
+  | { ok: false; error: { code: 'internal' | 'cancelled'; message: string; details: Record<string, never> } }
+
+/** Optional Host Connection used by the Settings install button. */
+interface HostConnectionRpc {
+  handle(
+    channel: string,
+    handler: (endpoint: string, payload: unknown, signal: AbortSignal) => Promise<SkillsRpcResult>,
+    options: { authority: 'loopback' },
+  ): () => Promise<void>
+}
+
 interface DefaultModel {
   currentSelection(): { provider: string; model: string; reasoningEffort?: string }
 }
@@ -252,6 +330,16 @@ interface AgentPresets {
   mount(agentCtx: Context, id: string): Promise<unknown>
 }
 
+interface SystemPromptService {
+  section(entry: { name: string; order: number; text: () => string }): unknown
+}
+
+/** Caller-bound prompt registry on an Agent context (not a raw `get()` result). */
+interface PromptHost {
+  get(name: string): unknown
+  systemPrompt?: SystemPromptService
+}
+
 interface SettingsReader {
   get(ns: ReturnType<typeof settingsNamespace>): unknown
 }
@@ -412,6 +500,79 @@ export function apply(ctx: Context, config: Config): void {
   })
   const cfg = (): Config => source()
 
+  const chats = new Map<string, ChatState>()
+  let wecomCliReady = false
+  let officeSkills: WecomSkill[] = []
+  /** Launcher and credential directory the gated tool spawns with; set once wecom-cli is usable. */
+  let officeCli: { binJs: string; configDir: string } | undefined
+
+  /**
+   * Install the office layer on one Agent: wecomcli-* skills and the gated
+   * `wecom_cli` tool. Both register through the Agent's own context, so a group
+   * chat or the GUI never sees them. Idempotent per Agent, and retried on each
+   * inbound message because skills can arrive from the Settings button later.
+   */
+  function installOfficeLayer(agentCtx: Context, st: ChatState): void {
+    if (!wecomCliReady) return
+    if (!shouldInjectWecomOfficeSkills(st.kind, st.office)) return
+    if (!st.officeSkillsRegistered) {
+      const count = registerWecomOfficeSkills(agentCtx, officeSkills)
+      if (count > 0) {
+        st.officeSkillsRegistered = true
+        console.log(`[im-bridge] 已在该 Agent 注册 ${String(count)} 个 wecomcli-*`)
+      }
+    }
+    if (st.officeToolRegistered || officeCli === undefined) return
+    try {
+      st.officeToolRegistered = registerWecomCliTool(agentCtx, officeCli.binJs, officeCli.configDir)
+      if (st.officeToolRegistered) {
+        console.log(`[im-bridge] 已在该 Agent 注册 ${WECOM_CLI_TOOL_NAME} 工具`)
+      }
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error)
+      console.error(`[im-bridge] 注册 ${WECOM_CLI_TOOL_NAME} 失败: ${message}`)
+    }
+  }
+
+  ctx.inject(['connection'], (bound) => {
+    const rpc = (bound.get('connection') as { rpc?: HostConnectionRpc } | undefined)?.rpc
+    if (rpc === undefined) {
+      console.warn(`[im-bridge] ${SKILLS_RPC_UNAVAILABLE_MESSAGE}`)
+      return
+    }
+    bound.effect(
+      () => rpc.handle(IM_BRIDGE_RPC_CHANNEL, async (endpoint, _payload, signal) => {
+        if (endpoint !== INSTALL_SKILLS_ENDPOINT) {
+          return {
+            ok: false,
+            error: { code: 'internal', message: `unknown endpoint ${endpoint}`, details: {} },
+          }
+        }
+        if (signal.aborted) {
+          return {
+            ok: false,
+            error: { code: 'cancelled', message: '安装已取消', details: {} },
+          }
+        }
+        try {
+          const dest = resolveSkillsDir(cfg().wecomCli.skillsDir, cfg().workspace)
+          const result = await installOfficialWecomSkills(dest, { signal })
+          officeSkills = loadWecomSkills(result.dest).filter(skill => skill.name.startsWith('wecomcli-'))
+          for (const st of chats.values()) {
+            if (st.agent === undefined) continue
+            installOfficeLayer(st.agent.ctx, st)
+          }
+          console.log(`[im-bridge] 已安装 ${String(result.count)} 个 wecomcli-* 到 ${result.dest}`)
+          return { ok: true, value: result }
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error)
+          return { ok: false, error: { code: 'internal', message, details: {} } }
+        }
+      }, { authority: 'loopback' }),
+      'im-bridge: wecomcli.installSkills',
+    )
+  })
+
   void (async () => {
     const loader = ctx.get('loader') as LoaderTree | undefined
     await loader?.await()
@@ -423,7 +584,57 @@ export function apply(ctx: Context, config: Config): void {
       return
     }
 
-    const chats = new Map<string, ChatState>()
+    const wecomCli = cfg().wecomCli
+    if (wecomCli.enabled) {
+      const skillsDir = resolveSkillsDir(wecomCli.skillsDir, cfg().workspace)
+      officeSkills = loadWecomSkills(skillsDir).filter(skill => skill.name.startsWith('wecomcli-'))
+      const wecomcliCount = countWecomcliSkills(officeSkills)
+      if (wecomcliCount === 0) {
+        console.warn(
+          `[im-bridge] 未找到 wecomcli-* skills（${skillsDir}）。${skillsInstallHint(skillsDir)}`,
+        )
+      } else {
+        console.log(
+          `[im-bridge] 已从 ${skillsDir} 加载 ${String(wecomcliCount)} 个 wecomcli-*，将在办公单聊 Agent 上注册`,
+        )
+      }
+      const leakCount = countWorkspaceWecomcliLeaks(cfg().workspace)
+      if (leakCount > 0) {
+        console.warn(`[im-bridge] ${WORKSPACE_WECOMCLI_LEAK_MESSAGE}（${String(leakCount)}）`)
+      }
+      if (!shouldEnableWecomCli(true, wecomCli.allowFrom)) {
+        console.warn(`[im-bridge] ${ALLOW_FROM_REQUIRED_MESSAGE}`)
+      } else {
+        wecomCliReady = true
+        const binJs = resolveWecomBin()
+        if (binJs === undefined) {
+          console.warn('[im-bridge] 未找到 @wecom/cli 二进制，办公命令不可用。请确认插件依赖已安装。')
+        } else {
+          const configDir = ensureConfigDir(resolveConfigDir(wecomCli.configDir, cfg().workspace))
+          officeCli = { binJs, configDir }
+          console.log(`[im-bridge] wecom-cli 凭证目录: ${configDir}`)
+          const pathResult = ensureOnPath()
+          console.log(
+            `[im-bridge] PATH 上的 wecom-cli 已改为拒绝执行: ${pathResult.shimDir}${pathResult.shadowed ? '（已遮蔽另一个 wecom-cli）' : ''}`,
+          )
+          let status = await probeAuth(binJs, configDir)
+          if (status === 'unauthorized') {
+            if ((await trySeedAuth(binJs, cfg().botId, cfg().secret, configDir)) === undefined) {
+              status = await probeAuth(binJs, configDir)
+            }
+          }
+          if (status === 'authorized') {
+            console.log('[im-bridge] wecom-cli 已授权')
+          } else if (status === 'unauthorized') {
+            console.warn(
+              `[im-bridge] wecom-cli 未能用 botId/secret 完成授权。请在 host 上执行 ${authInitHint(configDir)}（输入同一套密钥，不要全局安装）。`,
+            )
+          } else {
+            console.warn('[im-bridge] wecom-cli auth show 失败。')
+          }
+        }
+      }
+    }
 
     /**
      * Add the channel prefix to a title the Host generated. `session/event`
@@ -494,6 +705,52 @@ export function apply(ctx: Context, config: Config): void {
       }
     }
 
+    /**
+     * Register persona + wecom prompt on this Agent's layer, synchronously.
+     * Must use `agentCtx.systemPrompt` (caller-bound). `inject()` without await
+     * yields a microtask and can publish the Agent before the section exists;
+     * `adopt` never re-runs setup.
+     */
+    function installWecomChannel(agentCtx: Context, st: ChatState): void {
+      if (st.wecomPromptInstalled) return
+      const host = agentCtx as Context & PromptHost
+      if (host.get('systemPrompt') === undefined || host.systemPrompt === undefined) {
+        console.warn('[im-bridge] 当前 Agent 没有 systemPrompt，企微提示词未注入')
+        return
+      }
+      const prompt = host.systemPrompt
+      try {
+        prompt.section({
+          name: 'deployment:persona',
+          order: 0,
+          text: () => resolvePersona(cfg(), settings),
+        })
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error)
+        console.warn(`[im-bridge] 人设段未覆盖（可能已由 preset 注册）: ${message}`)
+      }
+      try {
+        prompt.section({
+          name: 'channel:wecom-cli',
+          order: 1,
+          // Re-read per request: a group Agent is shared, and its sender —
+          // hence `st.office` — changes message to message. Only an office
+          // 1:1 gets the tool, so only it may get the office prompt.
+          // Always inject: WeCom has no GUI even when wecomCli is off.
+          text: () => wecomCliReady && shouldInjectWecomOfficeSkills(st.kind, st.office)
+            ? WECOM_CLI_PROMPT
+            : WECOM_CLI_NO_OFFICE_PROMPT,
+        })
+        console.log(
+          `[im-bridge] 已注入企微提示词 office=${String(st.office)} kind=${st.kind ?? '?'}`,
+        )
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error)
+        console.error(`[im-bridge] 注入企微提示词失败: ${message}`)
+      }
+      st.wecomPromptInstalled = true
+    }
+
     async function ensureAgent(ref: WecomSessionRef): Promise<ChatState> {
       let st = chats.get(ref.key)
       if (st === undefined) {
@@ -502,10 +759,18 @@ export function apply(ctx: Context, config: Config): void {
       }
       st.kind = ref.kind
       if (st.agent !== undefined) {
-        if (st.sessionId === undefined || !archivedSessions().has(st.sessionId)) return st
+        if (st.sessionId === undefined || !archivedSessions().has(st.sessionId)) {
+          // Office access is decided per inbound sender, and skills can arrive
+          // from the Settings button after this Agent was created.
+          installOfficeLayer(st.agent.ctx, st)
+          return st
+        }
         console.log(`[im-bridge] 会话 ${st.sessionId} 已归档，改开新会话`)
         st.agent = undefined
         st.sessionId = undefined
+        st.wecomPromptInstalled = false
+        st.officeSkillsRegistered = false
+        st.officeToolRegistered = false
       }
 
       const persistence = ctx.get('sessionPersistence') as SessionPersistence | undefined
@@ -522,6 +787,12 @@ export function apply(ctx: Context, config: Config): void {
         st.agent = agent
         st.sessionId = sessionId
         st.kind = ref.kind
+        if (agent.ctx === undefined) {
+          console.warn('[im-bridge] Agent 没有 ctx，无法注入企微提示词')
+        } else {
+          installWecomChannel(agent.ctx, st)
+          installOfficeLayer(agent.ctx, st)
+        }
         void unpinLegacyWecomTitle(agent)
         const cwd = agent.session.header?.cwd ?? stored?.cwd
         if (cwd !== undefined && cwd !== cfg().workspace) {
@@ -552,13 +823,7 @@ export function apply(ctx: Context, config: Config): void {
         const selected = { current: selection, assembled: undefined }
         installModelSelection(agentCtx, selected)
         if (presets !== undefined) await presets.mount(agentCtx, resolvedId)
-        agentCtx.inject(['systemPrompt'], (promptCtx) => {
-          promptCtx.systemPrompt.section({
-            name: 'deployment:persona',
-            order: 0,
-            text: () => resolvePersona(cfg(), settings),
-          })
-        })
+        installWecomChannel(agentCtx, st)
       }
       const agentOptions = { provider: selection.provider, model: selection.model }
 
@@ -637,7 +902,13 @@ export function apply(ctx: Context, config: Config): void {
     }
 
     async function handle(frame: WecomFrame, ref: WecomSessionRef, content: string): Promise<void> {
-      const st = await ensureAgent(ref)
+      let st = chats.get(ref.key)
+      if (st === undefined) {
+        st = emptyChatState()
+        chats.set(ref.key, st)
+      }
+      st.office = senderHasOfficeAccess(cfg().wecomCli.allowFrom, ref.sender)
+      st = await ensureAgent(ref)
       const startedAt = Date.now()
       const streamId = generateReqId('stream')
       let stopThinking: (() => void) | null = null

package/src/session-key.ts

@@ -163,6 +163,7 @@ export function planWecomBind(key: string, state: WecomBindState): WecomBindPlan
     if (state.stored.has(sessionId)) return { sessionId, bind: 'resume', epoch }
     return { sessionId, bind: 'create', epoch }
   }
+  
   throw new Error(`im-bridge: no free session epoch for ${key} within ${String(limit)} candidates`)
 }