@ai_mind/dsh-a2a 1.2.0 → 1.3.0

package/README.md

@@ -115,7 +115,7 @@
 面板分三部分：
 
 1. **概览**：实时 Agent Card、JSON-RPC / HTTP+JSON 地址（一键复制）、流式/推送/扩展卡片能力、鉴权状态、运行状态与可复制的 `curl` / 官方 JS 客户端示例。
-2. **配置表单**：直接编辑名称、描述、对外地址、挂载路径、流式/推送/扩展卡片、鉴权模式与令牌环境变量、访问令牌（写入后不再回显）、Agent 预设/模型/工作目录/沙箱/审批/并发/超时，以及请求体与任务保留限额。预设、模型提供方、模型和推理强度会从当前 Host 的 `agentPresets` / `llm` 服务动态列出选项；留空即使用部署默认，无法列出的自定义值仍可手动输入。
+2. **配置表单**：直接编辑名称、描述、对外地址、挂载路径、流式/推送/扩展卡片、鉴权模式与令牌环境变量、访问令牌（写入后不再回显）、Agent 预设/模型/工作目录/工作区名称/沙箱/审批/并发/超时，以及请求体与任务保留限额。预设、模型提供方、模型和推理强度会从当前 Host 的 `agentPresets` / `llm` 服务动态列出选项；留空即使用部署默认，无法列出的自定义值仍可手动输入。
 3. **保存**：写入 profile 的 `cordis.patch.yml`（`a2a-server` 行），校验通过后插件自动重载；修改挂载路径后刷新页面即可。
 
 配置接口 `GET/PUT <mountPath>/panel/config` 始终位于 DSH Web 的 origin（独立端口模式下也不在 A2A 端口上），使用 **Harness Web 连接凭据**（不是 A2A token）鉴权：只有能打开 Settings 的已登录浏览器可以读写，远程 A2A 客户端即使知道路径也会收到 401。令牌字段是只写字段，GET 只返回“是否已配置”。
@@ -266,6 +266,14 @@ server:
 
 ---
 
+### 工作区分组
+
+A2A 创建的 Harness 会话使用 `agent.cwd` 作为工作目录，GUI 按会话目录把会话归入已注册的 Workspace。如果该目录还不是工作区，会话就会显示在「未分组」。
+
+- 想让 A2A 会话归入**已有工作区**：把 `agent.cwd` 指向该工作区目录即可，插件会复用该工作区并附加新会话。
+- 想为专用目录**新建分组**：设置 `agent.workspaceTitle`（面板里的「工作区名称（自动分组）」），插件会在该目录注册一个同名工作区，并把之后创建的 A2A 会话附加进去。
+- 已有历史会话不会自动追溯重排；新创建的 A2A 任务会出现在分组下。
+
 ## Agent 运行时映射
 
 ### 会话与并发
@@ -400,6 +408,7 @@ agent:
   reasoningEffort: null
   maxTokens: null
   cwd: null                    # 绝对路径；留空用 workingDirectory.defaultDirectory
+  workspaceTitle: null         # 可选；为 cwd 注册 GUI 工作区并让 A2A 会话归入该分组
   sandboxMode: workspace-write
   approvalPolicy: never
   maxConcurrentTasks: 4

package/client.js

@@ -108,9 +108,11 @@ window.__ModuleLoader__.load({
       fieldAgentProvider: '模型提供方',
       fieldAgentModel: '模型',
       fieldAgentReasoningEffort: '推理强度',
+      fieldAgentWorkspaceTitle: '工作区名称（自动分组）',
       optionDefault: '（使用默认）',
       defaultModel: '默认模型（留空时）',
       modelPairHint: '模型提供方和模型必须同时选择，或都留空使用默认。',
+      workspaceHint: 'A2A 会话会归入 agent.cwd 对应的工作区；若该目录还不是工作区，填写“工作区名称”即可为该目录创建分组。',
       fieldAgentSandboxMode: '沙箱模式',
       fieldAgentApprovalPolicy: '审批策略',
       fieldAgentMaxConcurrentTasks: '最大并发任务',
@@ -223,9 +225,11 @@ window.__ModuleLoader__.load({
       fieldAgentProvider: 'Model provider',
       fieldAgentModel: 'Model',
       fieldAgentReasoningEffort: 'Reasoning effort',
+      fieldAgentWorkspaceTitle: 'Workspace title (auto-group)',
       optionDefault: '(use default)',
       defaultModel: 'Default model (when empty)',
       modelPairHint: 'Choose both a provider and a model, or leave both empty for the default.',
+      workspaceHint: 'A2A sessions join the workspace that owns agent.cwd. Set a workspace title to create that workspace when the directory is not registered yet.',
       fieldAgentSandboxMode: 'Sandbox mode',
       fieldAgentApprovalPolicy: 'Approval policy',
       fieldAgentMaxConcurrentTasks: 'Max concurrent tasks',
@@ -821,6 +825,7 @@ window.__ModuleLoader__.load({
                             (optionSets.default.reasoningEffort ? ` · ${optionSets.default.reasoningEffort}` : ''),
                         )
                       : null,
+                    group === 'agent' ? h('p', { className: 'a2aui-field-note' }, t('workspaceHint')) : null,
                   )
                   return group === 'auth' ? [node, secretBlock] : [node]
                 }),

package/lib/bridge.js

@@ -275,6 +275,7 @@ class ContextWorker {
       throw new Error(`A2A agent cwd must be an absolute path, got ${JSON.stringify(cwd)}`)
     }
     await mkdir(cwd, { recursive: true })
+    const workspace = await runtime.ensureWorkspace(cwd)
     const sessionId = `session-a2a-${newId()}`
     const agentOptions = runtime.agentOptions()
     const presets = runtime.ctx.get?.('agentPresets')
@@ -307,6 +308,13 @@ class ContextWorker {
     }
     this.#handle = handle
     this.#agent = handle.agent
+    if (workspace !== null) {
+      try {
+        await workspace.attachSession(handle.agent.id)
+      } catch (error) {
+        runtime.logger.warn(`[a2a] could not attach session ${handle.agent.id} to workspace ${workspace.path}: ${errorMessage(error)}`)
+      }
+    }
     try {
       runtime.applyAgentPolicy(handle.agent)
     } catch (error) {
@@ -361,6 +369,7 @@ export class AgentRuntime {
   #logger
   #workers = new Map()
   #sweepTimer = undefined
+  #workspacePromise = undefined
   #disposed = false
   #stats = { turns: 0, completed: 0, failed: 0, canceled: 0 }
 
@@ -422,6 +431,42 @@ export class AgentRuntime {
     return options
   }
 
+  /**
+   * Resolve the project (GUI workspace) that owns the agent working directory.
+   *
+   * An existing workspace is reused and its sessions are attached explicitly.
+   * When `agent.workspaceTitle` is set, a missing workspace is created for the
+   * directory so the GUI can group new A2A sessions under it.
+   *
+   * @param {string} cwd absolute agent working directory
+   * @returns {Promise<object|null>} the Workspace entity, or null when grouping is unavailable
+   */
+  async ensureWorkspace(cwd) {
+    if (this.#workspacePromise === undefined) {
+      this.#workspacePromise = (async () => {
+        const registry = this.#ctx.get?.('workspaceRegistry')
+        if (registry === undefined) {
+          if (this.#config.agent.workspaceTitle) {
+            this.#logger.warn('[a2a] agent.workspaceTitle is set but workspaceRegistry is unavailable')
+          }
+          return null
+        }
+        try {
+          const existing = await registry.resolveByPath(cwd)
+          if (existing !== undefined) return existing
+          if (!this.#config.agent.workspaceTitle) return null
+          const created = await registry.create(cwd, this.#config.agent.workspaceTitle)
+          this.#logger.info(`[a2a] workspace "${created.title}" registered for ${cwd}`)
+          return created
+        } catch (error) {
+          this.#logger.warn(`[a2a] cannot resolve or create a workspace for ${cwd}: ${errorMessage(error)}`)
+          return null
+        }
+      })()
+    }
+    return this.#workspacePromise
+  }
+
   /** @returns {Promise<string>} the absolute workspace directory for agents */
   async resolveCwd() {
     if (this.#config.agent.cwd) return this.#config.agent.cwd

package/lib/config.js

@@ -96,6 +96,7 @@ export const DEFAULT_CONFIG = {
     reasoningEffort: null,
     maxTokens: null,
     cwd: null,
+    workspaceTitle: null,
     sandboxMode: 'workspace-write',
     approvalPolicy: 'never',
     maxConcurrentTasks: 4,
@@ -463,6 +464,9 @@ export function normalizeConfig(raw) {
   if (merged.agent.cwd !== null && !merged.agent.cwd.startsWith('/')) {
     fail('agent.cwd', 'must be an absolute path')
   }
+  merged.agent.workspaceTitle = expectNullableString(merged.agent.workspaceTitle, 'agent.workspaceTitle', {
+    allowEmpty: false,
+  })
   merged.agent.sandboxMode = expectEnum(merged.agent.sandboxMode, 'agent.sandboxMode', [
     'inherit',
     'read-only',

package/lib/panel.js

@@ -49,6 +49,7 @@ const FIELDS = [
   { path: 'auth.tokenEnv', type: 'string', group: 'auth', nullable: true, placeholder: 'A2A_AUTH_TOKEN' },
   { path: 'auth.allowRemoteUnauthenticated', type: 'boolean', group: 'auth' },
   { path: 'agent.cwd', type: 'string', group: 'agent', nullable: true, placeholder: '/srv/a2a-workspace' },
+  { path: 'agent.workspaceTitle', type: 'string', group: 'agent', nullable: true, placeholder: 'A2A Agents' },
   { path: 'agent.preset', type: 'string', group: 'agent', nullable: true, optionsKey: 'presets' },
   { path: 'agent.provider', type: 'string', group: 'agent', nullable: true, optionsKey: 'providers' },
   { path: 'agent.model', type: 'string', group: 'agent', nullable: true, optionsKey: 'models' },
@@ -305,7 +306,7 @@ export function createPanelRouter({ ctx, config, mountPath, logger, status, heal
     res.setHeader('Cache-Control', 'no-store')
     res.json({
       ok: true,
-      plugin: { name: PLUGIN_NAME, version: '1.2.0' },
+      plugin: { name: PLUGIN_NAME, version: '1.3.0' },
       mountPath,
       ...payload,
       ...(typeof status === 'function' ? { server: status() } : {}),
@@ -484,7 +485,7 @@ export function createPanelRouter({ ctx, config, mountPath, logger, status, heal
     logger.info('[a2a] configuration updated from the settings panel')
     res.json({
       ok: true,
-      plugin: { name: PLUGIN_NAME, version: '1.2.0' },
+      plugin: { name: PLUGIN_NAME, version: '1.3.0' },
       mountPath,
       ...describe(live, liveEntry, []),
       ...(typeof status === 'function' ? { server: status() } : {}),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai_mind/dsh-a2a",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Production A2A (Agent2Agent) v1.0 server for DeepSeek Harness agents: JSON-RPC + HTTP+JSON bindings, streaming, tasks, push notifications and signed Agent Cards.",
   "type": "module",
   "license": "MIT",