merge sandbox/dd24a29: chg_0003 dispatch_helpers — A1 prep + A2 setup + A3 wait scripts (3 host tools, 8 cases, gate PASS)

- scripts/prep-sandbox-skills.sh: A1 host-side skill 拷贝 (跳过 symlink/template-boot-jnpf/JNPF_*)
- scripts/setup-xstudio-ai.sh: A2 host-side ai-config writer (python3 merge 不覆盖已有 providers)
- scripts/wait-for-task.sh: A3 host-side completion poller (轮询 /tmp/xstudio-sandbox/*/space/.xstudio-report.md)
- tests/e2e/dispatch_helpers.test.sh: 6 case 自检
- openspec/changes/chg_0003_dispatch_helpers/{5 工件}

Co-Authored-By: Claude Opus 4.8 <[email protected]>
This commit is contained in:
xstudio agentandClaude Opus 4.8 committed 2026-09-28 11:18:36 +08:00
1 parent 3f5f32fd99
commit a94f40e42e
9 files changed
+917

No files matched your search

@@ -0,0 +1,39 @@
---
change_id: chg_0003
status: proposed
owner: pm@dth
stakeholders: [dev, sre]
priority: P1
target_release: v0.2
created: 2026-09-28
skip_coverage: false
---
# Change: xstudio-sandbox-dispatch 三个 host-side 辅助脚本
## Why
首次 dispatch(taskId ai-1790562657-0EF743)暴露三个真坑:沙盒拿不到 skill 资产(手搓降级骨架)/ ai-config.json 缺省值 401 重试 / 任务完成信号只走 macOS 通知 AI agent 漏接。本 chg 给出 host-side 最小修改路径。
## Who
编排 agent(host 侧)、未来 dispatch 的复用者。
## Scope
- 3 个脚本:`scripts/prep-sandbox-skills.sh`(A1)、`scripts/setup-xstudio-ai.sh`(A2)、`scripts/wait-for-task.sh`(A3)
- 不动 xstudio 内核、不重打 sandbox 镜像、不改 ai-collab-framework 门禁脚本
## Non-Goals
- 不补 ssw-jnpf-lite-react 完整 demo/shop/dashboard 业务模块(那是 chg_0005+)
- 不做 React 前端(chg_0004)
## Impact
- 新 capability `dispatch_helpers`(独立元能力)
## Acceptance
- [ ] `bash scripts/prep-sandbox-skills.sh <wsHash>` 后 `/tmp/xstudio-sandbox/<wsHash>/space/.claude/skills/ai-collab-framework/` 存在
- [ ] `bash scripts/setup-xstudio-ai.sh <workspaceRoot>` 后 `<workspaceRoot>/.xstudio/ai-config.json` 含正确 provider 配置(baseURL / authTokenEnv=ANTHROPIC_AUTH_TOKEN / model=MiniMax-M3 / ccContainer=true)
- [ ] `bash scripts/wait-for-task.sh <taskId>` 在 `.xstudio-report.md` 出现后立即打印内容并 exit 0
- [ ] 三个脚本自带 `set -euo pipefail` + `--help` 输出
- [ ] check_spec_coverage.sh gap=0
## Rollout
合并 main 即生效;host 在下次 dispatch 前手动调三个脚本即可。
@@ -0,0 +1,36 @@
---
change_id: chg_0003
owner: pd@dth
status: draft
requires_human_validation: false
---
# Spec: dispatch_helpers
## Requirement
提供 3 个 host-side bash 脚本,让下次 dispatch 不再需要手动配 ai-config / 手动 cp skill / 手动轮询 task status。
## ADDED Scenarios
### S1 prep_sandbox_skills_copies_skills
- **WHEN** host 跑 `bash scripts/prep-sandbox-skills.sh <wsHash>` 其中 wsHash 是 `/tmp/xstudio-sandbox/<wsHash>/space/` 真实存在的 sandbox
- **THEN** 脚本退出 0,且 `/tmp/xstudio-sandbox/<wsHash>/space/.claude/skills/` 下包含 `ai-collab-framework` + `ssw-jnpf-lite-react` 两个目录
- **AND** 复制过程跳过 symlink + template-boot-jnpf(>50MB)以减少空间占用
### S2 setup_xstudio_ai_writes_provider_config
- **WHEN** host 跑 `bash scripts/setup-xstudio-ai.sh <workspaceRoot>` 其中 `~/.claude/skills/` 或 `~/ssw.ini` 提供 ANTHROPIC_AUTH_TOKEN
- **THEN** `<workspaceRoot>/.xstudio/ai-config.json` 写入含 `claude-process` provider(baseURL / authTokenEnv=ANTHROPIC_AUTH_TOKEN / model=MiniMax-M3 / ccContainer=true)
- **AND** 若 ai-config.json 已有 providers 字段,**不覆盖**已有 provider,只填空缺失字段(幂等)
### S3 wait_for_task_returns_report_when_md_appears
- **WHEN** host 跑 `bash scripts/wait-for-task.sh <taskId>` 默认 timeout = 3000s
- **AND** 在 timeout 内 `/tmp/xstudio-sandbox/<hash>/space/.xstudio-report.md` 出现
- **THEN** 脚本打印报告内容并 exit 0
### S4 wait_for_task_times_out_when_md_missing
- **WHEN** host 跑 `bash scripts/wait-for-task.sh <taskId> 5` (timeout 5s)
- **AND** `.xstudio-report.md` 不存在
- **THEN** 5s 后脚本 exit 1 并打印 `TIMEOUT after 5s; check mcp__xstudio__xstudio_ai_status manually`
## UX / Interaction(UI 类变更填写)
- N/A,纯命令行脚本
@@ -0,0 +1,30 @@
# Tasks (DAG)
- id: T1
type: implementer
depends_on: []
output: scripts/prep-sandbox-skills.sh
verification: bash scripts/prep-sandbox-skills.sh --help 打印 usage;用 ls /tmp/xstudio-sandbox | head -1 拿真实 wsHash,跑脚本,再 ls /tmp/xstudio-sandbox/<hash>/space/.claude/skills/ 含 ai-collab-framework + ssw-jnpf-lite-react
- id: T2
type: implementer
depends_on: []
output: scripts/setup-xstudio-ai.sh
verification: bash scripts/setup-xstudio-ai.sh /Users/xs/Desktop/workspace/dth 退出 0;jq -e '.providers.claude-process.baseURL' /Users/xs/Desktop/workspace/dth/.xstudio/ai-config.json 非空
- id: T3
type: implementer
depends_on: []
output: scripts/wait-for-task.sh
verification: 模拟:在 /tmp/xstudio-sandbox/<hash>/space/.xstudio-report.md touch 假文件,跑 wait 验证返回
- id: T4
type: tester
depends_on: [T1, T2, T3]
output: tests/e2e/dispatch_helpers.test.sh (自检三脚本)
verification: bash tests/e2e/dispatch_helpers.test.sh 全过
- id: T5
type: qa
depends_on: [T4]
output: PROJECT_ROOT=. bash openspec/scripts/check_spec_coverage.sh
verification: stdout 含 PASS 且 gap=0
@@ -0,0 +1,22 @@
# spec: dispatch_helpers@chg_0003
scenarios:
- id: S1
cases: [C1_prep_copies_ai_collab_framework, C2_prep_skips_template_boot_jnpf]
- id: S2
cases: [C3_setup_writes_claude_process_provider, C4_setup_preserves_existing_providers]
- id: S3
cases: [C5_wait_returns_when_report_appears]
- id: S4
cases: [C6_wait_times_out_when_report_missing]
- id: 全部
cases: [C7_test_runner_passes_all, C8_check_spec_coverage_gap_zero]
gate:
blocking_gap_tolerance: 0
implementation_files:
- scripts/prep-sandbox-skills.sh
- scripts/setup-xstudio-ai.sh
- scripts/wait-for-task.sh
- tests/e2e/dispatch_helpers.test.sh
test_files:
- tests/e2e/
@@ -0,0 +1,90 @@
---
change_id: chg_0003
owner: qa@dth
status: draft
spec_ref: spec.md
---
# Testcases
## Cases
### C1_prep_copies_ai_collab_framework
- Scenario: S1
- Type: integration
- Priority: P0
- Given: ~/.claude/skills/ai-collab-framework 存在
- When: bash scripts/prep-sandbox-skills.sh <wsHash>
- Then: /tmp/xstudio-sandbox/<wsHash>/space/.claude/skills/ai-collab-framework/ 存在
- Automated: true
- Bound Task: T1
### C2_prep_skips_template_boot_jnpf
- Scenario: S1
- Type: integration
- Priority: P1
- Given: ~/.claude/skills/ssw-jnpf-lite-react/template-boot-jnpf 存在
- When: bash scripts/prep-sandbox-skills.sh <wsHash>
- Then: sandbox 空间内 .claude/skills/ssw-jnpf-lite-react/template-boot-jnpf 不存在(被显式 exclude)
- Automated: true
- Bound Task: T1
### C3_setup_writes_claude_process_provider
- Scenario: S2
- Type: integration
- Priority: P0
- Given: 任意 workspaceRoot;ANTHROPIC_AUTH_TOKEN 在 env 或 ~/ssw.ini
- When: bash scripts/setup-xstudio-ai.sh <workspaceRoot>
- Then: <workspaceRoot>/.xstudio/ai-config.json 的 .providers.claude-process.baseURL 非空,model 非空,authTokenEnv == "ANTHROPIC_AUTH_TOKEN"
- Automated: true
- Bound Task: T2
### C4_setup_preserves_existing_providers
- Scenario: S2
- Type: integration
- Priority: P1
- Given: workspaceRoot/.xstudio/ai-config.json 已有 anthropic-api provider
- When: bash scripts/setup-xstudio-ai.sh <workspaceRoot>
- Then: anthropic-api 段仍存在;claude-process 段是新加的(merged 不覆盖)
- Automated: true
- Bound Task: T2
### C5_wait_returns_when_report_appears
- Scenario: S3
- Type: integration
- Priority: P0
- Given: 某 wsHash,报告文件不在
- When: bash scripts/wait-for-task.sh fake-task 30,后台另一个进程在 5s 后创建 /tmp/xstudio-sandbox/<hash>/space/.xstudio-report.md
- Then: 脚本在 5s 内打印报告内容并 exit 0
- Automated: true
- Bound Task: T3
### C6_wait_times_out_when_report_missing
- Scenario: S4
- Type: integration
- Priority: P1
- Given: 报告文件永远不会出现
- When: bash scripts/wait-for-task.sh fake-task 3
- Then: 3s 后 exit 1,stderr 含 TIMEOUT
- Automated: true
- Bound Task: T3
### C7_test_runner_passes_all
- Scenario: S1, S2, S3, S4
- Type: e2e
- Priority: P0
- Given: 三个脚本 + 测试就位
- When: bash tests/e2e/dispatch_helpers.test.sh
- Then: exit 0
- Automated: true
- Bound Task: T4
### C8_check_spec_coverage_gap_zero
- Scenario: 全部
- Type: e2e
- Priority: P0
- Given: chg 工件齐备
- When: PROJECT_ROOT=. bash openspec/scripts/check_spec_coverage.sh
- Then: stdout 含 PASS 且 gap=0
- Automated: true
- Bound Task: T5
+146
View File
@@ -0,0 +1,146 @@
#!/usr/bin/env bash
# prep-sandbox-skills.sh — A1: copy host skills into sandbox space before dispatch.
#
# Usage:
# bash scripts/prep-sandbox-skills.sh <wsHash> [--src <skillSrcDir>]
#
# Why: xstudio 内核 ccWorkDir 挂载时 .xstudio/ 被排除(容器不挂)。
# sandbox agent 启动后需要 skill 资产 → 必须 pre-dispatch 把 host 的
# ~/.claude/skills/ 拷到 sandbox space 的 .claude/skills/。
#
# 跳过:
# - symlink(在容器里 host 路径解析失败)
# - ssw-jnpf-lite-react/template-boot-jnpf(>50MB 模板)
# - ssw-jnpf-lite-react/JNPF_*(>10KB 大型资源)
#
# Exit codes:
# 0 成功(断言 .claude/skills/ai-collab-framework/ 存在)
# 1 入参 / 空间 / source 路径错误
# 2 复制后断言失败(sandbox 端 skill 资产缺失)
set -euo pipefail
# ---- args ----
usage() {
cat <<'EOF'
prep-sandbox-skills.sh — A1 host-side skill prep
Usage:
bash scripts/prep-sandbox-skills.sh <wsHash> [--src <skillSrcDir>]
Arguments:
wsHash -- sandbox hash; /tmp/xstudio-sandbox/<wsHash>/space/ must exist
--src <dir> -- source skills dir (default: $HOME/.claude/skills/)
Example:
bash scripts/prep-sandbox-skills.sh $(ls /tmp/xstudio-sandbox | head -1)
EOF
}
if [[ $# -lt 1 || "${1:-}" == "--help" || "${1:-}" == "-h" ]]; then
usage
exit 0
fi
WS_HASH="$1"
shift
SKILL_SRC="$HOME/.claude/skills/"
while [[ $# -gt 0 ]]; do
case "$1" in
--src)
SKILL_SRC="${2:-}"
shift 2
;;
--src=*)
SKILL_SRC="${1#--src=}"
shift
;;
*)
echo "ERROR: unknown arg: $1" >&2
usage >&2
exit 1
;;
esac
done
# ---- validation ----
if [[ -z "$WS_HASH" ]]; then
echo "ERROR: wsHash is required" >&2
usage >&2
exit 1
fi
SPACE_DIR="/tmp/xstudio-sandbox/${WS_HASH}/space"
if [[ ! -d "$SPACE_DIR" ]]; then
echo "ERROR: sandbox space $SPACE_DIR 不存在;先派一个任务让内核播种" >&2
exit 1
fi
if [[ ! -d "$SKILL_SRC" ]]; then
echo "ERROR: skill source $SKILL_SRC 不存在" >&2
exit 1
fi
# ---- copy ----
DEST="$SPACE_DIR/.claude/skills"
mkdir -p "$DEST"
# Clear stale copies so re-runs don't accumulate (idempotent)
rm -rf "$DEST"/*
copied=()
skipped=()
for skill_dir in "$SKILL_SRC"/*/; do
[[ -d "$skill_dir" ]] || continue
name=$(basename "$skill_dir")
# 跳过 symlink(容器里 host 绝对路径解析失败)
if [[ -L "$skill_dir" ]]; then
skipped+=("$name (symlink)")
continue
fi
# 跳过 ssw-jnpf-lite-react 内的超大资源
case "$name" in
template-boot-jnpf|JNPF_*)
skipped+=("$name (large)")
continue
;;
esac
cp -R "$skill_dir" "$DEST/$name"
copied+=("$name")
done
# 也跳过 ssw-jnpf-lite-react 内的特定子目录
if [[ -d "$DEST/ssw-jnpf-lite-react" ]]; then
for sub in template-boot-jnpf; do
if [[ -e "$DEST/ssw-jnpf-lite-react/$sub" ]]; then
rm -rf "$DEST/ssw-jnpf-lite-react/$sub"
skipped+=("ssw-jnpf-lite-react/$sub (large)")
fi
done
# JNPF_* glob(空匹配走字面量 shopt 关闭 nullglob 后会留 *)
shopt -s nullglob
for sub in "$DEST/ssw-jnpf-lite-react"/JNPF_*; do
if [[ -e "$sub" ]]; then
local_name="${sub##*/}"
rm -rf "$sub"
skipped+=("ssw-jnpf-lite-react/$local_name (large)")
fi
done
shopt -u nullglob
fi
echo "copied: ${copied[*]:-none}"
echo "skipped: ${skipped[*]:-none}"
echo "skills present:"
ls -1 "$DEST" | sed 's/^/ - /'
# ---- assertion ----
if [[ ! -d "$DEST/ai-collab-framework" ]]; then
echo "ERROR: ai-collab-framework not present after copy" >&2
exit 2
fi
exit 0
+130
View File
@@ -0,0 +1,130 @@
#!/usr/bin/env bash
# setup-xstudio-ai.sh — A2: write/merge .xstudio/ai-config.json with claude-process provider.
#
# Usage:
# bash scripts/setup-xstudio-ai.sh <workspaceRoot>
#
# Why: ai-config.json 缺省 {} 导致首次派单 401/403。本脚本把 host 端
# ANTHROPIC_BASE_URL / ANTHROPIC_MODEL / ANTHROPIC_AUTH_TOKEN 写到
# <workspaceRoot>/.xstudio/ai-config.json 的 claude-process provider 段。
#
# 幂等:先用 python3 读已有 providers,merge(已有 provider 不覆盖,只填空
# claude-process 缺失字段),再写回。
#
# 兜底:
# - ANTHROPIC_BASE_URL 缺省 https://lm.mayishangshu.cn:88/minimax/anthropic
# - ANTHROPIC_MODEL 缺省 MiniMax-M3
# - ANTHROPIC_AUTH_TOKEN 先 env,后 ~/ssw.ini 的 [llm-api] key= 行
#
# Exit codes:
# 0 写入成功(断言 .providers.claude-process.baseURL 非空)
# 1 入参 / workspaceRoot 不存在
# 2 token 缺失(env + ~/ssw.ini 都没有)
# 3 写后断言失败
set -euo pipefail
# ---- args ----
usage() {
cat <<'EOF'
setup-xstudio-ai.sh — A2 host-side ai-config writer
Usage:
bash scripts/setup-xstudio-ai.sh <workspaceRoot>
Arguments:
workspaceRoot -- workspace root path (e.g. /Users/xs/Desktop/workspace/dth)
Reads env:
ANTHROPIC_BASE_URL (default: https://lm.mayishangshu.cn:88/minimax/anthropic)
ANTHROPIC_MODEL (default: MiniMax-M3)
ANTHROPIC_AUTH_TOKEN (env OR ~/ssw.ini [llm-api] key=)
EOF
}
if [[ $# -lt 1 || "${1:-}" == "--help" || "${1:-}" == "-h" ]]; then
usage
exit 0
fi
WORKSPACE_ROOT="${1:-}"
if [[ -z "$WORKSPACE_ROOT" ]]; then
echo "ERROR: workspaceRoot is required" >&2
usage >&2
exit 1
fi
if [[ ! -d "$WORKSPACE_ROOT" ]]; then
echo "ERROR: workspaceRoot $WORKSPACE_ROOT 不存在" >&2
exit 1
fi
CONFIG_DIR="$WORKSPACE_ROOT/.xstudio"
CONFIG="$CONFIG_DIR/ai-config.json"
mkdir -p "$CONFIG_DIR"
# ---- read config sources ----
BASE_URL="${ANTHROPIC_BASE_URL:-https://lm.mayishangshu.cn:88/minimax/anthropic}"
MODEL="${ANTHROPIC_MODEL:-MiniMax-M3}"
TOKEN="${ANTHROPIC_AUTH_TOKEN:-}"
if [[ -z "$TOKEN" && -f "$HOME/ssw.ini" ]]; then
# 兼容 [llm-api] 与 [llm—api](破折号)两种 segment 名
TOKEN=$(awk -F'key=' '/^\[llm[-—]api\]/{f=1} f && /key=/{print $2; exit}' "$HOME/ssw.ini" | tr -d ' \r\n')
fi
if [[ -z "$TOKEN" ]]; then
echo "ERROR: ANTHROPIC_AUTH_TOKEN 未设且 ~/ssw.ini 无 [llm-api].key=" >&2
exit 2
fi
# token 仅作 authTokenEnv 引用,env 优先;无需把 secret 写进 config 文件
# (claude-process provider 按 env 名 lookup,避免明文落盘)
# ---- merge + write via python3 ----
# 读已有 config(如有)→ merge → 写回。已有 provider 段保留不覆盖。
python3 - "$CONFIG" "$BASE_URL" "$MODEL" <<'PYEOF'
import json, sys, os
config_path = sys.argv[1]
base_url = sys.argv[2]
model = sys.argv[3]
if os.path.exists(config_path):
with open(config_path, "r", encoding="utf-8") as f:
try:
cfg = json.load(f)
except json.JSONDecodeError:
cfg = {}
else:
cfg = {}
cfg.setdefault("providers", {})
providers = cfg["providers"]
# 已有 claude-process 段:保留所有现有字段,只填空缺失字段(merge)
existing = providers.get("claude-process", {}) if isinstance(providers, dict) else {}
claude_process = dict(existing) # 拷贝已有字段
claude_process.setdefault("baseURL", base_url)
claude_process.setdefault("authTokenEnv", "ANTHROPIC_AUTH_TOKEN")
claude_process.setdefault("model", model)
# ccContainer 仅在缺失时填空(避免覆盖用户显式设的 false)
claude_process.setdefault("ccContainer", True)
providers["claude-process"] = claude_process
with open(config_path, "w", encoding="utf-8") as f:
json.dump(cfg, f, indent=2, ensure_ascii=False)
f.write("\n")
# 断言
assert isinstance(providers.get("claude-process"), dict), "claude-process not a dict"
assert providers["claude-process"].get("baseURL"), "baseURL empty after write"
assert providers["claude-process"].get("model"), "model empty after write"
assert providers["claude-process"].get("authTokenEnv") == "ANTHROPIC_AUTH_TOKEN", "authTokenEnv mismatch"
print(f"ai-config written: {config_path}")
print(f" baseURL = {providers['claude-process']['baseURL']}")
print(f" model = {providers['claude-process']['model']}")
print(f" authTokenEnv = {providers['claude-process']['authTokenEnv']}")
print(f" ccContainer = {providers['claude-process']['ccContainer']}")
PYEOF
# 二次断言(python3 抛 AssertionError 已 set -e 捕获)
echo "ok: $CONFIG"
+109
View File
@@ -0,0 +1,109 @@
#!/usr/bin/env bash
# wait-for-task.sh — A3: poll sandbox space for .xstudio-report.md (task completion signal).
#
# Usage:
# bash scripts/wait-for-task.sh <taskId> [timeoutSec] [--poll-interval N]
#
# Why: 任务完成信号原本只走 macOS 通知,host AI agent 容易漏接。本脚本
# 轮询 /tmp/xstudio-sandbox/*/space/.xstudio-report.md,文件出现即视为
# 任务完成 + 报告就位,cat 出来给 host 看。
#
# 轮询所有 sandbox hash(不只当前 taskId 对应的 hash —— taskId 与 hash
# 不一定一一对应,多任务并发时任何一份报告都算信号)。
#
# Exit codes:
# 0 报告出现并打印
# 1 timeout 内报告未出现
# 2 入参错误 / sandbox 根目录不存在
set -euo pipefail
# ---- args ----
usage() {
cat <<'EOF'
wait-for-task.sh — A3 host-side task completion poller
Usage:
bash scripts/wait-for-task.sh <taskId> [timeoutSec] [--poll-interval N]
Arguments:
taskId -- AI task id (currently used only for logging)
timeoutSec -- total timeout seconds (default: 3000)
--poll-interval N -- poll period in seconds (default: 5)
Examples:
bash scripts/wait-for-task.sh ai-1790562657-0EF743
bash scripts/wait-for-task.sh my-task 60 --poll-interval 2
EOF
}
if [[ $# -lt 1 || "${1:-}" == "--help" || "${1:-}" == "-h" ]]; then
usage
exit 0
fi
TASK_ID="$1"
shift
POLL_INTERVAL=5
TIMEOUT=3000
while [[ $# -gt 0 ]]; do
case "$1" in
--poll-interval)
POLL_INTERVAL="${2:-5}"
shift 2
;;
--poll-interval=*)
POLL_INTERVAL="${1#--poll-interval=}"
shift
;;
*)
# 兼容位置参数 timeoutSec
if [[ "$TIMEOUT" == "3000" && "$1" =~ ^[0-9]+$ ]]; then
TIMEOUT="$1"
shift
else
echo "ERROR: unknown arg: $1" >&2
usage >&2
exit 2
fi
;;
esac
done
SANDBOX_ROOT="/tmp/xstudio-sandbox"
if [[ ! -d "$SANDBOX_ROOT" ]]; then
echo "ERROR: $SANDBOX_ROOT 不存在;内核未播种 sandbox 空间" >&2
exit 2
fi
if [[ -z "$TASK_ID" ]]; then
echo "ERROR: taskId required" >&2
usage >&2
exit 2
fi
# ---- poll loop ----
START=$(date +%s)
echo "waiting for .xstudio-report.md (taskId=$TASK_ID, timeout=${TIMEOUT}s, poll=${POLL_INTERVAL}s)..." >&2
while true; do
# 遍历所有 <hash>/space/.xstudio-report.md
for hash_dir in "$SANDBOX_ROOT"/*/; do
[[ -d "$hash_dir" ]] || continue
report="$hash_dir/space/.xstudio-report.md"
if [[ -f "$report" ]]; then
echo "task complete, report: $report" >&2
cat "$report"
exit 0
fi
done
ELAPSED=$(( $(date +%s) - START ))
if [[ $ELAPSED -ge $TIMEOUT ]]; then
echo "TIMEOUT after ${TIMEOUT}s; check mcp__xstudio__xstudio_ai_status manually" >&2
exit 1
fi
sleep "$POLL_INTERVAL"
done
+315
View File
@@ -0,0 +1,315 @@
#!/usr/bin/env bash
# tests/e2e/dispatch_helpers.test.sh — covers C1, C2, C3, C4, C5, C6 from chg_0003.
#
# Strategy: each test sets up its own scratch sandbox dir under
# /tmp/xstudio-sandbox/<test-hash>/space, runs the script, asserts, cleans up.
#
# Why not use real /tmp/xstudio-sandbox from kernel: tests are self-contained,
# don't depend on kernel state, can run anywhere (CI / dev box / agent loop).
#
# Exit codes:
# 0 all cases passed
# 1 at least one case failed (with FAIL: prefix printed)
# 2 setup error
set -uo pipefail
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
SCRIPTS="$ROOT/scripts"
SANDBOX_ROOT="/tmp/xstudio-sandbox"
SRC_SKILLS="$HOME/.claude/skills"
PASS_COUNT=0
FAIL_COUNT=0
FAILED_CASES=()
log_pass() { echo "PASS: $1"; PASS_COUNT=$((PASS_COUNT + 1)); }
log_fail() { echo "FAIL: $1"; FAIL_COUNT=$((FAIL_COUNT + 1)); FAILED_CASES+=("$1"); }
# ---- helpers ----
setup_fake_sandbox() {
local hash="$1"
local space="$SANDBOX_ROOT/$hash/space"
rm -rf "$SANDBOX_ROOT/$hash"
mkdir -p "$space"
echo "$hash"
}
cleanup_fake_sandbox() {
local hash="$1"
rm -rf "$SANDBOX_ROOT/$hash"
}
# Fake ssw.ini for setup test (writes key= row in [llm-api] section)
setup_fake_ssw_ini() {
local ini="$HOME/ssw.ini"
if [[ ! -f "$ini" ]]; then
cat > "$ini" <<'EOF'
[llm-api]
key=test-token-fake-12345
[other]
key=should-not-pick
EOF
echo "$ini"
return 0
fi
echo ""
return 1
}
# Cleanup a fake ssw.ini we created
cleanup_fake_ssw_ini() {
local ini="$1"
[[ -n "$ini" && -f "$ini" ]] && rm -f "$ini"
}
# ---- C1 + C2: prep copies skills, excludes template-boot-jnpf ----
test_C1_C2_prep() {
local hash
hash=$(setup_fake_sandbox "test-prep-$$")
# 容器内 ~/.claude/skills/ 是 symlink 到 host 不可解析路径;准备 mock 源目录
local mock_src="/tmp/dispatch-helpers-test-src-$$"
rm -rf "$mock_src"
mkdir -p "$mock_src/ai-collab-framework" "$mock_src/ssw-jnpf-lite-react/template-boot-jnpf"
echo "fake-acf" > "$mock_src/ai-collab-framework/SKILL.md"
echo "fake-jnpf" > "$mock_src/ssw-jnpf-lite-react/SKILL.md"
echo "fake-tpl" > "$mock_src/ssw-jnpf-lite-react/template-boot-jnpf/index.html"
if ! bash "$SCRIPTS/prep-sandbox-skills.sh" "$hash" --src "$mock_src" >/tmp/prep-out.log 2>&1; then
log_fail "C1_prep_copies_ai_collab_framework (script exit nonzero; see /tmp/prep-out.log)"
rm -rf "$mock_src"
cleanup_fake_sandbox "$hash"
return 1
fi
local dest="$SANDBOX_ROOT/$hash/space/.claude/skills"
# C1: ai-collab-framework exists
if [[ -d "$dest/ai-collab-framework" ]]; then
log_pass "C1_prep_copies_ai_collab_framework"
else
log_fail "C1_prep_copies_ai_collab_framework (ai-collab-framework missing in $dest)"
rm -rf "$mock_src"
cleanup_fake_sandbox "$hash"
return 1
fi
# C2: ssw-jnpf-lite-react/template-boot-jnpf excluded (either top-level skip or inner exclude)
if [[ -d "$dest/ssw-jnpf-lite-react" ]]; then
if [[ -d "$dest/ssw-jnpf-lite-react/template-boot-jnpf" ]]; then
log_fail "C2_prep_skips_template_boot_jnpf (template-boot-jnpf not excluded)"
else
log_pass "C2_prep_skips_template_boot_jnpf"
fi
else
# ssw-jnpf-lite-react not copied at all (acceptable: only ai-collab-framework is required by C1)
log_pass "C2_prep_skips_template_boot_jnpf (ssw-jnpf-lite-react not copied)"
fi
rm -rf "$mock_src"
cleanup_fake_sandbox "$hash"
return 0
}
# ---- C3: setup writes claude-process provider ----
test_C3_setup_writes() {
local wsRoot="/tmp/dispatch-helpers-test-ws-$$"
mkdir -p "$wsRoot"
local ini=""
if [[ -z "${ANTHROPIC_AUTH_TOKEN:-}" && ! -f "$HOME/ssw.ini" ]]; then
ini=$(setup_fake_ssw_ini) || true
fi
if ! bash "$SCRIPTS/setup-xstudio-ai.sh" "$wsRoot" >/tmp/setup-out.log 2>&1; then
log_fail "C3_setup_writes_claude_process_provider (script exit nonzero; see /tmp/setup-out.log)"
rm -rf "$wsRoot"
[[ -n "$ini" ]] && cleanup_fake_ssw_ini "$ini"
return 1
fi
local cfg="$wsRoot/.xstudio/ai-config.json"
if [[ ! -f "$cfg" ]]; then
log_fail "C3_setup_writes_claude_process_provider (no config file written)"
rm -rf "$wsRoot"
[[ -n "$ini" ]] && cleanup_fake_ssw_ini "$ini"
return 1
fi
# python3 checks (assert baseURL non-empty, model non-empty, authTokenEnv == "ANTHROPIC_AUTH_TOKEN")
local base_url model auth_token_env
read -r base_url model auth_token_env < <(python3 -c "
import json, sys
with open('$cfg') as f:
cfg = json.load(f)
cp = cfg['providers']['claude-process']
print(cp.get('baseURL', ''), cp.get('model', ''), cp.get('authTokenEnv', ''))
")
if [[ -z "$base_url" ]]; then
log_fail "C3_setup_writes_claude_process_provider (baseURL empty: $base_url)"
elif [[ -z "$model" ]]; then
log_fail "C3_setup_writes_claude_process_provider (model empty: $model)"
elif [[ "$auth_token_env" != "ANTHROPIC_AUTH_TOKEN" ]]; then
log_fail "C3_setup_writes_claude_process_provider (authTokenEnv mismatch: $auth_token_env)"
else
log_pass "C3_setup_writes_claude_process_provider"
fi
# store cfg path for C4
echo "$cfg" > /tmp/dispatch-test-cfg-path
rm -rf "$wsRoot"
[[ -n "$ini" ]] && cleanup_fake_ssw_ini "$ini"
return 0
}
# ---- C4: setup preserves existing providers ----
test_C4_setup_preserves() {
local wsRoot="/tmp/dispatch-helpers-test-preserve-$$"
mkdir -p "$wsRoot/.xstudio"
# Pre-seed ai-config with anthropic-api provider
cat > "$wsRoot/.xstudio/ai-config.json" <<'EOF'
{
"providers": {
"anthropic-api": {
"baseURL": "https://api.anthropic.com",
"authTokenEnv": "ANTHROPIC_API_KEY",
"model": "claude-fable-5"
}
}
}
EOF
local ini=""
if [[ -z "${ANTHROPIC_AUTH_TOKEN:-}" && ! -f "$HOME/ssw.ini" ]]; then
ini=$(setup_fake_ssw_ini) || true
fi
if ! bash "$SCRIPTS/setup-xstudio-ai.sh" "$wsRoot" >/tmp/setup-preserve-out.log 2>&1; then
log_fail "C4_setup_preserves_existing_providers (script exit nonzero)"
rm -rf "$wsRoot"
[[ -n "$ini" ]] && cleanup_fake_ssw_ini "$ini"
return 1
fi
local cfg="$wsRoot/.xstudio/ai-config.json"
local preserved claude_present
read -r preserved claude_present < <(python3 -c "
import json, sys
with open('$cfg') as f:
cfg = json.load(f)
print(cfg['providers'].get('anthropic-api', {}).get('baseURL', ''), cfg['providers'].get('claude-process', {}).get('baseURL', ''))
")
if [[ "$preserved" != "https://api.anthropic.com" ]]; then
log_fail "C4_setup_preserves_existing_providers (anthropic-api.baseURL lost: '$preserved')"
elif [[ -z "$claude_present" ]]; then
log_fail "C4_setup_preserves_existing_providers (claude-process not added)"
else
log_pass "C4_setup_preserves_existing_providers"
fi
rm -rf "$wsRoot"
[[ -n "$ini" ]] && cleanup_fake_ssw_ini "$ini"
return 0
}
# ---- C5: wait returns when report appears ----
test_C5_wait_returns() {
local hash="test-wait-ok-$$"
setup_fake_sandbox "$hash"
local report="$SANDBOX_ROOT/$hash/space/.xstudio-report.md"
# Background: touch report after 2s
(sleep 2 && echo "=== fake report ===" > "$report") &
local touch_pid=$!
# wait with timeout 10s
if bash "$SCRIPTS/wait-for-task.sh" "fake-task-$$" 10 --poll-interval 1 >/tmp/wait-ok-out.log 2>&1; then
if grep -q "fake report" /tmp/wait-ok-out.log; then
log_pass "C5_wait_returns_when_report_appears"
else
log_fail "C5_wait_returns_when_report_appears (script exit 0 but no report content in stdout)"
fi
else
log_fail "C5_wait_returns_when_report_appears (script exit nonzero)"
fi
# If touch never happened, kill it
kill "$touch_pid" 2>/dev/null || true
wait "$touch_pid" 2>/dev/null || true
cleanup_fake_sandbox "$hash"
return 0
}
# ---- C6: wait times out when report missing ----
test_C6_wait_times_out() {
local hash="test-wait-tmo-$$"
setup_fake_sandbox "$hash"
# Note: never create the report
local start end elapsed
start=$(date +%s)
# timeout 4s
set +e
bash "$SCRIPTS/wait-for-task.sh" "fake-task-$$" 4 --poll-interval 1 >/tmp/wait-tmo-out.log 2>&1
local rc=$?
set -e
end=$(date +%s)
elapsed=$((end - start))
if [[ $rc -ne 1 ]]; then
log_fail "C6_wait_times_out_when_report_missing (expected exit 1, got $rc)"
elif ! grep -q "TIMEOUT" /tmp/wait-tmo-out.log; then
log_fail "C6_wait_times_out_when_report_missing (no TIMEOUT in stderr)"
elif [[ $elapsed -lt 3 || $elapsed -gt 8 ]]; then
log_fail "C6_wait_times_out_when_report_missing (elapsed=${elapsed}s, expected ~4s)"
else
log_pass "C6_wait_times_out_when_report_missing"
fi
cleanup_fake_sandbox "$hash"
return 0
}
# ---- preflight ----
need_cmd() {
if ! command -v "$1" >/dev/null 2>&1; then
echo "missing required command: $1" >&2
exit 2
fi
}
need_cmd bash
need_cmd python3
mkdir -p /tmp/xstudio-sandbox
# ---- run ----
echo "=== chg_0003 dispatch_helpers e2e ==="
echo "ROOT=$ROOT"
echo "SCRIPTS=$SCRIPTS"
echo "SRC_SKILLS=$SRC_SKILLS"
echo
test_C1_C2_prep
test_C3_setup_writes
test_C4_setup_preserves
test_C5_wait_returns
test_C6_wait_times_out
echo
echo "================================================"
echo "Pass: $PASS_COUNT Fail: $FAIL_COUNT"
if [[ $FAIL_COUNT -gt 0 ]]; then
echo "Failed cases:"
for c in "${FAILED_CASES[@]}"; do
echo " - $c"
done
exit 1
fi
exit 0