agentworkshop 0.7.24 → 0.7.33

package/server/services/workshop/agents/copilot-agent.ts

@@ -0,0 +1,136 @@
+/**
+ * CopilotAgentImpl — GitHub Copilot CLI(`-p/--output-format json`)的 AgentInterface 实现。
+ *
+ * 进程模型:每回合一个 `copilot` 子进程(prompt 经 stdin 管道投递,--output-format json
+ * 输出 JSONL)。鉴权走 token 链(COPILOT_GITHUB_TOKEN > GH_TOKEN > GITHUB_TOKEN,
+ * 服务端无需浏览器);配置经 COPILOT_HOME 按 agent 隔离(<root>/.AgentWorkShop/
+ * harness-config/copilot/<agentId>/,内种子 mcp-config.json 挂 aw 桥)。
+ *
+ *  - steer:一次性进程模型 → 恒 'deferred'
+ *  - HITL:无程序化审批面(--allow-tool 白名单制)。默认仅授权 aw 桥工具
+ *    (--allow-tool aw),native shell/write 保持未授权;config.copilotAllowTools 可扩
+ *  - 事件帧:JSONL 逐行(行级 schema 以探针为准;解析器对未知 type 忽略并计数)
+ */
+import { isAbsolute, join, resolve } from 'node:path'
+import { mkdirSync, writeFileSync, existsSync, readFileSync } from 'node:fs'
+import { createLogger } from '../logger'
+import { harnessSettings } from '../settings'
+import {
+  OneShotCliAgentImpl,
+  type OneShotEngineSpec,
+} from './adapters/one-shot-cli-agent'
+import { resolveBridgePath } from './harness-env'
+import { toolArgsPreview } from './prompt-builder'
+
+const log = createLogger('workshop.copilot')
+
+/** agentId 白名单化(仅作为路径段使用;杜绝 ../ 与分隔符注入) */
+function safeId(agentId: unknown): string {
+  const id = String(agentId ?? 'default').replace(/[^A-Za-z0-9_-]/g, '')
+  return id !== '' ? id : 'default'
+}
+
+/** COPILOT_HOME 解析:显式 config 路径须为绝对路径且不含 .. 段;否则落配置根白名单目录 */
+function resolveCopilotHome(config: Record<string, unknown>): string {
+  const raw = typeof config.copilotHome === 'string' ? config.copilotHome.trim() : ''
+  if (raw !== '') {
+    if (raw.split(/[\\/]/).includes('..') || !isAbsolute(raw)) {
+      throw new Error(`copilotHome 必须是不含 .. 的绝对路径: ${JSON.stringify(raw.slice(0, 80))}`)
+    }
+    return resolve(raw)
+  }
+  const root = process.env.AW_PACKAGE_ROOT ?? process.cwd()
+  return join(root, '.AgentWorkShop', 'harness-config', 'copilot', safeId(config.agentId))
+}
+
+/** 确保 <copilotHome>/mcp-config.json 含 aw 桥(merge-only) */
+export function ensureCopilotMcpConfig(home: string, bridgePath: string): void {
+  mkdirSync(home, { recursive: true })
+  const file = join(home, 'mcp-config.json')
+  let doc: Record<string, unknown> = {}
+  try {
+    if (existsSync(file)) doc = JSON.parse(readFileSync(file, 'utf-8')) as Record<string, unknown>
+  }
+  catch (err) {
+    log.warn(`copilot mcp-config.json 解析失败,保留原文件: ${err instanceof Error ? err.message : String(err)}`)
+    return
+  }
+  const servers = (doc.mcpServers && typeof doc.mcpServers === 'object' ? doc.mcpServers : {}) as Record<string, unknown>
+  const existing = servers.aw as Record<string, unknown> | undefined
+  if (existing?.command && existing?.args) return
+  servers.aw = { type: 'stdio', command: process.execPath, args: [bridgePath] }
+  doc.mcpServers = servers
+  writeFileSync(file, JSON.stringify(doc, null, 2), 'utf-8')
+}
+
+/** 从行 JSON 中尽力抽取文本增量/工具名(官方行级 schema 未稳定,宽容解析) */
+function extractAssistantText(json: Record<string, unknown>): string {
+  const msg = (json.message ?? {}) as Record<string, unknown>
+  const content = (json.content ?? msg.content) as unknown
+  if (typeof content === 'string') return content
+  if (Array.isArray(content)) {
+    return content.map((p) => {
+      const part = p as Record<string, unknown>
+      if (typeof part?.text === 'string') return part.text
+      return ''
+    }).join('')
+  }
+  if (typeof json.text === 'string') return json.text
+  if (typeof msg.text === 'string') return msg.text
+  return ''
+}
+
+const spec: OneShotEngineSpec = {
+  harnessId: 'copilot',
+  resolveCommand: config => (typeof config.command === 'string' && config.command.trim() !== '' ? config.command.trim() : harnessSettings().copilot_command),
+  buildArgs: ({ config }) => {
+    const args = ['--output-format', 'json', '--no-ask-user', '--allow-tool', 'aw']
+    if (typeof config.model === 'string' && config.model.trim() !== '') args.push('--model', config.model.trim())
+    const extra = Array.isArray(config.copilotAllowTools) ? config.copilotAllowTools as unknown[] : []
+    for (const t of extra) {
+      if (typeof t === 'string' && t.trim() !== '') args.push('--allow-tool', t.trim())
+    }
+    return args
+  },
+  engineEnv: (config) => {
+    let home: string
+    try {
+      home = resolveCopilotHome(config)
+    }
+    catch (err) {
+      log.warn(`copilotHome 非法,回退默认目录: ${err instanceof Error ? err.message : String(err)}`)
+      home = join(process.env.AW_PACKAGE_ROOT ?? process.cwd(), '.AgentWorkShop', 'harness-config', 'copilot', safeId(config.agentId))
+    }
+    return {
+      COPILOT_HOME: home,
+      ...(typeof config.apiKey === 'string' && config.apiKey !== '' ? { COPILOT_GITHUB_TOKEN: config.apiKey } : {}),
+    }
+  },
+  prepare: (config) => {
+    ensureCopilotMcpConfig(resolveCopilotHome(config), resolveBridgePath(typeof config.mcpBridgePath === 'string' ? config.mcpBridgePath : undefined))
+  },
+  mapLine: (json, _raw, _state, sink) => {
+    const type = String(json.type ?? '')
+    if (type === 'assistant' || type === 'message' || (!type && (json.message || json.content))) {
+      const text = extractAssistantText(json)
+      if (text) sink.delta(text)
+      return
+    }
+    if (type === 'tool_call' || type === 'tool_use' || type === 'tool') {
+      const tool = (json.tool_call ?? json.tool ?? json) as Record<string, unknown>
+      sink.status(`🔧 ${String(tool.name ?? tool.tool_name ?? type)}${toolArgsPreview(tool.input ?? tool.arguments ?? tool.args)}`)
+      return
+    }
+    if (type === 'result' || type === 'done') {
+      const usage = (json.usage ?? json.token_usage ?? {}) as Record<string, unknown>
+      const input = Number(usage.input_tokens ?? usage.input ?? usage.total_tokens)
+      if (Number.isFinite(input) && input > 0) sink.usage({ inputTokens: input })
+    }
+  },
+}
+
+export class CopilotAgentImpl extends OneShotCliAgentImpl {
+  constructor(config: Record<string, unknown>) {
+    super(config, spec)
+  }
+}

package/server/services/workshop/agents/crush-agent.ts

@@ -0,0 +1,107 @@
+/**
+ * CrushAgentImpl — Charm Crush(`crush run --format json`)的 AgentInterface 实现。
+ *
+ * 进程模型:每回合一个 `crush run` 子进程(prompt 作为单参数投递,--format json 输出
+ * JSONL 事件,opencode 血统):step_start / text / step_finish(含 cost/tokens)。
+ *
+ *  - steer:一次性进程模型 → 恒 'deferred'
+ *  - HITL:run 模式无程序化审批面(如后续版本输出权限事件再升级)
+ *  - 工具/模型:crush 配置解析序 ./.crushrc → ./crushrc → ~/.config/crush/crushrc;
+ *    首次回合 merge-only 写 <workspace>/.crushrc(mcp add aw 桥 + zhipu openai-compat
+ *    provider,api_key 引用 AW_CRUSH_API_KEY 环境变量,不落明文进配置文件)
+ *  - 鉴权:config.apiKey → 进程 env AW_CRUSH_API_KEY(经 crushrc $() 引用) +
+ *    OPENAI_API_KEY 兜底
+ */
+import { existsSync, writeFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { createLogger } from '../logger'
+import { harnessSettings } from '../settings'
+import {
+  OneShotCliAgentImpl,
+  type OneShotEngineSpec,
+} from './adapters/one-shot-cli-agent'
+import { resolveBridgePath } from './harness-env'
+import { toolArgsPreview } from './prompt-builder'
+
+const log = createLogger('workshop.crush')
+
+/** crushrc 的 bash 方言内变量引用固定为 AW_CRUSH_API_KEY(凭据不落盘) */
+const CRUSH_KEY_ENV = 'AW_CRUSH_API_KEY'
+
+/**
+ * 确保 <cwd>/.crushrc 存在且含 aw 桥与 zhipu provider(仅当文件缺失时整份生成;
+ * 已有用户 crushrc 时不动 —— 用户自行按官方文档接入)。
+ */
+export function ensureCrushConfig(cwd: string, bridgePath: string, baseUrl: string): void {
+  const file = join(cwd, '.crushrc')
+  if (existsSync(file)) return
+  // crushrc 是 bash 方言:路径统一正斜杠,避免反斜杠被转义吞掉
+  const nodePath = process.execPath.replace(/\\/g, '/')
+  const bridgeForward = bridgePath.replace(/\\/g, '/')
+  const lines = [
+    `# AgentWorkShop 生成(幂等;删除后下次回合重建)。凭据经 ${CRUSH_KEY_ENV} 环境变量注入。`,
+    `mcp add aw --command "${nodePath}" --args "${bridgeForward}" --timeout 30`,
+    `provider add zhipu --type openai-compat --base-url ${baseUrl} --api-key "\${${CRUSH_KEY_ENV}}"`,
+    `model add zhipu/glm-5.3-flash`,
+    `model large zhipu/glm-5.3-flash`,
+    '',
+  ]
+  try {
+    writeFileSync(file, lines.join('\n'), 'utf-8')
+  }
+  catch (err) {
+    log.warn(`.crushrc 写入失败(引擎侧将以无桥模式运行): ${err instanceof Error ? err.message : String(err)}`)
+  }
+}
+
+const spec: OneShotEngineSpec = {
+  harnessId: 'crush',
+  resolveCommand: config => (typeof config.command === 'string' && config.command.trim() !== '' ? config.command.trim() : harnessSettings().crush_command),
+  buildArgs: ({ config }) => {
+    // crush v0.92:run 无 --format 旗标(JSON 输出已移除);-q 静默 spinner,输出纯文本
+    const args = ['run', '-q']
+    if (typeof config.model === 'string' && config.model.trim() !== '') args.push('-m', config.model.trim())
+    return args
+  },
+  promptDelivery: 'arg',
+  plainTextStdout: true,
+  engineEnv: (config) => {
+    const key = typeof config.apiKey === 'string' ? config.apiKey : ''
+    return {
+      ...(key !== '' ? { [CRUSH_KEY_ENV]: key, OPENAI_API_KEY: key } : {}),
+    }
+  },
+  prepare: (config) => {
+    const cwd = (typeof config.cwd === 'string' && config.cwd !== '' ? config.cwd : process.cwd())
+    ensureCrushConfig(cwd, resolveBridgePath(typeof config.mcpBridgePath === 'string' ? config.mcpBridgePath : undefined), String(config.providerBaseUrl ?? 'https://open.bigmodel.cn/api/coding/paas/v4'))
+  },
+  mapLine: (json, _raw, _state, sink) => {
+    const type = String(json.type ?? '')
+    if (type === 'step_start' || type === 'step-start') {
+      sink.status('▶ crush step')
+      return
+    }
+    if (type === 'text') {
+      const part = (json.part ?? json) as Record<string, unknown>
+      if (typeof part.text === 'string') sink.delta(part.text)
+      return
+    }
+    if (type === 'tool_use' || type === 'tool_call' || type === 'tool') {
+      const part = (json.part ?? json.tool ?? json) as Record<string, unknown>
+      sink.status(`🔧 ${String(part.tool ?? part.name ?? part.type ?? 'tool')}${toolArgsPreview(part.input ?? part.arguments ?? part.args)}`)
+      return
+    }
+    if (type === 'step_finish' || type === 'step-finish') {
+      const part = (json.part ?? json) as Record<string, unknown>
+      const tokens = (part.tokens ?? {}) as Record<string, unknown>
+      const input = Number(tokens.input ?? tokens.inputTokens ?? tokens.total)
+      if (Number.isFinite(input) && input > 0) sink.usage({ inputTokens: input })
+    }
+  },
+}
+
+export class CrushAgentImpl extends OneShotCliAgentImpl {
+  constructor(config: Record<string, unknown>) {
+    super(config, spec)
+  }
+}

package/server/services/workshop/agents/cursor-agent.ts

@@ -0,0 +1,102 @@
+/**
+ * CursorAgentImpl — Cursor CLI(`cursor-agent -p --output-format stream-json`)的实现。
+ *
+ * 进程模型:每回合一个 `cursor-agent -p` 子进程(prompt 作为单参数投递,经消毒;
+ * --stream-partial-output 提供增量 delta)。帧形(官方 headless 文档,Claude Code 同构):
+ *   {"type":"system","subtype":"init","model":"..."}
+ *   {"type":"assistant","timestamp_ms":..,"message":{"content":[{"text":"..."}]}}
+ *   {"type":"tool_call","subtype":"started"|"completed","tool_call":{...}}
+ *   {"type":"result","duration_ms":..}
+ *
+ *  - steer:一次性进程模型 → 恒 'deferred'
+ *  - HITL:无程序化审批面(--force 二档制)。默认**不带** --force:文件变更只提案不落地
+ *    (与平台写控制哲学一致);config.force=true 显式放开
+ *  - 工具:--mcp-config 指向 .AgentWorkShop/harness-config/cursor/aw-mcp.json(aw 桥);
+ *    agent 身份经进程 env 继承到 MCP 子进程
+ *  - 已知边界:社区报告 print 模式下 MCP 工具偶发不触发(版本相关);鉴权仅
+ *    CURSOR_API_KEY(Cursor 账号侧),无 OpenAI 兼容 provider 面
+ */
+import { mkdirSync, writeFileSync, existsSync, readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { harnessSettings } from '../settings'
+import {
+  OneShotCliAgentImpl,
+  type OneShotEngineSpec,
+} from './adapters/one-shot-cli-agent'
+import { resolveBridgePath } from './harness-env'
+import { toolArgsPreview } from './prompt-builder'
+
+/** aw 桥 mcp-config 固定路径(无 agent 段:身份走 env 继承,配置可共享) */
+function mcpConfigPath(): string {
+  return join(process.env.AW_PACKAGE_ROOT ?? process.cwd(), '.AgentWorkShop', 'harness-config', 'cursor', 'aw-mcp.json')
+}
+
+export function ensureCursorMcpConfig(bridgePath: string): void {
+  const file = mcpConfigPath()
+  let doc: Record<string, unknown> = {}
+  try {
+    if (existsSync(file)) doc = JSON.parse(readFileSync(file, 'utf-8')) as Record<string, unknown>
+  }
+  catch {
+    doc = {}
+  }
+  const servers = (doc.mcpServers && typeof doc.mcpServers === 'object' ? doc.mcpServers : {}) as Record<string, unknown>
+  const existing = servers.aw as Record<string, unknown> | undefined
+  if (existing?.command && existing?.args) return
+  servers.aw = { command: process.execPath, args: [bridgePath] }
+  doc.mcpServers = servers
+  mkdirSync(join(file, '..'), { recursive: true })
+  writeFileSync(file, JSON.stringify(doc, null, 2), 'utf-8')
+}
+
+const spec: OneShotEngineSpec = {
+  harnessId: 'cursor',
+  resolveCommand: config => (typeof config.command === 'string' && config.command.trim() !== '' ? config.command.trim() : harnessSettings().cursor_command),
+  buildArgs: ({ config }) => {
+    const args = ['-p', '--output-format', 'stream-json', '--stream-partial-output', '--mcp-config', mcpConfigPath()]
+    if (typeof config.model === 'string' && config.model.trim() !== '') args.push('--model', config.model.trim())
+    if (config.force === true) args.push('--force')
+    return args
+  },
+  promptDelivery: 'arg',
+  engineEnv: config => ({
+    ...(typeof config.apiKey === 'string' && config.apiKey !== '' ? { CURSOR_API_KEY: config.apiKey } : {}),
+  }),
+  prepare: () => {
+    ensureCursorMcpConfig(resolveBridgePath())
+  },
+  mapLine: (json, _raw, _state, sink) => {
+    const type = String(json.type ?? '')
+    if (type === 'system' && String(json.subtype ?? '') === 'init') {
+      sink.status(`▶ cursor(${String(json.model ?? 'default')})`)
+      return
+    }
+    if (type === 'assistant') {
+      const msg = (json.message ?? {}) as Record<string, unknown>
+      const content = msg.content ?? json.content
+      if (Array.isArray(content)) {
+        for (const p of content as Array<Record<string, unknown>>) {
+          if (typeof p?.text === 'string' && p.text) sink.delta(p.text)
+        }
+      }
+      else if (typeof content === 'string' && content) sink.delta(content)
+      return
+    }
+    if (type === 'tool_call') {
+      const tool = (json.tool_call ?? {}) as Record<string, unknown>
+      const name = String(tool.name ?? (tool as Record<string, unknown>).tool_name ?? json.tool_name ?? 'tool')
+      const status = String(json.subtype ?? '')
+      sink.status(`🔧 ${name}${status === 'completed' ? ' ✓' : ''}${status !== 'completed' ? toolArgsPreview(tool.input ?? tool.arguments) : ''}`)
+      return
+    }
+    if (type === 'result') {
+      sink.status(`✓ cursor 回合完成(${Number(json.duration_ms ?? 0)}ms)`)
+    }
+  },
+}
+
+export class CursorAgentImpl extends OneShotCliAgentImpl {
+  constructor(config: Record<string, unknown>) {
+    super(config, spec)
+  }
+}