404425a06e
The run page now has a Cancel button next to the status pill while a pipeline is non-terminal. Clicking it (after a confirm prompt) hits POST /api/reports/:id/cancel, which marks the row as failed with "Cancelled by <email>" and SIGTERMs the spawned tsx child's whole process group — so the Claude CLI subshell, ffmpeg, and Apify-poll loops all stop together rather than orphaning. Implementation notes: - Replaced runningReportId with runningChild that holds the child handle - Removed child.unref() so we can manage it. Pulled both the run and retry spawn paths into a single spawnPipeline() helper to avoid drift - Mark the row before sending the signal so the spawn-exit handler's COALESCE doesn't overwrite "Cancelled by" with "killed by SIGTERM" - Cancel from a different server process (e.g. after a server restart) returns 409 with a hint that the child handle is no longer in scope — the user can mark it failed manually if needed Already-completed stages are preserved on disk via .state sentinels, so "Cancel + edit brief + Force re-run" works without re-spending on finished stages. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> |
||
|---|---|---|
| v2 | ||
| .gitignore | ||
| DEVELOPER_BRIEF_V2.md | ||
| README.md | ||
Social Reporting
V2 lives in v2/. All commands run from there.
cd v2
docker compose -f docker-compose.v2.yml --env-file .env up -d --build
npm install
npm test # 62 unit tests
npm run pipe seed --report <brief-id>
For the full V2 spec see DEVELOPER_BRIEF_V2.md.
Deploying V2 over an existing V1 install
If V1 is already deployed at /opt/social-reporting, cut over in place:
ssh you@optical-dev.oliver.solutions
cd /opt/social-reporting
git pull origin main # pulls in v2/, removes V1 dirs
bash v2/deploy/cutover-in-place.sh # stops V1, migrates secrets, starts V2
The script prompts before doing anything destructive, migrates
APIFY/Anthropic/Azure secrets from V1's .env into a fresh v2/.env,
swaps the Apache conf to V2's, and starts the V2 docker stack. It also
prompts for the email that will be auto-promoted to super-admin on first
SSO sign-in (BOOTSTRAP_SUPER_ADMIN_EMAIL).
The Azure-registered redirect URI
https://optical-dev.oliver.solutions/social-reports/login.html is
preserved by V2 (Vite base: /social-reports/, React Router basename,
and an explicit /login.html route alias).
V1 archive
V1 source is preserved on the v1-archive branch (frozen at the last V1
commit) and is no longer kept on the deployed server. To roll back from
V2 to V1, the rollback script will re-clone v1-archive if needed:
# On the server
export REPO_URL="https://x-token-auth:YOUR_TOKEN@bitbucket.org/zlalani/social-reporting-tool.git"
bash /opt/social-reporting-v2/v2/deploy/rollback-to-v1.sh
To inspect or check out V1 source locally:
git checkout v1-archive