agentworkshop 0.7.4 → 0.7.6

package/tui/lib/config.mjs

@@ -1,58 +1,62 @@
-// ============================================================
-// TUI 认证/连接配置 —— 落配置根 .AgentWorkShop/tui-auth.json(0600)。
-// 解析口径与服务端一致:cwd 向上找 config.yml → <repo>/.AgentWorkShop,
-// 找不到(全局安装任意 cwd)→ ~/.AgentWorkShop。
-// ============================================================
-import { existsSync, mkdirSync, readFileSync, writeFileSync, chmodSync } from 'node:fs'
-import { homedir } from 'node:os'
-import { join, resolve, dirname } from 'node:path'
-
-/** 向上查找文件(repo 模式判定) */
-function findUp(startDir, filename) {
-  let dir = resolve(startDir)
-  for (;;) {
-    const candidate = join(dir, filename)
-    if (existsSync(candidate)) return candidate
-    const parent = dirname(dir)
-    if (parent === dir) return null
-    dir = parent
-  }
-}
-
-/** 配置根(repo 内 cwd → <repo>/.AgentWorkShop;否则 ~/.AgentWorkShop) */
-export function configRoot(cwd = process.cwd()) {
-  const marker = findUp(cwd, 'config.yml')
-  if (marker) return join(dirname(marker), '.AgentWorkShop')
-  return join(homedir(), '.AgentWorkShop')
-}
-
-const authPath = cwd => join(configRoot(cwd), 'tui-auth.json')
-
-/** 读取已存凭据({ baseUrl, token, email? } 或 null) */
-export function loadAuth(cwd = process.cwd()) {
-  try {
-    const raw = JSON.parse(readFileSync(authPath(cwd), 'utf8'))
-    if (raw && typeof raw.token === 'string' && typeof raw.baseUrl === 'string') return raw
-  }
-  catch { /* 无凭据/损坏 → 重新登录 */ }
-  return null
-}
-
-/** 持久化凭据(0600;路径加入 .gitignore) */
-export function saveAuth(auth, cwd = process.cwd()) {
-  const file = authPath(cwd)
-  mkdirSync(dirname(file), { recursive: true })
-  writeFileSync(file, `${JSON.stringify(auth, null, 2)}\n`, 'utf8')
-  try {
-    chmodSync(file, 0o600)
-  }
-  catch { /* Windows FAT 卷 chmod 无效,忽略 */ }
-}
-
-/** 清除凭据(登出) */
-export function clearAuth(cwd = process.cwd()) {
-  try {
-    existsSync(authPath(cwd)) && (writeFileSync(authPath(cwd), '{}\n', 'utf8'), true)
-  }
-  catch { /* 尽力而为 */ }
-}
+// ============================================================
+// TUI 认证/连接配置 —— 落配置根 .AgentWorkShop/tui-auth.json(0600)。
+// 解析口径与服务端一致:cwd 向上找 config.yml → <repo>/.AgentWorkShop,
+// 找不到(全局安装任意 cwd)→ ~/.AgentWorkShop。
+// ============================================================
+import { existsSync, mkdirSync, readFileSync, writeFileSync, chmodSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { join, resolve, dirname } from 'node:path'
+
+/** 向上查找文件(repo 模式判定) */
+function findUp(startDir, filename) {
+  let dir = resolve(startDir)
+  for (;;) {
+    const candidate = join(dir, filename)
+    if (existsSync(candidate)) return candidate
+    const parent = dirname(dir)
+    if (parent === dir) return null
+    dir = parent
+  }
+}
+
+/** 配置根(与服务端同策略):仅当用户自建了 <检出根>/.AgentWorkShop 时优先使用;
+ *  否则一律回落 ~/.AgentWorkShop(绝不在 pwd 下自动创建)。 */
+export function configRoot(cwd = process.cwd()) {
+  const marker = findUp(cwd, 'config.yml')
+  if (marker) {
+    const candidate = join(dirname(marker), '.AgentWorkShop')
+    if (existsSync(candidate)) return candidate
+  }
+  return join(homedir(), '.AgentWorkShop')
+}
+
+const authPath = cwd => join(configRoot(cwd), 'tui-auth.json')
+
+/** 读取已存凭据({ baseUrl, token, email? } 或 null) */
+export function loadAuth(cwd = process.cwd()) {
+  try {
+    const raw = JSON.parse(readFileSync(authPath(cwd), 'utf8'))
+    if (raw && typeof raw.token === 'string' && typeof raw.baseUrl === 'string') return raw
+  }
+  catch { /* 无凭据/损坏 → 重新登录 */ }
+  return null
+}
+
+/** 持久化凭据(0600;路径加入 .gitignore) */
+export function saveAuth(auth, cwd = process.cwd()) {
+  const file = authPath(cwd)
+  mkdirSync(dirname(file), { recursive: true })
+  writeFileSync(file, `${JSON.stringify(auth, null, 2)}\n`, 'utf8')
+  try {
+    chmodSync(file, 0o600)
+  }
+  catch { /* Windows FAT 卷 chmod 无效,忽略 */ }
+}
+
+/** 清除凭据(登出) */
+export function clearAuth(cwd = process.cwd()) {
+  try {
+    existsSync(authPath(cwd)) && (writeFileSync(authPath(cwd), '{}\n', 'utf8'), true)
+  }
+  catch { /* 尽力而为 */ }
+}

package/tui/lib/pickers.mjs

@@ -0,0 +1,102 @@
+// ============================================================
+// 交互选择器(浮层)—— 频道选择 / Agent 选择。
+// 基于 pi-tui showOverlay + SelectList:方向键移动、Enter 选择、Esc 取消。
+// ============================================================
+import { SelectList } from '@earendil-works/pi-tui'
+import { theme } from '../theme.mjs'
+
+/** 组合"标题 + SelectList"的浮层组件。返回 handle { hide, list, component, __bindHandle } */
+function pickerComponent(title, items, maxVisible, onSelect, onCancel) {
+  const list = new SelectList(items, maxVisible, theme.editor.selectList)
+  const wrap = {
+    render(width) {
+      return [theme.accent(`┌─ ${title}`), ...list.render(Math.max(width - 2, 24))]
+    },
+  }
+  const handle = { hide() {}, list, component: wrap }
+  list.onSelect = (item) => {
+    handle.hide()
+    onSelect(item)
+  }
+  list.onCancel = () => {
+    handle.hide()
+    onCancel?.()
+  }
+  // 二次装配:showOverlay 返回真实 handle 后回填 hide(调用方调 picker.__bindHandle(real))
+  handle.__bindHandle = (h) => {
+    handle.hide = () => h.hide()
+  }
+  return handle
+}
+
+/**
+ * 频道选择浮层。Enter 选择并切换;Esc 取消(fallback 频道由调用方决定)。
+ * @returns handle { close }
+ */
+export function openChannelPicker(tui, state, { onSelect, onCancel } = {}) {
+  const items = state.channels.map(c => ({
+    value: c.id,
+    label: c.name,
+    description: c.leadAgentId ? 'lead 已配置' : '无 lead(仅收发消息)',
+  }))
+  const picker = pickerComponent('选择要进入的频道(↑↓ 移动 · Enter 进入 · Esc 取消)', items, Math.min(10, items.length),
+    (item) => {
+      state.channelPickerOpen = false
+      onSelect?.(item.value)
+    },
+    () => {
+      state.channelPickerOpen = false
+      onCancel?.()
+    })
+  state.channelPickerOpen = true
+  const handle = tui.showOverlay(picker.component, { anchor: 'center' })
+  picker.__bindHandle(handle)
+  tui.setFocus(picker.list)
+  return handle
+}
+
+/**
+ * Agent/对话目标选择浮层(Tab 触发)。首项 = 频道(发布任务模式);
+ * 选具体成员 = 切换通信目标并自动打开其独立监控。
+ */
+export function openTargetPicker(tui, state, { onPick, onCancel } = {}) {
+  const s = state.agents
+    .filter(a => a.enabled !== 0)
+    .map(a => ({
+      value: a.id,
+      label: `${a.name}${a.role === 'lead' ? '(lead)' : ''}`,
+      description: `通信对话 + 独立监控 · ${state.agentStates[a.id]?.state ?? 'idle'}`,
+    }))
+  const items = [{ value: '__channel__', label: '频道(发布任务)', description: '普通文本 = 向频道发布正式任务' }, ...s]
+  if (items.length === 1 && s.length === 0) {
+    onCancel?.()
+    return null
+  }
+  const picker = pickerComponent('选择对话目标(Tab 呼出 · ↑↓ 移动 · Enter 确认 · Esc 取消)', items, Math.min(10, items.length),
+    (item) => {
+      if (process.env.AW_TUI_DEBUG) console.error('[picker-debug] item=', JSON.stringify(item), 'agentIds=', JSON.stringify(s.map(x => x.value)))
+      state.targetPickerOpen = false
+      if (item.value === '__channel__') {
+        state.target = null
+        onPick?.(null)
+      }
+      else {
+        const a = state.agents.find(x => x.id === item.value)
+        if (!a) {
+          onCancel?.()
+          return
+        }
+        state.target = { agentId: a.id, name: a.name }
+        onPick?.(a)
+      }
+    },
+    () => {
+      state.targetPickerOpen = false
+      onCancel?.()
+    })
+  state.targetPickerOpen = true
+  const handle = tui.showOverlay(picker.component, { anchor: 'center' })
+  picker.__bindHandle(handle)
+  tui.setFocus(picker.list)
+  return handle
+}

package/tui/lib/state.mjs

@@ -28,6 +28,12 @@ export function createState() {
     /** 正在作答的条目(index → /hitl <n>;null = 常规输入) */
     hitlAnswering: null,
 
+    /** 对话目标:null = 频道(普通文本=发布任务);{agentId,name} = 成员(普通文本=通信消息) */
+    target: null,
+    /** 浮层开关(按键路由用:Tab 呼出目标选择;启动/`/channel` 呼出频道选择) */
+    channelPickerOpen: false,
+    targetPickerOpen: false,
+
     monitor: {
       agentId: null,
       name: null,