Compare commits
13
Commits
latest
...
v2026.08.11.4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b49290bd91 | ||
|
|
31fdb36e48 | ||
|
|
c565e89d60 | ||
|
|
4cbeca4e09 | ||
|
|
f66b9c3e9d | ||
|
|
b19af8846a | ||
|
|
a5e91ac2b8 | ||
|
|
258f4996eb | ||
|
|
2dc37e3fd8 | ||
|
|
a53839e157 | ||
|
|
1407dd3bbe | ||
|
|
764a1f4e82 | ||
|
|
07016451d6 |
@@ -1,7 +1,11 @@
|
|||||||
.git
|
.git
|
||||||
node_modules
|
node_modules
|
||||||
.opencode/node_modules
|
.opencode/node_modules
|
||||||
|
.env
|
||||||
|
.env.*
|
||||||
.local.env
|
.local.env
|
||||||
|
data/
|
||||||
|
logs/
|
||||||
dist
|
dist
|
||||||
.vscode
|
.vscode
|
||||||
*.log
|
*.log
|
||||||
|
|||||||
+15
-213
@@ -1,221 +1,23 @@
|
|||||||
name: Agent CI/CD
|
name: Agent CI/CD v2
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
tags:
|
tags:
|
||||||
- "v*"
|
- "v*"
|
||||||
- "latest"
|
|
||||||
workflow_dispatch: {}
|
workflow_dispatch: {}
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
docker-image:
|
build-test-publish-and-deploy:
|
||||||
runs-on: ubuntu-22.04
|
uses: OrgTJWater/ci-templates/.gitea/workflows/container-cd.yml@main
|
||||||
if: startsWith(github.ref, 'refs/tags/')
|
with:
|
||||||
permissions:
|
image_name: gitea.waternetwork.cn/orgtjwater/tjwateragent
|
||||||
contents: read
|
dockerfile: Dockerfile
|
||||||
defaults:
|
build_context: .
|
||||||
run:
|
cache_image: gitea.waternetwork.cn/orgtjwater/tjwateragent:ci-cache
|
||||||
shell: bash
|
test_target: build
|
||||||
|
deploy_service: agent
|
||||||
steps:
|
deploy_host: 192.168.1.114
|
||||||
- name: Setup tools
|
secrets:
|
||||||
run: |
|
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
|
||||||
sudo apt-get update -qq && sudo apt-get install -y -qq jq
|
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
|
||||||
jq --version
|
DEV_DEPLOY_SSH_KEY: ${{ secrets.DEV_DEPLOY_SSH_KEY }}
|
||||||
|
|
||||||
- name: Checkout code
|
|
||||||
env:
|
|
||||||
SERVER_URL: ${{ github.server_url }}
|
|
||||||
REPOSITORY: ${{ github.repository }}
|
|
||||||
COMMIT_SHA: ${{ github.sha }}
|
|
||||||
GIT_USERNAME: ${{ github.actor }}
|
|
||||||
GIT_TOKEN: ${{ github.token }}
|
|
||||||
run: |
|
|
||||||
case "$SERVER_URL" in
|
|
||||||
http://*)
|
|
||||||
AUTH_SERVER_URL="http://${GIT_USERNAME}:${GIT_TOKEN}@${SERVER_URL#http://}"
|
|
||||||
;;
|
|
||||||
https://*)
|
|
||||||
AUTH_SERVER_URL="https://${GIT_USERNAME}:${GIT_TOKEN}@${SERVER_URL#https://}"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
AUTH_SERVER_URL="$SERVER_URL"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ ! -d .git ]; then
|
|
||||||
git init .
|
|
||||||
fi
|
|
||||||
|
|
||||||
if git remote get-url origin >/dev/null 2>&1; then
|
|
||||||
git remote set-url origin "${AUTH_SERVER_URL}/${REPOSITORY}.git"
|
|
||||||
else
|
|
||||||
git remote add origin "${AUTH_SERVER_URL}/${REPOSITORY}.git"
|
|
||||||
fi
|
|
||||||
|
|
||||||
git fetch --depth=1 origin "$COMMIT_SHA"
|
|
||||||
git checkout --force --detach FETCH_HEAD
|
|
||||||
git clean -ffdx
|
|
||||||
|
|
||||||
- name: Normalize image metadata
|
|
||||||
env:
|
|
||||||
RAW_REGISTRY_HOST: ${{ vars.REGISTRY_HOST }}
|
|
||||||
RAW_REPOSITORY: ${{ github.repository }}
|
|
||||||
RAW_REF: ${{ github.ref }}
|
|
||||||
RAW_REF_NAME: ${{ github.ref_name }}
|
|
||||||
run: |
|
|
||||||
RAW_REGISTRY_HOST="$(printf '%s' "${RAW_REGISTRY_HOST}" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')"
|
|
||||||
|
|
||||||
if [ -z "${RAW_REGISTRY_HOST}" ]; then
|
|
||||||
echo "Missing required repository variable: REGISTRY_HOST"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
REGISTRY_HOST="${RAW_REGISTRY_HOST#http://}"
|
|
||||||
REGISTRY_HOST="${REGISTRY_HOST#https://}"
|
|
||||||
REGISTRY_HOST="${REGISTRY_HOST%/}"
|
|
||||||
|
|
||||||
if [ -z "${REGISTRY_HOST}" ]; then
|
|
||||||
echo "Repository variable REGISTRY_HOST resolves to an empty host"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
REPOSITORY_PATH="${RAW_REPOSITORY#/}"
|
|
||||||
IMAGE_REPOSITORY_PATH="$(printf '%s' "$REPOSITORY_PATH" | tr '[:upper:]' '[:lower:]')"
|
|
||||||
IMAGE_NAME="${REGISTRY_HOST}/${IMAGE_REPOSITORY_PATH}"
|
|
||||||
IMAGE_TAG="${RAW_REF_NAME}"
|
|
||||||
{
|
|
||||||
echo "REGISTRY_HOST=${REGISTRY_HOST}"
|
|
||||||
echo "REPOSITORY_PATH=${REPOSITORY_PATH}"
|
|
||||||
echo "IMAGE_REPOSITORY_PATH=${IMAGE_REPOSITORY_PATH}"
|
|
||||||
echo "IMAGE_NAME=${IMAGE_NAME}"
|
|
||||||
echo "IMAGE_TAG=${IMAGE_TAG}"
|
|
||||||
echo "IMAGE_REF=${IMAGE_NAME}:${IMAGE_TAG}"
|
|
||||||
} >> "$GITHUB_ENV"
|
|
||||||
|
|
||||||
- name: Login to Gitea Container Registry
|
|
||||||
env:
|
|
||||||
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
|
|
||||||
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
|
|
||||||
run: |
|
|
||||||
if [ -z "${REGISTRY_HOST:-}" ]; then
|
|
||||||
echo "Missing resolved environment value: REGISTRY_HOST"
|
|
||||||
echo "The previous step should write REGISTRY_HOST into GITHUB_ENV."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "${REGISTRY_USERNAME}" ]; then
|
|
||||||
echo "Missing required repository secret: REGISTRY_USERNAME"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "${REGISTRY_PASSWORD}" ]; then
|
|
||||||
echo "Missing required repository secret: REGISTRY_PASSWORD"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Logging into registry host: ${REGISTRY_HOST}"
|
|
||||||
echo "${REGISTRY_PASSWORD}" | docker login "$REGISTRY_HOST" \
|
|
||||||
--username "${REGISTRY_USERNAME}" \
|
|
||||||
--password-stdin
|
|
||||||
|
|
||||||
- name: Build and Push Image
|
|
||||||
run: |
|
|
||||||
if [ -z "${IMAGE_NAME:-}" ] || [ -z "${IMAGE_TAG:-}" ]; then
|
|
||||||
echo "Missing resolved image metadata: IMAGE_NAME or IMAGE_TAG"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
push_with_retry() {
|
|
||||||
image_ref="$1"
|
|
||||||
attempt=1
|
|
||||||
max_attempts=3
|
|
||||||
|
|
||||||
while [ "$attempt" -le "$max_attempts" ]; do
|
|
||||||
if docker push "$image_ref"; then
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$attempt" -eq "$max_attempts" ]; then
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Push failed for $image_ref (attempt $attempt/$max_attempts); retrying in 10s..."
|
|
||||||
attempt=$((attempt + 1))
|
|
||||||
sleep 10
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
if [ "${IMAGE_TAG}" = "latest" ]; then
|
|
||||||
docker build \
|
|
||||||
--network=host \
|
|
||||||
-f ./Dockerfile \
|
|
||||||
-t "${IMAGE_NAME}:latest" \
|
|
||||||
.
|
|
||||||
push_with_retry "${IMAGE_NAME}:latest"
|
|
||||||
else
|
|
||||||
docker build \
|
|
||||||
--network=host \
|
|
||||||
-f ./Dockerfile \
|
|
||||||
-t "${IMAGE_NAME}:${IMAGE_TAG}" \
|
|
||||||
-t "${IMAGE_NAME}:latest" \
|
|
||||||
.
|
|
||||||
push_with_retry "${IMAGE_NAME}:${IMAGE_TAG}"
|
|
||||||
push_with_retry "${IMAGE_NAME}:latest"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Notify Deploy Server
|
|
||||||
run: |
|
|
||||||
post_deploy_webhook() {
|
|
||||||
label="$1"
|
|
||||||
payload="$2"
|
|
||||||
webhook_url="${{ vars.DEPLOY_WEBHOOK_URL }}"
|
|
||||||
token="${{ secrets.DEPLOY_WEBHOOK_TOKEN }}"
|
|
||||||
|
|
||||||
# Trim whitespace
|
|
||||||
webhook_url=$(echo "$webhook_url" | xargs)
|
|
||||||
|
|
||||||
echo "[$label] Calling webhook: $webhook_url"
|
|
||||||
|
|
||||||
http_code=$(curl -sS -D /tmp/deploy_headers.txt -o /tmp/deploy_response.txt -w "%{http_code}" -X POST "$webhook_url" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-H "Authorization: Bearer $token" \
|
|
||||||
-d "$payload")
|
|
||||||
|
|
||||||
echo "[$label] webhook HTTP status: ${http_code}"
|
|
||||||
if [ "$http_code" -ge 200 ] && [ "$http_code" -lt 300 ]; then
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "[$label] response headers:"
|
|
||||||
cat /tmp/deploy_headers.txt
|
|
||||||
echo "[$label] response body:"
|
|
||||||
cat /tmp/deploy_response.txt
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
PRIMARY_PAYLOAD="{\"image\":\"${IMAGE_REF}\",\"tag\":\"${IMAGE_TAG}\",\"repo\":\"${REPOSITORY_PATH}\"}"
|
|
||||||
FALLBACK_PAYLOAD="{\"image\":\"${IMAGE_REF}\",\"tag\":\"${IMAGE_TAG}\",\"repo\":\"${IMAGE_REPOSITORY_PATH}\"}"
|
|
||||||
|
|
||||||
echo "Deploy webhook target: ${{ vars.DEPLOY_WEBHOOK_URL }}"
|
|
||||||
echo "Deploy payload(primary): image=${IMAGE_REF}, tag=${IMAGE_TAG}, repo=${REPOSITORY_PATH}"
|
|
||||||
if post_deploy_webhook "primary" "$PRIMARY_PAYLOAD"; then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Primary webhook request failed, retrying with lowercase repo path..."
|
|
||||||
echo "Deploy payload(fallback): image=${IMAGE_REF}, tag=${IMAGE_TAG}, repo=${IMAGE_REPOSITORY_PATH}"
|
|
||||||
if post_deploy_webhook "fallback" "$FALLBACK_PAYLOAD"; then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Deploy webhook failed after primary and fallback attempts."
|
|
||||||
exit 1
|
|
||||||
|
|
||||||
deploy-fallback-log:
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
needs: docker-image
|
|
||||||
if: failure()
|
|
||||||
steps:
|
|
||||||
- name: Deployment not triggered
|
|
||||||
run: echo "Image build/push failed, deployment webhook was not called."
|
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ Skills 树是**动态生长的**——工作流不是预置的,而是从实际
|
|||||||
3. 大结果集禁止完整读取,优先采样/截断/按字段读取
|
3. 大结果集禁止完整读取,优先采样/截断/按字段读取
|
||||||
4. 避免直接用 `Read` 或 `cat` 读取结果文件,尤其是大文件;优先用 `head`/`tail`/`rg` 截断查看,或用 Python 只向 stdout 输出精简 JSON,避免大文件冲击 stdin/stdout
|
4. 避免直接用 `Read` 或 `cat` 读取结果文件,尤其是大文件;优先用 `head`/`tail`/`rg` 截断查看,或用 Python 只向 stdout 输出精简 JSON,避免大文件冲击 stdin/stdout
|
||||||
5. 无可用数据时不得编造结果
|
5. 无可用数据时不得编造结果
|
||||||
6. 尽量不使用 `task` 子代理,避免无法观测过程进行人为干预
|
6. 禁止使用 `task` 子代理;当前前端无法观测和干预子代理的具体工作过程
|
||||||
|
|
||||||
## 工作流沉淀(skill_manager)
|
## 工作流沉淀(skill_manager)
|
||||||
|
|
||||||
|
|||||||
+8
-4
@@ -4,7 +4,7 @@
|
|||||||
"workspaces": {
|
"workspaces": {
|
||||||
"": {
|
"": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@opencode-ai/plugin": "^1.16.2",
|
"@opencode-ai/plugin": "1.18.13",
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "^24.7.2",
|
"@types/node": "^24.7.2",
|
||||||
@@ -13,6 +13,8 @@
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
"packages": {
|
"packages": {
|
||||||
|
"@ai-sdk/provider": ["@ai-sdk/provider@3.0.8", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ=="],
|
||||||
|
|
||||||
"@msgpackr-extract/msgpackr-extract-darwin-arm64": ["@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-LCkGo6JDfaBhgST7UpPWgNgLINpcpabaHfyz5OBx75nUYxBsaEPxjnyNjWpeb/xBup/682QnBfRBy2/LvPutZQ=="],
|
"@msgpackr-extract/msgpackr-extract-darwin-arm64": ["@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-LCkGo6JDfaBhgST7UpPWgNgLINpcpabaHfyz5OBx75nUYxBsaEPxjnyNjWpeb/xBup/682QnBfRBy2/LvPutZQ=="],
|
||||||
|
|
||||||
"@msgpackr-extract/msgpackr-extract-darwin-x64": ["@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-zExlW9zUJKZH/tOtVMttwjKa4Xm/3KcNjnE3dPN92uCktwavMxpgCA3MoJK/DOnTWsQgo224OaST27/mPNAf+w=="],
|
"@msgpackr-extract/msgpackr-extract-darwin-x64": ["@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-zExlW9zUJKZH/tOtVMttwjKa4Xm/3KcNjnE3dPN92uCktwavMxpgCA3MoJK/DOnTWsQgo224OaST27/mPNAf+w=="],
|
||||||
@@ -25,9 +27,9 @@
|
|||||||
|
|
||||||
"@msgpackr-extract/msgpackr-extract-win32-x64": ["@msgpackr-extract/msgpackr-extract-win32-x64@3.0.4", "", { "os": "win32", "cpu": "x64" }, "sha512-CmCXPQrkbwExx3j946/PtHWHbYJiCRBRDl4BlkRQcJB/YOwQxJRTpoo7aTsortjgoJ1x7opzTSxn7C+ASSLVjQ=="],
|
"@msgpackr-extract/msgpackr-extract-win32-x64": ["@msgpackr-extract/msgpackr-extract-win32-x64@3.0.4", "", { "os": "win32", "cpu": "x64" }, "sha512-CmCXPQrkbwExx3j946/PtHWHbYJiCRBRDl4BlkRQcJB/YOwQxJRTpoo7aTsortjgoJ1x7opzTSxn7C+ASSLVjQ=="],
|
||||||
|
|
||||||
"@opencode-ai/plugin": ["@opencode-ai/plugin@1.16.2", "", { "dependencies": { "@opencode-ai/sdk": "1.16.2", "effect": "4.0.0-beta.74", "zod": "4.1.8" }, "peerDependencies": { "@opentui/core": ">=0.3.2", "@opentui/keymap": ">=0.3.2", "@opentui/solid": ">=0.3.2" }, "optionalPeers": ["@opentui/core", "@opentui/keymap", "@opentui/solid"] }, "sha512-FaZhVXrbz93xsdGLCtarRDTeqFt8AkLfh8B34tFBj6G4HXVmKSgBwVXmtELKKC+08xMtawBC9hshiMbXryv6cg=="],
|
"@opencode-ai/plugin": ["@opencode-ai/plugin@1.18.13", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@opencode-ai/sdk": "1.18.13", "effect": "4.0.0-beta.83", "zod": "4.1.8" }, "peerDependencies": { "@opentui/core": ">=0.4.5", "@opentui/keymap": ">=0.4.5", "@opentui/solid": ">=0.4.5" }, "optionalPeers": ["@opentui/core", "@opentui/keymap", "@opentui/solid"] }, "sha512-2H9YT80M1PYElpG+lmd/9kGqsNouiJIBCUhLblmgFwoSrB4wyahgkCS6NcFQR/AYXNH4I1Yd3lmQcVaEPu1qNg=="],
|
||||||
|
|
||||||
"@opencode-ai/sdk": ["@opencode-ai/sdk@1.16.2", "", { "dependencies": { "cross-spawn": "7.0.6" } }, "sha512-Z/xZ7q79dYeE0afqIk/yFEcRNGEQFcE+H8ssYivUiy+xGZ1mGwT72jpaQZKBwPn3JH4sRCu4KA2lcktBQfcOjg=="],
|
"@opencode-ai/sdk": ["@opencode-ai/sdk@1.18.13", "", { "dependencies": { "cross-spawn": "7.0.6" } }, "sha512-JY9etiVcu1G/pZjaH2vjK/b8z54ujxaWCD1GziO4ADUhRM6m6zm2332bPGcxEfA6TwweiJfNlK6wVZQ0f/X4KQ=="],
|
||||||
|
|
||||||
"@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
|
"@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
|
||||||
|
|
||||||
@@ -37,7 +39,7 @@
|
|||||||
|
|
||||||
"detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="],
|
"detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="],
|
||||||
|
|
||||||
"effect": ["effect@4.0.0-beta.74", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "fast-check": "^4.8.0", "find-my-way-ts": "^0.1.6", "ini": "^7.0.0", "kubernetes-types": "^1.30.0", "msgpackr": "^2.0.1", "multipasta": "^0.2.7", "toml": "^4.1.1", "uuid": "^14.0.0", "yaml": "^2.9.0" } }, "sha512-Yx+Kh12U+i2FmjwEfKs+ePFmpMd43RPD1oGqc/VraSS9bYzvF0Ff3PojwEFEVEewp8xc92Uxu28gTspU4qyvHA=="],
|
"effect": ["effect@4.0.0-beta.83", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "fast-check": "^4.8.0", "find-my-way-ts": "^0.1.6", "ini": "^7.0.0", "kubernetes-types": "^1.30.0", "msgpackr": "^2.0.1", "multipasta": "^0.2.7", "toml": "^4.1.1", "uuid": "^14.0.0", "yaml": "^2.9.0" } }, "sha512-0wsak8RtgGAr9UWSbVDgJHZcUqMSvicHcvaZv1MbMM7MCGgW4Rn/137J1MHQbwYPcwYGxT/IqehFd+UbYuj78w=="],
|
||||||
|
|
||||||
"fast-check": ["fast-check@4.8.0", "", { "dependencies": { "pure-rand": "^8.0.0" } }, "sha512-GOJ158CUMnN6cSahsv4+ExARvIDuzzinFjkp0E9WtiBa5zcVeLozVkWaE4IzFcc+Y48Wp1EDlUZsXRyAztQcSg=="],
|
"fast-check": ["fast-check@4.8.0", "", { "dependencies": { "pure-rand": "^8.0.0" } }, "sha512-GOJ158CUMnN6cSahsv4+ExARvIDuzzinFjkp0E9WtiBa5zcVeLozVkWaE4IzFcc+Y48Wp1EDlUZsXRyAztQcSg=="],
|
||||||
|
|
||||||
@@ -47,6 +49,8 @@
|
|||||||
|
|
||||||
"isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="],
|
"isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="],
|
||||||
|
|
||||||
|
"json-schema": ["json-schema@0.4.0", "", {}, "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="],
|
||||||
|
|
||||||
"kubernetes-types": ["kubernetes-types@1.30.0", "", {}, "sha512-Dew1okvhM/SQcIa2rcgujNndZwU8VnSapDgdxlYoB84ZlpAD43U6KLAFqYo17ykSFGHNPrg0qry0bP+GJd9v7Q=="],
|
"kubernetes-types": ["kubernetes-types@1.30.0", "", {}, "sha512-Dew1okvhM/SQcIa2rcgujNndZwU8VnSapDgdxlYoB84ZlpAD43U6KLAFqYo17ykSFGHNPrg0qry0bP+GJd9v7Q=="],
|
||||||
|
|
||||||
"msgpackr": ["msgpackr@2.0.2", "", { "optionalDependencies": { "msgpackr-extract": "^3.0.4" } }, "sha512-c5hYOXFbP79Slh6Dzd2wzk+jnV7mX1UxfMYtilnY1NmalXPqG8DGb5cYCMBrW4AsH3zekBBZd4QrKz9NhtvYLQ=="],
|
"msgpackr": ["msgpackr@2.0.2", "", { "optionalDependencies": { "msgpackr-extract": "^3.0.4" } }, "sha512-c5hYOXFbP79Slh6Dzd2wzk+jnV7mX1UxfMYtilnY1NmalXPqG8DGb5cYCMBrW4AsH3zekBBZd4QrKz9NhtvYLQ=="],
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
"typecheck": "tsc --noEmit -p tsconfig.json"
|
"typecheck": "tsc --noEmit -p tsconfig.json"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@opencode-ai/plugin": "^1.16.2"
|
"@opencode-ai/plugin": "1.18.13"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "^24.7.2",
|
"@types/node": "^24.7.2",
|
||||||
|
|||||||
@@ -1,12 +1,8 @@
|
|||||||
import { tool } from "@opencode-ai/plugin";
|
import { tool } from "@opencode-ai/plugin";
|
||||||
import { MemoryStore } from "../../src/memory/store.js";
|
|
||||||
import {
|
|
||||||
getRuntimeSessionContext,
|
|
||||||
setRuntimeSessionContext,
|
|
||||||
} from "../../src/runtime/sessionContext.js";
|
|
||||||
|
|
||||||
const memoryStore = new MemoryStore();
|
const internalBaseUrl =
|
||||||
const initializePromise = memoryStore.initialize();
|
process.env.TJWATER_AGENT_INTERNAL_BASE_URL ?? "http://127.0.0.1:8787";
|
||||||
|
const internalToken = process.env.TJWATER_AGENT_INTERNAL_TOKEN ?? "";
|
||||||
|
|
||||||
export default tool({
|
export default tool({
|
||||||
description:
|
description:
|
||||||
@@ -26,130 +22,31 @@ export default tool({
|
|||||||
content: tool.schema
|
content: tool.schema
|
||||||
.string()
|
.string()
|
||||||
.optional()
|
.optional()
|
||||||
.describe(
|
.describe("The durable fact or preference to remember, written as one concise sentence."),
|
||||||
"The durable fact or preference to remember, written as one concise sentence.",
|
|
||||||
),
|
|
||||||
target_id: tool.schema
|
target_id: tool.schema
|
||||||
.string()
|
.string()
|
||||||
.optional()
|
.optional()
|
||||||
.describe("Stable memory entry id used by replace/remove."),
|
.describe("Stable memory entry id used by replace/remove."),
|
||||||
},
|
},
|
||||||
async execute(args, context) {
|
async execute(args, context) {
|
||||||
await initializePromise;
|
const response = await fetch(
|
||||||
const sessionContext = getRuntimeSessionContext(context.sessionID);
|
`${internalBaseUrl}/internal/tools/memory-manager`,
|
||||||
if (!sessionContext) {
|
{
|
||||||
throw new Error(`session context not found for ${context.sessionID}`);
|
method: "POST",
|
||||||
}
|
headers: {
|
||||||
const scope =
|
"Content-Type": "application/json",
|
||||||
args.scope === "user"
|
"x-agent-internal-token": internalToken,
|
||||||
? "user"
|
|
||||||
: args.scope === "workspace"
|
|
||||||
? "workspace"
|
|
||||||
: null;
|
|
||||||
if (!scope) {
|
|
||||||
return JSON.stringify({
|
|
||||||
ok: true,
|
|
||||||
kind: "memory",
|
|
||||||
decision: "rejected",
|
|
||||||
detail: `unsupported scope: ${args.scope}; use exact keyword 'user' or 'workspace'`,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
if (sessionContext.allowLearningWrite === false && args.action !== "list") {
|
|
||||||
return JSON.stringify({
|
|
||||||
ok: true,
|
|
||||||
kind: "memory",
|
|
||||||
decision: "rejected",
|
|
||||||
detail: "memory writes are disabled for this session",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const scopeKey =
|
|
||||||
scope === "user" ? sessionContext.actorKey : sessionContext.projectKey;
|
|
||||||
if (args.action === "list") {
|
|
||||||
const readScopes = {
|
|
||||||
...(sessionContext.memoryListReadScopes ?? {}),
|
|
||||||
[scope]: true,
|
|
||||||
};
|
|
||||||
setRuntimeSessionContext({
|
|
||||||
...sessionContext,
|
|
||||||
memoryListReadScopes: readScopes,
|
|
||||||
});
|
|
||||||
return JSON.stringify({
|
|
||||||
ok: true,
|
|
||||||
kind: "memory",
|
|
||||||
decision: "accepted",
|
|
||||||
detail: "memory listed",
|
|
||||||
items: await memoryStore.list(scope, scopeKey),
|
|
||||||
target: scope,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (args.action === "add") {
|
|
||||||
if (sessionContext.memoryListReadScopes?.[scope] !== true) {
|
|
||||||
return JSON.stringify({
|
|
||||||
ok: true,
|
|
||||||
kind: "memory",
|
|
||||||
decision: "rejected",
|
|
||||||
detail: `must list ${scope} memory and review existing entries before add`,
|
|
||||||
target: scope,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
const result = await memoryStore.upsert(scope, scopeKey, {
|
|
||||||
content: args.content ?? "",
|
|
||||||
sessionId: sessionContext.clientSessionId,
|
|
||||||
source: "tool",
|
|
||||||
traceId: sessionContext.traceId,
|
|
||||||
});
|
|
||||||
if (!result.entry) {
|
|
||||||
return JSON.stringify({
|
|
||||||
ok: true,
|
|
||||||
kind: "memory",
|
|
||||||
decision: "rejected",
|
|
||||||
detail: "content rejected by persistence policy",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return JSON.stringify({
|
|
||||||
ok: true,
|
|
||||||
kind: "memory",
|
|
||||||
decision: result.changed ? "accepted" : "deduped",
|
|
||||||
detail: result.detail,
|
|
||||||
entry: result.entry,
|
|
||||||
target: scope,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (args.action === "replace") {
|
|
||||||
const result = await memoryStore.replace(
|
|
||||||
scope,
|
|
||||||
scopeKey,
|
|
||||||
args.target_id ?? "",
|
|
||||||
{
|
|
||||||
content: args.content ?? "",
|
|
||||||
sessionId: sessionContext.clientSessionId,
|
|
||||||
source: "tool",
|
|
||||||
traceId: sessionContext.traceId,
|
|
||||||
},
|
},
|
||||||
);
|
body: JSON.stringify({
|
||||||
return JSON.stringify({
|
...args,
|
||||||
ok: true,
|
session_id: context.sessionID,
|
||||||
kind: "memory",
|
}),
|
||||||
decision: result.changed ? "accepted" : "rejected",
|
},
|
||||||
detail: result.detail,
|
|
||||||
target: scope,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const result = await memoryStore.remove(
|
|
||||||
scope,
|
|
||||||
scopeKey,
|
|
||||||
args.target_id ?? "",
|
|
||||||
);
|
);
|
||||||
return JSON.stringify({
|
const text = await response.text();
|
||||||
ok: true,
|
if (!response.ok) {
|
||||||
kind: "memory",
|
throw new Error(text);
|
||||||
decision: result.changed ? "accepted" : "rejected",
|
}
|
||||||
detail: result.detail,
|
return text;
|
||||||
target: scope,
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { tool } from "@opencode-ai/plugin";
|
|||||||
|
|
||||||
export default tool({
|
export default tool({
|
||||||
description:
|
description:
|
||||||
"在前端地图上对 junctions 图层应用分区渲染。使用前必须完成两步:① 准备数据结构(JSON 文件,结构为 { node_area_map: Record<string, string>, area_ids?: string[], area_colors?: Record<string, string> },其中 node_area_map 的 key 是 junction/node id,value 是 area id);② 调用 store_render_ref 将 JSON 文件存储到受控路径,获取 render_ref(格式为 res-...);③ 将 render_ref 传入本工具完成前端渲染。注意:不要先把 ref 内容完整读出再传给前端,也不要直接传本地文件路径。",
|
"在前端地图上对 junctions 图层应用分区渲染。先把包装格式 { metadata, location: { file_path }, data: { node_area_map, area_ids?, area_colors? } } 写入 RESULT_REF_IMPORT_DIR,location.file_path 必须等于文件绝对路径;再调用 store_render_ref 获得 res-... 引用,最后把引用传入本工具。不要读取并转传完整 ref 内容,也不要直接传本地文件路径。",
|
||||||
args: {
|
args: {
|
||||||
reason: tool.schema
|
reason: tool.schema
|
||||||
.string()
|
.string()
|
||||||
|
|||||||
@@ -1,158 +1,67 @@
|
|||||||
import { tool } from "@opencode-ai/plugin";
|
import { tool } from "@opencode-ai/plugin";
|
||||||
|
|
||||||
import { SkillStore } from "../../src/skills/store.js";
|
const internalBaseUrl =
|
||||||
import {
|
process.env.TJWATER_AGENT_INTERNAL_BASE_URL ?? "http://127.0.0.1:8787";
|
||||||
getRuntimeSessionContext,
|
const internalToken = process.env.TJWATER_AGENT_INTERNAL_TOKEN ?? "";
|
||||||
type RuntimeSessionContext,
|
|
||||||
} from "../../src/runtime/sessionContext.js";
|
|
||||||
|
|
||||||
type ToolContextReader = {
|
export default tool({
|
||||||
read(sessionId: string): RuntimeSessionContext | null;
|
description:
|
||||||
};
|
"维护已验证、可复用、非敏感的 workflow 或方法模式。支持 list、write_skill、remove_skill、append_pattern、remove_pattern、write_reference、remove_reference、write_script、remove_script。",
|
||||||
|
args: {
|
||||||
const runtimeContextReader: ToolContextReader = {
|
action: tool.schema
|
||||||
read: getRuntimeSessionContext,
|
.enum([
|
||||||
};
|
"list",
|
||||||
|
"write_skill",
|
||||||
export const createSkillManagerTool = (
|
"remove_skill",
|
||||||
skillStore = new SkillStore(),
|
"append_pattern",
|
||||||
toolContextStore: ToolContextReader = runtimeContextReader,
|
"remove_pattern",
|
||||||
initializePromise: Promise<unknown> = Promise.resolve(),
|
"write_reference",
|
||||||
) =>
|
"remove_reference",
|
||||||
tool({
|
"write_script",
|
||||||
description:
|
"remove_script",
|
||||||
"维护已验证、可复用、非敏感的 workflow 或方法模式。支持 list、write_skill、remove_skill、append_pattern、remove_pattern、write_reference、remove_reference、write_script、remove_script。",
|
])
|
||||||
args: {
|
.describe("Skill maintenance operation."),
|
||||||
action: tool.schema
|
reason: tool.schema
|
||||||
.enum([
|
.string()
|
||||||
"list",
|
.describe("Why this skill maintenance action is justified for future reuse."),
|
||||||
"write_skill",
|
skill_path: tool.schema
|
||||||
"remove_skill",
|
.string()
|
||||||
"append_pattern",
|
.describe(
|
||||||
"remove_pattern",
|
"Target skill directory path relative to .opencode/skills. Use 'workflow' for the workflow index, or '__root__' for the root skills index.",
|
||||||
"write_reference",
|
),
|
||||||
"remove_reference",
|
pattern: tool.schema.string().optional().describe("Pattern text used by append_pattern."),
|
||||||
"write_script",
|
target_id: tool.schema
|
||||||
"remove_script",
|
.string()
|
||||||
])
|
.optional()
|
||||||
.describe("Skill maintenance operation."),
|
.describe("Stable learned pattern id used by remove_pattern."),
|
||||||
reason: tool.schema
|
file_path: tool.schema
|
||||||
.string()
|
.string()
|
||||||
.describe(
|
.optional()
|
||||||
"Why this skill maintenance action is justified for future reuse.",
|
.describe("Asset file path. For references use references/*.md; for scripts use scripts/*.py."),
|
||||||
),
|
content: tool.schema
|
||||||
skill_path: tool.schema
|
.string()
|
||||||
.string()
|
.optional()
|
||||||
.describe(
|
.describe("Content used by write_skill, write_reference, or write_script."),
|
||||||
"Target skill directory path relative to .opencode/skills. Use 'workflow' for the workflow index, or '__root__' for the root skills index.",
|
},
|
||||||
),
|
async execute(args, context) {
|
||||||
pattern: tool.schema
|
const response = await fetch(
|
||||||
.string()
|
`${internalBaseUrl}/internal/tools/skill-manager`,
|
||||||
.optional()
|
{
|
||||||
.describe("Pattern text used by append_pattern."),
|
method: "POST",
|
||||||
target_id: tool.schema
|
headers: {
|
||||||
.string()
|
"Content-Type": "application/json",
|
||||||
.optional()
|
"x-agent-internal-token": internalToken,
|
||||||
.describe("Stable learned pattern id used by remove_pattern."),
|
},
|
||||||
file_path: tool.schema
|
body: JSON.stringify({
|
||||||
.string()
|
...args,
|
||||||
.optional()
|
session_id: context.sessionID,
|
||||||
.describe(
|
}),
|
||||||
"Asset file path. For references use references/*.md; for scripts use scripts/*.py.",
|
},
|
||||||
),
|
);
|
||||||
content: tool.schema
|
const text = await response.text();
|
||||||
.string()
|
if (!response.ok) {
|
||||||
.optional()
|
throw new Error(text);
|
||||||
.describe(
|
}
|
||||||
"Content used by write_skill, write_reference, or write_script.",
|
return text;
|
||||||
),
|
},
|
||||||
},
|
});
|
||||||
async execute(args, context) {
|
|
||||||
await initializePromise;
|
|
||||||
const sessionContext = toolContextStore.read(context.sessionID);
|
|
||||||
if (!sessionContext) {
|
|
||||||
throw new Error(`session context not found for ${context.sessionID}`);
|
|
||||||
}
|
|
||||||
if (
|
|
||||||
sessionContext.allowLearningWrite === false &&
|
|
||||||
args.action !== "list"
|
|
||||||
) {
|
|
||||||
return JSON.stringify({
|
|
||||||
ok: true,
|
|
||||||
kind: "skill",
|
|
||||||
decision: "rejected",
|
|
||||||
detail: "skill writes are disabled for this session",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
if (args.action === "list") {
|
|
||||||
const result = await skillStore.list(args.skill_path);
|
|
||||||
if (!result) {
|
|
||||||
return JSON.stringify({
|
|
||||||
ok: true,
|
|
||||||
kind: "skill",
|
|
||||||
decision: "rejected",
|
|
||||||
detail:
|
|
||||||
"invalid skill_path; expected a relative path under .opencode/skills",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return JSON.stringify({
|
|
||||||
ok: true,
|
|
||||||
kind: "skill",
|
|
||||||
decision: "accepted",
|
|
||||||
detail: "skill listed",
|
|
||||||
references: result.references,
|
|
||||||
scripts: result.scripts,
|
|
||||||
skill_path: result.skillPath,
|
|
||||||
target: result.target,
|
|
||||||
patterns: result.patterns,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const result =
|
|
||||||
args.action === "write_skill"
|
|
||||||
? await skillStore.writeSkill(args.skill_path, args.content ?? "")
|
|
||||||
: args.action === "remove_skill"
|
|
||||||
? await skillStore.removeSkill(args.skill_path)
|
|
||||||
: args.action === "append_pattern"
|
|
||||||
? await skillStore.appendPattern(
|
|
||||||
args.skill_path,
|
|
||||||
args.pattern ?? "",
|
|
||||||
)
|
|
||||||
: args.action === "remove_pattern"
|
|
||||||
? await skillStore.removePattern(
|
|
||||||
args.skill_path,
|
|
||||||
args.target_id ?? "",
|
|
||||||
)
|
|
||||||
: args.action === "write_reference"
|
|
||||||
? await skillStore.writeReference(
|
|
||||||
args.skill_path,
|
|
||||||
args.file_path ?? "",
|
|
||||||
args.content ?? "",
|
|
||||||
)
|
|
||||||
: args.action === "remove_reference"
|
|
||||||
? await skillStore.removeReference(
|
|
||||||
args.skill_path,
|
|
||||||
args.file_path ?? "",
|
|
||||||
)
|
|
||||||
: args.action === "write_script"
|
|
||||||
? await skillStore.writeScript(
|
|
||||||
args.skill_path,
|
|
||||||
args.file_path ?? "",
|
|
||||||
args.content ?? "",
|
|
||||||
)
|
|
||||||
: await skillStore.removeScript(
|
|
||||||
args.skill_path,
|
|
||||||
args.file_path ?? "",
|
|
||||||
);
|
|
||||||
|
|
||||||
return JSON.stringify({
|
|
||||||
ok: true,
|
|
||||||
kind: "skill",
|
|
||||||
decision: result.changed ? "accepted" : "rejected",
|
|
||||||
detail: result.detail,
|
|
||||||
target: result.target,
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
export default createSkillManagerTool();
|
|
||||||
|
|||||||
@@ -3,10 +3,12 @@ import { tool } from "@opencode-ai/plugin";
|
|||||||
const internalBaseUrl =
|
const internalBaseUrl =
|
||||||
process.env.TJWATER_AGENT_INTERNAL_BASE_URL ?? "http://127.0.0.1:8787";
|
process.env.TJWATER_AGENT_INTERNAL_BASE_URL ?? "http://127.0.0.1:8787";
|
||||||
const internalToken = process.env.TJWATER_AGENT_INTERNAL_TOKEN ?? "";
|
const internalToken = process.env.TJWATER_AGENT_INTERNAL_TOKEN ?? "";
|
||||||
|
const importDirectory =
|
||||||
|
process.env.RESULT_REF_IMPORT_DIR ?? "./data/result-imports";
|
||||||
|
|
||||||
export default tool({
|
export default tool({
|
||||||
description:
|
description:
|
||||||
"将本地 JSON 渲染数据文件存储到受控路径,返回可供 render_junctions 使用的 render_ref(res-...)。前置步骤:先准备好符合 render_junctions 数据结构的 JSON 文件 { node_area_map, area_ids?, area_colors? },写入本地路径后再调用本工具传入该路径,获取 render_ref 后传给 render_junctions 完成前端渲染。",
|
`导入 ${importDirectory} 下的受控 JSON 包装文件并返回 render_ref。文件必须是 { metadata: object, location: { file_path: string }, data: { node_area_map, area_ids?, area_colors? } },location.file_path 必须与传入的绝对路径完全一致。只接受该目录内的真实文件,不接受目录外路径或指向目录外的符号链接。`,
|
||||||
args: {
|
args: {
|
||||||
reason: tool.schema
|
reason: tool.schema
|
||||||
.string()
|
.string()
|
||||||
@@ -16,7 +18,7 @@ export default tool({
|
|||||||
file_path: tool.schema
|
file_path: tool.schema
|
||||||
.string()
|
.string()
|
||||||
.describe(
|
.describe(
|
||||||
"本地 JSON 文件的绝对路径,内容为 render_junctions 所需的数据结构 { node_area_map, area_ids?, area_colors? }。",
|
`位于 ${importDirectory} 内的包装 JSON 文件绝对路径。必须包含 metadata、location.file_path 和 data;data 才是 render_junctions 使用的 { node_area_map, area_ids?, area_colors? }。`,
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
async execute(args, context) {
|
async execute(args, context) {
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ export default tool({
|
|||||||
command: tool.schema
|
command: tool.schema
|
||||||
.string()
|
.string()
|
||||||
.describe(
|
.describe(
|
||||||
"tjwater-cli 子命令,不含二进制路径。示例:'project list'、'data timeseries realtime links --start-time 2025-01-01T00:00:00+08:00 --end-time 2025-01-01T01:00:00+08:00'",
|
"tjwater-cli 子命令,不含二进制路径。示例:'data scheme list'、'data timeseries realtime links --start-time 2025-01-01T00:00:00+08:00 --end-time 2025-01-01T01:00:00+08:00'",
|
||||||
),
|
),
|
||||||
timeout: tool.schema
|
timeout: tool.schema
|
||||||
.number()
|
.number()
|
||||||
|
|||||||
+7
-10
@@ -1,4 +1,4 @@
|
|||||||
FROM smanx/opencode:latest AS base
|
FROM smanx/opencode:1.18.13@sha256:b976acda21efffacd44abd7847dac7d646910dbaa477d1877e2881b39cf22a91 AS base
|
||||||
USER root
|
USER root
|
||||||
ARG UBUNTU_APT_MIRROR=
|
ARG UBUNTU_APT_MIRROR=
|
||||||
ARG PYPI_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple
|
ARG PYPI_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple
|
||||||
@@ -58,32 +58,29 @@ WORKDIR /app
|
|||||||
|
|
||||||
COPY --from=deps /app/node_modules ./node_modules
|
COPY --from=deps /app/node_modules ./node_modules
|
||||||
COPY --from=deps /app/.opencode/node_modules ./.opencode/node_modules
|
COPY --from=deps /app/.opencode/node_modules ./.opencode/node_modules
|
||||||
|
COPY package.json bun.lock ./
|
||||||
COPY tsconfig.json opencode.json README.md .gitignore ./
|
COPY tsconfig.json opencode.json README.md .gitignore ./
|
||||||
COPY src ./src
|
COPY src ./src
|
||||||
COPY cli ./cli
|
COPY cli ./cli
|
||||||
COPY .opencode ./.opencode
|
COPY .opencode ./.opencode
|
||||||
RUN bun run check
|
RUN bun run check
|
||||||
|
|
||||||
FROM base AS runner
|
FROM build AS runner
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
ENV NODE_ENV=production
|
ENV NODE_ENV=production
|
||||||
ENV HOST=0.0.0.0
|
ENV HOST=0.0.0.0
|
||||||
ENV PORT=8787
|
ENV PORT=8787
|
||||||
|
ENV OPENCODE_HOST=127.0.0.1
|
||||||
|
ENV OPENCODE_HOSTNAME=127.0.0.1
|
||||||
ENV TJWATER_CLI_PATH=./cli/tjwater-cli
|
ENV TJWATER_CLI_PATH=./cli/tjwater-cli
|
||||||
|
|
||||||
COPY --from=deps /app/node_modules ./node_modules
|
|
||||||
COPY --from=deps /app/.opencode/node_modules ./.opencode/node_modules
|
|
||||||
COPY package.json bun.lock ./
|
|
||||||
COPY tsconfig.json opencode.json .gitignore ./
|
|
||||||
COPY src ./src
|
|
||||||
COPY .opencode ./.opencode
|
|
||||||
COPY cli ./cli
|
|
||||||
|
|
||||||
COPY entrypoint.sh /entrypoint.sh
|
COPY entrypoint.sh /entrypoint.sh
|
||||||
RUN chmod +x /entrypoint.sh ./cli/tjwater-cli
|
RUN chmod +x /entrypoint.sh ./cli/tjwater-cli
|
||||||
|
|
||||||
ENTRYPOINT ["/entrypoint.sh"]
|
ENTRYPOINT ["/entrypoint.sh"]
|
||||||
|
|
||||||
EXPOSE 8787
|
EXPOSE 8787
|
||||||
|
HEALTHCHECK --interval=30s --timeout=5s --start-period=60s --retries=3 \
|
||||||
|
CMD curl --fail --silent --show-error "http://127.0.0.1:${PORT}/health" >/dev/null || exit 1
|
||||||
CMD ["bun", "src/server.ts"]
|
CMD ["bun", "src/server.ts"]
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
## 主要能力
|
## 主要能力
|
||||||
|
|
||||||
- 提供 `POST /api/v1/agent/sessions/{session_id}/runs` SSE 聊天接口。
|
- 提供 `POST /api/v1/agent/sessions/{session_id}/runs` SSE 聊天接口。
|
||||||
- 支持 embedded OpenCode 运行时,也可连接外部 OpenCode server。
|
- 以内嵌模式启动并预热 OpenCode 运行时。
|
||||||
- 管理前端 `session_id` 与 OpenCode session 的映射。
|
- 管理前端 `session_id` 与 OpenCode session 的映射。
|
||||||
- 在服务端保存当前会话的用户 token、项目、network 和 trace 上下文。
|
- 在服务端保存当前会话的用户 token、项目、network 和 trace 上下文。
|
||||||
- 通过 `.opencode/tools` 和 MCP 工具驱动地图定位、图表、SCADA、历史数据和业务 API 调用。
|
- 通过 `.opencode/tools` 和 MCP 工具驱动地图定位、图表、SCADA、历史数据和业务 API 调用。
|
||||||
@@ -20,6 +20,7 @@ src/chat/ 聊天流和 SSE 事件适配
|
|||||||
src/runtime/ OpenCode 运行时管理
|
src/runtime/ OpenCode 运行时管理
|
||||||
src/session/ 会话映射和运行上下文
|
src/session/ 会话映射和运行上下文
|
||||||
src/mcp/ MCP 服务与工具桥接
|
src/mcp/ MCP 服务与工具桥接
|
||||||
|
cli/ Agent 使用的 TypeScript 后端 API CLI
|
||||||
.opencode/agents/ Agent prompt 和模型行为配置
|
.opencode/agents/ Agent prompt 和模型行为配置
|
||||||
.opencode/tools/ OpenCode 自定义工具
|
.opencode/tools/ OpenCode 自定义工具
|
||||||
.opencode/skills/ 可复用分析工作流
|
.opencode/skills/ 可复用分析工作流
|
||||||
@@ -39,6 +40,10 @@ bun run dev
|
|||||||
|
|
||||||
`bun install` 会通过 `postinstall` 安装 `.opencode` 子目录依赖。`bun run dev` 以 watch 模式启动 `src/server.ts`,修改 `src/**`、`.opencode/**`、`opencode.json` 或 `.local.env` 后会自动重启。
|
`bun install` 会通过 `postinstall` 安装 `.opencode` 子目录依赖。`bun run dev` 以 watch 模式启动 `src/server.ts`,修改 `src/**`、`.opencode/**`、`opencode.json` 或 `.local.env` 后会自动重启。
|
||||||
|
|
||||||
|
`cli/tjwater-cli` 是当前唯一的 TJWater 业务 CLI 入口,由 Bun 直接执行
|
||||||
|
`cli/tjwater-cli.ts` 及 `cli/src/` 源码,并随 Agent 镜像一起交付,不需要
|
||||||
|
Python 或 PyInstaller 构建步骤。
|
||||||
|
|
||||||
## 常用命令
|
## 常用命令
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@@ -60,23 +65,33 @@ docker build -t tjwater-agent:local .
|
|||||||
|
|
||||||
## 运行模式
|
## 运行模式
|
||||||
|
|
||||||
Embedded 模式由服务进程拉起本机 OpenCode:
|
当前运行时使用 OpenCode 稳定版 1.x CLI,并通过稳定版 SDK 的 `@opencode-ai/sdk/v2` HTTP 客户端访问运行时;这与 `opencode2` 及 `@opencode-ai/client` 的 2.0 beta 运行时不同。Embedded 模式由服务进程拉起本机 OpenCode:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
OPENCODE_MODE=embedded
|
OPENCODE_MODE=embedded
|
||||||
TJWATER_API_BASE_URL=http://127.0.0.1:8000
|
TJWATER_API_BASE_URL=http://127.0.0.1:8000
|
||||||
```
|
```
|
||||||
|
|
||||||
Client 模式连接外部 OpenCode server:
|
当前仅支持 Embedded 模式,不支持连接外部 OpenCode server。
|
||||||
|
|
||||||
```bash
|
## 认证续期与学习工具
|
||||||
OPENCODE_MODE=client
|
|
||||||
OPENCODE_CLIENT_BASE_URL=http://127.0.0.1:4096
|
后端工具调用遇到即将过期的 access token 或首次 `401` 时,Agent 会通过当前 SSE 流发送 `credential_refresh_required`。前端使用服务端保存的 Keycloak refresh token 强制换取新 access token,再调用 `POST /api/v1/agent/sessions/{session_id}/credential-refreshes` 唤醒原工具调用。等待上限为 30 秒,同一会话的并发请求合并为一次续期,原调用最多重试一次;`403` 不触发续期。
|
||||||
TJWATER_API_BASE_URL=http://127.0.0.1:8000
|
|
||||||
```
|
`memory_manager` 和 `skill_manager` 在 OpenCode 侧只保留内部 HTTP 桥,读取会话上下文和持久化数据的逻辑统一在 Agent 主进程中执行。长期记忆、自动学习和显式工具写入因此共享同一组 `MemoryStore`、`SkillStore` 和运行时会话上下文。
|
||||||
|
|
||||||
本地可使用 `.local.env` 保存开发配置;系统环境变量优先级更高。
|
本地可使用 `.local.env` 保存开发配置;系统环境变量优先级更高。
|
||||||
|
|
||||||
|
服务会在 HTTP 端口开始监听前完成 OpenCode 健康检查、临时会话创建和工具目录加载。`GET /health` 返回 `ready: true` 与 `warmed_up: true` 时,表示冷启动预热已经完成。开发环境会输出各预热阶段的耗时。
|
||||||
|
|
||||||
|
`opencode.json` 已启用 `experimental.continue_loop_on_deny`。用户拒绝权限请求后,OpenCode V1 会把拒绝结果交还给 Agent,让其尝试无需该权限的替代方案,而不是直接结束本轮执行。
|
||||||
|
|
||||||
|
前端提供三种整体权限模式:“请求批准”只执行 OpenCode 明确允许的白名单,其他权限请求逐次交给用户确认;“自动批准”额外自动放行低风险业务工具,其他请求仍需确认;“始终允许”自动放行当前对话中所有未被 OpenCode 明确禁止的权限请求。自动放行统一使用单次批准,切换整体模式后立即恢复对应策略,不会写入持久授权。
|
||||||
|
|
||||||
|
单次权限请求支持“允许一次”“保存授权”和“拒绝”。“保存授权”使用 OpenCode 的 `always` 回复,仅保存 OpenCode 为本次请求建议的权限范围,并只在当前 OpenCode 会话内生效。外部目录以及 `.env`、`data/`、`logs/` 路径仍由静态配置明确禁止,三种整体模式都不能绕过这些拒绝规则。
|
||||||
|
|
||||||
|
`store_render_ref` 只会从 `RESULT_REF_IMPORT_DIR`(默认 `./data/result-imports`)导入包装格式 JSON。文件必须包含 `metadata`、`location.file_path` 和 `data`,且真实路径不能越出导入目录;单文件默认上限为 64 MiB,成功导入后源包装文件会被删除。
|
||||||
|
|
||||||
## 配置与安全
|
## 配置与安全
|
||||||
|
|
||||||
不要提交 `.env`、`.local.env`、`data/`、`logs/`、会话记录、模型输出、访问令牌或 `node_modules/`。部署凭据、镜像仓库账号和 webhook 地址应放在 Gitea secrets 或部署环境变量中。
|
不要提交 `.env`、`.local.env`、`data/`、`logs/`、会话记录、模型输出、访问令牌或 `node_modules/`。部署凭据、镜像仓库账号和 webhook 地址应放在 Gitea secrets 或部署环境变量中。
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
"": {
|
"": {
|
||||||
"name": "tjwater-agent",
|
"name": "tjwater-agent",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@opencode-ai/sdk": "^1.16.2",
|
"@opencode-ai/sdk": "1.18.13",
|
||||||
"cors": "^2.8.5",
|
"cors": "^2.8.5",
|
||||||
"dotenv": "^17.2.3",
|
"dotenv": "^17.2.3",
|
||||||
"express": "^4.21.2",
|
"express": "^4.21.2",
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
"packages": {
|
"packages": {
|
||||||
"@asteasolutions/zod-to-openapi": ["@asteasolutions/zod-to-openapi@7.3.4", "", { "dependencies": { "openapi3-ts": "^4.1.2" }, "peerDependencies": { "zod": "^3.20.2" } }, "sha512-/2rThQ5zPi9OzVwes6U7lK1+Yvug0iXu25olp7S0XsYmOqnyMfxH7gdSQjn/+DSOHRg7wnotwGJSyL+fBKdnEA=="],
|
"@asteasolutions/zod-to-openapi": ["@asteasolutions/zod-to-openapi@7.3.4", "", { "dependencies": { "openapi3-ts": "^4.1.2" }, "peerDependencies": { "zod": "^3.20.2" } }, "sha512-/2rThQ5zPi9OzVwes6U7lK1+Yvug0iXu25olp7S0XsYmOqnyMfxH7gdSQjn/+DSOHRg7wnotwGJSyL+fBKdnEA=="],
|
||||||
|
|
||||||
"@opencode-ai/sdk": ["@opencode-ai/sdk@1.16.2", "", { "dependencies": { "cross-spawn": "7.0.6" } }, "sha512-Z/xZ7q79dYeE0afqIk/yFEcRNGEQFcE+H8ssYivUiy+xGZ1mGwT72jpaQZKBwPn3JH4sRCu4KA2lcktBQfcOjg=="],
|
"@opencode-ai/sdk": ["@opencode-ai/sdk@1.18.13", "", { "dependencies": { "cross-spawn": "7.0.6" } }, "sha512-JY9etiVcu1G/pZjaH2vjK/b8z54ujxaWCD1GziO4ADUhRM6m6zm2332bPGcxEfA6TwweiJfNlK6wVZQ0f/X4KQ=="],
|
||||||
|
|
||||||
"@pinojs/redact": ["@pinojs/redact@0.4.0", "", {}, "sha512-k2ENnmBugE/rzQfEcdWHcCY+/FM3VLzH9cYEsbdsoqrvzAKRhUZeRNhAZvB8OitQJ1TBed3yqWtdjzS6wJKBwg=="],
|
"@pinojs/redact": ["@pinojs/redact@0.4.0", "", {}, "sha512-k2ENnmBugE/rzQfEcdWHcCY+/FM3VLzH9cYEsbdsoqrvzAKRhUZeRNhAZvB8OitQJ1TBed3yqWtdjzS6wJKBwg=="],
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,10 @@ import { resolveScheme } from "../core/runtime.js";
|
|||||||
import { parseTime } from "../core/time.js";
|
import { parseTime } from "../core/time.js";
|
||||||
import type { HandlerMap, RuntimeContext } from "../core/types.js";
|
import type { HandlerMap, RuntimeContext } from "../core/types.js";
|
||||||
|
|
||||||
|
function backendElementType(type: ElementType): "link" | "node" {
|
||||||
|
return type === "pipe" ? "link" : "node";
|
||||||
|
}
|
||||||
|
|
||||||
function rangeGet(ctx: RuntimeContext, argv: string[], summary: string, path: string): Promise<void> {
|
function rangeGet(ctx: RuntimeContext, argv: string[], summary: string, path: string): Promise<void> {
|
||||||
const { values } = parseOptions(argv);
|
const { values } = parseOptions(argv);
|
||||||
return emitApi(ctx, summary, {
|
return emitApi(ctx, summary, {
|
||||||
@@ -18,10 +22,11 @@ function rangeGet(ctx: RuntimeContext, argv: string[], summary: string, path: st
|
|||||||
|
|
||||||
function realtimeByIdTime(ctx: RuntimeContext, argv: string[]): Promise<void> {
|
function realtimeByIdTime(ctx: RuntimeContext, argv: string[]): Promise<void> {
|
||||||
const { values } = parseOptions(argv);
|
const { values } = parseOptions(argv);
|
||||||
|
const type = validateChoice(requiredString(values, "type"), ["pipe", "junction"] as const, "--type");
|
||||||
return emitApi(ctx, "读取实时模拟数据成功", {
|
return emitApi(ctx, "读取实时模拟数据成功", {
|
||||||
method: "GET",
|
method: "GET",
|
||||||
path: "/timeseries/realtime/simulation-results",
|
path: "/timeseries/realtime/simulation-results",
|
||||||
params: { id: requiredString(values, "id"), type: validateChoice(requiredString(values, "type"), ["pipe", "junction"] as const, "--type"), query_time: parseTime(requiredString(values, "time"), "--time") },
|
params: { id: requiredString(values, "id"), type: backendElementType(type), query_time: parseTime(requiredString(values, "time"), "--time") },
|
||||||
requireProject: true,
|
requireProject: true,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -32,7 +37,7 @@ function realtimeByTimeProperty(ctx: RuntimeContext, argv: string[]): Promise<vo
|
|||||||
return emitApi(ctx, "读取实时属性聚合数据成功", {
|
return emitApi(ctx, "读取实时属性聚合数据成功", {
|
||||||
method: "GET",
|
method: "GET",
|
||||||
path: "/timeseries/realtime/records",
|
path: "/timeseries/realtime/records",
|
||||||
params: { type, query_time: parseTime(requiredString(values, "time"), "--time"), property: validateChoice(requiredString(values, "property"), fieldsFor(type), "--property") },
|
params: { type: backendElementType(type), query_time: parseTime(requiredString(values, "time"), "--time"), property: validateChoice(requiredString(values, "property"), fieldsFor(type), "--property") },
|
||||||
requireProject: true,
|
requireProject: true,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -76,7 +81,7 @@ function schemeSimulation(ctx: RuntimeContext, argv: string[]): Promise<void> {
|
|||||||
scheme_name: resolveScheme(ctx, optionalString(values, "scheme"), true),
|
scheme_name: resolveScheme(ctx, optionalString(values, "scheme"), true),
|
||||||
scheme_type: optionalString(values, "scheme-type") || "simulation",
|
scheme_type: optionalString(values, "scheme-type") || "simulation",
|
||||||
query_time: parseTime(requiredString(values, "time"), "--time"),
|
query_time: parseTime(requiredString(values, "time"), "--time"),
|
||||||
type,
|
type: backendElementType(type),
|
||||||
};
|
};
|
||||||
if (query === "by-id-time") {
|
if (query === "by-id-time") {
|
||||||
params.id = requiredString(values, "id");
|
params.id = requiredString(values, "id");
|
||||||
|
|||||||
@@ -1011,8 +1011,10 @@
|
|||||||
"type": "string",
|
"type": "string",
|
||||||
"enum": [
|
"enum": [
|
||||||
"request",
|
"request",
|
||||||
|
"auto",
|
||||||
"always"
|
"always"
|
||||||
]
|
],
|
||||||
|
"description": "request forwards approval prompts; auto approves only the low-risk allowlist; always approves every prompt not explicitly denied by OpenCode."
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
@@ -1386,6 +1388,155 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"/api/v1/agent/sessions/{session_id}/credential-refreshes": {
|
||||||
|
"post": {
|
||||||
|
"operationId": "post_sessions_session_id_credential_refreshes",
|
||||||
|
"tags": [
|
||||||
|
"Agent"
|
||||||
|
],
|
||||||
|
"security": [
|
||||||
|
{
|
||||||
|
"bearerAuth": []
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"summary": "Resume a waiting agent tool call with refreshed credentials",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"schema": {
|
||||||
|
"type": "string",
|
||||||
|
"maxLength": 128
|
||||||
|
},
|
||||||
|
"required": true,
|
||||||
|
"name": "session_id",
|
||||||
|
"in": "path"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"requestBody": {
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"request_id": {
|
||||||
|
"type": "string",
|
||||||
|
"minLength": 1,
|
||||||
|
"maxLength": 128
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"required": [
|
||||||
|
"request_id"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"responses": {
|
||||||
|
"202": {
|
||||||
|
"description": "Successful response",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"type": "object",
|
||||||
|
"additionalProperties": {
|
||||||
|
"nullable": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"400": {
|
||||||
|
"description": "Invalid request",
|
||||||
|
"content": {
|
||||||
|
"application/problem+json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ProblemDetails"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"401": {
|
||||||
|
"description": "Authentication required",
|
||||||
|
"content": {
|
||||||
|
"application/problem+json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ProblemDetails"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"403": {
|
||||||
|
"description": "Insufficient permission",
|
||||||
|
"content": {
|
||||||
|
"application/problem+json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ProblemDetails"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"404": {
|
||||||
|
"description": "Resource not found",
|
||||||
|
"content": {
|
||||||
|
"application/problem+json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ProblemDetails"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"409": {
|
||||||
|
"description": "Resource conflict",
|
||||||
|
"content": {
|
||||||
|
"application/problem+json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ProblemDetails"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"422": {
|
||||||
|
"description": "Validation error",
|
||||||
|
"content": {
|
||||||
|
"application/problem+json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ProblemDetails"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"500": {
|
||||||
|
"description": "Internal server error",
|
||||||
|
"content": {
|
||||||
|
"application/problem+json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ProblemDetails"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"502": {
|
||||||
|
"description": "Upstream dependency error",
|
||||||
|
"content": {
|
||||||
|
"application/problem+json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ProblemDetails"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"503": {
|
||||||
|
"description": "Dependency unavailable",
|
||||||
|
"content": {
|
||||||
|
"application/problem+json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ProblemDetails"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"/api/v1/agent/sessions/{session_id}/permission-responses": {
|
"/api/v1/agent/sessions/{session_id}/permission-responses": {
|
||||||
"post": {
|
"post": {
|
||||||
"operationId": "post_sessions_session_id_permission_responses",
|
"operationId": "post_sessions_session_id_permission_responses",
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
"contracts": {
|
"contracts": {
|
||||||
"agent": {
|
"agent": {
|
||||||
"file": "agent-v1.openapi.json",
|
"file": "agent-v1.openapi.json",
|
||||||
"sha256": "7699d0b59d2710f5179c3880fa9f7de90dee09239718c86ed9ff2ce12e6f4259"
|
"sha256": "94bd8914597c56b6429160e8c556993ac0617ad079de2980a4b6cb9fdf89c039"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,59 @@ import { fileURLToPath } from "node:url";
|
|||||||
import { dirname, join, resolve } from "node:path";
|
import { dirname, join, resolve } from "node:path";
|
||||||
|
|
||||||
const cliPath = resolve(dirname(fileURLToPath(import.meta.url)), "../../cli/tjwater-cli");
|
const cliPath = resolve(dirname(fileURLToPath(import.meta.url)), "../../cli/tjwater-cli");
|
||||||
const pythonCliCwd = resolve(dirname(fileURLToPath(import.meta.url)), "../../../TJWaterServerBinary/cli");
|
|
||||||
|
const visibleCommandPaths = [
|
||||||
|
"analysis age",
|
||||||
|
"analysis burst",
|
||||||
|
"analysis burst-detection detect",
|
||||||
|
"analysis burst-detection schemes get",
|
||||||
|
"analysis burst-detection schemes list",
|
||||||
|
"analysis contaminant",
|
||||||
|
"analysis flushing",
|
||||||
|
"analysis leakage identify",
|
||||||
|
"analysis leakage schemes get",
|
||||||
|
"analysis leakage schemes list",
|
||||||
|
"analysis sensor-placement kmeans",
|
||||||
|
"analysis valve",
|
||||||
|
"component option get",
|
||||||
|
"component option schema",
|
||||||
|
"data scada get",
|
||||||
|
"data scada list",
|
||||||
|
"data scheme get",
|
||||||
|
"data scheme list",
|
||||||
|
"data scheme schema",
|
||||||
|
"data timeseries composite",
|
||||||
|
"data timeseries composite pipeline-health",
|
||||||
|
"data timeseries realtime links",
|
||||||
|
"data timeseries realtime nodes",
|
||||||
|
"data timeseries realtime simulation-by-id-time",
|
||||||
|
"data timeseries realtime simulation-by-time-property",
|
||||||
|
"data timeseries scada query",
|
||||||
|
"data timeseries scheme links",
|
||||||
|
"data timeseries scheme node-field",
|
||||||
|
"data timeseries scheme simulation",
|
||||||
|
"network get-all-pipes-properties",
|
||||||
|
"network get-all-pumps-properties",
|
||||||
|
"network get-all-reservoirs-properties",
|
||||||
|
"network get-all-tanks-properties",
|
||||||
|
"network get-all-valves-properties",
|
||||||
|
"network get-junction-properties",
|
||||||
|
"network get-pipe-properties",
|
||||||
|
"network get-pump-properties",
|
||||||
|
"network get-reservoir-properties",
|
||||||
|
"network get-tank-properties",
|
||||||
|
"network get-valve-properties",
|
||||||
|
"simulation run",
|
||||||
|
];
|
||||||
|
|
||||||
|
const hiddenCommandPaths = [
|
||||||
|
"analysis burst-location locate",
|
||||||
|
"analysis burst-location schemes get",
|
||||||
|
"analysis burst-location schemes list",
|
||||||
|
"analysis risk network",
|
||||||
|
"analysis risk pipe-history",
|
||||||
|
"analysis risk pipe-now",
|
||||||
|
];
|
||||||
|
|
||||||
function runCommand(command, args, input, options = {}) {
|
function runCommand(command, args, input, options = {}) {
|
||||||
return new Promise((resolveRun, reject) => {
|
return new Promise((resolveRun, reject) => {
|
||||||
@@ -35,10 +87,6 @@ function runCli(args, input) {
|
|||||||
return runCommand(cliPath, args, input);
|
return runCommand(cliPath, args, input);
|
||||||
}
|
}
|
||||||
|
|
||||||
function runPythonCli(args, input) {
|
|
||||||
return runCommand("python", ["-m", "tjwater_cli", ...args], input, { cwd: pythonCliCwd });
|
|
||||||
}
|
|
||||||
|
|
||||||
function parseJsonResult(result) {
|
function parseJsonResult(result) {
|
||||||
return JSON.parse(result.stdout);
|
return JSON.parse(result.stdout);
|
||||||
}
|
}
|
||||||
@@ -118,74 +166,31 @@ test("emits structured JSON help compatible with tjwater-cli/v1", async () => {
|
|||||||
assert.equal(payload.usage, "tjwater-cli simulation run --start-time <START_TIME> --duration <DURATION>");
|
assert.equal(payload.usage, "tjwater-cli simulation run --start-time <START_TIME> --duration <DURATION>");
|
||||||
});
|
});
|
||||||
|
|
||||||
test("matches Python CLI help discovery and hidden command behavior", async () => {
|
test("discovers every visible command and keeps internal commands hidden", async () => {
|
||||||
for (const args of [["help"], ["help", "analysis"]]) {
|
const rootResult = await runCli(["help"]);
|
||||||
const [nodeResult, pythonResult] = await Promise.all([runCli(args), runPythonCli(args)]);
|
assert.equal(rootResult.exitCode, 0, rootResult.stderr);
|
||||||
assert.equal(nodeResult.exitCode, pythonResult.exitCode);
|
assert.deepEqual(
|
||||||
assert.deepEqual(parseJsonResult(nodeResult), parseJsonResult(pythonResult));
|
parseJsonResult(rootResult).commands.map(({ command }) => command),
|
||||||
|
["analysis", "component", "data", "network", "simulation"],
|
||||||
|
);
|
||||||
|
|
||||||
|
for (const command of visibleCommandPaths) {
|
||||||
|
const result = await runCli(["help", ...command.split(" ")]);
|
||||||
|
assert.equal(result.exitCode, 0, `${command}: ${result.stderr}`);
|
||||||
|
const payload = parseJsonResult(result);
|
||||||
|
assert.equal(payload.ok, true, command);
|
||||||
|
assert.equal(payload.command, command, command);
|
||||||
|
assert.equal(payload.schema_version, "tjwater-cli/v1", command);
|
||||||
|
assert.ok(payload.usage, `${command}: missing usage`);
|
||||||
|
assert.ok(payload.examples.length > 0, `${command}: missing examples`);
|
||||||
}
|
}
|
||||||
|
|
||||||
const [nodeLeaf, pythonLeaf] = await Promise.all([
|
for (const command of hiddenCommandPaths) {
|
||||||
runCli(["help", "simulation", "run"]),
|
const result = await runCli(["help", ...command.split(" ")]);
|
||||||
runPythonCli(["help", "simulation", "run"]),
|
assert.equal(result.exitCode, 0, `${command}: ${result.stderr}`);
|
||||||
]);
|
const payload = parseJsonResult(result);
|
||||||
assert.equal(nodeLeaf.exitCode, pythonLeaf.exitCode);
|
assert.equal(payload.ok, false, command);
|
||||||
const nodePayload = parseJsonResult(nodeLeaf);
|
assert.equal(payload.error.code, "COMMAND_NOT_FOUND", command);
|
||||||
const pythonPayload = parseJsonResult(pythonLeaf);
|
|
||||||
assert.equal(nodePayload.ok, pythonPayload.ok);
|
|
||||||
assert.equal(nodePayload.schema_version, pythonPayload.schema_version);
|
|
||||||
assert.equal(nodePayload.command, pythonPayload.command);
|
|
||||||
assert.equal(nodePayload.summary, pythonPayload.summary);
|
|
||||||
assert.equal(nodePayload.usage, pythonPayload.usage);
|
|
||||||
assert.deepEqual(nodePayload.options.map(({ name, required, repeated }) => ({ name, required, repeated })), pythonPayload.options.map(({ name, required, repeated }) => ({ name, required, repeated })));
|
|
||||||
assert.deepEqual(nodePayload.examples, pythonPayload.examples);
|
|
||||||
assert.deepEqual(nodePayload.next_commands, pythonPayload.next_commands);
|
|
||||||
|
|
||||||
const [nodeHidden, pythonHidden] = await Promise.all([
|
|
||||||
runCli(["help", "analysis", "risk"]),
|
|
||||||
runPythonCli(["help", "analysis", "risk"]),
|
|
||||||
]);
|
|
||||||
assert.equal(nodeHidden.exitCode, pythonHidden.exitCode);
|
|
||||||
const nodeError = parseJsonResult(nodeHidden);
|
|
||||||
const pythonError = parseJsonResult(pythonHidden);
|
|
||||||
delete nodeError.metadata.generated_at;
|
|
||||||
delete pythonError.metadata.generated_at;
|
|
||||||
assert.deepEqual(nodeError, pythonError);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("matches Python CLI leaf help for every visible command", async () => {
|
|
||||||
const listResult = await runCommand(
|
|
||||||
"python",
|
|
||||||
[
|
|
||||||
"-c",
|
|
||||||
"from tjwater_cli.registry import COMMAND_DOCS, is_hidden_path\nimport json\nprint(json.dumps([' '.join(path) for path in COMMAND_DOCS if not is_hidden_path(path)], ensure_ascii=False))",
|
|
||||||
],
|
|
||||||
undefined,
|
|
||||||
{ cwd: pythonCliCwd },
|
|
||||||
);
|
|
||||||
assert.equal(listResult.exitCode, 0, listResult.stderr);
|
|
||||||
const commands = JSON.parse(listResult.stdout);
|
|
||||||
|
|
||||||
for (const command of commands) {
|
|
||||||
const args = ["help", ...command.split(" ")];
|
|
||||||
const [nodeResult, pythonResult] = await Promise.all([runCli(args), runPythonCli(args)]);
|
|
||||||
assert.equal(nodeResult.exitCode, pythonResult.exitCode, command);
|
|
||||||
|
|
||||||
const nodePayload = parseJsonResult(nodeResult);
|
|
||||||
const pythonPayload = parseJsonResult(pythonResult);
|
|
||||||
const comparable = (payload) => ({
|
|
||||||
command: payload.command,
|
|
||||||
summary: payload.summary,
|
|
||||||
usage: payload.usage,
|
|
||||||
examples: payload.examples,
|
|
||||||
next_commands: payload.next_commands,
|
|
||||||
options: (payload.options ?? []).map(({ name, required, repeated }) => ({
|
|
||||||
name,
|
|
||||||
required,
|
|
||||||
repeated,
|
|
||||||
})),
|
|
||||||
});
|
|
||||||
assert.deepEqual(comparable(nodePayload), comparable(pythonPayload), command);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -262,7 +267,27 @@ test("uses project scoped headers for realtime data commands", async () => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
test("matches Python CLI backend request shape for every command and key variants", async () => {
|
test("maps CLI pipe and junction types to backend link and node types", async () => {
|
||||||
|
const server = await startJsonServer({ accepted: true });
|
||||||
|
const auth = { server: server.url, access_token: "token-3", project_id: "project-1" };
|
||||||
|
const at = "2025-01-02T03:30:00+08:00";
|
||||||
|
try {
|
||||||
|
for (const args of [
|
||||||
|
["data", "timeseries", "realtime", "simulation-by-id-time", "--id", "J1", "--type", "junction", "--time", at],
|
||||||
|
["data", "timeseries", "realtime", "simulation-by-time-property", "--type", "pipe", "--time", at, "--property", "flow"],
|
||||||
|
["data", "timeseries", "scheme", "simulation", "--query", "by-id-time", "--id", "P1", "--type", "pipe", "--time", at, "--scheme", "scheme_case"],
|
||||||
|
]) {
|
||||||
|
const result = await runCli(["--auth-stdin", ...args], auth);
|
||||||
|
assert.equal(result.exitCode, 0, result.stderr);
|
||||||
|
}
|
||||||
|
const queries = server.seen.map(normalizeSeenRequest).map((request) => request.query.type);
|
||||||
|
assert.deepEqual(queries, ["node", "link", "link"]);
|
||||||
|
} finally {
|
||||||
|
await server.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("executes every command and key variant against the backend contract", async () => {
|
||||||
const tempDir = await mkdtemp(join(tmpdir(), "tjwater-cli-parity-"));
|
const tempDir = await mkdtemp(join(tmpdir(), "tjwater-cli-parity-"));
|
||||||
try {
|
try {
|
||||||
const burstFile = join(tempDir, "burst.json");
|
const burstFile = join(tempDir, "burst.json");
|
||||||
@@ -339,12 +364,16 @@ test("matches Python CLI backend request shape for every command and key variant
|
|||||||
];
|
];
|
||||||
|
|
||||||
for (const [name, args] of cases) {
|
for (const [name, args] of cases) {
|
||||||
const [nodeRun, pythonRun] = await Promise.all([
|
const run = await runAgainstServer(name, runCli, args, auth);
|
||||||
runAgainstServer(`${name} node`, runCli, args, auth),
|
assert.equal(run.exitCode, 0, `${name}: ${run.stderr}`);
|
||||||
runAgainstServer(`${name} python`, runPythonCli, args, auth),
|
assert.equal(run.payload.ok, true, name);
|
||||||
]);
|
assert.equal(run.payload.schema_version, "tjwater-cli/v1", name);
|
||||||
assert.equal(nodeRun.exitCode, pythonRun.exitCode, `${name}: exit\nnode=${nodeRun.stderr}\npython=${pythonRun.stderr}`);
|
assert.ok(run.requests.length > 0, `${name}: no backend request`);
|
||||||
assert.deepEqual(nodeRun.requests, pythonRun.requests, name);
|
for (const request of run.requests) {
|
||||||
|
assert.match(request.path, /^\/api\/v1\//, name);
|
||||||
|
assert.equal(request.headers.authorization, "Bearer token", name);
|
||||||
|
assert.equal(request.headers["x-project-id"], "project-1", name);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
await rm(tempDir, { force: true, recursive: true });
|
await rm(tempDir, { force: true, recursive: true });
|
||||||
|
|||||||
+45
-5
@@ -13,10 +13,36 @@
|
|||||||
"port": 4096
|
"port": 4096
|
||||||
},
|
},
|
||||||
"permission": {
|
"permission": {
|
||||||
"*": "allow",
|
"*": "ask",
|
||||||
"external_directory": "ask",
|
"external_directory": "deny",
|
||||||
"bash": {
|
"read": {
|
||||||
"*": "allow",
|
"*": "allow",
|
||||||
|
".env": "deny",
|
||||||
|
".env.*": "deny",
|
||||||
|
"*.env": "deny",
|
||||||
|
"**/.env": "deny",
|
||||||
|
"**/.env.*": "deny",
|
||||||
|
"**/*.env": "deny",
|
||||||
|
"data/**": "deny",
|
||||||
|
"**/data/**": "deny",
|
||||||
|
"logs/**": "deny",
|
||||||
|
"**/logs/**": "deny"
|
||||||
|
},
|
||||||
|
"edit": {
|
||||||
|
"*": "ask",
|
||||||
|
".env": "deny",
|
||||||
|
".env.*": "deny",
|
||||||
|
"*.env": "deny",
|
||||||
|
"**/.env": "deny",
|
||||||
|
"**/.env.*": "deny",
|
||||||
|
"**/*.env": "deny",
|
||||||
|
"data/**": "deny",
|
||||||
|
"**/data/**": "deny",
|
||||||
|
"logs/**": "deny",
|
||||||
|
"**/logs/**": "deny"
|
||||||
|
},
|
||||||
|
"bash": {
|
||||||
|
"*": "ask",
|
||||||
"rm *": "ask",
|
"rm *": "ask",
|
||||||
"rmdir *": "ask",
|
"rmdir *": "ask",
|
||||||
"mv *": "ask",
|
"mv *": "ask",
|
||||||
@@ -24,9 +50,23 @@
|
|||||||
"chown *": "ask",
|
"chown *": "ask",
|
||||||
"sudo *": "ask",
|
"sudo *": "ask",
|
||||||
"curl *": "ask",
|
"curl *": "ask",
|
||||||
"wget *": "ask"
|
"wget *": "ask",
|
||||||
|
"*.env*": "deny",
|
||||||
|
"*data/*": "deny",
|
||||||
|
"* data": "deny",
|
||||||
|
"*/data": "deny",
|
||||||
|
"*logs/*": "deny",
|
||||||
|
"* logs": "deny",
|
||||||
|
"*/logs": "deny"
|
||||||
},
|
},
|
||||||
"edit": "ask"
|
"question": "allow",
|
||||||
|
"task": "deny",
|
||||||
|
"todo": "allow",
|
||||||
|
"todoread": "allow",
|
||||||
|
"todowrite": "allow"
|
||||||
|
},
|
||||||
|
"experimental": {
|
||||||
|
"continue_loop_on_deny": true
|
||||||
},
|
},
|
||||||
"default_agent": "instruction"
|
"default_agent": "instruction"
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@
|
|||||||
"start:prod": "bun run check && bun src/server.ts"
|
"start:prod": "bun run check && bun src/server.ts"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@opencode-ai/sdk": "^1.16.2",
|
"@opencode-ai/sdk": "1.18.13",
|
||||||
"cors": "^2.8.5",
|
"cors": "^2.8.5",
|
||||||
"dotenv": "^17.2.3",
|
"dotenv": "^17.2.3",
|
||||||
"express": "^4.21.2",
|
"express": "^4.21.2",
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
import type { RuntimeSessionContext } from "../runtime/sessionContext.js";
|
||||||
|
|
||||||
|
type BackendContext = Pick<
|
||||||
|
RuntimeSessionContext,
|
||||||
|
"accessToken" | "projectId" | "traceId"
|
||||||
|
>;
|
||||||
|
|
||||||
|
export const buildBackendContextHeaders = (
|
||||||
|
context: BackendContext,
|
||||||
|
): Record<string, string> => {
|
||||||
|
const headers: Record<string, string> = {
|
||||||
|
Accept: "application/json",
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
"X-Trace-Id": context.traceId,
|
||||||
|
};
|
||||||
|
|
||||||
|
if (context.accessToken) {
|
||||||
|
headers.Authorization = `Bearer ${context.accessToken}`;
|
||||||
|
}
|
||||||
|
if (context.projectId) {
|
||||||
|
headers["X-Project-Id"] = context.projectId;
|
||||||
|
}
|
||||||
|
|
||||||
|
return headers;
|
||||||
|
};
|
||||||
@@ -0,0 +1,232 @@
|
|||||||
|
import { randomUUID } from "node:crypto";
|
||||||
|
|
||||||
|
import { type RuntimeSessionContext } from "../runtime/sessionContext.js";
|
||||||
|
|
||||||
|
export type CredentialRefreshReason =
|
||||||
|
| "access_token_expired"
|
||||||
|
| "access_token_rejected";
|
||||||
|
|
||||||
|
export type CredentialRefreshEvent =
|
||||||
|
| {
|
||||||
|
type: "credential_refresh_required";
|
||||||
|
requestId: string;
|
||||||
|
reason: CredentialRefreshReason;
|
||||||
|
timeoutMs: number;
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
type: "credential_refreshed";
|
||||||
|
requestId: string;
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
type: "credential_refresh_failed";
|
||||||
|
requestId: string;
|
||||||
|
message: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
type PendingRefresh = {
|
||||||
|
deadlineAt: number;
|
||||||
|
promise: Promise<RuntimeSessionContext>;
|
||||||
|
reason: CredentialRefreshReason;
|
||||||
|
reject: (error: Error) => void;
|
||||||
|
requestId: string;
|
||||||
|
resolve: (context: RuntimeSessionContext) => void;
|
||||||
|
timer: ReturnType<typeof setTimeout>;
|
||||||
|
};
|
||||||
|
|
||||||
|
type CredentialRefreshListener = (event: CredentialRefreshEvent) => void;
|
||||||
|
|
||||||
|
export class CredentialRefreshError extends Error {
|
||||||
|
override readonly name = "CredentialRefreshError";
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
message: string,
|
||||||
|
readonly code: "cancelled" | "failed" | "timeout" | "unavailable" = "failed",
|
||||||
|
) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const AUTH_EXPIRY_SKEW_MS = 30_000;
|
||||||
|
|
||||||
|
export const isRuntimeCredentialExpired = (
|
||||||
|
context: RuntimeSessionContext,
|
||||||
|
now = Date.now(),
|
||||||
|
) => {
|
||||||
|
if (!context.tokenExpiresAt) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
const expiresAt = Date.parse(context.tokenExpiresAt);
|
||||||
|
return Number.isFinite(expiresAt) && now >= expiresAt - AUTH_EXPIRY_SKEW_MS;
|
||||||
|
};
|
||||||
|
|
||||||
|
export class CredentialRefreshCoordinator {
|
||||||
|
private readonly listeners = new Map<
|
||||||
|
string,
|
||||||
|
Set<CredentialRefreshListener>
|
||||||
|
>();
|
||||||
|
private readonly pending = new Map<string, PendingRefresh>();
|
||||||
|
|
||||||
|
constructor(private readonly timeoutMs = 30_000) {}
|
||||||
|
|
||||||
|
subscribe(sessionId: string, listener: CredentialRefreshListener) {
|
||||||
|
const listeners =
|
||||||
|
this.listeners.get(sessionId) ?? new Set<CredentialRefreshListener>();
|
||||||
|
listeners.add(listener);
|
||||||
|
this.listeners.set(sessionId, listeners);
|
||||||
|
return () => {
|
||||||
|
listeners.delete(listener);
|
||||||
|
if (listeners.size === 0) {
|
||||||
|
this.listeners.delete(sessionId);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
request(sessionId: string, reason: CredentialRefreshReason) {
|
||||||
|
const existing = this.pending.get(sessionId);
|
||||||
|
if (existing) {
|
||||||
|
return existing.promise;
|
||||||
|
}
|
||||||
|
if (!this.listeners.get(sessionId)?.size) {
|
||||||
|
return Promise.reject(
|
||||||
|
new CredentialRefreshError(
|
||||||
|
"credential refresh channel is unavailable",
|
||||||
|
"unavailable",
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const requestId = `credential-${randomUUID()}`;
|
||||||
|
let resolvePromise!: (context: RuntimeSessionContext) => void;
|
||||||
|
let rejectPromise!: (error: Error) => void;
|
||||||
|
const promise = new Promise<RuntimeSessionContext>((resolve, reject) => {
|
||||||
|
resolvePromise = resolve;
|
||||||
|
rejectPromise = reject;
|
||||||
|
});
|
||||||
|
const timer = setTimeout(() => {
|
||||||
|
this.fail(sessionId, requestId, "credential refresh timed out", "timeout");
|
||||||
|
}, this.timeoutMs);
|
||||||
|
this.pending.set(sessionId, {
|
||||||
|
deadlineAt: Date.now() + this.timeoutMs,
|
||||||
|
promise,
|
||||||
|
reason,
|
||||||
|
reject: rejectPromise,
|
||||||
|
requestId,
|
||||||
|
resolve: resolvePromise,
|
||||||
|
timer,
|
||||||
|
});
|
||||||
|
this.emit(sessionId, {
|
||||||
|
type: "credential_refresh_required",
|
||||||
|
requestId,
|
||||||
|
reason,
|
||||||
|
timeoutMs: this.timeoutMs,
|
||||||
|
});
|
||||||
|
return promise;
|
||||||
|
}
|
||||||
|
|
||||||
|
resolve(
|
||||||
|
sessionId: string,
|
||||||
|
requestId: string,
|
||||||
|
context: RuntimeSessionContext,
|
||||||
|
) {
|
||||||
|
const pending = this.pending.get(sessionId);
|
||||||
|
if (!pending || pending.requestId !== requestId) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
clearTimeout(pending.timer);
|
||||||
|
this.pending.delete(sessionId);
|
||||||
|
pending.resolve(context);
|
||||||
|
this.emit(sessionId, {
|
||||||
|
type: "credential_refreshed",
|
||||||
|
requestId,
|
||||||
|
});
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
fail(
|
||||||
|
sessionId: string,
|
||||||
|
requestId: string,
|
||||||
|
message: string,
|
||||||
|
code: CredentialRefreshError["code"] = "failed",
|
||||||
|
emitFailureEvent = true,
|
||||||
|
) {
|
||||||
|
const pending = this.pending.get(sessionId);
|
||||||
|
if (!pending || pending.requestId !== requestId) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
clearTimeout(pending.timer);
|
||||||
|
this.pending.delete(sessionId);
|
||||||
|
pending.reject(new CredentialRefreshError(message, code));
|
||||||
|
if (emitFailureEvent) {
|
||||||
|
this.emit(sessionId, {
|
||||||
|
type: "credential_refresh_failed",
|
||||||
|
requestId,
|
||||||
|
message,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
cancelSession(sessionId: string, message = "credential refresh cancelled") {
|
||||||
|
const pending = this.pending.get(sessionId);
|
||||||
|
if (!pending) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return this.fail(
|
||||||
|
sessionId,
|
||||||
|
pending.requestId,
|
||||||
|
message,
|
||||||
|
"cancelled",
|
||||||
|
false,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
getPendingRequestId(sessionId: string) {
|
||||||
|
return this.pending.get(sessionId)?.requestId;
|
||||||
|
}
|
||||||
|
|
||||||
|
getPendingEvent(
|
||||||
|
sessionId: string,
|
||||||
|
): Extract<CredentialRefreshEvent, { type: "credential_refresh_required" }> | null {
|
||||||
|
const pending = this.pending.get(sessionId);
|
||||||
|
if (!pending) return null;
|
||||||
|
return {
|
||||||
|
type: "credential_refresh_required",
|
||||||
|
requestId: pending.requestId,
|
||||||
|
reason: pending.reason,
|
||||||
|
timeoutMs: Math.max(0, pending.deadlineAt - Date.now()),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private emit(sessionId: string, event: CredentialRefreshEvent) {
|
||||||
|
for (const listener of this.listeners.get(sessionId) ?? []) {
|
||||||
|
listener(event);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const runWithCredentialRefresh = async <T extends { status: number }>(
|
||||||
|
coordinator: CredentialRefreshCoordinator,
|
||||||
|
context: RuntimeSessionContext,
|
||||||
|
execute: (context: RuntimeSessionContext) => Promise<T>,
|
||||||
|
) => {
|
||||||
|
let activeContext = context;
|
||||||
|
let refreshed = false;
|
||||||
|
if (isRuntimeCredentialExpired(activeContext)) {
|
||||||
|
activeContext = await coordinator.request(
|
||||||
|
activeContext.sessionId,
|
||||||
|
"access_token_expired",
|
||||||
|
);
|
||||||
|
refreshed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
let result = await execute(activeContext);
|
||||||
|
if (result.status !== 401 || refreshed) {
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
activeContext = await coordinator.request(
|
||||||
|
activeContext.sessionId,
|
||||||
|
"access_token_rejected",
|
||||||
|
);
|
||||||
|
result = await execute(activeContext);
|
||||||
|
return result;
|
||||||
|
};
|
||||||
+11
-25
@@ -41,8 +41,8 @@ const envSchema = z
|
|||||||
AGENT_INTERNAL_TOKEN: optionalString(),
|
AGENT_INTERNAL_TOKEN: optionalString(),
|
||||||
// Agent 前置认证调用后端 /api/v1/agent/auth/context 的超时时间(毫秒)。
|
// Agent 前置认证调用后端 /api/v1/agent/auth/context 的超时时间(毫秒)。
|
||||||
AGENT_AUTH_TIMEOUT_MS: z.coerce.number().int().positive().default(5000),
|
AGENT_AUTH_TIMEOUT_MS: z.coerce.number().int().positive().default(5000),
|
||||||
// opencode 运行模式:embedded 会启动本地 CLI 子进程;client 只连接现有 server。
|
// 当前仅支持 embedded;保留字段用于让旧 client 配置在启动时明确失败。
|
||||||
OPENCODE_MODE: z.enum(["embedded", "client"]).default("embedded"),
|
OPENCODE_MODE: z.literal("embedded").default("embedded"),
|
||||||
// embedded opencode server 的监听地址。
|
// embedded opencode server 的监听地址。
|
||||||
OPENCODE_HOSTNAME: z.string().default("127.0.0.1"),
|
OPENCODE_HOSTNAME: z.string().default("127.0.0.1"),
|
||||||
// embedded opencode server 的监听端口。
|
// embedded opencode server 的监听端口。
|
||||||
@@ -55,10 +55,6 @@ const envSchema = z
|
|||||||
OPENCODE_MODEL_OPTIONS: z.string().default(defaultAgentModelOptionsJson),
|
OPENCODE_MODEL_OPTIONS: z.string().default(defaultAgentModelOptionsJson),
|
||||||
// opencode skills 树目录;会在运行时解析为绝对路径,避免工具 cwd 偏移。
|
// opencode skills 树目录;会在运行时解析为绝对路径,避免工具 cwd 偏移。
|
||||||
OPENCODE_SKILLS_ROOT_DIR: z.string().default("./.opencode/skills"),
|
OPENCODE_SKILLS_ROOT_DIR: z.string().default("./.opencode/skills"),
|
||||||
// client 模式下,目标 opencode server 的基础地址。
|
|
||||||
OPENCODE_CLIENT_BASE_URL: z.string().url().optional(),
|
|
||||||
// 旧版 client 模式环境变量名,保留兼容,解析时会映射到 OPENCODE_CLIENT_BASE_URL。
|
|
||||||
OPENCODE_BASE_URL: z.string().url().optional(),
|
|
||||||
// tjwater-cli 可执行文件路径。
|
// tjwater-cli 可执行文件路径。
|
||||||
TJWATER_CLI_PATH: z.string().default("./cli/tjwater-cli"),
|
TJWATER_CLI_PATH: z.string().default("./cli/tjwater-cli"),
|
||||||
// TJWater 后端 API 的基础地址。
|
// TJWater 后端 API 的基础地址。
|
||||||
@@ -107,6 +103,14 @@ const envSchema = z
|
|||||||
LEARNING_MIN_PROPOSAL_CONFIDENCE: z.coerce.number().min(0).max(1).default(0.8),
|
LEARNING_MIN_PROPOSAL_CONFIDENCE: z.coerce.number().min(0).max(1).default(0.8),
|
||||||
// result_ref 持久化存储目录。
|
// result_ref 持久化存储目录。
|
||||||
RESULT_REF_STORAGE_DIR: z.string().default("./data/result-refs"),
|
RESULT_REF_STORAGE_DIR: z.string().default("./data/result-refs"),
|
||||||
|
// 仅允许 store_render_ref 从该目录导入受控 JSON 包装文件。
|
||||||
|
RESULT_REF_IMPORT_DIR: z.string().default("./data/result-imports"),
|
||||||
|
// 单个渲染包装 JSON 的最大导入字节数。
|
||||||
|
RESULT_REF_IMPORT_MAX_BYTES: z.coerce
|
||||||
|
.number()
|
||||||
|
.int()
|
||||||
|
.positive()
|
||||||
|
.default(64 * 1024 * 1024),
|
||||||
// result_ref 保留时长(小时)。
|
// result_ref 保留时长(小时)。
|
||||||
RESULT_REF_TTL_HOURS: z.coerce.number().int().positive().default(168),
|
RESULT_REF_TTL_HOURS: z.coerce.number().int().positive().default(168),
|
||||||
// 定时清理过期 result_ref 的扫描周期(毫秒)。
|
// 定时清理过期 result_ref 的扫描周期(毫秒)。
|
||||||
@@ -117,13 +121,6 @@ const envSchema = z
|
|||||||
.default(3600000),
|
.default(3600000),
|
||||||
})
|
})
|
||||||
.superRefine((env, ctx) => {
|
.superRefine((env, ctx) => {
|
||||||
if (env.OPENCODE_MODE === "client" && !env.OPENCODE_CLIENT_BASE_URL) {
|
|
||||||
ctx.addIssue({
|
|
||||||
code: z.ZodIssueCode.custom,
|
|
||||||
path: ["OPENCODE_CLIENT_BASE_URL"],
|
|
||||||
message: "OPENCODE_CLIENT_BASE_URL is required when OPENCODE_MODE=client",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
let modelOptions;
|
let modelOptions;
|
||||||
try {
|
try {
|
||||||
modelOptions = parseAgentModelOptions(env.OPENCODE_MODEL_OPTIONS);
|
modelOptions = parseAgentModelOptions(env.OPENCODE_MODEL_OPTIONS);
|
||||||
@@ -154,15 +151,4 @@ const envSchema = z
|
|||||||
|
|
||||||
export type AppConfig = z.infer<typeof envSchema>;
|
export type AppConfig = z.infer<typeof envSchema>;
|
||||||
|
|
||||||
const normalizedEnv = {
|
export const config: AppConfig = envSchema.parse(process.env);
|
||||||
...process.env,
|
|
||||||
OPENCODE_MODE:
|
|
||||||
process.env.OPENCODE_MODE ??
|
|
||||||
(process.env.OPENCODE_CLIENT_BASE_URL || process.env.OPENCODE_BASE_URL
|
|
||||||
? "client"
|
|
||||||
: "embedded"),
|
|
||||||
OPENCODE_CLIENT_BASE_URL:
|
|
||||||
process.env.OPENCODE_CLIENT_BASE_URL ?? process.env.OPENCODE_BASE_URL,
|
|
||||||
};
|
|
||||||
|
|
||||||
export const config: AppConfig = envSchema.parse(normalizedEnv);
|
|
||||||
|
|||||||
@@ -214,7 +214,12 @@ register("/api/v1/agent/sessions/{session_id}/runs", "post", {
|
|||||||
schema: z.object({
|
schema: z.object({
|
||||||
message: z.string().min(1).max(10000),
|
message: z.string().min(1).max(10000),
|
||||||
model: z.string().optional(),
|
model: z.string().optional(),
|
||||||
approval_mode: z.enum(["request", "always"]).optional(),
|
approval_mode: z
|
||||||
|
.enum(["request", "auto", "always"])
|
||||||
|
.optional()
|
||||||
|
.describe(
|
||||||
|
"request forwards approval prompts; auto approves only the low-risk allowlist; always approves every prompt not explicitly denied by OpenCode.",
|
||||||
|
),
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -246,6 +251,24 @@ register("/api/v1/agent/sessions/{session_id}/runs/current", "delete", {
|
|||||||
request: { params: SessionId },
|
request: { params: SessionId },
|
||||||
responses: { 202: jsonResponse(JsonObject), 204: { description: "No active run" } },
|
responses: { 202: jsonResponse(JsonObject), 204: { description: "No active run" } },
|
||||||
});
|
});
|
||||||
|
register(
|
||||||
|
"/api/v1/agent/sessions/{session_id}/credential-refreshes",
|
||||||
|
"post",
|
||||||
|
{
|
||||||
|
summary: "Resume a waiting agent tool call with refreshed credentials",
|
||||||
|
request: {
|
||||||
|
params: SessionId,
|
||||||
|
body: {
|
||||||
|
content: {
|
||||||
|
"application/json": {
|
||||||
|
schema: z.object({ request_id: z.string().min(1).max(128) }),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
responses: { 202: jsonResponse(JsonObject) },
|
||||||
|
},
|
||||||
|
);
|
||||||
register(
|
register(
|
||||||
"/api/v1/agent/sessions/{session_id}/permission-responses",
|
"/api/v1/agent/sessions/{session_id}/permission-responses",
|
||||||
"post",
|
"post",
|
||||||
|
|||||||
@@ -77,12 +77,12 @@ type TurnReviewInput = {
|
|||||||
export class LearningOrchestrator {
|
export class LearningOrchestrator {
|
||||||
private readonly activeReviews = new Set<string>();
|
private readonly activeReviews = new Set<string>();
|
||||||
private readonly sessionLearningStateStore = new SessionLearningStateStore();
|
private readonly sessionLearningStateStore = new SessionLearningStateStore();
|
||||||
private readonly skillStore = new SkillStore();
|
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly runtime: OpencodeRuntimeAdapter,
|
private readonly runtime: OpencodeRuntimeAdapter,
|
||||||
private readonly memoryStore: MemoryStore,
|
private readonly memoryStore: MemoryStore,
|
||||||
private readonly transcriptStore: SessionTranscriptStore,
|
private readonly transcriptStore: SessionTranscriptStore,
|
||||||
|
private readonly skillStore: SkillStore,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async initialize() {
|
async initialize() {
|
||||||
|
|||||||
@@ -0,0 +1,194 @@
|
|||||||
|
import { type MemoryScope, MemoryStore } from "../memory/store.js";
|
||||||
|
import {
|
||||||
|
setRuntimeSessionContext,
|
||||||
|
type RuntimeSessionContext,
|
||||||
|
} from "../runtime/sessionContext.js";
|
||||||
|
import { SkillStore } from "../skills/store.js";
|
||||||
|
|
||||||
|
export type MemoryManagerInput = {
|
||||||
|
action: "add" | "list" | "replace" | "remove";
|
||||||
|
content?: string;
|
||||||
|
scope: string;
|
||||||
|
target_id?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type SkillManagerInput = {
|
||||||
|
action:
|
||||||
|
| "list"
|
||||||
|
| "write_skill"
|
||||||
|
| "remove_skill"
|
||||||
|
| "append_pattern"
|
||||||
|
| "remove_pattern"
|
||||||
|
| "write_reference"
|
||||||
|
| "remove_reference"
|
||||||
|
| "write_script"
|
||||||
|
| "remove_script";
|
||||||
|
content?: string;
|
||||||
|
file_path?: string;
|
||||||
|
pattern?: string;
|
||||||
|
skill_path: string;
|
||||||
|
target_id?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const executeMemoryManager = async (
|
||||||
|
memoryStore: MemoryStore,
|
||||||
|
sessionContext: RuntimeSessionContext,
|
||||||
|
input: MemoryManagerInput,
|
||||||
|
) => {
|
||||||
|
const scope: MemoryScope | null =
|
||||||
|
input.scope === "user"
|
||||||
|
? "user"
|
||||||
|
: input.scope === "workspace"
|
||||||
|
? "workspace"
|
||||||
|
: null;
|
||||||
|
if (!scope) {
|
||||||
|
return rejected(
|
||||||
|
"memory",
|
||||||
|
`unsupported scope: ${input.scope}; use exact keyword 'user' or 'workspace'`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (sessionContext.allowLearningWrite === false && input.action !== "list") {
|
||||||
|
return rejected("memory", "memory writes are disabled for this session");
|
||||||
|
}
|
||||||
|
|
||||||
|
const scopeKey =
|
||||||
|
scope === "user" ? sessionContext.actorKey : sessionContext.projectKey;
|
||||||
|
if (input.action === "list") {
|
||||||
|
setRuntimeSessionContext({
|
||||||
|
...sessionContext,
|
||||||
|
memoryListReadScopes: {
|
||||||
|
...(sessionContext.memoryListReadScopes ?? {}),
|
||||||
|
[scope]: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return {
|
||||||
|
ok: true,
|
||||||
|
kind: "memory",
|
||||||
|
decision: "accepted",
|
||||||
|
detail: "memory listed",
|
||||||
|
items: await memoryStore.list(scope, scopeKey),
|
||||||
|
target: scope,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (input.action === "add") {
|
||||||
|
if (sessionContext.memoryListReadScopes?.[scope] !== true) {
|
||||||
|
return {
|
||||||
|
...rejected(
|
||||||
|
"memory",
|
||||||
|
`must list ${scope} memory and review existing entries before add`,
|
||||||
|
),
|
||||||
|
target: scope,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
const result = await memoryStore.upsert(scope, scopeKey, {
|
||||||
|
content: input.content ?? "",
|
||||||
|
sessionId: sessionContext.clientSessionId,
|
||||||
|
source: "tool",
|
||||||
|
traceId: sessionContext.traceId,
|
||||||
|
});
|
||||||
|
if (!result.entry) {
|
||||||
|
return rejected("memory", "content rejected by persistence policy");
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
ok: true,
|
||||||
|
kind: "memory",
|
||||||
|
decision: result.changed ? "accepted" : "deduped",
|
||||||
|
detail: result.detail,
|
||||||
|
entry: result.entry,
|
||||||
|
target: scope,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const result =
|
||||||
|
input.action === "replace"
|
||||||
|
? await memoryStore.replace(scope, scopeKey, input.target_id ?? "", {
|
||||||
|
content: input.content ?? "",
|
||||||
|
sessionId: sessionContext.clientSessionId,
|
||||||
|
source: "tool",
|
||||||
|
traceId: sessionContext.traceId,
|
||||||
|
})
|
||||||
|
: await memoryStore.remove(scope, scopeKey, input.target_id ?? "");
|
||||||
|
return {
|
||||||
|
ok: true,
|
||||||
|
kind: "memory",
|
||||||
|
decision: result.changed ? "accepted" : "rejected",
|
||||||
|
detail: result.detail,
|
||||||
|
target: scope,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export const executeSkillManager = async (
|
||||||
|
skillStore: SkillStore,
|
||||||
|
sessionContext: RuntimeSessionContext,
|
||||||
|
input: SkillManagerInput,
|
||||||
|
) => {
|
||||||
|
if (sessionContext.allowLearningWrite === false && input.action !== "list") {
|
||||||
|
return rejected("skill", "skill writes are disabled for this session");
|
||||||
|
}
|
||||||
|
if (input.action === "list") {
|
||||||
|
const result = await skillStore.list(input.skill_path);
|
||||||
|
if (!result) {
|
||||||
|
return rejected(
|
||||||
|
"skill",
|
||||||
|
"invalid skill_path; expected a relative path under .opencode/skills",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
ok: true,
|
||||||
|
kind: "skill",
|
||||||
|
decision: "accepted",
|
||||||
|
detail: "skill listed",
|
||||||
|
references: result.references,
|
||||||
|
scripts: result.scripts,
|
||||||
|
skill_path: result.skillPath,
|
||||||
|
target: result.target,
|
||||||
|
patterns: result.patterns,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const result =
|
||||||
|
input.action === "write_skill"
|
||||||
|
? await skillStore.writeSkill(input.skill_path, input.content ?? "")
|
||||||
|
: input.action === "remove_skill"
|
||||||
|
? await skillStore.removeSkill(input.skill_path)
|
||||||
|
: input.action === "append_pattern"
|
||||||
|
? await skillStore.appendPattern(input.skill_path, input.pattern ?? "")
|
||||||
|
: input.action === "remove_pattern"
|
||||||
|
? await skillStore.removePattern(input.skill_path, input.target_id ?? "")
|
||||||
|
: input.action === "write_reference"
|
||||||
|
? await skillStore.writeReference(
|
||||||
|
input.skill_path,
|
||||||
|
input.file_path ?? "",
|
||||||
|
input.content ?? "",
|
||||||
|
)
|
||||||
|
: input.action === "remove_reference"
|
||||||
|
? await skillStore.removeReference(
|
||||||
|
input.skill_path,
|
||||||
|
input.file_path ?? "",
|
||||||
|
)
|
||||||
|
: input.action === "write_script"
|
||||||
|
? await skillStore.writeScript(
|
||||||
|
input.skill_path,
|
||||||
|
input.file_path ?? "",
|
||||||
|
input.content ?? "",
|
||||||
|
)
|
||||||
|
: await skillStore.removeScript(
|
||||||
|
input.skill_path,
|
||||||
|
input.file_path ?? "",
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
ok: true,
|
||||||
|
kind: "skill",
|
||||||
|
decision: result.changed ? "accepted" : "rejected",
|
||||||
|
detail: result.detail,
|
||||||
|
target: result.target,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
const rejected = (kind: "memory" | "skill", detail: string) => ({
|
||||||
|
ok: true,
|
||||||
|
kind,
|
||||||
|
decision: "rejected",
|
||||||
|
detail,
|
||||||
|
});
|
||||||
+42
-4
@@ -1,4 +1,7 @@
|
|||||||
import { readJsonFile } from "../utils/fileStore.js";
|
import { realpath, stat } from "node:fs/promises";
|
||||||
|
import { isAbsolute, relative } from "node:path";
|
||||||
|
|
||||||
|
import { readJsonFile, removeFileIfExists } from "../utils/fileStore.js";
|
||||||
import {
|
import {
|
||||||
type ResultReferenceKind,
|
type ResultReferenceKind,
|
||||||
type ResultReferenceRecord,
|
type ResultReferenceRecord,
|
||||||
@@ -33,7 +36,11 @@ export type RenderJunctionPayload = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export class ResultReferenceResolver {
|
export class ResultReferenceResolver {
|
||||||
constructor(private readonly store: ResultReferenceStore) {}
|
constructor(
|
||||||
|
private readonly store: ResultReferenceStore,
|
||||||
|
private readonly importRoot: string,
|
||||||
|
private readonly importMaxBytes: number,
|
||||||
|
) {}
|
||||||
|
|
||||||
// Resolver 负责按结果类型做结构校验,Store 只关心授权和落盘。
|
// Resolver 负责按结果类型做结构校验,Store 只关心授权和落盘。
|
||||||
async register(input: RegisterResultReferenceInput) {
|
async register(input: RegisterResultReferenceInput) {
|
||||||
@@ -63,7 +70,17 @@ export class ResultReferenceResolver {
|
|||||||
filePath: string,
|
filePath: string,
|
||||||
input: Omit<RegisterResultReferenceInput, "data" | "kind" | "schemaVersion">,
|
input: Omit<RegisterResultReferenceInput, "data" | "kind" | "schemaVersion">,
|
||||||
) {
|
) {
|
||||||
const raw = await readJsonFile<unknown>(filePath);
|
const resolvedFilePath = await resolvePathInsideRoot(filePath, this.importRoot);
|
||||||
|
const fileStat = await stat(resolvedFilePath);
|
||||||
|
if (!fileStat.isFile()) {
|
||||||
|
throw new Error("render payload path must point to a regular file");
|
||||||
|
}
|
||||||
|
if (fileStat.size > this.importMaxBytes) {
|
||||||
|
throw new Error(
|
||||||
|
`render payload file exceeds RESULT_REF_IMPORT_MAX_BYTES (${this.importMaxBytes})`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const raw = await readJsonFile<unknown>(resolvedFilePath);
|
||||||
if (raw === null) {
|
if (raw === null) {
|
||||||
throw new Error(`render payload file not found: ${filePath}`);
|
throw new Error(`render payload file not found: ${filePath}`);
|
||||||
}
|
}
|
||||||
@@ -78,13 +95,15 @@ export class ResultReferenceResolver {
|
|||||||
throw new Error("render payload file does not contain a valid junction render payload");
|
throw new Error("render payload file does not contain a valid junction render payload");
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.register({
|
const record = await this.register({
|
||||||
...input,
|
...input,
|
||||||
data: payload,
|
data: payload,
|
||||||
kind: RESULT_REFERENCE_KIND.renderJunctionsPayload,
|
kind: RESULT_REFERENCE_KIND.renderJunctionsPayload,
|
||||||
schemaVersion: 1,
|
schemaVersion: 1,
|
||||||
source: RESULT_REFERENCE_SOURCE.agentGenerated,
|
source: RESULT_REFERENCE_SOURCE.agentGenerated,
|
||||||
});
|
});
|
||||||
|
await removeFileIfExists(resolvedFilePath);
|
||||||
|
return record;
|
||||||
}
|
}
|
||||||
|
|
||||||
async getFullAuthorized(
|
async getFullAuthorized(
|
||||||
@@ -167,6 +186,25 @@ export const extractRenderJunctionPayload = (
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const resolvePathInsideRoot = async (filePath: string, rootPath: string) => {
|
||||||
|
if (!isAbsolute(filePath)) {
|
||||||
|
throw new Error("render payload file_path must be absolute");
|
||||||
|
}
|
||||||
|
const [resolvedFilePath, resolvedRootPath] = await Promise.all([
|
||||||
|
realpath(filePath),
|
||||||
|
realpath(rootPath),
|
||||||
|
]);
|
||||||
|
const relativePath = relative(resolvedRootPath, resolvedFilePath);
|
||||||
|
if (
|
||||||
|
relativePath === ".." ||
|
||||||
|
relativePath.startsWith(`..${process.platform === "win32" ? "\\" : "/"}`) ||
|
||||||
|
isAbsolute(relativePath)
|
||||||
|
) {
|
||||||
|
throw new Error("render payload file must be inside RESULT_REF_IMPORT_DIR");
|
||||||
|
}
|
||||||
|
return resolvedFilePath;
|
||||||
|
};
|
||||||
|
|
||||||
const normalizeDataForKind = (
|
const normalizeDataForKind = (
|
||||||
kind: ResultReferenceKind,
|
kind: ResultReferenceKind,
|
||||||
data: unknown,
|
data: unknown,
|
||||||
|
|||||||
+55
-1
@@ -2,6 +2,7 @@ import { Router } from "express";
|
|||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
|
|
||||||
import { getAgentAuthContext } from "../auth/agentAuth.js";
|
import { getAgentAuthContext } from "../auth/agentAuth.js";
|
||||||
|
import { type CredentialRefreshCoordinator } from "../auth/credentialRefresh.js";
|
||||||
import {
|
import {
|
||||||
agentModelOptions,
|
agentModelOptions,
|
||||||
isSupportedModel,
|
isSupportedModel,
|
||||||
@@ -64,7 +65,13 @@ const payloadSchema = z.object({
|
|||||||
model: z.string().refine(isSupportedModel, {
|
model: z.string().refine(isSupportedModel, {
|
||||||
message: "unsupported model",
|
message: "unsupported model",
|
||||||
}).optional(),
|
}).optional(),
|
||||||
approval_mode: z.enum(["request", "always"]).optional().default("request"),
|
approval_mode: z
|
||||||
|
.enum(["request", "auto", "always"])
|
||||||
|
.optional()
|
||||||
|
.default("request")
|
||||||
|
.describe(
|
||||||
|
"request forwards approval prompts; auto approves only low-risk allowlisted tools; always approves every prompt not explicitly denied by OpenCode",
|
||||||
|
),
|
||||||
});
|
});
|
||||||
|
|
||||||
const createSessionPayloadSchema = z.object({
|
const createSessionPayloadSchema = z.object({
|
||||||
@@ -121,6 +128,7 @@ export const buildChatRouter = (
|
|||||||
sessionTranscriptStore: SessionTranscriptStore,
|
sessionTranscriptStore: SessionTranscriptStore,
|
||||||
learningOrchestrator: LearningOrchestrator,
|
learningOrchestrator: LearningOrchestrator,
|
||||||
resultReferenceResolver: ResultReferenceResolver,
|
resultReferenceResolver: ResultReferenceResolver,
|
||||||
|
credentialRefreshCoordinator: CredentialRefreshCoordinator,
|
||||||
) => {
|
) => {
|
||||||
const chatRouter = Router();
|
const chatRouter = Router();
|
||||||
|
|
||||||
@@ -295,6 +303,16 @@ export const buildChatRouter = (
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
run.subscribers.add(subscriber);
|
run.subscribers.add(subscriber);
|
||||||
|
const pendingCredentialRefresh =
|
||||||
|
credentialRefreshCoordinator.getPendingEvent(sessionRecord.sessionId);
|
||||||
|
if (pendingCredentialRefresh) {
|
||||||
|
subscriber.write(pendingCredentialRefresh.type, {
|
||||||
|
session_id: sessionRecord.sessionId,
|
||||||
|
request_id: pendingCredentialRefresh.requestId,
|
||||||
|
reason: pendingCredentialRefresh.reason,
|
||||||
|
timeout_ms: pendingCredentialRefresh.timeoutMs,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
const cleanup = () => {
|
const cleanup = () => {
|
||||||
run.subscribers.delete(subscriber);
|
run.subscribers.delete(subscriber);
|
||||||
@@ -390,6 +408,7 @@ export const buildChatRouter = (
|
|||||||
|
|
||||||
registerChatInteractionRoutes(chatRouter, {
|
registerChatInteractionRoutes(chatRouter, {
|
||||||
activeRuns,
|
activeRuns,
|
||||||
|
credentialRefreshCoordinator,
|
||||||
runtime,
|
runtime,
|
||||||
sessionMetadataStore,
|
sessionMetadataStore,
|
||||||
sessionUiStateStore,
|
sessionUiStateStore,
|
||||||
@@ -803,6 +822,35 @@ export const buildChatRouter = (
|
|||||||
logger.warn({ err: error, sessionId: clientSessionId }, "failed to persist chat stream state");
|
logger.warn({ err: error, sessionId: clientSessionId }, "failed to persist chat stream state");
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
const unsubscribeCredentialRefresh = credentialRefreshCoordinator.subscribe(
|
||||||
|
binding.sessionId,
|
||||||
|
(event) => {
|
||||||
|
publish(event.type, {
|
||||||
|
session_id: clientSessionId,
|
||||||
|
request_id: event.requestId,
|
||||||
|
...(event.type === "credential_refresh_required"
|
||||||
|
? {
|
||||||
|
reason: event.reason,
|
||||||
|
timeout_ms: event.timeoutMs,
|
||||||
|
}
|
||||||
|
: {}),
|
||||||
|
...(event.type === "credential_refresh_failed"
|
||||||
|
? { message: event.message }
|
||||||
|
: {}),
|
||||||
|
});
|
||||||
|
},
|
||||||
|
);
|
||||||
|
const cancelCredentialRefreshOnAbort = () => {
|
||||||
|
credentialRefreshCoordinator.cancelSession(
|
||||||
|
binding.sessionId,
|
||||||
|
"credential refresh cancelled because the agent run was aborted",
|
||||||
|
);
|
||||||
|
};
|
||||||
|
abortController.signal.addEventListener(
|
||||||
|
"abort",
|
||||||
|
cancelCredentialRefreshOnAbort,
|
||||||
|
{ once: true },
|
||||||
|
);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const preparedMessage = await buildPromptWithLearningContext(
|
const preparedMessage = await buildPromptWithLearningContext(
|
||||||
@@ -925,6 +973,12 @@ export const buildChatRouter = (
|
|||||||
logger.warn({ err: error, sessionId: clientSessionId }, "failed to persist chat stream state");
|
logger.warn({ err: error, sessionId: clientSessionId }, "failed to persist chat stream state");
|
||||||
});
|
});
|
||||||
sessionBridge.finalizeRequest(clientSessionId);
|
sessionBridge.finalizeRequest(clientSessionId);
|
||||||
|
abortController.signal.removeEventListener(
|
||||||
|
"abort",
|
||||||
|
cancelCredentialRefreshOnAbort,
|
||||||
|
);
|
||||||
|
credentialRefreshCoordinator.cancelSession(binding.sessionId);
|
||||||
|
unsubscribeCredentialRefresh();
|
||||||
activeRun.status = abortController.signal.aborted
|
activeRun.status = abortController.signal.aborted
|
||||||
? activeRun.status === "aborted"
|
? activeRun.status === "aborted"
|
||||||
? "aborted"
|
? "aborted"
|
||||||
|
|||||||
@@ -2,8 +2,13 @@ import { type Router } from "express";
|
|||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
|
|
||||||
import { getAgentAuthContext } from "../auth/agentAuth.js";
|
import { getAgentAuthContext } from "../auth/agentAuth.js";
|
||||||
|
import { type CredentialRefreshCoordinator } from "../auth/credentialRefresh.js";
|
||||||
import { logger } from "../logger.js";
|
import { logger } from "../logger.js";
|
||||||
import { type OpencodeRuntimeAdapter } from "../runtime/opencode.js";
|
import { type OpencodeRuntimeAdapter } from "../runtime/opencode.js";
|
||||||
|
import {
|
||||||
|
getRuntimeSessionContext,
|
||||||
|
setRuntimeSessionContext,
|
||||||
|
} from "../runtime/sessionContext.js";
|
||||||
import { type SessionMetadataStore } from "../sessions/metadataStore.js";
|
import { type SessionMetadataStore } from "../sessions/metadataStore.js";
|
||||||
import { type SessionUiStateStore } from "../sessions/uiStateStore.js";
|
import { type SessionUiStateStore } from "../sessions/uiStateStore.js";
|
||||||
import { toActorKey, toProjectKey } from "../utils/fileStore.js";
|
import { toActorKey, toProjectKey } from "../utils/fileStore.js";
|
||||||
@@ -26,8 +31,13 @@ const questionReplyPayloadSchema = z.object({
|
|||||||
answers: z.array(z.array(z.string().max(2000))).default([]),
|
answers: z.array(z.array(z.string().max(2000))).default([]),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const credentialRefreshPayloadSchema = z.object({
|
||||||
|
request_id: z.string().min(1).max(128),
|
||||||
|
});
|
||||||
|
|
||||||
type RegisterInteractionRoutesOptions = {
|
type RegisterInteractionRoutesOptions = {
|
||||||
activeRuns: Map<string, ActiveRun>;
|
activeRuns: Map<string, ActiveRun>;
|
||||||
|
credentialRefreshCoordinator: CredentialRefreshCoordinator;
|
||||||
runtime: OpencodeRuntimeAdapter;
|
runtime: OpencodeRuntimeAdapter;
|
||||||
sessionMetadataStore: SessionMetadataStore;
|
sessionMetadataStore: SessionMetadataStore;
|
||||||
sessionUiStateStore: SessionUiStateStore;
|
sessionUiStateStore: SessionUiStateStore;
|
||||||
@@ -41,11 +51,73 @@ export const registerChatInteractionRoutes = (
|
|||||||
chatRouter: Router,
|
chatRouter: Router,
|
||||||
{
|
{
|
||||||
activeRuns,
|
activeRuns,
|
||||||
|
credentialRefreshCoordinator,
|
||||||
runtime,
|
runtime,
|
||||||
sessionMetadataStore,
|
sessionMetadataStore,
|
||||||
sessionUiStateStore,
|
sessionUiStateStore,
|
||||||
}: RegisterInteractionRoutesOptions,
|
}: RegisterInteractionRoutesOptions,
|
||||||
) => {
|
) => {
|
||||||
|
chatRouter.post("/sessions/:session_id/credential-refreshes", async (req, res) => {
|
||||||
|
const parsed = credentialRefreshPayloadSchema.safeParse(req.body);
|
||||||
|
if (!parsed.success) {
|
||||||
|
res.status(400).json({
|
||||||
|
message: "invalid request payload",
|
||||||
|
detail: parsed.error.flatten(),
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const authContext = getAgentAuthContext(req);
|
||||||
|
const actorKey = toActorKey(authContext.userId);
|
||||||
|
const projectKey = toProjectKey(authContext.projectId);
|
||||||
|
const sessionRecord = await sessionMetadataStore.get(
|
||||||
|
{
|
||||||
|
actorKey,
|
||||||
|
projectId: authContext.projectId,
|
||||||
|
projectKey,
|
||||||
|
userId: authContext.userId,
|
||||||
|
},
|
||||||
|
req.params.session_id,
|
||||||
|
);
|
||||||
|
if (!sessionRecord) {
|
||||||
|
res.status(404).json({ message: "session not found" });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const current = getRuntimeSessionContext(sessionRecord.sessionId);
|
||||||
|
if (!current || current.actorKey !== actorKey || current.projectKey !== projectKey) {
|
||||||
|
res.status(409).json({ message: "runtime session context unavailable" });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
credentialRefreshCoordinator.getPendingRequestId(sessionRecord.sessionId) !==
|
||||||
|
parsed.data.request_id
|
||||||
|
) {
|
||||||
|
res.status(409).json({ message: "credential refresh request is no longer pending" });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const refreshedContext = {
|
||||||
|
...current,
|
||||||
|
accessToken: authContext.accessToken,
|
||||||
|
authExpired: undefined,
|
||||||
|
network: authContext.network,
|
||||||
|
projectId: authContext.projectId,
|
||||||
|
tokenExpiresAt: authContext.tokenExpiresAt,
|
||||||
|
traceId: req.header("x-trace-id")?.trim() || current.traceId,
|
||||||
|
};
|
||||||
|
setRuntimeSessionContext(refreshedContext);
|
||||||
|
credentialRefreshCoordinator.resolve(
|
||||||
|
sessionRecord.sessionId,
|
||||||
|
parsed.data.request_id,
|
||||||
|
refreshedContext,
|
||||||
|
);
|
||||||
|
res.status(202).json({
|
||||||
|
session_id: sessionRecord.sessionId,
|
||||||
|
request_id: parsed.data.request_id,
|
||||||
|
status: "accepted",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
chatRouter.post("/sessions/:session_id/permission-responses", async (req, res) => {
|
chatRouter.post("/sessions/:session_id/permission-responses", async (req, res) => {
|
||||||
const parsed = permissionReplyPayloadSchema.safeParse(req.body);
|
const parsed = permissionReplyPayloadSchema.safeParse(req.body);
|
||||||
if (!parsed.success) {
|
if (!parsed.success) {
|
||||||
|
|||||||
@@ -0,0 +1,56 @@
|
|||||||
|
export type ApprovalMode = "request" | "auto" | "always";
|
||||||
|
|
||||||
|
const lowRiskToolPermissions = new Set([
|
||||||
|
"apply_layer_style",
|
||||||
|
"geocode",
|
||||||
|
"locate_features",
|
||||||
|
"render_junctions",
|
||||||
|
"show_chart",
|
||||||
|
"view_history",
|
||||||
|
"view_scada",
|
||||||
|
"web_search",
|
||||||
|
"zoom_to_map",
|
||||||
|
]);
|
||||||
|
|
||||||
|
const normalizePermission = (permission: string) => permission.trim().toLowerCase();
|
||||||
|
|
||||||
|
export const canAutoApprovePermission = (permission: string): boolean => {
|
||||||
|
const normalized = normalizePermission(permission);
|
||||||
|
if (lowRiskToolPermissions.has(normalized)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (normalized.startsWith("tjwater_")) {
|
||||||
|
return lowRiskToolPermissions.has(normalized.slice("tjwater_".length));
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const resolvePermissionApproval = (
|
||||||
|
approvalMode: ApprovalMode,
|
||||||
|
permission: string,
|
||||||
|
) => {
|
||||||
|
if (approvalMode === "always") {
|
||||||
|
return {
|
||||||
|
autoApprove: true,
|
||||||
|
title: "已按始终允许模式放行",
|
||||||
|
detail:
|
||||||
|
"当前会话处于始终允许模式,已放行本次权限请求;明确禁止的权限仍由 OpenCode 拒绝。",
|
||||||
|
} as const;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (approvalMode === "auto" && canAutoApprovePermission(permission)) {
|
||||||
|
return {
|
||||||
|
autoApprove: true,
|
||||||
|
title: "已自动批准低风险权限",
|
||||||
|
detail: "当前批准模式允许自动执行低风险工具,已放行本次请求。",
|
||||||
|
} as const;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
autoApprove: false,
|
||||||
|
title: "等待权限确认",
|
||||||
|
detail: undefined,
|
||||||
|
} as const;
|
||||||
|
};
|
||||||
+25
-19
@@ -46,6 +46,10 @@ import {
|
|||||||
type TodoItemPayload,
|
type TodoItemPayload,
|
||||||
type TodoUpdatePayload,
|
type TodoUpdatePayload,
|
||||||
} from "./chatStreamEvents.js";
|
} from "./chatStreamEvents.js";
|
||||||
|
import {
|
||||||
|
resolvePermissionApproval,
|
||||||
|
type ApprovalMode,
|
||||||
|
} from "./chatPermissionPolicy.js";
|
||||||
|
|
||||||
export {
|
export {
|
||||||
collectTextContent,
|
collectTextContent,
|
||||||
@@ -55,7 +59,7 @@ export {
|
|||||||
type TodoUpdatePayload,
|
type TodoUpdatePayload,
|
||||||
} from "./chatStreamEvents.js";
|
} from "./chatStreamEvents.js";
|
||||||
|
|
||||||
export type ApprovalMode = "request" | "always";
|
export type { ApprovalMode } from "./chatPermissionPolicy.js";
|
||||||
|
|
||||||
type StreamPromptOptions = {
|
type StreamPromptOptions = {
|
||||||
runtime: OpencodeRuntimeAdapter;
|
runtime: OpencodeRuntimeAdapter;
|
||||||
@@ -372,6 +376,10 @@ export const streamPromptResponse = async ({
|
|||||||
|
|
||||||
if (isPermissionAskedEvent(event)) {
|
if (isPermissionAskedEvent(event)) {
|
||||||
sawResponseActivity = true;
|
sawResponseActivity = true;
|
||||||
|
const permissionApproval = resolvePermissionApproval(
|
||||||
|
approvalMode,
|
||||||
|
event.properties.permission,
|
||||||
|
);
|
||||||
logDevelopmentDebug("permission request received", {
|
logDevelopmentDebug("permission request received", {
|
||||||
...debugContext,
|
...debugContext,
|
||||||
requestId: event.properties.id,
|
requestId: event.properties.id,
|
||||||
@@ -382,23 +390,20 @@ export const streamPromptResponse = async ({
|
|||||||
emitProgress({
|
emitProgress({
|
||||||
id: `permission-${event.properties.id}`,
|
id: `permission-${event.properties.id}`,
|
||||||
phase: "permission",
|
phase: "permission",
|
||||||
status: approvalMode === "always" ? "completed" : "running",
|
status: permissionApproval.autoApprove ? "completed" : "running",
|
||||||
title: approvalMode === "always" ? "已自动允许权限请求" : "等待权限确认",
|
title: permissionApproval.title,
|
||||||
detail:
|
detail: permissionApproval.detail ?? buildPermissionDetail(event),
|
||||||
approvalMode === "always"
|
|
||||||
? "当前批准模式为始终允许,已自动允许本次权限请求。"
|
|
||||||
: buildPermissionDetail(event),
|
|
||||||
});
|
});
|
||||||
if (approvalMode === "always") {
|
if (permissionApproval.autoApprove) {
|
||||||
await runtime.replyPermission({
|
await runtime.replyPermission({
|
||||||
requestId: event.properties.id,
|
requestId: event.properties.id,
|
||||||
sessionId,
|
sessionId,
|
||||||
reply: "always",
|
reply: "once",
|
||||||
});
|
});
|
||||||
write("permission_response", {
|
write("permission_response", {
|
||||||
session_id: clientSessionId,
|
session_id: clientSessionId,
|
||||||
request_id: event.properties.id,
|
request_id: event.properties.id,
|
||||||
reply: "always" satisfies PermissionReply,
|
reply: "once" satisfies PermissionReply,
|
||||||
});
|
});
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -417,6 +422,10 @@ export const streamPromptResponse = async ({
|
|||||||
|
|
||||||
if (isPermissionV2AskedEvent(event)) {
|
if (isPermissionV2AskedEvent(event)) {
|
||||||
sawResponseActivity = true;
|
sawResponseActivity = true;
|
||||||
|
const permissionApproval = resolvePermissionApproval(
|
||||||
|
approvalMode,
|
||||||
|
event.properties.action,
|
||||||
|
);
|
||||||
logDevelopmentDebug("permission v2 request received", {
|
logDevelopmentDebug("permission v2 request received", {
|
||||||
...debugContext,
|
...debugContext,
|
||||||
requestId: event.properties.id,
|
requestId: event.properties.id,
|
||||||
@@ -427,23 +436,20 @@ export const streamPromptResponse = async ({
|
|||||||
emitProgress({
|
emitProgress({
|
||||||
id: `permission-${event.properties.id}`,
|
id: `permission-${event.properties.id}`,
|
||||||
phase: "permission",
|
phase: "permission",
|
||||||
status: approvalMode === "always" ? "completed" : "running",
|
status: permissionApproval.autoApprove ? "completed" : "running",
|
||||||
title: approvalMode === "always" ? "已自动允许权限请求" : "等待权限确认",
|
title: permissionApproval.title,
|
||||||
detail:
|
detail: permissionApproval.detail ?? buildPermissionV2Detail(event),
|
||||||
approvalMode === "always"
|
|
||||||
? "当前批准模式为始终允许,已自动允许本次权限请求。"
|
|
||||||
: buildPermissionV2Detail(event),
|
|
||||||
});
|
});
|
||||||
if (approvalMode === "always") {
|
if (permissionApproval.autoApprove) {
|
||||||
await runtime.replyPermission({
|
await runtime.replyPermission({
|
||||||
requestId: event.properties.id,
|
requestId: event.properties.id,
|
||||||
sessionId,
|
sessionId,
|
||||||
reply: "always",
|
reply: "once",
|
||||||
});
|
});
|
||||||
write("permission_response", {
|
write("permission_response", {
|
||||||
session_id: clientSessionId,
|
session_id: clientSessionId,
|
||||||
request_id: event.properties.id,
|
request_id: event.properties.id,
|
||||||
reply: "always" satisfies PermissionReply,
|
reply: "once" satisfies PermissionReply,
|
||||||
});
|
});
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
+60
-15
@@ -1,6 +1,5 @@
|
|||||||
import {
|
import {
|
||||||
createOpencode,
|
createOpencode,
|
||||||
createOpencodeClient,
|
|
||||||
type OpencodeClient,
|
type OpencodeClient,
|
||||||
} from "@opencode-ai/sdk/v2";
|
} from "@opencode-ai/sdk/v2";
|
||||||
import { existsSync, readFileSync } from "node:fs";
|
import { existsSync, readFileSync } from "node:fs";
|
||||||
@@ -64,6 +63,64 @@ export class OpencodeRuntimeAdapter {
|
|||||||
return requireData(response.data, "global.health");
|
return requireData(response.data, "global.health");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async warmup(): Promise<void> {
|
||||||
|
const client = await this.ensureClient();
|
||||||
|
const healthStartedAt = Date.now();
|
||||||
|
const healthResponse = await client.global.health();
|
||||||
|
const health = requireData(healthResponse.data, "global.health");
|
||||||
|
logDevelopmentDebug("opencode warmup health check completed", {
|
||||||
|
elapsedMs: Math.max(0, Date.now() - healthStartedAt),
|
||||||
|
healthy: health.healthy,
|
||||||
|
version: health.version,
|
||||||
|
});
|
||||||
|
|
||||||
|
const sessionStartedAt = Date.now();
|
||||||
|
const sessionResponse = await client.session.create({
|
||||||
|
title: "tjwater-agent-warmup",
|
||||||
|
});
|
||||||
|
const session = requireData(sessionResponse.data, "session.create");
|
||||||
|
logDevelopmentDebug("opencode warmup session created", {
|
||||||
|
elapsedMs: Math.max(0, Date.now() - sessionStartedAt),
|
||||||
|
sessionId: session.id,
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
const [provider, model] = config.OPENCODE_MODEL.split("/");
|
||||||
|
if (!provider || !model) {
|
||||||
|
throw new Error(
|
||||||
|
`invalid OPENCODE_MODEL; expected provider/model, received ${config.OPENCODE_MODEL}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const toolsStartedAt = Date.now();
|
||||||
|
const toolsResponse = await client.tool.list({ provider, model });
|
||||||
|
const tools = requireData(toolsResponse.data, "tool.list");
|
||||||
|
logDevelopmentDebug("opencode warmup tools loaded", {
|
||||||
|
elapsedMs: Math.max(0, Date.now() - toolsStartedAt),
|
||||||
|
model: config.OPENCODE_MODEL,
|
||||||
|
sessionId: session.id,
|
||||||
|
toolCount: tools.length,
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
const cleanupStartedAt = Date.now();
|
||||||
|
let cleanupSucceeded = true;
|
||||||
|
await client.session.delete(
|
||||||
|
{ sessionID: session.id },
|
||||||
|
{ throwOnError: true },
|
||||||
|
).catch((error) => {
|
||||||
|
cleanupSucceeded = false;
|
||||||
|
logger.warn(
|
||||||
|
{ err: error, sessionId: session.id },
|
||||||
|
"failed to remove opencode warmup session",
|
||||||
|
);
|
||||||
|
});
|
||||||
|
logDevelopmentDebug("opencode warmup session cleanup completed", {
|
||||||
|
elapsedMs: Math.max(0, Date.now() - cleanupStartedAt),
|
||||||
|
sessionId: session.id,
|
||||||
|
succeeded: cleanupSucceeded,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async createSession(title?: string) {
|
async createSession(title?: string) {
|
||||||
const client = await this.ensureClient();
|
const client = await this.ensureClient();
|
||||||
const response = await client.session.create({
|
const response = await client.session.create({
|
||||||
@@ -329,19 +386,6 @@ export class OpencodeRuntimeAdapter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async bootstrapClient(): Promise<OpencodeClient> {
|
private async bootstrapClient(): Promise<OpencodeClient> {
|
||||||
if (config.OPENCODE_MODE === "client") {
|
|
||||||
logger.info(
|
|
||||||
{
|
|
||||||
baseUrl: config.OPENCODE_CLIENT_BASE_URL,
|
|
||||||
mode: config.OPENCODE_MODE,
|
|
||||||
},
|
|
||||||
"connecting to opencode server in client mode",
|
|
||||||
);
|
|
||||||
return createOpencodeClient({
|
|
||||||
baseUrl: config.OPENCODE_CLIENT_BASE_URL,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// embedded 模式下,把服务内工具桥地址注入到 opencode 进程环境里,
|
// embedded 模式下,把服务内工具桥地址注入到 opencode 进程环境里,
|
||||||
// 这样 .opencode/tools 下的自定义工具可以回调本服务。
|
// 这样 .opencode/tools 下的自定义工具可以回调本服务。
|
||||||
process.env.TJWATER_AGENT_INTERNAL_BASE_URL = `http://127.0.0.1:${config.PORT}`;
|
process.env.TJWATER_AGENT_INTERNAL_BASE_URL = `http://127.0.0.1:${config.PORT}`;
|
||||||
@@ -349,6 +393,7 @@ export class OpencodeRuntimeAdapter {
|
|||||||
config.AGENT_INTERNAL_TOKEN ??
|
config.AGENT_INTERNAL_TOKEN ??
|
||||||
process.env.TJWATER_AGENT_INTERNAL_TOKEN ??
|
process.env.TJWATER_AGENT_INTERNAL_TOKEN ??
|
||||||
"";
|
"";
|
||||||
|
process.env.RESULT_REF_IMPORT_DIR = config.RESULT_REF_IMPORT_DIR;
|
||||||
|
|
||||||
logger.info(
|
logger.info(
|
||||||
{
|
{
|
||||||
@@ -372,7 +417,7 @@ export class OpencodeRuntimeAdapter {
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (isMissingOpencodeCli(error)) {
|
if (isMissingOpencodeCli(error)) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
"embedded mode requires the opencode CLI to be installed and available in PATH; otherwise set OPENCODE_MODE=client and provide OPENCODE_CLIENT_BASE_URL",
|
"embedded mode requires the opencode CLI to be installed and available in PATH",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
throw error;
|
throw error;
|
||||||
|
|||||||
+302
-116
@@ -4,6 +4,12 @@ import cors from "cors";
|
|||||||
import express from "express";
|
import express from "express";
|
||||||
|
|
||||||
import { requireAgentAuth } from "./auth/agentAuth.js";
|
import { requireAgentAuth } from "./auth/agentAuth.js";
|
||||||
|
import { buildBackendContextHeaders } from "./auth/backendContextHeaders.js";
|
||||||
|
import {
|
||||||
|
CredentialRefreshError,
|
||||||
|
CredentialRefreshCoordinator,
|
||||||
|
runWithCredentialRefresh,
|
||||||
|
} from "./auth/credentialRefresh.js";
|
||||||
import { SessionTranscriptStore } from "./sessions/transcriptStore.js";
|
import { SessionTranscriptStore } from "./sessions/transcriptStore.js";
|
||||||
import { ChatSessionBridge } from "./chat/sessionBridge.js";
|
import { ChatSessionBridge } from "./chat/sessionBridge.js";
|
||||||
import { config } from "./config.js";
|
import { config } from "./config.js";
|
||||||
@@ -11,6 +17,12 @@ import { SessionUiStateStore } from "./sessions/uiStateStore.js";
|
|||||||
import { SessionMetadataStore } from "./sessions/metadataStore.js";
|
import { SessionMetadataStore } from "./sessions/metadataStore.js";
|
||||||
import { logger } from "./logger.js";
|
import { logger } from "./logger.js";
|
||||||
import { LearningOrchestrator } from "./learning/orchestrator.js";
|
import { LearningOrchestrator } from "./learning/orchestrator.js";
|
||||||
|
import {
|
||||||
|
executeMemoryManager,
|
||||||
|
executeSkillManager,
|
||||||
|
type MemoryManagerInput,
|
||||||
|
type SkillManagerInput,
|
||||||
|
} from "./learning/toolManagers.js";
|
||||||
import { MemoryStore } from "./memory/store.js";
|
import { MemoryStore } from "./memory/store.js";
|
||||||
import { ResultReferenceResolver } from "./results/resolver.js";
|
import { ResultReferenceResolver } from "./results/resolver.js";
|
||||||
import {
|
import {
|
||||||
@@ -25,6 +37,8 @@ import {
|
|||||||
markRuntimeSessionAuthExpired,
|
markRuntimeSessionAuthExpired,
|
||||||
type RuntimeSessionContext,
|
type RuntimeSessionContext,
|
||||||
} from "./runtime/sessionContext.js";
|
} from "./runtime/sessionContext.js";
|
||||||
|
import { ensureDirectory } from "./utils/fileStore.js";
|
||||||
|
import { SkillStore } from "./skills/store.js";
|
||||||
|
|
||||||
const app = express();
|
const app = express();
|
||||||
|
|
||||||
@@ -33,17 +47,24 @@ const sessionBridge = new ChatSessionBridge(opencodeRuntime);
|
|||||||
const sessionMetadataStore = new SessionMetadataStore();
|
const sessionMetadataStore = new SessionMetadataStore();
|
||||||
const sessionUiStateStore = new SessionUiStateStore();
|
const sessionUiStateStore = new SessionUiStateStore();
|
||||||
const memoryStore = new MemoryStore();
|
const memoryStore = new MemoryStore();
|
||||||
|
const skillStore = new SkillStore();
|
||||||
const sessionTranscriptStore = new SessionTranscriptStore();
|
const sessionTranscriptStore = new SessionTranscriptStore();
|
||||||
const learningOrchestrator = new LearningOrchestrator(
|
const learningOrchestrator = new LearningOrchestrator(
|
||||||
opencodeRuntime,
|
opencodeRuntime,
|
||||||
memoryStore,
|
memoryStore,
|
||||||
sessionTranscriptStore,
|
sessionTranscriptStore,
|
||||||
|
skillStore,
|
||||||
);
|
);
|
||||||
const resultReferenceStore = new ResultReferenceStore();
|
const resultReferenceStore = new ResultReferenceStore();
|
||||||
const resultReferenceResolver = new ResultReferenceResolver(resultReferenceStore);
|
const resultReferenceResolver = new ResultReferenceResolver(
|
||||||
|
resultReferenceStore,
|
||||||
|
config.RESULT_REF_IMPORT_DIR,
|
||||||
|
config.RESULT_REF_IMPORT_MAX_BYTES,
|
||||||
|
);
|
||||||
const internalToken = config.AGENT_INTERNAL_TOKEN ?? randomUUID();
|
const internalToken = config.AGENT_INTERNAL_TOKEN ?? randomUUID();
|
||||||
|
const credentialRefreshCoordinator = new CredentialRefreshCoordinator();
|
||||||
|
|
||||||
// 这个 token 只用于仍需服务端上下文的工具桥(store_render_ref)。
|
// 这个 token 只用于 OpenCode 子进程回调本服务的内部工具桥。
|
||||||
process.env.TJWATER_AGENT_INTERNAL_TOKEN = internalToken;
|
process.env.TJWATER_AGENT_INTERNAL_TOKEN = internalToken;
|
||||||
|
|
||||||
app.use(cors());
|
app.use(cors());
|
||||||
@@ -54,6 +75,8 @@ app.get("/health", async (_req, res) => {
|
|||||||
const runtime = await opencodeRuntime.health();
|
const runtime = await opencodeRuntime.health();
|
||||||
res.json({
|
res.json({
|
||||||
ok: true,
|
ok: true,
|
||||||
|
ready: true,
|
||||||
|
warmed_up: true,
|
||||||
runtime,
|
runtime,
|
||||||
sessions: sessionBridge.count(),
|
sessions: sessionBridge.count(),
|
||||||
});
|
});
|
||||||
@@ -61,6 +84,8 @@ app.get("/health", async (_req, res) => {
|
|||||||
const detail = error instanceof Error ? error.message : String(error);
|
const detail = error instanceof Error ? error.message : String(error);
|
||||||
res.status(503).json({
|
res.status(503).json({
|
||||||
ok: false,
|
ok: false,
|
||||||
|
ready: false,
|
||||||
|
warmed_up: true,
|
||||||
message: "opencode runtime unavailable",
|
message: "opencode runtime unavailable",
|
||||||
detail,
|
detail,
|
||||||
sessions: sessionBridge.count(),
|
sessions: sessionBridge.count(),
|
||||||
@@ -68,6 +93,104 @@ app.get("/health", async (_req, res) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
app.post("/internal/tools/memory-manager", async (req, res) => {
|
||||||
|
if (req.header("x-agent-internal-token") !== internalToken) {
|
||||||
|
res.status(403).json({ message: "forbidden" });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const sessionId =
|
||||||
|
typeof req.body?.session_id === "string" ? req.body.session_id.trim() : "";
|
||||||
|
const context = sessionId ? getRuntimeSessionContext(sessionId) : null;
|
||||||
|
if (!context) {
|
||||||
|
res.status(404).json({
|
||||||
|
message: "session context not found",
|
||||||
|
detail: sessionId,
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const action = req.body?.action;
|
||||||
|
if (
|
||||||
|
typeof action !== "string" ||
|
||||||
|
!["add", "list", "replace", "remove"].includes(action) ||
|
||||||
|
typeof req.body?.scope !== "string"
|
||||||
|
) {
|
||||||
|
res.status(400).json({ message: "invalid memory manager request" });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
res.json(
|
||||||
|
await executeMemoryManager(memoryStore, context, {
|
||||||
|
action: action as MemoryManagerInput["action"],
|
||||||
|
content:
|
||||||
|
typeof req.body?.content === "string" ? req.body.content : undefined,
|
||||||
|
scope: req.body.scope,
|
||||||
|
target_id:
|
||||||
|
typeof req.body?.target_id === "string" ? req.body.target_id : undefined,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
res.status(500).json({
|
||||||
|
message: "memory manager failed",
|
||||||
|
detail: error instanceof Error ? error.message : String(error),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
app.post("/internal/tools/skill-manager", async (req, res) => {
|
||||||
|
if (req.header("x-agent-internal-token") !== internalToken) {
|
||||||
|
res.status(403).json({ message: "forbidden" });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const sessionId =
|
||||||
|
typeof req.body?.session_id === "string" ? req.body.session_id.trim() : "";
|
||||||
|
const context = sessionId ? getRuntimeSessionContext(sessionId) : null;
|
||||||
|
if (!context) {
|
||||||
|
res.status(404).json({ message: "session context not found", detail: sessionId });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const action = req.body?.action;
|
||||||
|
if (
|
||||||
|
typeof action !== "string" ||
|
||||||
|
![
|
||||||
|
"list",
|
||||||
|
"write_skill",
|
||||||
|
"remove_skill",
|
||||||
|
"append_pattern",
|
||||||
|
"remove_pattern",
|
||||||
|
"write_reference",
|
||||||
|
"remove_reference",
|
||||||
|
"write_script",
|
||||||
|
"remove_script",
|
||||||
|
].includes(action) ||
|
||||||
|
typeof req.body?.skill_path !== "string"
|
||||||
|
) {
|
||||||
|
res.status(400).json({ message: "invalid skill manager request" });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
res.json(
|
||||||
|
await executeSkillManager(skillStore, context, {
|
||||||
|
action: action as SkillManagerInput["action"],
|
||||||
|
content:
|
||||||
|
typeof req.body?.content === "string" ? req.body.content : undefined,
|
||||||
|
file_path:
|
||||||
|
typeof req.body?.file_path === "string" ? req.body.file_path : undefined,
|
||||||
|
pattern:
|
||||||
|
typeof req.body?.pattern === "string" ? req.body.pattern : undefined,
|
||||||
|
skill_path: req.body.skill_path,
|
||||||
|
target_id:
|
||||||
|
typeof req.body?.target_id === "string" ? req.body.target_id : undefined,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
res.status(500).json({
|
||||||
|
message: "skill manager failed",
|
||||||
|
detail: error instanceof Error ? error.message : String(error),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
app.post("/internal/tools/tjwater-cli-call", async (req, res) => {
|
app.post("/internal/tools/tjwater-cli-call", async (req, res) => {
|
||||||
if (req.header("x-agent-internal-token") !== internalToken) {
|
if (req.header("x-agent-internal-token") !== internalToken) {
|
||||||
res.status(403).json({ message: "forbidden" });
|
res.status(403).json({ message: "forbidden" });
|
||||||
@@ -84,15 +207,6 @@ app.post("/internal/tools/tjwater-cli-call", async (req, res) => {
|
|||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (isRuntimeAuthExpired(context)) {
|
|
||||||
markAuthExpired(context, "access_token_expired");
|
|
||||||
res.status(401).json({
|
|
||||||
message: "access token expired; refresh chat context",
|
|
||||||
detail: sessionId,
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const command = typeof req.body?.command === "string" ? req.body.command.trim() : "";
|
const command = typeof req.body?.command === "string" ? req.body.command.trim() : "";
|
||||||
if (!command) {
|
if (!command) {
|
||||||
res.status(400).json({ message: "command is required" });
|
res.status(400).json({ message: "command is required" });
|
||||||
@@ -110,46 +224,35 @@ app.post("/internal/tools/tjwater-cli-call", async (req, res) => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const authJson = JSON.stringify({
|
let result;
|
||||||
server: config.TJWATER_API_BASE_URL,
|
try {
|
||||||
access_token: context.accessToken,
|
result = await runWithCredentialRefresh(
|
||||||
project_id: context.projectId,
|
credentialRefreshCoordinator,
|
||||||
});
|
context,
|
||||||
|
(activeContext) => executeCliCommand(activeContext, command, timeoutSec),
|
||||||
const cliArgs = ["--auth-stdin", ...command.split(/\s+/).filter(Boolean)];
|
);
|
||||||
|
} catch (error) {
|
||||||
const child = spawn(config.TJWATER_CLI_PATH, cliArgs, {
|
if (!(error instanceof CredentialRefreshError)) {
|
||||||
stdio: ["pipe", "pipe", "pipe"],
|
const detail = error instanceof Error ? error.message : String(error);
|
||||||
});
|
res.status(502).json({
|
||||||
|
message: "CLI execution failed",
|
||||||
let stdout = "";
|
detail,
|
||||||
let stderr = "";
|
});
|
||||||
child.stdout.on("data", (data: Buffer) => {
|
return;
|
||||||
stdout += data.toString("utf-8");
|
}
|
||||||
});
|
if (error.code === "cancelled") {
|
||||||
child.stderr.on("data", (data: Buffer) => {
|
res.status(409).json({ message: "agent run was aborted" });
|
||||||
stderr += data.toString("utf-8");
|
return;
|
||||||
});
|
}
|
||||||
|
markAuthExpired(context, "access_token_expired");
|
||||||
child.stdin.write(authJson);
|
res.status(401).json({
|
||||||
child.stdin.end();
|
message: "credential refresh failed",
|
||||||
|
detail: error instanceof Error ? error.message : String(error),
|
||||||
const exitCode = await new Promise<number | null>((resolve, reject) => {
|
|
||||||
const timer = setTimeout(() => {
|
|
||||||
child.kill("SIGTERM");
|
|
||||||
resolve(-1);
|
|
||||||
}, timeoutSec * 1000);
|
|
||||||
child.on("close", (code) => {
|
|
||||||
clearTimeout(timer);
|
|
||||||
resolve(code);
|
|
||||||
});
|
});
|
||||||
child.on("error", (err) => {
|
return;
|
||||||
clearTimeout(timer);
|
}
|
||||||
reject(err);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
if (exitCode === -1) {
|
if (result.status === 504) {
|
||||||
res.status(504).json({
|
res.status(504).json({
|
||||||
ok: false,
|
ok: false,
|
||||||
schema_version: "tjwater-cli/v1",
|
schema_version: "tjwater-cli/v1",
|
||||||
@@ -163,29 +266,102 @@ app.post("/internal/tools/tjwater-cli-call", async (req, res) => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (exitCode !== 0) {
|
if (result.status === 401) {
|
||||||
res.status(502).json({
|
markAuthExpired(
|
||||||
ok: false,
|
getRuntimeSessionContext(sessionId) ?? context,
|
||||||
exit_code: exitCode,
|
"access_token_rejected",
|
||||||
stderr: stderr.slice(0, 2000),
|
);
|
||||||
stdout: stdout.slice(0, 2000),
|
}
|
||||||
message: `CLI exited with code ${exitCode}`,
|
if (result.exitCode !== 0) {
|
||||||
});
|
res
|
||||||
|
.status(result.status)
|
||||||
|
.type("application/json")
|
||||||
|
.send(
|
||||||
|
result.stdout ||
|
||||||
|
JSON.stringify({
|
||||||
|
ok: false,
|
||||||
|
exit_code: result.exitCode,
|
||||||
|
stderr: result.stderr.slice(0, 2000),
|
||||||
|
message: `CLI exited with code ${result.exitCode}`,
|
||||||
|
}),
|
||||||
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
res.json(JSON.parse(stdout));
|
res.json(JSON.parse(result.stdout));
|
||||||
} catch {
|
} catch {
|
||||||
res.json({
|
res.json({
|
||||||
ok: true,
|
ok: true,
|
||||||
schema_version: "tjwater-cli/v1",
|
schema_version: "tjwater-cli/v1",
|
||||||
raw: stdout,
|
raw: result.stdout,
|
||||||
stderr: stderr || undefined,
|
stderr: result.stderr || undefined,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const executeCliCommand = async (
|
||||||
|
context: RuntimeSessionContext,
|
||||||
|
command: string,
|
||||||
|
timeoutSec: number,
|
||||||
|
) => {
|
||||||
|
const child = spawn(
|
||||||
|
config.TJWATER_CLI_PATH,
|
||||||
|
["--auth-stdin", ...command.split(/\s+/).filter(Boolean)],
|
||||||
|
{ stdio: ["pipe", "pipe", "pipe"] },
|
||||||
|
);
|
||||||
|
let stdout = "";
|
||||||
|
let stderr = "";
|
||||||
|
child.stdout.on("data", (data: Buffer) => {
|
||||||
|
stdout += data.toString("utf-8");
|
||||||
|
});
|
||||||
|
child.stderr.on("data", (data: Buffer) => {
|
||||||
|
stderr += data.toString("utf-8");
|
||||||
|
});
|
||||||
|
child.stdin.write(
|
||||||
|
JSON.stringify({
|
||||||
|
server: config.TJWATER_API_BASE_URL,
|
||||||
|
access_token: context.accessToken,
|
||||||
|
project_id: context.projectId,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
child.stdin.end();
|
||||||
|
|
||||||
|
const exitCode = await new Promise<number | null>((resolve, reject) => {
|
||||||
|
const timer = setTimeout(() => {
|
||||||
|
child.kill("SIGTERM");
|
||||||
|
resolve(-1);
|
||||||
|
}, timeoutSec * 1000);
|
||||||
|
child.on("close", (code) => {
|
||||||
|
clearTimeout(timer);
|
||||||
|
resolve(code);
|
||||||
|
});
|
||||||
|
child.on("error", (error) => {
|
||||||
|
clearTimeout(timer);
|
||||||
|
reject(error);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
let errorCode = "";
|
||||||
|
try {
|
||||||
|
const payload = JSON.parse(stdout) as { error?: { code?: unknown } };
|
||||||
|
errorCode =
|
||||||
|
typeof payload.error?.code === "string" ? payload.error.code : "";
|
||||||
|
} catch {
|
||||||
|
errorCode = "";
|
||||||
|
}
|
||||||
|
const status =
|
||||||
|
exitCode === -1
|
||||||
|
? 504
|
||||||
|
: errorCode === "HTTP_401" || errorCode === "UNAUTHENTICATED"
|
||||||
|
? 401
|
||||||
|
: errorCode === "HTTP_403"
|
||||||
|
? 403
|
||||||
|
: exitCode === 0
|
||||||
|
? 200
|
||||||
|
: 502;
|
||||||
|
return { exitCode, status, stderr, stdout };
|
||||||
|
};
|
||||||
|
|
||||||
app.post("/internal/tools/store-render-ref", async (req, res) => {
|
app.post("/internal/tools/store-render-ref", async (req, res) => {
|
||||||
if (req.header("x-agent-internal-token") !== internalToken) {
|
if (req.header("x-agent-internal-token") !== internalToken) {
|
||||||
res.status(403).json({ message: "forbidden" });
|
res.status(403).json({ message: "forbidden" });
|
||||||
@@ -276,45 +452,60 @@ const callBackendJson = async (
|
|||||||
context: RuntimeSessionContext,
|
context: RuntimeSessionContext,
|
||||||
payload: unknown,
|
payload: unknown,
|
||||||
) => {
|
) => {
|
||||||
if (isRuntimeAuthExpired(context)) {
|
try {
|
||||||
|
const result = await runWithCredentialRefresh(
|
||||||
|
credentialRefreshCoordinator,
|
||||||
|
context,
|
||||||
|
async (activeContext) => {
|
||||||
|
const controller = new AbortController();
|
||||||
|
const timer = setTimeout(
|
||||||
|
() => controller.abort(),
|
||||||
|
config.TJWATER_API_TIMEOUT_MS,
|
||||||
|
);
|
||||||
|
try {
|
||||||
|
const response = await fetch(
|
||||||
|
new URL(path, config.TJWATER_API_BASE_URL),
|
||||||
|
{
|
||||||
|
method: "POST",
|
||||||
|
headers: buildBackendContextHeaders(activeContext),
|
||||||
|
body: JSON.stringify(payload),
|
||||||
|
signal: controller.signal,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
ok: response.ok,
|
||||||
|
status: response.status,
|
||||||
|
text: await response.text(),
|
||||||
|
};
|
||||||
|
} finally {
|
||||||
|
clearTimeout(timer);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
if (result.status === 401) {
|
||||||
|
markAuthExpired(
|
||||||
|
getRuntimeSessionContext(context.sessionId) ?? context,
|
||||||
|
"access_token_rejected",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
} catch (error) {
|
||||||
|
if (!(error instanceof CredentialRefreshError)) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
if (error.code === "cancelled") {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
markAuthExpired(context, "access_token_expired");
|
markAuthExpired(context, "access_token_expired");
|
||||||
return {
|
return {
|
||||||
ok: false,
|
ok: false,
|
||||||
status: 401,
|
status: 401,
|
||||||
text: JSON.stringify({
|
text: JSON.stringify({
|
||||||
message: "access token expired; refresh chat context",
|
message: "credential refresh failed",
|
||||||
|
detail: error instanceof Error ? error.message : String(error),
|
||||||
}),
|
}),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
const controller = new AbortController();
|
|
||||||
const timer = setTimeout(() => controller.abort(), config.TJWATER_API_TIMEOUT_MS);
|
|
||||||
try {
|
|
||||||
const headers: Record<string, string> = {
|
|
||||||
Accept: "application/json",
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
};
|
|
||||||
if (context.accessToken) {
|
|
||||||
headers.Authorization = `Bearer ${context.accessToken}`;
|
|
||||||
}
|
|
||||||
const response = await fetch(new URL(path, config.TJWATER_API_BASE_URL), {
|
|
||||||
method: "POST",
|
|
||||||
headers,
|
|
||||||
body: JSON.stringify(payload),
|
|
||||||
signal: controller.signal,
|
|
||||||
});
|
|
||||||
const text = await response.text();
|
|
||||||
if (response.status === 401) {
|
|
||||||
markAuthExpired(context, "access_token_rejected");
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
ok: response.ok,
|
|
||||||
status: response.status,
|
|
||||||
text,
|
|
||||||
};
|
|
||||||
} finally {
|
|
||||||
clearTimeout(timer);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const parseStringArray = (value: unknown) =>
|
const parseStringArray = (value: unknown) =>
|
||||||
@@ -337,19 +528,6 @@ const normalizeWebSearchFreshness = (value: unknown) => {
|
|||||||
return webSearchFreshnessMap[value] ?? value;
|
return webSearchFreshnessMap[value] ?? value;
|
||||||
};
|
};
|
||||||
|
|
||||||
const AUTH_EXPIRY_SKEW_MS = 30_000;
|
|
||||||
|
|
||||||
function isRuntimeAuthExpired(context: RuntimeSessionContext) {
|
|
||||||
if (!context.tokenExpiresAt) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
const expiresAt = Date.parse(context.tokenExpiresAt);
|
|
||||||
if (!Number.isFinite(expiresAt)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return Date.now() >= expiresAt - AUTH_EXPIRY_SKEW_MS;
|
|
||||||
}
|
|
||||||
|
|
||||||
function markAuthExpired(
|
function markAuthExpired(
|
||||||
context: RuntimeSessionContext,
|
context: RuntimeSessionContext,
|
||||||
reason: NonNullable<RuntimeSessionContext["authExpired"]>["reason"],
|
reason: NonNullable<RuntimeSessionContext["authExpired"]>["reason"],
|
||||||
@@ -471,6 +649,7 @@ const chatRouter = buildChatRouter(
|
|||||||
sessionTranscriptStore,
|
sessionTranscriptStore,
|
||||||
learningOrchestrator,
|
learningOrchestrator,
|
||||||
resultReferenceResolver,
|
resultReferenceResolver,
|
||||||
|
credentialRefreshCoordinator,
|
||||||
);
|
);
|
||||||
const authenticatedChatRouter = express.Router();
|
const authenticatedChatRouter = express.Router();
|
||||||
authenticatedChatRouter.use(requireAgentAuth, chatRouter);
|
authenticatedChatRouter.use(requireAgentAuth, chatRouter);
|
||||||
@@ -486,25 +665,15 @@ const bootstrap = async () => {
|
|||||||
learningOrchestrator.initialize(),
|
learningOrchestrator.initialize(),
|
||||||
memoryStore.initialize(),
|
memoryStore.initialize(),
|
||||||
resultReferenceStore.initialize(),
|
resultReferenceStore.initialize(),
|
||||||
|
ensureDirectory(config.RESULT_REF_IMPORT_DIR),
|
||||||
sessionTranscriptStore.initialize(),
|
sessionTranscriptStore.initialize(),
|
||||||
]);
|
]);
|
||||||
resultReferenceStore.startCleanupLoop();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
await bootstrap();
|
|
||||||
|
|
||||||
const server = app.listen(config.PORT, config.HOST, () => {
|
|
||||||
logger.info(
|
|
||||||
{ host: config.HOST, port: config.PORT },
|
|
||||||
"TJWaterAgent listening",
|
|
||||||
);
|
|
||||||
void warmupOpencodeRuntime();
|
|
||||||
});
|
|
||||||
|
|
||||||
const warmupOpencodeRuntime = async () => {
|
const warmupOpencodeRuntime = async () => {
|
||||||
const startedAt = Date.now();
|
const startedAt = Date.now();
|
||||||
try {
|
try {
|
||||||
await opencodeRuntime.ensureClient();
|
await opencodeRuntime.warmup();
|
||||||
logger.info(
|
logger.info(
|
||||||
{
|
{
|
||||||
elapsedMs: Math.max(0, Date.now() - startedAt),
|
elapsedMs: Math.max(0, Date.now() - startedAt),
|
||||||
@@ -521,9 +690,26 @@ const warmupOpencodeRuntime = async () => {
|
|||||||
},
|
},
|
||||||
"failed to warm up opencode runtime",
|
"failed to warm up opencode runtime",
|
||||||
);
|
);
|
||||||
|
throw error;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
await bootstrap();
|
||||||
|
await warmupOpencodeRuntime();
|
||||||
|
resultReferenceStore.startCleanupLoop();
|
||||||
|
|
||||||
|
const server = app.listen(config.PORT, config.HOST, () => {
|
||||||
|
logger.info(
|
||||||
|
{
|
||||||
|
host: config.HOST,
|
||||||
|
port: config.PORT,
|
||||||
|
ready: true,
|
||||||
|
warmedUp: true,
|
||||||
|
},
|
||||||
|
"TJWaterAgent listening",
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
const shutdown = async () => {
|
const shutdown = async () => {
|
||||||
logger.info("shutting down TJWaterAgent");
|
logger.info("shutting down TJWaterAgent");
|
||||||
server.close();
|
server.close();
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import { describe, expect, it } from "bun:test";
|
||||||
|
|
||||||
|
import { buildBackendContextHeaders } from "../../src/auth/backendContextHeaders.js";
|
||||||
|
|
||||||
|
describe("buildBackendContextHeaders", () => {
|
||||||
|
it("forwards authenticated project and trace context to the backend", () => {
|
||||||
|
expect(
|
||||||
|
buildBackendContextHeaders({
|
||||||
|
accessToken: "access-token-1",
|
||||||
|
projectId: "project-id-1",
|
||||||
|
traceId: "trace-id-1",
|
||||||
|
}),
|
||||||
|
).toEqual({
|
||||||
|
Accept: "application/json",
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
Authorization: "Bearer access-token-1",
|
||||||
|
"X-Project-Id": "project-id-1",
|
||||||
|
"X-Trace-Id": "trace-id-1",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("omits optional authentication and project headers when unavailable", () => {
|
||||||
|
expect(buildBackendContextHeaders({ traceId: "trace-id-2" })).toEqual({
|
||||||
|
Accept: "application/json",
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
"X-Trace-Id": "trace-id-2",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
import { describe, expect, test } from "bun:test";
|
||||||
|
|
||||||
|
import {
|
||||||
|
CredentialRefreshCoordinator,
|
||||||
|
CredentialRefreshError,
|
||||||
|
runWithCredentialRefresh,
|
||||||
|
} from "../../src/auth/credentialRefresh.js";
|
||||||
|
import { type RuntimeSessionContext } from "../../src/runtime/sessionContext.js";
|
||||||
|
|
||||||
|
const context = (overrides: Partial<RuntimeSessionContext> = {}) => ({
|
||||||
|
accessToken: "old-token",
|
||||||
|
actorKey: "user-1",
|
||||||
|
clientSessionId: "client-1",
|
||||||
|
projectId: "project-1",
|
||||||
|
projectKey: "project-1",
|
||||||
|
sessionId: "session-1",
|
||||||
|
traceId: "trace-1",
|
||||||
|
...overrides,
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("CredentialRefreshCoordinator", () => {
|
||||||
|
test("deduplicates concurrent refreshes for one session", async () => {
|
||||||
|
const coordinator = new CredentialRefreshCoordinator();
|
||||||
|
const requestIds: string[] = [];
|
||||||
|
coordinator.subscribe("session-1", (event) => {
|
||||||
|
if (event.type === "credential_refresh_required") {
|
||||||
|
requestIds.push(event.requestId);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
const expired = context({ tokenExpiresAt: new Date(0).toISOString() });
|
||||||
|
const execute = async (active: RuntimeSessionContext) => ({
|
||||||
|
status: 200,
|
||||||
|
token: active.accessToken,
|
||||||
|
});
|
||||||
|
|
||||||
|
const first = runWithCredentialRefresh(coordinator, expired, execute);
|
||||||
|
const second = runWithCredentialRefresh(coordinator, expired, execute);
|
||||||
|
await Promise.resolve();
|
||||||
|
expect(requestIds).toHaveLength(1);
|
||||||
|
expect(coordinator.getPendingEvent("session-1")).toMatchObject({
|
||||||
|
type: "credential_refresh_required",
|
||||||
|
requestId: requestIds[0],
|
||||||
|
reason: "access_token_expired",
|
||||||
|
});
|
||||||
|
coordinator.resolve(
|
||||||
|
"session-1",
|
||||||
|
requestIds[0]!,
|
||||||
|
context({ accessToken: "fresh-token" }),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(await first).toEqual({ status: 200, token: "fresh-token" });
|
||||||
|
expect(await second).toEqual({ status: 200, token: "fresh-token" });
|
||||||
|
expect(coordinator.getPendingEvent("session-1")).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
test("retries one time on 401 and never refreshes a 403", async () => {
|
||||||
|
const coordinator = new CredentialRefreshCoordinator();
|
||||||
|
let requestId = "";
|
||||||
|
coordinator.subscribe("session-1", (event) => {
|
||||||
|
if (event.type === "credential_refresh_required") {
|
||||||
|
requestId = event.requestId;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
let attempts = 0;
|
||||||
|
const resultPromise = runWithCredentialRefresh(
|
||||||
|
coordinator,
|
||||||
|
context(),
|
||||||
|
async () => ({ status: ++attempts === 1 ? 401 : 401 }),
|
||||||
|
);
|
||||||
|
await Promise.resolve();
|
||||||
|
coordinator.resolve("session-1", requestId, context({ accessToken: "fresh-token" }));
|
||||||
|
expect((await resultPromise).status).toBe(401);
|
||||||
|
expect(attempts).toBe(2);
|
||||||
|
|
||||||
|
requestId = "";
|
||||||
|
expect(
|
||||||
|
(await runWithCredentialRefresh(coordinator, context(), async () => ({ status: 403 })))
|
||||||
|
.status,
|
||||||
|
).toBe(403);
|
||||||
|
expect(requestId).toBe("");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("fails explicitly when no event stream can refresh credentials", async () => {
|
||||||
|
await expect(
|
||||||
|
runWithCredentialRefresh(
|
||||||
|
new CredentialRefreshCoordinator(),
|
||||||
|
context({ tokenExpiresAt: new Date(0).toISOString() }),
|
||||||
|
async () => ({ status: 200 }),
|
||||||
|
),
|
||||||
|
).rejects.toBeInstanceOf(CredentialRefreshError);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("reports run cancellation separately from authentication failure", async () => {
|
||||||
|
const coordinator = new CredentialRefreshCoordinator();
|
||||||
|
coordinator.subscribe("session-1", () => undefined);
|
||||||
|
const pending = coordinator.request("session-1", "access_token_rejected");
|
||||||
|
coordinator.cancelSession("session-1");
|
||||||
|
await expect(pending).rejects.toMatchObject({ code: "cancelled" });
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -47,7 +47,7 @@ describe("Agent REST OpenAPI", () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
expect(operationCount).toBe(13);
|
expect(operationCount).toBe(14);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("models runs as session subresources", () => {
|
test("models runs as session subresources", () => {
|
||||||
@@ -61,6 +61,34 @@ describe("Agent REST OpenAPI", () => {
|
|||||||
expect(document.paths["/api/v1/agent/chat/stream"]).toBeUndefined();
|
expect(document.paths["/api/v1/agent/chat/stream"]).toBeUndefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("separates automatic approval from persistent permission grants", () => {
|
||||||
|
const document = generateAgentOpenApi();
|
||||||
|
const runRequest = document.paths["/api/v1/agent/sessions/{session_id}/runs"]
|
||||||
|
?.post?.requestBody;
|
||||||
|
const permissionRequest = document.paths[
|
||||||
|
"/api/v1/agent/sessions/{session_id}/permission-responses"
|
||||||
|
]?.post?.requestBody;
|
||||||
|
|
||||||
|
expect(
|
||||||
|
runRequest && !("$ref" in runRequest)
|
||||||
|
? runRequest.content["application/json"]?.schema
|
||||||
|
: undefined,
|
||||||
|
).toMatchObject({
|
||||||
|
properties: {
|
||||||
|
approval_mode: { enum: ["request", "auto", "always"] },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
expect(
|
||||||
|
permissionRequest && !("$ref" in permissionRequest)
|
||||||
|
? permissionRequest.content["application/json"]?.schema
|
||||||
|
: undefined,
|
||||||
|
).toMatchObject({
|
||||||
|
properties: {
|
||||||
|
reply: { enum: ["once", "always", "reject"] },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
test("matches the public session runtime response shapes", () => {
|
test("matches the public session runtime response shapes", () => {
|
||||||
const document = generateAgentOpenApi();
|
const document = generateAgentOpenApi();
|
||||||
const schemas = document.components?.schemas ?? {};
|
const schemas = document.components?.schemas ?? {};
|
||||||
|
|||||||
@@ -0,0 +1,104 @@
|
|||||||
|
import { afterEach, beforeEach, describe, expect, it } from "bun:test";
|
||||||
|
import { mkdtemp, readFile, rm } from "node:fs/promises";
|
||||||
|
import { tmpdir } from "node:os";
|
||||||
|
import { join } from "node:path";
|
||||||
|
|
||||||
|
import {
|
||||||
|
executeMemoryManager,
|
||||||
|
executeSkillManager,
|
||||||
|
} from "../../src/learning/toolManagers.js";
|
||||||
|
import { MemoryStore } from "../../src/memory/store.js";
|
||||||
|
import {
|
||||||
|
getRuntimeSessionContext,
|
||||||
|
removeRuntimeSessionContext,
|
||||||
|
setRuntimeSessionContext,
|
||||||
|
type RuntimeSessionContext,
|
||||||
|
} from "../../src/runtime/sessionContext.js";
|
||||||
|
import { SkillStore } from "../../src/skills/store.js";
|
||||||
|
|
||||||
|
describe("main-process learning tool managers", () => {
|
||||||
|
let tempDir: string;
|
||||||
|
let memoryStore: MemoryStore;
|
||||||
|
let skillStore: SkillStore;
|
||||||
|
let context: RuntimeSessionContext;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
tempDir = await mkdtemp(join(tmpdir(), "tjwater-learning-tools-"));
|
||||||
|
memoryStore = new MemoryStore(
|
||||||
|
join(tempDir, "memory"),
|
||||||
|
join(tempDir, "backup", "memory"),
|
||||||
|
);
|
||||||
|
skillStore = new SkillStore(
|
||||||
|
join(tempDir, "skills"),
|
||||||
|
join(tempDir, "backup", "skills"),
|
||||||
|
);
|
||||||
|
await memoryStore.initialize();
|
||||||
|
context = {
|
||||||
|
actorKey: "actor-1",
|
||||||
|
allowLearningWrite: true,
|
||||||
|
clientSessionId: "client-session-1",
|
||||||
|
projectKey: "project-1",
|
||||||
|
sessionId: "session-1",
|
||||||
|
traceId: "trace-1",
|
||||||
|
};
|
||||||
|
setRuntimeSessionContext(context);
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(async () => {
|
||||||
|
removeRuntimeSessionContext(context.sessionId);
|
||||||
|
await rm(tempDir, { force: true, recursive: true });
|
||||||
|
});
|
||||||
|
|
||||||
|
it("enforces list-before-add using the canonical runtime context", async () => {
|
||||||
|
const rejected = await executeMemoryManager(memoryStore, context, {
|
||||||
|
action: "add",
|
||||||
|
content: "用户偏好查看压力单位为 MPa",
|
||||||
|
scope: "user",
|
||||||
|
});
|
||||||
|
expect(rejected.decision).toBe("rejected");
|
||||||
|
|
||||||
|
await executeMemoryManager(memoryStore, context, {
|
||||||
|
action: "list",
|
||||||
|
scope: "user",
|
||||||
|
});
|
||||||
|
const refreshedContext = getRuntimeSessionContext(context.sessionId)!;
|
||||||
|
const accepted = await executeMemoryManager(memoryStore, refreshedContext, {
|
||||||
|
action: "add",
|
||||||
|
content: "用户偏好查看压力单位为 MPa",
|
||||||
|
scope: "user",
|
||||||
|
});
|
||||||
|
expect(accepted.decision).toBe("accepted");
|
||||||
|
expect(await memoryStore.list("user", context.actorKey)).toHaveLength(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("writes and removes skills through the shared store", async () => {
|
||||||
|
const content = [
|
||||||
|
"---",
|
||||||
|
"name: pressure-review",
|
||||||
|
"description: Pressure review workflow.",
|
||||||
|
"---",
|
||||||
|
"",
|
||||||
|
"# Pressure Review",
|
||||||
|
].join("\n");
|
||||||
|
const written = await executeSkillManager(skillStore, context, {
|
||||||
|
action: "write_skill",
|
||||||
|
content,
|
||||||
|
skill_path: "workflow/pressure-review",
|
||||||
|
});
|
||||||
|
expect(written.decision).toBe("accepted");
|
||||||
|
expect("target" in written).toBe(true);
|
||||||
|
if (!("target" in written)) throw new Error("write returned no target");
|
||||||
|
await expect(readFile(written.target, "utf8")).resolves.toContain(
|
||||||
|
"# Pressure Review\n",
|
||||||
|
);
|
||||||
|
|
||||||
|
const removed = await executeSkillManager(skillStore, context, {
|
||||||
|
action: "remove_skill",
|
||||||
|
skill_path: "workflow/pressure-review",
|
||||||
|
});
|
||||||
|
expect(removed.decision).toBe("accepted");
|
||||||
|
expect("target" in removed).toBe(true);
|
||||||
|
if (!("target" in removed)) throw new Error("remove returned no target");
|
||||||
|
await expect(readFile(removed.target, "utf8")).rejects.toThrow();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,140 +0,0 @@
|
|||||||
import { afterEach, beforeEach, describe, expect, it } from "bun:test";
|
|
||||||
import { mkdtemp, readFile, rm } from "node:fs/promises";
|
|
||||||
import { tmpdir } from "node:os";
|
|
||||||
import { join } from "node:path";
|
|
||||||
|
|
||||||
import { createSkillManagerTool } from "../../.opencode/tools/skill_manager.js";
|
|
||||||
import { type RuntimeSessionContext } from "../../src/runtime/sessionContext.js";
|
|
||||||
import { SkillStore } from "../../src/skills/store.js";
|
|
||||||
|
|
||||||
describe("skill_manager tool", () => {
|
|
||||||
let tempDir: string;
|
|
||||||
let skillStore: SkillStore;
|
|
||||||
let context: RuntimeSessionContext;
|
|
||||||
|
|
||||||
const toolContext = {
|
|
||||||
abort: new AbortController().signal,
|
|
||||||
agent: "test",
|
|
||||||
ask: (() => undefined) as never,
|
|
||||||
directory: "",
|
|
||||||
messageID: "message-1",
|
|
||||||
metadata: () => undefined,
|
|
||||||
sessionID: "session-1",
|
|
||||||
worktree: "",
|
|
||||||
};
|
|
||||||
|
|
||||||
const skillDocument = (body: string) =>
|
|
||||||
[
|
|
||||||
"---",
|
|
||||||
"name: pressure-review",
|
|
||||||
"description: Pressure review workflow.",
|
|
||||||
"---",
|
|
||||||
"",
|
|
||||||
body,
|
|
||||||
].join("\n");
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
|
||||||
tempDir = await mkdtemp(join(tmpdir(), "tjwater-skill-tool-"));
|
|
||||||
skillStore = new SkillStore(
|
|
||||||
join(tempDir, "skills"),
|
|
||||||
join(tempDir, "backup", "skills"),
|
|
||||||
);
|
|
||||||
context = {
|
|
||||||
actorKey: "actor-1",
|
|
||||||
allowLearningWrite: true,
|
|
||||||
clientSessionId: "client-session-1",
|
|
||||||
projectKey: "project-1",
|
|
||||||
sessionId: "session-1",
|
|
||||||
traceId: "trace-1",
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(async () => {
|
|
||||||
await rm(tempDir, { force: true, recursive: true });
|
|
||||||
});
|
|
||||||
|
|
||||||
it("dispatches skill-level write, overwrite, and remove actions", async () => {
|
|
||||||
const tool = createSkillManagerTool(
|
|
||||||
skillStore,
|
|
||||||
{ read: () => context },
|
|
||||||
Promise.resolve(),
|
|
||||||
);
|
|
||||||
|
|
||||||
const writeResult = JSON.parse(
|
|
||||||
await tool.execute(
|
|
||||||
{
|
|
||||||
action: "write_skill",
|
|
||||||
content: skillDocument("# Pressure Review"),
|
|
||||||
reason: "verified reusable workflow",
|
|
||||||
skill_path: "workflow/pressure-review",
|
|
||||||
},
|
|
||||||
toolContext,
|
|
||||||
) as string,
|
|
||||||
);
|
|
||||||
expect(writeResult.decision).toBe("accepted");
|
|
||||||
await expect(readFile(writeResult.target, "utf8")).resolves.toContain(
|
|
||||||
"# Pressure Review\n",
|
|
||||||
);
|
|
||||||
|
|
||||||
const updateResult = JSON.parse(
|
|
||||||
await tool.execute(
|
|
||||||
{
|
|
||||||
action: "write_skill",
|
|
||||||
content: skillDocument("# Updated Pressure Review"),
|
|
||||||
reason: "verified reusable workflow overwrite",
|
|
||||||
skill_path: "workflow/pressure-review",
|
|
||||||
},
|
|
||||||
toolContext,
|
|
||||||
) as string,
|
|
||||||
);
|
|
||||||
expect(updateResult.decision).toBe("accepted");
|
|
||||||
await expect(readFile(updateResult.target, "utf8")).resolves.toContain(
|
|
||||||
"# Updated Pressure Review\n",
|
|
||||||
);
|
|
||||||
|
|
||||||
const removeResult = JSON.parse(
|
|
||||||
await tool.execute(
|
|
||||||
{
|
|
||||||
action: "remove_skill",
|
|
||||||
reason: "workflow is obsolete",
|
|
||||||
skill_path: "workflow/pressure-review",
|
|
||||||
},
|
|
||||||
toolContext,
|
|
||||||
) as string,
|
|
||||||
);
|
|
||||||
expect(removeResult.decision).toBe("accepted");
|
|
||||||
await expect(readFile(removeResult.target, "utf8")).rejects.toThrow();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("writes the root skills index through the reserved alias", async () => {
|
|
||||||
const tool = createSkillManagerTool(
|
|
||||||
skillStore,
|
|
||||||
{ read: () => context },
|
|
||||||
Promise.resolve(),
|
|
||||||
);
|
|
||||||
|
|
||||||
const writeResult = JSON.parse(
|
|
||||||
await tool.execute(
|
|
||||||
{
|
|
||||||
action: "write_skill",
|
|
||||||
content: [
|
|
||||||
"---",
|
|
||||||
"name: skills",
|
|
||||||
"description: TJWater Skills root index.",
|
|
||||||
"---",
|
|
||||||
"",
|
|
||||||
"# TJWater Skills",
|
|
||||||
].join("\n"),
|
|
||||||
reason: "refresh root skills index",
|
|
||||||
skill_path: "__root__",
|
|
||||||
},
|
|
||||||
toolContext,
|
|
||||||
) as string,
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(writeResult.decision).toBe("accepted");
|
|
||||||
await expect(readFile(writeResult.target, "utf8")).resolves.toContain(
|
|
||||||
"# TJWater Skills\n",
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import { afterEach, beforeEach, describe, expect, it } from "bun:test";
|
import { afterEach, beforeEach, describe, expect, it } from "bun:test";
|
||||||
import { mkdtemp, rm, writeFile } from "node:fs/promises";
|
import { mkdtemp, rm, stat, writeFile } from "node:fs/promises";
|
||||||
import { tmpdir } from "node:os";
|
import { tmpdir } from "node:os";
|
||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
|
|
||||||
@@ -18,7 +18,7 @@ describe("ResultReferenceResolver", () => {
|
|||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
tempDir = await mkdtemp(join(tmpdir(), "tjwater-result-ref-"));
|
tempDir = await mkdtemp(join(tmpdir(), "tjwater-result-ref-"));
|
||||||
store = new ResultReferenceStore(tempDir, 60_000);
|
store = new ResultReferenceStore(tempDir, 60_000);
|
||||||
resolver = new ResultReferenceResolver(store);
|
resolver = new ResultReferenceResolver(store, tempDir, 1024 * 1024);
|
||||||
await store.initialize();
|
await store.initialize();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -193,6 +193,53 @@ describe("ResultReferenceResolver", () => {
|
|||||||
"DMA-2": "#00ff00",
|
"DMA-2": "#00ff00",
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
await expect(stat(filePath)).rejects.toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects render payload files outside the configured import directory", async () => {
|
||||||
|
const outsideDir = await mkdtemp(join(tmpdir(), "tjwater-result-outside-"));
|
||||||
|
const filePath = join(outsideDir, "render-wrapper.json");
|
||||||
|
await writeFile(
|
||||||
|
filePath,
|
||||||
|
JSON.stringify({
|
||||||
|
metadata: {},
|
||||||
|
location: { file_path: filePath },
|
||||||
|
data: { node_area_map: { J1: "DMA-1" } },
|
||||||
|
}),
|
||||||
|
"utf8",
|
||||||
|
);
|
||||||
|
|
||||||
|
try {
|
||||||
|
await expect(
|
||||||
|
resolver.registerRenderPayloadFile(filePath, {
|
||||||
|
actorKey: "actor-4",
|
||||||
|
clientSessionId: "client-4",
|
||||||
|
projectKey: "project-key-4",
|
||||||
|
sessionId: "session-4",
|
||||||
|
source: RESULT_REFERENCE_SOURCE.agentGenerated,
|
||||||
|
traceId: "trace-4",
|
||||||
|
}),
|
||||||
|
).rejects.toThrow("RESULT_REF_IMPORT_DIR");
|
||||||
|
} finally {
|
||||||
|
await rm(outsideDir, { force: true, recursive: true });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects oversized render payload files before parsing", async () => {
|
||||||
|
const filePath = join(tempDir, "oversized.json");
|
||||||
|
await writeFile(filePath, "x".repeat(128), "utf8");
|
||||||
|
const sizeLimitedResolver = new ResultReferenceResolver(store, tempDir, 64);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
sizeLimitedResolver.registerRenderPayloadFile(filePath, {
|
||||||
|
actorKey: "actor-5",
|
||||||
|
clientSessionId: "client-5",
|
||||||
|
projectKey: "project-key-5",
|
||||||
|
sessionId: "session-5",
|
||||||
|
source: RESULT_REFERENCE_SOURCE.agentGenerated,
|
||||||
|
traceId: "trace-5",
|
||||||
|
}),
|
||||||
|
).rejects.toThrow("RESULT_REF_IMPORT_MAX_BYTES");
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -0,0 +1,153 @@
|
|||||||
|
import { afterAll, beforeAll, describe, expect, it, mock } from "bun:test";
|
||||||
|
import express, { Router } from "express";
|
||||||
|
import type { Server } from "node:http";
|
||||||
|
|
||||||
|
import { CredentialRefreshCoordinator } from "../../src/auth/credentialRefresh.js";
|
||||||
|
import { registerChatInteractionRoutes } from "../../src/routes/chatInteractionRoutes.js";
|
||||||
|
import type { ActiveRun } from "../../src/routes/chatUiState.js";
|
||||||
|
|
||||||
|
describe("chat interaction routes", () => {
|
||||||
|
let baseUrl = "";
|
||||||
|
let server: Server;
|
||||||
|
const replyQuestion = mock(async () => ({ ok: true }));
|
||||||
|
const replyPermission = mock(async () => ({ ok: true }));
|
||||||
|
|
||||||
|
beforeAll(async () => {
|
||||||
|
const activeRuns = new Map<string, ActiveRun>();
|
||||||
|
activeRuns.set("runtime-session", {
|
||||||
|
clientSessionId: "client-session",
|
||||||
|
controller: new AbortController(),
|
||||||
|
messages: [
|
||||||
|
{
|
||||||
|
id: "assistant-1",
|
||||||
|
role: "assistant",
|
||||||
|
permissions: [
|
||||||
|
{
|
||||||
|
requestId: "permission-1",
|
||||||
|
sessionId: "runtime-session",
|
||||||
|
permission: "bash",
|
||||||
|
patterns: ["npm test"],
|
||||||
|
always: ["npm test"],
|
||||||
|
createdAt: 1,
|
||||||
|
status: "pending",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
questions: [{ requestId: "question-1", status: "pending" }],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
pendingPermissions: new Map([
|
||||||
|
[
|
||||||
|
"permission-1",
|
||||||
|
{
|
||||||
|
session_id: "runtime-session",
|
||||||
|
request_id: "permission-1",
|
||||||
|
permission: "bash",
|
||||||
|
patterns: ["npm test"],
|
||||||
|
always: ["npm test"],
|
||||||
|
created_at: 1,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
]),
|
||||||
|
pendingQuestions: new Map([
|
||||||
|
[
|
||||||
|
"question-1",
|
||||||
|
{
|
||||||
|
created_at: 1,
|
||||||
|
request_id: "question-1",
|
||||||
|
session_id: "runtime-session",
|
||||||
|
questions: [],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
]),
|
||||||
|
status: "running",
|
||||||
|
subscribers: new Set(),
|
||||||
|
});
|
||||||
|
|
||||||
|
const router = Router();
|
||||||
|
router.use((req, _res, next) => {
|
||||||
|
req.agentAuth = {
|
||||||
|
accessToken: "access-token",
|
||||||
|
userId: "user-1",
|
||||||
|
keycloakSub: "keycloak-1",
|
||||||
|
username: "tester",
|
||||||
|
role: "user",
|
||||||
|
isSuperuser: false,
|
||||||
|
projectId: "project-1",
|
||||||
|
network: "network-1",
|
||||||
|
projectRole: "member",
|
||||||
|
};
|
||||||
|
next();
|
||||||
|
});
|
||||||
|
registerChatInteractionRoutes(router, {
|
||||||
|
activeRuns,
|
||||||
|
credentialRefreshCoordinator: new CredentialRefreshCoordinator(),
|
||||||
|
runtime: { replyPermission, replyQuestion } as never,
|
||||||
|
sessionMetadataStore: {
|
||||||
|
get: async () => ({ sessionId: "runtime-session" }),
|
||||||
|
} as never,
|
||||||
|
sessionUiStateStore: {
|
||||||
|
read: async () => null,
|
||||||
|
write: async () => undefined,
|
||||||
|
} as never,
|
||||||
|
});
|
||||||
|
|
||||||
|
const app = express();
|
||||||
|
app.use(express.json());
|
||||||
|
app.use(router);
|
||||||
|
server = app.listen(0);
|
||||||
|
await new Promise<void>((resolve) => server.once("listening", resolve));
|
||||||
|
const address = server.address();
|
||||||
|
if (!address || typeof address === "string") {
|
||||||
|
throw new Error("test server did not expose a TCP port");
|
||||||
|
}
|
||||||
|
baseUrl = `http://127.0.0.1:${address.port}`;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(() => {
|
||||||
|
server.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("submits answers to the stable OpenCode question adapter", async () => {
|
||||||
|
const response = await fetch(
|
||||||
|
`${baseUrl}/sessions/client-session/question-responses`,
|
||||||
|
{
|
||||||
|
method: "POST",
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
body: JSON.stringify({
|
||||||
|
request_id: "question-1",
|
||||||
|
action: "reply",
|
||||||
|
answers: [["继续"]],
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(response.status).toBe(202);
|
||||||
|
expect(replyQuestion).toHaveBeenCalledWith({
|
||||||
|
requestId: "question-1",
|
||||||
|
sessionId: "runtime-session",
|
||||||
|
answers: [["继续"]],
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("forwards saved permission grants to OpenCode", async () => {
|
||||||
|
const response = await fetch(
|
||||||
|
`${baseUrl}/sessions/client-session/permission-responses`,
|
||||||
|
{
|
||||||
|
method: "POST",
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
body: JSON.stringify({
|
||||||
|
request_id: "permission-1",
|
||||||
|
reply: "always",
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(response.status).toBe(202);
|
||||||
|
expect(replyPermission).toHaveBeenCalledWith({
|
||||||
|
requestId: "permission-1",
|
||||||
|
sessionId: "runtime-session",
|
||||||
|
reply: "always",
|
||||||
|
message: undefined,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
import { describe, expect, it } from "bun:test";
|
||||||
|
|
||||||
|
import {
|
||||||
|
canAutoApprovePermission,
|
||||||
|
resolvePermissionApproval,
|
||||||
|
} from "../../src/routes/chatPermissionPolicy.js";
|
||||||
|
|
||||||
|
describe("permission approval policy", () => {
|
||||||
|
it.each([
|
||||||
|
"show_chart",
|
||||||
|
"web_search",
|
||||||
|
])("allows low-risk permission %s", (permission) => {
|
||||||
|
expect(canAutoApprovePermission(permission)).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
"bash",
|
||||||
|
"edit",
|
||||||
|
"external_directory",
|
||||||
|
"store_render_ref",
|
||||||
|
"tjwater_server_query",
|
||||||
|
"tjwater_tjwater_server_query",
|
||||||
|
])(
|
||||||
|
"requires confirmation for permission %s",
|
||||||
|
(permission) => {
|
||||||
|
expect(canAutoApprovePermission(permission)).toBe(false);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
it("resolves request, auto, and always modes", () => {
|
||||||
|
expect(resolvePermissionApproval("request", "show_chart").autoApprove).toBe(false);
|
||||||
|
expect(resolvePermissionApproval("auto", "show_chart").autoApprove).toBe(true);
|
||||||
|
expect(resolvePermissionApproval("auto", "bash").autoApprove).toBe(false);
|
||||||
|
expect(resolvePermissionApproval("always", "bash")).toMatchObject({
|
||||||
|
autoApprove: true,
|
||||||
|
title: "已按始终允许模式放行",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -61,7 +61,7 @@ describe("streamPromptResponse", () => {
|
|||||||
} satisfies Partial<PermissionRequestPayload>);
|
} satisfies Partial<PermissionRequestPayload>);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("auto replies always when approval mode is always", async () => {
|
it("auto approves an allowlisted low-risk permission once", async () => {
|
||||||
const replies: Array<Record<string, unknown>> = [];
|
const replies: Array<Record<string, unknown>> = [];
|
||||||
const runtime = {
|
const runtime = {
|
||||||
subscribeEvents: async () =>
|
subscribeEvents: async () =>
|
||||||
@@ -71,10 +71,10 @@ describe("streamPromptResponse", () => {
|
|||||||
properties: {
|
properties: {
|
||||||
id: "perm-1",
|
id: "perm-1",
|
||||||
sessionID: "runtime-session-1",
|
sessionID: "runtime-session-1",
|
||||||
permission: "bash",
|
permission: "show_chart",
|
||||||
patterns: ["npm test"],
|
patterns: ["*"],
|
||||||
metadata: { command: "npm test" },
|
metadata: {},
|
||||||
always: ["npm test"],
|
always: ["*"],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -97,7 +97,7 @@ describe("streamPromptResponse", () => {
|
|||||||
sessionId: "runtime-session-1",
|
sessionId: "runtime-session-1",
|
||||||
clientSessionId: "client-session-1",
|
clientSessionId: "client-session-1",
|
||||||
message: "run tests",
|
message: "run tests",
|
||||||
approvalMode: "always",
|
approvalMode: "auto",
|
||||||
write: (event, data) => events.push({ event, data }),
|
write: (event, data) => events.push({ event, data }),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -105,17 +105,100 @@ describe("streamPromptResponse", () => {
|
|||||||
{
|
{
|
||||||
requestId: "perm-1",
|
requestId: "perm-1",
|
||||||
sessionId: "runtime-session-1",
|
sessionId: "runtime-session-1",
|
||||||
reply: "always",
|
reply: "once",
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
expect(events.some((item) => item.event === "permission_request")).toBe(false);
|
expect(events.some((item) => item.event === "permission_request")).toBe(false);
|
||||||
expect(events.find((item) => item.event === "permission_response")?.data).toEqual({
|
expect(events.find((item) => item.event === "permission_response")?.data).toEqual({
|
||||||
session_id: "client-session-1",
|
session_id: "client-session-1",
|
||||||
request_id: "perm-1",
|
request_id: "perm-1",
|
||||||
reply: "always",
|
reply: "once",
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("keeps high-risk permissions interactive in auto mode", async () => {
|
||||||
|
const replies: Array<Record<string, unknown>> = [];
|
||||||
|
const runtime = {
|
||||||
|
subscribeEvents: async () =>
|
||||||
|
createEventStream([
|
||||||
|
{
|
||||||
|
type: "permission.asked",
|
||||||
|
properties: {
|
||||||
|
id: "perm-auto-bash",
|
||||||
|
sessionID: "runtime-session-1",
|
||||||
|
permission: "bash",
|
||||||
|
patterns: ["npm test"],
|
||||||
|
metadata: { command: "npm test" },
|
||||||
|
always: ["npm test"],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{ type: "session.idle", properties: { sessionID: "runtime-session-1" } },
|
||||||
|
]),
|
||||||
|
prompt: async () => undefined,
|
||||||
|
messages: async () => [],
|
||||||
|
replyPermission: async (options: Record<string, unknown>) => replies.push(options),
|
||||||
|
} as unknown as OpencodeRuntimeAdapter;
|
||||||
|
const events: Array<{ event: string; data: Record<string, unknown> }> = [];
|
||||||
|
|
||||||
|
await streamPromptResponse({
|
||||||
|
runtime,
|
||||||
|
sessionId: "runtime-session-1",
|
||||||
|
clientSessionId: "client-session-1",
|
||||||
|
message: "run tests",
|
||||||
|
approvalMode: "auto",
|
||||||
|
write: (event, data) => events.push({ event, data }),
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(replies).toEqual([]);
|
||||||
|
expect(events.find((item) => item.event === "permission_request")?.data).toMatchObject({
|
||||||
|
request_id: "perm-auto-bash",
|
||||||
|
permission: "bash",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("approves every OpenCode ask once in always mode", async () => {
|
||||||
|
const replies: Array<Record<string, unknown>> = [];
|
||||||
|
const runtime = {
|
||||||
|
subscribeEvents: async () =>
|
||||||
|
createEventStream([
|
||||||
|
{
|
||||||
|
type: "permission.asked",
|
||||||
|
properties: {
|
||||||
|
id: "perm-always-bash",
|
||||||
|
sessionID: "runtime-session-1",
|
||||||
|
permission: "bash",
|
||||||
|
patterns: ["npm test"],
|
||||||
|
metadata: { command: "npm test" },
|
||||||
|
always: ["npm test"],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{ type: "session.idle", properties: { sessionID: "runtime-session-1" } },
|
||||||
|
]),
|
||||||
|
prompt: async () => undefined,
|
||||||
|
messages: async () => [],
|
||||||
|
replyPermission: async (options: Record<string, unknown>) => replies.push(options),
|
||||||
|
} as unknown as OpencodeRuntimeAdapter;
|
||||||
|
const events: Array<{ event: string; data: Record<string, unknown> }> = [];
|
||||||
|
|
||||||
|
await streamPromptResponse({
|
||||||
|
runtime,
|
||||||
|
sessionId: "runtime-session-1",
|
||||||
|
clientSessionId: "client-session-1",
|
||||||
|
message: "run tests",
|
||||||
|
approvalMode: "always",
|
||||||
|
write: (event, data) => events.push({ event, data }),
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(replies).toEqual([
|
||||||
|
{
|
||||||
|
requestId: "perm-always-bash",
|
||||||
|
sessionId: "runtime-session-1",
|
||||||
|
reply: "once",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
expect(events.some((item) => item.event === "permission_request")).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
it("forwards opencode v2 permission requests as SSE payloads", async () => {
|
it("forwards opencode v2 permission requests as SSE payloads", async () => {
|
||||||
const runtime = {
|
const runtime = {
|
||||||
subscribeEvents: async () =>
|
subscribeEvents: async () =>
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ describe("Agent public REST router", () => {
|
|||||||
undefined as never,
|
undefined as never,
|
||||||
undefined as never,
|
undefined as never,
|
||||||
undefined as never,
|
undefined as never,
|
||||||
|
undefined as never,
|
||||||
);
|
);
|
||||||
const layers = (router as unknown as { stack: RouterLayer[] }).stack;
|
const layers = (router as unknown as { stack: RouterLayer[] }).stack;
|
||||||
const runtimeOperations = layers
|
const runtimeOperations = layers
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { describe, expect, it } from "bun:test";
|
import { describe, expect, it } from "bun:test";
|
||||||
import { type OpencodeClient } from "@opencode-ai/sdk/v2";
|
import { type OpencodeClient } from "@opencode-ai/sdk/v2";
|
||||||
|
|
||||||
|
import { config } from "../../src/config.js";
|
||||||
import { OpencodeRuntimeAdapter } from "../../src/runtime/opencode.js";
|
import { OpencodeRuntimeAdapter } from "../../src/runtime/opencode.js";
|
||||||
|
|
||||||
const createRuntimeAdapter = (
|
const createRuntimeAdapter = (
|
||||||
@@ -85,3 +86,74 @@ describe("OpencodeRuntimeAdapter.ensureClient", () => {
|
|||||||
expect(attempts).toBe(2);
|
expect(attempts).toBe(2);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("OpencodeRuntimeAdapter.warmup", () => {
|
||||||
|
it("initializes the project session and model tools before reporting ready", async () => {
|
||||||
|
const calls: string[] = [];
|
||||||
|
const client = {
|
||||||
|
global: {
|
||||||
|
health: async () => {
|
||||||
|
calls.push("health");
|
||||||
|
return { data: { healthy: true, version: "test" } };
|
||||||
|
},
|
||||||
|
},
|
||||||
|
session: {
|
||||||
|
create: async () => {
|
||||||
|
calls.push("session.create");
|
||||||
|
return { data: { id: "warmup-session" } };
|
||||||
|
},
|
||||||
|
delete: async ({ sessionID }: { sessionID: string }) => {
|
||||||
|
calls.push(`session.delete:${sessionID}`);
|
||||||
|
return { data: true };
|
||||||
|
},
|
||||||
|
},
|
||||||
|
tool: {
|
||||||
|
list: async (model: { provider: string; model: string }) => {
|
||||||
|
calls.push(`tool.list:${model.provider}/${model.model}`);
|
||||||
|
return { data: [] };
|
||||||
|
},
|
||||||
|
},
|
||||||
|
} as unknown as OpencodeClient;
|
||||||
|
const runtime = Object.assign(Object.create(OpencodeRuntimeAdapter.prototype), {
|
||||||
|
clientPromise: null,
|
||||||
|
closeServer: null,
|
||||||
|
ensureClient: async () => client,
|
||||||
|
}) as OpencodeRuntimeAdapter;
|
||||||
|
|
||||||
|
await runtime.warmup();
|
||||||
|
|
||||||
|
expect(calls).toEqual([
|
||||||
|
"health",
|
||||||
|
"session.create",
|
||||||
|
`tool.list:${config.OPENCODE_MODEL}`,
|
||||||
|
"session.delete:warmup-session",
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("submits question answers through the stable question API", async () => {
|
||||||
|
const calls: unknown[] = [];
|
||||||
|
const client = {
|
||||||
|
question: {
|
||||||
|
reply: async (input: unknown) => {
|
||||||
|
calls.push(input);
|
||||||
|
return { data: { ok: true } };
|
||||||
|
},
|
||||||
|
},
|
||||||
|
} as unknown as OpencodeClient;
|
||||||
|
const runtime = Object.assign(Object.create(OpencodeRuntimeAdapter.prototype), {
|
||||||
|
clientPromise: null,
|
||||||
|
closeServer: null,
|
||||||
|
ensureClient: async () => client,
|
||||||
|
}) as OpencodeRuntimeAdapter;
|
||||||
|
|
||||||
|
await runtime.replyQuestion({
|
||||||
|
requestId: "question-1",
|
||||||
|
sessionId: "session-1",
|
||||||
|
answers: [["继续"]],
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(calls).toEqual([
|
||||||
|
{ requestID: "question-1", answers: [["继续"]] },
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
import { describe, expect, it } from "bun:test";
|
||||||
|
import { readFile } from "node:fs/promises";
|
||||||
|
|
||||||
|
describe("internal OpenCode permissions", () => {
|
||||||
|
it("keeps protected paths denied in every approval mode", async () => {
|
||||||
|
const config = JSON.parse(await readFile("opencode.json", "utf8")) as {
|
||||||
|
permission?: Record<string, string | Record<string, string>>;
|
||||||
|
};
|
||||||
|
const permission = config.permission ?? {};
|
||||||
|
const bash = permission.bash as Record<string, string> | undefined;
|
||||||
|
const edit = permission.edit as Record<string, string> | undefined;
|
||||||
|
const read = permission.read as Record<string, string> | undefined;
|
||||||
|
|
||||||
|
expect(permission["*"]).toBe("ask");
|
||||||
|
expect(permission.external_directory).toBe("deny");
|
||||||
|
expect(permission.task).toBe("deny");
|
||||||
|
expect(permission.question).toBe("allow");
|
||||||
|
expect(permission.todowrite).toBe("allow");
|
||||||
|
expect(read?.["*"]).toBe("allow");
|
||||||
|
expect(read?.["data/**"]).toBe("deny");
|
||||||
|
expect(read?.["**/logs/**"]).toBe("deny");
|
||||||
|
expect(edit?.["*"]).toBe("ask");
|
||||||
|
expect(edit?.["data/**"]).toBe("deny");
|
||||||
|
expect(edit?.["**/logs/**"]).toBe("deny");
|
||||||
|
expect(bash?.["*"]).toBe("ask");
|
||||||
|
expect(bash?.["*.env*"]).toBe("deny");
|
||||||
|
expect(bash?.["*data/*"]).toBe("deny");
|
||||||
|
expect(bash?.["*logs/*"]).toBe("deny");
|
||||||
|
});
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user