@v587d/capital-generation 2.15.1 → 2.16.1

package/automation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@v587d/capital-automation",
-  "version": "2.15.1",
+  "version": "2.16.1",
   "description": "CapGen 投研自动化：独立 host bundle（固定 capital_automation 域、单 scheduler owner、/capital-automation 路由与浏览器页面）。",
   "license": "MIT",
   "type": "module",
@@ -41,6 +41,7 @@
     "runner.js",
     "scheduler.js",
     "workspaces.js",
+    "contract.js",
     "policy.js",
     "route.js",
     "settings.js",

package/automation/route.js

@@ -6,8 +6,9 @@ import { MAX_REQUEST_BODY_BYTES } from './defaults.js'
 import { AutomationError } from './service.js'
 import { SchemaError } from './schema.js'
 import { sanitizeMessage } from './redact.js'
+import { AUTOMATION_ROUTE, WORKSPACES_SUFFIX } from './contract.js'
 
-export const ROUTE_PREFIX = '/capital-automation'
+export const ROUTE_PREFIX = AUTOMATION_ROUTE
 const ID_PATTERN = /^[A-Za-z0-9_-]{1,120}$/
 
 function send(res, status, payload, extraHeaders = {}) {
@@ -226,9 +227,15 @@ async function dispatch({ req, method, suffix, url, service, requestId }) {
     if (method === 'DELETE') return { body: await service.deleteTask(id) }
     throw new AutomationError('method_not_allowed', '只支持 GET / PATCH / DELETE。', 405)
   }
+  if (suffix === WORKSPACES_SUFFIX && method === 'GET') {
+    return { body: await service.workspaceCatalog() }
+  }
   if (suffix === '/runs' && method === 'GET') {
     return { body: await service.listRuns(queryOf(url, new Set(['limit', 'before']))) }
   }
+  if (suffix === '/runs/history' && method === 'GET') {
+    return { body: await service.runHistory(queryOf(url, new Set(['days', 'tz']))) }
+  }
   if (suffix === '/notifications' && method === 'GET') {
     return { body: await service.listNotifications(queryOf(url, new Set(['unread', 'scope']))) }
   }

package/automation/runner.js

@@ -6,6 +6,7 @@
 import { mkdir } from 'node:fs/promises'
 import { CANCEL_GRACE_MS, MAX_ERRORS_PER_RUN, QUIET_SETTLE_MS, SETTLED_RUN_STATUSES } from './defaults.js'
 import { sanitizeMessage } from './redact.js'
+import { localPartsAt } from './time.js'
 
 const PRESET_ID = 'capital-generation'
 const POLICY_ID = 'automation-v1'
@@ -39,11 +40,28 @@ function iso(now) {
 }
 
 function shortRunId(id) {
-  return String(id).replace(/^run_/, '').slice(-8) || 'unknown'
+  return String(id).replace(/^run_/, '').slice(0, 8) || 'unknown'
 }
 
-export function sessionTitleOf(task, profileName, runId) {
-  const raw = `[CapGen 投研自动化·${profileName}] ${task.title}·${shortRunId(runId)}`
+function pad2(value) {
+  return String(value).padStart(2, '0')
+}
+
+/**
+ * Session title is `<mm-dd> <task title> <run id prefix>` in the trigger's zone, so the
+ * sidebar reads chronologically without repeating the automation profile name.
+ */
+export function sessionTitleOf(task, runId, at = Date.now()) {
+  const instant = typeof at === 'string' ? Date.parse(at) : Number(at)
+  const time = Number.isFinite(instant) ? instant : Date.now()
+  let monthDay
+  try {
+    const { month, day } = localPartsAt(time, task.trigger.timezone)
+    monthDay = `${pad2(month)}-${pad2(day)}`
+  } catch {
+    monthDay = '00-00'
+  }
+  const raw = `${monthDay} ${task.title} ${shortRunId(runId)}`
   return raw.length > 200 ? `${raw.slice(0, 197)}...` : raw
 }
 
@@ -53,7 +71,7 @@ function promptData(value) {
 }
 
 export function buildRunPrompt({ task, run, trigger, profileName, now }) {
-  const local = new Intl.DateTimeFormat('zh-CN', {
+  const formatLocal = (instant) => new Intl.DateTimeFormat('zh-CN', {
     timeZone: task.trigger.timezone,
     year: 'numeric',
     month: '2-digit',
@@ -61,7 +79,9 @@ export function buildRunPrompt({ task, run, trigger, profileName, now }) {
     hour: '2-digit',
     minute: '2-digit',
     hourCycle: 'h23',
-  }).format(new Date(now))
+  }).format(new Date(instant))
+  const local = formatLocal(now)
+  const deadline = formatLocal(Number(now) + task.limits.runTimeoutMinutes * 60_000)
   const reason = trigger === 'manual' ? '手动运行' : '定时触发'
   return `【CapGen 投研自动化】
 运行: ${run.id}
@@ -69,6 +89,7 @@ export function buildRunPrompt({ task, run, trigger, profileName, now }) {
 触发: ${reason}
 occurrence: ${run.occurrenceKey}
 ${run.scheduledFor === undefined ? '' : `计划时刻: ${run.scheduledFor}\n`}当前时间: ${local}（${task.trigger.timezone}）
+最晚结束: ${deadline}（${task.trigger.timezone}）
 profile: ${promptData(profileName)}
 任务分类: ${task.category}
 无人值守策略: ${POLICY_ID}
@@ -88,6 +109,7 @@ ${task.instruction}
 - 这是无人值守运行：禁止 ask_user_question、禁止等待审批、禁止写文件或提权。
 - 使用当前角色可见的工具面；结构化数据交 data_collector，网页材料交 web_retriever，分析交 data_junior。
 - 墙钟预算覆盖整棵运行子树；预算过半后优先完成主交付，剩余时间再补图表/可选材料，不要为可选图表或对账耗尽预算。
+- 预算判断只以宿主时钟为准：本 prompt 的「当前时间」是起点，「最晚结束」是硬截止；不要用步数、等待次数或工具耗时估算。每次决定「继续等待 / 收口 / 改用网页口径」前，先调用 get_local_datetime，用当前时间与最晚结束计算剩余时间；剩余时间足够就继续等数据，不够才收口。
 - 等待子 Agent 用 wait_for_agents；不要用 bash sleep 代替等待，它会阻塞回传处理，也不会让子 Agent 更快收敛。
 - 最终答复必须自足：结论、证据与来源、局限与风险；不要写“见上”“已完成”。
 - 缺少关键输入时，采用最保守的可核查口径继续，并在开头写明「需要用户确认」及具体缺口。`
@@ -777,7 +799,7 @@ export function createRunRunner(options) {
         await stopEntryAgent(entry, controller)
         return
       }
-      const title = sessionTitleOf(task, profile.displayName, run.id)
+      const title = sessionTitleOf(task, run.id, run.queuedAt)
       const renamed = controller.rename === undefined
         ? undefined
         : await controller.rename({ sessionId: created.sessionId, title }).catch(() => undefined)

package/automation/service.js

@@ -4,7 +4,9 @@
  * profile filter; the wire body never selects a profile.
  */
 import {
+  ACTIVE_RUN_STATUSES,
   DEFAULT_AUTOMATION_SETTINGS,
+  FAILURE_RUN_STATUSES,
   MAX_IDLE_TIMEOUT_MINUTES,
   MAX_MAX_STEPS,
   MAX_MAX_TOOL_CALLS,
@@ -22,14 +24,49 @@ import {
   parseStrict,
 } from './schema.js'
 import { sanitizeMessage } from './redact.js'
+import { addDays, localPartsAt } from './time.js'
 
 const MAX_RUN_PAGE_LIMIT = 2_000
 const RUN_CURSOR_PATTERN = /^[A-Za-z0-9_-]{1,120}$/
+const HISTORY_DAYS = 371
+const ACTIVE_STATUSES = new Set(ACTIVE_RUN_STATUSES)
+const FAILURE_STATUSES = new Set(FAILURE_RUN_STATUSES)
 
 function invalidQuery(message) {
   return new AutomationError('invalid_query', message, 400)
 }
 
+function historyDaysOf(value) {
+  if (value === undefined) return HISTORY_DAYS
+  if (typeof value !== 'string' && typeof value !== 'number') throw invalidQuery('运行历史 days 参数无效。')
+  const text = String(value)
+  if (!/^\d{1,3}$/.test(text)) throw invalidQuery(`运行历史 days 必须是 1–${HISTORY_DAYS} 的整数。`)
+  const days = Number(text)
+  if (!Number.isSafeInteger(days) || days < 1 || days > HISTORY_DAYS) {
+    throw invalidQuery(`运行历史 days 必须是 1–${HISTORY_DAYS} 的整数。`)
+  }
+  return days
+}
+
+function historyTimeZoneOf(value) {
+  if (value === undefined) {
+    try {
+      return Intl.DateTimeFormat().resolvedOptions().timeZone || 'UTC'
+    } catch {
+      return 'UTC'
+    }
+  }
+  if (typeof value !== 'string' || value.length === 0 || value.length > 64) {
+    throw invalidQuery('运行历史 tz 参数无效。')
+  }
+  try {
+    new Intl.DateTimeFormat('en-US', { timeZone: value })
+  } catch {
+    throw invalidQuery('运行历史 tz 参数无效。')
+  }
+  return value
+}
+
 function notificationScopeOf(value) {
   if (value === undefined) return 'task'
   if (value === 'task' || value === 'system' || value === 'all') return value
@@ -165,6 +202,15 @@ export function createAutomationService(options) {
     }
   }
 
+  async function workspaceCatalog() {
+    if (typeof workspaces?.details !== 'function') return { workspaces: [], defaultWorkspaceId: null }
+    try {
+      return await workspaces.details()
+    } catch (error) {
+      throw new AutomationError('workspace_unavailable', sanitizeMessage(String(error?.message ?? error)), 503)
+    }
+  }
+
   async function createTask(input) {
     const parsed = parseStrict(TaskCreateSchema, input, 'task')
     const defaults = { ...DEFAULT_AUTOMATION_SETTINGS, ...settings() }
@@ -285,6 +331,47 @@ export function createAutomationService(options) {
     }
   }
 
+  /**
+   * Daily run counts for the contribution heatmap. Days are bucketed in the browser's zone,
+   * because `queuedAt` is an instant and the calendar day is a local fact.
+   */
+  async function runHistory(query = {}) {
+    const days = historyDaysOf(query.days)
+    const timeZone = historyTimeZoneOf(query.tz)
+    const end = localPartsAt(now(), timeZone)
+    const start = addDays(end, -(days - 1))
+    const buckets = []
+    const byDate = new Map()
+    for (let index = 0; index < days; index += 1) {
+      const date = addDays(start, index).date
+      const bucket = { date, total: 0, success: 0, failure: 0, active: 0 }
+      buckets.push(bucket)
+      byDate.set(date, bucket)
+    }
+    const page = await store.listRunsPage({ limit: MAX_RUN_PAGE_LIMIT })
+    let total = 0
+    let success = 0
+    let failure = 0
+    for (const run of page.runs) {
+      const at = Date.parse(run.queuedAt)
+      if (Number.isNaN(at)) continue
+      const bucket = byDate.get(localPartsAt(at, timeZone).date)
+      if (bucket === undefined) continue
+      bucket.total += 1
+      total += 1
+      if (run.status === 'succeeded') {
+        bucket.success += 1
+        success += 1
+      }
+      if (FAILURE_STATUSES.has(run.status)) {
+        bucket.failure += 1
+        failure += 1
+      }
+      if (ACTIVE_STATUSES.has(run.status)) bucket.active += 1
+    }
+    return { days: buckets, total, success, failure }
+  }
+
   async function listNotifications(query = {}) {
     let unreadOnly = false
     if (query.unread !== undefined) {
@@ -316,6 +403,7 @@ export function createAutomationService(options) {
   return {
     serialize,
     meta,
+    workspaceCatalog,
     listTasks,
     taskDetail,
     createTask,
@@ -327,6 +415,7 @@ export function createAutomationService(options) {
     cancelRun,
     getRun,
     listRuns,
+    runHistory,
     listNotifications,
     markNotificationsRead,
     storageState: async () => {

package/automation/settings.js

@@ -26,6 +26,11 @@ function intIn(value, minimum, maximum, fallback) {
 
 export function normalizeAutomationSettings(value = {}, fallback = DEFAULT_AUTOMATION_SETTINGS) {
   const source = value ?? {}
+  const workspaceId = source.defaultWorkspaceId === undefined
+    ? fallback.defaultWorkspaceId
+    : typeof source.defaultWorkspaceId === 'string'
+      ? source.defaultWorkspaceId.trim()
+      : fallback.defaultWorkspaceId
   return {
     tickMs: intIn(source.tickMs, MIN_TICK_MS, MAX_TICK_MS, fallback.tickMs),
     runTimeoutMinutes: intIn(source.runTimeoutMinutes, MIN_RUN_TIMEOUT_MINUTES, MAX_RUN_TIMEOUT_MINUTES, fallback.runTimeoutMinutes),
@@ -33,6 +38,7 @@ export function normalizeAutomationSettings(value = {}, fallback = DEFAULT_AUTOM
     maxSteps: intIn(source.maxSteps, MIN_MAX_STEPS, MAX_MAX_STEPS, fallback.maxSteps),
     maxToolCalls: intIn(source.maxToolCalls, MIN_MAX_TOOL_CALLS, MAX_MAX_TOOL_CALLS, fallback.maxToolCalls),
     inAppNotifications: source.inAppNotifications === undefined ? fallback.inAppNotifications : source.inAppNotifications !== false,
+    defaultWorkspaceId: workspaceId ?? '',
   }
 }
 

package/automation/workspaces.js

@@ -4,6 +4,9 @@
  * sessions are grouped instead of landing in the ungrouped bucket.
  */
 import { mkdir, realpath } from 'node:fs/promises'
+import { join, sep } from 'node:path'
+
+export const AUTOMATION_WORKSPACE_DIR = 'CapGen-automation-workspace'
 
 export class WorkspaceError extends Error {
   constructor(code, message) {
@@ -15,6 +18,7 @@ export class WorkspaceError extends Error {
 
 const DEFAULT_REGISTRATIONS = new WeakMap()
 const MAX_SESSIONS_TO_ADOPT = 500
+const MAX_WORKSPACE_ID_CHARS = 200
 
 function service(ctx, name) {
   try {
@@ -24,15 +28,54 @@ function service(ctx, name) {
   }
 }
 
+/** Directory segment safe on every platform; the raw profile name never becomes a path. */
+export function safeSegment(value) {
+  return String(value).replace(/[^A-Za-z0-9._-]+/g, '_').slice(0, 120)
+}
+
+export function defaultWorkspacePath(profile = {}) {
+  const home = profile.home ?? profile.dir ?? process.cwd()
+  return join(home, AUTOMATION_WORKSPACE_DIR, safeSegment(profile.name ?? 'default'))
+}
+
+export function defaultWorkspaceTitle(displayName) {
+  return `CapGen 投研自动化（${displayName}）`
+}
+
+/** `~` only for paths under the user's home; anything else stays absolute so it is unambiguous. */
+export function workspaceDisplayPath(path, home) {
+  if (typeof path !== 'string' || typeof home !== 'string' || home.length === 0) return path
+  const prefix = home.endsWith(sep) ? home : `${home}${sep}`
+  return path.startsWith(prefix) ? `~${path.slice(home.length)}` : path
+}
+
 export function createWorkspaceCatalog(options) {
-  const { ctx, displayName, runDir, logger } = options
-  let defaultEntity
-  let defaultPromise
+  const { ctx, displayName, runDir, displayHome, getDefaultWorkspaceId, logger } = options
+  let dedicatedEntity
+  let dedicatedPromise
+  let warnedDefaultId
 
   function registry() {
     return service(ctx, 'workspaceRegistry')
   }
 
+  function configuredDefaultId() {
+    let value
+    try {
+      value = typeof getDefaultWorkspaceId === 'function' ? getDefaultWorkspaceId() : getDefaultWorkspaceId
+    } catch {
+      value = undefined
+    }
+    if (typeof value !== 'string') return ''
+    return value.trim().slice(0, MAX_WORKSPACE_ID_CHARS)
+  }
+
+  function warnDefaultUnusable(id, reason) {
+    if (warnedDefaultId === id) return
+    warnedDefaultId = id
+    logger?.warn?.(`capital-automation: 默认工作区 ${id} ${reason}，回退到专属默认工作区。`)
+  }
+
   async function adoptSessions(entity) {
     if (entity.sessionIds.length > 0) return
     const persistence = service(ctx, 'sessionPersistence')
@@ -66,8 +109,8 @@ export function createWorkspaceCatalog(options) {
   }
 
   async function ensureDefault() {
-    if (defaultEntity !== undefined) return defaultEntity
-    if (defaultPromise !== undefined) return defaultPromise
+    if (dedicatedEntity !== undefined) return dedicatedEntity
+    if (dedicatedPromise !== undefined) return dedicatedPromise
     const current = registry()
     if (current === undefined) return undefined
     let registrations = DEFAULT_REGISTRATIONS.get(current)
@@ -85,7 +128,7 @@ export function createWorkspaceCatalog(options) {
         }
         if (created === undefined) {
           try {
-            created = await current.create(runDir, `CapGen 投研自动化（${displayName}）`)
+            created = await current.create(runDir, defaultWorkspaceTitle(displayName))
           } catch (error) {
             const recovered = typeof current.resolveByPath === 'function'
               ? await current.resolveByPath(runDir).catch(() => undefined)
@@ -94,35 +137,92 @@ export function createWorkspaceCatalog(options) {
             created = recovered
           }
         }
-        defaultEntity = created
+        dedicatedEntity = created
         await adoptSessions(created)
         return created
       })()
       registrations.set(runDir, sharedPromise)
     }
-    defaultPromise = sharedPromise
+    dedicatedPromise = sharedPromise
     try {
-      return await sharedPromise
+      const created = await sharedPromise
+      if (created !== undefined) dedicatedEntity = created
+      return created
     } catch (error) {
       logger?.warn?.(`capital-automation: 无法注册默认工作区：${String(error)}`)
       return undefined
     } finally {
       if (registrations.get(runDir) === sharedPromise) registrations.delete(runDir)
-      if (defaultEntity === undefined) defaultPromise = undefined
+      if (dedicatedEntity === undefined) dedicatedPromise = undefined
     }
   }
 
+  /**
+   * A configured default is honoured only while it is registered and its directory is usable.
+   * A stale id must degrade to the dedicated workspace instead of breaking every empty task.
+   */
+  async function configuredDefaultEntity() {
+    const id = configuredDefaultId()
+    if (id === '') return undefined
+    const entity = registry()?.get?.(id)
+    if (entity === undefined) {
+      warnDefaultUnusable(id, '不存在或已被移除')
+      return undefined
+    }
+    let status
+    try {
+      status = await entity.status?.()
+    } catch {
+      status = 'unavailable'
+    }
+    if (status !== undefined && status !== 'ok') {
+      warnDefaultUnusable(id, '目录不可用')
+      return undefined
+    }
+    warnedDefaultId = undefined
+    return entity
+  }
+
+  async function effectiveDefault() {
+    const configured = await configuredDefaultEntity()
+    if (configured !== undefined) return configured
+    return ensureDefault()
+  }
+
   async function list() {
+    await ensureDefault()
     const current = registry()
     if (current === undefined) return []
-    const preferred = await ensureDefault()
+    const preferred = await effectiveDefault()
+    const dedicatedId = dedicatedEntity?.id
     return current.list().map((entity) => ({
       id: entity.id,
       title: entity.title,
       default: preferred !== undefined && entity.id === preferred.id,
+      ...(entity.id === dedicatedId ? { dedicated: true } : {}),
     }))
   }
 
+  /** Settings-card projection only: it carries paths, unlike the task page's `/meta`. */
+  async function details() {
+    await ensureDefault()
+    const current = registry()
+    if (current === undefined) return { workspaces: [], defaultWorkspaceId: null }
+    const preferred = await effectiveDefault()
+    const dedicatedId = dedicatedEntity?.id
+    return {
+      workspaces: current.list().map((entity) => ({
+        id: entity.id,
+        title: entity.title,
+        path: entity.path,
+        displayPath: workspaceDisplayPath(entity.path, displayHome),
+        default: preferred !== undefined && entity.id === preferred.id,
+        dedicated: entity.id === dedicatedId,
+      })),
+      defaultWorkspaceId: preferred?.id ?? null,
+    }
+  }
+
   async function validate(id) {
     if (typeof id !== 'string' || id.length === 0) return
     const current = registry()
@@ -145,10 +245,10 @@ export function createWorkspaceCatalog(options) {
       const entity = registry().get(id)
       return { workspaceId: entity.id, path: entity.path }
     }
-    const preferred = await ensureDefault()
+    const preferred = await effectiveDefault()
     if (preferred !== undefined) return { workspaceId: preferred.id, path: preferred.path }
     return { workspaceId: undefined, path: runDir }
   }
 
-  return { list, validate, resolve, runDir }
+  return { list, details, validate, resolve, runDir }
 }

package/chart-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@v587d/capital-charts",
-  "version": "2.15.1",
+  "version": "2.16.1",
   "description": "自动模式的图表前端组件（浏览器半边 + 序列旁路路由）：由 @v587d/capital-generation 随包携带并作为 host 平面行挂载。",
   "license": "MIT",
   "type": "module",