openteam 1.0.6 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openteam",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Agent-centric team collaboration framework",
   "type": "module",
   "bin": {

package/src/interfaces/cli.js

@@ -16,7 +16,7 @@ import {
   listAllInstances,
 } from '../foundation/state.js';
 import { detectMultiplexer, getSessionState, hasSession, findSessionsByPrefix, attachSession, startSession, killSession, isInsideMux } from '../foundation/terminal.js';
-import { buildWrapperCmd } from './daemon/panes.js';
+import { buildWrapperCmd, buildWrapperOptions } from './daemon/panes.js';
 
 // ── 输出辅助 ──
 
@@ -156,13 +156,10 @@ export async function cmdStart(teamName, options) {
   const daemonCmd = `openteam daemon ${teamName} --port ${port} --dir "${projectDir}" --mux ${mux} --cli ${cliType}`;
 
   // zellij: 构建 wrapper 命令，由 team layout 的 stacked panes 自动调用
-  const cliArgs = teamConfig.cli_config?.[cliType]?.args || [];
-  const wrapperOptions = {
+  const wrapperOptions = buildWrapperOptions(teamConfig, {
     serverUrl: `http://127.0.0.1:${port}`,
     teamName, projectDir, cliType,
-    agents: teamConfig.agents,
-    cliArgs,
-  };
+  });
   const agentCmds = mux === 'zellij' ? teamConfig.agents.map(agent => ({
     name: agent,
     cmd: buildWrapperCmd(agent, wrapperOptions, { mux, sessionName }),

package/src/interfaces/daemon/index.js

@@ -14,7 +14,7 @@ import { DEFAULTS, getSessionName } from '../../foundation/constants.js';
 import { createLogger } from '../../foundation/logger.js';
 import { cleanMuxEnv } from '../../foundation/terminal.js';
 import { startServe, stopServe } from './serve.js';
-import { createAllAgentPanes, checkAndRespawn } from './panes.js';
+import { createAllAgentPanes, checkAndRespawn, buildWrapperOptions } from './panes.js';
 import { createEmbeddedDashboard } from '../dashboard/index.js';
 
 const log = createLogger('daemon');
@@ -70,7 +70,10 @@ export async function runDaemon(teamName, projectDir, options = {}) {
     started: new Date().toISOString(),
   });
 
-  // ── 2. 确保 agent/skill 软链接 ──
+  // ── 2. 读取 CLI 配置 ──
+  const keepDefaultSP = !!teamConfig.cli_config?.[cliType]?.keep_default_system_prompt;
+
+  // ── 3. 确保 agent/skill 软链接 ──
   const { ensureLinks } = await import('./links.js');
   const linkResult = ensureLinks({ teamName, projectDir, cliType, agents, skipAgentLinks: keepDefaultSP });
   if (!linkResult.ok) {
@@ -86,19 +89,10 @@ export async function runDaemon(teamName, projectDir, options = {}) {
     console.log(`已创建 ${linkResult.linked.length} 个链接`);
   }
 
-  // ── 3. wrapper 环境配置 ──
-  const cliConf = teamConfig.cli_config?.[cliType] || {};
-  const cliArgs = cliConf.args || [];
-  const keepDefaultSP = !!cliConf.keep_default_system_prompt;
-  const wrapperOptions = {
-    serverUrl: serve.url,
-    teamName,
-    projectDir,
-    cliType,
-    agents,
-    cliArgs,
-    keepDefaultSP,
-  };
+  // ── 4. wrapper 环境配置 ──
+  const wrapperOptions = buildWrapperOptions(teamConfig, {
+    serverUrl: serve.url, teamName, projectDir, cliType,
+  });
 
   // ── 4. 创建 agent panes ──
   // zellij: layout 已在 startSession 时创建好 stacked agents

package/src/interfaces/daemon/panes.js

@@ -152,3 +152,27 @@ export function buildWrapperCmd(agent, wrapperOptions, muxInfo) {
 
   return `env ${envVars.join(' ')} ${wrapperBin}`;
 }
+
+/**
+ * 从 teamConfig 构建 wrapperOptions — 唯一入口，消除重复构建
+ *
+ * @param {object} teamConfig - 团队配置
+ * @param {object} runtime - 运行时信息
+ * @param {string} runtime.serverUrl
+ * @param {string} runtime.teamName
+ * @param {string} runtime.projectDir
+ * @param {string} runtime.cliType
+ * @returns {object} wrapperOptions
+ */
+export function buildWrapperOptions(teamConfig, { serverUrl, teamName, projectDir, cliType }) {
+  const cliConf = teamConfig.cli_config?.[cliType] || {};
+  return {
+    serverUrl,
+    teamName,
+    projectDir,
+    cliType,
+    agents: teamConfig.agents,
+    cliArgs: cliConf.args || [],
+    keepDefaultSP: !!cliConf.keep_default_system_prompt,
+  };
+}