Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5897abcbad | ||
|
|
b3b9e617b5 | ||
|
|
6f9529d31f | ||
|
|
c25b10f7f3 | ||
|
|
c69a779ecc | ||
|
|
688a0e4de5 | ||
|
|
cf9b80bbb3 | ||
|
|
2a341d3969 | ||
|
|
9275233d09 | ||
|
|
13dceaa460 | ||
|
|
0ab2980ff4 | ||
|
|
fd14c05f3a | ||
|
|
cc0358bb12 | ||
|
|
f94ef580fb | ||
|
|
1bb6274b35 | ||
|
|
448c250944 | ||
|
|
5f5c3eb3b9 | ||
|
|
3805057923 | ||
|
|
f4678c48ca | ||
|
|
c40e931168 | ||
|
|
e96a13b255 | ||
|
|
4413c2ef6c | ||
|
|
65063e224a | ||
|
|
c8063b5f2a | ||
|
|
bfeb464bfb | ||
|
|
860324e3a9 | ||
|
|
f705511164 | ||
|
|
70a5449d35 | ||
|
|
80a2e188cf | ||
|
|
e036c5d436 | ||
|
|
ed77f87ab5 | ||
|
|
4712433903 | ||
|
|
f4add07780 | ||
|
|
01b6f1d3d7 | ||
|
|
60a4e14b4b | ||
|
|
6e465663bd | ||
|
|
b1142bd0c0 | ||
|
|
50d0df822c | ||
|
|
ab2f330eb8 | ||
|
|
ca3d4f6a16 | ||
|
|
3321bac22d | ||
|
|
3e78b89cc1 | ||
|
|
bfb1841370 | ||
|
|
6ba2c51403 | ||
|
|
ba0aa5ee4e | ||
|
|
7485c89e9b | ||
|
|
8869ce2583 | ||
|
|
64419f6755 |
No files matched your search
@@ -0,0 +1,69 @@
|
||||
name: Approved narrow auth schema reconciliation
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- ops/auth-schema-stage
|
||||
- ops/auth-schema-production
|
||||
jobs:
|
||||
reconcile:
|
||||
runs-on: canina
|
||||
steps:
|
||||
- name: Authenticated host narrow schema operation (no deployment)
|
||||
shell: bash
|
||||
env:
|
||||
CI_EVENT: ${{ github.event_name }}
|
||||
CI_REF: ${{ github.ref }}
|
||||
SQL_SHA: 8a22f3e89efb3dacc24f3ed9337ae87d0b4345da003a607bc1994478f69c6feb
|
||||
APPROVAL_ID: CEO-AUTH-SCHEMA-20261025
|
||||
DEPLOY_SHA: ${{ github.sha }}
|
||||
DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
|
||||
DEPLOY_KNOWN_HOSTS: ${{ secrets.DEPLOY_KNOWN_HOSTS }}
|
||||
PRODUCTION_SCHEMA_APPROVAL: ${{ secrets.PRODUCTION_AUTH_SCHEMA_APPROVAL }}
|
||||
REVIEWED_SCHEMA_COMMIT: ${{ secrets.REVIEWED_AUTH_SCHEMA_COMMIT }}
|
||||
STAGE_AUTH_ACCEPTANCE: ${{ secrets.STAGE_AUTH_SCHEMA_ACCEPTANCE }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
set +x
|
||||
[[ "$CI_EVENT" == push ]]
|
||||
case "$CI_REF" in
|
||||
refs/heads/ops/auth-schema-stage) TARGET_ENV=stage ;;
|
||||
refs/heads/ops/auth-schema-production) TARGET_ENV=production ;;
|
||||
*) exit 2 ;;
|
||||
esac
|
||||
[[ "$SQL_SHA" =~ ^[0-9a-f]{64}$ && "$DEPLOY_SHA" =~ ^[0-9a-f]{40}$ ]]
|
||||
[[ "$APPROVAL_ID" =~ ^[A-Za-z0-9_-]{4,100}$ ]]
|
||||
[[ "$REVIEWED_SCHEMA_COMMIT" == "$DEPLOY_SHA" ]]
|
||||
schema_ok=no; auth_ok=no
|
||||
if [[ "$TARGET_ENV" == production ]]; then
|
||||
[[ -n "$PRODUCTION_SCHEMA_APPROVAL" && "$PRODUCTION_SCHEMA_APPROVAL" == "$DEPLOY_SHA:$SQL_SHA:$APPROVAL_ID" ]]
|
||||
[[ "$STAGE_AUTH_ACCEPTANCE" == "$DEPLOY_SHA:$SQL_SHA" ]]
|
||||
schema_ok=yes; auth_ok=yes
|
||||
fi
|
||||
[[ -n "$DEPLOY_KEY" && -n "$DEPLOY_KNOWN_HOSTS" ]]
|
||||
umask 077
|
||||
scratch=$(mktemp -d)
|
||||
trap 'rm -rf "$scratch"' EXIT
|
||||
printf '%s\n' "$DEPLOY_KEY" > "$scratch/key"
|
||||
printf '%s\n' "$DEPLOY_KNOWN_HOSTS" > "$scratch/known_hosts"
|
||||
unset DEPLOY_KEY DEPLOY_KNOWN_HOSTS PRODUCTION_SCHEMA_APPROVAL
|
||||
ssh-keygen -F '[87.248.133.138]:2234' -f "$scratch/known_hosts" >/dev/null
|
||||
ssh -F /dev/null -T -p 2234 -i "$scratch/key" -o BatchMode=yes -o IdentitiesOnly=yes -o IdentityAgent=none -o StrictHostKeyChecking=yes -o UserKnownHostsFile="$scratch/known_hosts" -o GlobalKnownHostsFile=/dev/null devops@87.248.133.138 "sudo -n bash -s -- $DEPLOY_SHA $TARGET_ENV $SQL_SHA $schema_ok $auth_ok" <<'HOST'
|
||||
set -euo pipefail
|
||||
set +x
|
||||
umask 077
|
||||
sha=$1; target=$2; sql_sha=$3
|
||||
[[ ! -e /.dockerenv && $(id -u) == 0 ]]
|
||||
work=$(mktemp -d /opt/services/canina/auth-reconcile-XXXXXX)
|
||||
trap 'rm -rf "$work"' EXIT
|
||||
git clone --quiet --no-checkout /opt/services/canina/stage "$work"
|
||||
remote=$(git -C /opt/services/canina/stage remote get-url origin)
|
||||
git -C "$work" fetch --quiet "$remote" "$sha"
|
||||
git -C "$work" checkout --quiet --detach "$sha"
|
||||
cd "$work"
|
||||
[[ $(git rev-parse HEAD) == "$sha" ]]
|
||||
if [[ $target == production ]]; then
|
||||
[[ $4 == yes && $5 == yes ]]
|
||||
export PRODUCTION_SCHEMA_APPROVED="$sha:$sql_sha" STAGE_AUTH_ACCEPTANCE_APPROVED="$sha:$sql_sha"
|
||||
fi
|
||||
GITHUB_ACTIONS=true bash scripts/ci-auth-schema-reconcile.sh "$target" "$sha" "$sql_sha"
|
||||
HOST
|
||||
@@ -10,7 +10,7 @@ jobs:
|
||||
deploy:
|
||||
runs-on: canina
|
||||
steps:
|
||||
- name: Authenticated host Stage deployment (Production blocked)
|
||||
- name: Authenticated immutable host deployment (Production acceptance gated)
|
||||
shell: bash
|
||||
env:
|
||||
BRANCH: ${{ github.ref_name }}
|
||||
@@ -20,7 +20,7 @@ jobs:
|
||||
run: |
|
||||
set -euo pipefail
|
||||
set +x
|
||||
[[ "${BRANCH}" == develop ]] || { echo 'Production blocked' >&2; exit 2; }
|
||||
[[ "${BRANCH}" == develop || "${BRANCH}" == main ]] || exit 2
|
||||
[[ "${DEPLOY_SHA}" =~ ^[0-9a-f]{40}$ ]] || exit 2
|
||||
# Provision DEPLOY_KNOWN_HOSTS from an independently verified host key.
|
||||
# Never use baked-in /opt/services, runner SSH keys or docker.sock.
|
||||
|
||||
@@ -8,6 +8,11 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: '3.12'
|
||||
- name: Editorial Python protocol and deadline regressions (no inference)
|
||||
run: PYTHONDONTWRITEBYTECODE=1 python3 -m unittest discover -s infra/hermes-editorial/tests -v
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '22'
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
name: Owner authorized Stage test principal
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
approval:
|
||||
required: true
|
||||
description: "Exact owner grant: owner-authorized-stage-editorial"
|
||||
session:
|
||||
required: true
|
||||
description: "Unique session (8-64 lowercase letters/digits/hyphens)"
|
||||
ttl:
|
||||
required: true
|
||||
description: "Bounded session TTL, 60-3600 seconds"
|
||||
action:
|
||||
required: true
|
||||
description: "open or close"
|
||||
jobs:
|
||||
principal:
|
||||
if: github.ref == 'refs/heads/develop'
|
||||
runs-on: canina
|
||||
steps:
|
||||
- name: Explicit authenticated Stage CI seed authority
|
||||
shell: bash
|
||||
env:
|
||||
BRANCH: ${{ github.ref_name }}
|
||||
DEPLOY_SHA: ${{ github.sha }}
|
||||
DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
|
||||
DEPLOY_KNOWN_HOSTS: ${{ secrets.DEPLOY_KNOWN_HOSTS }}
|
||||
STAGE_TEST_APPROVAL: ${{ inputs.approval }}
|
||||
STAGE_TEST_SESSION: ${{ inputs.session }}
|
||||
STAGE_TEST_TTL_SECONDS: ${{ inputs.ttl }}
|
||||
STAGE_TEST_ACTION: ${{ inputs.action }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
set +x
|
||||
[[ "$DEPLOY_SHA" =~ ^[a-f0-9]{40}$ ]] || exit 2
|
||||
umask 077
|
||||
script=$(mktemp)
|
||||
trap 'rm -f "$script"' EXIT
|
||||
wget --no-proxy -qO "$script" "https://git.parsaaghayi.ir/parsa/canina/raw/commit/$DEPLOY_SHA/scripts/ci-stage-test-principal.sh"
|
||||
bash "$script"
|
||||
+7
-9
@@ -1,4 +1,4 @@
|
||||
FROM node:20-alpine AS app-builder
|
||||
FROM node:22-alpine AS app-builder
|
||||
USER root
|
||||
WORKDIR /app
|
||||
ENV NEXT_TELEMETRY_DISABLED=1
|
||||
@@ -7,18 +7,17 @@ ENV NEXT_PUBLIC_API_URL=https://api.canina.ir/api
|
||||
# Optional: Use Nexus as npm registry
|
||||
ARG NPM_REGISTRY=
|
||||
RUN if [ -n "$NPM_REGISTRY" ]; then \
|
||||
npm config set registry "$NPM_REGISTRY" && \
|
||||
npm config set strict-ssl false; \
|
||||
npm config set registry "$NPM_REGISTRY"; \
|
||||
fi
|
||||
|
||||
COPY frontend/application/package*.json ./
|
||||
RUN npm ci --include=dev --prefer-offline --no-audit
|
||||
RUN npm ci --include=dev --prefer-offline --no-audit && test -x node_modules/.bin/next
|
||||
COPY frontend/application ./
|
||||
ARG NEXT_PUBLIC_API_URL
|
||||
ENV NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL
|
||||
RUN npm run build
|
||||
|
||||
FROM node:20-alpine AS admin-builder
|
||||
FROM node:22-alpine AS admin-builder
|
||||
USER root
|
||||
WORKDIR /app
|
||||
ENV VITE_API_URL=https://api.canina.ir/api
|
||||
@@ -26,18 +25,17 @@ ENV VITE_API_URL=https://api.canina.ir/api
|
||||
# Optional: Use Nexus as npm registry (inherits build-arg)
|
||||
ARG NPM_REGISTRY=
|
||||
RUN if [ -n "$NPM_REGISTRY" ]; then \
|
||||
npm config set registry "$NPM_REGISTRY" && \
|
||||
npm config set strict-ssl false; \
|
||||
npm config set registry "$NPM_REGISTRY"; \
|
||||
fi
|
||||
|
||||
COPY frontend/admin-panel/package*.json ./
|
||||
RUN npm ci --include=dev --prefer-offline --no-audit
|
||||
RUN npm ci --include=dev --prefer-offline --no-audit && test -x node_modules/.bin/vite
|
||||
COPY frontend/admin-panel ./
|
||||
ARG VITE_API_URL
|
||||
ENV VITE_API_URL=$VITE_API_URL
|
||||
RUN npm run build
|
||||
|
||||
FROM node:20-alpine
|
||||
FROM node:22-alpine
|
||||
USER root
|
||||
RUN addgroup -S nginx 2>/dev/null || true && adduser -S nginx -G nginx 2>/dev/null || true
|
||||
RUN mkdir -p /var/log/nginx /var/cache/nginx /run/nginx /etc/nginx/conf.d /etc/nginx/http.d
|
||||
|
||||
+3
-2
@@ -12,7 +12,6 @@ ENV npm_config_cache=/tmp/npm-cache
|
||||
ARG NPM_REGISTRY=
|
||||
RUN if [ -n "$NPM_REGISTRY" ]; then \
|
||||
npm config set registry "$NPM_REGISTRY" && \
|
||||
npm config set strict-ssl false && \
|
||||
echo "Using npm registry: $NPM_REGISTRY"; \
|
||||
fi
|
||||
|
||||
@@ -32,8 +31,10 @@ RUN http_proxy=http://172.17.0.1:8888 https_proxy=http://172.17.0.1:8888 \
|
||||
FROM node:20-alpine
|
||||
USER root
|
||||
RUN http_proxy=http://172.17.0.1:8888 https_proxy=http://172.17.0.1:8888 apk add --no-cache openssl || apk add --no-cache openssl || true
|
||||
RUN mkdir -p /app/uploads && chown node:node /app/uploads
|
||||
RUN mkdir -p /app/uploads /app/private-stage-test && chmod 700 /app/private-stage-test && chown node:node /app/uploads /app/private-stage-test
|
||||
WORKDIR /app
|
||||
ARG STAGE_TEST_ARTIFACT_SHA=disabled
|
||||
RUN printf "%s" "$STAGE_TEST_ARTIFACT_SHA" > /app/STAGE_TEST_ARTIFACT_SHA
|
||||
ENV PRISMA_HIDE_UPDATE_MESSAGE=true
|
||||
COPY --chown=node:node --from=builder /app/package*.json ./
|
||||
COPY --chown=node:node --from=builder /app/tsconfig.json ./tsconfig.json
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
-- Scheduling is distinct from immutable approval validity. Existing queues run immediately.
|
||||
ALTER TABLE "prepare_workflow_outbox" ADD COLUMN "not_before" TIMESTAMPTZ;
|
||||
CREATE INDEX "prepare_workflow_outbox_due_idx" ON "prepare_workflow_outbox" ("status", "not_before", "created_at");
|
||||
@@ -0,0 +1 @@
|
||||
ALTER TABLE "users" ADD COLUMN "auth_expires_at" TIMESTAMPTZ, ADD COLUMN "stage_test_session" VARCHAR(64), ADD COLUMN "stage_test_generation" UUID;
|
||||
@@ -16,6 +16,9 @@ model User {
|
||||
mobile String @unique @db.VarChar(15)
|
||||
password String? @db.VarChar(255)
|
||||
role String @default("User_PetOwner") @db.VarChar(30)
|
||||
authExpiresAt DateTime? @map("auth_expires_at") @db.Timestamptz()
|
||||
stageTestGeneration String? @map("stage_test_generation") @db.Uuid
|
||||
stageTestSession String? @map("stage_test_session") @db.VarChar(64)
|
||||
walletBalance Decimal @default(0.00) @map("wallet_balance") @db.Decimal(15, 2)
|
||||
charityDonationTotal Decimal @default(0.00) @map("charity_donation_total") @db.Decimal(15, 2)
|
||||
createdAt DateTime @default(now()) @map("created_at") @db.Timestamptz()
|
||||
@@ -1239,6 +1242,7 @@ model PrepareWorkflowOutbox {
|
||||
taskId String @unique @map("task_id") @db.Uuid
|
||||
status String @default("PENDING") @db.VarChar(20)
|
||||
attempts Int @default(0)
|
||||
notBefore DateTime? @map("not_before") @db.Timestamptz()
|
||||
leaseOwner String? @map("lease_owner") @db.VarChar(100)
|
||||
leaseToken String? @map("lease_token") @db.Uuid
|
||||
leaseUntil DateTime? @map("lease_until") @db.Timestamptz()
|
||||
@@ -1247,5 +1251,6 @@ model PrepareWorkflowOutbox {
|
||||
reservationId String? @map("reservation_id") @db.Uuid
|
||||
createdAt DateTime @default(now()) @map("created_at") @db.Timestamptz()
|
||||
@@index([status, leaseUntil])
|
||||
@@index([status, notBefore, createdAt], map: "prepare_workflow_outbox_due_idx")
|
||||
@@map("prepare_workflow_outbox")
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
import { ForbiddenException } from "@nestjs/common";
|
||||
import { AdminService } from "./admin.service";
|
||||
import { AdminController } from "./admin.controller";
|
||||
|
||||
// All identities and credentials here are disposable test fixtures.
|
||||
describe("admin user privilege boundary", () => {
|
||||
let service: any;
|
||||
let prisma: any;
|
||||
const owner = { id: "owner-fixture", role: "SUPER_ADMIN" };
|
||||
const admin = { id: "admin-fixture", role: "ADMIN" };
|
||||
beforeEach(() => {
|
||||
prisma = {
|
||||
user: {
|
||||
findUnique: jest.fn().mockResolvedValue({ id: "target-fixture", role: "SUPER_ADMIN" }),
|
||||
update: jest.fn().mockImplementation(async ({ data }) => ({ role: "SUPER_ADMIN", ...data })),
|
||||
create: jest.fn(),
|
||||
},
|
||||
walletTransaction: { create: jest.fn() },
|
||||
$transaction: jest.fn(),
|
||||
};
|
||||
service = new AdminService(prisma, {} as never, {} as never);
|
||||
});
|
||||
it("allows an authenticated superadmin password-only edit without changing the exact role", async () => {
|
||||
const result = await service.updateUser("target-fixture", { password: "Fixture-only-123" }, owner);
|
||||
expect(result.role).toBe("SUPER_ADMIN");
|
||||
expect(prisma.user.update.mock.calls[0][0].data).not.toHaveProperty("role");
|
||||
});
|
||||
it.each(["ADMIN", "Admin", "User_PetOwner"])("denies %s assigning superadmin on create", async role => {
|
||||
prisma.user.findUnique.mockResolvedValue(null);
|
||||
await expect(service.createUser({ firstName: "Test", lastName: "Fixture", mobile: "09120000001", role: "SUPER_ADMIN" }, { id: "actor", role })).rejects.toBeInstanceOf(ForbiddenException);
|
||||
expect(prisma.user.create).not.toHaveBeenCalled();
|
||||
});
|
||||
it.each(["SUPER_ADMIN", "super-admin", "AdminSuper"])("denies ordinary admin escalation to %s", async role => {
|
||||
prisma.user.findUnique.mockResolvedValue({ id: admin.id, role: "Admin" });
|
||||
await expect(service.updateUser(admin.id, { role }, admin)).rejects.toBeInstanceOf(ForbiddenException);
|
||||
expect(prisma.user.update).not.toHaveBeenCalled();
|
||||
});
|
||||
it.each([{ password: "Fixture-only-123" }, { email: "fixture@example.test" }, { mobile: "09120000001" }, { role: "Admin" }, { walletBalance: 1 }, { firstName: "Changed" }])("denies ordinary admin editing superadmin", async dto => {
|
||||
await expect(service.updateUser("target-fixture", dto, admin)).rejects.toBeInstanceOf(ForbiddenException);
|
||||
expect(prisma.user.update).not.toHaveBeenCalled();
|
||||
});
|
||||
it("denies alternate role endpoint revocation", async () => {
|
||||
await expect(service.updateUserRole("target-fixture", "Admin", admin)).rejects.toBeInstanceOf(ForbiddenException);
|
||||
expect(prisma.user.update).not.toHaveBeenCalled();
|
||||
});
|
||||
it("denies deleting superadmin", async () => {
|
||||
await expect(service.deleteUser("target-fixture", admin)).rejects.toBeInstanceOf(ForbiddenException);
|
||||
expect(prisma.$transaction).not.toHaveBeenCalled();
|
||||
});
|
||||
it("denies changing superadmin wallet", async () => {
|
||||
await expect(service.adjustUserWallet("target-fixture", 1, "deposit", "fixture", admin)).rejects.toBeInstanceOf(ForbiddenException);
|
||||
expect(prisma.walletTransaction.create).not.toHaveBeenCalled();
|
||||
});
|
||||
it("accepts ADMIN alias for ordinary CRUD and authorized promotion/revocation", async () => {
|
||||
prisma.user.findUnique.mockResolvedValue({ id: "target-fixture", role: "User_PetOwner" });
|
||||
await service.updateUser("target-fixture", { role: "ADMIN" }, admin);
|
||||
await service.updateUser("target-fixture", { role: "SUPER_ADMIN" }, owner);
|
||||
prisma.user.findUnique.mockResolvedValue({ id: "target-fixture", role: "SUPER_ADMIN" });
|
||||
await service.updateUserRole("target-fixture", "Admin", owner);
|
||||
expect(prisma.user.update).toHaveBeenCalledTimes(3);
|
||||
});
|
||||
it("fails closed without authenticated actor or with API key superadmin", async () => {
|
||||
await expect(service.updateUser("target-fixture", { role: "Admin" })).rejects.toBeInstanceOf(ForbiddenException);
|
||||
await expect(service.updateUser("target-fixture", { role: "Admin" }, { ...owner, isApiKey: true })).rejects.toBeInstanceOf(ForbiddenException);
|
||||
});
|
||||
it("controller forwards authenticated request identity, not DTO identity", async () => {
|
||||
const svc = { updateUser: jest.fn().mockResolvedValue({}) };
|
||||
const controller: any = new AdminController(svc as never, {} as never);
|
||||
const dto = { firstName: "Test" };
|
||||
await controller.updateUser("target-fixture", dto, { user: admin });
|
||||
expect(svc.updateUser).toHaveBeenCalledWith("target-fixture", dto, admin);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,72 @@
|
||||
import { Test } from "@nestjs/testing";
|
||||
import { ExecutionContext } from "@nestjs/common";
|
||||
import { firstValueFrom, of } from "rxjs";
|
||||
import { AdminService } from "./admin.service";
|
||||
import { AdminController } from "./admin.controller";
|
||||
import { PrismaService } from "../prisma/prisma.service";
|
||||
import { RedisService } from "../redis/redis.service";
|
||||
import { RevalidationService } from "../common/revalidation/revalidation.service";
|
||||
import { DecimalInterceptor } from "../common/interceptors/decimal.interceptor";
|
||||
import { Prisma } from "@prisma/client";
|
||||
|
||||
describe("admin users list contract", () => {
|
||||
const prisma = { user: { findMany: jest.fn(), count: jest.fn() } };
|
||||
let service: AdminService;
|
||||
|
||||
beforeEach(async () => {
|
||||
jest.clearAllMocks();
|
||||
const module = await Test.createTestingModule({
|
||||
providers: [
|
||||
AdminService,
|
||||
{ provide: PrismaService, useValue: prisma },
|
||||
{ provide: RedisService, useValue: {} },
|
||||
{ provide: RevalidationService, useValue: {} },
|
||||
],
|
||||
}).compile();
|
||||
service = module.get(AdminService);
|
||||
});
|
||||
|
||||
it("returns only allowlisted list fields with aggregates through the controller and decimal interceptor", async () => {
|
||||
// Deliberately return extra fields even if the query selects safely.
|
||||
prisma.user.findMany.mockResolvedValue([{
|
||||
id: "fixture-user", firstName: "Fixture", lastName: "User",
|
||||
mobile: "fixture-mobile", email: null, role: "ADMIN",
|
||||
walletBalance: new Prisma.Decimal(0), charityDonationTotal: new Prisma.Decimal(12),
|
||||
createdAt: new Date("2026-01-01T00:00:00Z"),
|
||||
password: "test-only-password-hash", passwordHash: "test-only-hash",
|
||||
refreshToken: "test-only-token", futureSecret: "must-not-leak",
|
||||
walletTransactions: [{ transactionReference: "private-reference" }],
|
||||
addresses: [], orders: [{ totalAmount: new Prisma.Decimal(100) }, { totalAmount: 25 }],
|
||||
_count: { orders: 3, reviews: 2, blogComments: 1, pets: 4 },
|
||||
}]);
|
||||
prisma.user.count.mockResolvedValue(11);
|
||||
const controller = new AdminController(service, {} as never);
|
||||
const result = await controller.getUsers({ page: 2, limit: 10 });
|
||||
const body = await firstValueFrom(new DecimalInterceptor().intercept({} as ExecutionContext, { handle: () => of(result) }));
|
||||
expect(body).toEqual({
|
||||
data: [{
|
||||
id: "fixture-user", firstName: "Fixture", lastName: "User", mobile: "fixture-mobile",
|
||||
email: null, role: "ADMIN", walletBalance: "0", charityDonationTotal: "12",
|
||||
createdAt: new Date("2026-01-01T00:00:00Z"), addresses: [],
|
||||
totalSpent: 125, ordersCount: 3, reviewsCount: 3, petsCount: 4,
|
||||
}],
|
||||
meta: { total: 11, page: 2, limit: 10, lastPage: 2 },
|
||||
});
|
||||
const query = prisma.user.findMany.mock.calls[0][0];
|
||||
expect(query.select).toBeDefined();
|
||||
expect(query.select.password).toBeUndefined();
|
||||
expect(query.include).toBeUndefined();
|
||||
expect(query.skip).toBe(10);
|
||||
});
|
||||
|
||||
it("preserves the empty paginated list contract and filters", async () => {
|
||||
prisma.user.findMany.mockResolvedValue([]);
|
||||
prisma.user.count.mockResolvedValue(0);
|
||||
expect(await service.getUsers({ search: "fixture", role: "ADMIN" })).toEqual({
|
||||
data: [], meta: { total: 0, page: 1, limit: 10, lastPage: 1 },
|
||||
});
|
||||
expect(prisma.user.findMany).toHaveBeenCalledWith(expect.objectContaining({
|
||||
where: expect.objectContaining({ role: "ADMIN", OR: expect.any(Array) }),
|
||||
}));
|
||||
});
|
||||
});
|
||||
@@ -7,6 +7,7 @@ import {
|
||||
Body,
|
||||
Param,
|
||||
Query,
|
||||
Req,
|
||||
UseGuards,
|
||||
BadRequestException,
|
||||
} from "@nestjs/common";
|
||||
@@ -27,6 +28,7 @@ import {
|
||||
} from "@nestjs/swagger";
|
||||
|
||||
import { CreateUserDto, UpdateUserDto } from "./dto/user.dto";
|
||||
import type { UserAdminActor } from "./user-role-policy";
|
||||
import { SettingsService } from "../settings/settings.service";
|
||||
|
||||
import { RolesGuard } from "../common/guards/roles.guard";
|
||||
@@ -62,8 +64,8 @@ export class AdminController {
|
||||
|
||||
@Post("users")
|
||||
@ApiOperation({ summary: "ایجاد کاربر جدید توسط ادمین" })
|
||||
async createUser(@Body() dto: CreateUserDto) {
|
||||
const user = await this.adminService.createUser(dto);
|
||||
async createUser(@Body() dto: CreateUserDto, @Req() req?: { user?: UserAdminActor }) {
|
||||
const user = await this.adminService.createUser(dto, req?.user);
|
||||
return {
|
||||
success: true,
|
||||
message: "کاربر جدید با موفقیت ایجاد شد",
|
||||
@@ -80,8 +82,8 @@ export class AdminController {
|
||||
|
||||
@Put("users/:id")
|
||||
@ApiOperation({ summary: "ویرایش مشخصات کامل کاربر" })
|
||||
async updateUser(@Param("id") id: string, @Body() dto: UpdateUserDto) {
|
||||
const user = await this.adminService.updateUser(id, dto);
|
||||
async updateUser(@Param("id") id: string, @Body() dto: UpdateUserDto, @Req() req?: { user?: UserAdminActor }) {
|
||||
const user = await this.adminService.updateUser(id, dto, req?.user);
|
||||
return {
|
||||
success: true,
|
||||
message: "اطلاعات کاربر با موفقیت ویرایش شد",
|
||||
@@ -91,8 +93,8 @@ export class AdminController {
|
||||
|
||||
@Delete("users/:id")
|
||||
@ApiOperation({ summary: "حذف کاربر و دادههای مرتبط" })
|
||||
async deleteUser(@Param("id") id: string) {
|
||||
await this.adminService.deleteUser(id);
|
||||
async deleteUser(@Param("id") id: string, @Req() req?: { user?: UserAdminActor }) {
|
||||
await this.adminService.deleteUser(id, req?.user);
|
||||
return {
|
||||
success: true,
|
||||
message: "کاربر با موفقیت از سیستم حذف شد",
|
||||
@@ -101,8 +103,8 @@ export class AdminController {
|
||||
|
||||
@Put("users/:id/role")
|
||||
@ApiOperation({ summary: "تغییر نقش کاربر" })
|
||||
async updateUserRole(@Param("id") id: string, @Body("role") role: string) {
|
||||
const user = await this.adminService.updateUserRole(id, role);
|
||||
async updateUserRole(@Param("id") id: string, @Body("role") role: string, @Req() req?: { user?: UserAdminActor }) {
|
||||
const user = await this.adminService.updateUserRole(id, role, req?.user);
|
||||
return { success: true, data: user };
|
||||
}
|
||||
|
||||
@@ -113,6 +115,7 @@ export class AdminController {
|
||||
@Body("amount") amount: number,
|
||||
@Body("type") type: "deposit" | "withdrawal" | "refund",
|
||||
@Body("description") description?: string,
|
||||
@Req() req?: { user?: UserAdminActor },
|
||||
) {
|
||||
const numAmount = Number(amount);
|
||||
if (!numAmount || isNaN(numAmount) || numAmount <= 0) {
|
||||
@@ -130,6 +133,7 @@ export class AdminController {
|
||||
numAmount,
|
||||
type,
|
||||
description,
|
||||
req?.user,
|
||||
);
|
||||
return {
|
||||
success: true,
|
||||
|
||||
@@ -61,15 +61,10 @@ export class CouponInput {
|
||||
targets?: CouponTargetInput[];
|
||||
}
|
||||
|
||||
const ALLOWED_USER_ROLES = [
|
||||
"User_PetOwner",
|
||||
"User_Vet",
|
||||
"User_Clinic",
|
||||
"User_PetShop",
|
||||
"Customer",
|
||||
"Admin",
|
||||
"SUPER_ADMIN",
|
||||
];
|
||||
import { ALLOWED_USER_ROLES, assertUserMutationAllowed } from "./user-role-policy";
|
||||
import type { UserAdminActor } from "./user-role-policy";
|
||||
import { randomUUID } from "crypto";
|
||||
import { authorizeStageSession, STAGE_TEST_ID, STAGE_TEST_EMAIL, STAGE_TEST_MOBILE } from "../auth/stage-test-principal";
|
||||
|
||||
@Injectable()
|
||||
export class AdminService {
|
||||
@@ -168,12 +163,17 @@ export class AdminService {
|
||||
skip,
|
||||
take: limit,
|
||||
orderBy: { [sortField]: sortDirection },
|
||||
include: {
|
||||
select: {
|
||||
id: true,
|
||||
firstName: true,
|
||||
lastName: true,
|
||||
mobile: true,
|
||||
email: true,
|
||||
role: true,
|
||||
walletBalance: true,
|
||||
charityDonationTotal: true,
|
||||
createdAt: true,
|
||||
addresses: true,
|
||||
walletTransactions: {
|
||||
orderBy: { createdAt: "desc" },
|
||||
take: 20,
|
||||
},
|
||||
orders: {
|
||||
where: { status: { not: "CANCELLED" } },
|
||||
select: { totalAmount: true },
|
||||
@@ -197,9 +197,19 @@ export class AdminService {
|
||||
(acc, curr) => acc + (Number(curr.totalAmount) || 0),
|
||||
0,
|
||||
) || 0;
|
||||
const { orders: _orders, ...rest } = u;
|
||||
// Explicit response allowlist: never expose authentication fields or
|
||||
// new model columns implicitly through this administrative list.
|
||||
return {
|
||||
...rest,
|
||||
id: u.id,
|
||||
firstName: u.firstName,
|
||||
lastName: u.lastName,
|
||||
mobile: u.mobile,
|
||||
email: u.email,
|
||||
role: u.role,
|
||||
walletBalance: u.walletBalance,
|
||||
charityDonationTotal: u.charityDonationTotal,
|
||||
createdAt: u.createdAt,
|
||||
addresses: u.addresses,
|
||||
totalSpent,
|
||||
ordersCount: u._count?.orders || 0,
|
||||
reviewsCount: (u._count?.reviews || 0) + (u._count?.blogComments || 0),
|
||||
@@ -227,7 +237,12 @@ export class AdminService {
|
||||
return user;
|
||||
}
|
||||
|
||||
async createUser(dto: CreateUserDto) {
|
||||
async createUser(dto: CreateUserDto, actor?: UserAdminActor) {
|
||||
assertUserMutationAllowed(actor, undefined, dto.role);
|
||||
return this.persistUser(dto);
|
||||
}
|
||||
|
||||
private async persistUser(dto: CreateUserDto, stage?: { session: string; expiresAt: Date; generation?: string }) {
|
||||
const mobile = normalizeMobile(dto.mobile);
|
||||
const existingMobile = await this.prisma.user.findUnique({
|
||||
where: { mobile },
|
||||
@@ -260,6 +275,7 @@ export class AdminService {
|
||||
|
||||
return this.prisma.user.create({
|
||||
data: {
|
||||
...(stage ? { id: STAGE_TEST_ID, stageTestGeneration:stage.generation || randomUUID(), stageTestSession: stage.session, authExpiresAt: stage.expiresAt } : {}),
|
||||
firstName: dto.firstName.trim(),
|
||||
lastName: dto.lastName.trim(),
|
||||
mobile,
|
||||
@@ -274,7 +290,30 @@ export class AdminService {
|
||||
});
|
||||
}
|
||||
|
||||
async updateUser(id: string, dto: UpdateUserDto) {
|
||||
// Explicit CI seed authority, NOT a fabricated SUPER_ADMIN actor. Not controller-exposed.
|
||||
async provisionStageTestPrincipal(env: NodeJS.ProcessEnv, sha: string, password: string) {
|
||||
const grant = authorizeStageSession(env, sha);
|
||||
const existing = await this.prisma.user.findFirst({where:{OR:[{id:STAGE_TEST_ID},{email:STAGE_TEST_EMAIL},{mobile:STAGE_TEST_MOBILE}]}});
|
||||
if (existing) {
|
||||
if (existing.id !== STAGE_TEST_ID || existing.email !== STAGE_TEST_EMAIL || existing.mobile !== STAGE_TEST_MOBILE || existing.stageTestSession !== grant.session || (env.STAGE_TEST_GENERATION && existing.stageTestGeneration !== env.STAGE_TEST_GENERATION) || existing.role !== 'SUPER_ADMIN' || !existing.authExpiresAt || existing.authExpiresAt.getTime() <= Date.now() || !await bcrypt.compare(password, existing.password || '')) throw new Error('Refusing existing or unowned principal');
|
||||
return existing; // Never renew TTL on retry.
|
||||
}
|
||||
if (password.length < 32) throw new Error('Server generated secret required');
|
||||
return this.persistUser({firstName:'Stage',lastName:'CI independent reviewer',email:STAGE_TEST_EMAIL,mobile:STAGE_TEST_MOBILE,role:'SUPER_ADMIN',password}, {session:grant.session,expiresAt:new Date(Date.now()+grant.ttl*1000),generation:env.STAGE_TEST_GENERATION});
|
||||
}
|
||||
|
||||
async cleanupStageTestPrincipal(env: NodeJS.ProcessEnv, sha: string, onRevoked: () => void = () => undefined) {
|
||||
const grant = authorizeStageSession(env, sha);
|
||||
const existing = await this.prisma.user.findUnique({where:{id:STAGE_TEST_ID}});
|
||||
if (!existing) { onRevoked(); return; }
|
||||
if (existing.email !== STAGE_TEST_EMAIL || existing.mobile !== STAGE_TEST_MOBILE || existing.stageTestSession !== grant.session || !existing.authExpiresAt || (env.STAGE_TEST_GENERATION && existing.stageTestGeneration !== env.STAGE_TEST_GENERATION)) throw new Error('Refusing unowned principal cleanup');
|
||||
// Revoke before relational cleanup; failed cleanup cannot leave valid tokens.
|
||||
await this.prisma.user.update({where:{id:STAGE_TEST_ID,stageTestSession:grant.session,stageTestGeneration:existing.stageTestGeneration},data:{authExpiresAt:new Date(0),password:''}});
|
||||
onRevoked();
|
||||
return this.deleteUserRecords(STAGE_TEST_ID, {session:grant.session,generation:existing.stageTestGeneration});
|
||||
}
|
||||
|
||||
async updateUser(id: string, dto: UpdateUserDto, actor?: UserAdminActor) {
|
||||
if (id === "12345678-1234-1234-1234-123456789012") {
|
||||
throw new BadRequestException(
|
||||
"امکان ویرایش حساب ادمین پیشفرض وجود ندارد",
|
||||
@@ -286,6 +325,8 @@ export class AdminService {
|
||||
throw new NotFoundException(`کاربری با شناسه ${id} یافت نشد`);
|
||||
}
|
||||
|
||||
assertUserMutationAllowed(actor, user.role, dto.role);
|
||||
|
||||
const normalizedMobile = dto.mobile
|
||||
? normalizeMobile(dto.mobile)
|
||||
: undefined;
|
||||
@@ -340,17 +381,11 @@ export class AdminService {
|
||||
});
|
||||
}
|
||||
|
||||
async updateUserRole(id: string, role: string) {
|
||||
if (!ALLOWED_USER_ROLES.includes(role)) {
|
||||
throw new BadRequestException("نقش کاربری مشخص شده نامعتبر است");
|
||||
}
|
||||
return this.prisma.user.update({
|
||||
where: { id },
|
||||
data: { role },
|
||||
});
|
||||
async updateUserRole(id: string, role: string, actor?: UserAdminActor) {
|
||||
return this.updateUser(id, { role }, actor);
|
||||
}
|
||||
|
||||
async deleteUser(id: string) {
|
||||
async deleteUser(id: string, actor?: UserAdminActor) {
|
||||
if (id === "12345678-1234-1234-1234-123456789012") {
|
||||
throw new BadRequestException("امکان حذف حساب ادمین پیشفرض وجود ندارد");
|
||||
}
|
||||
@@ -360,7 +395,17 @@ export class AdminService {
|
||||
throw new NotFoundException(`کاربری با شناسه ${id} یافت نشد`);
|
||||
}
|
||||
|
||||
assertUserMutationAllowed(actor, user.role);
|
||||
|
||||
return this.deleteUserRecords(id);
|
||||
}
|
||||
|
||||
private async deleteUserRecords(id: string, stage?: {session:string; generation:string|null}) {
|
||||
return this.prisma.$transaction(async (tx) => {
|
||||
if (stage) {
|
||||
// Acquire the row lock with an exact fence before deleting any related rows.
|
||||
await tx.user.update({where:{id,stageTestSession:stage.session,stageTestGeneration:stage.generation},data:{authExpiresAt:new Date(0),password:''}});
|
||||
}
|
||||
await tx.userAddress.deleteMany({ where: { userId: id } });
|
||||
await tx.walletTransaction.deleteMany({ where: { userId: id } });
|
||||
await tx.pet.deleteMany({ where: { userId: id } });
|
||||
@@ -1397,12 +1442,15 @@ export class AdminService {
|
||||
amount: number,
|
||||
type: "deposit" | "withdrawal" | "refund",
|
||||
description?: string,
|
||||
actor?: UserAdminActor,
|
||||
) {
|
||||
const user = await this.prisma.user.findUnique({ where: { id: userId } });
|
||||
if (!user) {
|
||||
throw new NotFoundException(`کاربری با شناسه ${userId} یافت نشد.`);
|
||||
}
|
||||
|
||||
assertUserMutationAllowed(actor, user.role);
|
||||
|
||||
const transaction = await this.prisma.walletTransaction.create({
|
||||
data: {
|
||||
userId,
|
||||
|
||||
@@ -5,9 +5,12 @@ import {
|
||||
IsEmail,
|
||||
MinLength,
|
||||
IsNumber,
|
||||
IsIn,
|
||||
} from "class-validator";
|
||||
import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
|
||||
|
||||
import { ALLOWED_USER_ROLES } from "../user-role-policy";
|
||||
|
||||
export class CreateUserDto {
|
||||
@ApiProperty({ description: "نام کاربر", example: "علی" })
|
||||
@IsNotEmpty({ message: "نام الزامی است" })
|
||||
@@ -41,6 +44,7 @@ export class CreateUserDto {
|
||||
@ApiPropertyOptional({ description: "نقش کاربر", example: "User_PetOwner" })
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
@IsIn(ALLOWED_USER_ROLES)
|
||||
role?: string;
|
||||
|
||||
@ApiPropertyOptional({ description: "موجودی اولیه کیف پول", example: 0 })
|
||||
@@ -85,6 +89,7 @@ export class UpdateUserDto {
|
||||
@ApiPropertyOptional({ description: "نقش کاربر", example: "User_PetOwner" })
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
@IsIn(ALLOWED_USER_ROLES)
|
||||
role?: string;
|
||||
|
||||
@ApiPropertyOptional({ description: "موجودی کیف پول", example: 500000 })
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
import { ForbiddenException } from "@nestjs/common";
|
||||
|
||||
export const ALLOWED_USER_ROLES = [
|
||||
"User_PetOwner", "User_Vet", "User_Clinic", "User_PetShop",
|
||||
"User_Wholesale", "User_B2B", "Customer", "Admin", "ADMIN", "SUPER_ADMIN",
|
||||
];
|
||||
|
||||
export interface UserAdminActor {
|
||||
id?: string;
|
||||
role?: string;
|
||||
isApiKey?: boolean;
|
||||
}
|
||||
|
||||
// Match RolesGuard semantics; keep stored values unchanged.
|
||||
export function isSuperAdminRole(role?: string): boolean {
|
||||
const normalized = typeof role === "string" ? role.toLowerCase().replace(/[_-]/g, "") : "";
|
||||
return normalized === "superadmin" || normalized === "adminsuper";
|
||||
}
|
||||
|
||||
export function assertUserMutationAllowed(actor?: UserAdminActor, currentRole?: string, nextRole?: string): void {
|
||||
const role = actor?.role?.toLowerCase().replace(/[_-]/g, "");
|
||||
const isSuperAdmin = !!actor?.id && !actor.isApiKey && isSuperAdminRole(actor.role);
|
||||
if ((!actor?.id && !actor?.isApiKey) || (role !== "admin" && !isSuperAdmin) ||
|
||||
((isSuperAdminRole(currentRole) || isSuperAdminRole(nextRole)) && !isSuperAdmin)) {
|
||||
throw new ForbiddenException("فقط مدیر ارشد مجاز به مدیریت حساب و نقش مدیر ارشد است");
|
||||
}
|
||||
}
|
||||
@@ -14,6 +14,7 @@ import { SmsService } from "../common/services/sms.service";
|
||||
import * as bcrypt from "bcryptjs";
|
||||
import * as crypto from "crypto";
|
||||
import { normalizeMobile } from "../common/utils/phone.utils";
|
||||
import { assertPrincipalActive } from "./stage-test-principal";
|
||||
import { getJwtRefreshSecret } from "./auth.constants";
|
||||
|
||||
export class RegisterInput {
|
||||
@@ -200,7 +201,8 @@ export class AuthService {
|
||||
});
|
||||
}
|
||||
|
||||
const payload = { sub: user.id, phoneNumber: user.mobile, role: user.role };
|
||||
assertPrincipalActive(user);
|
||||
const payload = { sub: user.id, phoneNumber: user.mobile, role: user.role, ...(user.stageTestSession ? {stageTestSession:user.stageTestSession, stageTestGeneration:user.stageTestGeneration} : {}) };
|
||||
const tokens = await this.generateTokens(payload);
|
||||
|
||||
const { password: _p, ...safeUser } = user;
|
||||
@@ -257,7 +259,8 @@ export class AuthService {
|
||||
},
|
||||
});
|
||||
|
||||
const payload = { sub: user.id, phoneNumber: user.mobile, role: user.role };
|
||||
assertPrincipalActive(user);
|
||||
const payload = { sub: user.id, phoneNumber: user.mobile, role: user.role, ...(user.stageTestSession ? {stageTestSession:user.stageTestSession, stageTestGeneration:user.stageTestGeneration} : {}) };
|
||||
const tokens = await this.generateTokens(payload);
|
||||
|
||||
const { password: _p, ...safeUser } = user;
|
||||
@@ -300,7 +303,8 @@ export class AuthService {
|
||||
});
|
||||
}
|
||||
|
||||
const payload = { sub: user.id, phoneNumber: user.mobile, role: user.role };
|
||||
assertPrincipalActive(user);
|
||||
const payload = { sub: user.id, phoneNumber: user.mobile, role: user.role, ...(user.stageTestSession ? {stageTestSession:user.stageTestSession, stageTestGeneration:user.stageTestGeneration} : {}) };
|
||||
const tokens = await this.generateTokens(payload);
|
||||
|
||||
const { password: _pw, ...safeUser } = user;
|
||||
@@ -326,10 +330,12 @@ export class AuthService {
|
||||
if (dbAdmin && dbAdmin.password && body.password) {
|
||||
const isMatch = await bcrypt.compare(body.password, dbAdmin.password);
|
||||
if (isMatch) {
|
||||
assertPrincipalActive(dbAdmin);
|
||||
const payload = {
|
||||
sub: dbAdmin.id,
|
||||
email: dbAdmin.email,
|
||||
role: dbAdmin.role,
|
||||
...(dbAdmin.stageTestSession ? {stageTestSession:dbAdmin.stageTestSession, stageTestGeneration:dbAdmin.stageTestGeneration} : {}),
|
||||
};
|
||||
const tokens = await this.generateTokens(payload);
|
||||
const { password: _p, ...safeUser } = dbAdmin;
|
||||
@@ -443,11 +449,14 @@ export class AuthService {
|
||||
|
||||
const user = await this.prisma.user.findUnique({ where: { id: userId } });
|
||||
if (user) {
|
||||
assertPrincipalActive(user);
|
||||
if (user.stageTestSession && (!user.stageTestGeneration || decoded.stageTestGeneration !== user.stageTestGeneration || decoded.stageTestSession !== user.stageTestSession)) throw new UnauthorizedException("Stage session revoked");
|
||||
userPayload = {
|
||||
sub: user.id,
|
||||
email: user.email,
|
||||
phoneNumber: user.mobile,
|
||||
role: user.role,
|
||||
...(user.stageTestSession ? {stageTestSession:user.stageTestSession, stageTestGeneration:user.stageTestGeneration} : {}),
|
||||
};
|
||||
const { password: _p, ...restUser } = user;
|
||||
safeUser = restUser;
|
||||
@@ -487,12 +496,15 @@ export class AuthService {
|
||||
email?: string;
|
||||
role?: string;
|
||||
mobile?: string;
|
||||
stageTestSession?: string | null;
|
||||
stageTestGeneration?: string | null;
|
||||
}) {
|
||||
const payload = {
|
||||
sub: user.id,
|
||||
email: user.email,
|
||||
role: user.role,
|
||||
phoneNumber: user.mobile,
|
||||
...(user.stageTestSession ? {stageTestSession:user.stageTestSession, stageTestGeneration:user.stageTestGeneration} : {}),
|
||||
};
|
||||
const tokens = await this.generateTokens(payload);
|
||||
return {
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
import { AdminService } from '../admin/admin.service';
|
||||
import { STAGE_TEST_ID, STAGE_TEST_EMAIL, STAGE_TEST_MOBILE } from './stage-test-principal';
|
||||
const sha='a'.repeat(40), generation='8311eb41-23b4-4aab-ade2-e97b90debc11';
|
||||
const env={APP_ENV:'stage',CI:'true',STAGE_TEST_PRINCIPAL_ENABLED:'true',STAGE_TEST_APPROVAL:'owner-authorized-stage-editorial',STAGE_TEST_SHA:sha,STAGE_TEST_SESSION:'cleanup-session',STAGE_TEST_TTL_SECONDS:'600',STAGE_TEST_GENERATION:generation};
|
||||
describe('durable cleanup ownership fence',()=>{
|
||||
it('does not revoke a replacement generation',async()=>{
|
||||
const update=jest.fn();
|
||||
const db={user:{findUnique:async()=>({id:STAGE_TEST_ID,email:STAGE_TEST_EMAIL,mobile:STAGE_TEST_MOBILE,stageTestSession:env.STAGE_TEST_SESSION,stageTestGeneration:'replacement',authExpiresAt:new Date()}),update}};
|
||||
await expect(new AdminService(db as any,undefined as any,undefined as any).cleanupStageTestPrincipal(env,sha)).rejects.toThrow('Refusing');
|
||||
expect(update).not.toHaveBeenCalled();
|
||||
});
|
||||
it('confirms revocation before relational deletion failure',async()=>{
|
||||
const events:string[]=[];
|
||||
const db={user:{findUnique:async()=>({id:STAGE_TEST_ID,email:STAGE_TEST_EMAIL,mobile:STAGE_TEST_MOBILE,stageTestSession:env.STAGE_TEST_SESSION,stageTestGeneration:generation,authExpiresAt:new Date()}),update:async()=>events.push('revoke')},$transaction:async()=>{events.push('delete');throw Error('FK failure');}};
|
||||
await expect((new AdminService(db as any,undefined as any,undefined as any).cleanupStageTestPrincipal as any)(env,sha,()=>events.push('handle-removed'))).rejects.toThrow('FK failure');
|
||||
expect(events).toEqual(['revoke','handle-removed','delete']);
|
||||
});
|
||||
});
|
||||
@@ -2,6 +2,7 @@ import { ExtractJwt, Strategy } from "passport-jwt";
|
||||
import { PassportStrategy } from "@nestjs/passport";
|
||||
import { Injectable, UnauthorizedException } from "@nestjs/common";
|
||||
import { UsersService } from "../users/users.service";
|
||||
import { assertPrincipalActive } from "./stage-test-principal";
|
||||
import { getJwtSecret } from "./auth.constants";
|
||||
|
||||
import { RedisService } from "../redis/redis.service";
|
||||
@@ -12,6 +13,8 @@ export interface JwtPayload {
|
||||
email?: string;
|
||||
role?: string;
|
||||
phoneNumber?: string;
|
||||
stageTestSession?: string;
|
||||
stageTestGeneration?: string;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
@@ -59,6 +62,13 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
|
||||
if (!user) {
|
||||
throw new UnauthorizedException("کاربر یافت نشد");
|
||||
}
|
||||
try { assertPrincipalActive(user); } catch { throw new UnauthorizedException("Principal expired"); }
|
||||
if (user.stageTestSession) {
|
||||
if (!user.stageTestGeneration || payload.stageTestGeneration !== user.stageTestGeneration || payload.stageTestSession !== user.stageTestSession) throw new UnauthorizedException("Stage session revoked");
|
||||
const path = req.originalUrl?.split('?')[0] || '';
|
||||
const allowed = req.method === 'GET' && /^\/api\/admin\/orchestration\/tasks(?:\/[a-f0-9-]+)?$/.test(path) || req.method === 'POST' && (/^\/api\/admin\/orchestration\/tasks$/.test(path) || /^\/api\/admin\/orchestration\/tasks\/[a-f0-9-]+\/(?:gates\/1\/decide|editorial-failure|editorial-completed-recovery)$/.test(path));
|
||||
if (!allowed) throw new UnauthorizedException('Stage test scope denied');
|
||||
}
|
||||
return user;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
import { JwtService } from '@nestjs/jwt';
|
||||
import { AuthService } from './auth.service';
|
||||
import { RedisService } from '../redis/redis.service';
|
||||
import { STAGE_TEST_ID } from './stage-test-principal';
|
||||
import { createServer, Server } from 'http';
|
||||
import { execFile } from 'child_process';
|
||||
import { promisify } from 'util';
|
||||
import { readFileSync, writeFileSync, existsSync } from 'fs';
|
||||
const enabled=process.env.STAGE_PRINCIPAL_DISPOSABLE_TEST==='true';
|
||||
(enabled?describe:describe.skip)('actual internal CLI disposable lifecycle',()=>{
|
||||
const sha='a'.repeat(40), generation='b411eb41-23b4-4aab-ade2-e97b90debc11', session='cli-integration-session';
|
||||
const handle=`/app/private-stage-test/${session}.json`;
|
||||
const db=new PrismaClient({log:[]}), redis=new RedisService(); let server:Server;
|
||||
const env={...process.env,APP_ENV:'stage',CI:'true',STAGE_TEST_PRINCIPAL_ENABLED:'true',STAGE_TEST_APPROVAL:'owner-authorized-stage-editorial',STAGE_TEST_SHA:sha,STAGE_TEST_SESSION:session,STAGE_TEST_TTL_SECONDS:'600',STAGE_TEST_GENERATION:generation};
|
||||
const cli=(action:string)=>promisify(execFile)(process.execPath,['-r','ts-node/register','src/auth/stage-test-principal.cli.ts',action],{env,timeout:90000});
|
||||
beforeAll(async()=>{
|
||||
if(!process.env.DATABASE_URL?.endsWith('/principal_disposable')) throw Error('Disposable database only');
|
||||
writeFileSync('/app/STAGE_TEST_ARTIFACT_SHA',sha); redis.onModuleInit();
|
||||
const auth=new AuthService(db as any,new JwtService({secret:process.env.JWT_SECRET,signOptions:{expiresIn:'2h'}}),redis,undefined as any);
|
||||
server=createServer(async(req,res)=>{
|
||||
try {let body='';for await(const chunk of req) body+=chunk;
|
||||
if(req.url!=='/api/auth/admin-login') {res.writeHead(404).end();return;}
|
||||
const login=await auth.adminLogin(JSON.parse(body));res.setHeader('content-type','application/json');res.end(JSON.stringify(login));
|
||||
} catch {res.writeHead(401).end();}
|
||||
});
|
||||
await new Promise<void>(r=>server.listen(3000,'127.0.0.1',r));
|
||||
},120000);
|
||||
afterAll(async()=>{await new Promise<void>(r=>server.close(()=>r()));redis.onModuleDestroy();await db.$disconnect();});
|
||||
it('logs in using persisted credentials and removes handle on confirmed revocation despite failed delete',async()=>{
|
||||
await cli('open'); expect(existsSync(handle)).toBe(true);
|
||||
const credential=JSON.parse(readFileSync(handle,'utf8'));expect(credential.accessToken).toBeTruthy();
|
||||
expect((await db.user.findUnique({where:{id:STAGE_TEST_ID}}))?.stageTestGeneration).toBe(generation);
|
||||
await db.$executeRawUnsafe(`CREATE FUNCTION deny_principal_delete() RETURNS trigger LANGUAGE plpgsql AS $$ BEGIN RAISE EXCEPTION 'test FK deletion failure'; END $$`);
|
||||
await db.$executeRawUnsafe(`CREATE TRIGGER deny_principal_delete BEFORE DELETE ON users FOR EACH ROW EXECUTE FUNCTION deny_principal_delete()`);
|
||||
try {
|
||||
await expect(cli('close')).rejects.toThrow();
|
||||
expect(existsSync(handle)).toBe(false);
|
||||
const revoked=await db.user.findUnique({where:{id:STAGE_TEST_ID}});
|
||||
expect(revoked?.authExpiresAt?.getTime()).toBe(0);expect(revoked?.password).toBe('');
|
||||
} finally {await db.$executeRawUnsafe(`DROP TRIGGER deny_principal_delete ON users`);await db.$executeRawUnsafe(`DROP FUNCTION deny_principal_delete()`);}
|
||||
await cli('close');expect(await db.user.findUnique({where:{id:STAGE_TEST_ID}})).toBeNull();
|
||||
},240000);
|
||||
});
|
||||
@@ -0,0 +1,68 @@
|
||||
import 'reflect-metadata';
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
import { randomBytes } from 'crypto';
|
||||
import { mkdirSync, openSync, writeFileSync, closeSync, readFileSync, statSync, unlinkSync, constants } from 'fs';
|
||||
import { AdminService } from '../admin/admin.service';
|
||||
import { authorizeStageSession, STAGE_TEST_EMAIL } from './stage-test-principal';
|
||||
|
||||
// CI-only internal seed command; deliberately not registered in AppModule.
|
||||
async function main() {
|
||||
const sha = readFileSync('/app/STAGE_TEST_ARTIFACT_SHA', 'utf8').trim();
|
||||
const grant = authorizeStageSession(process.env, sha);
|
||||
const action = process.argv[2];
|
||||
if (action === 'cleanup-capability') { process.stdout.write('stage-generation-cleanup-v1'); return; }
|
||||
if (!['open','close'].includes(action)) throw new Error('Unknown command');
|
||||
const root = '/app/private-stage-test';
|
||||
mkdirSync(root,{recursive:true,mode:0o700});
|
||||
const st = statSync(root);
|
||||
if (st.uid !== process.getuid!() || (st.mode & 0o777) !== 0o700) throw new Error('Unsafe private directory');
|
||||
if (!/^[a-f0-9-]{36}$/.test(process.env.STAGE_TEST_GENERATION || '')) throw new Error('Generation required');
|
||||
const handle = `${root}/${grant.session}.json`;
|
||||
const removeHandle = () => { try {unlinkSync(handle);} catch(e:any) {if(e.code !== 'ENOENT') throw e;} };
|
||||
const audit = (event:string) => {
|
||||
const fd = openSync(`${root}/audit.jsonl`, constants.O_WRONLY|constants.O_CREAT|constants.O_APPEND|constants.O_NOFOLLOW,0o600);
|
||||
try { writeFileSync(fd,JSON.stringify({event,sha,session:grant.session,at:new Date().toISOString()})+'\n'); } finally {closeSync(fd);}
|
||||
};
|
||||
const db = new PrismaClient({log:[]});
|
||||
const service = new AdminService(db as any,undefined as any,undefined as any);
|
||||
try {
|
||||
audit(`${action}-requested`);
|
||||
if(action === 'close') {
|
||||
await service.cleanupStageTestPrincipal(process.env,sha,removeHandle);
|
||||
audit('revoked-and-deleted');
|
||||
return;
|
||||
}
|
||||
let fd:number;
|
||||
let password:string;
|
||||
try {
|
||||
fd = openSync(handle,constants.O_WRONLY|constants.O_CREAT|constants.O_EXCL|constants.O_NOFOLLOW,0o600);
|
||||
password = randomBytes(48).toString('base64url');
|
||||
try {writeFileSync(fd,JSON.stringify({password}));} finally {closeSync(fd);}
|
||||
} catch(e:any) {
|
||||
if(e.code !== 'EEXIST') throw e;
|
||||
fd = openSync(handle,constants.O_RDONLY|constants.O_NOFOLLOW);
|
||||
try {
|
||||
const {fstatSync} = await import('fs'); const s=fstatSync(fd);
|
||||
if(!s.isFile() || s.uid !== process.getuid!() || (s.mode & 0o777) !== 0o600) throw new Error('Unsafe handle');
|
||||
password=JSON.parse(readFileSync(fd,'utf8')).password;
|
||||
} finally {closeSync(fd);}
|
||||
}
|
||||
const user=await service.provisionStageTestPrincipal(process.env,sha,password);
|
||||
// Use deployed persisted-account HTTP login, never sign tokens here.
|
||||
const response=await fetch('http://127.0.0.1:3000/api/auth/admin-login',{method:'POST',headers:{'content-type':'application/json'},body:JSON.stringify({email:STAGE_TEST_EMAIL,password}),signal:AbortSignal.timeout(15000)});
|
||||
if(!response.ok) throw new Error('Persisted login failed');
|
||||
const result:any=await response.json();
|
||||
if(result.data?.user?.id !== user.id || result.data?.user?.role !== 'SUPER_ADMIN' || !result.data?.accessToken) throw new Error('Persisted login mismatch');
|
||||
fd=openSync(handle,constants.O_WRONLY|constants.O_TRUNC|constants.O_NOFOLLOW);
|
||||
try {writeFileSync(fd,JSON.stringify({password,...result.data,expiresAt:user.authExpiresAt}));} finally {closeSync(fd);}
|
||||
audit('created-and-login-verified');
|
||||
// Only an opaque local path is public. Never upload this file as a CI artifact.
|
||||
process.stdout.write(`Stage credential handle: ${handle}\n`);
|
||||
} catch {
|
||||
audit('failed');
|
||||
// Leave only a revoked account if relational cleanup fails.
|
||||
await service.cleanupStageTestPrincipal(process.env,sha,removeHandle).catch(()=>undefined);
|
||||
throw new Error('Stage test principal operation failed; inspect private audit');
|
||||
} finally {await db.$disconnect();}
|
||||
}
|
||||
main().catch(()=>{process.stderr.write('Stage test principal denied or failed\n');process.exitCode=1;});
|
||||
@@ -0,0 +1,58 @@
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
import { randomBytes } from 'crypto';
|
||||
import { JwtService } from '@nestjs/jwt';
|
||||
import { AdminService } from '../admin/admin.service';
|
||||
import { AuthService } from './auth.service';
|
||||
import { UsersService } from '../users/users.service';
|
||||
import { JwtStrategy } from './jwt.strategy';
|
||||
import { RedisService } from '../redis/redis.service';
|
||||
import { STAGE_TEST_ID, STAGE_TEST_EMAIL, STAGE_TEST_MOBILE } from './stage-test-principal';
|
||||
const enabled=process.env.STAGE_PRINCIPAL_DISPOSABLE_TEST === 'true';
|
||||
(enabled ? describe : describe.skip)('disposable persisted Stage principal lifecycle',()=>{
|
||||
const sha='a'.repeat(40), grant={APP_ENV:'stage',CI:'true',STAGE_TEST_PRINCIPAL_ENABLED:'true',STAGE_TEST_APPROVAL:'owner-authorized-stage-editorial',STAGE_TEST_SHA:sha,STAGE_TEST_SESSION:'integration-session',STAGE_TEST_TTL_SECONDS:'600'};
|
||||
const db=new PrismaClient({log:[]}); const redis=new RedisService();
|
||||
let admin:AdminService,auth:AuthService,strategy:JwtStrategy,password:string;
|
||||
beforeAll(async()=>{
|
||||
// Deliberately require a disposable database name; never point this suite at Stage.
|
||||
if(!process.env.DATABASE_URL?.endsWith('/principal_disposable')) throw new Error('Disposable database required');
|
||||
redis.onModuleInit(); password=randomBytes(48).toString('base64url');
|
||||
admin=new AdminService(db as any,redis,undefined as any);
|
||||
auth=new AuthService(db as any,new JwtService({secret:process.env.JWT_SECRET,signOptions:{expiresIn:'2h'}}),redis,undefined as any);
|
||||
strategy=new JwtStrategy(new UsersService(db as any),redis);
|
||||
});
|
||||
afterAll(async()=>{await admin.cleanupStageTestPrincipal(grant,sha); await db.$disconnect();redis.onModuleDestroy();});
|
||||
it('rejects unowned collision and never changes it',async()=>{
|
||||
const collision=await db.user.create({data:{firstName:'Unowned',lastName:'Account',email:STAGE_TEST_EMAIL,mobile:STAGE_TEST_MOBILE}});
|
||||
try {
|
||||
await expect(admin.provisionStageTestPrincipal(grant,sha,password)).rejects.toThrow('Refusing');
|
||||
expect((await db.user.findUnique({where:{id:collision.id}}))?.role).toBe('User_PetOwner');
|
||||
} finally {await db.user.delete({where:{id:collision.id}});}
|
||||
});
|
||||
it('creates through account service, logs in, verifies signed tokens, never renews retry TTL',async()=>{
|
||||
const u=await admin.provisionStageTestPrincipal(grant,sha,password);
|
||||
expect(u.id).toBe(STAGE_TEST_ID); expect(u.role).toBe('SUPER_ADMIN'); expect(u.password).not.toBe(password);
|
||||
const retry=await admin.provisionStageTestPrincipal(grant,sha,password); expect(retry.authExpiresAt).toEqual(u.authExpiresAt);
|
||||
await expect(admin.provisionStageTestPrincipal({...grant,STAGE_TEST_SESSION:'different-session'},sha,password)).rejects.toThrow('Refusing');
|
||||
const login=await auth.adminLogin({email:STAGE_TEST_EMAIL,password});
|
||||
const jwt=new JwtService({secret:process.env.JWT_SECRET});
|
||||
const payload=jwt.verify(login.data.accessToken); expect(payload.sub).toBe(u.id);expect(payload.role).toBe('SUPER_ADMIN');
|
||||
const req:any={method:'GET',originalUrl:'/api/admin/orchestration/tasks',headers:{authorization:`Bearer ${login.data.accessToken}`}};
|
||||
expect((await strategy.validate(req,payload)).id).toBe(u.id);
|
||||
await expect(strategy.validate({...req,originalUrl:'/api/admin/users'},payload)).rejects.toThrow('scope denied');
|
||||
await expect(strategy.validate({...req,method:'POST',originalUrl:'/api/admin/orchestration/tasks/abcd/gates/2/decide'},payload)).rejects.toThrow('scope denied');
|
||||
// Fixture time travel: persisted expiry is enforced independently of the long-lived signed token.
|
||||
await db.user.update({where:{id:u.id},data:{authExpiresAt:new Date(0)}});
|
||||
await expect(strategy.validate(req,payload)).rejects.toThrow();
|
||||
await expect(auth.adminLogin({email:STAGE_TEST_EMAIL,password})).rejects.toThrow();
|
||||
await expect(auth.refreshToken(login.data.refreshToken)).rejects.toThrow();
|
||||
await admin.cleanupStageTestPrincipal(grant,sha);
|
||||
await expect(strategy.validate(req,payload)).rejects.toThrow();
|
||||
expect(await db.user.findUnique({where:{id:u.id}})).toBeNull();
|
||||
const replacement=await admin.provisionStageTestPrincipal(grant,sha,password);
|
||||
expect(replacement.stageTestGeneration).not.toBe(u.stageTestGeneration);
|
||||
await expect(strategy.validate(req,payload)).rejects.toThrow();
|
||||
await expect(auth.refreshToken(login.data.refreshToken)).rejects.toThrow();
|
||||
const fresh=await auth.adminLogin({email:STAGE_TEST_EMAIL,password});
|
||||
expect((await strategy.validate(req,jwt.verify(fresh.data.accessToken))).id).toBe(u.id);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,13 @@
|
||||
import { assertPrincipalActive, authorizeStageSession } from './stage-test-principal';
|
||||
const sha = 'a'.repeat(40);
|
||||
const valid = { APP_ENV: 'stage', STAGE_TEST_PRINCIPAL_ENABLED: 'true', CI: 'true', STAGE_TEST_APPROVAL: 'owner-authorized-stage-editorial', STAGE_TEST_SHA: sha, STAGE_TEST_SESSION: 'editorial-20261024', STAGE_TEST_TTL_SECONDS: '600' };
|
||||
describe('Stage CI authority', () => {
|
||||
it('denies by default and in Production despite opt in', () => {
|
||||
expect(() => authorizeStageSession({}, sha)).toThrow();
|
||||
expect(() => authorizeStageSession({...valid, APP_ENV:'production'}, sha)).toThrow();
|
||||
});
|
||||
it('requires immutable matching SHA and bounded explicit authorization', () => {
|
||||
expect(authorizeStageSession(valid, sha).ttl).toBe(600);
|
||||
for(const patch of [{STAGE_TEST_SHA:'main'}, {STAGE_TEST_SHA:'b'.repeat(40)}, {STAGE_TEST_TTL_SECONDS:'3601'}, {STAGE_TEST_TTL_SECONDS:'0'}, {STAGE_TEST_APPROVAL:''}, {CI:''}]) expect(() => authorizeStageSession({...valid,...patch},sha)).toThrow();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,13 @@
|
||||
// Internal seed authority only. No controller, JWT actor, or owner impersonation.
|
||||
export const STAGE_TEST_ID = 'e876e7a0-738f-4e59-b6db-e270512ababc';
|
||||
export const STAGE_TEST_EMAIL = 'stage-editorial-reviewer@ci.canina.invalid';
|
||||
export const STAGE_TEST_MOBILE = '09999999071';
|
||||
export function authorizeStageSession(env: NodeJS.ProcessEnv, artifactSha: string) {
|
||||
if (env.APP_ENV !== 'stage' || env.STAGE_TEST_PRINCIPAL_ENABLED !== 'true' || env.CI !== 'true' || env.STAGE_TEST_APPROVAL !== 'owner-authorized-stage-editorial' || !/^[a-f0-9]{40}$/.test(artifactSha) || env.STAGE_TEST_SHA !== artifactSha || !/^[a-z0-9-]{8,64}$/.test(env.STAGE_TEST_SESSION || '')) throw new Error('Stage CI authority denied');
|
||||
const ttl = Number(env.STAGE_TEST_TTL_SECONDS);
|
||||
if (!Number.isInteger(ttl) || ttl < 60 || ttl > 3600) throw new Error('Bounded TTL required');
|
||||
return {ttl, session:env.STAGE_TEST_SESSION!, sha:artifactSha};
|
||||
}
|
||||
export function assertPrincipalActive(user: { authExpiresAt?: Date | null }, now = Date.now()) {
|
||||
if (user.authExpiresAt && user.authExpiresAt.getTime() <= now) throw new Error('Principal expired');
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
import { JwtService } from '@nestjs/jwt';
|
||||
import { JwtStrategy } from './jwt.strategy';
|
||||
import { AuthService } from './auth.service';
|
||||
|
||||
describe('Stage credentials remain fenced to their creation session', () => {
|
||||
const id='e876e7a0-738f-4e59-b6db-e270512ababc';
|
||||
const current={id, role:'SUPER_ADMIN', stageTestSession:'new-session', stageTestGeneration:'fresh-generation', authExpiresAt:new Date(Date.now()+600000)};
|
||||
const redis:any={get:jest.fn(async()=> '1'),del:jest.fn(),set:jest.fn()};
|
||||
beforeAll(()=> {process.env.JWT_SECRET='disposable-only-test-secret-at-least-32-characters';process.env.JWT_REFRESH_SECRET='disposable-only-refresh-secret-at-least-32-characters';});
|
||||
it('rejects an old-session access token after fixed account ID is recreated',async()=>{
|
||||
const strategy=new JwtStrategy({findById:async()=>current} as any,{get:async()=>null} as any);
|
||||
const req:any={method:'GET',originalUrl:'/api/admin/orchestration/tasks',headers:{}};
|
||||
await expect(strategy.validate(req,{sub:id,stageTestSession:'old-session'} as any)).rejects.toThrow();
|
||||
await expect(strategy.validate(req,{sub:id})).rejects.toThrow();
|
||||
await expect(strategy.validate(req,{sub:id,stageTestSession:'new-session',stageTestGeneration:'old-generation'} as any)).rejects.toThrow();
|
||||
await expect(strategy.validate(req,{sub:id,stageTestSession:'new-session',stageTestGeneration:'fresh-generation'} as any)).resolves.toMatchObject({id});
|
||||
});
|
||||
it('rejects an old-session refresh token even while its Redis entry remains active',async()=>{
|
||||
const jwt=new JwtService({secret:process.env.JWT_SECRET});
|
||||
const auth=new AuthService({user:{findUnique:async()=>current}} as any,jwt,redis,undefined as any);
|
||||
const token=jwt.sign({sub:id,jti:'old-refresh',role:'SUPER_ADMIN',stageTestSession:'old-session'},{secret:process.env.JWT_REFRESH_SECRET});
|
||||
await expect(auth.refreshToken(token)).rejects.toThrow();
|
||||
});
|
||||
it('includes session fencing in newly issued credentials',async()=>{
|
||||
const jwt=new JwtService({secret:process.env.JWT_SECRET});
|
||||
const auth=new AuthService({} as any,jwt,redis,undefined as any);
|
||||
const result=await auth.refresh(current);
|
||||
expect(jwt.verify(result.data.accessToken).stageTestGeneration).toBe('fresh-generation');
|
||||
expect(jwt.verify(result.data.accessToken).stageTestSession).toBe('new-session');
|
||||
expect(jwt.verify(result.data.refreshToken,{secret:process.env.JWT_REFRESH_SECRET}).stageTestSession).toBe('new-session');
|
||||
});
|
||||
});
|
||||
@@ -26,6 +26,16 @@ describe("RevalidationService", () => {
|
||||
expect(service).toBeDefined();
|
||||
});
|
||||
|
||||
it("uses the Next server rather than the nginx API proxy as production fallback", async () => {
|
||||
delete process.env.FRONTEND_INTERNAL_URL;
|
||||
delete process.env.FRONTEND_URL;
|
||||
delete process.env.NEXT_PUBLIC_SITE_URL;
|
||||
process.env.NODE_ENV = "production";
|
||||
const fetchSpy = jest.spyOn(global, "fetch").mockResolvedValue({ ok: true } as Response);
|
||||
await service.revalidate(["blogs"], ["/blog"]);
|
||||
expect(fetchSpy).toHaveBeenCalledWith("http://frontend_prod:3000/api/revalidate", expect.anything());
|
||||
});
|
||||
|
||||
describe("revalidateTag", () => {
|
||||
it("should send POST request with tag and secret header and return true on 200", async () => {
|
||||
const mockFetch = jest.spyOn(global, "fetch" as any).mockResolvedValue({
|
||||
|
||||
@@ -10,7 +10,7 @@ export class RevalidationService {
|
||||
process.env.FRONTEND_URL ||
|
||||
process.env.NEXT_PUBLIC_SITE_URL ||
|
||||
(process.env.NODE_ENV === "production"
|
||||
? "http://frontend_prod:8080"
|
||||
? "http://frontend_prod:3000"
|
||||
: "http://localhost:3000");
|
||||
return raw.replace(/\/+$/, "");
|
||||
}
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
import { Test } from '@nestjs/testing';
|
||||
import { INestApplication } from '@nestjs/common';
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
import { createHash, randomUUID } from 'crypto';
|
||||
import { sign } from 'jsonwebtoken';
|
||||
import { PrismaService } from '../prisma/prisma.service';
|
||||
import { PrepareWorkflowService } from '../orchestration/prepare-workflow.service';
|
||||
import { OrchestrationController } from '../orchestration/orchestration.controller';
|
||||
import { OrchestrationService } from '../orchestration/orchestration.service';
|
||||
import { JwtStrategy } from '../auth/jwt.strategy';
|
||||
import { UsersService } from '../users/users.service';
|
||||
import { RedisService } from '../redis/redis.service';
|
||||
import { WorkerTransportModule } from './worker-transport.module';
|
||||
import { EditorialExecutionService } from './editorial-execution';
|
||||
|
||||
(process.env.EDITORIAL_EXECUTION_DB === '1' ? describe : describe.skip)('completed recovery real JWT HTTP/PostgreSQL (synthetic evidence only)', () => {
|
||||
const db = new PrismaClient();
|
||||
const sha = (s: string) => createHash('sha256').update(s).digest('hex');
|
||||
const workerToken = 'disposable-pmo-'.repeat(5);
|
||||
let app: INestApplication, base: string, workflow: PrepareWorkflowService;
|
||||
let reviewer: any, admin: any, jwt: string, adminJwt: string;
|
||||
const generation = randomUUID(), session = 'disposable-recovery-http';
|
||||
const brief = () => ({researchDate:'2026-10-24',inputAvailability:[{input:'property',status:'UNAVAILABLE',details:'No authenticated property supplied'}],findings:[{sourceUrl:'https://www.who.int/news',sourceDate:'2026-10-20',finding:'Synthetic contract fixture, not research'}],candidates:[0,1,2].map(i=>({title:'Synthetic '+i,score:80-i,rationale:'Contract fixture only',sourceUrls:['https://www.who.int/news']}))});
|
||||
const token = (u: any, extra: any = {}) => sign({sub:u.id,stageTestSession:session,stageTestGeneration:generation,...extra},process.env.JWT_SECRET!,{expiresIn:'5m'});
|
||||
beforeAll(async () => {
|
||||
const module = await Test.createTestingModule({
|
||||
imports:[WorkerTransportModule.register({enabled:true,grants:[{id:'pmo',role:'WORKFLOW_WORKER',credentialSha256:sha(workerToken)}],workerIds:['pmo'],stageCiIds:[],artifactDirectory:'/work/tmp/recovery',artifactBaseUrl:'https://isolated.invalid/internal/prepare-worker/artifacts'})],
|
||||
controllers:[OrchestrationController],
|
||||
providers:[JwtStrategy,EditorialExecutionService,{provide:OrchestrationService,useValue:{}},{provide:UsersService,useValue:{findById:(id:string)=>db.user.findUnique({where:{id}})}},{provide:RedisService,useValue:{get:async()=>null}}],
|
||||
}).overrideProvider(PrismaService).useValue(db).compile();
|
||||
app=module.createNestApplication(); app.setGlobalPrefix('api'); await app.listen(0,'127.0.0.1'); base=await app.getUrl(); workflow=app.get(PrepareWorkflowService);
|
||||
reviewer=await db.user.create({data:{firstName:'Disposable',lastName:'Reviewer',mobile:'fixture-'+randomUUID().slice(0,7),role:'SUPER_ADMIN',stageTestSession:session,stageTestGeneration:generation,authExpiresAt:new Date(Date.now()+300000)}});
|
||||
admin=await db.user.create({data:{firstName:'Disposable',lastName:'Admin',mobile:'fixture-'+randomUUID().slice(0,7),role:'Admin',stageTestSession:session,stageTestGeneration:generation,authExpiresAt:new Date(Date.now()+300000)}});
|
||||
jwt=token(reviewer); adminJwt=token(admin);
|
||||
});
|
||||
afterAll(async()=>{await app?.close();await db.$disconnect();});
|
||||
async function request(path:string,body:any,secret=jwt) {const r=await fetch(base+'/api/'+path,{method:'POST',headers:{authorization:'Bearer '+secret,'content-type':'application/json'},body:JSON.stringify(body)});return {status:r.status,body:await r.json()};}
|
||||
async function fixture(ttl = 60000) {
|
||||
const p=await request('internal/prepare-worker/editorial-proposals',{requestId:randomUUID(),pilotKind:'editorial-research-to-brief-v1',operationMode:'PREPARE',environment:'staging',scope:'EDITORIAL_RESEARCH_TO_BRIEF',researchTopic:'Disposable recovery contract',acceptanceCriteria:['Dated evidence'],commitSha:'a'.repeat(40),budgetLimitCents:20},workerToken);
|
||||
expect(p.status).toBe(201);
|
||||
let t=await db.orchestrationTask.findUniqueOrThrow({where:{id:p.body.taskId}});
|
||||
t=await workflow.decide(t.id,1,{decision:'APPROVED',expiresAt:new Date(Date.now()+ttl).toISOString(),expectedVersion:t.version,idempotencyKey:randomUUID()},{id:'independent-approver',role:'SUPER_ADMIN'});
|
||||
const c=await request('internal/prepare-worker/editorial-claim',{taskId:t.id},workerToken);expect(c.status).toBe(201);
|
||||
const l=c.body.lease;
|
||||
await db.prepareWorkflowOutbox.update({where:{taskId:t.id},data:{leaseUntil:new Date(Date.now()-1000)}});
|
||||
const original=brief(); original.inputAvailability[0].status='missing';
|
||||
const originalText=JSON.stringify(original);
|
||||
const evidence:any={taskId:t.id,runId:l.runId,expectedVersion:t.version+1,commitSha:'a'.repeat(40),originalText,sessions:['canina-competitor-worker','canina-content-worker','canina-seo-worker','pmo'].map((profile,i)=>({profile,sessionId:'20261024_120000_aaaaa'+i,outputSha256:i===3?sha(originalText):sha('synthetic '+i),outcome:'COMPLETED'})),outputs:[{retrievalEvents:[{type:'tool_use',name:'web_extract',tool_call_id:'fixture-extract',input:{urls:['https://www.who.int/news']}},{type:'tool_result',name:'web_extract',tool_call_id:'fixture-extract',output:JSON.stringify({results:[{url:'https://www.who.int/news',content:'Synthetic retrieved bytes'}]})}]}],brief:brief(),correction:{mode:'STORED_REPORTS_ONLY',statusChanges:[{index:0,from:'missing',to:'UNAVAILABLE',reason:'Stored text explicitly says no authenticated property supplied'}],omissions:[],reason:'Synthetic stored-reports-only schema correction'}};
|
||||
return {t,l,evidence,path:'admin/orchestration/tasks/'+t.id+'/editorial-completed-recovery'};
|
||||
}
|
||||
const payload=(e:any)=>({runId:e.runId,expectedVersion:e.expectedVersion,evidenceSha256:sha(JSON.stringify(e)),evidence:e});
|
||||
it('allows narrowly scoped temporary reviewer, atomically ingests same run once, retains cost and pending QA',async()=>{
|
||||
const {t,l,evidence,path}=await fixture(); const body=payload(evidence);
|
||||
expect((await request(path,body,adminJwt)).status).toBe(403);
|
||||
expect((await request(path,body,token(reviewer,{stageTestGeneration:randomUUID()}))).status).toBe(401);
|
||||
expect((await request(path,body,'not-a-jwt')).status).toBe(401);
|
||||
expect((await request(path,{...body,actualCents:0})).status).toBe(400);
|
||||
expect((await request('admin/orchestration/tasks/'+t.id+'/budget/reconcile',{actualCents:0})).status).toBe(401);
|
||||
const results=await Promise.all([request(path,body),request(path,body)]);
|
||||
expect(results.map(x=>x.status).sort()).toEqual([201,403]);
|
||||
expect(results.find(x=>x.status===201)!.body).toMatchObject({state:'VERIFYING',qaStatus:'PENDING_INDEPENDENT_QA',retainedReservationCents:20,costStatus:'upper-bound-reserved'});
|
||||
const artifacts=await db.orchestrationArtifact.findMany({where:{runId:l.runId}});expect(artifacts).toHaveLength(2);
|
||||
const stored=artifacts.find(x=>x.kind==='EDITORIAL_RECOVERY_EVIDENCE')!;expect((stored.metadata as any).bytes).toBe(JSON.stringify(evidence));expect(sha((stored.metadata as any).bytes)).toBe(stored.sha256);
|
||||
const recovered=artifacts.find(x=>x.kind!=='EDITORIAL_RECOVERY_EVIDENCE')!;expect(sha((recovered.metadata as any).bytes)).toBe(recovered.sha256);
|
||||
expect(JSON.parse((recovered.metadata as any).bytes)).toMatchObject({runId:l.runId,recoveryEvidenceSha256:stored.sha256,qaStatus:'PENDING_INDEPENDENT_QA'});
|
||||
expect((await db.orchestrationRun.findUniqueOrThrow({where:{id:l.runId}})).status).toBe('AWAITING_QA');
|
||||
expect(await db.orchestrationAttestation.count({where:{runId:l.runId}})).toBe(0);
|
||||
expect((await db.orchestrationBudgetLedger.findMany({where:{taskId:t.id}})).map(x=>[x.kind,x.amountCents])).toEqual([['RESERVE',20]]);
|
||||
expect((await db.prepareWorkflowOutbox.findUniqueOrThrow({where:{taskId:t.id}}))).toMatchObject({status:'DONE',leaseToken:null,leaseUntil:null});
|
||||
expect((await request('internal/prepare-worker/heartbeat',{taskId:t.id,runId:l.runId,leaseToken:l.leaseToken},workerToken)).status).toBe(403);
|
||||
expect((await request('internal/prepare-worker/editorial-result',{taskId:t.id,runId:l.runId,leaseToken:l.leaseToken,brief:brief()},workerToken)).status).toBe(403);
|
||||
await expect(db.orchestrationArtifact.update({where:{id:stored.id},data:{metadata:{bytes:'tampered'}}})).rejects.toThrow('append-only');
|
||||
});
|
||||
it('rolls back evidence insertion when canonical database read-back is corrupted',async()=>{
|
||||
const f=await fixture();
|
||||
await db.$executeRawUnsafe(`CREATE FUNCTION fixture_corrupt_evidence() RETURNS trigger LANGUAGE plpgsql AS $$ BEGIN IF NEW.kind = 'EDITORIAL_RECOVERY_EVIDENCE' THEN NEW.metadata = jsonb_set(NEW.metadata, '{bytes}', '\"corrupt\"'::jsonb); END IF; RETURN NEW; END; $$`);
|
||||
await db.$executeRawUnsafe(`CREATE TRIGGER fixture_corrupt BEFORE INSERT ON orchestration_artifacts FOR EACH ROW EXECUTE FUNCTION fixture_corrupt_evidence()`);
|
||||
try {
|
||||
expect((await request(f.path,payload(f.evidence))).status).toBe(403);
|
||||
expect(await db.orchestrationArtifact.count({where:{runId:f.l.runId}})).toBe(0);
|
||||
expect((await db.orchestrationTask.findUniqueOrThrow({where:{id:f.t.id}})).state).toBe('RUNNING');
|
||||
expect((await db.orchestrationRun.findUniqueOrThrow({where:{id:f.l.runId}})).status).toBe('RUNNING');
|
||||
expect((await db.prepareWorkflowOutbox.findUniqueOrThrow({where:{taskId:f.t.id}})).leaseToken).toBe(f.l.leaseToken);
|
||||
expect(await db.orchestrationEvent.count({where:{taskId:f.t.id,eventType:'EDITORIAL_COMPLETED_RUN_RECOVERED'}})).toBe(0);
|
||||
expect((await db.orchestrationBudgetLedger.findMany({where:{taskId:f.t.id}})).map(x=>[x.kind,x.amountCents])).toEqual([['RESERVE',20]]);
|
||||
} finally {
|
||||
await db.$executeRawUnsafe('DROP TRIGGER fixture_corrupt ON orchestration_artifacts');
|
||||
await db.$executeRawUnsafe('DROP FUNCTION fixture_corrupt_evidence()');
|
||||
}
|
||||
});
|
||||
it('rejects hash/provenance/meaning changes, active leases, expired approvals, cancellation and kills without writes',async()=>{
|
||||
for(const mode of ['hash','retrieval','rewrite','version','commit','lease','approval','cancel','kill']) {
|
||||
const f=await fixture(mode==='approval'?1500:60000); const e=structuredClone(f.evidence);
|
||||
if(mode==='retrieval')e.outputs[0].retrievalEvents[1].tool_call_id='unmatched';
|
||||
if(mode==='rewrite')e.brief.candidates[0].rationale='Invented replacement';
|
||||
if(mode==='version')e.expectedVersion++;
|
||||
if(mode==='commit')e.commitSha='b'.repeat(40);
|
||||
if(mode==='lease')await db.prepareWorkflowOutbox.update({where:{taskId:f.t.id},data:{leaseUntil:new Date(Date.now()+60000)}});
|
||||
if(mode==='approval')await new Promise(resolve=>setTimeout(resolve,1600));
|
||||
if(mode==='cancel')await db.orchestrationTask.update({where:{id:f.t.id},data:{state:'CANCELLED'}});
|
||||
if(mode==='kill')await db.orchestrationKillSwitch.upsert({where:{scope:'GLOBAL'},create:{scope:'GLOBAL',level:'STOP_AGENTS',active:true,reason:'Disposable test',actorId:'fixture'},update:{active:true,level:'STOP_AGENTS'}});
|
||||
try {const b=payload(e);if(mode==='hash')b.evidenceSha256='0'.repeat(64); const r=await request(f.path,b);expect([400,403]).toContain(r.status);expect(await db.orchestrationArtifact.count({where:{runId:f.l.runId}})).toBe(0);expect(await db.orchestrationBudgetLedger.count({where:{taskId:f.t.id}})).toBe(1);}
|
||||
finally {if(mode==='kill')await db.orchestrationKillSwitch.update({where:{scope:'GLOBAL'},data:{active:false}});}
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,45 @@
|
||||
import { EditorialExecutionService } from './editorial-execution';
|
||||
import { createHash, randomUUID } from 'crypto';
|
||||
const sha=(x:string)=>createHash('sha256').update(x).digest('hex');
|
||||
describe('completed same-run recovery admission',()=>{
|
||||
let s:EditorialExecutionService,tx:any,t:any,o:any,r:any,evidence:any,d:any;
|
||||
const reviewer={id:'independent',role:'SUPER_ADMIN'};
|
||||
beforeEach(()=>{
|
||||
t={id:randomUUID(),state:'RUNNING',version:6,metadata:{commitSha:'a'.repeat(40)}};
|
||||
r={id:randomUUID(),taskId:t.id,status:'RUNNING',environment:'staging',commitSha:t.metadata.commitSha};
|
||||
o={id:randomUUID(),runId:r.id,status:'PENDING',leaseOwner:'pmo',leaseUntil:new Date(Date.now()-1000),reservationId:'reserve',leaseToken:randomUUID()};
|
||||
const brief={researchDate:'2026-10-24',inputAvailability:[{input:'Analytics',status:'UNAVAILABLE',details:'Not provided'}],findings:[{sourceUrl:'https://canina.de/a',sourceDate:'2026-10-24',finding:'Stored report'}],candidates:['A','B','C'].map(title=>({title,score:50,rationale:'Stored report',sourceUrls:['https://canina.de/a']}))};
|
||||
const sessions=['20261024_164035_8d20ed','20261024_164323_5b66bf','20261024_164531_02c075','20261024_164737_96755a'];
|
||||
evidence={taskId:t.id,runId:r.id,expectedVersion:6,commitSha:r.commitSha,originalText:JSON.stringify(brief),sessions:sessions.map((sessionId,i)=>({profile:['canina-competitor-worker','canina-content-worker','canina-seo-worker','pmo'][i],sessionId,outputSha256:sha(i===3?JSON.stringify(brief):'stored report'),outcome:'COMPLETED'})),outputs:[{retrievalEvents:[{type:'tool_use',name:'web_extract',tool_call_id:'1',input:{urls:['https://canina.de/a']}},{type:'tool_result',name:'web_extract',tool_call_id:'1',is_error:false,output:JSON.stringify({results:[{url:'https://canina.de/a',content:'Stored report'}]})}]}],brief,correction:{mode:'STORED_REPORTS_ONLY',statusChanges:[],omissions:[],reason:'No new research; original preserved'}};
|
||||
d={expectedVersion:6,runId:r.id,evidenceSha256:sha(JSON.stringify(evidence)),evidence};
|
||||
tx={$queryRaw:async()=>[],orchestrationArtifact:{count:async()=>0,create:jest.fn(async({data}:any)=>data),findFirst:async()=>({metadata:{bytes:JSON.stringify(evidence)}})},orchestrationRun:{findUnique:async()=>r,update:jest.fn()},prepareWorkflowOutbox:{findUnique:async()=>o,update:jest.fn()},orchestrationTask:{update:jest.fn(async()=>({...t,state:'VERIFYING',version:7}))},orchestrationBudgetLedger:{findUnique:async()=>({taskId:t.id,actorId:'pmo',kind:'RESERVE',amountCents:20,idempotencyKey:'prepare-reserve:'+r.id}),aggregate:async()=>({_sum:{amountCents:20}}),findFirst:async()=>null},orchestrationEvent:{create:jest.fn()}};
|
||||
s=new EditorialExecutionService({$transaction:async(fn:any)=>fn(tx)} as any);jest.spyOn(s as any,'scope').mockResolvedValue(t);jest.spyOn(s as any,'approval').mockResolvedValue(undefined);
|
||||
});
|
||||
it('stores original evidence and unreviewed artifact without lease renewal or cost writes',async()=>{
|
||||
await expect((s as any).recoverCompleted(reviewer,t.id,d)).resolves.toMatchObject({state:'VERIFYING',qaStatus:'PENDING_INDEPENDENT_QA',retainedReservationCents:20});
|
||||
expect(tx.orchestrationArtifact.create).toHaveBeenCalledTimes(2);
|
||||
expect(tx.orchestrationArtifact.create.mock.calls[0][0].data.metadata.bytes).toBe(JSON.stringify(evidence));
|
||||
expect(tx.prepareWorkflowOutbox.update.mock.calls[0][0].data.leaseToken).toBeNull();
|
||||
});
|
||||
it.each(['actor','version','hash','run','lease','cancel','artifact','source','evidenceBinding','session','approval','kill','storedHash','rewrite','omission'])('rejects %s before writes',async(mode)=>{
|
||||
let a=reviewer;
|
||||
if(mode==='actor')a={id:'pmo',role:'WORKFLOW_WORKER'};
|
||||
if(mode==='version')d.expectedVersion=5;
|
||||
if(mode==='hash')d.evidenceSha256='0'.repeat(64);
|
||||
if(mode==='run')r.taskId=randomUUID();
|
||||
if(mode==='lease')o.leaseUntil=new Date(Date.now()+60000);
|
||||
if(mode==='cancel')t.state='CANCELLED';
|
||||
if(mode==='artifact')tx.orchestrationArtifact.count=async()=>1;
|
||||
if(mode==='source')evidence.brief.findings[0].sourceUrl='https://canina.de/search-only';
|
||||
if(mode==='evidenceBinding')evidence.taskId=randomUUID();
|
||||
if(mode==='session')evidence.sessions[0].outcome='RUNNING';
|
||||
if(mode==='approval')jest.spyOn(s as any,'approval').mockRejectedValue(new Error('expired approval'));
|
||||
if(mode==='kill')tx.$queryRaw=async()=>[{active:true,level:'STOP_AGENTS'}];
|
||||
if(mode==='storedHash')tx.orchestrationArtifact.findFirst=async()=>({metadata:{bytes:'changed'}});
|
||||
if(mode==='rewrite')evidence.brief.candidates[0].rationale='Changed meaning';
|
||||
if(mode==='omission')evidence.brief.candidates.pop();
|
||||
if(mode!=='hash')d.evidenceSha256=sha(JSON.stringify(evidence));
|
||||
await expect((s as any).recoverCompleted(a,t.id,d)).rejects.toThrow();if(mode!=='storedHash')expect(tx.orchestrationArtifact.create).not.toHaveBeenCalled();
|
||||
else expect(tx.orchestrationArtifact.create).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,44 @@
|
||||
# Bounded PMO editorial proposal bridge
|
||||
|
||||
No live configuration, deployment, publication or execution is introduced. Opt-in transport/startup flag remains unchanged. Core services/controllers are untouched.
|
||||
|
||||
## Parent contract
|
||||
|
||||
`POST /internal/prepare-worker/editorial-proposals` (plus the application's existing `/api` global prefix when present), Bearer service credential. Strict JSON body, all fields required, no extra fields:
|
||||
|
||||
```json
|
||||
{
|
||||
"requestId": "a client-generated UUID retained across retries",
|
||||
"pilotKind": "editorial-research-to-brief-v1",
|
||||
"operationMode": "PREPARE",
|
||||
"environment": "staging",
|
||||
"scope": "EDITORIAL_RESEARCH_TO_BRIEF",
|
||||
"researchTopic": "Evidence-based senior dog nutrition research",
|
||||
"acceptanceCriteria": ["Cite primary sources with dates", "Return a research brief; do not publish"],
|
||||
"commitSha": "40 lowercase hexadecimal characters",
|
||||
"budgetLimitCents": 20
|
||||
}
|
||||
```
|
||||
|
||||
Topic 1..180 characters, criteria 1..10 items each 1..500 characters; whitespace-only rejected. commitSha must be a string. requestId must be a UUID. Fixed pilot/scope/environment/mode/budget are checked, not caller-controlled options. Department is server-owned CONTENT. Human research topic and criteria are owner-reviewable proposal data, not instructions executed by this endpoint.
|
||||
|
||||
201 returns `{taskId,key,pilotKind,state,version,department,operationMode,budgetLimitCents,metadata:{scope,acceptanceCriteria,environment,commitSha}}`. First success is GATE1_PENDING; replay returns current state, does not undo owner decisions or requeue work. Scope includes pilot kind, topic and explicit no-publication/release/production restriction. `key` is `editorial-v1:` plus SHA256 of JSON `[authenticatedWorkerId,requestId]`. Same request UUID + differing immutable proposal is 409. Concurrent identical requests produce one task, one PREPARE_PROPOSED event, one PREPARE_TRANSITION event. Crash after create can resume DRAFT submission. No arbitrary reads or mutations are exposed.
|
||||
|
||||
## Explicit grant and author authority
|
||||
|
||||
Only canonical server identity `pmo`, authenticated by a configured unique digest grant with role WORKFLOW_WORKER and included in workerIds, can submit. There was no canonical PMO grant mapping in repository transport configuration: the operator must explicitly provision this grant through the existing fixed `/run/secrets/prepare_worker_grants` configuration, using a new random dedicated credential, **without runtime defaults**. Never copy an arbitrary agent/request actor ID or reuse CI identity. Missing pmo grant denies; other valid workers and Stage CI get 403. Transport disabled remains denied/unregistered according to existing registration boundary. No secrets were read or provisioned by this change.
|
||||
|
||||
Existing core create/transition APIs accept only Admin/SUPER_ADMIN. This bounded adapter delegates **author-only Admin capability**, binding id to the authenticated pmo grant, for exactly create PREPARE and DRAFT→GATE1_PENDING. It never uses SUPER_ADMIN, calls decide, approves, queues READY, writes through Prisma, creates outbox/runs, reserves/reconciles costs or submits evidence. Prisma reads only support idempotency/payload reconciliation. Core remains authoritative for kill switch, immutable metadata/events, versioning and independent Gate1 reviewer. No approval bypass or arbitrary Admin endpoint is exposed.
|
||||
|
||||
Owner uses existing Backend owner Gate1 queue and independent authenticated SUPER_ADMIN review. This bridge does not replace that UI/API. Current deterministic/Tech transports are not editorial executors: editorial keys are explicitly refused by generic claim/complete even after independent approval. Actual research execution/completion needs a separately reviewed executor/ingestion contract; no toy QA, fake zero cost, release or publication is claimed.
|
||||
|
||||
## Verification
|
||||
|
||||
Disposable PostgreSQL16 (no published ports/live volumes), Node22 private copied dependencies from readonly orchestration-v4-runtime donor, regenerated private Prisma client and real listening Nest TCP HTTP boundary. Evidence directory `/opt/services/canina/validation/v4-editorial-bridge/`:
|
||||
|
||||
- red.log: missing endpoint 404 vs required 201.
|
||||
- tracer-red.log: approved editorial mistakenly admitted by generic tracer (201 vs required 403), fixed with transport fence.
|
||||
- green.log: five bridge tests pass, including race/replay/crash recovery, immutable payload conflict, grant/body/scope/production denial, kill switch and independent approval with tracer refusal.
|
||||
- regression-final.log / build.log: all 4 worker suites, 46 tests pass (exit 0); full backend tsc -b exits 0. New bridge files scoped ESLint exits 0 (lint.log). Initial combined regression hit a shared fixture kill-switch uniqueness collision; tests now preserve and restore the fixture row.
|
||||
|
||||
Tests use disposable fixture commit hashes, not deployed commit evidence. No AppModule, production, live DB, release authorization, push or deploy changes. Parent owns ingress service-network/TLS/body/rate limits and reviewed grant provisioning. This commit is the proposal slice only.
|
||||
@@ -0,0 +1,271 @@
|
||||
import { Test } from '@nestjs/testing';
|
||||
import { INestApplication } from '@nestjs/common';
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
import { createHash, randomUUID } from 'crypto';
|
||||
import { PrismaService } from '../prisma/prisma.service';
|
||||
import { PrepareWorkflowService } from '../orchestration/prepare-workflow.service';
|
||||
import { WorkerTransportModule } from './worker-transport.module';
|
||||
|
||||
(process.env.EDITORIAL_BRIDGE_DB === '1' ? describe : describe.skip)(
|
||||
'editorial proposal real TCP boundary',
|
||||
() => {
|
||||
const db = new PrismaClient();
|
||||
const token = 'disposable-pmo-token-'.repeat(3),
|
||||
other = 'disposable-other-token-'.repeat(3),
|
||||
ci = 'disposable-ci-token-'.repeat(3);
|
||||
const digest = (s: string) => createHash('sha256').update(s).digest('hex');
|
||||
let app: INestApplication, base: string, workflow: PrepareWorkflowService;
|
||||
const config = (enabled = true, withPmo = true) => ({
|
||||
enabled,
|
||||
grants: [
|
||||
...(withPmo
|
||||
? [
|
||||
{
|
||||
id: 'pmo',
|
||||
role: 'WORKFLOW_WORKER' as const,
|
||||
credentialSha256: digest(token),
|
||||
},
|
||||
]
|
||||
: []),
|
||||
{
|
||||
id: 'other',
|
||||
role: 'WORKFLOW_WORKER' as const,
|
||||
credentialSha256: digest(other),
|
||||
},
|
||||
{ id: 'ci', role: 'STAGE_CI' as const, credentialSha256: digest(ci) },
|
||||
],
|
||||
workerIds: withPmo ? ['pmo', 'other'] : ['other'],
|
||||
stageCiIds: ['ci'],
|
||||
artifactDirectory: '/work/tmp/editorial-artifacts',
|
||||
artifactBaseUrl:
|
||||
'https://isolated.invalid/internal/prepare-worker/artifacts',
|
||||
});
|
||||
async function start(c = config()) {
|
||||
const m = await Test.createTestingModule({
|
||||
imports: [WorkerTransportModule.register(c)],
|
||||
})
|
||||
.overrideProvider(PrismaService)
|
||||
.useValue(db)
|
||||
.compile();
|
||||
const a = m.createNestApplication();
|
||||
await a.listen(0, '127.0.0.1');
|
||||
return a;
|
||||
}
|
||||
beforeAll(async () => {
|
||||
app = await start();
|
||||
base = await app.getUrl();
|
||||
workflow = app.get(PrepareWorkflowService);
|
||||
});
|
||||
afterAll(async () => {
|
||||
await app?.close();
|
||||
await db.$disconnect();
|
||||
});
|
||||
const dto = () => ({
|
||||
requestId: randomUUID(),
|
||||
pilotKind: 'editorial-research-to-brief-v1',
|
||||
operationMode: 'PREPARE',
|
||||
environment: 'staging',
|
||||
scope: 'EDITORIAL_RESEARCH_TO_BRIEF',
|
||||
researchTopic: 'Evidence-based senior dog nutrition research',
|
||||
acceptanceCriteria: [
|
||||
'Cite primary sources with dates',
|
||||
'Return a research brief, not a published article',
|
||||
],
|
||||
commitSha: 'a'.repeat(40),
|
||||
budgetLimitCents: 20,
|
||||
});
|
||||
async function post(body: any, secret = token, url = base) {
|
||||
const r = await fetch(
|
||||
url + '/internal/prepare-worker/editorial-proposals',
|
||||
{
|
||||
method: 'POST',
|
||||
headers: {
|
||||
authorization: 'Bearer ' + secret,
|
||||
'content-type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify(body),
|
||||
},
|
||||
);
|
||||
return { status: r.status, body: await r.json() };
|
||||
}
|
||||
it('submits immutable owner-reviewable proposal, never approves or dispatches, retries idempotently', async () => {
|
||||
const body = dto();
|
||||
const r = await post(body);
|
||||
expect(r.status).toBe(201);
|
||||
expect(r.body).toMatchObject({
|
||||
pilotKind: body.pilotKind,
|
||||
state: 'GATE1_PENDING',
|
||||
operationMode: 'PREPARE',
|
||||
department: 'CONTENT',
|
||||
budgetLimitCents: 20,
|
||||
metadata: {
|
||||
environment: 'staging',
|
||||
commitSha: body.commitSha,
|
||||
acceptanceCriteria: body.acceptanceCriteria,
|
||||
},
|
||||
});
|
||||
const task = await db.orchestrationTask.findUniqueOrThrow({
|
||||
where: { id: r.body.taskId },
|
||||
});
|
||||
expect((task.metadata as any).createdBy).toBe('pmo');
|
||||
expect(task.key).toMatch(/^editorial-v1:/);
|
||||
expect((await post(body)).body.taskId).toBe(task.id);
|
||||
expect(
|
||||
await db.orchestrationEvent.count({ where: { taskId: task.id } }),
|
||||
).toBe(2);
|
||||
for (const model of [
|
||||
db.orchestrationApprovalDecision,
|
||||
db.orchestrationRun,
|
||||
db.prepareWorkflowOutbox,
|
||||
db.orchestrationBudgetLedger,
|
||||
] as any[])
|
||||
expect(await model.count({ where: { taskId: task.id } })).toBe(0);
|
||||
expect(
|
||||
(await post({ ...body, researchTopic: 'Changed topic' })).status,
|
||||
).toBe(409);
|
||||
expect((await post({ ...body, commitSha: 'b'.repeat(40) })).status).toBe(
|
||||
409,
|
||||
);
|
||||
await expect(
|
||||
workflow.decide(task.id, 1, {}, { id: 'pmo', role: 'Admin' }),
|
||||
).rejects.toThrow('Authenticated workflow identity required');
|
||||
});
|
||||
it('rejects untrusted workers, CI, impersonation, unbounded scope and disabled or absent PMO grants', async () => {
|
||||
for (const secret of [other, ci])
|
||||
expect((await post(dto(), secret)).status).toBe(403);
|
||||
expect((await post(dto(), 'incorrect')).status).toBe(401);
|
||||
for (const patch of [
|
||||
{ actorId: 'owner' },
|
||||
{ role: 'SUPER_ADMIN' },
|
||||
{ department: 'ENGINEERING' },
|
||||
{ scope: 'arbitrary' },
|
||||
{ pilotKind: 'other' },
|
||||
{ environment: 'production' },
|
||||
{ operationMode: 'RELEASE' },
|
||||
{ budgetLimitCents: 21 },
|
||||
{ researchTopic: ' ' },
|
||||
{ acceptanceCriteria: [' '] },
|
||||
{ commitSha: 123 },
|
||||
{ acceptanceCriteria: [] },
|
||||
{ taskId: randomUUID() },
|
||||
])
|
||||
expect((await post({ ...dto(), ...patch })).status).toBe(400);
|
||||
for (const c of [config(false), config(true, false)]) {
|
||||
const isolated = await start(c);
|
||||
try {
|
||||
const r = await post(dto(), token, await isolated.getUrl());
|
||||
expect([401, 403]).toContain(r.status);
|
||||
} finally {
|
||||
await isolated.close();
|
||||
}
|
||||
}
|
||||
});
|
||||
it('races identical requests with one proposal and submission event, and resumes a draft', async () => {
|
||||
const body = dto();
|
||||
const responses = await Promise.all(
|
||||
Array.from({ length: 5 }, () => post(body)),
|
||||
);
|
||||
expect(responses.map((r) => r.status)).toEqual([201, 201, 201, 201, 201]);
|
||||
expect(new Set(responses.map((r) => r.body.taskId)).size).toBe(1);
|
||||
expect(
|
||||
await db.orchestrationEvent.count({
|
||||
where: { taskId: responses[0].body.taskId },
|
||||
}),
|
||||
).toBe(2);
|
||||
const pending = await post(dto());
|
||||
const task = await db.orchestrationTask.findUniqueOrThrow({
|
||||
where: { id: pending.body.taskId },
|
||||
});
|
||||
// Interrupted transaction fixture: core create exists but no submission.
|
||||
const retry = dto();
|
||||
const key =
|
||||
'editorial-v1:' + digest(JSON.stringify(['pmo', retry.requestId]));
|
||||
const metadata = task.metadata as any;
|
||||
await workflow.create(
|
||||
{
|
||||
key,
|
||||
title: task.title,
|
||||
department: 'CONTENT',
|
||||
operationMode: 'PREPARE',
|
||||
budgetLimitCents: 20,
|
||||
metadata,
|
||||
},
|
||||
{ id: 'pmo', role: 'Admin' },
|
||||
);
|
||||
expect((await post(retry)).body.state).toBe('GATE1_PENDING');
|
||||
});
|
||||
it('honors kill switches without creating work', async () => {
|
||||
const previous = await db.orchestrationKillSwitch.findUnique({
|
||||
where: { scope: 'GLOBAL' },
|
||||
});
|
||||
await db.orchestrationKillSwitch.upsert({
|
||||
where: { scope: 'GLOBAL' },
|
||||
create: {
|
||||
scope: 'GLOBAL',
|
||||
level: 'FREEZE_NEW_WORK',
|
||||
active: true,
|
||||
reason: 'disposable test',
|
||||
actorId: 'fixture',
|
||||
},
|
||||
update: { level: 'FREEZE_NEW_WORK', active: true },
|
||||
});
|
||||
try {
|
||||
expect((await post(dto())).status).toBe(403);
|
||||
} finally {
|
||||
if (previous)
|
||||
await db.orchestrationKillSwitch.update({
|
||||
where: { scope: 'GLOBAL' },
|
||||
data: { level: previous.level, active: previous.active },
|
||||
});
|
||||
else
|
||||
await db.orchestrationKillSwitch.delete({
|
||||
where: { scope: 'GLOBAL' },
|
||||
});
|
||||
}
|
||||
});
|
||||
it('never admits an editorial proposal into the deterministic tracer even after real independent Gate1 approval', async () => {
|
||||
const created = await post(dto());
|
||||
let t = await db.orchestrationTask.findUniqueOrThrow({
|
||||
where: { id: created.body.taskId },
|
||||
});
|
||||
t = await workflow.decide(
|
||||
t.id,
|
||||
1,
|
||||
{
|
||||
decision: 'APPROVED',
|
||||
expiresAt: new Date(Date.now() + 60000).toISOString(),
|
||||
expectedVersion: t.version,
|
||||
idempotencyKey: randomUUID(),
|
||||
},
|
||||
{ id: 'independent-fixture-owner', role: 'SUPER_ADMIN' },
|
||||
);
|
||||
t = await workflow.transition(
|
||||
t.id,
|
||||
{
|
||||
toState: 'READY',
|
||||
expectedVersion: t.version,
|
||||
idempotencyKey: randomUUID(),
|
||||
},
|
||||
{ id: 'pmo', role: 'Admin' },
|
||||
);
|
||||
const r = await fetch(base + '/internal/prepare-worker/claim', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
authorization: 'Bearer ' + token,
|
||||
'content-type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({ taskId: t.id }),
|
||||
});
|
||||
expect(r.status).toBe(403);
|
||||
expect(await db.orchestrationRun.count({ where: { taskId: t.id } })).toBe(
|
||||
0,
|
||||
);
|
||||
expect(
|
||||
await db.orchestrationBudgetLedger.count({ where: { taskId: t.id } }),
|
||||
).toBe(0);
|
||||
expect((await post({ ...dto(), requestId: randomUUID() })).status).toBe(
|
||||
201,
|
||||
);
|
||||
});
|
||||
},
|
||||
);
|
||||
@@ -0,0 +1,145 @@
|
||||
import {
|
||||
BadRequestException,
|
||||
ConflictException,
|
||||
ForbiddenException,
|
||||
Injectable,
|
||||
} from '@nestjs/common';
|
||||
import {
|
||||
ArrayMaxSize,
|
||||
ArrayMinSize,
|
||||
IsArray,
|
||||
IsIn,
|
||||
IsInt,
|
||||
IsString,
|
||||
IsUUID,
|
||||
Matches,
|
||||
MaxLength,
|
||||
MinLength,
|
||||
} from 'class-validator';
|
||||
import { createHash } from 'crypto';
|
||||
import {
|
||||
PrepareWorkflowService,
|
||||
WorkflowIdentity,
|
||||
} from '../orchestration/prepare-workflow.service';
|
||||
import { PrismaService } from '../prisma/prisma.service';
|
||||
|
||||
export const EDITORIAL_PILOT_KIND = 'editorial-research-to-brief-v1';
|
||||
// No new implicit grant. Only an explicitly provisioned existing worker grant with
|
||||
// canonical id pmo is admitted; absence of that grant means denial, never fallback.
|
||||
export const EDITORIAL_PMO_WORKER_ID = 'pmo';
|
||||
export class EditorialProposalDto {
|
||||
@IsUUID() requestId!: string;
|
||||
@IsIn([EDITORIAL_PILOT_KIND]) pilotKind!: string;
|
||||
@IsIn(['PREPARE']) operationMode!: string;
|
||||
@IsIn(['staging']) environment!: string;
|
||||
@IsIn(['EDITORIAL_RESEARCH_TO_BRIEF']) scope!: string;
|
||||
@IsString() @MinLength(1) @MaxLength(180) researchTopic!: string;
|
||||
@IsArray()
|
||||
@ArrayMinSize(1)
|
||||
@ArrayMaxSize(10)
|
||||
@IsString({ each: true })
|
||||
@MinLength(1, { each: true })
|
||||
@MaxLength(500, { each: true })
|
||||
acceptanceCriteria!: string[];
|
||||
@IsString() @Matches(/^[a-f0-9]{40}$/) commitSha!: string;
|
||||
@IsInt() @IsIn([20]) budgetLimitCents!: number;
|
||||
}
|
||||
export function isEditorialProposal(task: any): boolean {
|
||||
return typeof task?.key === 'string' && task.key.startsWith('editorial-v1:');
|
||||
}
|
||||
@Injectable()
|
||||
export class EditorialProposalBridge {
|
||||
constructor(
|
||||
private readonly workflow: PrepareWorkflowService,
|
||||
private readonly db: PrismaService,
|
||||
) {}
|
||||
async submit(identity: WorkflowIdentity, dto: EditorialProposalDto) {
|
||||
if (
|
||||
identity.role !== 'WORKFLOW_WORKER' ||
|
||||
identity.id !== EDITORIAL_PMO_WORKER_ID
|
||||
)
|
||||
throw new ForbiddenException(
|
||||
'Explicit canonical PMO worker grant required',
|
||||
);
|
||||
if (
|
||||
!dto.researchTopic.trim() ||
|
||||
dto.acceptanceCriteria.some((s) => !s.trim())
|
||||
)
|
||||
throw new BadRequestException('Nonblank topic and criteria required');
|
||||
// Narrow server-owned author capability, NEVER a reviewer/SUPER_ADMIN identity.
|
||||
// The network credential still authenticates WORKFLOW_WORKER; only these two
|
||||
// fixed create/submit operations are delegated to core's existing Admin API.
|
||||
const author: WorkflowIdentity = { id: identity.id, role: 'Admin' };
|
||||
const key =
|
||||
'editorial-v1:' +
|
||||
createHash('sha256')
|
||||
.update(JSON.stringify([identity.id, dto.requestId]))
|
||||
.digest('hex');
|
||||
const scope = `${EDITORIAL_PILOT_KIND}\nTopic: ${dto.researchTopic}\nResearch and evidence-backed brief only. No publication, release, production changes or execution authorization.`;
|
||||
const proposal = {
|
||||
key,
|
||||
title: `Editorial research: ${dto.researchTopic}`,
|
||||
department: 'CONTENT',
|
||||
operationMode: 'PREPARE',
|
||||
budgetLimitCents: 20,
|
||||
metadata: {
|
||||
scope,
|
||||
acceptanceCriteria: dto.acceptanceCriteria,
|
||||
commitSha: dto.commitSha,
|
||||
},
|
||||
};
|
||||
let task = await this.db.orchestrationTask.findUnique({ where: { key } });
|
||||
if (!task) {
|
||||
try {
|
||||
task = await this.workflow.create(proposal, author);
|
||||
} catch (e) {
|
||||
if (!(e instanceof ConflictException)) throw e;
|
||||
task = await this.db.orchestrationTask.findUnique({ where: { key } });
|
||||
if (!task) throw e;
|
||||
}
|
||||
}
|
||||
const m = task!.metadata as any;
|
||||
if (
|
||||
task!.operationMode !== 'PREPARE' ||
|
||||
task!.department !== 'CONTENT' ||
|
||||
task!.budgetLimitCents !== 20 ||
|
||||
task!.title !== proposal.title ||
|
||||
m.createdBy !== identity.id ||
|
||||
m.workflowScope !== 'STAGE_PREPARE' ||
|
||||
m.environment !== 'staging' ||
|
||||
m.scope !== scope ||
|
||||
m.commitSha !== dto.commitSha ||
|
||||
JSON.stringify(m.acceptanceCriteria) !==
|
||||
JSON.stringify(dto.acceptanceCriteria)
|
||||
)
|
||||
throw new ConflictException('Editorial request payload mismatch');
|
||||
// Fixed idempotency token/version permits concurrent submits and recovery from
|
||||
// a crash between existing core create and transition transactions.
|
||||
if (task!.state === 'DRAFT')
|
||||
task = await this.workflow.transition(
|
||||
task!.id,
|
||||
{
|
||||
toState: 'GATE1_PENDING',
|
||||
expectedVersion: 1,
|
||||
idempotencyKey: `${key}:submit`,
|
||||
},
|
||||
author,
|
||||
);
|
||||
return {
|
||||
taskId: task!.id,
|
||||
key,
|
||||
pilotKind: EDITORIAL_PILOT_KIND,
|
||||
state: task!.state,
|
||||
version: task!.version,
|
||||
department: 'CONTENT',
|
||||
operationMode: 'PREPARE',
|
||||
budgetLimitCents: 20,
|
||||
metadata: {
|
||||
scope,
|
||||
acceptanceCriteria: m.acceptanceCriteria,
|
||||
environment: 'staging',
|
||||
commitSha: m.commitSha,
|
||||
},
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
# Bounded editorial approved-run contract
|
||||
|
||||
Only the explicitly configured WORKFLOW_WORKER grant `pmo` may use these routes under `/api/internal/prepare-worker` (the application's prefix supplies `/api`). No new credential or reviewer grant is provisioned here.
|
||||
|
||||
- `GET editorial-proposals/:taskId`: exact bridge-created proposal status and, after ingestion, canonical immutable brief bytes/digest. No lease token, raw events, reviewer identities or arbitrary task projection.
|
||||
- `POST editorial-claim`: `{ "taskId": "<uuid>" }`. Requires exact bridge key/title/scope/metadata plus original PMO creation/submission events, READY/RUNNING, latest independent unexpired approved Gate1, no blocking kill switch. Core claim runs inside the same admission/task-lock transaction, preserving reservations, ownership and 30-second leases. Competing claim returns null lease. Expired attempts retain unknown reservation; a 20-cent task cannot reserve a second 20 cents.
|
||||
- `POST heartbeat`: existing `{taskId,runId,leaseToken}` while working. Extends lease by 30 seconds. Result rechecks Gate1 independently; heartbeat is not approval extension.
|
||||
- `POST editorial-result`: `{taskId,runId,leaseToken,brief}`. No cost, QA pass, role, URI or caller identity fields accepted.
|
||||
|
||||
`brief` has exactly:
|
||||
|
||||
```json
|
||||
{
|
||||
"researchDate": "YYYY-MM-DD",
|
||||
"inputAvailability": [{"input":"input name","status":"AVAILABLE|UNAVAILABLE|PARTIAL","details":"availability explanation"}],
|
||||
"findings": [{"sourceUrl":"https://public-source.example.org/path","sourceDate":"YYYY-MM-DD","finding":"source-backed finding"}],
|
||||
"candidates": [
|
||||
{"title":"Distinct candidate A","score":80,"rationale":"Reason","sourceUrls":["https://public-source.example.org/path"]},
|
||||
{"title":"Distinct candidate B","score":70,"rationale":"Reason","sourceUrls":["https://public-source.example.org/path"]},
|
||||
{"title":"Distinct candidate C","score":60,"rationale":"Reason","sourceUrls":["https://public-source.example.org/path"]}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
Limits: canonical brief UTF-8 <=24,576 bytes; 1..10 inputs (name 120/details 500 characters); 1..20 findings (HTTPS DNS URL 2000/finding 1000 characters); 3..10 unique candidates (title 180/rationale 1000, integer score 0..100, 1..10 source references all in findings). Dates must be valid calendar dates, not future; source dates cannot exceed research date. Unknown nested keys rejected. Example URLs above illustrate shape only, not real research evidence.
|
||||
|
||||
Canonical artifact kind `EDITORIAL_RESEARCH_BRIEF` is stored in append-only artifact metadata with SHA-256 and a URN; authenticated status retrieves actual bytes. No filesystem/external URL persistence dependency. Transaction atomically checks task/approval/lease/run/reservation, inserts evidence/event, closes outbox and moves task to VERIFYING. Run is AWAITING_QA, quality PENDING_INDEPENDENT_QA; no attestation, success, publication, Gate2 or release authorization is created. Unknown cost retains RESERVE 20 without RECONCILE. Replay after lease closure is rejected, not silently overwritten.
|
||||
|
||||
Validation checks structure/source references, not source truth, retrieval, novelty, scoring quality, SEO value or factuality. No research/article/LLM execution is performed by this contract. Independent QA ingestion is deliberately not implemented; generic tracer/tech and Stage evidence cannot certify this evidence.
|
||||
|
||||
Verification: disposable Node22 + PostgreSQL16, source/dependency donors read-only and privately copied, generated Prisma client. New suite observed RED (missing routes) then GREEN. Final combined bridge/execution/tech/transport suites: 22/22; `npm run build`: exit 0. Full historical migrations fail on fresh database because pre-existing blog migration expects missing blogs table; final tests instead applied only real orchestration core, immutable-ledger and outbox migrations directly to empty disposable DB, including append-only triggers. No live database, proposal approval, cron, deployment or publication used.
|
||||
@@ -0,0 +1,407 @@
|
||||
import { Test } from '@nestjs/testing';
|
||||
import { INestApplication } from '@nestjs/common';
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
import { createHash, randomUUID } from 'crypto';
|
||||
import { PrismaService } from '../prisma/prisma.service';
|
||||
import { PrepareWorkflowService } from '../orchestration/prepare-workflow.service';
|
||||
import { WorkerTransportModule, tracerReport } from './worker-transport.module';
|
||||
|
||||
(process.env.EDITORIAL_EXECUTION_DB === '1' ? describe : describe.skip)(
|
||||
'editorial approved-run real TCP/PostgreSQL',
|
||||
() => {
|
||||
const db = new PrismaClient();
|
||||
const token = 'disposable-editorial-pmo-'.repeat(3),
|
||||
other = 'disposable-other-editor-'.repeat(3),
|
||||
ci = 'disposable-editorial-ci-'.repeat(3);
|
||||
const sha = (s: string) => createHash('sha256').update(s).digest('hex');
|
||||
let app: INestApplication, base: string, workflow: PrepareWorkflowService;
|
||||
const brief = () => ({
|
||||
researchDate: '2026-10-24',
|
||||
inputAvailability: [
|
||||
{
|
||||
input: 'search console',
|
||||
status: 'UNAVAILABLE',
|
||||
details: 'No authenticated property supplied',
|
||||
},
|
||||
],
|
||||
findings: [
|
||||
{
|
||||
sourceUrl: 'https://www.who.int/news',
|
||||
sourceDate: '2026-10-20',
|
||||
finding: 'Fixture finding for contract testing, not real research',
|
||||
},
|
||||
],
|
||||
candidates: [0, 1, 2].map((i) => ({
|
||||
title: 'Fixture candidate ' + i,
|
||||
score: 80 - i,
|
||||
rationale: 'Contract fixture only',
|
||||
sourceUrls: ['https://www.who.int/news'],
|
||||
})),
|
||||
});
|
||||
beforeAll(async () => {
|
||||
const m = await Test.createTestingModule({
|
||||
imports: [
|
||||
WorkerTransportModule.register({
|
||||
enabled: true,
|
||||
grants: [
|
||||
{
|
||||
id: 'pmo',
|
||||
role: 'WORKFLOW_WORKER',
|
||||
credentialSha256: sha(token),
|
||||
},
|
||||
{
|
||||
id: 'other',
|
||||
role: 'WORKFLOW_WORKER',
|
||||
credentialSha256: sha(other),
|
||||
},
|
||||
{ id: 'ci', role: 'STAGE_CI', credentialSha256: sha(ci) },
|
||||
],
|
||||
workerIds: ['pmo', 'other'],
|
||||
stageCiIds: ['ci'],
|
||||
artifactDirectory: '/work/tmp/editorial-execution',
|
||||
artifactBaseUrl:
|
||||
'https://isolated.invalid/internal/prepare-worker/artifacts',
|
||||
}),
|
||||
],
|
||||
})
|
||||
.overrideProvider(PrismaService)
|
||||
.useValue(db)
|
||||
.compile();
|
||||
app = m.createNestApplication();
|
||||
await app.listen(0, '127.0.0.1');
|
||||
base = await app.getUrl();
|
||||
workflow = app.get(PrepareWorkflowService);
|
||||
});
|
||||
afterAll(async () => {
|
||||
await app?.close();
|
||||
await db.$disconnect();
|
||||
});
|
||||
async function request(route: string, body?: any, secret = token) {
|
||||
const r = await fetch(base + '/internal/prepare-worker/' + route, {
|
||||
method: body === undefined ? 'GET' : 'POST',
|
||||
headers: {
|
||||
authorization: 'Bearer ' + secret,
|
||||
'content-type': 'application/json',
|
||||
},
|
||||
...(body === undefined ? {} : { body: JSON.stringify(body) }),
|
||||
});
|
||||
return { status: r.status, body: await r.json() };
|
||||
}
|
||||
async function proposal(ready = true, ttl = 60000) {
|
||||
const r = await request('editorial-proposals', {
|
||||
requestId: randomUUID(),
|
||||
pilotKind: 'editorial-research-to-brief-v1',
|
||||
operationMode: 'PREPARE',
|
||||
environment: 'staging',
|
||||
scope: 'EDITORIAL_RESEARCH_TO_BRIEF',
|
||||
researchTopic: 'Disposable research contract',
|
||||
acceptanceCriteria: ['Evidence with dates'],
|
||||
commitSha: 'a'.repeat(40),
|
||||
budgetLimitCents: 20,
|
||||
});
|
||||
expect(r.status).toBe(201);
|
||||
let t = await db.orchestrationTask.findUniqueOrThrow({
|
||||
where: { id: r.body.taskId },
|
||||
});
|
||||
if (ready) {
|
||||
t = await workflow.decide(
|
||||
t.id,
|
||||
1,
|
||||
{
|
||||
decision: 'APPROVED',
|
||||
expiresAt: new Date(Date.now() + ttl).toISOString(),
|
||||
expectedVersion: t.version,
|
||||
idempotencyKey: randomUUID(),
|
||||
},
|
||||
{ id: 'independent-disposable-reviewer', role: 'SUPER_ADMIN' },
|
||||
);
|
||||
// Gate decision now atomically queues READY; no second queue transition.
|
||||
}
|
||||
return t;
|
||||
}
|
||||
async function lease(ttl = 60000) {
|
||||
const t = await proposal(true, ttl);
|
||||
const r = await request('editorial-claim', { taskId: t.id });
|
||||
expect(r.status).toBe(201);
|
||||
expect(r.body.lease).toBeTruthy();
|
||||
const l = r.body.lease;
|
||||
return {
|
||||
t,
|
||||
l,
|
||||
b: { taskId: t.id, runId: l.runId, leaseToken: l.leaseToken },
|
||||
};
|
||||
}
|
||||
it('stops a held run through authenticated failure API, fences late writes and preserves unknown reservation', async () => {
|
||||
const {t,l,b}=await lease();
|
||||
const d={...b,expectedVersion: t.version+1,idempotencyKey:'stop:'+l.runId,reason:'Disposable subprocess failure'};
|
||||
expect((await request('editorial-failure',{...d,leaseToken:randomUUID()})).status).toBe(403);
|
||||
expect((await request('editorial-failure',d,other)).status).toBe(403);
|
||||
expect((await request('editorial-failure',{...d,actualCents:0})).status).toBe(400);
|
||||
const stopped=await Promise.all([request('editorial-failure',d),request('editorial-failure',d)]);
|
||||
expect(stopped.map(x=>x.status)).toEqual([201,201]);
|
||||
expect(stopped[0].body).toMatchObject({state:'FAILED',retainedReservationCents:20});
|
||||
expect((await request('heartbeat',b)).status).toBe(403);
|
||||
expect((await request('editorial-result',{...b,brief:brief()})).status).toBe(403);
|
||||
expect((await request('editorial-claim',{taskId:t.id})).status).toBe(403);
|
||||
expect(await db.orchestrationArtifact.count({where:{runId:l.runId}})).toBe(0);
|
||||
expect(await db.orchestrationAttestation.count({where:{runId:l.runId}})).toBe(0);
|
||||
expect((await db.orchestrationBudgetLedger.findMany({where:{taskId:t.id}})).map(x=>[x.kind,x.amountCents])).toEqual([['RESERVE',20]]);
|
||||
});
|
||||
it('recovers an expired run only as independent reviewer and fences original token', async () => {
|
||||
const {t,l,b}=await lease();
|
||||
const d={runId:l.runId,expectedVersion:t.version+1,idempotencyKey:'stale-stop:'+l.runId,reason:'Disposable ended process'};
|
||||
await expect(workflow.editorialFailure(t.id,d,{id:'reviewer',role:'SUPER_ADMIN'})).rejects.toThrow();
|
||||
await db.prepareWorkflowOutbox.update({where:{taskId:t.id},data:{leaseUntil:new Date(Date.now()-1000)}});
|
||||
const results=await Promise.all([workflow.editorialFailure(t.id,d,{id:'reviewer',role:'SUPER_ADMIN'}),workflow.editorialFailure(t.id,d,{id:'reviewer',role:'SUPER_ADMIN'})]);
|
||||
expect(results.map(x=>x.state)).toEqual(['FAILED','FAILED']);
|
||||
expect((await request('heartbeat',b)).status).toBe(403);
|
||||
expect((await request('editorial-result',{...b,brief:brief()})).status).toBe(403);
|
||||
expect(await db.orchestrationEvent.count({where:{taskId:t.id,eventType:'EDITORIAL_RUN_STOPPED'}})).toBe(1);
|
||||
expect(await db.orchestrationBudgetLedger.count({where:{taskId:t.id}})).toBe(1);
|
||||
});
|
||||
it('projects only owned exact proposals and refuses pending dispatch', async () => {
|
||||
const t = await proposal(false);
|
||||
const p = await request('editorial-proposals/' + t.id);
|
||||
expect(p.status).toBe(200);
|
||||
expect(p.body).toMatchObject({
|
||||
taskId: t.id,
|
||||
state: 'GATE1_PENDING',
|
||||
qaStatus: 'PENDING_INDEPENDENT_QA',
|
||||
});
|
||||
expect(JSON.stringify(p.body)).not.toMatch(
|
||||
/leaseToken|credential|createdBy|fingerprint/,
|
||||
);
|
||||
expect((await request('editorial-claim', { taskId: t.id })).status).toBe(
|
||||
403,
|
||||
);
|
||||
expect(
|
||||
(await request('editorial-proposals/' + t.id, undefined, other)).status,
|
||||
).toBe(403);
|
||||
expect(
|
||||
(await request('editorial-proposals/' + randomUUID())).status,
|
||||
).toBe(404);
|
||||
});
|
||||
it('races claims, ingests immutable bounded brief, never self-attests QA or reconciles unknown cost', async () => {
|
||||
const t = await proposal();
|
||||
const claims = await Promise.all([
|
||||
request('editorial-claim', { taskId: t.id }),
|
||||
request('editorial-claim', { taskId: t.id }),
|
||||
]);
|
||||
const leases = claims.filter((x) => x.body.lease);
|
||||
expect(leases).toHaveLength(1);
|
||||
const l = leases[0].body.lease,
|
||||
b = { taskId: t.id, runId: l.runId, leaseToken: l.leaseToken };
|
||||
expect((await request('heartbeat', b)).status).toBe(201);
|
||||
expect((await request('claim', { taskId: t.id })).status).toBe(403);
|
||||
expect((await request('tech-claim', { taskId: t.id })).status).toBe(403);
|
||||
expect(
|
||||
(await request('complete', { ...b, report: tracerReport(l) })).status,
|
||||
).toBe(403);
|
||||
const r = await request('editorial-result', { ...b, brief: brief() });
|
||||
expect(r.status).toBe(201);
|
||||
expect(r.body).toMatchObject({
|
||||
state: 'VERIFYING',
|
||||
qaStatus: 'PENDING_INDEPENDENT_QA',
|
||||
retainedReservationCents: 20,
|
||||
});
|
||||
const p = await request('editorial-proposals/' + t.id);
|
||||
expect(p.body.artifact.brief).toEqual(brief());
|
||||
expect(sha(p.body.artifact.bytes)).toBe(r.body.artifactSha256);
|
||||
await expect(
|
||||
db.orchestrationArtifact.updateMany({
|
||||
where: { runId: l.runId },
|
||||
data: { metadata: { bytes: 'tampered' } },
|
||||
}),
|
||||
).rejects.toThrow('append-only');
|
||||
expect(JSON.parse(p.body.artifact.bytes)).toMatchObject({
|
||||
taskId: t.id,
|
||||
runId: l.runId,
|
||||
brief: brief(),
|
||||
});
|
||||
expect(
|
||||
await db.orchestrationAttestation.count({ where: { runId: l.runId } }),
|
||||
).toBe(0);
|
||||
expect(
|
||||
(
|
||||
await db.orchestrationRun.findUniqueOrThrow({
|
||||
where: { id: l.runId },
|
||||
})
|
||||
).status,
|
||||
).toBe('AWAITING_QA');
|
||||
expect(
|
||||
(
|
||||
await db.orchestrationBudgetLedger.findMany({
|
||||
where: { taskId: t.id },
|
||||
})
|
||||
).map((x) => [x.kind, x.amountCents]),
|
||||
).toEqual([['RESERVE', 20]]);
|
||||
expect(
|
||||
(await request('editorial-result', { ...b, brief: brief() })).status,
|
||||
).toBe(403);
|
||||
expect(
|
||||
(
|
||||
await request(
|
||||
'stage-evidence',
|
||||
{
|
||||
taskId: t.id,
|
||||
runId: l.runId,
|
||||
commitSha: l.commitSha,
|
||||
sha256: r.body.artifactSha256,
|
||||
evidenceSha256: 'b'.repeat(64),
|
||||
uri: 'https://isolated.invalid/fixture',
|
||||
},
|
||||
ci,
|
||||
)
|
||||
).status,
|
||||
).toBe(403);
|
||||
});
|
||||
it('rejects impersonation, unsafe or incomplete briefs, and expired ownership without artifacts', async () => {
|
||||
const { l, b } = await lease();
|
||||
for (const secret of [other, ci])
|
||||
expect(
|
||||
(await request('editorial-result', { ...b, brief: brief() }, secret))
|
||||
.status,
|
||||
).toBe(403);
|
||||
for (const patch of [
|
||||
{ actualCents: 0 },
|
||||
{ qa: { passed: true } },
|
||||
{ actorId: 'pmo' },
|
||||
])
|
||||
expect(
|
||||
(
|
||||
await request('editorial-result', {
|
||||
...b,
|
||||
brief: brief(),
|
||||
...patch,
|
||||
})
|
||||
).status,
|
||||
).toBe(400);
|
||||
for (const bad of [
|
||||
{ ...brief(), candidates: brief().candidates.slice(0, 2) },
|
||||
{ ...brief(), researchDate: '2026-02-30' },
|
||||
{
|
||||
...brief(),
|
||||
findings: [
|
||||
{
|
||||
sourceUrl: 'http://127.0.0.1',
|
||||
sourceDate: '2026-10-20',
|
||||
finding: 'x',
|
||||
},
|
||||
],
|
||||
},
|
||||
{ ...brief(), inputAvailability: [] },
|
||||
{
|
||||
...brief(),
|
||||
candidates: brief().candidates.map((c) => ({ ...c, score: 101 })),
|
||||
},
|
||||
{ ...brief(), article: 'not allowed' },
|
||||
])
|
||||
expect(
|
||||
(await request('editorial-result', { ...b, brief: bad })).status,
|
||||
).toBe(400);
|
||||
expect(
|
||||
(
|
||||
await request('editorial-result', {
|
||||
...b,
|
||||
leaseToken: randomUUID(),
|
||||
brief: brief(),
|
||||
})
|
||||
).status,
|
||||
).toBe(403);
|
||||
await db.prepareWorkflowOutbox.update({
|
||||
where: { taskId: b.taskId },
|
||||
data: { leaseUntil: new Date(Date.now() - 1000) },
|
||||
});
|
||||
expect(
|
||||
(await request('editorial-result', { ...b, brief: brief() })).status,
|
||||
).toBe(403);
|
||||
expect(
|
||||
(await request('editorial-claim', { taskId: b.taskId })).status,
|
||||
).toBe(403);
|
||||
expect(
|
||||
await db.orchestrationArtifact.count({ where: { runId: l.runId } }),
|
||||
).toBe(0);
|
||||
expect(
|
||||
await db.orchestrationBudgetLedger.count({
|
||||
where: { taskId: b.taskId },
|
||||
}),
|
||||
).toBe(1);
|
||||
});
|
||||
it('enforces cancellation, approval expiry and kill switch inside ingestion', async () => {
|
||||
for (const mode of ['cancel', 'approval', 'kill']) {
|
||||
const { l, b } = await lease(mode === 'approval' ? 1500 : 60000);
|
||||
if (mode === 'cancel')
|
||||
await db.orchestrationTask.update({
|
||||
where: { id: b.taskId },
|
||||
data: { state: 'CANCELLED' },
|
||||
});
|
||||
if (mode === 'approval')
|
||||
await new Promise((resolve) => setTimeout(resolve, 1600));
|
||||
if (mode === 'kill')
|
||||
await db.orchestrationKillSwitch.upsert({
|
||||
where: { scope: 'GLOBAL' },
|
||||
create: {
|
||||
scope: 'GLOBAL',
|
||||
level: 'STOP_AGENTS',
|
||||
active: true,
|
||||
reason: 'disposable execution test',
|
||||
actorId: 'fixture',
|
||||
},
|
||||
update: { level: 'STOP_AGENTS', active: true },
|
||||
});
|
||||
try {
|
||||
expect(
|
||||
(await request('editorial-result', { ...b, brief: brief() }))
|
||||
.status,
|
||||
).toBe(403);
|
||||
expect(
|
||||
await db.orchestrationArtifact.count({ where: { runId: l.runId } }),
|
||||
).toBe(0);
|
||||
} finally {
|
||||
if (mode === 'kill')
|
||||
await db.orchestrationKillSwitch.update({
|
||||
where: { scope: 'GLOBAL' },
|
||||
data: { active: false },
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
it('rejects arbitrary CONTENT tasks and forged stored scope/provenance', async () => {
|
||||
const raw = await workflow.create(
|
||||
{
|
||||
key: 'arbitrary-' + randomUUID(),
|
||||
title: 'arbitrary',
|
||||
department: 'CONTENT',
|
||||
operationMode: 'PREPARE',
|
||||
budgetLimitCents: 20,
|
||||
metadata: {
|
||||
scope: 'editorial-research-to-brief-v1',
|
||||
commitSha: 'a'.repeat(40),
|
||||
acceptanceCriteria: ['x'],
|
||||
},
|
||||
},
|
||||
{ id: 'pmo', role: 'Admin' },
|
||||
);
|
||||
expect((await request('editorial-proposals/' + raw.id)).status).toBe(404);
|
||||
expect(
|
||||
(await request('editorial-claim', { taskId: raw.id })).status,
|
||||
).toBe(404);
|
||||
const t = await proposal();
|
||||
await db.orchestrationTask.update({
|
||||
where: { id: t.id },
|
||||
data: {
|
||||
metadata: {
|
||||
...(t.metadata as any),
|
||||
scope: 'editorial-research-to-brief-v1\nforged',
|
||||
},
|
||||
},
|
||||
});
|
||||
expect((await request('editorial-claim', { taskId: t.id })).status).toBe(
|
||||
404,
|
||||
);
|
||||
expect(await db.orchestrationRun.count({ where: { taskId: t.id } })).toBe(
|
||||
0,
|
||||
);
|
||||
});
|
||||
},
|
||||
);
|
||||
@@ -0,0 +1,536 @@
|
||||
import {
|
||||
BadRequestException,
|
||||
ForbiddenException,
|
||||
Injectable,
|
||||
NotFoundException,
|
||||
} from '@nestjs/common';
|
||||
import { IsInt, Min, IsNotEmpty, IsString, IsObject, IsUUID, Matches } from 'class-validator';
|
||||
import { createHash } from 'crypto';
|
||||
import {
|
||||
PrepareWorkflowService,
|
||||
WorkflowIdentity,
|
||||
} from '../orchestration/prepare-workflow.service';
|
||||
import { PrismaService } from '../prisma/prisma.service';
|
||||
import { EDITORIAL_PILOT_KIND } from './editorial-bridge';
|
||||
|
||||
export class EditorialClaimDto {
|
||||
@IsUUID() taskId!: string;
|
||||
}
|
||||
export class EditorialQueueDto extends EditorialClaimDto {
|
||||
@IsInt() @Min(1) expectedVersion!: number;
|
||||
@IsString() @IsNotEmpty() idempotencyKey!: string;
|
||||
}
|
||||
export class EditorialResultDto extends EditorialClaimDto {
|
||||
@IsUUID() runId!: string;
|
||||
@IsUUID() leaseToken!: string;
|
||||
@IsObject() brief!: Record<string, unknown>;
|
||||
}
|
||||
export class CompletedRecoveryDto {
|
||||
@IsUUID() runId!: string;
|
||||
@IsInt() @Min(1) expectedVersion!: number;
|
||||
@Matches(/^[a-f0-9]{64}$/) evidenceSha256!: string;
|
||||
@IsObject() evidence!: Record<string, unknown>;
|
||||
}
|
||||
const suffix =
|
||||
'\nResearch and evidence-backed brief only. No publication, release, production changes or execution authorization.';
|
||||
export function admittedEditorialTask(t: any): boolean {
|
||||
const m = t?.metadata;
|
||||
const topic =
|
||||
typeof t?.title === 'string' && t.title.startsWith('Editorial research: ')
|
||||
? t.title.slice(20)
|
||||
: '';
|
||||
return !!(
|
||||
t &&
|
||||
/^editorial-v1:[a-f0-9]{64}$/.test(t.key) &&
|
||||
t.department === 'CONTENT' &&
|
||||
t.operationMode === 'PREPARE' &&
|
||||
t.budgetLimitCents === 20 &&
|
||||
m?.createdBy === 'pmo' &&
|
||||
m.workflowScope === 'STAGE_PREPARE' &&
|
||||
m.environment === 'staging' &&
|
||||
typeof m.commitSha === 'string' &&
|
||||
/^[a-f0-9]{40}$/.test(m.commitSha) &&
|
||||
topic.trim() &&
|
||||
topic.length <= 180 &&
|
||||
m.scope === `${EDITORIAL_PILOT_KIND}\nTopic: ${topic}${suffix}` &&
|
||||
Array.isArray(m.acceptanceCriteria) &&
|
||||
m.acceptanceCriteria.length >= 1 &&
|
||||
m.acceptanceCriteria.length <= 10 &&
|
||||
m.acceptanceCriteria.every(
|
||||
(x: unknown) => typeof x === 'string' && x.trim() && x.length <= 500,
|
||||
)
|
||||
);
|
||||
}
|
||||
function keys(v: any, names: string[]) {
|
||||
return (
|
||||
v &&
|
||||
typeof v === 'object' &&
|
||||
!Array.isArray(v) &&
|
||||
Object.keys(v).length === names.length &&
|
||||
names.every((k) => Object.prototype.hasOwnProperty.call(v, k))
|
||||
);
|
||||
}
|
||||
function text(v: any, max: number) {
|
||||
return typeof v === 'string' && !!v.trim() && v.length <= max;
|
||||
}
|
||||
function date(v: any) {
|
||||
return (
|
||||
typeof v === 'string' &&
|
||||
/^\d{4}-\d{2}-\d{2}$/.test(v) &&
|
||||
Number.isFinite(Date.parse(v)) &&
|
||||
new Date(v).toISOString().slice(0, 10) === v &&
|
||||
v <= new Date().toISOString().slice(0, 10)
|
||||
);
|
||||
}
|
||||
function source(v: any) {
|
||||
try {
|
||||
if (!text(v, 2000)) return false;
|
||||
const u = new URL(v);
|
||||
return (
|
||||
u.protocol === 'https:' &&
|
||||
!u.username &&
|
||||
!u.password &&
|
||||
!u.port &&
|
||||
/^[a-z0-9.-]+\.[a-z]{2,}$/.test(u.hostname) &&
|
||||
!/(^|\.)(localhost|local|internal|lan|home|invalid|test|example)$/.test(
|
||||
u.hostname,
|
||||
)
|
||||
);
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
export function validateEditorialBrief(b: any) {
|
||||
const fail = () => {
|
||||
throw new BadRequestException(
|
||||
'Bounded research brief requires dated sources, input availability and 3..10 scored candidates',
|
||||
);
|
||||
};
|
||||
if (
|
||||
!keys(b, ['researchDate', 'inputAvailability', 'findings', 'candidates']) ||
|
||||
Buffer.byteLength(JSON.stringify(b), 'utf8') > 24576 ||
|
||||
!date(b.researchDate)
|
||||
)
|
||||
fail();
|
||||
if (
|
||||
!Array.isArray(b.inputAvailability) ||
|
||||
b.inputAvailability.length < 1 ||
|
||||
b.inputAvailability.length > 10 ||
|
||||
!b.inputAvailability.every(
|
||||
(x: any) =>
|
||||
keys(x, ['input', 'status', 'details']) &&
|
||||
text(x.input, 120) &&
|
||||
['AVAILABLE', 'UNAVAILABLE', 'PARTIAL'].includes(x.status) &&
|
||||
text(x.details, 500),
|
||||
)
|
||||
)
|
||||
fail();
|
||||
if (
|
||||
!Array.isArray(b.findings) ||
|
||||
b.findings.length < 1 ||
|
||||
b.findings.length > 20 ||
|
||||
!b.findings.every(
|
||||
(x: any) =>
|
||||
keys(x, ['sourceUrl', 'sourceDate', 'finding']) &&
|
||||
source(x.sourceUrl) &&
|
||||
date(x.sourceDate) &&
|
||||
x.sourceDate <= b.researchDate &&
|
||||
text(x.finding, 1000),
|
||||
)
|
||||
)
|
||||
fail();
|
||||
const urls = new Set(b.findings.map((x: any) => x.sourceUrl));
|
||||
if (
|
||||
!Array.isArray(b.candidates) ||
|
||||
b.candidates.length < 3 ||
|
||||
b.candidates.length > 10 ||
|
||||
!b.candidates.every(
|
||||
(x: any) =>
|
||||
keys(x, ['title', 'score', 'rationale', 'sourceUrls']) &&
|
||||
text(x.title, 180) &&
|
||||
Number.isInteger(x.score) &&
|
||||
x.score >= 0 &&
|
||||
x.score <= 100 &&
|
||||
text(x.rationale, 1000) &&
|
||||
Array.isArray(x.sourceUrls) &&
|
||||
x.sourceUrls.length >= 1 &&
|
||||
x.sourceUrls.length <= 10 &&
|
||||
x.sourceUrls.every((u: any) => urls.has(u)),
|
||||
) ||
|
||||
new Set(b.candidates.map((x: any) => x.title.trim().toLowerCase())).size !==
|
||||
b.candidates.length
|
||||
)
|
||||
fail();
|
||||
return JSON.parse(JSON.stringify(b));
|
||||
}
|
||||
const kind = 'EDITORIAL_RESEARCH_BRIEF';
|
||||
const qaStatus = 'PENDING_INDEPENDENT_QA';
|
||||
@Injectable()
|
||||
export class EditorialExecutionService {
|
||||
constructor(private readonly db: PrismaService) {}
|
||||
private pmo(a: WorkflowIdentity) {
|
||||
if (a?.role !== 'WORKFLOW_WORKER' || a.id !== 'pmo')
|
||||
throw new ForbiddenException(
|
||||
'Explicit canonical PMO worker grant required',
|
||||
);
|
||||
}
|
||||
private async scope(tx: any, id: string) {
|
||||
if (typeof id !== 'string' || !/^[0-9a-f-]{36}$/i.test(id))
|
||||
throw new NotFoundException('Editorial proposal not found');
|
||||
const t = await tx.orchestrationTask.findUnique({ where: { id } });
|
||||
if (!admittedEditorialTask(t))
|
||||
throw new NotFoundException('Editorial proposal not found');
|
||||
const proposed = await tx.orchestrationEvent.findFirst({
|
||||
where: {
|
||||
taskId: id,
|
||||
sequence: 1,
|
||||
eventType: 'PREPARE_PROPOSED',
|
||||
actorId: 'pmo',
|
||||
toState: 'DRAFT',
|
||||
},
|
||||
});
|
||||
const submitted = await tx.orchestrationEvent.findFirst({
|
||||
where: {
|
||||
taskId: id,
|
||||
sequence: 2,
|
||||
eventType: 'PREPARE_TRANSITION',
|
||||
actorId: 'pmo',
|
||||
fromState: 'DRAFT',
|
||||
toState: 'GATE1_PENDING',
|
||||
idempotencyKey: t.key + ':submit',
|
||||
},
|
||||
});
|
||||
if (!proposed || !submitted)
|
||||
throw new NotFoundException('Editorial proposal not found');
|
||||
return t;
|
||||
}
|
||||
private async approval(tx: any, t: any) {
|
||||
const approval = await tx.orchestrationApprovalDecision.findFirst({
|
||||
where: { taskId: t.id, gate: 1 },
|
||||
orderBy: { createdAt: 'desc' },
|
||||
});
|
||||
if (
|
||||
!approval ||
|
||||
approval.decision !== 'APPROVED' ||
|
||||
approval.actorId === 'pmo' ||
|
||||
approval.expiresAt <= new Date()
|
||||
)
|
||||
throw new ForbiddenException('Valid independent Gate1 required');
|
||||
}
|
||||
private async lock(tx: any, id: string, claim = false) {
|
||||
const switches =
|
||||
await tx.$queryRaw`SELECT level, active FROM orchestration_kill_switches WHERE scope = 'GLOBAL' FOR SHARE`;
|
||||
if (
|
||||
switches[0]?.active &&
|
||||
(claim || switches[0].level !== 'FREEZE_NEW_WORK')
|
||||
)
|
||||
throw new ForbiddenException('Kill switch blocks workflow');
|
||||
await tx.$queryRaw`SELECT id FROM orchestration_tasks WHERE id = ${id}::uuid FOR UPDATE`;
|
||||
const t = await this.scope(tx, id);
|
||||
await this.approval(tx, t);
|
||||
return t;
|
||||
}
|
||||
async status(a: WorkflowIdentity, id: string) {
|
||||
this.pmo(a);
|
||||
return this.db.$transaction(async (tx: any) => {
|
||||
const t = await this.scope(tx, id);
|
||||
const artifacts = await tx.orchestrationArtifact.findMany({
|
||||
where: { kind, run: { taskId: id } },
|
||||
orderBy: { createdAt: 'desc' },
|
||||
take: 1,
|
||||
});
|
||||
const artifact = artifacts[0];
|
||||
let result: any = null;
|
||||
if (artifact) {
|
||||
const bytes = artifact.metadata?.bytes;
|
||||
if (
|
||||
typeof bytes !== 'string' ||
|
||||
Buffer.byteLength(bytes) > 32768 ||
|
||||
createHash('sha256').update(bytes).digest('hex') !== artifact.sha256
|
||||
)
|
||||
throw new ForbiddenException('Artifact integrity mismatch');
|
||||
const parsed = JSON.parse(bytes);
|
||||
if (
|
||||
parsed.taskId !== t.id ||
|
||||
parsed.runId !== artifact.runId ||
|
||||
parsed.commitSha !== t.metadata.commitSha
|
||||
)
|
||||
throw new ForbiddenException('Artifact binding mismatch');
|
||||
result = { kind, sha256: artifact.sha256, bytes, brief: parsed.brief };
|
||||
}
|
||||
const approval = await tx.orchestrationApprovalDecision.findFirst({
|
||||
where: { taskId: t.id, gate: 1 }, orderBy: { createdAt: 'desc' },
|
||||
});
|
||||
const valid = approval?.decision === 'APPROVED' && approval.actorId !== 'pmo' && approval.expiresAt > new Date();
|
||||
return {
|
||||
displayState: t.state === 'READY' && !valid ? (approval?.decision === 'APPROVED' && approval.actorId !== 'pmo' && approval.expiresAt <= new Date() ? 'GATE1_RENEWAL_REQUIRED' : 'BLOCKED') : t.state,
|
||||
gate1Validity: valid ? 'VALID' : 'BLOCKED',
|
||||
taskId: t.id,
|
||||
pilotKind: EDITORIAL_PILOT_KIND,
|
||||
state: t.state,
|
||||
version: t.version,
|
||||
operationMode: t.operationMode,
|
||||
budgetLimitCents: 20,
|
||||
qaStatus,
|
||||
metadata: {
|
||||
scope: t.metadata.scope,
|
||||
acceptanceCriteria: t.metadata.acceptanceCriteria,
|
||||
commitSha: t.metadata.commitSha,
|
||||
environment: 'staging',
|
||||
},
|
||||
artifact: result,
|
||||
};
|
||||
});
|
||||
}
|
||||
async queue(a: WorkflowIdentity, dto: EditorialQueueDto) {
|
||||
this.pmo(a);
|
||||
return this.db.$transaction(async (tx:any)=>{
|
||||
await this.lock(tx,dto.taskId,true);
|
||||
const core=new PrepareWorkflowService(new Proxy(tx, {get(target,key){
|
||||
if(key==='$transaction') return (fn:any)=>fn(tx);
|
||||
const value=target[key]; return typeof value==='function'?value.bind(target):value;
|
||||
}}),{workerIds:['pmo'],stageCiIds:[]});
|
||||
const t=await core.enqueueApproved(a,dto);
|
||||
return {taskId:t.id,state:t.state,version:t.version};
|
||||
});
|
||||
}
|
||||
async claim(a: WorkflowIdentity, dto: EditorialClaimDto) {
|
||||
this.pmo(a);
|
||||
return this.db.$transaction(async (tx: any) => {
|
||||
const t = await this.lock(tx, dto.taskId, true);
|
||||
if (!['READY', 'RUNNING'].includes(t.state))
|
||||
throw new ForbiddenException('Ready editorial proposal required');
|
||||
// Reuse core claim/reservation/lease algorithm in THIS scoped transaction. No
|
||||
// nested transaction or check-then-claim gap: task lock spans admission/claim.
|
||||
const core = new PrepareWorkflowService(
|
||||
new Proxy(tx, {
|
||||
get(target, key) {
|
||||
if (key === '$transaction') return (fn: any) => fn(tx);
|
||||
const value = target[key];
|
||||
return typeof value === 'function' ? value.bind(target) : value;
|
||||
},
|
||||
}),
|
||||
{ workerIds: ['pmo'], stageCiIds: [] },
|
||||
);
|
||||
const lease = await core.claim(a, t.id);
|
||||
return {
|
||||
lease: lease ? { ...lease, pilotKind: EDITORIAL_PILOT_KIND } : null,
|
||||
};
|
||||
});
|
||||
}
|
||||
async recoverCompleted(a: WorkflowIdentity, taskId: string, dto: CompletedRecoveryDto) {
|
||||
if (a?.role !== 'SUPER_ADMIN' || !a.id || a.id === 'pmo')
|
||||
throw new ForbiddenException('Independent Stage reviewer required');
|
||||
const e: any = dto.evidence;
|
||||
const evidenceBytes = JSON.stringify(e);
|
||||
const digest = (s: string) => createHash('sha256').update(s).digest('hex');
|
||||
if (Buffer.byteLength(evidenceBytes) > 262144 || digest(evidenceBytes) !== dto.evidenceSha256 ||
|
||||
e?.taskId !== taskId || e.runId !== dto.runId || e.expectedVersion !== dto.expectedVersion ||
|
||||
typeof e.originalText !== 'string' || !Array.isArray(e.sessions) || e.sessions.length !== 4 ||
|
||||
!Array.isArray(e.outputs) || e.correction?.mode !== 'STORED_REPORTS_ONLY' ||
|
||||
!Array.isArray(e.correction.statusChanges) || !Array.isArray(e.correction.omissions) ||
|
||||
!text(e.correction.reason, 1000)) throw new BadRequestException('Bounded exact stored evidence required');
|
||||
const profiles = ['canina-competitor-worker','canina-content-worker','canina-seo-worker','pmo'];
|
||||
if (e.sessions.some((s: any, i: number) => s.profile !== profiles[i] ||
|
||||
!/^\d{8}_\d{6}_[a-f0-9]{6}$/.test(s.sessionId) || s.outcome !== 'COMPLETED' ||
|
||||
!/^[a-f0-9]{64}$/.test(s.outputSha256)) ||
|
||||
e.sessions[3].outputSha256 !== digest(e.originalText))
|
||||
throw new BadRequestException('Four immutable completed session bindings required');
|
||||
const brief = validateEditorialBrief(e.brief);
|
||||
let original: any;
|
||||
try { original = JSON.parse(e.originalText); } catch { throw new BadRequestException('Original JSON required'); }
|
||||
const same = (x: any, y: any) => JSON.stringify(x) === JSON.stringify(y);
|
||||
if (!Array.isArray(original.inputAvailability) || !Array.isArray(original.findings) || !Array.isArray(original.candidates) ||
|
||||
original.researchDate !== brief.researchDate || original.inputAvailability.length !== brief.inputAvailability.length)
|
||||
throw new BadRequestException('Original meaning and dates must be preserved');
|
||||
for (let i=0;i<brief.inputAvailability.length;i++) {
|
||||
const before=original.inputAvailability[i], after=brief.inputAvailability[i];
|
||||
if (before.input !== after.input || before.details !== after.details) throw new BadRequestException('Availability text must be preserved');
|
||||
const changes=e.correction.statusChanges.filter((x:any)=>x.index===i);
|
||||
if (before.status !== after.status && (changes.length!==1 || changes[0].from!==before.status || changes[0].to!==after.status ||
|
||||
!text(changes[0].reason,1000))) throw new BadRequestException('Explicit grounded status correction required');
|
||||
}
|
||||
for (const collection of ['findings','candidates']) {
|
||||
if (!brief[collection].every((x:any)=>original[collection].some((y:any)=>same(x,y))))
|
||||
throw new BadRequestException('No rewritten findings, candidates or source lists');
|
||||
for (let i=0;i<original[collection].length;i++) if (!brief[collection].some((x:any)=>same(x,original[collection][i])) &&
|
||||
!e.correction.omissions.some((x:any)=>x.collection===collection && x.index===i && text(x.reason,1000)))
|
||||
throw new BadRequestException('Explicit omission metadata required');
|
||||
}
|
||||
|
||||
const retrieved = new Set<string>();
|
||||
for (const output of e.outputs) {
|
||||
const pending: any[] = [];
|
||||
if (!Array.isArray(output.retrievalEvents)) throw new BadRequestException('Retrieval events required');
|
||||
for (const event of output.retrievalEvents) {
|
||||
if (event.type === 'tool_use' && event.name === 'web_extract') pending.push(event);
|
||||
if (event.type !== 'tool_result' || event.name !== 'web_extract') continue;
|
||||
const index = pending.findIndex(x => x.tool_call_id === event.tool_call_id);
|
||||
if (index < 0) continue;
|
||||
const use = pending.splice(index, 1)[0];
|
||||
if (event.is_error || typeof event.output !== 'string') continue;
|
||||
let entries: any;
|
||||
try { entries = JSON.parse(event.output).results; } catch { continue; }
|
||||
if (Array.isArray(entries) && Array.isArray(use.input?.urls))
|
||||
for (const x of entries) if (use.input.urls.includes(x?.url) && !x.error &&
|
||||
typeof x.content === 'string' && x.content.trim()) retrieved.add(x.url);
|
||||
}
|
||||
}
|
||||
if (brief.findings.some((x: any) => !retrieved.has(x.sourceUrl)))
|
||||
throw new BadRequestException('Finding lacks matched successful worker extraction');
|
||||
return this.db.$transaction(async (tx: any) => {
|
||||
const t = await this.lock(tx, taskId);
|
||||
const o = await tx.prepareWorkflowOutbox.findUnique({where:{taskId}});
|
||||
const r = await tx.orchestrationRun.findUnique({where:{id:dto.runId}});
|
||||
if (t.state !== 'RUNNING' || t.version !== dto.expectedVersion || e.commitSha !== t.metadata.commitSha ||
|
||||
!o || o.status !== 'PENDING' || o.leaseOwner !== 'pmo' || o.runId !== dto.runId ||
|
||||
!o.leaseUntil || o.leaseUntil > new Date() || !r || r.taskId !== taskId ||
|
||||
r.status !== 'RUNNING' || r.environment !== 'staging' || r.commitSha !== e.commitSha ||
|
||||
await tx.orchestrationArtifact.count({where:{run:{taskId}}}))
|
||||
throw new ForbiddenException('Exact expired artifact-free same run required');
|
||||
const reserve = await tx.orchestrationBudgetLedger.findUnique({where:{id:o.reservationId}});
|
||||
const ledger = await tx.orchestrationBudgetLedger.aggregate({where:{taskId},_sum:{amountCents:true}});
|
||||
if (!reserve || reserve.taskId !== taskId || reserve.actorId !== 'pmo' || reserve.kind !== 'RESERVE' ||
|
||||
reserve.amountCents !== 20 || reserve.idempotencyKey !== `prepare-reserve:${r.id}` ||
|
||||
ledger._sum.amountCents !== 20 || await tx.orchestrationBudgetLedger.findFirst({where:{taskId,kind:'RECONCILE'}}))
|
||||
throw new ForbiddenException('Existing unreconciled reservation required');
|
||||
await tx.orchestrationArtifact.create({data:{runId:r.id,kind:'EDITORIAL_RECOVERY_EVIDENCE',sha256:dto.evidenceSha256,
|
||||
uri:`urn:canina:editorial-recovery:sha256:${dto.evidenceSha256}`,sizeBytes:Buffer.byteLength(evidenceBytes),
|
||||
metadata:{bytes:evidenceBytes,originalOutputSha256:digest(e.originalText),reviewerId:a.id,qaStatus}}});
|
||||
const stored = await tx.orchestrationArtifact.findFirst({where:{runId:r.id,kind:'EDITORIAL_RECOVERY_EVIDENCE',sha256:dto.evidenceSha256}});
|
||||
if (!stored || stored.metadata?.bytes !== evidenceBytes || digest(stored.metadata.bytes) !== dto.evidenceSha256)
|
||||
throw new ForbiddenException('Stored canonical evidence hash required');
|
||||
const bytes = JSON.stringify({kind,pilotKind:EDITORIAL_PILOT_KIND,schemaVersion:1,taskId,runId:r.id,
|
||||
commitSha:r.commitSha,environment:'staging',qaStatus,costStatus:'upper-bound-reserved',brief,
|
||||
recoveryEvidenceSha256:dto.evidenceSha256});
|
||||
const hash = digest(bytes);
|
||||
await tx.orchestrationArtifact.create({data:{runId:r.id,kind,sha256:hash,uri:`urn:canina:editorial-brief:sha256:${hash}`,
|
||||
sizeBytes:Buffer.byteLength(bytes),metadata:{bytes,qaStatus,costStatus:'upper-bound-reserved'}}});
|
||||
await tx.orchestrationRun.update({where:{id:r.id},data:{status:'AWAITING_QA',finishedAt:new Date()}});
|
||||
await tx.prepareWorkflowOutbox.update({where:{id:o.id},data:{status:'DONE',leaseToken:null,leaseUntil:null}});
|
||||
const updated = await tx.orchestrationTask.update({where:{id:taskId},data:{state:'VERIFYING',version:{increment:1}}});
|
||||
await tx.orchestrationEvent.create({data:{taskId,sequence:updated.version,actorId:a.id,eventType:'EDITORIAL_COMPLETED_RUN_RECOVERED',
|
||||
fromState:'RUNNING',toState:'VERIFYING',idempotencyKey:`editorial-recovery:${r.id}`,
|
||||
payload:{artifactSha256:hash,evidenceSha256:dto.evidenceSha256,originalOutputSha256:digest(e.originalText),qaStatus,
|
||||
retainedReservationCents:20,costStatus:'upper-bound-reserved',newResearch:false}}});
|
||||
return {taskId,runId:r.id,state:updated.state,artifactSha256:hash,qaStatus,retainedReservationCents:20,costStatus:'upper-bound-reserved'};
|
||||
});
|
||||
}
|
||||
|
||||
async result(a: WorkflowIdentity, dto: EditorialResultDto) {
|
||||
this.pmo(a);
|
||||
const brief = validateEditorialBrief(dto.brief);
|
||||
// Core complete writes a passed QA attestation and reconciles supplied costs.
|
||||
// It is deliberately NOT reused for unreviewed research or unknown cost.
|
||||
return this.db.$transaction(async (tx: any) => {
|
||||
const t = await this.lock(tx, dto.taskId);
|
||||
const o = await tx.prepareWorkflowOutbox.findUnique({
|
||||
where: { taskId: t.id },
|
||||
});
|
||||
const r = await tx.orchestrationRun.findUnique({
|
||||
where: { id: dto.runId },
|
||||
});
|
||||
if (
|
||||
t.state !== 'RUNNING' ||
|
||||
!o ||
|
||||
o.status !== 'PENDING' ||
|
||||
o.leaseOwner !== a.id ||
|
||||
o.leaseToken !== dto.leaseToken ||
|
||||
o.runId !== dto.runId ||
|
||||
!o.leaseUntil ||
|
||||
o.leaseUntil <= new Date() ||
|
||||
!r ||
|
||||
r.taskId !== t.id ||
|
||||
r.status !== 'RUNNING' ||
|
||||
r.environment !== 'staging' ||
|
||||
r.commitSha !== t.metadata.commitSha
|
||||
)
|
||||
throw new ForbiddenException('Active owned editorial lease required');
|
||||
const reserve = await tx.orchestrationBudgetLedger.findUnique({
|
||||
where: { id: o.reservationId },
|
||||
});
|
||||
const ledger = await tx.orchestrationBudgetLedger.aggregate({
|
||||
where: { taskId: t.id },
|
||||
_sum: { amountCents: true },
|
||||
});
|
||||
if (
|
||||
!reserve ||
|
||||
reserve.taskId !== t.id ||
|
||||
reserve.actorId !== a.id ||
|
||||
reserve.kind !== 'RESERVE' ||
|
||||
reserve.amountCents !== 20 ||
|
||||
reserve.idempotencyKey !== `prepare-reserve:${r.id}` ||
|
||||
ledger._sum.amountCents !== 20 ||
|
||||
(await tx.orchestrationBudgetLedger.findFirst({
|
||||
where: { taskId: t.id, kind: 'RECONCILE' },
|
||||
}))
|
||||
)
|
||||
throw new ForbiddenException(
|
||||
'Unreconciled owned 20 cent reservation required',
|
||||
);
|
||||
const bytes = JSON.stringify({
|
||||
kind,
|
||||
pilotKind: EDITORIAL_PILOT_KIND,
|
||||
schemaVersion: 1,
|
||||
taskId: t.id,
|
||||
runId: r.id,
|
||||
commitSha: r.commitSha,
|
||||
environment: 'staging',
|
||||
qaStatus,
|
||||
costStatus: 'upper-bound-reserved',
|
||||
brief,
|
||||
});
|
||||
const hash = createHash('sha256').update(bytes).digest('hex');
|
||||
// Canonical bytes live in append-only DB artifact metadata, not a caller URI
|
||||
// or mutable external file. PMO status is the authenticated retrieval path.
|
||||
await tx.orchestrationArtifact.create({
|
||||
data: {
|
||||
runId: r.id,
|
||||
kind,
|
||||
sha256: hash,
|
||||
uri: `urn:canina:editorial-brief:sha256:${hash}`,
|
||||
sizeBytes: Buffer.byteLength(bytes),
|
||||
metadata: { bytes, qaStatus, costStatus: 'upper-bound-reserved' },
|
||||
},
|
||||
});
|
||||
await tx.orchestrationRun.update({
|
||||
where: { id: r.id },
|
||||
data: { status: 'AWAITING_QA', finishedAt: new Date() },
|
||||
});
|
||||
await tx.prepareWorkflowOutbox.update({
|
||||
where: { id: o.id },
|
||||
data: { status: 'DONE', leaseToken: null, leaseUntil: null },
|
||||
});
|
||||
const updated = await tx.orchestrationTask.update({
|
||||
where: { id: t.id },
|
||||
data: { state: 'VERIFYING', version: { increment: 1 } },
|
||||
});
|
||||
await tx.orchestrationEvent.create({
|
||||
data: {
|
||||
taskId: t.id,
|
||||
sequence: updated.version,
|
||||
actorId: a.id,
|
||||
eventType: 'EDITORIAL_BRIEF_RECEIVED',
|
||||
fromState: t.state,
|
||||
toState: 'VERIFYING',
|
||||
idempotencyKey: `editorial-result:${r.id}`,
|
||||
payload: {
|
||||
artifactSha256: hash,
|
||||
qaStatus,
|
||||
costStatus: 'upper-bound-reserved',
|
||||
retainedReservationCents: 20,
|
||||
},
|
||||
},
|
||||
});
|
||||
return {
|
||||
taskId: t.id,
|
||||
runId: r.id,
|
||||
state: updated.state,
|
||||
artifactSha256: hash,
|
||||
qaStatus,
|
||||
costStatus: 'upper-bound-reserved',
|
||||
retainedReservationCents: 20,
|
||||
};
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
import { EditorialExecutionService } from './editorial-execution';
|
||||
describe('editorial expiry read/claim consistency',()=>{
|
||||
it('rejects the actual expired claim while status explains blocked READY',async()=>{
|
||||
jest.useFakeTimers().setSystemTime(new Date('2026-10-24T09:15:00Z'));
|
||||
const t={id:'565ace1f-8cfc-4447-b978-66c36e7b767b',state:'READY',version:4,metadata:{commitSha:'a'.repeat(40)}};
|
||||
const tx:any={$queryRaw:jest.fn().mockResolvedValue([]),orchestrationApprovalDecision:{findFirst:jest.fn().mockResolvedValue({decision:'APPROVED',actorId:'owner',expiresAt:new Date('2026-10-24T06:37:00Z')})},orchestrationArtifact:{findMany:jest.fn().mockResolvedValue([])}};
|
||||
const s=new EditorialExecutionService({$transaction:async(fn:any)=>fn(tx)} as any);
|
||||
jest.spyOn(s as any,'scope').mockResolvedValue(t);
|
||||
const a={id:'pmo',role:'WORKFLOW_WORKER'};
|
||||
await expect(s.claim(a,{taskId:t.id})).rejects.toMatchObject({status:403,message:'Valid independent Gate1 required'});
|
||||
await expect(s.status(a,t.id)).resolves.toMatchObject({state:'READY',version:4,displayState:'GATE1_RENEWAL_REQUIRED',gate1Validity:'BLOCKED',artifact:null});
|
||||
jest.useRealTimers();
|
||||
});
|
||||
});
|
||||
@@ -1,5 +1,8 @@
|
||||
import { Test } from '@nestjs/testing';
|
||||
import { writeFileSync, chmodSync, symlinkSync, mkdirSync, rmSync } from 'fs';
|
||||
import { writeFileSync, chmodSync, symlinkSync, mkdirSync, rmSync, mkdtempSync } from 'fs';
|
||||
import fs = require('fs');
|
||||
import { tmpdir } from 'os';
|
||||
import { join } from 'path';
|
||||
import { execFileSync } from 'child_process';
|
||||
import { registerPrepareWorker } from './worker-registration';
|
||||
import { loadPrepareWorkerConfig } from './worker-config';
|
||||
@@ -7,10 +10,29 @@ import { linkSync } from 'fs';
|
||||
|
||||
|
||||
describe('reviewed prepare-worker startup registration', () => {
|
||||
const path = '/run/secrets/prepare_worker_grants';
|
||||
let root: string;
|
||||
let secrets: string;
|
||||
let path: string;
|
||||
beforeEach(() => {
|
||||
root = mkdtempSync(join(tmpdir(), 'prepare-worker-registration-'));
|
||||
secrets = join(root, 'run', 'secrets');
|
||||
mkdirSync(secrets, { recursive: true, mode: 0o700 });
|
||||
path = join(secrets, 'prepare_worker_grants');
|
||||
// Substitute only the root descriptor, retaining real openat-style traversal,
|
||||
// O_NOFOLLOW, fstat, read bounds, ownership and permission validation.
|
||||
const open = fs.openSync;
|
||||
jest.spyOn(fs, 'openSync').mockImplementation((file, flags, mode) =>
|
||||
open(file === '/' ? root : file, flags, mode));
|
||||
});
|
||||
afterEach(() => {
|
||||
jest.restoreAllMocks();
|
||||
rmSync(root, { recursive: true, force: true });
|
||||
});
|
||||
it('isolates secret fixtures from the host runtime secret directory', () => {
|
||||
expect(path.startsWith('/run/secrets/')).toBe(false);
|
||||
});
|
||||
const valid = () => ({ grants: [{ id: 'worker', role: 'WORKFLOW_WORKER', credentialSha256: 'a'.repeat(64) }, { id: 'ci', role: 'STAGE_CI', credentialSha256: 'b'.repeat(64) }], workerIds: ['worker'], stageCiIds: ['ci'], artifactBaseUrl: 'https://stage.example.com/internal/prepare-worker/artifacts' });
|
||||
it('loader itself rejects malformed SHA grants', () => {
|
||||
mkdirSync('/run/secrets', { recursive: true });
|
||||
const c = valid(); c.grants[0].credentialSha256 = 'secret-not-a-sha';
|
||||
writeFileSync(path, JSON.stringify(c), { mode: 0o400 });
|
||||
try { expect(() => loadPrepareWorkerConfig()).toThrow('Prepare worker startup configuration rejected'); }
|
||||
@@ -20,8 +42,7 @@ describe('reviewed prepare-worker startup registration', () => {
|
||||
expect(registerPrepareWorker({ PREPARE_WORKER_ENABLED: value })).toEqual([]);
|
||||
});
|
||||
it.each(['missing', 'symlink', 'directory', 'fifo', 'oversize', 'group-write', 'world-write', 'hardlink'])('fails startup on unsafe file: %s', kind => {
|
||||
mkdirSync('/run/secrets', { recursive: true });
|
||||
const other = '/run/secrets/test-other';
|
||||
const other = join(secrets, 'test-other');
|
||||
try {
|
||||
if (kind === 'fifo') execFileSync('mkfifo', [path]);
|
||||
else if (kind === 'directory') mkdirSync(path);
|
||||
@@ -36,7 +57,6 @@ describe('reviewed prepare-worker startup registration', () => {
|
||||
} finally { rmSync(path, { recursive: true, force: true }); rmSync(other, { force: true }); }
|
||||
});
|
||||
it.each(['extra', 'raw-token', 'wrong-role', 'overlap', 'duplicate-sha', 'missing-grant', 'http', 'credentials', 'localhost', 'query', 'bad-json', 'null'])('rejects unreviewed JSON: %s without leaking contents or logging', kind => {
|
||||
mkdirSync('/run/secrets', { recursive: true });
|
||||
const c: any = valid();
|
||||
if (kind === 'extra') c.artifactDirectory = '/user-selected';
|
||||
if (kind === 'raw-token') c.grants[0].token = 'DO_NOT_LOG_THIS_SECRET';
|
||||
@@ -67,8 +87,7 @@ describe('reviewed prepare-worker startup registration', () => {
|
||||
} finally { await app.close(); }
|
||||
});
|
||||
it('loads immutable reviewed JSON into the real transport registration', async () => {
|
||||
mkdirSync('/run/secrets', { recursive: true });
|
||||
const file = '/run/secrets/prepare_worker_grants';
|
||||
const file = path;
|
||||
const config = { grants: [{ id: 'worker', role: 'WORKFLOW_WORKER', credentialSha256: 'a'.repeat(64) }, { id: 'ci', role: 'STAGE_CI', credentialSha256: 'b'.repeat(64) }], workerIds: ['worker'], stageCiIds: ['ci'], artifactBaseUrl: 'https://stage.example.com/internal/prepare-worker/artifacts' };
|
||||
writeFileSync(file, JSON.stringify(config), { mode: 0o400 });
|
||||
try {
|
||||
|
||||
@@ -32,6 +32,9 @@ import {
|
||||
WorkflowIdentity,
|
||||
} from "../orchestration/prepare-workflow.service";
|
||||
|
||||
import { EditorialFailureDto } from '../orchestration/dto/orchestration.dto';
|
||||
import { EditorialProposalBridge, EditorialProposalDto, isEditorialProposal } from "./editorial-bridge";
|
||||
import { EditorialExecutionService, EditorialClaimDto, EditorialQueueDto, EditorialResultDto } from './editorial-execution';
|
||||
import { admittedTechTask, TECH_PILOT_KIND, techArtifact, validateTechSource } from "./tech-pilot-validator";
|
||||
|
||||
// This is reviewed static configuration, not a URL fetched by the transport.
|
||||
@@ -68,6 +71,10 @@ class LeaseDto extends ClaimDto {
|
||||
@IsUUID() runId!: string;
|
||||
@IsUUID() leaseToken!: string;
|
||||
}
|
||||
class EditorialHeldFailureDto extends EditorialFailureDto {
|
||||
@IsUUID() taskId!: string;
|
||||
@IsUUID() leaseToken!: string;
|
||||
}
|
||||
class CompleteDto extends LeaseDto {
|
||||
@IsString() @MaxLength(2048) report!: string;
|
||||
}
|
||||
@@ -155,6 +162,7 @@ class WorkerTransportService {
|
||||
const t = await this.db.orchestrationTask.findUnique({
|
||||
where: { id: dto.taskId },
|
||||
});
|
||||
if (isEditorialProposal(t)) throw new ForbiddenException("Editorial execution requires a separately reviewed executor");
|
||||
// Explicit per-task pilot scope; never opportunistically consume arbitrary queued work.
|
||||
if (!t || !["READY", "RUNNING"].includes(t.state)) return { lease: null };
|
||||
if (t.budgetLimitCents !== 20)
|
||||
@@ -168,6 +176,7 @@ class WorkerTransportService {
|
||||
async complete(a: WorkflowIdentity, dto: CompleteDto) {
|
||||
this.worker(a);
|
||||
const task = await this.db.orchestrationTask.findUnique({ where: { id: dto.taskId } });
|
||||
if (isEditorialProposal(task)) throw new ForbiddenException("Editorial execution requires a separately reviewed executor");
|
||||
if (task?.key === TECH_PILOT_KIND || (task?.metadata as any)?.scope === TECH_PILOT_KIND)
|
||||
throw new ForbiddenException("Tech pilot requires separate source completion");
|
||||
// Recheck stop/interrupt and fencing before artifact creation; core rechecks atomically at commit.
|
||||
@@ -302,6 +311,11 @@ class WorkerTransportService {
|
||||
throw new ConflictException("Artifact binding mismatch");
|
||||
return JSON.parse(bytes);
|
||||
}
|
||||
async editorialFailure(a: WorkflowIdentity, dto: EditorialHeldFailureDto) {
|
||||
const { taskId, ...failure } = dto;
|
||||
const t = await this.workflow.editorialFailure(taskId, failure, a);
|
||||
return { taskId: t.id, state: t.state, version: t.version, costStatus: 'unknown-upper-bound-reserved', retainedReservationCents: 20 };
|
||||
}
|
||||
stage(a: WorkflowIdentity, dto: StageEvidenceDto) {
|
||||
return this.workflow.stageEvidence(a, dto);
|
||||
}
|
||||
@@ -316,7 +330,25 @@ class WorkerTransportService {
|
||||
}),
|
||||
)
|
||||
class WorkerTransportController {
|
||||
constructor(private readonly service: WorkerTransportService) {}
|
||||
constructor(private readonly service: WorkerTransportService, private readonly editorial: EditorialProposalBridge, private readonly execution: EditorialExecutionService) {}
|
||||
@Get('editorial-proposals/:taskId') editorialStatus(@Req() req: any, @Param('taskId') taskId: string) {
|
||||
return this.execution.status(req.workerIdentity, taskId);
|
||||
}
|
||||
@Post('editorial-queue') editorialQueue(@Req() req: any, @Body() dto: EditorialQueueDto) {
|
||||
return this.execution.queue(req.workerIdentity, dto);
|
||||
}
|
||||
@Post('editorial-claim') editorialClaim(@Req() req: any, @Body() dto: EditorialClaimDto) {
|
||||
return this.execution.claim(req.workerIdentity, dto);
|
||||
}
|
||||
@Post('editorial-failure') editorialFailure(@Req() req: any, @Body() dto: EditorialHeldFailureDto) {
|
||||
return this.service.editorialFailure(req.workerIdentity, dto);
|
||||
}
|
||||
@Post('editorial-result') editorialResult(@Req() req: any, @Body() dto: EditorialResultDto) {
|
||||
return this.execution.result(req.workerIdentity, dto);
|
||||
}
|
||||
@Post("editorial-proposals") editorialProposal(@Req() req: any, @Body() dto: EditorialProposalDto) {
|
||||
return this.editorial.submit(req.workerIdentity, dto);
|
||||
}
|
||||
@Post("claim") claim(@Req() req: any, @Body() dto: ClaimDto) {
|
||||
return this.service.claim(req.workerIdentity, dto);
|
||||
}
|
||||
@@ -395,6 +427,8 @@ export class WorkerTransportModule {
|
||||
PrepareWorkflowService,
|
||||
WorkerIdentityGuard,
|
||||
WorkerTransportService,
|
||||
EditorialProposalBridge,
|
||||
EditorialExecutionService,
|
||||
{ provide: CONFIG, useValue: snapshot },
|
||||
{
|
||||
provide: PREPARE_WORKFLOW_CONFIG,
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
import { PrepareWorkflowService } from './prepare-workflow.service';
|
||||
const enabled=process.env.WORKFLOW_DB==='1';
|
||||
(enabled?describe:describe.skip)('approval queue PostgreSQL atomicity',()=>{
|
||||
const db=new PrismaClient();
|
||||
const service=new PrepareWorkflowService(db,{workerIds:['pmo','worker'],stageCiIds:[]});
|
||||
const owner={id:'pmo',role:'Admin'}, reviewer={id:'reviewer',role:'SUPER_ADMIN'},worker={id:'worker',role:'WORKFLOW_WORKER'};
|
||||
async function pending(){const t=await service.create({key:`queue-${crypto.randomUUID()}`,title:'QA',department:'CONTENT',operationMode:'PREPARE',budgetLimitCents:20,metadata:{scope:'Isolated QA',acceptanceCriteria:['Test queue'],commitSha:'a'.repeat(40)}},owner);return service.transition(t.id,{toState:'GATE1_PENDING',expectedVersion:t.version,idempotencyKey:`submit-${t.id}`},owner);}
|
||||
afterAll(()=>db.$disconnect());
|
||||
it('racing approvals serialize once, replay once, and queue can immediately claim',async()=>{
|
||||
const t=await pending();const dto={decision:'APPROVED',expectedVersion:t.version,idempotencyKey:`approve-${t.id}`};
|
||||
const results=await Promise.all([service.decide(t.id,1,dto,reviewer),service.decide(t.id,1,dto,reviewer)]);
|
||||
expect(results.every(t=>t.state==='READY')).toBe(true);
|
||||
expect(await db.orchestrationApprovalDecision.count({where:{taskId:t.id}})).toBe(1);
|
||||
expect(await db.prepareWorkflowOutbox.count({where:{taskId:t.id}})).toBe(1);
|
||||
const claims=await Promise.all([service.claim(worker,t.id),service.claim(worker,t.id)]);
|
||||
expect(claims.filter(Boolean)).toHaveLength(1);
|
||||
});
|
||||
it('scheduled work cannot claim early via targeted or polling claim; becomes claimable at due time',async()=>{
|
||||
const t=await pending();const notBefore=new Date(Date.now()+3600000).toISOString();
|
||||
await service.decide(t.id,1,{decision:'APPROVED',expectedVersion:t.version,idempotencyKey:`schedule-${t.id}`,notBefore},reviewer);
|
||||
expect(await service.claim(worker,t.id)).toBeNull();
|
||||
expect(await service.claim(worker)).toBeNull();
|
||||
const o=await db.prepareWorkflowOutbox.findUniqueOrThrow({where:{taskId:t.id}});
|
||||
expect(o.notBefore).toEqual(new Date(notBefore));
|
||||
const approval=await db.orchestrationApprovalDecision.findFirstOrThrow({where:{taskId:t.id}});
|
||||
expect(approval.expiresAt.getTime()).toBeGreaterThan(Date.parse(notBefore));
|
||||
await db.prepareWorkflowOutbox.update({where:{taskId:t.id},data:{notBefore:new Date(0)}});
|
||||
expect(await service.claim(worker,t.id)).toMatchObject({taskId:t.id,attempt:1});
|
||||
});
|
||||
it('hold and rejection never queue',async()=>{
|
||||
const t=await pending();const held=await service.transition(t.id,{toState:'GATE1_HELD',expectedVersion:t.version,idempotencyKey:`hold-${t.id}`,reason:'Revise scope'},reviewer);
|
||||
expect(await db.prepareWorkflowOutbox.count({where:{taskId:t.id}})).toBe(0);
|
||||
await service.decide(t.id,1,{decision:'REJECTED',expectedVersion:held.version,idempotencyKey:`reject-${t.id}`},reviewer);
|
||||
expect(await db.prepareWorkflowOutbox.count({where:{taskId:t.id}})).toBe(0);
|
||||
});
|
||||
it('expired approval cannot claim and immutable decision is not edited',async()=>{
|
||||
const t=await pending();await service.decide(t.id,1,{decision:'APPROVED',expectedVersion:t.version,idempotencyKey:`expire-${t.id}`,expiresAt:new Date(Date.now()+300).toISOString()},reviewer);
|
||||
await new Promise(r=>setTimeout(r,350));
|
||||
await expect(service.claim(worker,t.id)).rejects.toThrow(/expired/i);
|
||||
expect(await db.orchestrationRun.count({where:{taskId:t.id}})).toBe(0);
|
||||
});
|
||||
it('PMO recovery queues stored v3 approval without creating a decision, no impersonation',async()=>{
|
||||
const t=await pending();
|
||||
await db.orchestrationTask.update({where:{id:t.id},data:{state:'GATE1_APPROVED',version:3}});
|
||||
await db.orchestrationApprovalDecision.create({data:{taskId:t.id,gate:1,decision:'APPROVED',actorId:'independent',expiresAt:new Date(Date.now()+60000),idempotencyKey:`legacy-${t.id}`}});
|
||||
const dto={taskId:t.id,expectedVersion:3,idempotencyKey:`recover-${t.id}`};
|
||||
const result=await Promise.all([service.enqueueApproved({id:'pmo',role:'WORKFLOW_WORKER'},dto),service.enqueueApproved({id:'pmo',role:'WORKFLOW_WORKER'},dto)]);
|
||||
expect(result.every(t=>t.state==='READY'&&t.version===4)).toBe(true);
|
||||
expect(await db.orchestrationApprovalDecision.count({where:{taskId:t.id}})).toBe(1);
|
||||
expect(await db.prepareWorkflowOutbox.count({where:{taskId:t.id}})).toBe(1);
|
||||
});
|
||||
it('outbox failure rolls back immutable approval and READY together',async()=>{
|
||||
const t=await pending();await db.prepareWorkflowOutbox.create({data:{taskId:t.id}});
|
||||
await expect(service.decide(t.id,1,{decision:'APPROVED',expectedVersion:t.version,idempotencyKey:`fail-${t.id}`},reviewer)).rejects.toThrow();
|
||||
expect((await db.orchestrationTask.findUniqueOrThrow({where:{id:t.id}})).state).toBe('GATE1_PENDING');
|
||||
expect(await db.orchestrationApprovalDecision.count({where:{taskId:t.id}})).toBe(0);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,47 @@
|
||||
import { PrepareWorkflowService } from './prepare-workflow.service';
|
||||
|
||||
describe('atomic approval queue contract', () => {
|
||||
let t:any, tx:any, service:PrepareWorkflowService;
|
||||
const actor={id:'reviewer',role:'SUPER_ADMIN'};
|
||||
const command={decision:'APPROVED',expectedVersion:2,idempotencyKey:'approve'};
|
||||
beforeEach(()=>{
|
||||
t={id:'t',state:'GATE1_PENDING',version:2,operationMode:'PREPARE',metadata:{workflowScope:'STAGE_PREPARE',createdBy:'pmo'}};
|
||||
tx={$queryRaw:jest.fn().mockResolvedValue([]),orchestrationTask:{findUnique:jest.fn(async()=>t),update:jest.fn(async({data}:any)=>(t={...t,...data,version:t.version+1}))},orchestrationEvent:{findUnique:jest.fn(),create:jest.fn()},orchestrationApprovalDecision:{create:jest.fn()},prepareWorkflowOutbox:{create:jest.fn()}};
|
||||
service=new PrepareWorkflowService({$transaction:async(fn:any)=>fn(tx)},{workerIds:['pmo'],stageCiIds:[]});
|
||||
});
|
||||
it('approval with no date enters READY and creates exactly one outbox atomically',async()=>{
|
||||
await expect(service.decide('t',1,command,actor)).resolves.toMatchObject({state:'READY',version:3});
|
||||
expect(tx.prepareWorkflowOutbox.create).toHaveBeenCalledTimes(1);
|
||||
expect(tx.orchestrationApprovalDecision.create).toHaveBeenCalledWith({data:expect.objectContaining({actorId:'reviewer',expiresAt:expect.any(Date),notes:expect.any(String)})});
|
||||
tx.orchestrationEvent.findUnique.mockResolvedValue(tx.orchestrationEvent.create.mock.calls[0][0].data);
|
||||
await service.decide('t',1,command,actor);
|
||||
expect(tx.prepareWorkflowOutbox.create).toHaveBeenCalledTimes(1);
|
||||
expect(tx.orchestrationApprovalDecision.create).toHaveBeenCalledTimes(1);
|
||||
await expect(service.decide('t',1,{...command,notes:'changed'},actor)).rejects.toMatchObject({status:409});
|
||||
});
|
||||
it('future schedule is durable and server expiry extends beyond it',async()=>{
|
||||
const notBefore=new Date(Date.now()+7*86400000).toISOString();
|
||||
await service.decide('t',1,{...command,notBefore},actor);
|
||||
const data=tx.prepareWorkflowOutbox.create.mock.calls[0][0].data;
|
||||
expect(data.notBefore).toEqual(new Date(notBefore));
|
||||
expect(tx.orchestrationApprovalDecision.create.mock.calls[0][0].data.expiresAt.getTime()).toBeGreaterThan(Date.parse(notBefore));
|
||||
});
|
||||
it('rejected decision never queues',async()=>{
|
||||
await expect(service.decide('t',1,{...command,decision:'REJECTED'},actor)).resolves.toMatchObject({state:'REJECTED'});
|
||||
expect(tx.prepareWorkflowOutbox.create).not.toHaveBeenCalled();
|
||||
});
|
||||
it.each([new Date(0).toISOString(),new Date(Date.now()+31*86400000).toISOString(),'bad'])('denies invalid schedule %s',async notBefore=>{
|
||||
await expect(service.decide('t',1,{...command,notBefore},actor)).rejects.toMatchObject({status:400});
|
||||
expect(tx.orchestrationApprovalDecision.create).not.toHaveBeenCalled();
|
||||
});
|
||||
it('legacy explicit expiry remains an expiry, never a schedule',async()=>{
|
||||
const expiresAt=new Date(Date.now()+60000).toISOString();
|
||||
await service.decide('t',1,{...command,expiresAt},actor);
|
||||
expect(tx.orchestrationApprovalDecision.create.mock.calls[0][0].data.expiresAt).toEqual(new Date(expiresAt));
|
||||
expect(tx.prepareWorkflowOutbox.create.mock.calls[0][0].data.notBefore).toBeNull();
|
||||
});
|
||||
it('expired approval is denied with no writes',async()=>{
|
||||
await expect(service.decide('t',1,{...command,expiresAt:new Date(0).toISOString()},actor)).rejects.toMatchObject({status:400});
|
||||
expect(tx.prepareWorkflowOutbox.create).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -8,6 +8,8 @@ import {
|
||||
IsNotEmpty,
|
||||
IsOptional,
|
||||
IsString,
|
||||
IsUUID,
|
||||
MaxLength,
|
||||
Max,
|
||||
Min,
|
||||
} from 'class-validator';
|
||||
@@ -30,13 +32,21 @@ export class GateDecisionDto {
|
||||
@IsIn(['APPROVED', 'REJECTED']) decision!: 'APPROVED' | 'REJECTED';
|
||||
@Type(() => Number) @IsInt() @Min(1) expectedVersion!: number;
|
||||
@IsString() @IsNotEmpty() idempotencyKey!: string;
|
||||
@IsISO8601() expiresAt!: string;
|
||||
// Legacy explicit validity cap; scheduling uses notBefore instead.
|
||||
@IsOptional() @IsISO8601() expiresAt?: string;
|
||||
@IsOptional() @IsISO8601() notBefore?: string;
|
||||
@IsOptional() @IsString() notes?: string;
|
||||
@IsOptional() @IsString() runId?: string;
|
||||
@IsOptional() @IsHash('sha256') artifactHash?: string;
|
||||
@IsOptional() @IsString() commitSha?: string;
|
||||
@IsOptional() @IsString() environment?: string;
|
||||
}
|
||||
export class EditorialFailureDto {
|
||||
@IsUUID() runId!: string;
|
||||
@IsInt() @Min(1) expectedVersion!: number;
|
||||
@IsString() @IsNotEmpty() @MaxLength(120) idempotencyKey!: string;
|
||||
@IsString() @IsNotEmpty() @MaxLength(500) reason!: string;
|
||||
}
|
||||
export class RecordBudgetDto {
|
||||
@Type(() => Number) @IsInt() @Min(1) amountCents!: number;
|
||||
@IsString() @IsNotEmpty() idempotencyKey!: string;
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
import {PrepareWorkflowService} from './prepare-workflow.service';
|
||||
const sha='a'.repeat(40),runId='run';
|
||||
const task=()=>({id:'task',key:'editorial-v1:'+'a'.repeat(64),title:'Editorial research: Test',department:'CONTENT',operationMode:'PREPARE',budgetLimitCents:20,state:'RUNNING',version:6,metadata:{createdBy:'pmo',workflowScope:'STAGE_PREPARE',environment:'staging',commitSha:sha,scope:'EDITORIAL_KIND',acceptanceCriteria:['Research']},runs:[{id:runId,taskId:'task',status:'RUNNING',environment:'staging',commitSha:sha,artifacts:[]}],budgetLedger:[{id:'reserve',taskId:'task',actorId:'pmo',kind:'RESERVE',amountCents:20,idempotencyKey:'prepare-reserve:run'}]});
|
||||
// Use the real canonical proposal marker, not a permissive admission mock.
|
||||
import {EDITORIAL_PILOT_KIND} from '../orchestration-worker/editorial-bridge';
|
||||
describe('safe editorial recovery detail hint',()=>{
|
||||
let service:any,row:any,db:any,outbox:any;
|
||||
beforeEach(()=>{row=task();row.metadata.scope=EDITORIAL_PILOT_KIND+'\nTopic: Test\nResearch and evidence-backed brief only. No publication, release, production changes or execution authorization.';outbox={taskId:'task',status:'PENDING',runId,leaseOwner:'pmo',leaseToken:'NEVER_EXPOSE',leaseUntil:new Date(Date.now()-1000),reservationId:'reserve'};db={prepareWorkflowOutbox:{findUnique:jest.fn(async()=>outbox)}};service=Object.create(PrepareWorkflowService.prototype);service.db=db;service.config={reviewerIds:['owner']};});
|
||||
it('returns only matching run id to an independent reviewer',async()=>{expect(await service.editorialRecovery(row,{id:'owner',role:'SUPER_ADMIN'})).toEqual({runId});});
|
||||
it.each(['active','mismatch','artifact','reconciled','other-task','wrong-commit','wrong-mode'])('denies %s',async mode=>{
|
||||
if(mode==='active')outbox.leaseUntil=new Date(Date.now()+100000);
|
||||
if(mode==='mismatch')outbox.runId='other';
|
||||
if(mode==='artifact')row.runs[0].artifacts=[{id:'qa'}];
|
||||
if(mode==='reconciled')row.budgetLedger.push({kind:'RECONCILE',amountCents:0});
|
||||
if(mode==='other-task')row.runs[0].taskId='other';
|
||||
if(mode==='wrong-commit')row.runs[0].commitSha='b'.repeat(40);
|
||||
if(mode==='wrong-mode')row.operationMode='MUTATE_PRODUCTION';
|
||||
expect(await service.editorialRecovery(row,{id:'owner',role:'SUPER_ADMIN'})).toBeUndefined();
|
||||
});
|
||||
it('denies ordinary admin and creator',async()=>{expect(await service.editorialRecovery(row,{id:'admin',role:'Admin'})).toBeUndefined();expect(await service.editorialRecovery(row,{id:'pmo',role:'SUPER_ADMIN'})).toBeUndefined();});
|
||||
});
|
||||
@@ -0,0 +1,30 @@
|
||||
import { PrepareWorkflowService } from './prepare-workflow.service';
|
||||
import { randomUUID } from 'crypto';
|
||||
|
||||
describe('editorial failure recovery fencing',()=>{
|
||||
const actor={id:'owner',role:'SUPER_ADMIN'},worker={id:'pmo',role:'WORKFLOW_WORKER'};
|
||||
let db:any,core:PrepareWorkflowService,t:any,o:any,r:any,events:any[];
|
||||
beforeEach(()=>{
|
||||
t={id:randomUUID(),key:'editorial-v1:'+'a'.repeat(64),title:'Editorial research: fixture',department:'CONTENT',operationMode:'PREPARE',budgetLimitCents:20,state:'RUNNING',version:6,metadata:{createdBy:'pmo',workflowScope:'STAGE_PREPARE',environment:'staging',commitSha:'a'.repeat(40),scope:'editorial-research-to-brief-v1\nTopic: fixture\nResearch and evidence-backed brief only. No publication, release, production changes or execution authorization.',acceptanceCriteria:['evidence']}};
|
||||
r={id:randomUUID(),taskId:t.id,status:'RUNNING',commitSha:t.metadata.commitSha,environment:'staging'};
|
||||
o={id:randomUUID(),taskId:t.id,status:'PENDING',runId:r.id,leaseOwner:'pmo',leaseToken:randomUUID(),leaseUntil:new Date(Date.now()-1000),reservationId:'reserve'};events=[];
|
||||
const tx:any={$queryRaw:async()=>[],orchestrationTask:{findUnique:async()=>t,update:async({data}:any)=>(Object.assign(t,{state:data.state,version:t.version+1}),{...t})},prepareWorkflowOutbox:{findUnique:async()=>o,update:async({data}:any)=>Object.assign(o,data)},orchestrationRun:{findUnique:async()=>r,update:async({data}:any)=>Object.assign(r,data)},orchestrationEvent:{findUnique:async({where}:any)=>events.find(e=>e.idempotencyKey===where.idempotencyKey),findFirst:async()=>({}),create:async({data}:any)=>events.push(data)},orchestrationBudgetLedger:{findUnique:async()=>({id:'reserve',taskId:t.id,kind:'RESERVE',actorId:'pmo',amountCents:20,idempotencyKey:'prepare-reserve:'+r.id}),aggregate:async()=>({_sum:{amountCents:20}}),findFirst:async()=>null},orchestrationArtifact:{count:async()=>0}};
|
||||
let tail=Promise.resolve();db={$transaction:(fn:any)=>{const p=tail.then(()=>fn(tx));tail=p.catch(()=>{});return p;}};core=new PrepareWorkflowService(db,{workerIds:['pmo'],stageCiIds:[]});
|
||||
});
|
||||
const dto=()=>({runId:r.id,expectedVersion:6,idempotencyKey:'recover:'+r.id,reason:'local process ended; cost unknown'});
|
||||
it('terminalizes expired run without QA/cost writes and replays concurrently',async()=>{
|
||||
const d=dto();const results=await Promise.all([core.editorialFailure(t.id,d,actor),core.editorialFailure(t.id,d,actor)]);
|
||||
expect(results.map(x=>x.state)).toEqual(['FAILED','FAILED']);expect(t.version).toBe(7);expect(r.status).toBe('FAILED');expect(o.status).toBe('DONE');expect(o.leaseToken).toBeNull();expect(o.reservationId).toBe('reserve');expect(events).toHaveLength(1);expect(events[0].payload.retainedReservationCents).toBe(20);
|
||||
});
|
||||
it('rejects wrong run, stale version, unprivileged actor, active recovery and wrong held token',async()=>{
|
||||
for(const [d,a] of [[{...dto(),runId:randomUUID()},actor],[{...dto(),expectedVersion:5},actor],[dto(),{id:'other',role:'Admin'}],[dto(),worker]] as any)await expect(core.editorialFailure(t.id,d,a)).rejects.toThrow();
|
||||
o.leaseUntil=new Date(Date.now()+30000);
|
||||
await expect(core.editorialFailure(t.id,dto(),actor)).rejects.toThrow();
|
||||
await expect(core.editorialFailure(t.id,{...dto(),leaseToken:randomUUID()},worker)).rejects.toThrow();
|
||||
await core.editorialFailure(t.id,{...dto(),leaseToken:o.leaseToken},worker);expect(t.state).toBe('FAILED');
|
||||
});
|
||||
it('rejects cross-task run binding and changed idempotency payload',async()=>{
|
||||
r.taskId=randomUUID();await expect(core.editorialFailure(t.id,dto(),actor)).rejects.toThrow();r.taskId=t.id;
|
||||
const d=dto();await core.editorialFailure(t.id,d,actor);await expect(core.editorialFailure(t.id,{...d,reason:'changed'},actor)).rejects.toThrow();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,44 @@
|
||||
import { PrepareWorkflowService } from './prepare-workflow.service';
|
||||
|
||||
describe('queued Gate1 expiry renewal',()=>{
|
||||
const owner={id:'owner',role:'SUPER_ADMIN'};
|
||||
let t:any,tx:any,s:PrepareWorkflowService,approval:any;
|
||||
beforeEach(()=>{
|
||||
jest.useFakeTimers().setSystemTime(new Date('2026-10-24T09:15:00Z'));
|
||||
approval={id:'approval',gate:1,decision:'APPROVED',actorId:'owner',createdAt:new Date('2026-10-24T05:37:54.808Z'),expiresAt:new Date('2026-10-24T06:37:00Z')};
|
||||
t={id:'t',state:'READY',version:4,operationMode:'PREPARE',metadata:{workflowScope:'STAGE_PREPARE',createdBy:'pmo',commitSha:'a'.repeat(40)},decisions:[approval]};
|
||||
tx={$queryRaw:jest.fn().mockResolvedValue([]),orchestrationTask:{findUnique:jest.fn(async()=>t),update:jest.fn(async({data}:any)=>(t={...t,state:data.state,version:t.version+1}))},orchestrationEvent:{findUnique:jest.fn(),create:jest.fn()},orchestrationApprovalDecision:{findFirst:jest.fn(async()=>approval),create:jest.fn()},prepareWorkflowOutbox:{findUnique:jest.fn().mockResolvedValue({status:'PENDING',attempts:0,runId:null,notBefore:null}),create:jest.fn(),update:jest.fn()}};
|
||||
s=new PrepareWorkflowService({$transaction:async(fn:any)=>fn(tx)},{workerIds:['pmo'],stageCiIds:[]});
|
||||
});
|
||||
afterEach(()=>jest.useRealTimers());
|
||||
const dto={decision:'APPROVED',expectedVersion:4,idempotencyKey:'renew'};
|
||||
it('shows blocked renewal rather than actionable READY at actual failure time',()=>{
|
||||
expect(s.project(t,owner)).toMatchObject({displayState:'GATE1_RENEWAL_REQUIRED',availableActions:['APPROVE_GATE1']});
|
||||
});
|
||||
it('renews by ordinary independent approval without recreating outbox or changing immutable task binding',async()=>{
|
||||
await expect(s.decide('t',1,dto,owner)).resolves.toMatchObject({state:'READY',version:5});
|
||||
expect(tx.prepareWorkflowOutbox.create).not.toHaveBeenCalled();
|
||||
expect(tx.orchestrationApprovalDecision.create).toHaveBeenCalledWith({data:expect.objectContaining({actorId:'owner',expiresAt:new Date('2026-10-25T09:15:00Z')})});
|
||||
expect(tx.orchestrationEvent.create).toHaveBeenCalledWith({data:expect.objectContaining({eventType:'PREPARE_GATE1_RENEWED',fromState:'READY',toState:'READY'})});
|
||||
});
|
||||
it('does not renew valid approvals, self review, active runs, or schedule changes',async()=>{
|
||||
await expect(s.decide('t',1,dto,{id:'pmo',role:'SUPER_ADMIN'})).rejects.toMatchObject({status:403});
|
||||
await expect(s.decide('t',1,{...dto,notBefore:'2026-10-25T10:00:00Z'},owner)).rejects.toMatchObject({status:400});
|
||||
tx.prepareWorkflowOutbox.findUnique.mockResolvedValue({status:'PENDING',attempts:1,runId:'r'});
|
||||
await expect(s.decide('t',1,dto,owner)).rejects.toMatchObject({status:409});
|
||||
tx.prepareWorkflowOutbox.findUnique.mockResolvedValue({status:'PENDING',attempts:0,runId:null});
|
||||
approval.expiresAt=new Date('2026-10-25T09:15:00Z');
|
||||
await expect(s.decide('t',1,dto,owner)).rejects.toMatchObject({status:409});
|
||||
});
|
||||
it('replays identical command after expiry but denies changed payload and stale concurrent command',async()=>{
|
||||
await s.decide('t',1,dto,owner);
|
||||
const e=tx.orchestrationEvent.create.mock.calls[0][0].data;
|
||||
tx.orchestrationEvent.findUnique.mockResolvedValue(e);
|
||||
jest.setSystemTime(new Date('2026-10-26T09:15:00Z'));
|
||||
await s.decide('t',1,dto,owner);
|
||||
expect(tx.orchestrationTask.update).toHaveBeenCalledTimes(1);
|
||||
await expect(s.decide('t',1,{...dto,notes:'changed'},owner)).rejects.toMatchObject({status:409});
|
||||
tx.orchestrationEvent.findUnique.mockResolvedValue(null);
|
||||
await expect(s.decide('t',1,{...dto,idempotencyKey:'competing'},owner)).rejects.toMatchObject({status:409});
|
||||
});
|
||||
});
|
||||
@@ -1,3 +1,4 @@
|
||||
import { EditorialExecutionService, CompletedRecoveryDto } from '../orchestration-worker/editorial-execution';
|
||||
import {
|
||||
Controller,
|
||||
Body,
|
||||
@@ -25,6 +26,7 @@ import {
|
||||
CreateOrchestrationTaskDto,
|
||||
TransitionTaskDto,
|
||||
GateDecisionDto,
|
||||
EditorialFailureDto,
|
||||
} from './dto/orchestration.dto';
|
||||
const workflowValidation = new ValidationPipe({
|
||||
transform: true,
|
||||
@@ -94,16 +96,24 @@ export class OrchestrationController {
|
||||
constructor(
|
||||
private readonly service: OrchestrationService,
|
||||
@Optional() private readonly workflow?: PrepareWorkflowService,
|
||||
@Optional() private readonly editorialExecution?: EditorialExecutionService,
|
||||
) {}
|
||||
private actor(req: any): WorkflowIdentity {
|
||||
const id = req?.user?.id ?? req?.user?.sub;
|
||||
// Match RolesGuard aliases without promoting an admin to a reviewer.
|
||||
const normalized = typeof req?.user?.role === 'string'
|
||||
? req.user.role.toLowerCase().replace(/[_-]/g, '')
|
||||
: '';
|
||||
const role = normalized === 'admin' ? 'Admin'
|
||||
: ['superadmin', 'adminsuper'].includes(normalized) ? 'SUPER_ADMIN'
|
||||
: undefined;
|
||||
if (
|
||||
typeof id !== 'string' ||
|
||||
!id ||
|
||||
!['Admin', 'SUPER_ADMIN'].includes(req?.user?.role)
|
||||
!role
|
||||
)
|
||||
throw new ForbiddenException('Authenticated workflow identity required');
|
||||
return { id, role: req.user.role };
|
||||
return { id, role };
|
||||
}
|
||||
private safe(row: any, req: any) {
|
||||
const view = project(row);
|
||||
@@ -112,6 +122,7 @@ export class OrchestrationController {
|
||||
return {
|
||||
...view,
|
||||
metadata: w.metadata,
|
||||
displayState: w.displayState,
|
||||
availableActions: w.availableActions,
|
||||
};
|
||||
}
|
||||
@@ -121,7 +132,10 @@ export class OrchestrationController {
|
||||
);
|
||||
}
|
||||
@Get('tasks/:id') async one(@Param('id') id: string, @Req() req: any) {
|
||||
return this.safe(await this.service.findOne(id), req);
|
||||
const row = await this.service.findOne(id);
|
||||
const editorialRecovery = this.workflow
|
||||
? await this.workflow.editorialRecovery(row, this.actor(req)) : undefined;
|
||||
return { ...this.safe(row, req), ...(editorialRecovery ? { editorialRecovery } : {}) };
|
||||
}
|
||||
@Get('overview') async overview() {
|
||||
const tasks = await this.service.findAll();
|
||||
@@ -207,6 +221,22 @@ export class OrchestrationController {
|
||||
req,
|
||||
);
|
||||
}
|
||||
@Post('tasks/:id/editorial-completed-recovery') async completedRecovery(
|
||||
@Param('id') id: string,
|
||||
@Body(workflowValidation) dto: CompletedRecoveryDto,
|
||||
@Req() req: any,
|
||||
) {
|
||||
if (!this.workflow || !this.editorialExecution) return this.deny();
|
||||
return this.editorialExecution.recoverCompleted(this.actor(req), id, dto);
|
||||
}
|
||||
@Post('tasks/:id/editorial-failure') async editorialFailure(
|
||||
@Param('id') id: string,
|
||||
@Body(workflowValidation) dto: EditorialFailureDto,
|
||||
@Req() req: any,
|
||||
) {
|
||||
if (!this.workflow) return this.deny();
|
||||
return this.safe(await this.workflow.editorialFailure(id, dto, this.actor(req)), req);
|
||||
}
|
||||
@Post('tasks/:id/budget') budget() {
|
||||
return this.deny();
|
||||
}
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
import { EditorialExecutionService } from '../orchestration-worker/editorial-execution';
|
||||
import {
|
||||
PrepareWorkflowService,
|
||||
PREPARE_WORKFLOW_CONFIG,
|
||||
} from './prepare-workflow.service';
|
||||
import { workflowConfig } from './workflow-config';
|
||||
import { Module } from '@nestjs/common';
|
||||
import { PrismaModule } from '../prisma/prisma.module';
|
||||
import { KillSwitchService } from './kill-switch.service';
|
||||
@@ -12,13 +14,14 @@ import { OrchestrationService } from './orchestration.service';
|
||||
imports: [PrismaModule],
|
||||
controllers: [OrchestrationController],
|
||||
providers: [
|
||||
EditorialExecutionService,
|
||||
OrchestrationService,
|
||||
KillSwitchService,
|
||||
ModelTierPolicyService,
|
||||
PrepareWorkflowService,
|
||||
{
|
||||
provide: PREPARE_WORKFLOW_CONFIG,
|
||||
useValue: { workerIds: [], stageCiIds: [] },
|
||||
useFactory: () => workflowConfig(process.env),
|
||||
},
|
||||
],
|
||||
exports: [
|
||||
|
||||
@@ -200,6 +200,7 @@ export class OrchestrationService {
|
||||
return prior;
|
||||
}
|
||||
if (
|
||||
typeof dto.expiresAt !== 'string' ||
|
||||
!Number.isFinite(Date.parse(dto.expiresAt)) ||
|
||||
new Date(dto.expiresAt) <= new Date()
|
||||
)
|
||||
@@ -618,6 +619,7 @@ export class OrchestrationService {
|
||||
await this.killSwitch.assertAllowed('OBSERVE');
|
||||
return (this.prisma as any).orchestrationTask.findMany({
|
||||
orderBy: { createdAt: 'desc' },
|
||||
include: { decisions: true },
|
||||
});
|
||||
}
|
||||
async findOne(id: string) {
|
||||
|
||||
@@ -5,8 +5,27 @@ describe('owner Gate1 hold operation', () => {
|
||||
let task:any, tx:any, service:PrepareWorkflowService;
|
||||
beforeEach(()=>{
|
||||
task={id:'t',state:'GATE1_PENDING',version:2,operationMode:'PREPARE',metadata:{workflowScope:'STAGE_PREPARE',createdBy:'proposer'}};
|
||||
tx={$queryRaw:jest.fn().mockResolvedValue([]),orchestrationTask:{findUnique:jest.fn(async()=>task),update:jest.fn(async({data}:any)=>(task={...task,state:data.state,version:task.version+1}))},orchestrationEvent:{findUnique:jest.fn(),create:jest.fn()},orchestrationApprovalDecision:{create:jest.fn()}};
|
||||
service=new PrepareWorkflowService({$transaction:async(cb:any)=>cb(tx)}, {workerIds:[],stageCiIds:[]});
|
||||
tx={prepareWorkflowOutbox:{create:jest.fn()},$queryRaw:jest.fn().mockResolvedValue([]),orchestrationTask:{findUnique:jest.fn(async()=>task),update:jest.fn(async({data}:any)=>(task={...task,state:data.state,version:task.version+1}))},orchestrationEvent:{findUnique:jest.fn(),create:jest.fn()},orchestrationApprovalDecision:{create:jest.fn()}};
|
||||
service=new PrepareWorkflowService({$transaction:async(cb:any)=>cb(tx)}, {workerIds:[],stageCiIds:[],ownerReviewerIds:['12345678-1234-1234-1234-123456789012']} as any);
|
||||
});
|
||||
it('advertises and permits the pinned canonical Admin independent reviewer only',async()=>{
|
||||
const owner={id:'12345678-1234-1234-1234-123456789012',role:'Admin'};
|
||||
expect(service.project(task,owner).availableActions).toEqual(['APPROVE_GATE1','REJECT_GATE1','HOLD_GATE1']);
|
||||
await expect(service.transition('t',hold,owner)).resolves.toMatchObject({state:'GATE1_HELD'});
|
||||
await expect(service.decide('t',1,{decision:'APPROVED',expectedVersion:3,idempotencyKey:'owner-approve',expiresAt:new Date(Date.now()+60000).toISOString()},owner)).resolves.toMatchObject({state:'READY'});
|
||||
expect(tx.orchestrationApprovalDecision.create).toHaveBeenCalledWith({data:expect.objectContaining({actorId:owner.id})});
|
||||
});
|
||||
it.each(['Admin','SUPER_ADMIN'])('never permits proposer self-review even if allowlisted: %s',async role=>{
|
||||
const actor={id:'12345678-1234-1234-1234-123456789012',role}; task.metadata.createdBy=actor.id;
|
||||
expect(service.project(task,actor).availableActions).toEqual([]);
|
||||
await expect(service.transition('t',hold,actor)).rejects.toMatchObject({status:403});
|
||||
await expect(service.decide('t',1,{decision:'REJECTED',expectedVersion:2,idempotencyKey:'self',expiresAt:new Date(Date.now()+60000).toISOString()},actor)).rejects.toMatchObject({status:403});
|
||||
expect(tx.orchestrationTask.update).not.toHaveBeenCalled();
|
||||
});
|
||||
it.each([{id:'other',role:'Admin'},{id:'12345678-1234-1234-1234-123456789012',role:'User'},{id:'12345678-1234-1234-1234-123456789012',role:'ADMIN'}])('denies noncanonical or ungranted reviewer %j',async actor=>{
|
||||
expect(service.project(task,actor).availableActions).toEqual([]);
|
||||
await expect(service.decide('t',1,{decision:'REJECTED',expectedVersion:2,idempotencyKey:'deny',expiresAt:new Date(Date.now()+60000).toISOString()},actor)).rejects.toMatchObject({status:403});
|
||||
expect(tx.orchestrationTask.update).not.toHaveBeenCalled();
|
||||
});
|
||||
const hold={toState:'GATE1_HELD',expectedVersion:2,idempotencyKey:'hold-t',reason:'Need revised budget'};
|
||||
it('advertises hold only to independent owner reviewer',()=>{
|
||||
@@ -43,6 +62,6 @@ describe('owner Gate1 hold operation', () => {
|
||||
});
|
||||
it.each(['APPROVED','REJECTED'])('decides held proposal via existing Gate1 command: %s',async decision=>{
|
||||
task.state='GATE1_HELD';
|
||||
await expect(service.decide('t',1,{decision,expectedVersion:2,idempotencyKey:'decision',expiresAt:new Date(Date.now()+60000).toISOString()},reviewer)).resolves.toMatchObject({state:decision==='APPROVED'?'GATE1_APPROVED':'REJECTED'});
|
||||
await expect(service.decide('t',1,{decision,expectedVersion:2,idempotencyKey:'decision',expiresAt:new Date(Date.now()+60000).toISOString()},reviewer)).resolves.toMatchObject({state:decision==='APPROVED'?'READY':'REJECTED'});
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,48 @@
|
||||
import {Test} from '@nestjs/testing';
|
||||
import {INestApplication} from '@nestjs/common';
|
||||
import request from 'supertest';
|
||||
import {OrchestrationController} from './orchestration.controller';
|
||||
import {OrchestrationService} from './orchestration.service';
|
||||
import {PrepareWorkflowService} from './prepare-workflow.service';
|
||||
import {JwtAuthGuard} from '../auth/jwt-auth.guard';
|
||||
import {RolesGuard} from '../common/guards/roles.guard';
|
||||
describe('configured owner real workflow HTTP authorization',()=>{
|
||||
const owner='12345678-1234-1234-1234-123456789012';
|
||||
let app:INestApplication,task:any,tx:any;
|
||||
beforeAll(async()=>{
|
||||
tx={prepareWorkflowOutbox:{create:jest.fn()},$queryRaw:jest.fn(async()=>[]),orchestrationTask:{findUnique:async()=>task,update:jest.fn(async({data}:any)=>(task={...task,state:data.state,version:task.version+1}))},orchestrationEvent:{findUnique:jest.fn(),create:jest.fn()},orchestrationApprovalDecision:{create:jest.fn()}};
|
||||
const workflow=new PrepareWorkflowService({$transaction:async(cb:any)=>cb(tx)},{workerIds:[],stageCiIds:[],ownerReviewerIds:[owner]});
|
||||
const m=await Test.createTestingModule({controllers:[OrchestrationController],providers:[{provide:OrchestrationService,useValue:{findAll:async()=>[task],findOne:async()=>task}},{provide:PrepareWorkflowService,useValue:workflow},RolesGuard]})
|
||||
.overrideGuard(JwtAuthGuard).useValue({canActivate(c:any){const r=c.switchToHttp().getRequest();if(!r.headers.authorization)return false;r.user={sub:r.headers.authorization,role:'ADMIN'};return true;}}).compile();
|
||||
app=m.createNestApplication();await app.init();
|
||||
});
|
||||
beforeEach(()=>{jest.clearAllMocks();task={id:'t',state:'GATE1_PENDING',version:2,operationMode:'PREPARE',metadata:{workflowScope:'STAGE_PREPARE',createdBy:'pmo'}};});
|
||||
afterAll(async()=>{await app.close();});
|
||||
it.each(['APPROVED','REJECTED'])('advertises and executes %s only for verified granted JWT subject',async decision=>{
|
||||
const r=await request(app.getHttpServer()).get('/admin/orchestration/tasks').set('Authorization',owner).expect(200);
|
||||
expect(r.body[0].availableActions).toEqual(['APPROVE_GATE1','REJECT_GATE1','HOLD_GATE1']);
|
||||
await request(app.getHttpServer()).post('/admin/orchestration/tasks/t/gates/1/decide').set('Authorization',owner).send({decision,expectedVersion:2,idempotencyKey:'decision',expiresAt:new Date(Date.now()+60000).toISOString(),notes:'Delegated system testing by independent owner'}).expect(201);
|
||||
expect(tx.orchestrationApprovalDecision.create).toHaveBeenCalledWith({data:expect.objectContaining({actorId:owner,decision})});
|
||||
expect(tx.orchestrationEvent.create).toHaveBeenCalledWith({data:expect.objectContaining({actorId:owner,payload:expect.objectContaining({fingerprint:expect.stringContaining('Delegated system testing')})})});
|
||||
});
|
||||
it('holds via canonicalized ADMIN without granting proposer powers',async()=>{
|
||||
await request(app.getHttpServer()).put('/admin/orchestration/tasks/t/transition').set('Authorization',owner).send({toState:'GATE1_HELD',expectedVersion:2,idempotencyKey:'hold',reason:'Independent owner needs evidence'}).expect(200);
|
||||
expect(tx.orchestrationApprovalDecision.create).not.toHaveBeenCalled();
|
||||
});
|
||||
it.each(['ordinary-admin','pmo'])('denies ungranted subject %s and body impersonation',async subject=>{
|
||||
const r=await request(app.getHttpServer()).get('/admin/orchestration/tasks').set('Authorization',subject).expect(200);
|
||||
expect(r.body[0].availableActions).toEqual([]);
|
||||
const body={decision:'APPROVED',expectedVersion:2,idempotencyKey:'deny',expiresAt:new Date(Date.now()+60000).toISOString()};
|
||||
await request(app.getHttpServer()).post('/admin/orchestration/tasks/t/gates/1/decide').set('Authorization',subject).send(body).expect(403);
|
||||
await request(app.getHttpServer()).post('/admin/orchestration/tasks/t/gates/1/decide').set('Authorization',subject).send({...body,actorId:owner}).expect(400);
|
||||
await request(app.getHttpServer()).put('/admin/orchestration/tasks/t/transition').set('Authorization',subject).send({toState:'GATE1_HELD',expectedVersion:2,idempotencyKey:'hold',reason:'hold'}).expect(403);
|
||||
expect(tx.orchestrationTask.update).not.toHaveBeenCalled();
|
||||
});
|
||||
it('denies grant holder self review, Gate2 and release',async()=>{
|
||||
task.metadata.createdBy=owner;
|
||||
await request(app.getHttpServer()).post('/admin/orchestration/tasks/t/gates/1/decide').set('Authorization',owner).send({decision:'APPROVED',expectedVersion:2,idempotencyKey:'self',expiresAt:new Date(Date.now()+60000).toISOString()}).expect(403);
|
||||
await request(app.getHttpServer()).post('/admin/orchestration/tasks/t/gates/2/decide').set('Authorization',owner).send({}).expect(403);
|
||||
await request(app.getHttpServer()).post('/admin/orchestration/tasks/t/commands/RELEASE_AUTHORIZE').set('Authorization',owner).send({}).expect(403);
|
||||
expect(tx.orchestrationTask.update).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -22,6 +22,7 @@ describe('bounded workflow HTTP contracts', () => {
|
||||
},
|
||||
};
|
||||
const workflow = {
|
||||
editorialRecovery: jest.fn(async () => undefined as undefined | {runId:string}),
|
||||
create: jest.fn(async () => t),
|
||||
transition: jest.fn(async () => t),
|
||||
decide: jest.fn(async () => t),
|
||||
@@ -68,6 +69,47 @@ describe('bounded workflow HTTP contracts', () => {
|
||||
afterAll(async () => {
|
||||
await app.close();
|
||||
});
|
||||
it.each([
|
||||
['ADMIN', 'Admin'],
|
||||
['admin', 'Admin'],
|
||||
['Admin', 'Admin'],
|
||||
['SUPER_ADMIN', 'SUPER_ADMIN'],
|
||||
['super-admin', 'SUPER_ADMIN'],
|
||||
['SuperAdmin', 'SUPER_ADMIN'],
|
||||
['ADMIN_SUPER', 'SUPER_ADMIN'],
|
||||
])('canonicalizes guard-supported %s on task reads to %s', async (role, canonical) => {
|
||||
for (const path of ['tasks', 'tasks/t']) {
|
||||
workflow.project.mockClear();
|
||||
const response = await request(app.getHttpServer())
|
||||
.get('/admin/orchestration/' + path)
|
||||
.set('Authorization', role)
|
||||
.expect(200);
|
||||
expect(workflow.project).toHaveBeenCalledWith(t, {
|
||||
id: 'verified-subject', role: canonical,
|
||||
});
|
||||
const task = Array.isArray(response.body) ? response.body[0] : response.body;
|
||||
expect(task.availableActions).toEqual(['SUBMIT_GATE1']);
|
||||
}
|
||||
});
|
||||
it('adds only the safe recovery hint to detail, never the list', async () => {
|
||||
workflow.editorialRecovery.mockResolvedValueOnce({runId:'registered-run'});
|
||||
const detail=await request(app.getHttpServer()).get('/admin/orchestration/tasks/t').set('Authorization','SUPER_ADMIN').expect(200);
|
||||
expect(detail.body.editorialRecovery).toEqual({runId:'registered-run'});
|
||||
expect(workflow.editorialRecovery).toHaveBeenCalledWith(t,{id:'verified-subject',role:'SUPER_ADMIN'});
|
||||
const list=await request(app.getHttpServer()).get('/admin/orchestration/tasks').set('Authorization','SUPER_ADMIN').expect(200);
|
||||
expect(list.body[0].editorialRecovery).toBeUndefined();
|
||||
expect(JSON.stringify(detail.body)).not.toContain('secret');
|
||||
});
|
||||
it('denies ordinary users before workflow projection', async () => {
|
||||
workflow.project.mockClear();
|
||||
for (const path of ['tasks', 'tasks/t', 'overview']) {
|
||||
await request(app.getHttpServer())
|
||||
.get('/admin/orchestration/' + path)
|
||||
.set('Authorization', 'User_PetOwner')
|
||||
.expect(403);
|
||||
}
|
||||
expect(workflow.project).not.toHaveBeenCalled();
|
||||
});
|
||||
it('accepts existing proposal DTO, derives actor from JWT sub and returns projected task', async () => {
|
||||
const dto = {
|
||||
key: 'k',
|
||||
|
||||
@@ -14,6 +14,7 @@ export interface WorkflowIdentity {
|
||||
role: string;
|
||||
}
|
||||
export interface WorkflowConfig {
|
||||
ownerReviewerIds?: string[];
|
||||
workerIds: string[];
|
||||
stageCiIds: string[];
|
||||
}
|
||||
@@ -34,6 +35,11 @@ export class PrepareWorkflowService {
|
||||
)
|
||||
throw new ForbiddenException('Authenticated workflow identity required');
|
||||
}
|
||||
private reviewer(a: WorkflowIdentity) {
|
||||
return typeof a?.id === 'string' && !!a.id && a.id.length <= 100 &&
|
||||
(a.role === 'SUPER_ADMIN' ||
|
||||
(a.role === 'Admin' && (this.config.ownerReviewerIds ?? []).includes(a.id)));
|
||||
}
|
||||
private worker(a: WorkflowIdentity) {
|
||||
this.identity(a, ['WORKFLOW_WORKER']);
|
||||
if (!this.config.workerIds.includes(a.id))
|
||||
@@ -199,7 +205,7 @@ export class PrepareWorkflowService {
|
||||
if (await this.replay(tx, dto.idempotencyKey, fingerprint)) return t;
|
||||
this.version(t, dto);
|
||||
if (dto.toState === 'GATE1_HELD') {
|
||||
if (a.role !== 'SUPER_ADMIN' || t.metadata.createdBy === a.id || t.state !== 'GATE1_PENDING')
|
||||
if (!this.reviewer(a) || t.metadata.createdBy === a.id || t.state !== 'GATE1_PENDING')
|
||||
throw new ForbiddenException('Independent Gate1 reviewer and pending proposal required');
|
||||
if (typeof dto.reason !== 'string' || !dto.reason.trim() || dto.reason.length > 2000)
|
||||
throw new BadRequestException('Hold requires reason of 1..2000 characters');
|
||||
@@ -237,20 +243,16 @@ export class PrepareWorkflowService {
|
||||
});
|
||||
}
|
||||
async decide(id: string, gate: number, dto: any, a: WorkflowIdentity) {
|
||||
this.identity(a, ['SUPER_ADMIN']);
|
||||
if (!this.reviewer(a))
|
||||
throw new ForbiddenException('Provisioned independent Gate1 reviewer required');
|
||||
if (gate !== 1)
|
||||
throw new ForbiddenException(
|
||||
'Gate2 decisions and release remain disabled',
|
||||
);
|
||||
if (
|
||||
!['APPROVED', 'REJECTED'].includes(dto.decision) ||
|
||||
!Number.isFinite(Date.parse(dto.expiresAt)) ||
|
||||
Date.parse(dto.expiresAt) <= Date.now() ||
|
||||
Date.parse(dto.expiresAt) > Date.now() + 86400000
|
||||
)
|
||||
throw new BadRequestException(
|
||||
'Decision requires future expiry within 24 hours',
|
||||
);
|
||||
if (!['APPROVED', 'REJECTED'].includes(dto.decision))
|
||||
throw new BadRequestException('Invalid decision');
|
||||
// Time-sensitive validation happens after replay, so a successful command
|
||||
// remains replayable after its original schedule or validity window passes.
|
||||
return this.db.$transaction(async (tx: any) => {
|
||||
await this.allowed(tx);
|
||||
const t = await this.task(tx, id);
|
||||
@@ -259,37 +261,87 @@ export class PrepareWorkflowService {
|
||||
this.version(t, dto);
|
||||
if (t.metadata.createdBy === a.id)
|
||||
throw new ForbiddenException('Independent reviewer required');
|
||||
if (!['GATE1_PENDING', 'GATE1_HELD'].includes(t.state))
|
||||
const renewing = t.state === 'READY';
|
||||
let queue: any;
|
||||
if (renewing) {
|
||||
const previous = await tx.orchestrationApprovalDecision.findFirst({
|
||||
where: { taskId: id, gate: 1 }, orderBy: { createdAt: 'desc' },
|
||||
});
|
||||
queue = await tx.prepareWorkflowOutbox.findUnique({ where: { taskId: id } });
|
||||
if (dto.notBefore !== undefined)
|
||||
throw new BadRequestException('Renewal preserves the existing schedule');
|
||||
if (dto.decision !== 'APPROVED' || !previous || previous.decision !== 'APPROVED' ||
|
||||
previous.actorId === t.metadata.createdBy || previous.expiresAt > new Date() ||
|
||||
!queue || queue.status !== 'PENDING' || queue.attempts !== 0 || queue.runId || queue.leaseToken)
|
||||
throw new ConflictException('Only expired independent approval on an unstarted queue can be renewed');
|
||||
} else if (!['GATE1_PENDING', 'GATE1_HELD'].includes(t.state))
|
||||
throw new ConflictException('Gate1 pending required');
|
||||
const now = Date.now();
|
||||
if (renewing && queue.notBefore && new Date(queue.notBefore).getTime() >= now + 86400000)
|
||||
throw new ConflictException('Existing schedule is outside the renewal validity window');
|
||||
const scheduled = dto.notBefore !== undefined;
|
||||
const notBefore = scheduled ? new Date(dto.notBefore) : null;
|
||||
if (scheduled && (dto.decision !== 'APPROVED' || typeof dto.notBefore !== 'string' || !Number.isFinite(notBefore!.getTime()) || notBefore!.getTime() <= now || notBefore!.getTime() > now + 30 * 86400000))
|
||||
throw new BadRequestException('notBefore must be a future approval schedule within 30 days');
|
||||
const policyExpiry = (notBefore?.getTime() ?? now) + 86400000;
|
||||
// Legacy expiresAt is an explicit validity cap, never a scheduled start.
|
||||
const expiresAt = dto.expiresAt === undefined ? new Date(policyExpiry) : new Date(dto.expiresAt);
|
||||
if (!Number.isFinite(expiresAt.getTime()) || expiresAt.getTime() <= (notBefore?.getTime() ?? now) || expiresAt.getTime() > policyExpiry)
|
||||
throw new BadRequestException('Approval expiry must cover schedule and remain within backend validity policy');
|
||||
if (dto.notes !== undefined && (typeof dto.notes !== 'string' || dto.notes.length > 2000))
|
||||
throw new BadRequestException('Audit notes must be at most 2000 characters');
|
||||
if (dto.decision === 'APPROVED') {
|
||||
await this.allowed(tx, true);
|
||||
if (!renewing) await tx.prepareWorkflowOutbox.create({data:{taskId:id,notBefore}});
|
||||
}
|
||||
await tx.orchestrationApprovalDecision.create({
|
||||
data: {
|
||||
taskId: id,
|
||||
gate: 1,
|
||||
decision: dto.decision,
|
||||
actorId: a.id,
|
||||
expiresAt: new Date(dto.expiresAt),
|
||||
expiresAt,
|
||||
notes: dto.notes?.trim() || `Owner ${dto.decision.toLowerCase()} Gate1`,
|
||||
idempotencyKey: `decision:${dto.idempotencyKey}`,
|
||||
},
|
||||
});
|
||||
return this.event(
|
||||
tx,
|
||||
t,
|
||||
dto.decision === 'APPROVED' ? 'GATE1_APPROVED' : 'REJECTED',
|
||||
dto.decision === 'APPROVED' ? 'READY' : 'REJECTED',
|
||||
a,
|
||||
dto.idempotencyKey,
|
||||
'PREPARE_GATE1',
|
||||
renewing ? 'PREPARE_GATE1_RENEWED' : 'PREPARE_GATE1',
|
||||
fingerprint,
|
||||
);
|
||||
});
|
||||
}
|
||||
/** Recovery of a stored approval by its provisioned proposal worker, not a new decision. */
|
||||
async enqueueApproved(a: WorkflowIdentity, dto: {taskId:string;expectedVersion:number;idempotencyKey:string}) {
|
||||
this.worker(a);
|
||||
return this.db.$transaction(async (tx:any)=>{
|
||||
await this.allowed(tx,true);
|
||||
const t=await this.task(tx,dto.taskId);
|
||||
if(t.metadata.createdBy!==a.id) throw new ForbiddenException('Proposal worker required');
|
||||
const fingerprint=JSON.stringify({dto,a});
|
||||
if(await this.replay(tx,dto.idempotencyKey,fingerprint)) return t;
|
||||
this.version(t,dto);
|
||||
if(t.state!=='GATE1_APPROVED') throw new ConflictException('Stored Gate1 approval required');
|
||||
const approval=await tx.orchestrationApprovalDecision.findFirst({where:{taskId:t.id,gate:1},orderBy:{createdAt:'desc'}});
|
||||
if(!approval || approval.decision!=='APPROVED' || approval.actorId===a.id || approval.expiresAt<=new Date())
|
||||
throw new ForbiddenException('Valid independent Gate1 required');
|
||||
await tx.prepareWorkflowOutbox.create({data:{taskId:t.id}});
|
||||
return this.event(tx,t,'READY',a,dto.idempotencyKey,'PREPARE_APPROVED_QUEUED',fingerprint);
|
||||
});
|
||||
}
|
||||
async claim(a: WorkflowIdentity, id?: string): Promise<any> {
|
||||
this.worker(a);
|
||||
return this.db.$transaction(async (tx: any) => {
|
||||
await this.allowed(tx, true);
|
||||
// Lock order is task then outbox for every worker operation. SKIP LOCKED permits competing workers.
|
||||
const rows: any[] = id
|
||||
? await tx.$queryRaw`SELECT t.id FROM orchestration_tasks t JOIN prepare_workflow_outbox o ON o.task_id=t.id WHERE t.id=${id}::uuid AND o.status='PENDING' AND (o.lease_until IS NULL OR o.lease_until < now()) ORDER BY o.created_at FOR UPDATE OF t SKIP LOCKED LIMIT 1`
|
||||
: await tx.$queryRaw`SELECT t.id FROM orchestration_tasks t JOIN prepare_workflow_outbox o ON o.task_id=t.id WHERE o.status='PENDING' AND (o.lease_until IS NULL OR o.lease_until < now()) ORDER BY o.created_at FOR UPDATE OF t SKIP LOCKED LIMIT 1`;
|
||||
? await tx.$queryRaw`SELECT t.id FROM orchestration_tasks t JOIN prepare_workflow_outbox o ON o.task_id=t.id WHERE t.id=${id}::uuid AND t.state IN ('READY','RUNNING') AND o.status='PENDING' AND (o.not_before IS NULL OR o.not_before <= now()) AND (o.lease_until IS NULL OR o.lease_until < now()) ORDER BY o.created_at FOR UPDATE OF t SKIP LOCKED LIMIT 1`
|
||||
: await tx.$queryRaw`SELECT t.id FROM orchestration_tasks t JOIN prepare_workflow_outbox o ON o.task_id=t.id WHERE t.state IN ('READY','RUNNING') AND o.status='PENDING' AND (o.not_before IS NULL OR o.not_before <= now()) AND (o.lease_until IS NULL OR o.lease_until < now()) ORDER BY o.created_at FOR UPDATE OF t SKIP LOCKED LIMIT 1`;
|
||||
if (!rows.length) return null;
|
||||
const t = await this.task(tx, rows[0].id);
|
||||
const o = await tx.prepareWorkflowOutbox.findUnique({
|
||||
@@ -465,6 +517,66 @@ export class PrepareWorkflowService {
|
||||
);
|
||||
});
|
||||
}
|
||||
/** Detail-only eligibility hint. No lease credentials leave this service. Command rechecks atomically. */
|
||||
async editorialRecovery(t: any, a: WorkflowIdentity) {
|
||||
const { admittedEditorialTask } = require('../orchestration-worker/editorial-execution');
|
||||
if (!this.reviewer(a) || t.metadata?.createdBy === a.id || t.state !== 'RUNNING' || !admittedEditorialTask(t)) return undefined;
|
||||
const o = await (this.db as any).prepareWorkflowOutbox.findUnique({ where: { taskId: t.id } });
|
||||
if (!o || o.status !== 'PENDING' || o.leaseOwner !== 'pmo' || !o.leaseUntil || !Number.isFinite(new Date(o.leaseUntil).getTime()) || new Date(o.leaseUntil).getTime() > Date.now()) return undefined;
|
||||
const r = t.runs?.find((r: any) => r.id === o.runId);
|
||||
const ledger = t.budgetLedger ?? [];
|
||||
const reserve = ledger.find((b: any) => b.id === o.reservationId);
|
||||
if (!r || r.taskId !== t.id || r.status !== 'RUNNING' || r.environment !== 'staging' || r.commitSha !== t.metadata.commitSha || !Array.isArray(r.artifacts) || r.artifacts.length ||
|
||||
!reserve || reserve.actorId !== 'pmo' || reserve.kind !== 'RESERVE' || reserve.amountCents !== 20 || reserve.idempotencyKey !== `prepare-reserve:${r.id}` ||
|
||||
ledger.some((b: any) => b.kind === 'RECONCILE') || ledger.reduce((n: number, b: any) => n + b.amountCents, 0) !== 20) return undefined;
|
||||
return { runId: r.id };
|
||||
}
|
||||
/** Stop only; never turns unknown spend into free retry capacity. */
|
||||
async editorialFailure(id: string, dto: any, a: WorkflowIdentity) {
|
||||
const held = dto.leaseToken !== undefined;
|
||||
if (held) {
|
||||
this.worker(a);
|
||||
if (a.id !== 'pmo') throw new ForbiddenException('Canonical PMO required');
|
||||
} else if (!this.reviewer(a)) throw new ForbiddenException('Independent recovery reviewer required');
|
||||
if (typeof dto.reason !== 'string' || !dto.reason.trim() || dto.reason.length > 500)
|
||||
throw new BadRequestException('Bounded failure reason required');
|
||||
return this.db.$transaction(async (tx: any) => {
|
||||
await this.allowed(tx);
|
||||
const t = await this.task(tx, id);
|
||||
const { admittedEditorialTask } = require('../orchestration-worker/editorial-execution');
|
||||
if (!admittedEditorialTask(t)) throw new ForbiddenException('Exact editorial proposal required');
|
||||
const proposed = await tx.orchestrationEvent.findFirst({ where: { taskId: id, sequence: 1, eventType: 'PREPARE_PROPOSED', actorId: 'pmo', toState: 'DRAFT' } });
|
||||
const submitted = await tx.orchestrationEvent.findFirst({ where: { taskId: id, sequence: 2, eventType: 'PREPARE_TRANSITION', actorId: 'pmo', fromState: 'DRAFT', toState: 'GATE1_PENDING', idempotencyKey: t.key + ':submit' } });
|
||||
if (!proposed || !submitted) throw new ForbiddenException('Editorial provenance required');
|
||||
if (!held && t.metadata.createdBy === a.id) throw new ForbiddenException('Independent recovery reviewer required');
|
||||
const fingerprint = JSON.stringify({ id, dto, a });
|
||||
if (await this.replay(tx, dto.idempotencyKey, fingerprint)) return t;
|
||||
this.version(t, dto);
|
||||
const o = await tx.prepareWorkflowOutbox.findUnique({ where: { taskId: id } });
|
||||
const r = await tx.orchestrationRun.findUnique({ where: { id: dto.runId } });
|
||||
if (t.state !== 'RUNNING' || !o || o.status !== 'PENDING' || o.runId !== dto.runId ||
|
||||
o.leaseOwner !== 'pmo' || !o.leaseUntil || !r || r.taskId !== id || r.status !== 'RUNNING' ||
|
||||
r.environment !== 'staging' || r.commitSha !== t.metadata.commitSha ||
|
||||
(held ? (o.leaseOwner !== a.id || o.leaseToken !== dto.leaseToken || o.leaseUntil <= new Date()) : o.leaseUntil > new Date()))
|
||||
throw new ForbiddenException('Matching held lease or expired run required');
|
||||
const reserve = await tx.orchestrationBudgetLedger.findUnique({ where: { id: o.reservationId } });
|
||||
const ledger = await tx.orchestrationBudgetLedger.aggregate({ where: { taskId: id }, _sum: { amountCents: true } });
|
||||
if (!reserve || reserve.taskId !== id || reserve.actorId !== 'pmo' || reserve.kind !== 'RESERVE' || reserve.amountCents !== 20 ||
|
||||
reserve.idempotencyKey !== `prepare-reserve:${r.id}` || ledger._sum.amountCents !== 20 ||
|
||||
await tx.orchestrationBudgetLedger.findFirst({ where: { taskId: id, kind: 'RECONCILE' } }) ||
|
||||
await tx.orchestrationArtifact.count({ where: { runId: r.id } }))
|
||||
throw new ForbiddenException('Unreconciled artifact-free editorial reservation required');
|
||||
await tx.orchestrationRun.update({ where: { id: r.id }, data: { status: 'FAILED', retryClass: 'DEPENDENCY', finishedAt: new Date() } });
|
||||
await tx.prepareWorkflowOutbox.update({ where: { id: o.id }, data: { status: 'DONE', leaseToken: null, leaseUntil: null } });
|
||||
const updated = await tx.orchestrationTask.update({ where: { id }, data: { state: 'FAILED', version: { increment: 1 } } });
|
||||
await tx.orchestrationEvent.create({ data: {
|
||||
taskId: id, sequence: updated.version, actorId: a.id, eventType: 'EDITORIAL_RUN_STOPPED',
|
||||
fromState: 'RUNNING', toState: 'FAILED', idempotencyKey: dto.idempotencyKey,
|
||||
payload: { fingerprint, runId: r.id, reason: dto.reason, recoveryMode: held ? 'HELD_LEASE' : 'EXPIRED_RUN', costStatus: 'unknown-upper-bound-reserved', retainedReservationCents: 20 },
|
||||
} });
|
||||
return updated;
|
||||
});
|
||||
}
|
||||
async stageEvidence(a: WorkflowIdentity, dto: any) {
|
||||
this.identity(a, ['STAGE_CI']);
|
||||
if (!this.config.stageCiIds.includes(a.id))
|
||||
@@ -537,13 +649,21 @@ export class PrepareWorkflowService {
|
||||
(t.metadata?.workflowScope ?? t.metadata?.scope) === 'STAGE_PREPARE';
|
||||
const owner =
|
||||
a?.id && (t.metadata?.createdBy === a.id || a.role === 'SUPER_ADMIN');
|
||||
const latest = [...(t.decisions ?? [])].filter((d: any) => d.gate === 1)
|
||||
.sort((a: any, b: any) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime())[0];
|
||||
const expired = safe && t.state === 'READY' && latest?.decision === 'APPROVED' &&
|
||||
latest.actorId !== t.metadata.createdBy && new Date(latest.expiresAt).getTime() <= Date.now();
|
||||
const blocked = safe && t.state === 'READY' && (!latest || latest.decision !== 'APPROVED' ||
|
||||
latest.actorId === t.metadata.createdBy || new Date(latest.expiresAt).getTime() <= Date.now());
|
||||
const actions: string[] = [];
|
||||
if (expired && this.reviewer(a) && t.metadata.createdBy !== a.id)
|
||||
actions.push('APPROVE_GATE1');
|
||||
if (safe && owner && t.state === 'DRAFT') actions.push('SUBMIT_GATE1');
|
||||
if (safe && owner && t.state === 'GATE1_APPROVED')
|
||||
actions.push('QUEUE_PREPARE');
|
||||
if (
|
||||
safe &&
|
||||
a?.role === 'SUPER_ADMIN' &&
|
||||
this.reviewer(a) &&
|
||||
t.metadata?.createdBy !== a.id &&
|
||||
['GATE1_PENDING', 'GATE1_HELD'].includes(t.state)
|
||||
) {
|
||||
@@ -552,6 +672,7 @@ export class PrepareWorkflowService {
|
||||
}
|
||||
return {
|
||||
...t,
|
||||
displayState: blocked ? (expired ? 'GATE1_RENEWAL_REQUIRED' : 'BLOCKED') : t.state,
|
||||
metadata: safe
|
||||
? {
|
||||
scope: t.metadata.scope,
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
import { PrepareWorkflowService } from './prepare-workflow.service';
|
||||
(process.env.WORKFLOW_DB==='1'?describe:describe.skip)('renewal PostgreSQL serialization',()=>{
|
||||
const db=new PrismaClient();
|
||||
const service=new PrepareWorkflowService(db,{workerIds:['pmo'],stageCiIds:[]});
|
||||
const owner={id:'owner',role:'SUPER_ADMIN'};
|
||||
afterAll(()=>db.$disconnect());
|
||||
it('denies expired claim, serializes renewal/replay, retains original decision and enables one claim',async()=>{
|
||||
const t=await db.orchestrationTask.create({data:{key:crypto.randomUUID(),title:'Disposable renewal',department:'CONTENT',operationMode:'PREPARE',state:'READY',version:4,budgetLimitCents:20,metadata:{workflowScope:'STAGE_PREPARE',createdBy:'pmo',commitSha:'a'.repeat(40)}}});
|
||||
const old=await db.orchestrationApprovalDecision.create({data:{taskId:t.id,gate:1,decision:'APPROVED',actorId:'owner',expiresAt:new Date('2026-10-24T06:37:00Z'),idempotencyKey:crypto.randomUUID()}});
|
||||
await db.prepareWorkflowOutbox.create({data:{taskId:t.id}});
|
||||
const worker={id:'pmo',role:'WORKFLOW_WORKER'};
|
||||
await expect(service.claim(worker,t.id)).rejects.toMatchObject({status:403});
|
||||
const dto={expectedVersion:4,decision:'APPROVED',idempotencyKey:crypto.randomUUID()};
|
||||
const renewed=await Promise.all([service.decide(t.id,1,dto,owner),service.decide(t.id,1,dto,owner)]);
|
||||
expect(renewed.map(t=>t.version)).toEqual([5,5]);
|
||||
await expect(service.decide(t.id,1,{...dto,idempotencyKey:crypto.randomUUID()},owner)).rejects.toMatchObject({status:409});
|
||||
expect(await db.orchestrationApprovalDecision.count({where:{taskId:t.id}})).toBe(2);
|
||||
expect((await db.orchestrationApprovalDecision.findUniqueOrThrow({where:{id:old.id}})).expiresAt).toEqual(old.expiresAt);
|
||||
expect(await db.prepareWorkflowOutbox.count({where:{taskId:t.id}})).toBe(1);
|
||||
const claims=await Promise.all([service.claim(worker,t.id),service.claim(worker,t.id)]);
|
||||
expect(claims.filter(Boolean)).toHaveLength(1);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,11 @@
|
||||
import { workflowConfig } from './workflow-config';
|
||||
describe('startup owner reviewer configuration',()=>{
|
||||
it('defaults denied, accepts explicit UUID only in staging',()=>{
|
||||
expect(workflowConfig({}).ownerReviewerIds).toEqual([]);
|
||||
expect(workflowConfig({NODE_ENV:'production',CANINA_WORKFLOW_OWNER_REVIEWER_IDS:'12345678-1234-1234-1234-123456789012'})).toMatchObject({ownerReviewerIds:[]});
|
||||
expect(workflowConfig({CANINA_ENV:'staging',CANINA_WORKFLOW_OWNER_REVIEWER_IDS:'12345678-1234-1234-1234-123456789012'}).ownerReviewerIds).toEqual(['12345678-1234-1234-1234-123456789012']);
|
||||
});
|
||||
it.each(['*','admin','12345678-1234-1234-1234-123456789012,'])('fails startup on malformed explicit grant %s',ids=>{
|
||||
expect(()=>workflowConfig({CANINA_ENV:'staging',CANINA_WORKFLOW_OWNER_REVIEWER_IDS:ids})).toThrow('Invalid owner reviewer UUID allowlist');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,9 @@
|
||||
import type { WorkflowConfig } from './prepare-workflow.service';
|
||||
/** Startup-only configuration; HTTP payloads can never supply reviewer grants. */
|
||||
export function workflowConfig(env: NodeJS.ProcessEnv): WorkflowConfig {
|
||||
const raw = env.CANINA_ENV === 'staging' ? env.CANINA_WORKFLOW_OWNER_REVIEWER_IDS ?? '' : '';
|
||||
const ids = raw ? raw.split(',') : [];
|
||||
if (ids.length > 20 || ids.some(id => !/^[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$/.test(id)))
|
||||
throw new Error('Invalid owner reviewer UUID allowlist');
|
||||
return {workerIds:[],stageCiIds:[],ownerReviewerIds:[...new Set(ids)]};
|
||||
}
|
||||
@@ -56,15 +56,7 @@ const enabled = process.env.WORKFLOW_DB === '1';
|
||||
},
|
||||
reviewer,
|
||||
);
|
||||
return service.transition(
|
||||
t.id,
|
||||
{
|
||||
toState: WorkflowState.READY,
|
||||
expectedVersion: t.version,
|
||||
idempotencyKey: `ready-${t.id}`,
|
||||
},
|
||||
admin,
|
||||
);
|
||||
return t;
|
||||
}
|
||||
afterAll(async () => {
|
||||
await db.$disconnect();
|
||||
@@ -87,7 +79,7 @@ const enabled = process.env.WORKFLOW_DB === '1';
|
||||
expect(JSON.stringify(events[0].payload)).toContain('Need source review');
|
||||
expect(await db.orchestrationApprovalDecision.count({where:{taskId:t.id}})).toBe(0);
|
||||
expect(await db.prepareWorkflowOutbox.count({where:{taskId:t.id}})).toBe(0);
|
||||
await expect(service.transition(t.id, {...command,expectedVersion:held.version,reason:'changed'},reviewer)).rejects.toMatchObject({status:409});
|
||||
await expect(service.transition(t.id, {...command,idempotencyKey:events[0].idempotencyKey,expectedVersion:held.version,reason:'changed'},reviewer)).rejects.toMatchObject({status:409});
|
||||
const decision = await service.decide(t.id,1,{decision:'REJECTED',expectedVersion:held.version,idempotencyKey:`decline-held-${t.id}`,expiresAt:new Date(Date.now()+60000).toISOString()},reviewer);
|
||||
expect(decision.state).toBe('REJECTED');
|
||||
});
|
||||
@@ -340,15 +332,7 @@ const enabled = process.env.WORKFLOW_DB === '1';
|
||||
},
|
||||
reviewer,
|
||||
);
|
||||
await service.transition(
|
||||
t.id,
|
||||
{
|
||||
toState: 'READY',
|
||||
expectedVersion: current.version,
|
||||
idempotencyKey: `q-${t.id}`,
|
||||
},
|
||||
admin,
|
||||
);
|
||||
expect(current.state).toBe('READY');
|
||||
const first = await service.claim(worker, t.id);
|
||||
for (let i = 0; i < 2; i++) {
|
||||
await db.prepareWorkflowOutbox.update({
|
||||
@@ -462,20 +446,7 @@ const enabled = process.env.WORKFLOW_DB === '1';
|
||||
},
|
||||
reviewer,
|
||||
);
|
||||
const results = await Promise.allSettled(
|
||||
['one', 'two'].map((k) =>
|
||||
service.transition(
|
||||
t.id,
|
||||
{
|
||||
toState: 'READY',
|
||||
expectedVersion: t.version,
|
||||
idempotencyKey: `${k}-${t.id}`,
|
||||
},
|
||||
admin,
|
||||
),
|
||||
),
|
||||
);
|
||||
expect(results.filter((r) => r.status === 'fulfilled')).toHaveLength(1);
|
||||
expect(t.state).toBe('READY');
|
||||
expect(
|
||||
await db.prepareWorkflowOutbox.count({ where: { taskId: t.id } }),
|
||||
).toBe(1);
|
||||
|
||||
@@ -20,7 +20,10 @@ describe('support HTTP boundary', () => {
|
||||
beforeAll(async () => {
|
||||
process.env.JWT_ACCESS_SECRET = 'test-secret-with-at-least-32-characters';
|
||||
const mod = await Test.createTestingModule({ imports: [PassportModule], controllers: [SupportChatController], providers: [{ provide: SupportChatSettingsService, useValue: { read: async () => ({ enabled: true, provider: 'p', model: 'm' }) } }, SupportChatService, OptionalCustomerJwtGuard, TestJwt, { provide: PrismaService, useValue: prisma }] }).compile();
|
||||
app = mod.createNestApplication(); app.useGlobalPipes(new ValidationPipe({ transform: true, whitelist: true, forbidNonWhitelisted: true })); await app.init();
|
||||
app = mod.createNestApplication(); app.useGlobalPipes(new ValidationPipe({ transform: true, whitelist: true, forbidNonWhitelisted: true }));
|
||||
// Own the listener for the entire suite. Otherwise Supertest lets the first
|
||||
// request start the server and close it while its concurrent peer is using it.
|
||||
await app.listen(0, '127.0.0.1');
|
||||
});
|
||||
afterAll(() => app.close());
|
||||
beforeEach(() => {
|
||||
@@ -45,7 +48,14 @@ describe('support HTTP boundary', () => {
|
||||
});
|
||||
it('scopes wallet to validated identity across concurrent callers', async () => {
|
||||
const replies=await Promise.all(['alice','bob'].map(sub => request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub})).send({message:'کیف پول'}).expect(201)));
|
||||
expect(replies[0].body.answer).toContain('11'); expect(replies[0].body.answer).not.toContain('22'); expect(replies[1].body.answer).toContain('22'); expect(prisma.product.findMany).not.toHaveBeenCalled();
|
||||
expect(replies[0].body.answer).toBe('موجودی کیف پول شما: 11 تومان.');
|
||||
expect(replies[1].body.answer).toBe('موجودی کیف پول شما: 22 تومان.');
|
||||
expect(prisma.user.findUnique).toHaveBeenCalledTimes(2);
|
||||
for (const id of ['alice', 'bob']) {
|
||||
expect(prisma.user.findUnique).toHaveBeenCalledWith({ where: { id }, select: { walletBalance: true } });
|
||||
}
|
||||
expect(prisma.product.findMany).not.toHaveBeenCalled();
|
||||
expect(prisma.order.findMany).not.toHaveBeenCalled();
|
||||
});
|
||||
it('scopes bounded orders to identity', async () => { const r=await request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub:'bob'})).send({message:'سفارش'}).expect(201); expect(r.body.answer).toContain('bob-order'); expect(prisma.order.findMany).toHaveBeenCalledWith(expect.objectContaining({ where:{userId:'bob'}, take:5 })); });
|
||||
it.each(['', 'x'.repeat(1501)])('bounds message length', async message => { await request(app.getHttpServer()).post('/support-chat/ask').send({message}).expect(400); });
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
#!/bin/sh
|
||||
# Run only in a private checkout on a Docker host; never consumes application env.
|
||||
set -eu
|
||||
cd "$(dirname "$0")"
|
||||
name="recovery-http-$$"
|
||||
# Pin the available dependency image once; tests copy dependencies privately.
|
||||
image=$(docker image inspect "${RECOVERY_TEST_IMAGE:-stage-backend_stage:latest}" --format '{{.Id}}')
|
||||
cleanup() { docker rm -f "$name-node" "$name-pg" >/dev/null 2>&1 || :; docker network rm "$name" >/dev/null 2>&1 || :; }
|
||||
trap cleanup EXIT INT TERM
|
||||
docker network create --internal "$name" >/dev/null
|
||||
docker run -d --name "$name-pg" --network "$name" --network-alias postgres --tmpfs /var/lib/postgresql/data -e POSTGRES_PASSWORD=disposable -e POSTGRES_DB=recovery postgres:16-alpine >/dev/null
|
||||
until docker exec "$name-pg" pg_isready -U postgres >/dev/null 2>&1; do sleep 1; done
|
||||
docker run --rm --name "$name-node" --user 0 --network "$name" --entrypoint sh -v "$PWD:/source:ro" -e DATABASE_URL=postgresql://postgres:disposable@postgres:5432/recovery -e JWT_SECRET=disposable-recovery-jwt-secret-not-a-real-credential -e EDITORIAL_EXECUTION_DB=1 "$image" -c '
|
||||
set -eu
|
||||
mkdir -p /work
|
||||
cp -a /source/. /work/
|
||||
cp -a /app/node_modules /work/node_modules
|
||||
cd /work
|
||||
./node_modules/.bin/prisma generate
|
||||
./node_modules/.bin/prisma db push --skip-generate
|
||||
# db push is disposable-schema coverage only; install tracked append-only triggers explicitly.
|
||||
./node_modules/.bin/prisma db execute --file prisma/migrations/20261022190000_harden_orchestration_ledger/migration.sql --schema prisma/schema.prisma
|
||||
./node_modules/.bin/jest --runInBand src/orchestration-worker/completed-recovery-http.spec.ts src/orchestration-worker/editorial-execution.spec.ts src/orchestration-worker/editorial-validity.spec.ts src/orchestration-worker/editorial-bridge.spec.ts src/orchestration/editorial-recovery.spec.ts src/orchestration/editorial-recovery-hint.spec.ts
|
||||
./node_modules/.bin/tsc --noEmit
|
||||
'
|
||||
@@ -0,0 +1,30 @@
|
||||
# Narrow auth schema operation — approval required
|
||||
|
||||
## Exact scope
|
||||
`auth-schema-reconcile.sql` adds only users.auth_expires_at TIMESTAMPTZ NULL, stage_test_session VARCHAR(64) NULL, stage_test_generation UUID NULL (no defaults/backfill), and prepare_workflow_outbox with its original CHECKs, three RESTRICT FKs, task uniqueness, lease and due indexes, including nullable not_before. No existing rows changed, no auth behavior disabled, no Prisma metadata altered.
|
||||
|
||||
Read-only production PostgreSQL 16.14 catalogs verified all three users columns and outbox absent; users.id and orchestration_tasks/runs/budget_ledger.id are UUID PKs. Existing users wallet CHECK and orchestration constraints stay intact. Production has six ledger rows (one historical rolled-back admin_modules attempt), no Oct22–24 entries despite orchestration objects existing. Never run generic migrate deploy or mark whole pending history applied.
|
||||
|
||||
Historical principal migration at e036c5d has two columns, SHA256 8b4fe1fdedd2ae459b720f78479cfcb13da465eec821b422ece5e9bb41dc47ae; 80a2e18 edited it to three, SHA256 a458a94329b1ad078298b042ae0bd2e25439c1f0bb5a086beb55c517d9e0aa28. Read-only Stage ledger records the latter, not the former. Preserve both historical files unchanged here. This operation is separately journaled by CI/backup receipt, not invented Prisma history. Broader baseline/history repair remains separate work.
|
||||
|
||||
## Execution contract
|
||||
Dedicated push workflow `auth-schema-reconcile.yml` uses DEPLOY_KEY and pinned DEPLOY_KNOWN_HOSTS, fixed SSH endpoint, isolated immutable Git checkout; it does not deploy applications. It accepts only exact branches `ops/auth-schema-stage` and `ops/auth-schema-production`, mapping their full refs to Stage and production respectively. It requires REVIEWED_AUTH_SCHEMA_COMMIT matching the event SHA and checks detached checkout HEAD equals that SHA. SQL digest is fixed to `8a22f3e89efb3dacc24f3ed9337ae87d0b4345da003a607bc1994478f69c6feb`, approval ID to `CEO-AUTH-SCHEMA-20261025`; neither is push-supplied input. Production additionally requires PRODUCTION_AUTH_SCHEMA_APPROVAL = SHA:SQL_SHA256:APPROVAL_ID and STAGE_AUTH_SCHEMA_ACCEPTANCE = SHA:SQL_SHA256, provisioned only after real review and Stage auth acceptance. These are explicit approval records, not automatically issued receipts. The repository's workflow/secret permissions must restrict dedicated-ref mutation to trusted maintainers; unrestricted malicious workflow edits can bypass any workflow-local gate. Review/protect this boundary before provisioning production approval.
|
||||
|
||||
Stage already has the DDL: Stage mode backs up production read-only, restores into isolated network-none temporary PostgreSQL, applies exact SQL there, compares resulting catalog with Stage read-only, and writes a SHA-bound structural receipt only. Production requires that receipt, repeats fresh full backup and restore/patch rehearsal, then executes only exact approved SQL. Full dumps remain mode600 host-only under /opt/backups/canina-auth-reconcile; never upload/log PII. Backup nonempty and pg_restore TOC checked. Restore errors/capacity failure stop before DDL. tmpfs is capped at 1GiB: if full restore exceeds capacity, separately review capacity rather than skipping restore. Existing read-only schema backup was 94,694 bytes / 67 tables, no PII copied; its restored PostgreSQL rehearsal is genuine, not a full data-backup recovery claim.
|
||||
|
||||
SQL lock_timeout 3s, statement_timeout 30s, idle transaction 60s; advisory lock plus host flock. DDL transactional; lock/contention failure aborts all. No automatic retries. Re-execution with existing outbox fails closed pending comparison, rather than silently accepting drift. Stage/production outputs compare columns/types/nullability/defaults, all outbox constraints/indexes to fresh rehearsed expected schema.
|
||||
|
||||
## Gitea 1.22.6 trigger semantics and operator sequence
|
||||
Gitea [1.22 comparison](https://docs.gitea.com/1.22/usage/actions/comparison) explicitly marks `workflow_dispatch` ignored. The [v1.22.6 notifier implementation](https://github.com/go-gitea/gitea/blob/v1.22.6/services/actions/notifier_helper.go) resolves the pushed ref's commit, detects workflows at that commit and records `Ref` and `CommitSHA` on the run. Push is not default-branch-only. The dedicated branch must therefore contain this workflow and point to the **final integrated reviewed commit**, not a new trigger-only commit. Existing app deployment listens only to `main`/`develop`, not either operations branch.
|
||||
|
||||
After independent review/authorization, a trusted operator can push `<REVIEWED_FULL_SHA>:refs/heads/ops/auth-schema-stage` to origin. Inspect that CI run's SHA and structural receipt, then complete real Stage auth tests. Only after separate production and Stage acceptance approval records exist for the **same** SHA/digest may the operator push `<REVIEWED_FULL_SHA>:refs/heads/ops/auth-schema-production`. No empty commits, merges, arbitrary ref inputs, secret updates by this workflow, automatic acceptance, or app promotion. A no-op push does not retrigger; do not change the reviewed SHA to manufacture a run. Any SHA change requires fresh review, approval bindings and Stage evidence. Workflow preparation has not pushed either branch, changed secrets/protections or executed the operation.
|
||||
|
||||
## Acceptance and rollback
|
||||
1. Parent DBA review exact commit/diff plus SQL hash and workflow trusted-ref/secret permissions. Approve read-only production full backup + isolated full restore scope separately from production DDL.
|
||||
2. Run Stage workflow from exact commit; inspect successful backup/restore/catalog comparison. Existing Stage backend must pass ordinary admin password login + protected dashboard, OTP flow with authorized principal, refresh, and expiry/session/generation rejection tests. Do not manufacture acceptance if no approved credential/test principal is available. Record actual test run identifiers before setting Stage acceptance approval.
|
||||
3. Obtain explicit approval: execute only this commit's SQL in caninodb_prod, three nullable users columns + empty outbox and declared constraints/indexes, 3s lock/30s statement budgets, no unrelated migrations/history writes/seeds. Provision approval binding SHA, SQL digest, approval record. Trigger production workflow, inspect terminal CI log. No production execution has been performed during preparation.
|
||||
4. Release separately via existing code-only develop→Stage→main CI, using actual regenerated backend client, runtime-image/schema guard, immutable image receipts and authenticated login/OTP/refresh/protected data acceptance. Keep current compatible backend until this passes. Schema approval alone does not authorize application promotion.
|
||||
5. Before commit failure: transaction rollback. After successful DDL: leave additive nullable fields/table intact, roll back application to known compatible immutable image via approved CI; do not DROP columns or outbox after writes. Restore full backup only under separately approved incident/data-loss recovery process. Existing backup tables remain untouched.
|
||||
|
||||
## Verified preparation / limitations
|
||||
Disposable network-none PG16 schema-only restore and exact SQL executed successfully (see JSON). Missing-column SELECT failed before patch and passed after; invalid status rejected; second application rejected without changes; container removed. Independent reviewer found SQL definition matched history; requested stronger gating, Stage preexisting-schema handling, capacity awareness and postcondition validation, addressed or explicit prerequisites above. Full-data restore and dedicated workflow SSH path are implemented but not yet executed in actual CI. No production writes or deployments occurred. Approval/environment gates must not be represented as production repair completion.
|
||||
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"schema_backup_bytes": 94694,
|
||||
"schema_backup_sha256": "9c6367a06acaf97c1afe9355e4306d2a10f878b7fe156c7dbc5d58d675262c72",
|
||||
"schema_tables": 67,
|
||||
"pii_copied": false,
|
||||
"postgres": "16.14",
|
||||
"restore_and_patch_seconds": 3.669,
|
||||
"pre_patch_missing_columns_failed": true,
|
||||
"post_patch_queries": " auth_expires_at | stage_test_session | stage_test_generation \n-----------------+--------------------+-----------------------\n(0 rows)\n\n count \n-------\n 0\n(1 row)\n\n count \n-------\n 0\n(1 row)\n\n",
|
||||
"constraints": " conname | pg_get_constraintdef \n---------------------------------------------+-----------------------------------------------------------------------------------------------------------\n prepare_workflow_outbox_attempts_check | CHECK (((attempts >= 0) AND (attempts <= 3)))\n prepare_workflow_outbox_pkey | PRIMARY KEY (id)\n prepare_workflow_outbox_reservation_id_fkey | FOREIGN KEY (reservation_id) REFERENCES orchestration_budget_ledger(id) ON DELETE RESTRICT\n prepare_workflow_outbox_run_id_fkey | FOREIGN KEY (run_id) REFERENCES orchestration_runs(id) ON DELETE RESTRICT\n prepare_workflow_outbox_status_check | CHECK (((status)::text = ANY ((ARRAY['PENDING'::character varying, 'DONE'::character varying])::text[])))\n prepare_workflow_outbox_task_id_fkey | FOREIGN KEY (task_id) REFERENCES orchestration_tasks(id) ON DELETE RESTRICT\n prepare_workflow_outbox_task_id_key | UNIQUE (task_id)\n(7 rows)\n\n",
|
||||
"invalid_status_rejected": true,
|
||||
"repeat_execution_rejected_without_writes": true,
|
||||
"production_writes": false
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
# Queued Gate1 validity correction
|
||||
|
||||
## Read-only Stage evidence (2026-10-24)
|
||||
|
||||
Task `565ace1f-8cfc-4447-b978-66c36e7b767b`: READY, version 4, PREPARE/STAGE_PREPARE, proposer `pmo`. Approval `30f8ce5c-ce00-4885-8eea-3c1bb5a7e8b0`: gate 1 APPROVED by independent actor `4a0afc72-0fd4-4d76-825b-aea13f00e880`, created 05:37:54.808Z, **expires 06:37:00Z**. runId/artifactHash/commitSha/environment on that Gate1 decision are null (normal Gate1 task binding, not Gate2 binding). Recovery event sequence 4 queued the valid approval at 06:22:06.891Z; outbox PENDING, attempts 0, runId null, notBefore null. At 09:15Z it was truly expired. Editorial claim queries newest decision for this task/gate, not a version-specific approval; it correctly rejects it. No evidence of a binding/version mismatch.
|
||||
|
||||
## Behavior
|
||||
|
||||
Persisted state remains READY; separate displayState reports blocked/renewal-required on reads. No approval is extended automatically. Existing independent reviewer authorization and task row lock protect a new ordinary Gate1 APPROVED decision. Renewal is limited to READY with a latest expired independent APPROVED decision and an unstarted PENDING outbox. It appends a decision and PREPARE_GATE1_RENEWED event, increments task version, preserves task scope/commit/budget and the existing outbox/notBefore. It rejects scheduling changes, active/attempted execution, valid approvals and self-review. Claim logic and its kill/budget/lease checks remain unchanged.
|
||||
|
||||
## Owner steps after parent CI integration
|
||||
|
||||
1. Sign in normally as an independent SUPER_ADMIN (or existing provisioned canonical owner reviewer); do not use worker identity or impersonation.
|
||||
2. Open orchestration, refresh server state, find this same task in owner decisions marked `مسدود — تأیید Gate1 منقضی شده؛ نیازمند تأیید مجدد مالک`.
|
||||
3. Review immutable scope, acceptance criteria, commit, environment and 20-cent budget; open ordinary Gate1 approval. Confirm bounded work explicitly. Renewal keeps the previous schedule; no new scheduled-start input is shown.
|
||||
4. Confirm once. The existing POST `/api/admin/orchestration/tasks/565ace1f-8cfc-4447-b978-66c36e7b767b/gates/1/decide` uses `{decision:"APPROVED",expectedVersion:4,idempotencyKey:<fresh unique key>}` (use refreshed version if changed). Notes optional; omit expiresAt for backend 24-hour validity. Retry only the identical payload/key after an ambiguous response; 409 requires refresh.
|
||||
5. Verify new independent decision, PREPARE_GATE1_RENEWED event and version increment. Do not recreate task or enqueue another outbox. Parent performs separately authorized runner/live acceptance.
|
||||
|
||||
## Verification
|
||||
|
||||
Frozen 09:15Z regression observed RED before implementation for READY representation and ordinary renewal; editorial exact 403/read mismatch observed RED; UI owner queue observed RED. GREEN: 41 backend scoped tests, 25 admin scoped tests. Disposable PostgreSQL test passes real simultaneous renewal/replay and claim serialization, expired denial, immutable old approval retention, one outbox/one claim. Backend build, Prisma client generation, admin build and application TypeScript check passed in Node22 with private donor dependencies. Initial build permission/stale-generated-client setup failures corrected only in private worktree copies. No Stage/Production DB mutation, approval, runner invocation, push or deploy.
|
||||
@@ -0,0 +1,53 @@
|
||||
# Durable Stage cleanup verification
|
||||
|
||||
This change replaces the SHA-pinned transient timer with a root-owned intent journal
|
||||
and a fixed host systemd retry worker. No host service is installed or enabled by
|
||||
the CI credential command. The tracked `deploy.yml` → `ci-host-deploy.sh` →
|
||||
`deploy.sh` path invokes `install-stage-principal-cleanup.py` from the verified
|
||||
immutable release before `stage_rollout`. It atomically installs the root-owned
|
||||
worker (0755) and supplied systemd units (0644), reloads systemd, enables/starts
|
||||
the timer and verifies enabled/active state. Failure aborts rollout. No manual
|
||||
sudo provisioning is required or permitted during review. The open wrapper refuses to operate
|
||||
without an enabled and active timer. Never overwrite or delete the 0700 root-owned
|
||||
`/opt/services/canina/stage-principal-cleanup` journal during deployments.
|
||||
|
||||
A journal entry is fsynced before provisioning and contains the exact session,
|
||||
random generation, creation SHA, bounded TTL and immutable cleanup deadline.
|
||||
Repeated opens fail rather than replace an intent or renew TTL. Close and the
|
||||
30-second boot/periodic retry worker retain intents on lock contention, unavailable
|
||||
containers/DB, and relational deletion failures. Cleanup resolves the current Stage
|
||||
container ID once, verifies its cleanup capability, and authenticates against its
|
||||
current artifact SHA while retaining original session/generation ownership. Older
|
||||
artifacts without generation cleanup support fail closed; never roll back to one
|
||||
with a pending principal. Persisted expiry remains independently enforced at login,
|
||||
refresh and every scoped JWT request.
|
||||
|
||||
Revocation commits before private-handle removal; relational deletion is subsequent.
|
||||
A transaction acquires a generation/session-fenced row lock before touching related
|
||||
records. Failed deletion retains a revoked row and a pending retry intent, but no
|
||||
credential handle. Wrong ownership/generation never invokes the handle callback.
|
||||
The CLI requires the generation supplied by the private journal; no broader admin
|
||||
or production authority was introduced.
|
||||
|
||||
Verification performed in a new isolated worktree and disposable Docker network:
|
||||
- Cleanup fence tests: RED (replacement generation was revoked; callback missing),
|
||||
then GREEN (2 tests).
|
||||
- Python simulated worker tests: restart/redeploy, failed-delete retry, lock
|
||||
contention, immutable container ID/current artifact and old-CLI refusal (4 tests).
|
||||
- Persisted account lifecycle plus delete/recreate access AND refresh regression.
|
||||
- Actual CLI via ts-node with real disposable Postgres/Redis and HTTP adminLogin
|
||||
handler, injected PostgreSQL delete trigger failure: confirmed revocation,
|
||||
private handle removal, then successful repeated cleanup after trigger removal.
|
||||
- TypeScript `tsc --noEmit`: passed.
|
||||
- Full migration chain attempt on fresh disposable database: baseline failure in
|
||||
20261020000000_add_blog_freshness_authorship (`blogs` missing). Not concealed.
|
||||
Independent migration test constructed the pre-Stage schema excluding all three
|
||||
new fields, then applied the EXACT committed 20261024090000 migration with psql
|
||||
ON_ERROR_STOP before exercising persisted lifecycle. Not db-push-only testing.
|
||||
|
||||
No live account, Stage/Production DB mutation, deployment, push, host service change,
|
||||
or retry of the previous pending-approval operation was performed.
|
||||
|
||||
Invocation after normal reviewed deployment and host prerequisite provisioning:
|
||||
`sudo -n env CI=true STAGE_TEST_APPROVAL=owner-authorized-stage-editorial bash /opt/services/canina/releases/<promoted-sha>/scripts/stage-test-principal-host.sh <promoted-sha> <unique-session> 600 open`
|
||||
Use the same command with `close` immediately after the authorized test.
|
||||
@@ -0,0 +1,44 @@
|
||||
# Temporary Stage editorial reviewer (disabled by default)
|
||||
|
||||
Authority: repository write/CI-dispatch permission plus the existing authenticated,
|
||||
pinned Stage deployment SSH boundary. This is a narrowly scoped seed operation,
|
||||
not an API-key actor, owner JWT, or a public bootstrap endpoint. The destructive
|
||||
legacy seed is not used. `AdminService` shares its normal hashing/persistence and
|
||||
relational cleanup implementation with the internal command; normal user mutation
|
||||
role checks remain unchanged. The canonical default administrator is untouched.
|
||||
|
||||
## Activation after independent review
|
||||
|
||||
1. Promote this commit through the normal Git/CI Stage deployment. Do not run the
|
||||
seed command against an old image: the embedded immutable SHA must match.
|
||||
Apply the additive migration through the existing migration deployment step.
|
||||
2. Dispatch **Owner authorized Stage test principal** on develop with `approval`
|
||||
exactly `owner-authorized-stage-editorial`, unique `session` such as
|
||||
`editorial-20261024-a`, `ttl` explicitly 600 (maximum 3600), and `action=open`.
|
||||
The workflow uses existing DEPLOY_KEY / pinned DEPLOY_KNOWN_HOSTS only.
|
||||
3. CI reports only `/app/private-stage-test/<session>.json` inside
|
||||
`canino_backend_stage`. This mode-0600 file in a mode-0700 directory contains
|
||||
the process-generated password and real persisted-account login tokens.
|
||||
Consume it only from an approved in-container CI HTTP process; never print,
|
||||
download, publish as an artifact, or type it into a browser. No owner secret is
|
||||
needed. Audit records contain events, session and SHA, never credentials.
|
||||
4. Use this independent reviewer for Gate1 only; the proposer/PMO must be a
|
||||
distinct actor. Existing self-review checks are not changed. This session does
|
||||
NOT authorize Gate2, publication, release, general admin APIs, worker identity
|
||||
replacement, or budget increases. Approve a separate explicit bounded test
|
||||
budget before running inference; unknown prior reservations remain retained.
|
||||
5. Dispatch the same workflow/session/ttl with `action=close` immediately after
|
||||
tests. This revokes persisted authentication BEFORE relational deletion and
|
||||
removes the private credential file. Close is idempotent when absent.
|
||||
|
||||
A durable root-owned host cleanup journal and boot/periodic systemd retry worker must be provisioned before opening a session. Cleanup follows the current Stage artifact but retains the original exact session and generation fence; persisted expiry cannot be extended. See [cleanup verification and promotion prerequisites](stage-principal-cleanup-verification.md). No live host services are changed by review tests.
|
||||
|
||||
## Verification
|
||||
|
||||
Unit guards and existing independent self-review/role tests run with Jest.
|
||||
`stage-test-principal.integration.spec.ts` is opt-in via
|
||||
`STAGE_PRINCIPAL_DISPOSABLE_TEST=true` and requires a database URL ending in
|
||||
`/principal_disposable`; use a new isolated Postgres and Redis, then remove both.
|
||||
It verifies real account persistence/hash, signed access/refresh login tokens,
|
||||
collision refusal, nonrenewing retries, request scope, expiry, deletion/revocation.
|
||||
Never run it against Stage or Production.
|
||||
@@ -0,0 +1,26 @@
|
||||
import {useRef,useState} from 'react';
|
||||
import Button from './ui/Button';
|
||||
import {commandFailure,orchestration} from '../services/orchestration';
|
||||
import type {Task,EditorialFailureInput} from '../services/orchestration';
|
||||
export default function EditorialRecoveryDialog({task,onClose,onSuccess}:{task:Task;onClose:()=>void;onSuccess:()=>Promise<void>}) {
|
||||
const [reason,setReason]=useState('');const [confirmed,setConfirmed]=useState(false);
|
||||
const [busy,setBusy]=useState(false);const [attempted,setAttempted]=useState(false);const [blocked,setBlocked]=useState(false);const [error,setError]=useState('');
|
||||
const payload=useRef<EditorialFailureInput|null>(null);const inFlight=useRef(false);
|
||||
const execute=async()=>{
|
||||
if(inFlight.current||blocked||!confirmed||!reason.trim()||reason.length>500)return;
|
||||
if(!payload.current)payload.current={runId:task.editorialRecovery!.runId,expectedVersion:task.version,idempotencyKey:crypto.randomUUID(),reason};
|
||||
inFlight.current=true;setBusy(true);setAttempted(true);setError('');
|
||||
try {await orchestration.editorialFailure(task,payload.current);await onSuccess();}
|
||||
catch(e){const failure=commandFailure(e);setBlocked(!failure.retryable);setError(failure.message)}
|
||||
finally{inFlight.current=false;setBusy(false)}
|
||||
};
|
||||
return <div dir="rtl" lang="fa" role="dialog" aria-modal="true" aria-label="ثبت شکست اجرای متوقفشده" className="fixed inset-0 z-50 bg-black/50 overflow-y-auto p-8"><div className="bg-white rounded-2xl p-6 max-w-2xl mx-auto space-y-4">
|
||||
<h2>ثبت شکست اجرای متوقفشده</h2><p>وظیفه: {task.title} · نسخه: {task.version}</p><p>شناسه اجرا: {task.editorialRecovery!.runId}</p>
|
||||
<p>فقط اجرای منقضیشده به شکست ثبت میشود. رزرو ۲۰ سنت حفظ میشود؛ هزینه واقعی نامشخص است، نه هزینه صفر.</p>
|
||||
<p>این اقدام QA یا تأیید خودکار ایجاد نمیکند؛ انتشار، اجرای دوباره، افزایش بودجه یا آزادسازی رزرو انجام نمیشود. مجوز بازبین مستقل و اتصال اجرای منقضی را سرور دوباره بررسی میکند.</p>
|
||||
<label className="block">دلیل شکست<textarea aria-label="دلیل شکست" maxLength={500} value={reason} disabled={busy||attempted} onChange={e=>{setReason(e.target.value);setConfirmed(false)}} className="border p-2 w-full"/></label><p>{reason.length}/500</p>
|
||||
<label className="block"><input type="checkbox" checked={confirmed} disabled={busy||attempted} onChange={e=>setConfirmed(e.target.checked)}/>ثبت شکست بدون تأیید کیفیت یا آزادسازی بودجه را تأیید میکنم</label>
|
||||
{error&&<p role="alert">{error}</p>}
|
||||
<div className="flex gap-3"><Button disabled={busy||blocked||!confirmed||!reason.trim()||reason.length>500} onClick={()=>void execute()}>ثبت شکست</Button><Button disabled={busy} variant="outline" onClick={onClose}>بازخوانی و بستن</Button></div>
|
||||
</div></div>;
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
import type {ServerAction} from '../services/orchestration';
|
||||
const labels:Record<string,string>={DRAFT:'پیشنویس',GATE1_HELD:'تصمیم به تعویق افتاده',GATE1_PENDING:'در انتظار تأیید Gate1',GATE1_APPROVED:'تأییدشده در Gate1',READY:'آماده اجرا',RUNNING:'در حال اجرا',SUCCEEDED:'موفق',FAILED:'ناموفق',BLOCKED:'مسدود',EXPIRED:'منقضی',REJECTED:'ردشده',APPROVED:'تأییدشده',GATE2_PENDING:'در انتظار Gate2 (غیرفعال)',PREPARE:'آمادهسازی',MUTATE_PRODUCTION:'تغییر Production (غیرفعال)',SEO:'بهینهسازی جستوجو (SEO)',Content:'محتوا',Tech:'فنی',operationMode:'حالت عملیات',budgetLimitCents:'سقف بودجه (سنت)',metadata:'اطلاعات ثبتشده',scope:'محدوده',acceptanceCriteria:'معیارهای پذیرش',commitSha:'شناسه کامیت',id:'شناسه',taskId:'شناسه وظیفه',expectedVersion:'نسخه مورد انتظار',idempotencyKey:'کلید جلوگیری از اجرای تکراری',gate:'دروازه تأیید',decision:'تصمیم',expiresAt:'زمان انقضا',createdAt:'زمان ثبت',runId:'شناسه اجرا',artifactHash:'هش خروجی',environment:'محیط',sha256:'هش SHA-256',kind:'نوع',eventType:'نوع رویداد',fromState:'وضعیت پیشین',toState:'وضعیت بعدی',sequence:'ترتیب',amountCents:'مبلغ (سنت)',status:'وضعیت',reason:'دلیل',department:'دپارتمان',staging:'آزمایشی (staging)',FREEZE_NEW_WORK:'توقف کار جدید',STOP_AGENTS:'توقف عاملها',DISABLE_MUTATIONS:'منع تغییرات',EMERGENCY_HALT:'توقف اضطراری',RESERVE:'رزرو بودجه',RECONCILE:'تطبیق بودجه'};
|
||||
const labels:Record<string,string>={GATE1_RENEWAL_REQUIRED:'مسدود — تأیید Gate1 منقضی شده؛ نیازمند تأیید مجدد مالک',DRAFT:'پیشنویس',GATE1_HELD:'تصمیم به تعویق افتاده',GATE1_PENDING:'در انتظار تأیید Gate1',GATE1_APPROVED:'تأییدشده در Gate1',READY:'آماده اجرا',RUNNING:'در حال اجرا',SUCCEEDED:'موفق',FAILED:'ناموفق',BLOCKED:'مسدود',EXPIRED:'منقضی',REJECTED:'ردشده',APPROVED:'تأییدشده',GATE2_PENDING:'در انتظار Gate2 (غیرفعال)',PREPARE:'آمادهسازی',MUTATE_PRODUCTION:'تغییر Production (غیرفعال)',SEO:'بهینهسازی جستوجو (SEO)',Content:'محتوا',Tech:'فنی',operationMode:'حالت عملیات',budgetLimitCents:'سقف بودجه (سنت)',metadata:'اطلاعات ثبتشده',scope:'محدوده',acceptanceCriteria:'معیارهای پذیرش',commitSha:'شناسه کامیت',id:'شناسه',taskId:'شناسه وظیفه',expectedVersion:'نسخه مورد انتظار',idempotencyKey:'کلید جلوگیری از اجرای تکراری',gate:'دروازه تأیید',decision:'تصمیم',expiresAt:'زمان انقضا',createdAt:'زمان ثبت',runId:'شناسه اجرا',artifactHash:'هش خروجی',environment:'محیط',sha256:'هش SHA-256',kind:'نوع',eventType:'نوع رویداد',fromState:'وضعیت پیشین',toState:'وضعیت بعدی',sequence:'ترتیب',amountCents:'مبلغ (سنت)',status:'وضعیت',reason:'دلیل',department:'دپارتمان',staging:'آزمایشی (staging)',FREEZE_NEW_WORK:'توقف کار جدید',STOP_AGENTS:'توقف عاملها',DISABLE_MUTATIONS:'منع تغییرات',EMERGENCY_HALT:'توقف اضطراری',RESERVE:'رزرو بودجه',RECONCILE:'تطبیق بودجه'};
|
||||
export const label=(value:string)=>labels[value]??value;
|
||||
export const actionLabel=(action:ServerAction)=>({HOLD_GATE1:'تعویق تصمیم Gate1',SUBMIT_GATE1:'ارسال برای Gate1',APPROVE_GATE1:'تأیید کار محدود در Gate1',REJECT_GATE1:'رد کار در Gate1',QUEUE_PREPARE:'صفبندی آمادهسازی'}[action.id]??(action.gate?`${action.decision==='APPROVED'?'تأیید':'رد'} در Gate${action.gate}`:'اقدام سرور'));
|
||||
export function Records({value,field}:{value:unknown;field?:string}){
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
import {render,screen,within} from '@testing-library/react';
|
||||
import {it,expect,vi} from 'vitest';
|
||||
import api from '../services/api';
|
||||
import OrchestrationCommandCenter from './OrchestrationCommandCenter';
|
||||
vi.mock('../services/api',()=>({default:{get:vi.fn(),post:vi.fn(),put:vi.fn()}}));
|
||||
it('shows expired queued work in owner decisions as blocked, not ready to execute',async()=>{
|
||||
const t={id:'t',key:'t',title:'Expired queued research',state:'READY',displayState:'GATE1_RENEWAL_REQUIRED',version:4,operationMode:'PREPARE',budgetLimitCents:20,availableActions:['APPROVE_GATE1'],metadata:{scope:'Same immutable scope',acceptanceCriteria:['Evidence']}};
|
||||
vi.mocked(api.get).mockImplementation(async url=>({data:url.endsWith('/overview')?{items:[],capabilities:{mutations:true}}:url.endsWith('/tasks')?[t]:t}));
|
||||
render(<OrchestrationCommandCenter/>);
|
||||
const queue=screen.getByRole('region',{name:'منتظر تصمیم شما'});
|
||||
expect(await within(queue).findByRole('button',{name:t.title})).toBeInTheDocument();
|
||||
expect(within(queue).getByText(/نیازمند تأیید مجدد مالک/)).toBeInTheDocument();
|
||||
expect(screen.queryByText('آماده اجرا')).not.toBeInTheDocument();
|
||||
expect(api.post).not.toHaveBeenCalled();
|
||||
});
|
||||
@@ -1,4 +1,4 @@
|
||||
import { render, screen, fireEvent, within } from '@testing-library/react';
|
||||
import { render, screen, fireEvent, within, waitFor, act } from '@testing-library/react';
|
||||
import { beforeEach, describe, it, expect, vi } from 'vitest';
|
||||
import api from '../services/api';
|
||||
import OrchestrationCommandCenter from './OrchestrationCommandCenter';
|
||||
@@ -30,20 +30,35 @@ describe('command center', () => {
|
||||
expect(await screen.findByText('محدوده و معیارهای پذیرش در دسترس نیست؛ سرور این اطلاعات را در نمای امن ارسال نکرده است.')).toBeInTheDocument();
|
||||
expect(screen.queryByText('Immutable scope / acceptance criteria')).not.toBeInTheDocument();
|
||||
});
|
||||
it('requires explicit confirmation and expiry; retains idempotency across failed retry', async () => {
|
||||
it('approves immediately without date or reason after explicit confirmation',async()=>{
|
||||
vi.mocked(api.post).mockResolvedValue({data:{...task,state:'READY'}});
|
||||
render(<OrchestrationCommandCenter/>);
|
||||
fireEvent.click(await screen.findByRole('button',{name:'Bounded SEO audit'}));
|
||||
fireEvent.click(await screen.findByRole('button',{name:'تأیید در Gate1'}));
|
||||
const dialog=screen.getByRole('dialog');
|
||||
expect(within(dialog).getByLabelText('زمان اجرای برنامهریزیشده')).toHaveValue('');
|
||||
expect(within(dialog).queryByLabelText('زمان انقضا')).not.toBeInTheDocument();
|
||||
fireEvent.click(within(dialog).getByLabelText('محدوده و اتصال تغییرناپذیر را بررسی کردم'));
|
||||
fireEvent.click(within(dialog).getByRole('button',{name:'تأیید فرمان'}));
|
||||
await waitFor(()=>expect(api.post).toHaveBeenCalledTimes(1));
|
||||
const payload=vi.mocked(api.post).mock.calls[0][1] as Record<string,unknown>;
|
||||
expect(payload.decision).toBe('APPROVED');
|
||||
expect(payload.expiresAt).toBeUndefined();expect(payload.notBefore).toBeUndefined();
|
||||
});
|
||||
it('requires explicit confirmation; retains idempotency across failed retry', async () => {
|
||||
vi.mocked(api.post).mockRejectedValue(new Error('network failure'));
|
||||
render(<OrchestrationCommandCenter />);
|
||||
fireEvent.click(await screen.findByRole('button',{name:'Bounded SEO audit'}));
|
||||
fireEvent.click(await screen.findByRole('button',{name:'تأیید در Gate1'}));
|
||||
const dialog=screen.getByRole('dialog');
|
||||
expect(within(dialog).getByRole('button',{name:'تأیید فرمان'})).toBeDisabled();
|
||||
fireEvent.change(within(dialog).getByLabelText('زمان انقضا'),{target:{value:'2099-01-01T12:00'}});
|
||||
fireEvent.change(within(dialog).getByLabelText('زمان اجرای برنامهریزیشده'),{target:{value:new Date(Date.now()+3600000).toISOString().slice(0,16)}});
|
||||
fireEvent.change(within(dialog).getByLabelText('دلیل'),{target:{value:'محدوده checked'}});
|
||||
fireEvent.click(within(dialog).getByLabelText('محدوده و اتصال تغییرناپذیر را بررسی کردم'));
|
||||
fireEvent.click(within(dialog).getByRole('button',{name:'تأیید فرمان'}));
|
||||
expect(await within(dialog).findByRole('alert')).toHaveTextContent('network failure');
|
||||
expect(within(dialog).getByLabelText('دلیل')).toBeDisabled();
|
||||
expect(within(dialog).getByLabelText('زمان انقضا')).toBeDisabled();
|
||||
expect(within(dialog).getByLabelText('زمان اجرای برنامهریزیشده')).toBeDisabled();
|
||||
fireEvent.click(within(dialog).getByRole('button',{name:'تأیید فرمان'}));
|
||||
await within(dialog).findByRole('alert');
|
||||
expect(api.post).toHaveBeenCalledTimes(2);
|
||||
@@ -116,3 +131,68 @@ it('separates human evidence from server workflow scope without inventing a mark
|
||||
expect(await screen.findByText('محدوده و معیارهای پذیرش گزارششده از سرور')).toBeInTheDocument();
|
||||
expect(screen.getByText('محدوده گردش کار سرور: در نمای امن در دسترس نیست.')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('shows advertised decisions directly on pending card and labels reservation not measured cost',async()=>{
|
||||
const ownerTask={...task,budgetLimitCents:20,availableActions:['APPROVE_GATE1','REJECT_GATE1','HOLD_GATE1']};
|
||||
vi.mocked(api.get).mockImplementation(async url=>({data:url.endsWith('/overview')?{items:[],measuredAt:'now',capabilities:{mutations:true}}:url.endsWith('/tasks')?[ownerTask]:ownerTask}));
|
||||
render(<OrchestrationCommandCenter/>);
|
||||
const card=await screen.findByRole('region',{name:'منتظر تصمیم شما'});
|
||||
expect(await within(card).findByRole('button',{name:'تأیید کار محدود در Gate1'})).toBeEnabled();
|
||||
expect(within(card).getByRole('button',{name:'رد کار در Gate1'})).toBeEnabled();
|
||||
expect(within(card).getByRole('button',{name:'تعویق تصمیم Gate1'})).toBeEnabled();
|
||||
expect(within(card).getByText('رزرو آزمایشی؛ هزینه واقعی نامشخص')).toBeInTheDocument();
|
||||
fireEvent.click(within(card).getByRole('button',{name:'تعویق تصمیم Gate1'}));
|
||||
const dialog=await screen.findByRole('dialog');
|
||||
expect(within(dialog).getByRole('heading',{name:'تعویق تصمیم Gate1'})).toBeInTheDocument();
|
||||
expect(api.post).not.toHaveBeenCalled(); expect(api.put).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
const cardActions=['APPROVE_GATE1','HOLD_GATE1','REJECT_GATE1'];
|
||||
const cardLabels=['تأیید کار محدود در Gate1','تعویق تصمیم Gate1','رد کار در Gate1'];
|
||||
it.each(cardActions)('opens fresh matching %s from the card without a preconfirm mutation',async action=>{
|
||||
vi.resetAllMocks();
|
||||
const fresh={...task,version:9,budgetLimitCents:73,availableActions:[action]};
|
||||
vi.mocked(api.get).mockImplementation(async url=>({data:url.endsWith('/overview')?{items:[],measuredAt:'now',capabilities:{mutations:true}}:url.endsWith('/tasks')?[{...task,availableActions:cardActions}]:fresh}));
|
||||
render(<OrchestrationCommandCenter/>);
|
||||
const queue=screen.getByRole('region',{name:'منتظر تصمیم شما'});
|
||||
const label=cardLabels[cardActions.indexOf(action)];
|
||||
fireEvent.click(await within(queue).findByRole('button',{name:label}));
|
||||
const dialog=await screen.findByRole('dialog');
|
||||
expect(within(dialog).getByRole('heading',{name:label})).toBeInTheDocument();
|
||||
expect(within(dialog).getByText('9')).toBeInTheDocument();
|
||||
expect(within(dialog).getByText('73')).toBeInTheDocument();
|
||||
expect(api.get).toHaveBeenCalledWith('/admin/orchestration/tasks/t1');
|
||||
expect(api.post).not.toHaveBeenCalled();expect(api.put).not.toHaveBeenCalled();
|
||||
fireEvent.click(within(dialog).getByRole('button',{name:'انصراف'}));
|
||||
expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
|
||||
expect(api.post).not.toHaveBeenCalled();expect(api.put).not.toHaveBeenCalled();
|
||||
});
|
||||
it.each(['missing','disabled','wrong-task','error'])('reports fresh card action failure: %s',async failure=>{
|
||||
vi.resetAllMocks();
|
||||
vi.mocked(api.get).mockImplementation(async url=>{
|
||||
if(url.endsWith('/overview'))return {data:{items:[],measuredAt:'now',capabilities:{mutations:true}}};
|
||||
if(url.endsWith('/tasks'))return {data:[{...task,availableActions:cardActions}]};
|
||||
if(failure==='error')throw new Error('offline detail');
|
||||
return {data:{...task,id:failure==='wrong-task'?'other':task.id,availableActions:failure==='missing'?['HOLD_GATE1']:[{id:'APPROVE_GATE1',disabledReason:'policy'}]}};
|
||||
});
|
||||
render(<OrchestrationCommandCenter/>);
|
||||
fireEvent.click(await within(screen.getByRole('region',{name:'منتظر تصمیم شما'})).findByRole('button',{name:cardLabels[0]}));
|
||||
expect(await screen.findByRole('alert')).toBeInTheDocument();
|
||||
expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
|
||||
expect(api.post).not.toHaveBeenCalled();expect(api.put).not.toHaveBeenCalled();
|
||||
});
|
||||
it('invalidates a delayed card decision on refresh',async()=>{
|
||||
vi.resetAllMocks();let resolve!:(value:{data:unknown})=>void;
|
||||
vi.mocked(api.get).mockImplementation(async url=>{
|
||||
if(url.endsWith('/overview'))return {data:{items:[],measuredAt:'now',capabilities:{mutations:true}}};
|
||||
if(url.endsWith('/tasks'))return {data:[{...task,availableActions:cardActions}]};
|
||||
return await new Promise<{data:unknown}>(r=>{resolve=r});
|
||||
});
|
||||
render(<OrchestrationCommandCenter/>);
|
||||
fireEvent.click(await within(screen.getByRole('region',{name:'منتظر تصمیم شما'})).findByRole('button',{name:cardLabels[0]}));
|
||||
expect(screen.getByRole('status')).toHaveTextContent('در حال');
|
||||
fireEvent.click(screen.getByRole('button',{name:'بازخوانی وضعیت از سرور'}));
|
||||
await act(async()=>resolve({data:{...task,availableActions:cardActions}}));
|
||||
await waitFor(()=>expect(screen.queryByRole('dialog')).not.toBeInTheDocument());
|
||||
expect(api.post).not.toHaveBeenCalled();expect(api.put).not.toHaveBeenCalled();
|
||||
});
|
||||
@@ -1,5 +1,7 @@
|
||||
import { useEffect, useState, useRef } from 'react';
|
||||
import Button from '../components/ui/Button';
|
||||
import EditorialRecoveryDialog from '../components/EditorialRecoveryDialog';
|
||||
import {editorialRecoveryRun} from '../services/orchestration';
|
||||
import RouterUsagePanel from '../components/RouterUsagePanel';
|
||||
import RuntimeReadPanel from '../components/RuntimeReadPanel';
|
||||
import CreateOrchestrationTask from '../components/CreateOrchestrationTask';
|
||||
@@ -14,10 +16,12 @@ const errorText=(e:unknown)=> {const status=(e as {response?:{status?:number}})?
|
||||
function Json({value}:{value:unknown}) {return <Records value={value}/>;}
|
||||
export default function OrchestrationCommandCenter() {
|
||||
const detailEpoch=useRef(0);
|
||||
const [recovery,setRecovery]=useState<Task|null>(null);
|
||||
const [section,setSection]=useState<Section>('نمای کلی');
|
||||
const [capabilities,setCapabilities]=useState({mutations:false,chat:false,runtime:false,killSwitch:false});
|
||||
const [tasks,setTasks]=useState<Task[]>([]);
|
||||
const [selected,setSelected]=useState<Task|null>(null);
|
||||
const [decisionLoading,setDecisionLoading]=useState(false);
|
||||
const [snapshot,setSnapshot]=useState<ResourceSnapshot|null>(null);
|
||||
const [error,setError]=useState(''); const [loading,setLoading]=useState(false);
|
||||
const [search,setSearch]=useState('');
|
||||
@@ -28,7 +32,7 @@ export default function OrchestrationCommandCenter() {
|
||||
const [attempted,setAttempted]=useState(false); const [busy,setBusy]=useState(false); const [commandError,setCommandError]=useState('');
|
||||
const [success,setSuccess]=useState('');
|
||||
const [blocked,setBlocked]=useState(false);
|
||||
const [now,setNow]=useState(Date.now());
|
||||
const [now,setNow]=useState(()=>Date.now());
|
||||
useEffect(()=>{const timer=setInterval(()=>setNow(Date.now()),1000);return ()=>clearInterval(timer)},[]);
|
||||
const [kill,setKill]=useState<KillLevel>('FREEZE_NEW_WORK');
|
||||
const [session,setSession]=useState(''); const [message,setMessage]=useState('');
|
||||
@@ -43,42 +47,67 @@ export default function OrchestrationCommandCenter() {
|
||||
orchestration.resource(resource).then(data=>{if(active)setSnapshot(data)}).catch(e=>{if(active)setError(errorText(e))}).finally(()=>{if(active)setLoading(false)});
|
||||
return ()=>{active=false};
|
||||
},[section]);
|
||||
const select=async(task:Task)=>{const epoch=++detailEpoch.current;setSelected(null);setError('');try {const detail=await orchestration.task(task.id);if(epoch===detailEpoch.current)setSelected(detail)}catch(e){if(epoch===detailEpoch.current)setError(errorText(e))}};
|
||||
const select=async(task:Task)=>{const epoch=++detailEpoch.current;setDecisionLoading(false);setSelected(null);setError('');try {const detail=await orchestration.task(task.id);if(epoch===detailEpoch.current)setSelected(detail)}catch(e){if(epoch===detailEpoch.current)setError(errorText(e))}};
|
||||
const open=(task:Task,action:ServerAction)=>{if(!capabilities.mutations||actionBlockReason(task,action))return;setBlocked(false);setAttempted(false);setPending({task,action,key:crypto.randomUUID()});setExpires('');setReason('');setConfirmed(false);setBinding('');setCommandError('');setSuccess('')};
|
||||
const decide=async(task:Task,requested:ServerAction)=>{
|
||||
const epoch=++detailEpoch.current;
|
||||
setSelected(null);setPending(null);setError('');setSuccess('');setDecisionLoading(true);
|
||||
try {
|
||||
const detail=await orchestration.task(task.id);
|
||||
if(epoch!==detailEpoch.current)return;
|
||||
if(detail.id!==task.id)throw new Error('پاسخ جزئیات با وظیفه انتخابشده مطابقت ندارد');
|
||||
const action=detail.availableActions.find(a=>a.id===requested.id);
|
||||
if(!action)throw new Error('این اقدام دیگر توسط سرور مجاز نیست؛ وضعیت را بازخوانی کنید');
|
||||
const blockedReason=actionBlockReason(detail,action);
|
||||
if(blockedReason)throw new Error(blockedReason);
|
||||
if(!capabilities.mutations)throw new Error('تغییرات از طرف سرور مجاز نیست');
|
||||
setSelected(detail);open(detail,action);
|
||||
} catch(e) {if(epoch===detailEpoch.current)setError(errorText(e))}
|
||||
finally {if(epoch===detailEpoch.current)setDecisionLoading(false)}
|
||||
};
|
||||
const execute=async()=> {
|
||||
if(!pending||busy||!confirmed||blocked||!capabilities.mutations)return;
|
||||
setAttempted(true);setBusy(true);setCommandError('');
|
||||
try { const [runId,artifactHash]=binding.split('|');
|
||||
await orchestration.command(pending.task,pending.action,{idempotencyKey:pending.key,reason,expiresAt:expires?new Date(expires).toISOString():undefined,runId,artifactHash});
|
||||
await orchestration.command(pending.task,pending.action,{idempotencyKey:pending.key,reason,notBefore:expires?new Date(expires).toISOString():undefined,runId,artifactHash});
|
||||
setPending(null);setSelected(null);setSuccess('فرمان توسط سرور پذیرفته شد؛ وضعیت مرجع بازخوانی شد.');await loadTasks();
|
||||
} catch(e) {const failure=commandFailure(e);setBlocked(!failure.retryable);setCommandError(failure.message)} finally {setBusy(false)}
|
||||
};
|
||||
const refresh=()=>{detailEpoch.current++;setSelected(null);setPending(null);void loadTasks()};
|
||||
const openRecovery=async(task:Task)=>{
|
||||
if(!capabilities.mutations||pending||recovery)return;
|
||||
const epoch=++detailEpoch.current;setDecisionLoading(true);setSelected(null);setError('');
|
||||
try{const detail=await orchestration.task(task.id);if(epoch!==detailEpoch.current)return;
|
||||
if(detail.id!==task.id||!editorialRecoveryRun(detail))throw new Error('بازیابی دیگر مجاز نیست؛ وضعیت را بازخوانی کنید');
|
||||
setRecovery(detail);
|
||||
}catch(e){if(epoch===detailEpoch.current)setError(errorText(e))}finally{if(epoch===detailEpoch.current)setDecisionLoading(false)}
|
||||
};
|
||||
const refresh=()=>{detailEpoch.current++;setDecisionLoading(false);setSelected(null);setPending(null);setRecovery(null);void loadTasks()};
|
||||
const filtered=tasks.filter(t=>(t.title+' '+t.department+' '+t.state).toLowerCase().includes(search.toLowerCase()));
|
||||
return <div dir="rtl" lang="fa" className="space-y-5 font-vazir pb-12">
|
||||
return <><div inert={!!recovery} dir="rtl" lang="fa" className="space-y-5 font-vazir pb-12">
|
||||
<header className="bg-white border rounded-2xl p-5 flex justify-between gap-4"><div><h1 className="text-xl font-black">مرکز فرماندهی ارکستراسیون</h1><p className="text-sm text-gray-600">مرجع عملیات سرور است · Gate1 برای کار محدود · Gate2 و انتشار غیرفعال هستند</p></div><Button onClick={refresh} disabled={busy||loading}>بازخوانی وضعیت از سرور</Button></header>
|
||||
<nav aria-label="بخشهای ارکستراسیون" className="flex flex-wrap gap-2">{sections.map(s=><Button key={s} disabled={!!pending||busy} onClick={()=>{setSection(s);setSuccess('');setReason('');setConfirmed(false)}} variant={section===s?'primary':'outline'}>{s}</Button>)}</nav>
|
||||
<nav aria-label="بخشهای ارکستراسیون" className="flex flex-wrap gap-2">{sections.map(s=><Button key={s} disabled={!!pending||busy} onClick={()=>{detailEpoch.current++;setDecisionLoading(false);setSection(s);setSuccess('');setReason('');setConfirmed(false)}} variant={section===s?'primary':'outline'}>{s}</Button>)}</nav>
|
||||
{unavailable[section]&&<section className="bg-amber-50 border border-amber-200 rounded-2xl p-5 space-y-3"><h2 className="font-bold">این بخش در نسخه فعلی در دسترس نیست</h2><p>{unavailable[section]}</p><p>برای این بخش درخواست ناموفق تکراری به سرور ارسال نمیشود.</p></section>}
|
||||
{loading&&<p role="status">در حال دریافت وضعیت از سرور…</p>}
|
||||
{(loading||decisionLoading)&&<p role="status">در حال دریافت وضعیت از سرور…</p>}
|
||||
{error&&<p role="alert" className="border border-red-200 bg-red-50 rounded-xl p-4">دریافت اطلاعات از سرور ناموفق بود: {error}. داده جایگزین نمایش داده نمیشود. <button onClick={refresh}>بازخوانی وظیفهها</button></p>}
|
||||
{success&&<p role="status">{success}</p>}
|
||||
{section==='وظیفهها و تأییدها'&&capabilities.mutations&&<CreateOrchestrationTask onCreated={()=>void loadTasks()}/>}
|
||||
{section==='نمای کلی'&&<section aria-label="منتظر تصمیم شما" className="border-2 border-purple-300 bg-purple-50 rounded-2xl p-5 space-y-4">
|
||||
<h2 className="text-xl font-black">منتظر تصمیم شما</h2><p>تصمیم Gate1 برای کار محدود؛ تأیید بهمعنای انتشار یا اجرای Production نیست. اقدامها پس از دریافت جزئیات از سرور نمایش داده میشوند.</p>
|
||||
<label>فیلتر تصمیمها<select aria-label="فیلتر تصمیمها" value={decisionFilter} onChange={e=>setDecisionFilter(e.target.value)} className="border rounded p-2 m-2"><option value="ALL">در انتظار و بهتعویقافتاده</option><option value="GATE1_PENDING">در انتظار تصمیم</option><option value="GATE1_HELD">بهتعویقافتاده</option></select></label>
|
||||
{!loading&&!error&&!tasks.some(t=>['GATE1_PENDING','GATE1_HELD'].includes(t.state)&&(decisionFilter==='ALL'||t.state===decisionFilter))&&<p>تصمیمی در این فیلتر منتظر نیست.</p>}
|
||||
{!loading&&!error&&tasks.filter(t=>['GATE1_PENDING','GATE1_HELD'].includes(t.state)&&(decisionFilter==='ALL'||t.state===decisionFilter)).map(t=><article key={t.id} className="bg-white border rounded-xl p-4 space-y-3"><button disabled={!!pending||busy} className="font-bold text-purple-700 underline" onClick={()=>void select(t)}>{t.title}</button><p>{label(t.department)} · {label(t.state)} · سقف بودجه: {t.budgetLimitCents??'نامشخص'} سنت</p>{selected?.id!==t.id&&<><p>محدوده: {typeof t.metadata?.scope==='string'?t.metadata.scope:'گزارش نشده؛ جزئیات را بررسی کنید'}</p><h3>معیارهای پذیرش</h3>{Array.isArray(t.metadata?.acceptanceCriteria)&&t.metadata.acceptanceCriteria.every(c=>typeof c==='string')?<ul className="list-disc list-inside">{(t.metadata.acceptanceCriteria as string[]).map((c,i)=><li key={i}>{c}</li>)}</ul>:<p>گزارش نشده؛ جزئیات را بررسی کنید</p>}</>}</article>)}
|
||||
<h2 className="text-xl font-black">منتظر تصمیم شما</h2><p>تصمیم Gate1 برای کار محدود؛ تأیید بهمعنای انتشار یا اجرای Production نیست. دکمهها فقط اقدامهای مجاز اعلامشده توسط سرور هستند؛ برای بررسی و تصمیم، جزئیات را باز کنید.</p>
|
||||
<label>فیلتر تصمیمها<select aria-label="فیلتر تصمیمها" value={decisionFilter} onChange={e=>setDecisionFilter(e.target.value)} className="border rounded p-2 m-2"><option value="ALL">در انتظار، بهتعویقافتاده و نیازمند تمدید</option><option value="GATE1_PENDING">در انتظار تصمیم</option><option value="GATE1_HELD">بهتعویقافتاده</option></select></label>
|
||||
{!loading&&!error&&!tasks.some(t=>['GATE1_PENDING','GATE1_HELD','GATE1_RENEWAL_REQUIRED'].includes(t.displayState??t.state)&&(decisionFilter==='ALL'||t.state===decisionFilter))&&<p>تصمیمی در این فیلتر منتظر نیست.</p>}
|
||||
{!loading&&!error&&tasks.filter(t=>['GATE1_PENDING','GATE1_HELD','GATE1_RENEWAL_REQUIRED'].includes(t.displayState??t.state)&&(decisionFilter==='ALL'||t.state===decisionFilter)).map(t=><article key={t.id} className="bg-white border rounded-xl p-4 space-y-3"><button disabled={!!pending||busy} className="font-bold text-purple-700 underline" onClick={()=>void select(t)}>{t.title}</button><p>{label(t.department)} · {label(t.displayState??t.state)} · سقف بودجه: {t.budgetLimitCents??'نامشخص'} سنت</p><p>رزرو آزمایشی؛ هزینه واقعی نامشخص</p><div className="flex flex-wrap gap-2">{t.availableActions.filter(a=>['APPROVE_GATE1','REJECT_GATE1','HOLD_GATE1'].includes(a.id)).map(a=><Button key={a.id} disabled={!capabilities.mutations||!!pending||busy||!!actionBlockReason(t,a)} onClick={()=>void decide(t,a)}>{actionLabel(a)}</Button>)}</div>{selected?.id!==t.id&&<><p>محدوده: {typeof t.metadata?.scope==='string'?t.metadata.scope:'گزارش نشده؛ جزئیات را بررسی کنید'}</p><h3>معیارهای پذیرش</h3>{Array.isArray(t.metadata?.acceptanceCriteria)&&t.metadata.acceptanceCriteria.every(c=>typeof c==='string')?<ul className="list-disc list-inside">{(t.metadata.acceptanceCriteria as string[]).map((c,i)=><li key={i}>{c}</li>)}</ul>:<p>گزارش نشده؛ جزئیات را بررسی کنید</p>}</>}</article>)}
|
||||
</section>}
|
||||
{section==='نمای کلی'&&!loading&&!error&&<section className="bg-white border rounded-2xl p-5 space-y-4"><h2 className="font-bold">فهرست وظیفههای ثبتشده</h2><p>{tasks.length} وظیفه از سرور دریافت شد. این فهرست نشاندهنده سلامت عامل یا وضعیت زنده اجرا نیست.</p><div className="flex flex-wrap gap-3">{[...new Set(tasks.map(t=>t.state))].map(state=><span key={state} className="border rounded-xl p-3">{label(state)}: {tasks.filter(t=>t.state===state).length}</span>)}</div></section>}
|
||||
{section==='نمای کلی'&&!loading&&!error&&<section className="bg-white border rounded-2xl p-5 space-y-4"><h2 className="font-bold">فهرست وظیفههای ثبتشده</h2><p>{tasks.length} وظیفه از سرور دریافت شد. این فهرست نشاندهنده سلامت عامل یا وضعیت زنده اجرا نیست.</p><div className="flex flex-wrap gap-3">{[...new Set(tasks.map(t=>t.displayState??t.state))].map(state=><span key={state} className="border rounded-xl p-3">{label(state)}: {tasks.filter(t=>(t.displayState??t.state)===state).length}</span>)}</div></section>}
|
||||
{(['نمای کلی','وظیفهها و تأییدها','اجراها و خروجیها'] as Section[]).includes(section)&&<section className="bg-white border rounded-2xl p-5 space-y-4"><label>جستوجوی وظیفهها<input className="border rounded-lg p-2 m-2" value={search} onChange={e=>setSearch(e.target.value)}/></label>
|
||||
{!loading&&!error&&!tasks.length&&<p>وظیفهای از سرور دریافت نشد.</p>}
|
||||
<div className="overflow-x-auto"><table className="w-full text-sm"><thead><tr>{['وظیفه','دپارتمان','وضعیت','حالت عملیات','سقف بودجه (سنت)','نسخه'].map(h=><th key={h} className="text-start p-2">{h}</th>)}</tr></thead><tbody>{filtered.filter(t=>section!=='نمای کلی'||!['GATE1_PENDING','GATE1_HELD'].includes(t.state)).map(t=><tr key={t.id} className="border-t"><td className="p-2"><button className="text-purple-700 underline" onClick={()=>void select(t)}>{t.title}</button></td><td>{label(t.department)}</td><td>{label(t.state)}</td><td>{label(t.operationMode)}</td><td>{t.budgetLimitCents??'نامشخص'}</td><td>{t.version}</td></tr>)}</tbody></table></div>
|
||||
<div className="overflow-x-auto"><table className="w-full text-sm"><thead><tr>{['وظیفه','دپارتمان','وضعیت','حالت عملیات','سقف بودجه (سنت)','نسخه'].map(h=><th key={h} className="text-start p-2">{h}</th>)}</tr></thead><tbody>{filtered.filter(t=>section!=='نمای کلی'||!['GATE1_PENDING','GATE1_HELD','GATE1_RENEWAL_REQUIRED'].includes(t.displayState??t.state)).map(t=><tr key={t.id} className="border-t"><td className="p-2"><button className="text-purple-700 underline" onClick={()=>void select(t)}>{t.title}</button></td><td>{label(t.department)}</td><td>{label(t.displayState??t.state)}</td><td>{label(t.operationMode)}</td><td>{t.budgetLimitCents??'نامشخص'}</td><td>{t.version}</td></tr>)}</tbody></table></div>
|
||||
</section>}
|
||||
{selected&&<section aria-label="جزئیات وظیفه" className="bg-white border rounded-2xl p-5 space-y-4"><h2 className="font-bold">{selected.title} · v{selected.version}</h2>{typeof selected.metadata?.scope==='string'&&selected.metadata.scope.trim()&&Array.isArray(selected.metadata.acceptanceCriteria)&&selected.metadata.acceptanceCriteria.length>0&&selected.metadata.acceptanceCriteria.every(value=>typeof value==='string'&&value.trim())?<h3 className="font-bold">محدوده و معیارهای پذیرش گزارششده از سرور</h3>:<p>محدوده و معیارهای پذیرش در دسترس نیست؛ سرور این اطلاعات را در نمای امن ارسال نکرده است.</p>}<p>محدوده گردش کار سرور: در نمای امن در دسترس نیست.</p><Json value={{operationMode:selected.operationMode,budgetLimitCents:selected.budgetLimitCents,metadata:selected.metadata}}/>
|
||||
<h3 className="font-bold">اقدامهای مجاز اعلامشده توسط سرور</h3>{!selected.availableActions.length&&<p>اقدامی اعلام نشده است. این نما فقط خواندنی است؛ مرورگر مجوز یا تغییر وضعیت ایجاد نمیکند.</p>}<div className="flex flex-wrap gap-2">{selected.availableActions.map(a=><Button key={a.id} disabled={!capabilities.mutations||!!actionBlockReason(selected,a)} title={!capabilities.mutations?'تغییرات از طرف سرور مجاز نیست':actionBlockReason(selected,a)} onClick={()=>open(selected,a)}>{actionLabel(a)}</Button>)}</div>
|
||||
{selected.displayState==='GATE1_RENEWAL_REQUIRED'&&<p role="status">مسدود — تأیید Gate1 منقضی شده؛ برای همان وظیفه و محدوده، تأیید مجدد مستقل لازم است. برنامه زمانی و سقف بودجه تغییر نمیکند.</p>}<h3 className="font-bold">اقدامهای مجاز اعلامشده توسط سرور</h3>{!selected.availableActions.length&&<p>اقدامی اعلام نشده است. این نما فقط خواندنی است؛ مرورگر مجوز یا تغییر وضعیت ایجاد نمیکند.</p>}<div className="flex flex-wrap gap-2">{selected.availableActions.map(a=><Button key={a.id} disabled={!capabilities.mutations||!!actionBlockReason(selected,a)} title={!capabilities.mutations?'تغییرات از طرف سرور مجاز نیست':actionBlockReason(selected,a)} onClick={()=>open(selected,a)}>{actionLabel(a)}</Button>)}</div>
|
||||
{editorialRecoveryRun(selected)&&<Button disabled={!capabilities.mutations||!!pending||busy||decisionLoading} onClick={()=>void openRecovery(selected)}>ثبت شکست اجرای متوقفشده</Button>}
|
||||
<h3 className="font-bold">تصمیمهای تأیید تغییرناپذیر</h3><Json value={selected.decisions??[]}/>
|
||||
<h3 className="font-bold">اجراها و خروجیهای ثبتشده</h3>{!selected.runs?.length&&<p>اجرای ثبتشدهای وجود ندارد.</p>}{selected.runs?.map(r=><article key={r.id} className="border rounded-xl p-3 space-y-2"><h4>{r.id} · {label(r.status)}</h4><p>کامیت: {r.commitSha} · محیط: {r.environment}</p>{r.artifacts.map(a=><Json key={a.id} value={a}/>)}</article>)}
|
||||
<h3 className="font-bold">دفتر بودجه (سنت؛ نه مصرف تخمینی)</h3><Json value={selected.budgetLedger??[]}/><h3 className="font-bold">رویدادهای ممیزی بهترتیب</h3><Json value={selected.events??[]}/>
|
||||
<p>رزرو آزمایشی؛ هزینه واقعی نامشخص</p><h3 className="font-bold">دفتر بودجه (سنت؛ رزرو با هزینه واقعی متفاوت است)</h3><Json value={selected.budgetLedger??[]}/><h3 className="font-bold">رویدادهای ممیزی بهترتیب</h3><Json value={selected.events??[]}/>
|
||||
</section>}
|
||||
{snapshot&&<section className="bg-white border rounded-2xl p-5 space-y-4"><h2>{section}</h2><p>زمان دریافت از سرور: {snapshot.measuredAt}</p>{!snapshot.items.length&&<p>رکوردی از سرور دریافت نشد.</p>}<div className="grid md:grid-cols-2 gap-3">{snapshot.items.map(item=><article key={item.id} className="border rounded-xl p-4"><h3 className="font-bold">{item.title??item.id}</h3><dl>{Object.entries(item).filter(([k])=>k!=='id'&&k!=='title').map(([k,v])=><div key={k} className="flex justify-between gap-3"><dt>{label(k)}</dt><dd>{String(v??'نامشخص')}</dd></div>)}</dl></article>)}</div><p>تغییر تنظیمات فقط با فرمان مجاز سرور ممکن است؛ مرورگر فرمانی ایجاد نمیکند.</p></section>}
|
||||
{section==='توقف اضطراری'&&!capabilities.killSwitch&&<p>کنترل توقف اضطراری در این نسخه در دسترس نیست؛ مسیر سرور اجازه تغییر نمیدهد.</p>}
|
||||
@@ -88,11 +117,12 @@ export default function OrchestrationCommandCenter() {
|
||||
{section==='گفتوگو'&&!capabilities.chat&&<p>گفتوگو در دسترس نیست؛ پل مورد اعتماد اجرا فعال نیست.</p>}
|
||||
{section==='گفتوگو'&&capabilities.chat&&<section className="bg-white border rounded-2xl p-5 space-y-3"><h2>گفتوگوی متنی از مسیر امن سرور</h2><p>فقط متن مشورتی؛ بدون ترمینال، PTY، توکن اجرا یا اتصال مستقیم به Hermes. تصمیمها از کنترل تأیید مستقل عبور میکنند.</p><label>شناسه نشست<input value={session} onChange={e=>{setSession(e.target.value);setMessages([])}} className="border p-2"/></label><div role="log">{messages.map(m=><p key={m.id}>{m.role}: {m.content}</p>)}</div><label>پیام<textarea value={message} onChange={e=>{setMessage(e.target.value);setChatKey(crypto.randomUUID())}} className="border p-2 block w-full"/></label><Button disabled={busy||!session.trim()||!message.trim()} onClick={async()=>{setBusy(true);setError('');try{const reply=await orchestration.chat(session,message,chatKey);setMessages(prev=>[...prev,{id:chatKey,role:'user',content:message},reply]);setMessage('');setChatKey(crypto.randomUUID())}catch(e){setError(errorText(e))}finally{setBusy(false)}}}>ارسال پیام مشورتی</Button></section>}
|
||||
{pending&&<div role="dialog" aria-modal="true" aria-label="تأیید فرمان تغییرناپذیر" className="fixed inset-0 z-50 bg-black/50 overflow-y-auto p-8"><div className="bg-white rounded-2xl p-6 max-w-2xl mx-auto space-y-4"><h2>{actionLabel(pending.action)}</h2><Json value={{taskId:pending.task.id,expectedVersion:pending.task.version,idempotencyKey:pending.key,scope:pending.task.metadata,budgetLimitCents:pending.task.budgetLimitCents,operationMode:pending.task.operationMode}}/>
|
||||
{pending.action.gate&&<label className="block">زمان انقضا<input aria-label="زمان انقضا" type="datetime-local" value={expires} onChange={e=>setExpires(e.target.value)} disabled={busy||attempted}/></label>}
|
||||
{pending.action.gate===1&&pending.action.decision==='APPROVED'&&pending.task.displayState!=='GATE1_RENEWAL_REQUIRED'&&<label className="block">زمان اجرای برنامهریزیشده (اختیاری؛ پیشفرض فوری)<input aria-label="زمان اجرای برنامهریزیشده" type="datetime-local" value={expires} onChange={e=>setExpires(e.target.value)} disabled={busy||attempted}/></label>}
|
||||
{pending.action.gate===2&&pending.action.decision==='APPROVED'&&<label>اتصال اجرای ثبتشده به خروجی<select aria-label="اتصال اجرای ثبتشده به خروجی" value={binding} onChange={e=>{setBinding(e.target.value);setConfirmed(false)}} disabled={busy||attempted}><option value="">انتخاب شواهد تغییرناپذیر</option>{pending.task.runs?.filter(r=>r.status==='SUCCEEDED').flatMap(r=>r.artifacts.map(a=><option key={r.id+'|'+a.sha256} value={r.id+'|'+a.sha256}>{r.id} · {r.commitSha} · {r.environment} · {a.sha256}</option>))}</select></label>}
|
||||
<label className="block">دلیل<input aria-label="دلیل" value={reason} onChange={e=>setReason(e.target.value)} disabled={busy||attempted} className="border p-2"/></label>
|
||||
<p>تأیید، وظیفه را در اولویت صف آماده قرار میدهد؛ زمان اختیاری فقط زودترین زمان شروع است و اجرای دقیق در آن لحظه تضمین نمیشود. حداکثر زمانبندی ۳۰ روز است؛ اعتبار تأیید را سرور مدیریت میکند.</p>
|
||||
<label className="block">دلیل (برای تأیید اختیاری)<input aria-label="دلیل" value={reason} onChange={e=>setReason(e.target.value)} disabled={busy||attempted} className="border p-2"/></label>
|
||||
<label className="block"><input type="checkbox" checked={confirmed} onChange={e=>setConfirmed(e.target.checked)} disabled={busy}/>محدوده و اتصال تغییرناپذیر را بررسی کردم</label>
|
||||
{commandError&&<p role="alert">{commandError}</p>}<div className="flex gap-3"><Button disabled={busy||blocked||!capabilities.mutations||!confirmed||!reason.trim()|| (!!pending.action.gate&&!(Date.parse(expires)>now)) || (['APPROVE_GATE1','REJECT_GATE1'].includes(pending.action.id)&&Date.parse(expires)>now+86400000) || (pending.action.gate===2&&pending.action.decision==='APPROVED'&&!binding)} onClick={()=>void execute()}>تأیید فرمان</Button><Button variant="outline" disabled={busy} onClick={()=>setPending(null)}>انصراف</Button></div>
|
||||
{commandError&&<p role="alert">{commandError}</p>}<div className="flex gap-3"><Button disabled={busy||blocked||!capabilities.mutations||!confirmed||(pending.action.toState==='GATE1_HELD'&&!reason.trim())|| (!!expires&&!(Date.parse(expires)>now)) || (['APPROVE_GATE1','REJECT_GATE1'].includes(pending.action.id)&&Date.parse(expires)>now+30*86400000) || (pending.action.gate===2&&pending.action.decision==='APPROVED'&&!binding)} onClick={()=>void execute()}>تأیید فرمان</Button><Button variant="outline" disabled={busy} onClick={()=>setPending(null)}>انصراف</Button></div>
|
||||
</div></div>}
|
||||
</div>;
|
||||
</div>{recovery&&<EditorialRecoveryDialog task={recovery} onClose={refresh} onSuccess={async()=>{detailEpoch.current++;setRecovery(null);setSelected(null);setSuccess('شکست ثبت شد؛ رزرو با هزینه نامشخص حفظ شد.');await loadTasks()}}/>}</>;
|
||||
}
|
||||
@@ -17,14 +17,16 @@ it('opens with obvious pending and held owner queue, scope, criteria and budget;
|
||||
fireEvent.change(within(queue).getByLabelText('فیلتر تصمیمها'),{target:{value:'GATE1_HELD'}});
|
||||
expect(within(queue).queryByRole('button',{name:proposal.title})).not.toBeInTheDocument();
|
||||
fireEvent.click(within(queue).getByRole('button',{name:'کار نگهداشته'}));
|
||||
expect(await screen.findByRole('button',{name:'تعویق تصمیم Gate1'})).toBeInTheDocument();
|
||||
const detail=await screen.findByRole('region',{name:'جزئیات وظیفه'});
|
||||
expect(within(detail).getByRole('button',{name:'تعویق تصمیم Gate1'})).toBeInTheDocument();
|
||||
expect(api.put).not.toHaveBeenCalled();expect(api.post).not.toHaveBeenCalled();
|
||||
});
|
||||
it('holds through authenticated server transition and reloads instead of fabricating a local decision',async()=>{
|
||||
vi.mocked(api.put).mockResolvedValue({data:{}});
|
||||
render(<OrchestrationCommandCenter/>);
|
||||
fireEvent.click(await screen.findByRole('button',{name:proposal.title}));
|
||||
fireEvent.click(await screen.findByRole('button',{name:'تعویق تصمیم Gate1'}));
|
||||
const detail=await screen.findByRole('region',{name:'جزئیات وظیفه'});
|
||||
fireEvent.click(within(detail).getByRole('button',{name:'تعویق تصمیم Gate1'}));
|
||||
const dialog=screen.getByRole('dialog');
|
||||
expect(within(dialog).queryByLabelText('زمان انقضا')).not.toBeInTheDocument();
|
||||
fireEvent.change(within(dialog).getByLabelText('دلیل'),{target:{value:'بررسی بودجه'}});
|
||||
|
||||
@@ -4,6 +4,46 @@ import { MemoryRouter } from 'react-router-dom';
|
||||
import { beforeEach,describe,expect,it,vi } from 'vitest';
|
||||
import api from '../services/api';
|
||||
import Users from './Users';
|
||||
import { useAdminAuthStore } from '../store/adminAuthStore';
|
||||
|
||||
vi.mock('../store/adminAuthStore', () => ({ useAdminAuthStore: vi.fn() }));
|
||||
|
||||
describe('Users superadmin editor', () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
vi.mocked(useAdminAuthStore).mockReturnValue('SUPER_ADMIN');
|
||||
vi.mocked(api.get).mockResolvedValue({ data: { data: [{ id: 'owner-fixture', firstName: 'Owner', role: 'SUPER_ADMIN' }], meta: { total: 1 } } });
|
||||
vi.mocked(api.put).mockResolvedValue({ data: { success: true } });
|
||||
});
|
||||
it.each(['SUPER_ADMIN', 'ADMIN', 'Admin', 'User_Vet'])('preserves exact %s role on password-only save', async (role) => {
|
||||
vi.mocked(api.get).mockResolvedValue({ data: { data: [{ id: 'owner-fixture', firstName: 'Owner', role }], meta: { total: 1 } } });
|
||||
render(<MemoryRouter><Users /></MemoryRouter>);
|
||||
fireEvent.click((await screen.findAllByTitle('ویرایش مشخصات'))[0]);
|
||||
const select = screen.getAllByRole('combobox')[1];
|
||||
expect(select).toHaveValue(role);
|
||||
expect(screen.getAllByRole('option', { name: /مدیر ارشد/ }).length).toBeGreaterThan(0);
|
||||
fireEvent.change(document.querySelector('input[type="password"]')!, { target: { value: 'Fixture-only-123' } });
|
||||
fireEvent.click(screen.getByRole('button', { name: 'ذخیره تغییرات' }));
|
||||
await waitFor(() => expect(api.put).toHaveBeenCalled());
|
||||
const payload = vi.mocked(api.put).mock.calls[0][1] as Record<string, unknown>;
|
||||
expect(payload).not.toHaveProperty('role');
|
||||
});
|
||||
it('submits explicit superadmin promotion for authorized actor', async () => {
|
||||
vi.mocked(api.get).mockResolvedValue({ data: { data: [{ id: 'ordinary-fixture', role: 'Admin' }], meta: { total: 1 } } });
|
||||
render(<MemoryRouter><Users /></MemoryRouter>);
|
||||
fireEvent.click((await screen.findAllByTitle('ویرایش مشخصات'))[0]);
|
||||
fireEvent.change(screen.getAllByRole('combobox')[1], { target: { value: 'SUPER_ADMIN' } });
|
||||
fireEvent.click(screen.getByRole('button', { name: 'ذخیره تغییرات' }));
|
||||
await waitFor(() => expect(api.put).toHaveBeenCalledWith('/admin/users/ordinary-fixture', expect.objectContaining({ role: 'SUPER_ADMIN' })));
|
||||
});
|
||||
it('does not offer superadmin promotion to ordinary admin', async () => {
|
||||
vi.mocked(useAdminAuthStore).mockReturnValue('Admin');
|
||||
render(<MemoryRouter><Users /></MemoryRouter>);
|
||||
fireEvent.click(screen.getByRole('button', { name: 'افزودن کاربر جدید' }));
|
||||
const select = screen.getAllByRole('combobox')[1];
|
||||
expect(select.querySelector('option[value="SUPER_ADMIN"]')).toBeNull();
|
||||
});
|
||||
});
|
||||
|
||||
vi.mock('../services/api', () => ({
|
||||
default: {
|
||||
@@ -57,9 +97,9 @@ describe('Users Page', () => {
|
||||
vi.clearAllMocks();
|
||||
vi.mocked(api.get).mockResolvedValue({
|
||||
data: {
|
||||
success: true,
|
||||
// Actual GET /admin/users contract: no success envelope.
|
||||
data: mockUsers,
|
||||
meta: { lastPage: 2, total: 2 },
|
||||
meta: { lastPage: 2, total: 2, page: 1, limit: 10 },
|
||||
},
|
||||
});
|
||||
});
|
||||
@@ -260,9 +300,8 @@ describe('Users Page', () => {
|
||||
it('renders empty table state when no users are returned', async () => {
|
||||
vi.mocked(api.get).mockResolvedValueOnce({
|
||||
data: {
|
||||
success: true,
|
||||
data: [],
|
||||
meta: { lastPage: 1, total: 0 },
|
||||
meta: { lastPage: 1, total: 0, page: 1, limit: 10 },
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
@@ -17,6 +17,7 @@ import Button from '../components/ui/Button';
|
||||
import Modal from '../components/ui/Modal';
|
||||
import Pagination from '../components/ui/Pagination';
|
||||
import api from '../services/api';
|
||||
import { useAdminAuthStore } from '../store/adminAuthStore';
|
||||
|
||||
|
||||
|
||||
@@ -44,6 +45,8 @@ export interface UserRecord {
|
||||
import { useSearchParams } from 'react-router-dom';
|
||||
|
||||
export default function Users() {
|
||||
const actorRole = useAdminAuthStore(state => state.adminUser?.role);
|
||||
const canManageSuperAdmin = ['superadmin', 'adminsuper'].includes((actorRole || '').toLowerCase().replace(/[_-]/g, ''));
|
||||
const [searchParams, setSearchParams] = useSearchParams();
|
||||
const [users, setUsers] = useState<UserRecord[]>([]);
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
@@ -179,7 +182,8 @@ export default function Users() {
|
||||
if (role) params.append('role', role);
|
||||
|
||||
const response = await api.get(`/admin/users?${params.toString()}`);
|
||||
if (response.data?.success) {
|
||||
// The list endpoint returns { data, meta }, not a success envelope.
|
||||
if (Array.isArray(response.data?.data)) {
|
||||
const userList = response.data.data || [];
|
||||
setUsers(userList);
|
||||
setTotalPages(response.data.meta?.lastPage || 1);
|
||||
@@ -265,7 +269,7 @@ export default function Users() {
|
||||
firstName: editFormData.firstName.trim(),
|
||||
lastName: editFormData.lastName.trim(),
|
||||
mobile: editFormData.mobile.trim(),
|
||||
role: editFormData.role,
|
||||
...(editFormData.role !== editUser.role && { role: editFormData.role }),
|
||||
walletBalance: Number(editFormData.walletBalance) || 0,
|
||||
};
|
||||
if (editFormData.email.trim()) payload.email = editFormData.email.trim();
|
||||
@@ -357,6 +361,7 @@ export default function Users() {
|
||||
<option value="User_Wholesale">خریدار عمده</option>
|
||||
<option value="User_B2B">همکار (B2B)</option>
|
||||
<option value="ADMIN">مدیر سیستم (Admin)</option>
|
||||
<option value="SUPER_ADMIN">مدیر ارشد (Super Admin)</option>
|
||||
</select>
|
||||
|
||||
<div className="relative w-full sm:w-64">
|
||||
@@ -632,6 +637,7 @@ export default function Users() {
|
||||
<option value="User_Wholesale">خریدار عمده (داروخانه/پتشاپ)</option>
|
||||
<option value="User_B2B">همکار (B2B)</option>
|
||||
<option value="ADMIN">مدیر سیستم (Admin)</option>
|
||||
{canManageSuperAdmin && <option value="SUPER_ADMIN">مدیر ارشد (Super Admin)</option>}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
@@ -741,6 +747,7 @@ export default function Users() {
|
||||
<label className="block text-gray-700 font-bold mb-1">نقش دسترسی</label>
|
||||
<select
|
||||
value={editFormData.role}
|
||||
disabled={!canManageSuperAdmin && ['superadmin', 'adminsuper'].includes((editUser?.role || '').toLowerCase().replace(/[_-]/g, ''))}
|
||||
onChange={(e) => setEditFormData({ ...editFormData, role: e.target.value })}
|
||||
className="w-full px-3 py-2.5 rounded-xl border border-gray-200 focus:border-purple-500 outline-none font-bold bg-white"
|
||||
>
|
||||
@@ -748,6 +755,10 @@ export default function Users() {
|
||||
<option value="User_Wholesale">خریدار عمده (داروخانه/پتشاپ)</option>
|
||||
<option value="User_B2B">همکار (B2B)</option>
|
||||
<option value="ADMIN">مدیر سیستم (Admin)</option>
|
||||
{canManageSuperAdmin && <option value="SUPER_ADMIN">مدیر ارشد (Super Admin)</option>}
|
||||
{editUser?.role && !['User_PetOwner', 'User_Wholesale', 'User_B2B', 'ADMIN', ...(canManageSuperAdmin ? ['SUPER_ADMIN'] : [])].includes(editUser.role) && (
|
||||
<option value={editUser.role}>{['superadmin', 'adminsuper'].includes(editUser.role.toLowerCase().replace(/[_-]/g, '')) ? 'مدیر ارشد (Super Admin)' : editUser.role}</option>
|
||||
)}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
import {render,screen,fireEvent,within,waitFor} from '@testing-library/react';
|
||||
import {beforeEach,it,expect,vi} from 'vitest';
|
||||
import api from '../services/api';
|
||||
import {orchestration} from '../services/orchestration';
|
||||
import OrchestrationCommandCenter from './OrchestrationCommandCenter';
|
||||
vi.mock('../services/api',()=>({default:{get:vi.fn(),post:vi.fn(),put:vi.fn()}}));
|
||||
const run={id:'r-expired',status:'RUNNING',environment:'staging',commitSha:'a'.repeat(40),artifacts:[]};
|
||||
const task={id:'editorial',key:'editorial-v1:'+ 'a'.repeat(64),title:'Editorial research: Test',department:'CONTENT',operationMode:'PREPARE',state:'RUNNING',version:6,budgetLimitCents:20,metadata:{commitSha:run.commitSha},availableActions:[],runs:[run],editorialRecovery:{runId:run.id}};
|
||||
beforeEach(()=>{vi.resetAllMocks();vi.mocked(api.get).mockImplementation(async url=>({data:url.endsWith('/overview')?{items:[],measuredAt:'now',capabilities:{mutations:true}}:url.endsWith('/tasks')?[task]:task}));});
|
||||
it('posts only the exact expired recovery payload through authenticated API',async()=>{
|
||||
vi.mocked(api.post).mockResolvedValue({data:{}});
|
||||
await orchestration.editorialFailure(task,{runId:run.id,expectedVersion:6,idempotencyKey:'stable',reason:'Process ended'});
|
||||
expect(api.post).toHaveBeenCalledWith('/admin/orchestration/tasks/editorial/editorial-failure',{runId:run.id,expectedVersion:6,idempotencyKey:'stable',reason:'Process ended'});
|
||||
});
|
||||
it.each([{...task,editorialRecovery:undefined},{...task,runs:[]},{...task,runs:[{...run,status:'SUCCEEDED'}]},{...task,runs:[{...run,commitSha:'b'.repeat(40)}]}])('rejects missing or mismatched server recovery binding',async invalid=>{
|
||||
await expect(orchestration.editorialFailure(invalid,{runId:run.id,expectedVersion:6,idempotencyKey:'k',reason:'Process ended'})).rejects.toThrow();expect(api.post).not.toHaveBeenCalled();
|
||||
});
|
||||
it.each(['',' ','x'.repeat(501)])('bounds required recovery reason',async reason=>{
|
||||
await expect(orchestration.editorialFailure(task,{runId:run.id,expectedVersion:6,idempotencyKey:'k',reason})).rejects.toThrow();expect(api.post).not.toHaveBeenCalled();
|
||||
});
|
||||
it('uses fresh detail before modal; freezes retry bytes; blocks concurrency rejection until refresh',async()=>{
|
||||
let details=0;
|
||||
vi.mocked(api.get).mockImplementation(async url=>({data:url.endsWith('/overview')?{items:[],measuredAt:'now',capabilities:{mutations:true}}:url.endsWith('/tasks')?[task]:{...task,version:++details===1?6:7}}));
|
||||
vi.mocked(api.post).mockRejectedValueOnce(new Error('offline')).mockRejectedValueOnce({response:{status:409}});
|
||||
render(<OrchestrationCommandCenter/>);
|
||||
fireEvent.click(await screen.findByRole('button',{name:task.title}));
|
||||
fireEvent.click(await screen.findByRole('button',{name:'ثبت شکست اجرای متوقفشده'}));
|
||||
const dialog=await screen.findByRole('dialog',{name:'ثبت شکست اجرای متوقفشده'});
|
||||
expect(details).toBe(2);expect(api.post).not.toHaveBeenCalled();
|
||||
expect(within(dialog).getByText(/۲۰ سنت.*نامشخص/)).toBeInTheDocument();
|
||||
expect(within(dialog).getByText(/QA.*تأیید خودکار/)).toBeInTheDocument();
|
||||
const submit=within(dialog).getByRole('button',{name:'ثبت شکست'});
|
||||
expect(submit).toBeDisabled();
|
||||
fireEvent.change(within(dialog).getByLabelText('دلیل شکست'),{target:{value:'Process ended'}});
|
||||
fireEvent.click(within(dialog).getByLabelText('ثبت شکست بدون تأیید کیفیت یا آزادسازی بودجه را تأیید میکنم'));
|
||||
fireEvent.click(submit);await within(dialog).findByRole('alert');
|
||||
expect(within(dialog).getByLabelText('دلیل شکست')).toBeDisabled();
|
||||
fireEvent.click(submit);await waitFor(()=>expect(submit).toBeDisabled());
|
||||
expect(api.post).toHaveBeenCalledTimes(2);
|
||||
const payload=vi.mocked(api.post).mock.calls[0][1];expect(payload).toEqual(expect.objectContaining({runId:run.id,expectedVersion:7,reason:'Process ended'}));expect(vi.mocked(api.post).mock.calls[1][1]).toEqual(payload);
|
||||
fireEvent.click(within(dialog).getByRole('button',{name:'بازخوانی و بستن'}));await waitFor(()=>expect(screen.queryByRole('dialog')).not.toBeInTheDocument());
|
||||
});
|
||||
it('refreshes authoritative tasks after success without approval or budget commands',async()=>{
|
||||
vi.mocked(api.post).mockResolvedValue({data:{state:'FAILED'}});
|
||||
render(<OrchestrationCommandCenter/>);fireEvent.click(await screen.findByRole('button',{name:task.title}));fireEvent.click(await screen.findByRole('button',{name:'ثبت شکست اجرای متوقفشده'}));
|
||||
const dialog=await screen.findByRole('dialog');
|
||||
fireEvent.change(within(dialog).getByLabelText('دلیل شکست'),{target:{value:'Process ended'}});
|
||||
fireEvent.click(within(dialog).getByLabelText('ثبت شکست بدون تأیید کیفیت یا آزادسازی بودجه را تأیید میکنم'));
|
||||
fireEvent.click(within(dialog).getByRole('button',{name:'ثبت شکست'}));
|
||||
await waitFor(()=>expect(screen.queryByRole('dialog')).not.toBeInTheDocument());
|
||||
expect(api.post).toHaveBeenCalledTimes(1);expect(api.put).not.toHaveBeenCalled();
|
||||
expect(vi.mocked(api.get).mock.calls.filter(([url])=>url.endsWith('/tasks'))).toHaveLength(2);
|
||||
});
|
||||
it('does not infer eligibility from RUNNING or guessed age',async()=>{
|
||||
vi.mocked(api.get).mockImplementation(async url=>({data:url.endsWith('/tasks')?[task]:{...task,editorialRecovery:undefined}}));
|
||||
render(<OrchestrationCommandCenter/>);fireEvent.click(await screen.findByRole('button',{name:task.title}));await screen.findByRole('region',{name:'جزئیات وظیفه'});
|
||||
expect(screen.queryByRole('button',{name:'ثبت شکست اجرای متوقفشده'})).not.toBeInTheDocument();
|
||||
});
|
||||
it('rejects eligibility removed during fresh open without a mutation',async()=>{
|
||||
let details=0;vi.mocked(api.get).mockImplementation(async url=>({data:url.endsWith('/overview')?{items:[],measuredAt:'now',capabilities:{mutations:true}}:url.endsWith('/tasks')?[task]:{...task,editorialRecovery:++details===1?task.editorialRecovery:undefined}}));
|
||||
render(<OrchestrationCommandCenter/>);fireEvent.click(await screen.findByRole('button',{name:task.title}));fireEvent.click(await screen.findByRole('button',{name:'ثبت شکست اجرای متوقفشده'}));
|
||||
expect(await screen.findByRole('alert')).toHaveTextContent(/بازخوانی/);expect(screen.queryByRole('dialog')).not.toBeInTheDocument();expect(api.post).not.toHaveBeenCalled();
|
||||
});
|
||||
@@ -14,6 +14,11 @@ it('does not restore stale detail after authoritative refresh while detail reque
|
||||
it('keeps payload immutable when navigating after an ambiguous network failure',async()=>{
|
||||
vi.resetAllMocks();const t={id:'t',key:'t',title:'Task identity',department:'DEV',state:'GATE1_PENDING',version:2,operationMode:'PREPARE',budgetLimitCents:0,availableActions:[{id:'g1',label:'Approve safe work',gate:1,decision:'APPROVED'}]};
|
||||
vi.mocked(api.get).mockImplementation(async url=>({data:url.endsWith('/overview')?{items:[],measuredAt:'2026-10-23',capabilities:{mutations:true}}:url.endsWith('/tasks')?[t]:t}));vi.mocked(api.post).mockRejectedValue(new Error('network'));
|
||||
render(<OrchestrationCommandCenter/>);fireEvent.click(await screen.findByRole('button',{name:'Task identity'}));fireEvent.click(await screen.findByRole('button',{name:'تأیید در Gate1'}));const d=within(screen.getByRole('dialog'));fireEvent.change(d.getByLabelText('زمان انقضا'),{target:{value:'2099-01-01T12:00'}});fireEvent.change(d.getByLabelText('دلیل'),{target:{value:'Reviewed'}});fireEvent.click(d.getByLabelText('محدوده و اتصال تغییرناپذیر را بررسی کردم'));fireEvent.click(d.getByRole('button',{name:'تأیید فرمان'}));await d.findByRole('alert');
|
||||
render(<OrchestrationCommandCenter/>);fireEvent.click(await screen.findByRole('button',{name:'Task identity'}));fireEvent.click(await screen.findByRole('button',{name:'تأیید در Gate1'}));const d=within(screen.getByRole('dialog'));expect(d.queryByLabelText('زمان انقضا')).not.toBeInTheDocument();expect(d.getByLabelText('زمان اجرای برنامهریزیشده')).toHaveValue('');fireEvent.change(d.getByLabelText('دلیل'),{target:{value:'Reviewed'}});fireEvent.click(d.getByLabelText('محدوده و اتصال تغییرناپذیر را بررسی کردم'));fireEvent.click(d.getByRole('button',{name:'تأیید فرمان'}));await d.findByRole('alert');
|
||||
const sentPayload=structuredClone(vi.mocked(api.post).mock.calls[0][1]);
|
||||
expect(sentPayload).toMatchObject({expectedVersion:2,decision:'APPROVED',notes:'Reviewed'});
|
||||
expect(sentPayload).not.toHaveProperty('expiresAt');expect(sentPayload).not.toHaveProperty('notBefore');
|
||||
fireEvent.click(screen.getByRole('button',{name:'وظیفهها و تأییدها'}));expect(d.getByLabelText('دلیل')).toHaveValue('Reviewed');expect(d.getByLabelText('محدوده و اتصال تغییرناپذیر را بررسی کردم')).toBeChecked();
|
||||
expect(vi.mocked(api.post).mock.calls[0][1]).toEqual(sentPayload);
|
||||
expect(d.getByLabelText('دلیل')).toBeDisabled();expect(d.getByLabelText('زمان اجرای برنامهریزیشده')).toBeDisabled();
|
||||
});
|
||||
@@ -27,7 +27,7 @@ it('rejects Gate2 evidence from failed runs',async()=>{
|
||||
await expect(orchestration.command({...task,availableActions:[g2],runs:[{id:'r',status:'FAILED',commitSha:'abc',environment:'stage',artifacts:[{id:'a',sha256:'a'.repeat(64)}]}]},g2,{idempotencyKey:'key',expiresAt:'2099-01-01T00:00:00Z',runId:'r',artifactHash:'a'.repeat(64)})).rejects.toThrow(/Gate2.*غیرفعال/);
|
||||
expect(api.post).not.toHaveBeenCalled();
|
||||
});
|
||||
async function dialog(){render(<OrchestrationCommandCenter/>);fireEvent.click(await screen.findByRole('button',{name:'Safe proposal'}));fireEvent.click(await screen.findByRole('button',{name:'تأیید در Gate1'}));const d=within(screen.getByRole('dialog'));fireEvent.change(d.getByLabelText('زمان انقضا'),{target:{value:'2099-01-01T12:00'}});fireEvent.change(d.getByLabelText('دلیل'),{target:{value:'Reviewed bounds'}});fireEvent.click(d.getByLabelText('محدوده و اتصال تغییرناپذیر را بررسی کردم'));return d;}
|
||||
async function dialog(){render(<OrchestrationCommandCenter/>);fireEvent.click(await screen.findByRole('button',{name:'Safe proposal'}));fireEvent.click(await screen.findByRole('button',{name:'تأیید در Gate1'}));const d=within(screen.getByRole('dialog'));expect(d.queryByLabelText('زمان انقضا')).not.toBeInTheDocument();expect(d.getByLabelText('زمان اجرای برنامهریزیشده')).toHaveValue('');fireEvent.change(d.getByLabelText('دلیل'),{target:{value:'Reviewed bounds'}});fireEvent.click(d.getByLabelText('محدوده و اتصال تغییرناپذیر را بررسی کردم'));return d;}
|
||||
it('locks stale 409 command until authoritative refresh instead of retrying stale payload',async()=>{
|
||||
vi.mocked(api.post).mockRejectedValue({response:{status:409,data:{message:'Version conflict'}}});
|
||||
const d=await dialog();fireEvent.click(d.getByRole('button',{name:'تأیید فرمان'}));
|
||||
@@ -41,7 +41,9 @@ it('does not expose authorized task mutations when capabilities are unavailable'
|
||||
render(<OrchestrationCommandCenter/>);fireEvent.click(await screen.findByRole('button',{name:'Safe proposal'}));await screen.findByRole('region',{name:'جزئیات وظیفه'});
|
||||
expect(screen.getByRole('button',{name:'تأیید در Gate1'})).toBeDisabled();
|
||||
});
|
||||
it('prevents confirming an already expired approval',async()=>{
|
||||
const d=await dialog();fireEvent.change(d.getByLabelText('زمان انقضا'),{target:{value:'2020-01-01T12:00'}});
|
||||
it('prevents confirming a scheduled start in the past without sending a command',async()=>{
|
||||
const d=await dialog();fireEvent.change(d.getByLabelText('زمان اجرای برنامهریزیشده'),{target:{value:'2020-01-01T12:00'}});
|
||||
expect(d.getByRole('button',{name:'تأیید فرمان'})).toBeDisabled();
|
||||
fireEvent.click(d.getByRole('button',{name:'تأیید فرمان'}));
|
||||
expect(api.post).not.toHaveBeenCalled();
|
||||
});
|
||||
@@ -34,10 +34,10 @@ export function normalizeActions(value:unknown):ServerAction[] {
|
||||
}
|
||||
export interface Artifact { id: string; sha256: string; kind?: string; uri?: string }
|
||||
export interface Run { id: string; commitSha: string; environment: string; status: string; artifacts: Artifact[] }
|
||||
export interface Task { id: string; key: string; title: string; department: string; state: string; version: number; operationMode: string; budgetLimitCents: number; metadata?: Record<string, unknown>; availableActions: ServerAction[]; runs?: Run[]; decisions?: Record<string, unknown>[]; events?: Record<string, unknown>[]; budgetLedger?: Record<string, unknown>[] }
|
||||
export interface CommandInput { idempotencyKey: string; reason?: string; expiresAt?: string; runId?: string; artifactHash?: string }
|
||||
export interface Task { id: string; key: string; title: string; department: string; state: string; displayState?: string; editorialRecovery?: {runId:string}; version: number; operationMode: string; budgetLimitCents: number; metadata?: Record<string, unknown>; availableActions: ServerAction[]; runs?: Run[]; decisions?: Record<string, unknown>[]; events?: Record<string, unknown>[]; budgetLedger?: Record<string, unknown>[] }
|
||||
export interface CommandInput { idempotencyKey: string; reason?: string; expiresAt?: string; notBefore?: string; runId?: string; artifactHash?: string }
|
||||
export interface TransitionDto {toState:string;expectedVersion:number;idempotencyKey:string;reason?:string}
|
||||
export interface GateDecisionDto {decision:'APPROVED'|'REJECTED';expectedVersion:number;idempotencyKey:string;expiresAt:string;notes?:string;runId?:string;artifactHash?:string;commitSha?:string;environment?:string}
|
||||
export interface GateDecisionDto {decision:'APPROVED'|'REJECTED';expectedVersion:number;idempotencyKey:string;expiresAt?:string;notBefore?:string;notes?:string;runId?:string;artifactHash?:string;commitSha?:string;environment?:string}
|
||||
export function actionBlockReason(task:Task,action:ServerAction):string|undefined {
|
||||
if(action.gate===2)return 'Gate2 و انتشار در این پنل غیرفعال هستند';
|
||||
if(action.disabledReason)return 'اقدام توسط سرور غیرفعال شده است: '+action.disabledReason;
|
||||
@@ -69,7 +69,18 @@ export function proposalError(input:CreateTaskInput):string|undefined {
|
||||
if(!Array.isArray(input.metadata?.acceptanceCriteria)||input.metadata.acceptanceCriteria.length<1||input.metadata.acceptanceCriteria.length>20||input.metadata.acceptanceCriteria.some(value=>typeof value!=='string'||!value.trim()||value.length>500))return 'Acceptance criteria must contain 1..20 nonblank strings of at most 500 characters';
|
||||
if(!input.key.trim()||input.key.length>120||!input.title.trim()||input.title.length>255||!input.department.trim()||input.department.length>50)return 'کلید (۱ تا ۱۲۰)، عنوان (۱ تا ۲۵۵) و دپارتمان (۱ تا ۵۰ نویسه) الزامی است';
|
||||
}
|
||||
export interface EditorialFailureInput {runId:string;expectedVersion:number;idempotencyKey:string;reason:string}
|
||||
// Eligibility is a safe server hint, never inferred from elapsed browser time.
|
||||
export function editorialRecoveryRun(task:Task):Run|undefined {
|
||||
if(task.state!=='RUNNING'||task.operationMode!=='PREPARE'||task.department!=='CONTENT'||task.budgetLimitCents!==20||!/^editorial-v1:[a-f0-9]{64}$/.test(task.key))return;
|
||||
const matches=task.runs?.filter(r=>r.id===task.editorialRecovery?.runId&&r.status==='RUNNING'&&r.environment==='staging'&&r.commitSha===task.metadata?.commitSha&&Array.isArray(r.artifacts)&&!r.artifacts.length);
|
||||
return matches?.length===1?matches[0]:undefined;
|
||||
}
|
||||
export const orchestration = {
|
||||
async editorialFailure(task:Task,input:EditorialFailureInput):Promise<unknown> {
|
||||
if(!editorialRecoveryRun(task)||input.runId!==task.editorialRecovery?.runId||input.expectedVersion!==task.version||!Number.isInteger(input.expectedVersion)||!input.idempotencyKey||typeof input.reason!=='string'||!input.reason.trim()||input.reason.length>500)throw new Error('اتصال بازیابی معتبر نیست؛ وضعیت را بازخوانی کنید');
|
||||
return (await api.post('/admin/orchestration/tasks/'+encodeURIComponent(task.id)+'/editorial-failure',{runId:input.runId,expectedVersion:input.expectedVersion,idempotencyKey:input.idempotencyKey,reason:input.reason})).data;
|
||||
},
|
||||
async create(input:CreateTaskInput):Promise<unknown> {
|
||||
const error=proposalError(input);if(error)throw new Error(error);
|
||||
// Preserve human evidence exactly; workflowScope/environment/identity remain server-owned.
|
||||
@@ -102,8 +113,9 @@ export const orchestration = {
|
||||
if (!input.idempotencyKey || !Number.isInteger(task.version)) throw new Error('نسخه و کلید جلوگیری از تکرار الزامی است');
|
||||
const base = '/admin/orchestration/tasks/' + encodeURIComponent(task.id);
|
||||
if (action.gate && action.decision) {
|
||||
if (!input.expiresAt || !(Date.parse(input.expiresAt) > Date.now())) throw new Error('زمان انقضا باید در آینده باشد');
|
||||
if(['APPROVE_GATE1','REJECT_GATE1'].includes(action.id)&&Date.parse(input.expiresAt)>Date.now()+86400000)throw new Error('انقضای Gate1 باید در ۲۴ ساعت آینده باشد');
|
||||
if (input.notBefore && (action.decision!=='APPROVED' || !(Date.parse(input.notBefore)>Date.now()) || Date.parse(input.notBefore)>Date.now()+30*86400000)) throw new Error('زمان اجرا باید در آینده و حداکثر ۳۰ روز باشد');
|
||||
if (input.expiresAt && !(Date.parse(input.expiresAt)>Date.now())) throw new Error('زمان انقضا باید در آینده باشد');
|
||||
if(input.expiresAt && Date.parse(input.expiresAt)>(input.notBefore?Date.parse(input.notBefore):Date.now())+86400000) throw new Error('انقضای Gate1 باید در ۲۴ ساعت پس از زمان اجرا باشد');
|
||||
let binding = {};
|
||||
if (action.gate === 2 && action.decision === 'APPROVED') {
|
||||
const run = task.runs?.find(r => r.id === input.runId);
|
||||
@@ -111,7 +123,7 @@ export const orchestration = {
|
||||
if (!run?.commitSha || !run.environment || !run.artifacts.some(a => a.sha256 === input.artifactHash)) throw new Error('Registered immutable Gate2 binding required');
|
||||
binding = {runId:run.id, artifactHash:input.artifactHash, commitSha:run.commitSha, environment:run.environment};
|
||||
}
|
||||
return (await api.post(base + `/gates/${action.gate}/decide`, {expectedVersion:task.version,idempotencyKey:input.idempotencyKey,decision:action.decision,expiresAt:input.expiresAt,notes:input.reason,...binding})).data;
|
||||
return (await api.post(base + `/gates/${action.gate}/decide`, {expectedVersion:task.version,idempotencyKey:input.idempotencyKey,decision:action.decision,...(input.expiresAt?{expiresAt:input.expiresAt}:{}),...(input.notBefore?{notBefore:input.notBefore}:{}),notes:input.reason,...binding})).data;
|
||||
}
|
||||
if (!action.toState) throw new Error('اقدام سرور پشتیبانی نمیشود');
|
||||
return (await api.put(base + '/transition', {toState:action.toState,expectedVersion:task.version,idempotencyKey:input.idempotencyKey,reason:input.reason})).data;
|
||||
|
||||
@@ -1 +1,13 @@
|
||||
import '@testing-library/jest-dom/vitest';
|
||||
|
||||
// Vitest preserves Node 26's host storage globals when populating jsdom.
|
||||
// Bind the actual jsdom Storage objects, not the unavailable host storage.
|
||||
const browserWindow = (globalThis as typeof globalThis & {
|
||||
jsdom: { window: Window };
|
||||
}).jsdom.window;
|
||||
for (const name of ['localStorage', 'sessionStorage'] as const) {
|
||||
Object.defineProperty(globalThis, name, {
|
||||
configurable: true,
|
||||
value: browserWindow[name],
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
import { expect, it } from 'vitest';
|
||||
|
||||
it('uses browser storage for persistent auth instead of Node host storage', () => {
|
||||
expect(localStorage).toBe(window.localStorage);
|
||||
expect(localStorage).toBeInstanceOf(window.Storage);
|
||||
expect(sessionStorage).toBeInstanceOf(window.Storage);
|
||||
localStorage.setItem('storage-probe', 'browser');
|
||||
expect(localStorage.getItem('storage-probe')).toBe('browser');
|
||||
localStorage.removeItem('storage-probe');
|
||||
});
|
||||
@@ -79,9 +79,9 @@ export default function AnalyticsDeferred({ gtmId, gaId, clarityId }: AnalyticsD
|
||||
if (gaId) {
|
||||
window.dataLayer = window.dataLayer || [];
|
||||
function gtag(..._args: any[]) {
|
||||
// Note: Google's gtag.js specifically expects the native `arguments` object.
|
||||
// Pushing an ES6 Array causes gtag.js to silently ignore tracking commands.
|
||||
window.dataLayer?.push(arguments);
|
||||
// gtag.js consumes the native Arguments object, not an ES6 rest array.
|
||||
// valueOf returns that same object without converting the vendor payload.
|
||||
window.dataLayer?.push(arguments.valueOf());
|
||||
}
|
||||
window.gtag = gtag;
|
||||
gtag('js', new Date());
|
||||
|
||||
@@ -105,10 +105,10 @@ export default function BlogPage({
|
||||
if (sortBy === "most_viewed") {
|
||||
return (b.viewCount ?? 0) - (a.viewCount ?? 0);
|
||||
}
|
||||
if (sortBy === "oldest") {
|
||||
return new Date(a.date).getTime() - new Date(b.date).getTime();
|
||||
}
|
||||
return new Date(b.date).getTime() - new Date(a.date).getTime();
|
||||
// `date` is a localized Persian display value, not a parseable timestamp.
|
||||
const aPublished = Date.parse(publicationDate(a) || '') || 0;
|
||||
const bPublished = Date.parse(publicationDate(b) || '') || 0;
|
||||
return sortBy === "oldest" ? aPublished - bPublished : bPublished - aPublished;
|
||||
});
|
||||
}, [blogs, selectedCategory, searchQuery, selectedTag, sortBy]);
|
||||
|
||||
|
||||
@@ -214,6 +214,11 @@ export default function BlogPostClient({ blog, publishedDate, authorName, author
|
||||
<div className="font-bold text-xs text-medical-gray-400 mt-0.5">
|
||||
تیم: {authorTeam || blog.authorTeam || BLOG_TEAM_FALLBACK}
|
||||
</div>
|
||||
{typeof blog.authorRole === 'string' && blog.authorRole.trim() && (
|
||||
<div className="font-bold text-xs text-medical-gray-500 mt-1">
|
||||
نقش نویسنده: {blog.authorRole.trim()}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex items-center gap-2">
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
import React from 'react';
|
||||
import { afterEach, describe, expect, it, vi } from 'vitest';
|
||||
import { act, cleanup, fireEvent, render, screen } from '@testing-library/react';
|
||||
import BlogPage, { type BlogPostItem } from '../BlogPage';
|
||||
|
||||
vi.mock('next/navigation', () => ({ useRouter: () => ({ push: vi.fn(), replace: vi.fn() }) }));
|
||||
vi.mock('../../lib/services/productService', () => ({ productService: { getProducts: vi.fn().mockResolvedValue({ data: [] }) } }));
|
||||
vi.mock('next/image', () => ({ default: ({ fill, priority, unoptimized, ...props }: any) => <img {...props} /> }));
|
||||
vi.mock('motion/react', async () => {
|
||||
const React = await import('react');
|
||||
const cache: Record<string, React.ComponentType<any>> = {};
|
||||
return { AnimatePresence: ({ children }: any) => children, motion: new Proxy({}, { get: (_, tag: string) => cache[tag] ||= React.forwardRef(function MotionElement({ children, ...props }: any, ref) { return React.createElement(tag, { ...Object.fromEntries(Object.entries(props).filter(([key]) => !['initial', 'animate', 'exit', 'transition', 'whileHover', 'whileTap', 'whileInView', 'viewport', 'layout'].includes(key))), ref }, children); }) }) };
|
||||
});
|
||||
afterEach(cleanup);
|
||||
|
||||
const post = (id: string, dates: Partial<BlogPostItem> = {}): BlogPostItem => ({
|
||||
id, slug: id, title: `Article ${id}`, excerpt: 'Health guide', image: '/a.png',
|
||||
author: 'Author', content: '', date: '۱۴۰۵/۸/۳', categoryId: 'health',
|
||||
tags: [{ id: 'tag', name: 'health' }], ...dates,
|
||||
});
|
||||
const posts = [
|
||||
post('middle', { publishedAt: '2026-10-24T12:00:00Z', createdAt: '2026-01-01T00:00:00Z', viewCount: 30 }),
|
||||
post('old', { publishedAt: '2026-10-23T12:00:00Z', createdAt: '2026-10-26T00:00:00Z', viewCount: 80 }),
|
||||
post('new', { createdAt: '2026-10-25T12:00:00Z', viewCount: 10 }),
|
||||
];
|
||||
const titles = () => screen.getAllByRole('link').filter(link => link.getAttribute('href')?.startsWith('/blog/')).map(link => link.querySelector('h2,h3')?.textContent);
|
||||
|
||||
describe('BlogPage sorting', () => {
|
||||
it('defaults to newest using raw publication time with createdAt fallback, not the Persian display date', async () => {
|
||||
await act(async () => { render(<BlogPage blogs={posts} />); });
|
||||
expect(titles()).toEqual(['Article new', 'Article middle', 'Article old']);
|
||||
expect(posts.map(post => post.id)).toEqual(['middle', 'old', 'new']);
|
||||
});
|
||||
it('switches to oldest using publication rather than creation or localized dates', async () => {
|
||||
await act(async () => { render(<BlogPage blogs={posts} />); });
|
||||
fireEvent.change(screen.getByRole('combobox'), { target: { value: 'oldest' } });
|
||||
expect(titles()).toEqual(['Article old', 'Article middle', 'Article new']);
|
||||
});
|
||||
it('supports exactly newest, oldest and most_viewed, keeping popularity independent of dates', async () => {
|
||||
await act(async () => { render(<BlogPage blogs={posts} />); });
|
||||
expect(screen.getAllByRole('option').map(option => option.getAttribute('value'))).toEqual(['newest', 'oldest', 'most_viewed']);
|
||||
fireEvent.change(screen.getByRole('combobox'), { target: { value: 'most_viewed' } });
|
||||
expect(titles()).toEqual(['Article old', 'Article middle', 'Article new']);
|
||||
fireEvent.change(screen.getByRole('combobox'), { target: { value: 'newest' } });
|
||||
expect(titles()).toEqual(['Article new', 'Article middle', 'Article old']);
|
||||
});
|
||||
it('preserves featured priority, combined filters and six-at-a-time pagination while sorting', async () => {
|
||||
const collection = Array.from({ length: 10 }, (_, index) => post(String(index), {
|
||||
publishedAt: `2026-10-${String(index + 10).padStart(2, '0')}T12:00:00Z`,
|
||||
featured: index === 2,
|
||||
}));
|
||||
await act(async () => { render(<BlogPage blogs={[...collection, post('excluded', { categoryId: 'other' })]} categories={[{ id: 'health', name: 'Health', slug: 'health' }]} />); });
|
||||
fireEvent.click(screen.getByRole('button', { name: 'Health' }));
|
||||
fireEvent.change(screen.getByPlaceholderText('جستجو در موضوعات، بیماریها، ویتامینها...'), { target: { value: 'Health guide' } });
|
||||
fireEvent.click(screen.getByRole('button', { name: '#health' }));
|
||||
expect(titles()).toEqual(['Article 2', 'Article 9', 'Article 8', 'Article 7', 'Article 6', 'Article 5', 'Article 4']);
|
||||
fireEvent.click(screen.getByRole('button', { name: /مشاهده ۶ مقاله بیشتر/ }));
|
||||
expect(titles()).toHaveLength(10);
|
||||
fireEvent.change(screen.getByRole('combobox'), { target: { value: 'oldest' } });
|
||||
expect(titles()).toEqual(['Article 2', 'Article 0', 'Article 1', 'Article 3', 'Article 4', 'Article 5', 'Article 6', 'Article 7', 'Article 8', 'Article 9']);
|
||||
expect(screen.queryByText('Article excluded')).not.toBeInTheDocument();
|
||||
});
|
||||
it('keeps equal or unavailable raw dates stable without parsing localized display strings', async () => {
|
||||
await act(async () => { render(<BlogPage blogs={[post('missing'), post('also-missing'), ...posts]} />); });
|
||||
expect(titles()).toEqual(['Article new', 'Article middle', 'Article old', 'Article missing', 'Article also-missing']);
|
||||
fireEvent.change(screen.getByRole('combobox'), { target: { value: 'oldest' } });
|
||||
expect(titles()).toEqual(['Article missing', 'Article also-missing', 'Article old', 'Article middle', 'Article new']);
|
||||
});
|
||||
});
|
||||
@@ -119,6 +119,14 @@ describe("BlogPostClient Component", () => {
|
||||
expect(document.querySelectorAll("time[datetime]").length).toBe(2);
|
||||
});
|
||||
|
||||
it("displays an explicit author role without inventing one for older articles", () => {
|
||||
const props = { sanitizedContent: mockBlog.content, publishedDate: "۱۴۰۵/۸/۳", authorName: "کارشناس کنینا" };
|
||||
const { rerender } = render(<BlogPostClient {...props} blog={{ ...mockBlog, authorRole: "پژوهش مراقبت گوش و نگهداری ایمن" }} />);
|
||||
expect(screen.getByText("نقش نویسنده: پژوهش مراقبت گوش و نگهداری ایمن")).toBeInTheDocument();
|
||||
rerender(<BlogPostClient {...props} blog={{ ...mockBlog, authorRole: " " }} />);
|
||||
expect(screen.queryByText(/نقش نویسنده:/)).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("registers blog view count on mount via API", async () => {
|
||||
render(
|
||||
<BlogPostClient
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
import { describe, expect, it } from 'vitest';
|
||||
import { extractFaqsFromHtml } from './extractFaqs';
|
||||
|
||||
describe('FAQ heading boundaries', () => {
|
||||
it('never merges intervening care lists or section headings into a question', () => {
|
||||
const html = `<h2>تا زمان معاینه چه کارهایی کمخطرتر است؟</h2>
|
||||
<ul><li>از دستکاری گوش خودداری کنید.</li></ul>
|
||||
<p>این اقدامات درمان نیستند.</p>
|
||||
<h2>چه چیزهایی داخل گوش نریزیم؟</h2><p>مواد خانگی استفاده نکنید.</p>
|
||||
<h2>پرسشهای رایج</h2><h3>آیا بو یعنی عفونت است؟</h3><p>خیر، معاینه لازم است.</p>`;
|
||||
expect(extractFaqsFromHtml(html)).toEqual([
|
||||
{ question: 'چه چیزهایی داخل گوش نریزیم؟', answer: 'مواد خانگی استفاده نکنید.' },
|
||||
{ question: 'آیا بو یعنی عفونت است؟', answer: 'خیر، معاینه لازم است.' },
|
||||
]);
|
||||
});
|
||||
});
|
||||
@@ -61,11 +61,11 @@ export function extractFaqsFromHtml(html: string): FAQItem[] {
|
||||
|
||||
// 3. Headings with questions followed immediately by paragraph answers:
|
||||
// e.g. <h2>پرسش: آیا این مکمل برای سگ مفید است؟</h2> <p>بله، کاملاً مفید است.</p>
|
||||
const headingRegex = /<h[2-4][^>]*>([\s\S]*?)<\/h[2-4]>\s*<p[^>]*>([\s\S]*?)<\/p>/gi;
|
||||
const headingRegex = /<h([2-4])\b[^>]*>((?:(?!<\/?h[1-6]\b)[\s\S])*?)<\/h\1>\s*<p[^>]*>([\s\S]*?)<\/p>/gi;
|
||||
let headingMatch;
|
||||
while ((headingMatch = headingRegex.exec(html)) !== null) {
|
||||
const rawHeading = headingMatch[1].replace(/<[^>]+>/g, '').trim();
|
||||
const rawParagraph = headingMatch[2].replace(/<[^>]+>/g, ' ').replace(/\s+/g, ' ').trim();
|
||||
const rawHeading = headingMatch[2].replace(/<[^>]+>/g, '').trim();
|
||||
const rawParagraph = headingMatch[3].replace(/<[^>]+>/g, ' ').replace(/\s+/g, ' ').trim();
|
||||
if (
|
||||
(rawHeading.endsWith('?') ||
|
||||
rawHeading.endsWith('؟') ||
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
# Completed run ingestion (Stage only; no research retry)
|
||||
|
||||
Implemented admin protocol: `POST https://stageapi.canina.ir/api/admin/orchestration/tasks/f66588b6-197f-4435-9241-a64e8e22e0d0/editorial-completed-recovery` using an authenticated independent SUPER_ADMIN reviewer. Ordinary PMO credentials cannot call it. Do not invoke until CI integrates this change and the evidence/correction is independently reviewed.
|
||||
|
||||
Request body: `{runId,expectedVersion,evidenceSha256,evidence}`. `evidenceSha256` is SHA256 of UTF8 JavaScript `JSON.stringify(evidence)` (not pretty JSON). `evidence` must contain exact taskId/runId/expectedVersion/commitSha, originalText (unaltered PMO final response), four ordered sessions `{profile,sessionId,outputSha256,outcome:"COMPLETED"}`, original worker retrieval outputs `{retrievalEvents}`, validated corrected `brief`, and `correction:{mode:"STORED_REPORTS_ONLY",statusChanges:[{index,from,to,reason}],omissions:[{collection,index,reason}],reason}`.
|
||||
|
||||
The reviewer must independently compare the session IDs, final output hashes and retrieval events with the read-only stored sessions before authorizing submission. Evidence is a reviewer assertion, not an independently authenticated Hermes attestation. The backend stores the original evidence append-only, reads and verifies its canonical bytes/hash within the same transaction, and binds the recovered unreviewed artifact to that hash. It neither renews nor fabricates a worker lease. It atomically fences the expired original lease, retains the existing reservation, creates no QA attestation, and enters VERIFYING/AWAITING_QA only.
|
||||
|
||||
Backend requires currently valid independent Gate1, exact current version, existing RUNNING same run, expired PMO lease, Stage commit binding, no artifacts, existing unreconciled 20-cent reservation, no cancellation and applicable kill-switch clearance. It never claims, reserves or invokes a model. Replays fail closed after the first ingestion; read status rather than retry after transport uncertainty.
|
||||
|
||||
## Actual read-only diagnosis
|
||||
|
||||
Original PMO session `20261024_164737_96755a`, output SHA256 `f8cea0e486cb9a909294ba1278885c3b48377bcf1d02f28d112675730bf3dc8c`. All ten availability statuses violate the strict enum. Five of eleven findings fail matched successful extraction provenance. Original JSON and original tool stream evidence are preserved in `tests/fixtures/completed-ingestion.json` as a diagnostic fixture, NOT an accepted artifact or QA result.
|
||||
|
||||
Do not guess mappings for `research_only`, `qualified`, `pending`, or `unknown_reserved`: those describe authority/qualification/cost, not availability. A grounded PMO schema correction using ONLY stored reports is needed unless the reviewer can establish precise availability semantics. No model call was made for this patch. Do not silently trim candidate source lists: this implementation rejects rewritten findings/candidates and accepts only unchanged retained entries with explicit omission metadata for every excluded entry. If fewer than three whole unchanged candidates remain, schema-only correction is required; do not weaken the validator.
|
||||
|
||||
## Safe invocation after review
|
||||
|
||||
Produce private reviewed `recovery-request.json` using the exact existing run and current version from authenticated read-back; never infer a run ID from a session ID. Use an HTTP client that reads the reviewer bearer token from a private credential file, supplies the request via `--data-binary @recovery-request.json`, and does not print credentials. Endpoint above is the exact protocol; no ready-to-submit payload is supplied because original ambiguous statuses have not been corrected. Close the temporary reviewer via the existing generation-fenced cleanup in a finally block, and verify zero matching accounts/handle removal.
|
||||
|
||||
No push, deployment, live database mutation, model call, new task, failure terminalization or budget reconciliation was performed.
|
||||
|
||||
## Disposable security regression
|
||||
|
||||
Run `sh backend/test-completed-recovery-disposable.sh` on an authorized Docker host. It resolves the dependency image (`RECOVERY_TEST_IMAGE`, default `stage-backend_stage:latest`) to its immutable local ID, copies dependencies into a disposable container, creates an internal-only Docker network and tmpfs PostgreSQL16 without published ports, and removes containers/network on exit. No application environment files or database connections are used. Redis blacklist lookup is a deliberately empty test adapter; JWT verification, persisted user/session/generation/expiry lookup, role guards, DTO validation, controller, service, transactions and PostgreSQL triggers are real.
|
||||
|
||||
The new `completed-recovery-http.spec.ts` uses synthetic report/retrieval bytes only, never the actual task. It covers temporary reviewer access versus ordinary admin, generation mismatch, invalid JWT, strict DTO and unrelated reconciliation-route denial; concurrent same-run ingestion/replay; evidence and artifact digest read-back; append-only triggers; pending independent QA and unchanged reservation; old lease heartbeat/result rejection; and failed canonical read-back rollback via a disposable INSERT trigger. Rejection cases include unmatched retrieval, rewritten candidates, hash/version/commit mismatch, active lease, expired approval, cancellation and STOP_AGENTS.
|
||||
|
||||
Observed verification: 5 suites passed, 1 existing bridge suite skipped (5 gated tests), 23 tests passed, `tsc --noEmit` passed. This is disposable schema coverage using `prisma db push` plus the exact tracked append-only migration, NOT full-chain migration coverage, live acceptance, independent artifact QA, or a claim that unknown cost is zero. The actual unknown 100-cent aggregate reservation is not read or mutated by these tests; each synthetic run preserves its own 20-cent reservation.
|
||||
|
||||
The temporary principal JWT allowlist now permits only the additional exact POST suffix `editorial-completed-recovery`; no broad administrative prefix was opened. Parent must independently review/promote the commit and review the actual stored-reports-only correction before invoking the protocol. No ready-to-submit correction for the ambiguous actual statuses is fabricated here.
|
||||
@@ -0,0 +1,19 @@
|
||||
# Stage functional bring-up policy
|
||||
|
||||
The previous 120-second/profile, eight-turn and 540-second task limits were assistant-selected, not owner requirements. They are removed for functional bring-up; completion precedes optimization.
|
||||
|
||||
## Persistent CI configuration
|
||||
|
||||
`model-policy.json` is the exact source allowlist: 28 entries in the actual `canina_department_registry.yaml` (including PMO), plus the installed canonical `canina-blog-qa-worker`, total **29**. CI provisioning calls the tracked installer to set only `model.default: Canina-content`, `agent.max_turns: 0`, and `agent.run_budget_seconds: 0`. Every other config byte, file mode, provider, base URL, credential and platform gate is preserved. The default/root assistant and legacy alias profiles are out of scope. Unknown registry membership or unsafe destination files stop installation. No provider credential is copied into the payload, report or a rollback journal. Rerunning the model policy is idempotent.
|
||||
|
||||
Installed Hermes source verified: `hermes_cli.config.resolve_turn_limit(0)` resolves to `TURN_LIMIT_UNLIMITED`; CLI `--max-turns` accepts integers. `agent.agent_init._normalize_run_budget_seconds(0)` disables the advisory budget. The runner uses `--model Canina-content --max-turns 0 --run-budget 0`; explicit zeros override stale profile defaults. There is no default per-profile/task research deadline or external timeout command. Explicit duration seams exist only for deterministic tests or an independently approved infrastructure watchdog, never a hidden production default.
|
||||
|
||||
## One supervised execution after parent promotion
|
||||
|
||||
1. Parent promotes the tested SHA through Stage CI; this child does not push, deploy or call models.
|
||||
2. Open the CI temporary reviewer only for approval/recovery. Its 600-second TTL is an approval/recovery window, **not a research execution deadline**. Keep existing generation fencing and durable cleanup unchanged.
|
||||
3. Verify fresh Gate1 and exact READY task/commit. Close the temporary principal immediately after Gate1, verify closure, and only then invoke the worker using its dedicated PMO worker credential. Do not wrap research in the temporary account's context, cleanup deadline, CI job timeout or SSH timeout.
|
||||
4. Run one actual task in supervised background under the real Hermes UID. Use five-second authenticated heartbeats, collect allowlisted diagnostics and monitor task state. Natural completion is required; no autonomous replay/retry. Operator SIGTERM/SIGINT and heartbeat failure kill the entire child process group. Backend kill/cancel/lease generation remain authoritative.
|
||||
5. Accept only exactly one successful terminal `result` envelope, not streamed text or `finish_reason=stop`. Preserve source-retrieval validation, independent QA pending, artifact digest/read-back and unknown-cost reservations. Do not reconcile the prior unknown 80 cents to fabricated zero.
|
||||
|
||||
HTTP timeouts, CLI help timeout, input/output/security bounds and the research-only tool allowlist remain. No article/image/publication/QA approval or Production authority is introduced. New tests are synthetic process/config transport evidence, not live research, provider behavior or factual QA evidence.
|
||||
@@ -0,0 +1,24 @@
|
||||
# Competitor profile protocol diagnosis (no paid retry)
|
||||
|
||||
Base: `471243390`; runtime inspected read-only as user `hermes`.
|
||||
|
||||
## Observed evidence
|
||||
|
||||
* Installed `/opt/hermes/bin/hermes chat --help` exits 0 and accepts every argument used by runner, including `--query-file -`, `--oneshot`, `--format stream-json`, `--toolsets`, `--max-turns`, `--run-budget`, and `--ignore-rules`. stream-json implies quiet. Invalid flags/banner/model unavailability are not supported by the evidence.
|
||||
* Canonical competitor config, .env, logs, and private cache are readable/writable by hermes. No credential values were returned.
|
||||
* Read-only SQLite metadata for session `20261024_111941_64c954` shows 8 API calls, 8 tool calls, no `ended_at`, and no final assistant answer. Calls were three searches followed by five extracts; the last persisted entry is the fifth extract request without its result.
|
||||
* Agent logs show startup at 11:19:36, first search at 11:20:03, and last extract start at 11:21:23. This is consistent with runner's 120-second hard wall killing an active retrieval, including CLI startup. It is NOT evidence of invalid CLI flags or an unavailable model. Exact original exception cannot be proven: runner deleted stdout/stderr and collapsed the cause to RUNNER_ERROR.
|
||||
* Installed web_extract schema requires char_limit >=2000 and its implementation clamps to 2000. Runner requested 1000 and falsely promised that would fit the emitter's 5000-character cap. Several persisted tool outputs exceeded 5000; such event output is truncated and cannot be decoded as retrieval proof. This remains fail-closed; truncated text is never accepted as source evidence.
|
||||
|
||||
## Changes
|
||||
|
||||
* Preclaim `chat --help` capability check for each canonical profile environment. No model/credential resolution occurs in this help check; it cannot establish upstream model availability.
|
||||
* Preserve constant safe categories for wall-clock timeout, process/init failure, malformed stream, and forbidden tool. Parse nonzero terminal envelopes before classifying; never persist or reflect provider text, prompts, stderr, or raw output.
|
||||
* Correct char_limit to 2000 and bound requested search/retrieval exploration so the model has turns left to finish. Prompt guidance is not an enforcement guarantee and does not make unreliable retrieval available.
|
||||
* Actual installed `StreamJsonEmitter` is exercised directly without constructing an agent or invoking a model. Synthetic process failures are explicitly test-only and not research evidence.
|
||||
|
||||
## Verification and limits
|
||||
|
||||
`python3 -m unittest discover -s infra/hermes-editorial/tests -v` discovers all editorial Python tests. The installed-emitter test runs when the installed module exists, or set `HERMES_STREAM_JSON_SOURCE` to a copied installed source. Never substitute a made-up envelope fixture for this check.
|
||||
|
||||
No task/lease/recovery mutations, runner execution, model invocation, production cron, deploy, or push were performed. No increase in cost reservation or wall-clock limit. Lost live output means timeout is strongly indicated, not conclusively reconstructed. Web availability and successful paid end-to-end completion remain unverified. Reservations remain unknown/retained.
|
||||
@@ -0,0 +1,76 @@
|
||||
# Hermes editorial runtime distribution v4.1.0
|
||||
|
||||
Config-only tracked artifact for `canina-hermes`, explicit home `/opt/data`.
|
||||
No deployment or runtime writes were performed by this change. Parent owns CI
|
||||
copy/provisioning and Stage bridge acceptance. No dependencies beyond Python stdlib.
|
||||
|
||||
## Isolated verification / approved CI usage
|
||||
|
||||
```
|
||||
python3 -m unittest discover -s infra/hermes-editorial/tests -v
|
||||
python3 infra/hermes-editorial/installer.py install --target-home /ABSOLUTE/DISPOSABLE/HOME
|
||||
python3 infra/hermes-editorial/installer.py verify --target-home /ABSOLUTE/DISPOSABLE/HOME
|
||||
python3 infra/hermes-editorial/installer.py rollback --target-home /ABSOLUTE/DISPOSABLE/HOME
|
||||
```
|
||||
|
||||
Never use live `/opt/data` until the parent-approved CI installation step. Installer
|
||||
requires an explicit existing absolute home. Exact 19-file allowlist and SHA-256
|
||||
manifest cover unique `canina-editorial-v4` skills for six canonical profiles plus
|
||||
blocked status. No root skill inheritance is assumed. Profile discovery requires
|
||||
fresh-session validation after CI; copying bytes alone is not runtime discovery.
|
||||
|
||||
Each changed file is fsynced and atomically replaced on its destination filesystem.
|
||||
A durable write-ahead rollback journal records only allowlisted owned files and
|
||||
original modes; a process lock rejects concurrent installers. Synchronous failures
|
||||
restore the prior files. Process death may leave a partial transaction: rollback
|
||||
before retry; never activate consumers during install. This is per-file atomicity,
|
||||
not a claim of a globally atomic multi-directory swap. Rollback preflights every
|
||||
file, refuses external-edit conflicts, restores old bytes/modes, removes newly
|
||||
installed files, and leaves empty directories/lock. An unchanged reinstall performs
|
||||
no byte/mtime changes. Different-version upgrades require rollback first. Do not
|
||||
edit or symlink managed paths concurrently; installer rejects existing symlink
|
||||
ancestors but is not an adversarial filesystem sandbox.
|
||||
|
||||
## Read-only target findings (2026-10-24 UTC)
|
||||
|
||||
Inspected canonical `pmo`, `canina-competitor-worker`, `canina-seo-worker`,
|
||||
`canina-content-worker`, `canina-vet-review-worker`, `canina-qa-worker` under
|
||||
`/opt/data/profiles`. All exist; registry uses these names. PMO filesystem skill
|
||||
inventory lacks `canina-daily-content-publisher`; Content has it. Root publisher
|
||||
exists at `/opt/data/skills/canina/canina-daily-content-publisher/SKILL.md`.
|
||||
Existing cron JSON contains 17 jobs, all `enabled:false`, `state:paused` (there is
|
||||
no `paused` boolean field). CLI resolves `/opt/hermes/bin/hermes`.
|
||||
No secret values, config files, cron prompts or database contents were copied.
|
||||
Target checks establish filesystem availability, not an end-to-end workflow.
|
||||
|
||||
## Backend proposal bridge integration contract
|
||||
|
||||
Parent reports implementation `09dbe4d`, integrated as `64419f6`. This bundle does
|
||||
not mark dispatch or actual execution verified merely because this endpoint exists.
|
||||
CI/grant provisioning belongs to parent. No speculative token path or grants are
|
||||
created here; parent must pin the dedicated PMO secret file and service origin
|
||||
before implementing/exercising a submitting client. Never pass tokens in argv,
|
||||
print tokens, use generic admin grants, or submit to Production.
|
||||
|
||||
* POST `/api/internal/prepare-worker/editorial-proposals`, authenticated Bearer
|
||||
dedicated grant with id `pmo`, role `WORKFLOW_WORKER`, explicitly listed in
|
||||
`workerIds`.
|
||||
* DTO: `requestId` UUID; `pilotKind:editorial-research-to-brief-v1`;
|
||||
`operationMode:PREPARE`; `environment:staging`;
|
||||
`scope:EDITORIAL_RESEARCH_TO_BRIEF`; `researchTopic` <=180 characters;
|
||||
`acceptanceCriteria` 1..10 strings each <=500 characters; `commitSha` 40 lowercase
|
||||
hexadecimal characters; `budgetLimitCents:20`.
|
||||
* Response: `taskId`, `key`, `state:GATE1_PENDING`, `version`, `metadata`.
|
||||
* Submission is proposal preparation only, not worker execution, Gate1 approval,
|
||||
budget expenditure evidence, article creation or publishing authorization.
|
||||
A fixed reviewed request must be committed separately with a real commit SHA
|
||||
and stable requestId; ambiguous submit requires reconciliation, not new UUID retry.
|
||||
|
||||
## Remaining acceptance blockers
|
||||
|
||||
Read `payload/editorial-v4/status.json`. Dispatch/result transport, durable
|
||||
artifacts, authenticated owner gates, first-party research, image routing,
|
||||
Stage Admin auth, scoped backup/restore, publisher idempotency and public browser
|
||||
verification are all unverified. No cron activation, deployment, Production write
|
||||
or RELEASE_AUTHORIZE is included. Config isolation tests cannot establish any of
|
||||
these bridges. Policy is in each profile-local `references/policy.md`.
|
||||
@@ -0,0 +1,41 @@
|
||||
# Reviewed Stage editorial recovery
|
||||
|
||||
No live change was made by this patch. CI owns installation, parent owns authenticated recovery and any separately approved research. Do not use `complete`, DB writes, forged tokens or root runner invocation.
|
||||
|
||||
## Ownership
|
||||
|
||||
Read-only reconnaissance: `canina-hermes` Docker Config.User=root; `/proc/self/uid_map` maps container 0 to host 100000 for 65536 IDs; passwd hermes is 10000:10000 (host 110000:110000). Migration runs *inside* the container namespace, never with guessed host IDs. Existing package, dedicated PMO token (0400), locks and competitor editorial-runner cache (0700) are root-owned. Profile roots and normal caches are already hermes-owned and must not be recursively changed.
|
||||
|
||||
`provision-editorial-runtime.py` runs the tracked `editorial-ownership.py` through the existing clean-SHA serialized Stage CI gate before installing as hermes. `scan()` preflights every member, symlink ancestor, UID/GID, mode and hardlink; exact package/payload/installed skills, dedicated credential, editorial state names and profile `cache/editorial-runner` only. Read-only scan against the existing container accepted 96 paths. General profile files, provider credentials, other caches and config are excluded. Unknown entries fail closed. Modes and contents never change. Root journal `/opt/data/.editorial-ownership-v1.json` is 0600, records original IDs/modes/inodes; a second migration is a no-op. A partial failure rolls back. Explicit `rollback(home,journal)` refuses inode/mode/path-set conflicts; use only before an installer upgrade replaces files. CI must remain serialized and runner/client inactive during migration. After installation, normal installer rollback and ownership rollback are separate operations; do not blindly restore old journal after file replacement.
|
||||
|
||||
## Stop original RUNNING v6
|
||||
|
||||
After deploying/reviewing this SHA through CI, authenticated independent SUPER_ADMIN or configured owner-reviewer Admin uses the ordinary admin JWT (not a worker token). Read:
|
||||
|
||||
`GET https://stageapi.canina.ir/api/admin/orchestration/tasks/565ace1f-8cfc-4447-b978-66c36e7b767b`
|
||||
|
||||
Take the actual RUNNING run ID from `runs` (do not guess). Confirm version=6 and original process has ended. Invoke:
|
||||
|
||||
```
|
||||
POST https://stageapi.canina.ir/api/admin/orchestration/tasks/565ace1f-8cfc-4447-b978-66c36e7b767b/editorial-failure
|
||||
Authorization: Bearer <existing independent admin session JWT>
|
||||
Content-Type: application/json
|
||||
|
||||
{"runId":"<actual original RUNNING run UUID>","expectedVersion":6,"idempotencyKey":"editorial-recovery:565ace1f:v6","reason":"Original supervised runner process ended before artifact ingestion; cache access failure; actual spend unknown"}
|
||||
```
|
||||
|
||||
Requires exact editorial provenance, matching current run, expired lease, expected task version and unreconciled owned 20 reservation; rejects cross-run/cross-task/active lease. This does not require an expired execution approval to become valid again merely to stop work. Existing kill policy still applies: FREEZE_NEW_WORK permits stopping; STOP_AGENTS/DISABLE_MUTATIONS/EMERGENCY_HALT block as for other core operations. Owner controls switches through existing policy, not this endpoint. Identical replay is safe; different payload/key collision is rejected. Locks serialize heartbeat/result/claim/failure. Success is task FAILED v7, run FAILED, outbox DONE, token cleared, no artifact/QA/reconciliation, original unknown20 retained.
|
||||
|
||||
Held lease variant: canonical PMO worker may `POST /api/internal/prepare-worker/editorial-failure` with the same fields plus `taskId` and valid unexpired `leaseToken`; no worker can perform stale recovery. Never include actualCents or QA.
|
||||
|
||||
## Explicit retry and budget boundary
|
||||
|
||||
There is intentionally **no retry of this exhausted 20-cent task**: preserving unknown20 and reserving another20 under a20 task cap is mathematically impossible. Reusing the original reservation as fresh spend would falsely manufacture free capacity. A repeat claim on FAILED is denied before any ledger write; duplicate failure never creates another reservation.
|
||||
|
||||
After predecessor is confirmed FAILED/fenced, parent can explicitly submit a **new** editorial proposal through existing authenticated `POST /api/internal/prepare-worker/editorial-proposals`, with a fresh requestId, the reviewed deployment commit SHA, same bounded topic/criteria and budgetLimitCents=20 (see editorial-execution.md contract). Obtain a new independent Gate1 via existing `POST /api/admin/orchestration/tasks/<newTaskId>/gates/1/decide` with APPROVED, its current expectedVersion and a new idempotencyKey. This atomically queues READY under current policy. Do not renew or mutate the FAILED predecessor. Only then execute the reviewed hermes-identity runner on the *new task ID*. Original unknown20 remains reserved; the new explicit approval authorizes up to20 additional, so cumulative upper bound is40. Parent must make that extra-budget authorization explicit; if the existing authorization is a cumulative20 ceiling, retry remains blocked until actual spend is measured through a separately reviewed reconciliation path. This patch does not bypass that ceiling or invent cost0.
|
||||
|
||||
## Verification
|
||||
|
||||
TDD: missing failure method was observed red (3 tests), then green. Migration tests verify twice, exact ownership/modes, outside sentinel, symlink/public secret/unknown path rejection and injected partial-failure rollback. Real TCP/PostgreSQL worker test races duplicate failure, rejects wrong token/actor/extra cost field, denies heartbeat/result/reclaim after stop and verifies only original RESERVE20, no artifacts or attestations. Unit tests cover stale version, active stale recovery, wrong run/task, independent role and idempotency payload mismatch.
|
||||
|
||||
Disposable test database `editorial_recovery_isolated` only. Full migration chain has pre-existing `blogs` missing relation; isolated tests apply the four scoped orchestration migrations to a dedicated DB instead. Shared generated Prisma client was stale; tests/build use private generated .prisma mount, not shared mutation. Build initially failed from remapped fixture ownership and stale Prisma; private owned fixture fixed both. No Stage/Production migrations or writes, deploy, push, scheduler, runner or live research executed.
|
||||
@@ -0,0 +1,9 @@
|
||||
# Owner recovery control
|
||||
|
||||
Command center task detail offers **ثبت شکست اجرای متوقفشده** only when the authenticated detail response supplies `editorialRecovery: {runId}` and that ID matches the registered RUNNING staging run/commit with no artifacts. The server derives the hint from the actual expired outbox lease, canonical editorial admission and unreconciled 20-cent reservation for an independent reviewer. Lists contain no hint. No lease owner/token/credentials are serialized. The existing failure command remains the atomic authority, including provenance, version and run/lease fencing.
|
||||
|
||||
Opening the control refetches detail. The modal requires a nonblank reason of at most 500 characters and explicit acknowledgement. It explains retained unknown 20-cent spend, not cost zero, no QA, no autoapproval, no release/retry/budget authorization. A first submit freezes exact runId/expectedVersion/idempotencyKey/reason bytes; ambiguous network retries reuse them. 4xx rejections require refresh. Successful commands and close reconcile with a fresh list. Background content is inert while the recovery modal is mounted.
|
||||
|
||||
This adds a backend **read-only detail hint** because the old safe run projection contains neither lease expiry nor a trustworthy recovery capability. A frontend-only age heuristic cannot establish actual expiry. Deploy both admin and backend changes through normal CI. No change to the failure endpoint, authorization, budgets or worker transport.
|
||||
|
||||
Validation: disposable source/dependency copies, no published ports or live state writes. Scoped admin/API tests and application tsc + Vite build; backend hint/failure/read/HTTP tests plus Prisma generation and tsc build. No push/deployment or live task recovery performed here; the owner must authenticate and click after integration.
|
||||
@@ -0,0 +1,53 @@
|
||||
# One-task research runner
|
||||
|
||||
**Current policy:** [FUNCTIONAL_BRINGUP.md](FUNCTIONAL_BRINGUP.md) supersedes historical deadline guidance below. Complete functional orchestration before optimization. All 29 canonical worker/PMO configs are selected through tracked CI model policy, preserving credentials and gates. Close the temporary reviewer after Gate1, then start one supervised worker-credential research run; the reviewer's 600-second recovery/approval window must not enclose research execution.
|
||||
|
||||
Installed through `scripts/provision-editorial-runtime.py`'s exact runtime-package allowlist, not a live edit. This adds no activation, scheduler, approval or grant.
|
||||
|
||||
After parent deploy/approval verification, run **inside canina-hermes as its configured runtime identity**:
|
||||
|
||||
```
|
||||
python3 -B /opt/data/editorial-v4/runtime-package/runner.py --task-id 565ace1f-8cfc-4447-b978-66c36e7b767b
|
||||
```
|
||||
|
||||
Do not invoke until the original approval is valid and task READY. Runner cannot queue or approve; claim and result independently enforce backend Gate1. No automatic retry (including ambiguous ingestion failure). Inspect authenticated task status before any owner-directed recovery. Expired approvals/reservations are never changed locally.
|
||||
|
||||
Limits: one task, four sequential installed canonical profile invocations (market competitor-worker, coverage content-worker, SEO seo-worker, PMO synthesis), unlimited turns and no imposed per-profile or total research deadline, five-second heartbeat interval/HTTP timeout, 1MiB stdout and 256KiB stderr per child; report <=16KiB, final canonical brief <=24KiB. SIGTERM/heartbeat loss/error kills child process group. Profile-local writable cache is cwd/TMPDIR; no root workspace or terminal sandbox. Web toolset is only web_search/web_extract. Model tools cannot access service credential. No filesystem, terminal, browser, image, article, publication, QA, release or production tools.
|
||||
|
||||
Hermes CLI installed help/source inspected: `--query-file - --oneshot --format stream-json --toolsets web --model Canina-content --max-turns 0 --run-budget 0`. Parse exactly one successful terminal `result` JSONL envelope; reject unknown tool events, duplicate/error result and invalid JSON. Extract one URL per call with char_limit=2000 to keep CLI's 5000-character tool-output cap parseable. Require worker retrieval events, successful nonempty extraction content, and final source URLs in those worker retrievals. This is transport provenance, not factuality/QA certification. Source/date/scoring truth remains independent QA's job.
|
||||
|
||||
Result submits only task/run/lease/brief, expects VERIFYING/PENDING_INDEPENDENT_QA and retained unknown reservation20. It never claims zero spend or a passed QA. No durable local lease token/log is emitted. CLI failures suppress private provider/backend details.
|
||||
|
||||
Tests use disposable localhost HTTP and real subprocesses inside disposable network-isolated Python containers. Explicit test-only synthetic CLI events/content prove protocol, cancellation and fencing, **not live research or application QA**. Live model/research acceptance intentionally not run; parent owns promotion and original-approval check.
|
||||
|
||||
|
||||
## Identity failure diagnosed on 2026-10-24
|
||||
|
||||
The existing installed package/credential/runner lock were UID0; competitor cache
|
||||
was UID0 mode0700 while canonical profile belonged to hermes UID10000. The actual
|
||||
`/opt/hermes/bin/hermes` wrapper drops UID0 to hermes. A read-only UID10000 access
|
||||
probe returned false for that cache. This is a concrete pre-model process boundary
|
||||
failure, not evidence of a claim-response mismatch. Deployed compiled claim returns
|
||||
`{lease:{taskId,runId,attempt,leaseToken,leaseUntil,commitSha,environment,maxCostCents,pilotKind}}`;
|
||||
heartbeat accepts exactly taskId/runId/leaseToken and returns `{leaseUntil}`. These
|
||||
match the runner. No failure/report endpoint exists in worker transport; `complete`
|
||||
is NOT a failure protocol (it attests QA and reconciles cost), and must not be used.
|
||||
|
||||
Installer now explicitly uses `docker exec --user hermes` for installation and skill
|
||||
discovery; existing root-owned state fails closed. Do not run a root runner or set
|
||||
HERMES_DOCKER_EXEC_AS_ROOT to bypass the privilege boundary. Preflight ownership
|
||||
checks occur before credential access and claim. Failure JSON contains only local
|
||||
stage/error-code constants and explicitly requires reading backend status, never
|
||||
claims task completion or zero spend.
|
||||
|
||||
Current task 565ace1f-8cfc-4447-b978-66c36e7b767b remains RUNNING v6, artifact null
|
||||
(read-only authenticated status). It was not reclaimed, retried, renewed or altered.
|
||||
Lease expiry alone does not transition state; its unknown 20-cent reservation stays.
|
||||
Recovery requires owner review: retain reservation and audit failed run; authorize
|
||||
an explicit backend fenced failure/cancel protocol before changing task state (none
|
||||
exists currently), and a separately reviewed CI-only ownership migration for the
|
||||
exact installed package/credential/runner-created cache paths. Do NOT recursively
|
||||
chown profiles, invent actualCents=0, clear DB rows, or invoke runner to recover.
|
||||
After that migration, install via reviewed CI under hermes; a new execution still
|
||||
requires explicit parent/owner authorization and a backend-ready task. This patch
|
||||
is not installed, deployed, activated or live-model accepted.
|
||||
@@ -0,0 +1,33 @@
|
||||
# Editorial timeout investigation (no inference replay)
|
||||
|
||||
## Outcome and evidence
|
||||
|
||||
Investigated task `4a109290-3722-4e0d-acd5-118da297b959` context, latest canonical competitor session `20261024_132234_a57b57`. Read container source, logs and SQLite using actual hermes UID10000; SQLite opened `mode=ro`. No API requests, task claims, paid inference, live code modifications, DB writes, deploys or Production operations performed.
|
||||
|
||||
Sources in `canina-hermes`:
|
||||
- `/opt/data/profiles/canina-competitor-worker/state.db`: latest session has 7 messages (user1/assistant3/tool3), 3 completed API calls, 3 tools; no end timestamp/reason. Session start 1792848171.040386.
|
||||
- `/opt/data/profiles/canina-competitor-worker/logs/agent.log`: startup plugins at 13:22:29.711; turn begins13:22:45.529; API1 latency6.2s completes13:22:57.313; search5.82s completes13:23:03.259; API2 latency4.5s completes13:23:07.772; extraction1 2.01s completes13:23:09.797; API3 latency21.7s completes13:23:31.528; extraction2 .97s completes13:23:32.508.
|
||||
- SQLite last_activity_at1792848225.5890484 =13:23:45.589 UTC, description `receiving stream response`, provenance `unknown`. This is positive evidence that final model streaming had begun after the tools, not a hung extraction. It does NOT reveal first-token/last-token timing or prove whether upstream subsequently stalled/failed.
|
||||
- Total logged tool duration8.80s. Completed API latency32.4s. Startup to turn ~15.8s. Last extraction ~62.8s after first plugin log; model stream active ~75.9s after first plugin log. Exact Popen launch time was not persisted.
|
||||
|
||||
## Confirmed contract mismatch
|
||||
|
||||
`infra/hermes-editorial/runner.py` previously supplied CLI `--run-budget120` and killed its process group at120s from Popen, discarding stdout on timeout. Installed CLI help confirms advisory wrapup semantics, not a subprocess deadline. Installed `/opt/hermes/agent/turn_context.py:647` starts budget only during turn preparation (after startup); `/opt/hermes/agent/turn_iteration_prep.py:183` checks80% wrapup only between iterations. `/opt/hermes/agent/chat_completion_helpers.py:679-688` caps implicit stale waits to `min(timeout,max(60,remaining*.5))`; explicit timeouts do not yield to budget. Thus run-budget can exceed remaining outer time and cannot force a final envelope before the runner kill. Session evidence was available in stream init but discarded with TemporaryFile on failure.
|
||||
|
||||
`PROFILE_TIMEOUT` proves the runner deadline fired. No logged provider503/error for this session; a previous agent's provider503 is NOT evidence about this run. Underlying reason final response did not finish in available time remains upstream latency/stall versus other unlogged processing; do not label confirmed provider outage. Most recent activity narrows bottleneck to final model response, not search/extraction or account provisioning.
|
||||
|
||||
## Narrow mitigation (not acceptance claim)
|
||||
|
||||
Keep120s/profile,540s/task and8turns unchanged. Supply advisory90s budget (or less for remaining task time), reserving30s startup/terminalization headroom. This is not a hard upstream guarantee: installed CLI minimum60s stale floor still requires the outer hard kill.
|
||||
|
||||
Persist atomic mode0600 per-invocation/per-profile diagnostics in runner-state every heartbeat and after cancellation. Allowlist only session ID, elapsed time, event type/counts and constant outcome. Never retain provider text/errors, prompts, tool outputs, tokens/lease secrets or raw stderr. Report timeout as timeout even when a partial text stream exists. Evidence is diagnostic, not retrieval proof or QA.
|
||||
|
||||
Tests: deterministic real child process timeout with partial init/tools/text; safe evidence and mode; malformed stream injection; deadline headroom; actual installed StreamJsonEmitter callbacks without agent/model. Existing heartbeat/process-group kill and protocol tests retained. Python discovery added to manual no-deploy runtime-contract workflow (stage rollout already discovers this directory).
|
||||
|
||||
## Verification
|
||||
|
||||
RED: new timeout evidence/budget tests failed because execute lacked evidence_path and cli_budget was absent. GREEN: local suite with source copied read-only from the installed container emitter:25 discovered,24 passed,1 UID-drop fixture skipped (local runtime nonroot). Remote repository suite:25 discovered,23 passed,2 installed-emitter tests skipped (host has no Hermes installation); actual root UID-drop fixture passed. No inference or research acceptance/QA success claimed. Unknown reservations remain unchanged.
|
||||
|
||||
## Limits and follow-up
|
||||
|
||||
Do not blindly rerun one-time CI activation or paid task. Parent can integrate this commit through normal CI and arrange a separately authorized Stage acceptance window. Headroom/evidence mitigation is tested; successful live research remains unverified. An exact provider error cannot be recovered from already discarded stream. Later diagnostics preserve session correlation and partial event counts without leaking content.
|
||||
@@ -0,0 +1,24 @@
|
||||
{
|
||||
"version": "4.1.0",
|
||||
"files": {
|
||||
"editorial-v4/status.json": "5694c82d4ef5ed0b070b72ad009a71c1362a4cffc32fd605e8456a8d1cb39720",
|
||||
"profiles/canina-competitor-worker/skills/canina-editorial-v4/SKILL.md": "c6827fae775b0b6ce897af6131cf56d39e6579c3cce3f8c899ac63f3967cff8b",
|
||||
"profiles/canina-competitor-worker/skills/canina-editorial-v4/references/policy.md": "61cf7c686440d542ae249320a2834cba5f06a5b985248b3ace7ca6233507a8a3",
|
||||
"profiles/canina-competitor-worker/skills/canina-editorial-v4/references/role.json": "04472ed7d789bde1b1846da04a30d11009ee645be08ca8493eeef7460e9fff48",
|
||||
"profiles/canina-content-worker/skills/canina-editorial-v4/SKILL.md": "a7ddef44876b55174470f7c196f5307870bff93a94fbc67e0a44abb5a287da9e",
|
||||
"profiles/canina-content-worker/skills/canina-editorial-v4/references/policy.md": "61cf7c686440d542ae249320a2834cba5f06a5b985248b3ace7ca6233507a8a3",
|
||||
"profiles/canina-content-worker/skills/canina-editorial-v4/references/role.json": "3d5cc5fb2c755b7afb69ec7ca6cc238ca13891d04d6c5e64e19c2c07402c473b",
|
||||
"profiles/canina-qa-worker/skills/canina-editorial-v4/SKILL.md": "b1558a923c9daad7ed270f6d997a13e69efa80d87345a0e515026cf8ab768910",
|
||||
"profiles/canina-qa-worker/skills/canina-editorial-v4/references/policy.md": "61cf7c686440d542ae249320a2834cba5f06a5b985248b3ace7ca6233507a8a3",
|
||||
"profiles/canina-qa-worker/skills/canina-editorial-v4/references/role.json": "4aa981d43f17d998708127da423905bab335a7eccff1bf8f2c7e46da62ffaa60",
|
||||
"profiles/canina-seo-worker/skills/canina-editorial-v4/SKILL.md": "480e8f02bf9051ad1f324783f4231d8ebc29061b97f2602942c69ff7fe216761",
|
||||
"profiles/canina-seo-worker/skills/canina-editorial-v4/references/policy.md": "61cf7c686440d542ae249320a2834cba5f06a5b985248b3ace7ca6233507a8a3",
|
||||
"profiles/canina-seo-worker/skills/canina-editorial-v4/references/role.json": "0fe8cd663434fd91c7fa43950327bae3aa831943a112d0ba9f5e8f6a47367ea2",
|
||||
"profiles/canina-vet-review-worker/skills/canina-editorial-v4/SKILL.md": "1f57072cf34101fa20f47c06be3d27f455e0460c5638acdaa36caf827d605243",
|
||||
"profiles/canina-vet-review-worker/skills/canina-editorial-v4/references/policy.md": "61cf7c686440d542ae249320a2834cba5f06a5b985248b3ace7ca6233507a8a3",
|
||||
"profiles/canina-vet-review-worker/skills/canina-editorial-v4/references/role.json": "9c29f4182228221740ec46ab76fd0a47af7885a2fe45e0c3aed0b0e4980f2560",
|
||||
"profiles/pmo/skills/canina-editorial-v4/SKILL.md": "7dbf15d46058cec13c409ca0ccf488ccd475ff7f5a8b0260df9d1656c511b9c5",
|
||||
"profiles/pmo/skills/canina-editorial-v4/references/policy.md": "61cf7c686440d542ae249320a2834cba5f06a5b985248b3ace7ca6233507a8a3",
|
||||
"profiles/pmo/skills/canina-editorial-v4/references/role.json": "34627d072c8d9328411db814335165ffceaafb354fc5a5d2f1f15f531f739444"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Bounded PMO proposal only. No approval, execution, cron or publication API."""
|
||||
import argparse
|
||||
import fcntl
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import re
|
||||
import stat
|
||||
import tempfile
|
||||
import uuid
|
||||
import urllib.error
|
||||
import urllib.request
|
||||
|
||||
ENDPOINT = 'https://stageapi.canina.ir/api/internal/prepare-worker/editorial-proposals'
|
||||
|
||||
class ClientError(Exception):
|
||||
pass
|
||||
|
||||
class NoRedirect(urllib.request.HTTPRedirectHandler):
|
||||
def redirect_request(self, req, fp, code, msg, headers, newurl):
|
||||
return None
|
||||
|
||||
|
||||
def safe(path):
|
||||
if not path.is_absolute() or '..' in path.parts:
|
||||
raise ValueError('Absolute home required')
|
||||
for p in (path, *path.parents):
|
||||
if p.is_symlink(): raise ValueError('Symlink refused')
|
||||
return path
|
||||
|
||||
|
||||
def private_read(path):
|
||||
safe(path)
|
||||
fd = os.open(path, os.O_RDONLY | os.O_NOFOLLOW | os.O_NONBLOCK)
|
||||
with os.fdopen(fd, 'rb') as stream:
|
||||
s = os.fstat(stream.fileno())
|
||||
if not stat.S_ISREG(s.st_mode) or s.st_uid != os.getuid() or s.st_nlink != 1 or stat.S_IMODE(s.st_mode) not in (0o400, 0o600) or not 0 < s.st_size <= 16384:
|
||||
raise ValueError('Private runtime-owned regular file required')
|
||||
return stream.read(16385)
|
||||
|
||||
|
||||
def atomic(path, data):
|
||||
fd, name = tempfile.mkstemp(prefix='.pmo-', dir=path.parent)
|
||||
try:
|
||||
with os.fdopen(fd, 'wb') as stream:
|
||||
stream.write(data); stream.flush(); os.fsync(stream.fileno())
|
||||
os.chmod(name, 0o400); os.replace(name, path)
|
||||
finally:
|
||||
if os.path.exists(name): os.unlink(name)
|
||||
|
||||
|
||||
def submit(home, commit, proposal, *, endpoint=ENDPOINT, timeout=15):
|
||||
# endpoint override is an in-process disposable-test seam, never CLI/config input.
|
||||
safe(home)
|
||||
if not re.fullmatch('[0-9a-f]{40}', commit): raise ValueError('Full deployment SHA required')
|
||||
if not isinstance(proposal, dict) or set(proposal) != {'researchTopic', 'acceptanceCriteria'}:
|
||||
raise ValueError('Only owner topic and acceptanceCriteria accepted')
|
||||
topic, criteria = proposal['researchTopic'], proposal['acceptanceCriteria']
|
||||
if not isinstance(topic, str) or not topic.strip() or len(topic) > 180 or not isinstance(criteria, list) or not 1 <= len(criteria) <= 10 or any(not isinstance(v, str) or not v.strip() or len(v) > 500 for v in criteria):
|
||||
raise ValueError('Invalid proposal')
|
||||
token = private_read(home/'editorial-v4/credentials/editorial-pmo-token').decode('ascii')
|
||||
if not re.fullmatch('[A-Za-z0-9_-]{64}', token): raise ValueError('Invalid credential')
|
||||
directory = safe(home/'editorial-v4/client-state')
|
||||
directory.mkdir(mode=0o700, parents=True, exist_ok=True)
|
||||
if directory.stat().st_uid != os.getuid() or stat.S_IMODE(directory.stat().st_mode) != 0o700:
|
||||
raise ValueError('Private state directory required')
|
||||
lock = safe(directory/'lock')
|
||||
fd = os.open(lock, os.O_CREAT | os.O_RDWR | os.O_NOFOLLOW, 0o600)
|
||||
with os.fdopen(fd, 'a') as stream:
|
||||
fcntl.flock(stream, fcntl.LOCK_EX | fcntl.LOCK_NB)
|
||||
body = {**proposal, 'pilotKind':'editorial-research-to-brief-v1', 'operationMode':'PREPARE', 'environment':'staging', 'scope':'EDITORIAL_RESEARCH_TO_BRIEF', 'commitSha':commit, 'budgetLimitCents':20}
|
||||
state = safe(directory/'proposal.json')
|
||||
if state.exists():
|
||||
stored = json.loads(private_read(state))
|
||||
request_id = stored.get('requestId')
|
||||
if str(uuid.UUID(request_id)) != request_id or {k:v for k,v in stored.items() if k != 'requestId'} != body:
|
||||
raise ValueError('Existing request differs; explicit owner review required')
|
||||
body = stored
|
||||
else:
|
||||
body['requestId'] = str(uuid.uuid4())
|
||||
atomic(state, json.dumps(body, sort_keys=True).encode())
|
||||
req = urllib.request.Request(endpoint, data=json.dumps(body).encode(), headers={'Authorization':'Bearer '+token, 'Content-Type':'application/json'}, method='POST')
|
||||
opener = urllib.request.build_opener(urllib.request.ProxyHandler({}), NoRedirect())
|
||||
try:
|
||||
with opener.open(req, timeout=timeout) as response:
|
||||
if response.status != 201: raise ClientError('Unexpected proposal status')
|
||||
raw = response.read(16385)
|
||||
if len(raw)>16384: raise ClientError('Response exceeds bound')
|
||||
result = json.loads(raw)
|
||||
if not isinstance(result, dict) or not isinstance(result.get('taskId'), str): raise ClientError('Invalid proposal response')
|
||||
# Do not reflect arbitrary backend response bodies or credential material.
|
||||
return {'requestId':body['requestId'], 'taskId':result['taskId']}
|
||||
except (urllib.error.URLError, TimeoutError, OSError, ValueError) as error:
|
||||
code = getattr(error, 'code', None)
|
||||
if isinstance(error, urllib.error.HTTPError): error.close()
|
||||
raise ClientError('Proposal rejected HTTP '+str(code) if isinstance(code,int) else 'Proposal unavailable; retry same saved request') from None
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--proposal-file', type=Path, required=True)
|
||||
args = parser.parse_args()
|
||||
try:
|
||||
home = Path(os.environ['HERMES_HOME'])
|
||||
deployment = json.loads(private_read(home/'editorial-v4/deployment.json'))
|
||||
proposal = json.loads(private_read(args.proposal_file))
|
||||
print(json.dumps(submit(home, deployment['commitSha'], proposal), sort_keys=True))
|
||||
except (OSError, ValueError, KeyError, ClientError):
|
||||
parser.exit(1, 'PMO proposal failed (private details suppressed); saved request retained\n')
|
||||
|
||||
if __name__ == '__main__': main()
|
||||
@@ -0,0 +1,290 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Config-only installer. No process, network, config.yaml or scheduler changes."""
|
||||
import argparse
|
||||
import base64
|
||||
import fcntl
|
||||
import hashlib
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import tempfile
|
||||
|
||||
ROOT = Path(__file__).resolve().parent
|
||||
PROFILES = ('pmo', 'canina-competitor-worker', 'canina-seo-worker',
|
||||
'canina-content-worker', 'canina-vet-review-worker', 'canina-qa-worker')
|
||||
ALLOWED = {'editorial-v4/status.json'} | {
|
||||
f'profiles/{p}/skills/canina-editorial-v4/{f}'
|
||||
for p in PROFILES for f in ('SKILL.md', 'references/policy.md', 'references/role.json')}
|
||||
|
||||
|
||||
def digest(data):
|
||||
return hashlib.sha256(data).hexdigest()
|
||||
|
||||
|
||||
def safe(home, relative):
|
||||
path = home / relative
|
||||
for part in (path, *path.parents):
|
||||
if part.is_symlink():
|
||||
raise ValueError(f'symlink refused: {part}')
|
||||
if relative not in ALLOWED and relative not in (
|
||||
'editorial-v4/.installer/transaction.json', 'editorial-v4/.installer/lock'):
|
||||
raise ValueError('path not allowlisted')
|
||||
if path.exists() and not path.is_file():
|
||||
raise ValueError(f'not a regular file: {path}')
|
||||
return path
|
||||
|
||||
|
||||
def atomic(path, data):
|
||||
path.parent.mkdir(parents=True, exist_ok=True)
|
||||
fd, temp = tempfile.mkstemp(prefix='.editorial-', dir=path.parent)
|
||||
try:
|
||||
with os.fdopen(fd, 'wb') as stream:
|
||||
stream.write(data)
|
||||
stream.flush()
|
||||
os.fsync(stream.fileno())
|
||||
os.chmod(temp, 0o644)
|
||||
os.replace(temp, path)
|
||||
finally:
|
||||
if os.path.exists(temp):
|
||||
os.unlink(temp)
|
||||
|
||||
|
||||
def bundle():
|
||||
manifest = json.loads((ROOT / 'bundle.json').read_text())
|
||||
if set(manifest['files']) != ALLOWED:
|
||||
raise ValueError('bundle allowlist mismatch')
|
||||
result = {}
|
||||
for relative, expected in manifest['files'].items():
|
||||
path = ROOT / 'payload' / relative
|
||||
if path.is_symlink():
|
||||
raise ValueError('source symlink refused')
|
||||
data = path.read_bytes()
|
||||
if digest(data) != expected:
|
||||
raise ValueError(f'bundle digest mismatch: {relative}')
|
||||
result[relative] = data
|
||||
return result
|
||||
|
||||
|
||||
def recover(journal, paths):
|
||||
if not journal.exists():
|
||||
return
|
||||
try:
|
||||
state = json.loads(journal.read_text())
|
||||
except Exception:
|
||||
raise ValueError('invalid journal json')
|
||||
if state.get('phase') != 'applying':
|
||||
return
|
||||
if (set(state.get('before', {})) != ALLOWED or
|
||||
set(state.get('installed', {})) != ALLOWED):
|
||||
raise ValueError('invalid in-flight journal allowlist')
|
||||
if state.get('previous_installed') is not None and set(state['previous_installed']) != ALLOWED:
|
||||
raise ValueError('invalid in-flight journal previous_installed allowlist')
|
||||
if state.get('previous_before') is not None and set(state['previous_before']) != ALLOWED:
|
||||
raise ValueError('invalid in-flight journal previous_before allowlist')
|
||||
for r, p in paths.items():
|
||||
curr = p.read_bytes() if p.exists() else None
|
||||
curr_d = digest(curr) if curr is not None else None
|
||||
if curr_d == state['installed'][r]:
|
||||
continue
|
||||
if state.get('previous_installed') is not None:
|
||||
if curr_d == state['previous_installed'][r]:
|
||||
continue
|
||||
else:
|
||||
old = state['before'][r]
|
||||
old_data = base64.b64decode(old['data']) if old else None
|
||||
if curr == old_data:
|
||||
continue
|
||||
raise ValueError(f'interrupted transaction conflict: {r}')
|
||||
restore_target = state.get('previous_before') or state['before']
|
||||
restore(paths, restore_target)
|
||||
if state.get('previous_journal'):
|
||||
atomic(journal, base64.b64decode(state['previous_journal']))
|
||||
elif state.get('previous_installed'):
|
||||
atomic(journal, json.dumps({
|
||||
'phase': 'installed',
|
||||
'before': state['before'],
|
||||
'installed': state['previous_installed']
|
||||
}, sort_keys=True).encode())
|
||||
else:
|
||||
journal.unlink()
|
||||
|
||||
|
||||
def execute(action, home):
|
||||
if not home.is_absolute() or not home.is_dir():
|
||||
raise ValueError('--target-home must be an existing absolute directory')
|
||||
files = bundle()
|
||||
paths = {r: safe(home, r) for r in files}
|
||||
journal = safe(home, 'editorial-v4/.installer/transaction.json')
|
||||
if action == 'verify':
|
||||
bad = [r for r, p in paths.items() if not p.exists() or p.read_bytes() != files[r]]
|
||||
if bad:
|
||||
raise ValueError('verification mismatch: ' + ', '.join(bad))
|
||||
if journal.exists():
|
||||
jstate = json.loads(journal.read_text())
|
||||
if jstate.get('phase', 'installed') != 'installed':
|
||||
raise ValueError('verification refused: in-flight transaction requires recovery')
|
||||
return {'status': 'configured_only', 'files': len(files), 'workflow_verified': False}
|
||||
lock = safe(home, 'editorial-v4/.installer/lock')
|
||||
lock.parent.mkdir(parents=True, exist_ok=True)
|
||||
with lock.open('a') as stream:
|
||||
fcntl.flock(stream, fcntl.LOCK_EX | fcntl.LOCK_NB)
|
||||
recover(journal, paths)
|
||||
if action == 'rollback':
|
||||
if not journal.exists():
|
||||
return {'status': 'nothing_to_rollback'}
|
||||
state = json.loads(journal.read_text())
|
||||
if set(state['before']) != ALLOWED or set(state['installed']) != ALLOWED:
|
||||
raise ValueError('invalid rollback allowlist')
|
||||
# Refuse external edits rather than destroying another writer's work.
|
||||
for r, p in paths.items():
|
||||
current = p.read_bytes() if p.exists() else None
|
||||
before = state['before'][r]
|
||||
old = base64.b64decode(before['data']) if before else None
|
||||
if current != old and (current is None or digest(current) != state['installed'][r]):
|
||||
raise ValueError(f'rollback conflict: {r}')
|
||||
restore(paths, state['before'])
|
||||
journal.unlink()
|
||||
return {'status': 'rolled_back'}
|
||||
changes = [r for r, p in paths.items() if not p.exists() or p.read_bytes() != files[r]]
|
||||
if not changes:
|
||||
return {'status': 'unchanged', 'files': len(files)}
|
||||
previous_journal = journal.read_bytes() if journal.exists() else None
|
||||
previous_state = None
|
||||
if previous_journal is not None:
|
||||
previous_state = json.loads(previous_journal)
|
||||
if (set(previous_state) not in ({'before', 'installed'}, {'phase', 'before', 'installed'}) or
|
||||
set(previous_state['before']) != ALLOWED or
|
||||
set(previous_state['installed']) != ALLOWED):
|
||||
raise ValueError('invalid upgrade journal allowlist')
|
||||
if previous_state.get('phase', 'installed') != 'installed':
|
||||
raise ValueError('invalid upgrade journal phase')
|
||||
for r, p in paths.items():
|
||||
old = previous_state['before'][r]
|
||||
if old is not None:
|
||||
if (set(old) != {'data', 'mode'} or type(old['mode']) is not int or
|
||||
not 0 <= old['mode'] <= 0o777):
|
||||
raise ValueError('invalid upgrade rollback entry')
|
||||
base64.b64decode(old['data'], validate=True)
|
||||
# Only a completely installed, verified previous transaction may
|
||||
# advance. Never recover partial writes or overwrite live drift.
|
||||
if not p.exists() or digest(p.read_bytes()) != previous_state['installed'][r]:
|
||||
raise ValueError(f'existing transaction conflict: {r}')
|
||||
current_snapshot = {r: {'data': base64.b64encode(p.read_bytes()).decode(),
|
||||
'mode': p.stat().st_mode & 0o777} if p.exists() else None
|
||||
for r, p in paths.items()}
|
||||
original_before = previous_state['before'] if previous_state else current_snapshot
|
||||
incoming_installed = {r: digest(v) for r, v in files.items()}
|
||||
in_flight_state = {
|
||||
'phase': 'applying',
|
||||
'before': original_before,
|
||||
'installed': incoming_installed,
|
||||
'previous_installed': previous_state['installed'] if previous_state else None,
|
||||
'previous_before': current_snapshot,
|
||||
'previous_journal': base64.b64encode(previous_journal).decode() if previous_journal else None,
|
||||
}
|
||||
atomic(journal, json.dumps(in_flight_state, sort_keys=True).encode())
|
||||
try:
|
||||
for r in changes:
|
||||
atomic(paths[r], files[r])
|
||||
except BaseException:
|
||||
try:
|
||||
restore(paths, current_snapshot)
|
||||
if previous_journal is None:
|
||||
journal.unlink()
|
||||
else:
|
||||
atomic(journal, previous_journal)
|
||||
except BaseException:
|
||||
pass
|
||||
raise
|
||||
committed_state = {
|
||||
'phase': 'installed',
|
||||
'before': original_before,
|
||||
'installed': incoming_installed,
|
||||
}
|
||||
atomic(journal, json.dumps(committed_state, sort_keys=True).encode())
|
||||
return {'status': 'installed_config_only', 'files': len(files)}
|
||||
|
||||
|
||||
def restore(paths, before):
|
||||
for r, p in paths.items():
|
||||
old = before[r]
|
||||
if old is None:
|
||||
p.unlink(missing_ok=True)
|
||||
else:
|
||||
atomic(p, base64.b64decode(old['data']))
|
||||
os.chmod(p, old['mode'])
|
||||
|
||||
|
||||
def configure_models(home):
|
||||
"""CI-only narrow source policy; never serialize provider secrets or .env.
|
||||
|
||||
Surgical scalar edits preserve every unrelated byte (including auth/gates).
|
||||
Preflight the whole registry and every destination before the first write.
|
||||
"""
|
||||
import re
|
||||
import stat
|
||||
policy = json.loads((ROOT/'model-policy.json').read_text())
|
||||
profiles = policy['profiles']
|
||||
if policy['model'] != 'Canina-content' or len(set(profiles)) != 29:
|
||||
raise ValueError('Invalid canonical model policy')
|
||||
def checked(relative):
|
||||
path = home/relative
|
||||
if not home.is_absolute() or any(p.is_symlink() for p in (path, *path.parents)):
|
||||
raise ValueError('Unsafe model destination')
|
||||
st = path.stat()
|
||||
if not stat.S_ISREG(st.st_mode) or st.st_nlink != 1 or st.st_uid != os.getuid() or st.st_size > 65536:
|
||||
raise ValueError('Unsafe model file')
|
||||
return path
|
||||
registry = checked(policy['registry']).read_text()
|
||||
registered = re.findall(r'\bprofile:\s*([a-z0-9-]+)', registry)
|
||||
if len(registered) != len(set(registered)) or set(registered) | set(policy['additionalProfiles']) != set(profiles):
|
||||
raise ValueError('Canonical registry mismatch')
|
||||
pending = []
|
||||
for profile in profiles:
|
||||
if not re.fullmatch(r'(?:canina-[a-z0-9-]+-worker|pmo)', profile):
|
||||
raise ValueError('Noncanonical profile')
|
||||
path = checked(f'profiles/{profile}/config.yaml')
|
||||
old = path.read_text()
|
||||
updated = old
|
||||
for section, key, value in [('model','default','Canina-content'), ('agent','max_turns','0'), ('agent','run_budget_seconds','0')]:
|
||||
block = re.search(r'(?m)^'+section+r':[^\n]*\n(?:[ \t]+[^\n]*\n|\n)*', updated)
|
||||
if block is None:
|
||||
if section == 'model': raise ValueError('Model mapping required')
|
||||
updated += '\nagent:\n max_turns: 0\n run_budget_seconds: 0\n'
|
||||
continue
|
||||
content = block.group()
|
||||
pattern = r'(?m)^ '+key+r':[^\n]*$'
|
||||
count = len(re.findall(pattern, content))
|
||||
if count > 1: raise ValueError('Ambiguous model setting')
|
||||
replacement = ' '+key+': '+value
|
||||
content = re.sub(pattern, replacement, content) if count else content+replacement+'\n'
|
||||
updated = updated[:block.start()]+content+updated[block.end():]
|
||||
pending.append((path, old, updated, path.stat().st_mode & 0o777))
|
||||
for path, old, updated, mode in pending:
|
||||
if path.read_text() != old: raise ValueError('Concurrent model config edit')
|
||||
if old != updated:
|
||||
# Private same-directory atomic replacement; no secret-bearing journal.
|
||||
fd, temporary = tempfile.mkstemp(prefix='.model-policy-', dir=path.parent)
|
||||
try:
|
||||
with os.fdopen(fd, 'w') as stream:
|
||||
stream.write(updated); stream.flush(); os.fsync(stream.fileno())
|
||||
os.chmod(temporary, mode)
|
||||
os.replace(temporary, path)
|
||||
finally:
|
||||
if os.path.exists(temporary): os.unlink(temporary)
|
||||
return len(pending)
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('action', choices=['install', 'verify', 'rollback'])
|
||||
parser.add_argument('--target-home', type=Path, required=True)
|
||||
args = parser.parse_args()
|
||||
try:
|
||||
print(json.dumps(execute(args.action, args.target_home), sort_keys=True))
|
||||
except (OSError, ValueError, KeyError) as error:
|
||||
parser.exit(1, f'{error}\n')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"model": "Canina-content",
|
||||
"registry": "canina_department_registry.yaml",
|
||||
"additionalProfiles": ["canina-blog-qa-worker"],
|
||||
"profiles": ["pmo", "canina-product-worker", "canina-ux-worker", "canina-dev-worker", "canina-devops-worker", "canina-qa-worker", "canina-commerce-worker", "canina-finance-worker", "canina-supply-worker", "canina-payments-worker", "canina-fulfillment-worker", "canina-support-worker", "canina-content-worker", "canina-rd-worker", "canina-compliance-worker", "canina-seo-worker", "canina-analytics-worker", "canina-research-worker", "canina-crm-worker", "canina-b2b-worker", "canina-competitor-worker", "canina-security-worker", "canina-privacy-worker", "canina-procurement-worker", "canina-vet-review-worker", "canina-legal-review-worker", "canina-accessibility-worker", "canina-brand-marketing-worker", "canina-blog-qa-worker"]
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
{
|
||||
"version": "4.1.0",
|
||||
"stage": "blocked",
|
||||
"production": "unauthorized",
|
||||
"cron_activation_allowed": false,
|
||||
"existing_cron_expected": 17,
|
||||
"workflow_exercised": false,
|
||||
"bridges": {
|
||||
"dispatch_results": "unverified",
|
||||
"artifact_store": "unverified",
|
||||
"owner_gate1_gate2": "unverified",
|
||||
"first_party_research": "unverified",
|
||||
"image_route": "unverified",
|
||||
"stage_admin_auth": "unverified",
|
||||
"backup_restore": "unverified",
|
||||
"publisher_idempotency": "unverified",
|
||||
"public_browser_verification": "unverified"
|
||||
}
|
||||
}
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
---
|
||||
name: canina-editorial-v4
|
||||
description: "Use when running Canina editorial research or publishing. Enforce hash-bound departmental gates."
|
||||
version: 4.1.0
|
||||
---
|
||||
|
||||
# Editorial v4: canina-competitor-worker
|
||||
|
||||
Read references/policy.md and references/role.json before acting.
|
||||
|
||||
Independent parallel Persian market/SERP research with retrieved evidence; no publication.
|
||||
|
||||
Stage is blocked. This installed skill is not execution evidence. No Production or cron activation.
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
# Editorial runtime policy v4.1.0
|
||||
|
||||
This versioned skill is configuration, not a scheduler, delegation transport, approval bridge or publisher implementation. Stage is BLOCKED until every bridge below has real evidence. No Production mutations or RELEASE_AUTHORIZE. The user's approval of ten implementation steps does not approve any article, Gate1, Gate2, deployment or cron activation. Keep all existing 17 cron jobs disabled/paused. Do not overwrite existing config.yaml, SOUL.md, registry, .env, auth, skills or cron files.
|
||||
|
||||
## Mandatory departmental chain (ten steps)
|
||||
1. Preflight: verify Stage authenticated Admin API read authority, author/category, current field manifest, backup mechanism, durable artifact store, dispatch/result transport, authenticated owner approval ingress, publisher idempotency and public browser verification bridges. Check credential handles only. Unverified bridge = BLOCKED, never success. Production inventory/GSC/GA4 may be read for topic decisions only.
|
||||
2. Parallel research: dispatch distinct jobs to canina-competitor-worker (Persian market/SERP), canina-content-worker (Canina live Production inventory, overlap and user value), and canina-seo-worker (first-party demand/SEO). All three return independent evidence artifacts. Never serialize these by having PMO impersonate departments. Missing analytics is labeled unavailable; never fabricate facts, metrics, citations or demand.
|
||||
3. PMO synthesis: consume all three results and propose at least 3 genuinely distinct NEW/UPDATE candidates, with intent, evidence URLs/retrieval timestamps, medical risk, overlap decision, component scores and limitations. Scores are judgments, not invented measured demand. PMO resolves conflicts, does not substitute for content workforce. NEW daily goal never overrides safety gates.
|
||||
4. Gate1: authenticated accountable owner explicitly approves selected candidate and immutable brief hash for this run and Stage. HOLD/REJECT/timeout/missing bridge block progress. No auto approval, inferred approval or previous-run reuse.
|
||||
5. Draft and image: canina-content-worker produces immutable Persian draft and source ledger with SHA-256. Verify current image route/quota before exactly one final generation attempt; network ambiguity counts as an attempt, no retries. Validate bytes, MIME, dimensions and visual appropriateness. Image failure is reported and permits truthful empty image fields, never a fabricated URL. No invented human author/endorsement.
|
||||
6. Independent review: canina-vet-review-worker and canina-seo-worker independently review the same exact draft SHA-256 in parallel. Return identity, hash, evidence, findings, critical blockers and decision. Internal AI veterinary evidence review is not a licensed human certification. High-risk guidance requires two independent authoritative sources, one guideline/official authority/systematic review/primary study; no invented diagnosis, dosing or cure claims.
|
||||
7. Revision and hash QA: Content resolves both reviews into a new immutable artifact and resolution ledger. canina-qa-worker verifies revised SHA-256, source mapping, HTML/metadata, relation IDs, complete current Admin field dispositions, links, truthful author attribution, overlap and review resolutions. QA_PASSED names exact revised hash. Any subsequent byte/payload/image change invalidates QA and approvals and requires renewed affected reviews/QA.
|
||||
8. Gate2: authenticated owner explicitly approves publication of exact QA-passed revised hash, full payload digest, image disposition, environment and run ID. Gate1 is not Gate2. Reject stale/mismatched/replayed approval. Never automatically approve to meet quota.
|
||||
9. Authenticated publisher: Content invokes approved Stage Admin API bridge only after gates, scoped nonempty backup, immediate uniqueness recheck and verified permissions. One idempotent NEW/UPDATE mutation per selected action, keyed by run/environment/payload hash; ambiguous timeout requires authenticated reconciliation, not blind retry. No SQL/Prisma/file-copy bypass, forged JWT or exposed credentials. No changes to products, prices, stock, users, schema or unrelated records.
|
||||
10. Public verification: QA reads back authenticated persisted fields and independently verifies exact public identity, title/H1, content/citations, metadata/canonical/schema/dates, attribution, listing, links and desktop/mobile rendering/image disposition. HTTP 200 alone may be soft-404 and is not completion. Postwrite failure = PUBLISHED BUT VERIFICATION FAILED. Only actual evidence permits PUBLISHED/UPDATED. PMO reports concise Persian evidence and blockers, never claims end-to-end success from config tests.
|
||||
|
||||
## Artifact and bridge contract
|
||||
Every artifact/result includes run_id, task_id, canonical profile, environment, created_at UTC, dependencies, immutable artifact path/URI, sha256, evidence (retrieved URLs and timestamps), assumptions, proposal, risks, acceptance_tests and blockers. Missing/failed worker output cannot be silently replaced by parent prose. Dispatch bridge must demonstrate real canonical-profile invocation and authenticated result ingestion; approval ingress must identify authorized owner and bind exact hashes. Durable object storage, research data access, image endpoint, Stage authenticated read/write, scoped backup/restore, publisher reconciliation and independent browser/public verification need representative evidence before Stage can be unblocked by a separately reviewed tracked change. No bridge flags in this bundle are assertions of runtime capability.
|
||||
|
||||
The root canina-daily-content-publisher skill was not discoverable by PMO on inspection. This self-contained profile-local policy/role distribution intentionally uses unique canina-editorial-v4 paths rather than overwriting that publisher or relying on root inheritance. Existing publisher procedures may supplement but never weaken these gates. Fresh-session skill discovery must be checked after approved CI installation; existing session snapshots may be stale.
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"version": "4.1.0",
|
||||
"profile": "canina-competitor-worker",
|
||||
"role": "Independent parallel Persian market/SERP research with retrieved evidence; no publication.",
|
||||
"policy": "policy.md",
|
||||
"auto_approval": false
|
||||
}
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
---
|
||||
name: canina-editorial-v4
|
||||
description: "Use when running Canina editorial research or publishing. Enforce hash-bound departmental gates."
|
||||
version: 4.1.0
|
||||
---
|
||||
|
||||
# Editorial v4: canina-content-worker
|
||||
|
||||
Read references/policy.md and references/role.json before acting.
|
||||
|
||||
Canina inventory research, immutable draft/image, revisions, then approved authenticated publisher bridge; never self-approve.
|
||||
|
||||
Stage is blocked. This installed skill is not execution evidence. No Production or cron activation.
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
# Editorial runtime policy v4.1.0
|
||||
|
||||
This versioned skill is configuration, not a scheduler, delegation transport, approval bridge or publisher implementation. Stage is BLOCKED until every bridge below has real evidence. No Production mutations or RELEASE_AUTHORIZE. The user's approval of ten implementation steps does not approve any article, Gate1, Gate2, deployment or cron activation. Keep all existing 17 cron jobs disabled/paused. Do not overwrite existing config.yaml, SOUL.md, registry, .env, auth, skills or cron files.
|
||||
|
||||
## Mandatory departmental chain (ten steps)
|
||||
1. Preflight: verify Stage authenticated Admin API read authority, author/category, current field manifest, backup mechanism, durable artifact store, dispatch/result transport, authenticated owner approval ingress, publisher idempotency and public browser verification bridges. Check credential handles only. Unverified bridge = BLOCKED, never success. Production inventory/GSC/GA4 may be read for topic decisions only.
|
||||
2. Parallel research: dispatch distinct jobs to canina-competitor-worker (Persian market/SERP), canina-content-worker (Canina live Production inventory, overlap and user value), and canina-seo-worker (first-party demand/SEO). All three return independent evidence artifacts. Never serialize these by having PMO impersonate departments. Missing analytics is labeled unavailable; never fabricate facts, metrics, citations or demand.
|
||||
3. PMO synthesis: consume all three results and propose at least 3 genuinely distinct NEW/UPDATE candidates, with intent, evidence URLs/retrieval timestamps, medical risk, overlap decision, component scores and limitations. Scores are judgments, not invented measured demand. PMO resolves conflicts, does not substitute for content workforce. NEW daily goal never overrides safety gates.
|
||||
4. Gate1: authenticated accountable owner explicitly approves selected candidate and immutable brief hash for this run and Stage. HOLD/REJECT/timeout/missing bridge block progress. No auto approval, inferred approval or previous-run reuse.
|
||||
5. Draft and image: canina-content-worker produces immutable Persian draft and source ledger with SHA-256. Verify current image route/quota before exactly one final generation attempt; network ambiguity counts as an attempt, no retries. Validate bytes, MIME, dimensions and visual appropriateness. Image failure is reported and permits truthful empty image fields, never a fabricated URL. No invented human author/endorsement.
|
||||
6. Independent review: canina-vet-review-worker and canina-seo-worker independently review the same exact draft SHA-256 in parallel. Return identity, hash, evidence, findings, critical blockers and decision. Internal AI veterinary evidence review is not a licensed human certification. High-risk guidance requires two independent authoritative sources, one guideline/official authority/systematic review/primary study; no invented diagnosis, dosing or cure claims.
|
||||
7. Revision and hash QA: Content resolves both reviews into a new immutable artifact and resolution ledger. canina-qa-worker verifies revised SHA-256, source mapping, HTML/metadata, relation IDs, complete current Admin field dispositions, links, truthful author attribution, overlap and review resolutions. QA_PASSED names exact revised hash. Any subsequent byte/payload/image change invalidates QA and approvals and requires renewed affected reviews/QA.
|
||||
8. Gate2: authenticated owner explicitly approves publication of exact QA-passed revised hash, full payload digest, image disposition, environment and run ID. Gate1 is not Gate2. Reject stale/mismatched/replayed approval. Never automatically approve to meet quota.
|
||||
9. Authenticated publisher: Content invokes approved Stage Admin API bridge only after gates, scoped nonempty backup, immediate uniqueness recheck and verified permissions. One idempotent NEW/UPDATE mutation per selected action, keyed by run/environment/payload hash; ambiguous timeout requires authenticated reconciliation, not blind retry. No SQL/Prisma/file-copy bypass, forged JWT or exposed credentials. No changes to products, prices, stock, users, schema or unrelated records.
|
||||
10. Public verification: QA reads back authenticated persisted fields and independently verifies exact public identity, title/H1, content/citations, metadata/canonical/schema/dates, attribution, listing, links and desktop/mobile rendering/image disposition. HTTP 200 alone may be soft-404 and is not completion. Postwrite failure = PUBLISHED BUT VERIFICATION FAILED. Only actual evidence permits PUBLISHED/UPDATED. PMO reports concise Persian evidence and blockers, never claims end-to-end success from config tests.
|
||||
|
||||
## Artifact and bridge contract
|
||||
Every artifact/result includes run_id, task_id, canonical profile, environment, created_at UTC, dependencies, immutable artifact path/URI, sha256, evidence (retrieved URLs and timestamps), assumptions, proposal, risks, acceptance_tests and blockers. Missing/failed worker output cannot be silently replaced by parent prose. Dispatch bridge must demonstrate real canonical-profile invocation and authenticated result ingestion; approval ingress must identify authorized owner and bind exact hashes. Durable object storage, research data access, image endpoint, Stage authenticated read/write, scoped backup/restore, publisher reconciliation and independent browser/public verification need representative evidence before Stage can be unblocked by a separately reviewed tracked change. No bridge flags in this bundle are assertions of runtime capability.
|
||||
|
||||
The root canina-daily-content-publisher skill was not discoverable by PMO on inspection. This self-contained profile-local policy/role distribution intentionally uses unique canina-editorial-v4 paths rather than overwriting that publisher or relying on root inheritance. Existing publisher procedures may supplement but never weaken these gates. Fresh-session skill discovery must be checked after approved CI installation; existing session snapshots may be stale.
|
||||
Loaded 100 of 160 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user