fix(frontend): resumed_from null→undefined 类型兼容

TypeScript: resumed_from 是 string|null，StatusButtons 期望 string|undefined。用 ?? undefined 转换。
Merge pull request 'fix(test): e2e test collection crash - 跳过 import 安装目录' (#20 ) from fix/e2e-collection-crash into main
2026-06-10 08:10:58 +08:00 · 2026-06-10 07:53:58 +08:00 · 2026-06-10 07:52:41 +08:00 · 2026-06-10 07:21:24 +08:00 · 2026-06-10 07:20:24 +08:00 · 2026-06-10 07:15:39 +08:00
4 changed files with 8 additions and 7 deletions
@@ -23,16 +23,16 @@ jobs:

      - name: Setup Python
        run: |
-          python3 -m venv .venv
-          .venv/bin/pip install --quiet -r requirements.txt
+          python3 -m venv /tmp/ci-venv-deploy
+          /tmp/ci-venv-deploy/bin/pip install --quiet flake8 fastapi pydantic pyyaml uvicorn requests pytest pytest-asyncio httpx

      - name: Lint
        run: |
-          .venv/bin/flake8 src/ --max-line-length=120 --extend-ignore=E501
+          /tmp/ci-venv-deploy/bin/flake8 src/ --max-line-length=120 --extend-ignore=E501

      - name: Unit & Integration Tests
        run: |
-          .venv/bin/pytest tests/ -m "not e2e" -x -q
+          /tmp/ci-venv-deploy/bin/pytest tests/ -m "not e2e" -x -q

  # ── Job 2: 部署 ─────────────────────────────────────
  deploy:
@@ -426,7 +426,7 @@ export default function TaskModal() {
            {/* 状态操作 */}
            <div style={{ marginBottom: 16 }}>
              <SectionLabel icon="🔄" title="状态操作" />
-              <StatusButtons status={task.status} taskId={task.id} resumedFrom={task.resumed_from} />
+              <StatusButtons status={task.status} taskId={task.id} resumedFrom={task.resumed_from ?? undefined} />
            </div>

            {/* v2.7: 子 Task 进度 + 列表 */}
@@ -57,6 +57,7 @@ export interface V2Task {
  estimated_duration_minutes: number | null;
  escalated: number;
  archived: number;  // v2.8: 归档标记
+  resumed_from: string | null;  // v2.8: 续杯来源
  // API 聚合字段
  comments_count?: number;
  outputs_count?: number;
@@ -1,12 +1,12 @@
 import pytest

-pytestmark = pytest.mark.e2e
-
 skip_no_integration = pytest.mark.skipif(
    not __import__("os").environ.get("RUN_INTEGRATION"),
    reason="Set RUN_INTEGRATION=1 to run E2E tests against real daemon",
 )

+pytestmark = [pytest.mark.e2e, skip_no_integration]
+
 """v2.7 端到端测试 — 全链路真实环境

 覆盖：项目管理 → Task CRUD → SubTask → Stage进度 → 状态聚合 → 依赖链 → 超时 → Mail → 真实Agent调度
Author	SHA1	Message	Date
cfdaily	c1381c0c93	fix(frontend): resumed_from null→undefined 类型兼容 CI / lint (pull_request) Successful in 9s Details CI / test (pull_request) Successful in 8s Details CI / notify-on-failure (pull_request) Successful in 0s Details TypeScript: resumed_from 是 string\|null，StatusButtons 期望 string\|undefined。用 ?? undefined 转换。	2026-06-10 08:10:58 +08:00
jiangwei-infra	9a62a45a12	Merge pull request 'fix(test): e2e test collection crash - 跳过 import 安装目录' (#20 ) from fix/e2e-collection-crash into main Deploy / ci (push) Successful in 9s Details Deploy / deploy (push) Failing after 8s Details Deploy / notify-deploy-failure (push) Successful in 0s Details	2026-06-10 07:53:58 +08:00
cfdaily	b90b7b37c7	fix(test): e2e test 在 collection 阶段跳过(不 import 安装目录) CI / lint (pull_request) Successful in 8s Details CI / test (pull_request) Successful in 8s Details CI / notify-on-failure (pull_request) Successful in 1s Details 根因: test_e2e_v27.py 的 skipif 只标记了函数级别,pytest collection 阶段仍会 import 该文件,触发 sys.path.insert 指向安装目录的 spawner.py。如果安装目录有 merge conflict 残留,整个 test job crash。修复: 将 skipif 加入 pytestmark 级别,collection 阶段即跳过。	2026-06-10 07:52:41 +08:00
jiangwei-infra	672fadfee4	Merge pull request 'fix: deploy.yml requirements.txt + frontend resumed_from TS编译' (#18 ) from fix/deploy-workflow into main Deploy / ci (push) Successful in 10s Details Deploy / deploy (push) Failing after 11s Details Deploy / notify-deploy-failure (push) Successful in 1s Details	2026-06-10 07:21:24 +08:00
cfdaily	f380b5f92d	fix(frontend): V2Task 添加 resumed_from 字段 CI / lint (pull_request) Successful in 7s Details CI / test (pull_request) Successful in 8s Details CI / notify-on-failure (pull_request) Successful in 1s Details deploy 时 TypeScript 编译报 TS2339: Property 'resumed_from' does not exist on type 'V2Task'。 DB 表有此字段但 TS interface 遗漏。	2026-06-10 07:20:24 +08:00
jiangwei-infra	228a95b9fa	Merge pull request 'fix(ci): deploy.yml 用 /tmp/ci-venv 替代 requirements.txt' (#17 ) from fix/deploy-workflow into main Deploy / ci (push) Successful in 23s Details Deploy / deploy (push) Failing after 9s Details Deploy / notify-deploy-failure (push) Successful in 0s Details	2026-06-10 07:15:39 +08:00
cfdaily	405b7147a7	fix(ci): deploy.yml 用 /tmp/ci-venv + 直接 pip install 替代 requirements.txt CI / lint (pull_request) Successful in 8s Details CI / test (pull_request) Successful in 9s Details CI / notify-on-failure (pull_request) Successful in 1s Details 仓库没有 requirements.txt，deploy workflow 每次 push 到 main 都报错。改为与 ci.yml 一致的方式：/tmp/ci-venv + 直接 pip install 依赖。	2026-06-10 07:14:29 +08:00
jiangwei-infra	b876159b52	Merge pull request 'fix(lint): 修复 PR #14 引入的 lint 回退 (119→0)' (#16 ) from fix/lint-regression into main Deploy / ci (push) Failing after 8s Details Deploy / deploy (push) Has been skipped Details Deploy / notify-deploy-failure (push) Successful in 1s Details	2026-06-10 07:09:44 +08:00