From 4e5ab1719c52065f4c1614bba6ce0d1797620e40 Mon Sep 17 00:00:00 2001 From: eust-w Date: Thu, 22 Oct 2026 16:21:33 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Enable=20local=20Claude=20delivery?= =?UTF-8?q?=20to=20Gitea=20and=20POC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add authenticated LAN access, native Claude execution, checkpoint and budget recovery, and signed POC build/deploy/rollback contracts. Include local service management, regression coverage, and evidence from the completed POC delivery. --- README.md | 1 + apps/api/package.json | 3 +- apps/api/src/domain/application-access.ts | 13 +- apps/api/src/domain/control-plane.ts | 100 ++- apps/api/src/domain/local-execution.ts | 14 + apps/api/src/domain/local-poc.ts | 38 ++ apps/api/src/domain/provider-events.ts | 7 + apps/api/src/domain/releases.ts | 89 ++- apps/api/src/domain/runner-broker.ts | 53 +- apps/api/src/http.ts | 26 + apps/provisioner/README.md | 2 +- apps/provisioner/local.mjs | 24 +- apps/provisioner/test/local.test.mjs | 19 +- apps/runner/src/adapters.ts | 40 ++ apps/runner/src/main.ts | 95 +-- apps/runner/src/runner.ts | 2 + apps/runner/src/transport.ts | 86 +++ apps/runner/test/local-entry.test.ts | 147 +++++ apps/web/next.config.ts | 10 +- apps/web/src/app/api/session/route.ts | 3 +- apps/web/src/app/login/route.ts | 113 ++++ apps/web/src/features/projects.tsx | 3 +- apps/web/src/features/releases.tsx | 3 +- apps/web/src/features/runs.tsx | 127 +++- apps/web/src/lib/api.ts | 3 +- apps/web/src/lib/auth.test.ts | 1 + apps/web/src/lib/auth.ts | 23 +- apps/web/src/lib/browser-id.test.ts | 11 + apps/web/src/lib/browser-id.ts | 9 + apps/web/src/lib/local-access.test.ts | 142 +++++ apps/web/src/lib/local-access.ts | 98 +++ apps/web/src/lib/types.ts | 2 + apps/web/src/lib/waiting.ts | 5 +- apps/web/src/proxy.ts | 28 + apps/worker/src/common.ts | 13 + apps/worker/src/executor.ts | 131 +++- apps/worker/src/main.ts | 5 +- apps/worker/src/providers.ts | 19 + apps/worker/src/verifier.ts | 44 ++ apps/worker/test/providers.test.ts | 25 + docs/local-browser-access.md | 49 ++ docs/local-poc-operations.md | 57 ++ .../local-poc-acceptance-2026-10-22.md | 63 ++ docs/reference/poc-delivery-profile.md | 50 ++ package-lock.json | 1 + packages/contracts/src/index.ts | 14 + packages/contracts/src/poc-delivery.ts | 19 + packages/runtime/src/deploy.ts | 17 +- packages/runtime/src/git.ts | 81 ++- packages/runtime/src/index.ts | 6 + packages/runtime/src/local-poc-binding.ts | 46 ++ packages/runtime/src/poc-build.ts | 311 +++++++++ packages/runtime/src/poc-profile.ts | 67 ++ packages/runtime/src/poc-release.ts | 521 ++++++++++++++++ packages/runtime/src/poc-runner.ts | 162 +++++ packages/runtime/src/providers/codebuddy.ts | 110 +++- packages/runtime/src/providers/codex.ts | 2 +- packages/runtime/src/runner.ts | 5 +- packages/runtime/src/types.ts | 16 +- packages/runtime/test/claude-native.test.ts | 124 ++++ packages/runtime/test/git-contract.test.ts | 105 +++- packages/runtime/test/poc-release.test.ts | 350 +++++++++++ scripts/build-local-web.mjs | 32 + scripts/configure-local-poc-plan.ts | 41 ++ scripts/dev.mjs | 26 +- scripts/local-poc-service.mjs | 270 ++++++++ scripts/local-poc-service.test.mjs | 48 ++ scripts/poc-project-check.mjs | 195 ++++++ scripts/poc-project-check.test.mjs | 102 +++ scripts/poc-release.ts | 48 ++ scripts/recover-local-poc-run.ts | 94 +++ scripts/setup-local-access.mjs | 38 ++ scripts/setup-local-poc.ts | 179 ++++++ scripts/setup-local.mjs | 3 +- tests/local-loop.test.ts | 131 +++- tests/local-poc-delivery.test.ts | 589 ++++++++++++++++++ tests/run-budget.test.ts | 164 +++++ 77 files changed, 5544 insertions(+), 169 deletions(-) create mode 100644 apps/api/src/domain/local-execution.ts create mode 100644 apps/api/src/domain/local-poc.ts create mode 100644 apps/runner/src/adapters.ts create mode 100644 apps/runner/src/transport.ts create mode 100644 apps/runner/test/local-entry.test.ts create mode 100644 apps/web/src/lib/browser-id.test.ts create mode 100644 apps/web/src/lib/browser-id.ts create mode 100644 apps/web/src/lib/local-access.test.ts create mode 100644 apps/web/src/lib/local-access.ts create mode 100644 apps/web/src/proxy.ts create mode 100644 apps/worker/test/providers.test.ts create mode 100644 docs/local-browser-access.md create mode 100644 docs/local-poc-operations.md create mode 100644 docs/reference/local-poc-acceptance-2026-10-22.md create mode 100644 docs/reference/poc-delivery-profile.md create mode 100644 packages/contracts/src/poc-delivery.ts create mode 100644 packages/runtime/src/local-poc-binding.ts create mode 100644 packages/runtime/src/poc-build.ts create mode 100644 packages/runtime/src/poc-profile.ts create mode 100644 packages/runtime/src/poc-release.ts create mode 100644 packages/runtime/src/poc-runner.ts create mode 100644 packages/runtime/test/claude-native.test.ts create mode 100644 packages/runtime/test/poc-release.test.ts create mode 100644 scripts/build-local-web.mjs create mode 100644 scripts/configure-local-poc-plan.ts create mode 100644 scripts/local-poc-service.mjs create mode 100644 scripts/local-poc-service.test.mjs create mode 100644 scripts/poc-project-check.mjs create mode 100644 scripts/poc-project-check.test.mjs create mode 100644 scripts/poc-release.ts create mode 100644 scripts/recover-local-poc-run.ts create mode 100644 scripts/setup-local-access.mjs create mode 100644 scripts/setup-local-poc.ts create mode 100644 tests/local-poc-delivery.test.ts create mode 100644 tests/run-budget.test.ts diff --git a/README.md b/README.md index 9867367..d397064 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ - 本地开发:[docs/development.md](docs/development.md) - 生产运维:[docs/operations.md](docs/operations.md) - 专题参考:[docs/reference/](docs/reference/) +- 本机 Claude → Gitea POC:[运行说明](docs/local-poc-operations.md) · [真实交付验收](docs/reference/local-poc-acceptance-2026-10-22.md) ## 快速开始 diff --git a/apps/api/package.json b/apps/api/package.json index 6e5ca6c..e0c458a 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -25,7 +25,8 @@ "pg": "^8.16.0", "reflect-metadata": "^0.2.2", "rxjs": "^7.8.2", - "zod": "^3.25.0" + "zod": "^3.25.0", + "@wishforge/runtime": "*" }, "devDependencies": { "@types/express": "^5.0.0" diff --git a/apps/api/src/domain/application-access.ts b/apps/api/src/domain/application-access.ts index 485c7cb..9935c58 100644 --- a/apps/api/src/domain/application-access.ts +++ b/apps/api/src/domain/application-access.ts @@ -1,3 +1,4 @@ +import { readLocalPocBinding } from '@wishforge/runtime'; import { DomainError, normalizeApplicationUrl, @@ -12,14 +13,22 @@ import { * code, so they may never share an origin with the console, API or IDE gateways. */ export function applicationUrlFor( - environment: Pick, + environment: Pick & { projectId?: string }, env: NodeJS.ProcessEnv, additionalOrigins: string[] = [], ): string | undefined { if (!environment.applicationUrl) return undefined; let applicationUrl: string; try { - applicationUrl = normalizeApplicationUrl(environment.applicationUrl, !isProduction(env) && !environment.production); + const binding = env.WF_LOCAL_POC_BINDING_FILE ? readLocalPocBinding(env.WF_LOCAL_POC_BINDING_FILE, env) : undefined; + const localPoc = + binding && + binding.projectId === environment.projectId && + !environment.production && + environment.applicationUrl === 'http://120.48.164.19'; + applicationUrl = localPoc + ? environment.applicationUrl + : normalizeApplicationUrl(environment.applicationUrl, !isProduction(env) && !environment.production); } catch { throw new DomainError( 'APPLICATION_URL_INVALID', diff --git a/apps/api/src/domain/control-plane.ts b/apps/api/src/domain/control-plane.ts index 89d7791..1b73375 100644 --- a/apps/api/src/domain/control-plane.ts +++ b/apps/api/src/domain/control-plane.ts @@ -1,3 +1,5 @@ +import { assertPocBuild, boundPocProject } from './local-poc.js'; +import { nativeClaudeEnabled } from './local-execution.js'; import { randomUUID } from 'node:crypto'; import { DomainError, @@ -6,6 +8,8 @@ import { stages, projectInput, wishInput, + budgetPatchSchema, + budgetSchema, commandInput, transitionInput, evidenceInput, @@ -33,7 +37,7 @@ import { type CheckpointRecord, } from '@wishforge/contracts'; import type { Store, Transaction } from '../db/store.js'; -import { checkLease, digest, redact, requireRole } from './policy.js'; +import { checkLease, digest, redact, requireHuman, requireRole } from './policy.js'; import { GitStorage } from './git-storage.js'; import { requireCapacity, effectiveEntitlements } from './entitlements.js'; import { validateRepositoryUrl } from '../../../../packages/runtime/src/git.js'; @@ -267,10 +271,12 @@ export class ControlPlane { } async providerInfo(tx: Transaction): Promise { const connections = await tx.list('provider_connection'); + const awaitedTenantId = (await tx.tenant()).id; const connected = (id: string) => connections.some(c => c.provider === id && c.status === 'active'); return providers.map(id => { const { name, binaryVariable, proxied } = providerCatalog[id]; - const configured = connected(id); + const native = id === 'claude-code' && nativeClaudeEnabled(this.env, awaitedTenantId); + const configured = connected(id) || native; const productionAllowed = !isProduction(this.env) || (proxied && providerProxyConfigured(this.env)); const installed = !binaryVariable || Boolean(this.env[binaryVariable]); const enabled = configured && productionAllowed && installed; @@ -280,7 +286,9 @@ export class ControlPlane { ? 'Connect a tenant-owned provider credential to execute tasks.' : !installed ? `The ${name} executable is not configured on the worker (${binaryVariable}).` - : 'Available for worker preflight; account/model access is checked when a task starts.'; + : native + ? 'Available through the explicitly configured local Claude CLI account; trusted local operators only.' + : 'Available for worker preflight; account/model access is checked when a task starts.'; return { id, name, @@ -292,7 +300,7 @@ export class ControlPlane { resume: enabled, cancel: enabled, eventReplay: false, - usage: proxied && enabled, + usage: (proxied || native) && enabled, }, }; }); @@ -303,6 +311,12 @@ export class ControlPlane { this.validateKey(key); return this.store.transaction(actor.tenantId, async tx => { const project = await projectAccess(tx, actor, projectId); + const localPoc = boundPocProject(project, this.env); + if (localPoc && (data.sourceBranch || data.provider !== 'claude-code')) + throw new DomainError( + 'POC_EXECUTION_POLICY', + 'This local POC project runs Claude CLI from its fixed poc target branch', + ); if ( data.sourceBranch && (data.sourceBranch === project.targetBranch || data.sourceBranch.startsWith('wishforge/')) @@ -484,6 +498,67 @@ export class ControlPlane { }); }); } + /** Changes limits only; continuing execution remains a separate, quota-checked command. */ + async updateBudget(actor: Actor, id: string, input: unknown, key?: string) { + requireHuman(actor); + requireRole(actor, ['owner', 'admin']); + const data = budgetPatchSchema.parse(input); + this.validateKey(key); + return this.store.transaction(actor.tenantId, async tx => { + let run = await must(tx, 'run', id); + await projectAccess(tx, actor, run.projectId); + return idempotent(tx, `budget:${actor.userId}:${id}:${key}`, data, async () => { + if (!['waiting', 'paused'].includes(run.status)) + throw new DomainError('BUDGET_UPDATE_REQUIRES_STOPPED_RUN', 'Pause the run before changing its budget', 409); + if (run.providerProxyActiveRequest) + throw new DomainError( + 'BUDGET_UPDATE_PENDING_USAGE', + 'Settle the active model request before changing its budget', + 409, + ); + this.accountTime(run); + const oldBudget = { ...run.budget }; + const nextBudget = budgetSchema.parse({ ...run.budget, ...data }); + if (nextBudget.maxTokens < run.usedTokens) + throw new DomainError('BUDGET_BELOW_USAGE', 'Token limit cannot be lower than the recorded usage', 400); + if (nextBudget.maxMinutes * 60_000 < run.activeMilliseconds) + throw new DomainError( + 'BUDGET_BELOW_USAGE', + 'Time limit cannot be lower than the recorded active execution time', + 400, + ); + if (data.maxRepairRounds !== undefined && data.maxRepairRounds < run.repairCount) + throw new DomainError( + 'BUDGET_BELOW_USAGE', + 'Repair limit cannot be lower than the completed repair count', + 400, + ); + const remaining = Math.max(0, nextBudget.maxTokens - run.usedTokens); + const others = (await tx.list('run')).filter(other => other.id !== run.id); + const used = (await tx.usage(this.period())).reduce((sum, item) => sum + item.tokens, 0); + if ( + reservedTokens(others) + used + remaining > + effectiveEntitlements(await tx.tenant()).limits.monthlyModelTokens + ) + throw new DomainError('QUOTA_EXCEEDED', 'Tenant token reservation limit is exhausted', 429); + run = touch({ ...run, budget: nextBudget, reservedTokens: remaining }); + await tx.put('run', run); + await tx.event( + id, + 'run.budget.updated', + 'An administrator adjusted the run budget; execution remains stopped.', + { + actorId: actor.userId, + oldBudget, + newBudget: nextBudget, + usedTokens: run.usedTokens, + activeMilliseconds: run.activeMilliseconds, + }, + ); + return run; + }); + }); + } async lease(actor: Actor, id: string, workerId: string, generation?: string): Promise { if (!['worker', 'verifier', 'deployer'].includes(actor.kind)) throw new DomainError('FORBIDDEN', 'Execution identity required', 403); @@ -743,6 +818,11 @@ export class ControlPlane { ); const release = await must(tx, 'release', data.releaseId), environment = await must(tx, 'environment', data.environmentId); + if (release.pocRelease) + throw new DomainError( + 'POC_RUNNER_RECEIPT_REQUIRED', + 'POC deployment evidence is created only from the signed component Runner receipt', + ); if (actor.userId.startsWith('runner:') && actor.userId !== `runner:${environment.id}`) throw new DomainError('FORBIDDEN', 'Runner cannot attest another environment', 403); if ( @@ -801,6 +881,18 @@ export class ControlPlane { (project.verificationProfile && run.verifiedPolicyDigest !== verificationPolicyDigest(project))) ) throw new DomainError('UNVERIFIED_BUILD', 'Build must bind the verified commit and an immutable image digest'); + if (data.type === 'build' && data.passed) { + await assertPocBuild(project, project.deliveryConfig?.environmentId, data.pocRelease, this.env); + if ( + data.pocRelease && + (data.pocRelease.sourceCommit !== data.sourceCommit || data.pocRelease.images.api !== data.imageDigest) + ) + throw new DomainError( + 'POC_BUILD_MISMATCH', + 'All component evidence must bind the verified source and API image', + ); + } else if (data.pocRelease) + throw new DomainError('POC_EVIDENCE_TYPE', 'Only build evidence may introduce a POC component release'); const evidence = { ...record(actor.tenantId), ...data, diff --git a/apps/api/src/domain/local-execution.ts b/apps/api/src/domain/local-execution.ts new file mode 100644 index 0000000..4a57ac2 --- /dev/null +++ b/apps/api/src/domain/local-execution.ts @@ -0,0 +1,14 @@ +import { isAbsolute } from 'node:path'; + +/** Local account authority is explicitly assigned to one tenant; it is not a fake BYOK connection. */ +export function nativeClaudeEnabled(env: NodeJS.ProcessEnv, tenantId: string): boolean { + return ( + env.WF_DEPLOYMENT_MODE === 'development' && + env.NODE_ENV !== 'production' && + env.WF_PROVISIONER_BACKEND === 'local' && + env.WF_TENANT_ID === tenantId && + !!env.WF_CLAUDE_BIN && + !!env.WF_CLAUDE_LOCAL_AUTH_HOME && + isAbsolute(env.WF_CLAUDE_LOCAL_AUTH_HOME) + ); +} diff --git a/apps/api/src/domain/local-poc.ts b/apps/api/src/domain/local-poc.ts new file mode 100644 index 0000000..1c2f53e --- /dev/null +++ b/apps/api/src/domain/local-poc.ts @@ -0,0 +1,38 @@ +import type { Project, PocReleaseSet } from '@wishforge/contracts'; +import { DomainError } from '@wishforge/contracts'; +import { readLocalPocBinding, localPocForProject, loadPocProfile, profileDigest } from '@wishforge/runtime'; + +export function boundPocProject(project: Project, env: NodeJS.ProcessEnv) { + return localPocForProject(readLocalPocBinding(env.WF_LOCAL_POC_BINDING_FILE, env), project); +} + +export async function assertPocBuild( + project: Project, + environmentId: string | undefined, + release: PocReleaseSet | undefined, + env: NodeJS.ProcessEnv, +) { + const binding = boundPocProject(project, env); + if (!binding && !release) return; + if (!binding || !release || (environmentId && binding.environmentId !== environmentId)) + throw new DomainError( + 'POC_BINDING_REQUIRED', + 'POC component releases require the exact operator-bound project and environment', + ); + const profile = await loadPocProfile(binding.profileFile); + if (release.profileDigest !== profileDigest(profile) || !release.expectedTemplateDigests) + throw new DomainError( + 'POC_POLICY_CHANGED', + 'The POC profile or baseline configuration fingerprint is missing or changed', + ); + for (const [component, repository] of Object.entries({ + api: 'droboticflow-api', + worker: 'droboticflow-worker', + coordinator: 'drosync-coordinator', + })) { + for (const images of [release.images, release.expectedImages]) { + if (!images[component as keyof typeof images].startsWith(`${profile.registry}/${repository}@sha256:`)) + throw new DomainError('POC_IMAGE_SCOPE', 'A POC component image is outside the fixed registry repository'); + } + } +} diff --git a/apps/api/src/domain/provider-events.ts b/apps/api/src/domain/provider-events.ts index daab771..f80149e 100644 --- a/apps/api/src/domain/provider-events.ts +++ b/apps/api/src/domain/provider-events.ts @@ -51,6 +51,13 @@ export function describeProviderEvent(event: { type: ProviderEventType; data: Re case 'usage': { const input = count(data.input_tokens) ?? 0; const output = count(data.output_tokens) ?? 0; + const cacheCreation = count(data.cache_creation_input_tokens) ?? 0; + const cacheRead = count(data.cache_read_input_tokens) ?? 0; + if (cacheCreation || cacheRead) + return { + message: `Model usage: ${input} input, ${output} output, ${cacheCreation} cache creation and ${cacheRead} cache read tokens`, + data: { input, output, cacheCreation, cacheRead, total: input + output + cacheCreation + cacheRead }, + }; return { message: `Model usage: ${input} input and ${output} output tokens`, data: { input, output } }; } case 'failed': diff --git a/apps/api/src/domain/releases.ts b/apps/api/src/domain/releases.ts index 77a440c..8f02a91 100644 --- a/apps/api/src/domain/releases.ts +++ b/apps/api/src/domain/releases.ts @@ -1,3 +1,4 @@ +import { assertPocBuild } from './local-poc.js'; import { z } from 'zod'; import { requireDeploymentSecretPolicy } from './deployment-secret-policy.js'; import { gatewayIdentityOrigins } from './gateway-target.js'; @@ -15,9 +16,20 @@ import { isProduction, type CheckpointRecord, type RunnerTask, + type PocReleaseSet, } from '@wishforge/contracts'; import type { Store, Transaction } from '../db/store.js'; -import { record, touch, must, projectAccess, idempotent, now, executionScope, setWaiting } from './control-plane.js'; +import { + record, + touch, + must, + projectAccess, + idempotent, + now, + executionScope, + setWaiting, + clearWaiting, +} from './control-plane.js'; import { captureLesson } from './lessons.js'; import { digest, releaseRisk, requireRole, requireHuman } from './policy.js'; @@ -26,6 +38,7 @@ import { assertVerificationProfile, verificationPolicyDigest } from './verificat export function releaseBinding(release: Release) { return { + pocRelease: release.pocRelease, deploymentSecretPolicyDigest: release.deploymentSecretPolicyDigest, applicationUrl: release.applicationUrl, deliveryRequired: release.deliveryRequired, @@ -289,7 +302,9 @@ export class Releases { classification.sourceCommit === run.verifiedCommit, preauthorized: env.autoDeploy, }); + await assertPocBuild(project, env.id, build.pocRelease, this.env); const binding = { + pocRelease: build.pocRelease, deploymentSecretPolicyDigest: env.deploymentSecretPolicyDigest, applicationUrl: env.applicationUrl, deliveryRequired: isProduction(this.env) || !!env.applicationUrl, @@ -371,6 +386,7 @@ export class Releases { 'Requirements, code, policy, configuration, secrets or environment changed; request a new release', ); requireDeploymentSecretPolicy(release); + await assertPocBuild(project, environment.id, release.pocRelease, this.env); if (requireApproval && release.approvalId) { const approval = await must(tx, 'approval', release.approvalId); if ( @@ -458,6 +474,27 @@ export class Releases { 'ACCEPTANCE_REQUIRED', 'Health and business smoke evidence must bind this exact release and environment', ); + if (release.pocRelease) { + const task = evidence.runnerTaskId ? await tx.get('runner_task', evidence.runnerTaskId) : undefined; + const result = task?.result as { status?: string; evidence?: Record } | undefined; + const envelope = task?.envelope as { payload?: { release?: { pocRelease?: unknown } } } | undefined; + if ( + actor.userId !== `runner:${env.id}` || + !task || + task.runnerId !== env.runnerId || + task.releaseId !== release.id || + task.environmentId !== env.id || + result?.status !== 'verified' || + task.resultDigest !== digest(result) || + digest(result.evidence?.pocRelease) !== digest(release.pocRelease) || + result.evidence?.bundleDigest !== digest(release.pocRelease) || + digest(envelope?.payload?.release?.pocRelease) !== digest(release.pocRelease) + ) + throw new DomainError( + 'POC_RUNNER_RECEIPT_REQUIRED', + 'POC acceptance requires the registered Runner receipt for the entire signed component set', + ); + } assertApplicationAccepted(release, evidence.accessEvidence, this.env); if (release.applicationUrl) release.deliveryUrl = release.applicationUrl; release.status = 'healthy'; @@ -469,6 +506,7 @@ export class Releases { throw new DomainError('MODEL_USAGE_UNCONFIRMED', 'Outstanding model usage must be reconciled before acceptance'); run.status = 'succeeded'; run.stage = 'accept'; + clearWaiting(run); run.reservedTokens = 0; await captureLesson(tx, run); run.lastActiveAt = undefined; @@ -516,6 +554,52 @@ export class Releases { return { environmentId, releaseId, status: release.status }; }); } + /** Reconstruct the same immutable recovery bundle at dispatch, retries and receipt acceptance. */ + async rollbackPocManifest( + tx: Transaction, + current: Release, + target: Release, + operationId: string, + ): Promise { + if (!current.pocRelease && !target.pocRelease) return undefined; + const from = current.pocRelease, + to = target.pocRelease; + if ( + !from || + !to || + !from.rollbackCompatible || + current.projectId !== target.projectId || + current.environmentId !== target.environmentId || + current.previousReleaseId !== target.id || + digest(releaseBinding(current)) !== current.bindingDigest || + digest(releaseBinding(target)) !== target.bindingDigest || + from.sourceCommit !== current.sourceCommit || + to.sourceCommit !== target.sourceCommit || + from.images.api !== current.imageDigest || + to.images.api !== target.imageDigest || + from.profileDigest !== to.profileDigest || + !from.expectedTemplateDigests || + !to.expectedTemplateDigests || + digest(from.expectedTemplateDigests) !== digest(to.expectedTemplateDigests) || + digest(from.expectedImages) !== digest(to.images) + ) + throw new DomainError( + 'ROLLBACK_REQUIRES_OPERATOR', + 'POC rollback requires a compatible direct predecessor, complete component history and unchanged configuration fingerprints', + ); + const project = await must(tx, 'project', current.projectId); + await assertPocBuild(project, current.environmentId, from, this.env); + await assertPocBuild(project, target.environmentId, to, this.env); + return { + ...to, + id: `rollback-${operationId}`, + images: { ...to.images }, + expectedImages: { ...from.images }, + expectedTemplateDigests: { ...from.expectedTemplateDigests }, + // If restoring the prior version fails, compensation restores the compatible current version. + rollbackCompatible: true, + }; + } async rollback(actor: Actor, id: string, key?: string) { requireRole(actor, ['owner', 'admin', 'deployer']); requireHuman(actor); @@ -559,8 +643,11 @@ export class Releases { environmentId: env.id, expectedReleaseId: id, targetBindingDigest: previous.bindingDigest, + sourceBindingDigest: release.bindingDigest, status: 'pending', }; + // Validate before acquiring the environment lock. Dispatch persists the actual recovery manifest. + await this.rollbackPocManifest(tx, release, previous, operation.id); // Acquiring the environment lock here prevents a ready forward release racing the rollback. env.activeReleaseId = previous.id; await tx.put('environment', touch(env)); diff --git a/apps/api/src/domain/runner-broker.ts b/apps/api/src/domain/runner-broker.ts index defe102..7e53b1b 100644 --- a/apps/api/src/domain/runner-broker.ts +++ b/apps/api/src/domain/runner-broker.ts @@ -11,6 +11,7 @@ import { type Release, type RunnerRegistration, type RunnerTask, + type PocReleaseSet, } from '@wishforge/contracts'; import type { Store, Transaction } from '../db/store.js'; import { must, projectAccess, record, touch, now } from './control-plane.js'; @@ -29,6 +30,7 @@ interface Envelope { [key: string]: unknown; }; } +type PocRollbackOperation = RunnerTask & { sourceBindingDigest?: string; pocRelease?: PocReleaseSet }; const receipt = z .object({ result: z @@ -104,6 +106,23 @@ export class RunnerBroker { throw new DomainError('RUNNER_REVOKED', 'Runner registration is inactive or replaced', 403); return registration; } + private async rollbackPoc( + tx: Transaction, + operation: RunnerTask, + target: Release, + ): Promise { + const stored = operation as PocRollbackOperation; + const current = await must(tx, 'release', String(operation.expectedReleaseId)); + if (current.pocRelease && stored.sourceBindingDigest !== current.bindingDigest) + throw new DomainError('ROLLBACK_STALE', 'The current POC artifact binding changed after rollback was requested'); + const recovery = await this.releases.rollbackPocManifest(tx, current, target, operation.id); + if (stored.pocRelease && digest(stored.pocRelease) !== digest(recovery ?? null)) + throw new DomainError( + 'ROLLBACK_STALE', + 'The persisted POC recovery manifest no longer matches its source and target', + ); + return recovery; + } async poll(actor: Actor, environmentId: string) { const key = await this.signingKey(); return this.store.transaction(actor.tenantId, async tx => { @@ -130,6 +149,12 @@ export class RunnerBroker { digest(target.secretVersionRefs) !== digest(environment.secretVersionRefs) ) throw new DomainError('ROLLBACK_STALE', 'Rollback state changed'); + const recovery = await this.rollbackPoc(tx, operation, target); + if (digest(envelope.payload.release.pocRelease ?? null) !== digest(recovery ?? null)) + throw new DomainError( + 'ROLLBACK_STALE', + 'Signed rollback manifest differs from the current recovery plan', + ); } return envelope; } @@ -146,6 +171,7 @@ export class RunnerBroker { let release: Release | undefined; let action: 'deploy' | 'reconcile'; let previous: string | undefined; + let recoveryPoc: PocReleaseSet | undefined; if (rollback) { release = await must(tx, 'release', String(rollback.targetReleaseId)); if ( @@ -166,6 +192,8 @@ export class RunnerBroker { ); action = rollback.status === 'pending' ? 'deploy' : 'reconcile'; previous = String(rollback.expectedReleaseId); + recoveryPoc = await this.rollbackPoc(tx, rollback, release); + if (recoveryPoc) Object.assign(rollback, { pocRelease: recoveryPoc }); } else { const releases = await tx.list('release'); release = environment.activeReleaseId @@ -210,6 +238,7 @@ export class RunnerBroker { environmentId, sourceCommit: release.sourceCommit, image: release.imageDigest, + pocRelease: rollback ? recoveryPoc : release.pocRelease, architecture: release.architecture, configVersion: release.configVersion, deploymentSecretPolicyDigest: release.deploymentSecretPolicyDigest, @@ -293,14 +322,28 @@ export class RunnerBroker { Array.isArray(result.evidence.checks) && result.evidence.checks.includes('health') && result.evidence.checks.includes('business-smoke'); + const rollbackOperation = task.rollbackOperationId + ? await must(tx, 'runner_task', String(task.rollbackOperationId)) + : undefined; + const expectedPoc = rollbackOperation + ? await this.rollbackPoc(tx, rollbackOperation, release) + : release.pocRelease; + if (digest(payload.release.pocRelease ?? null) !== digest(expectedPoc ?? null)) + throw new DomainError( + 'RESULT_MISMATCH', + 'The signed component bundle no longer matches this deployment operation', + ); const verified = basicVerified && + (!expectedPoc || + (digest(result.evidence.pocRelease ?? null) === digest(expectedPoc) && + result.evidence.bundleDigest === digest(expectedPoc))) && matchesApplicationAccess(release, result.evidence.accessEvidence) && (!isProduction(this.env) || !!release.applicationUrl); let rolledBack = false; - if (task.rollbackOperationId) { - const operation = await must(tx, 'runner_task', String(task.rollbackOperationId)); + if (rollbackOperation) { + const operation = rollbackOperation; if ( operation.status !== 'dispatching' || operation.lastTaskId !== task.id || @@ -324,6 +367,8 @@ export class RunnerBroker { operation.completedAt = now(); const evidence = this.deploymentEvidence(actor, release, environment, task.id, result.evidence); await tx.put('evidence', evidence); + release.evidenceIds.push(evidence.id); + release.deployedAt = now(); operation.evidenceId = evidence.id; await tx.put('release', touch(original)); await tx.put('release', touch(release)); @@ -344,6 +389,10 @@ export class RunnerBroker { } await tx.put('runner_task', touch(operation)); } else if (verified) { + // Persist the bound receipt in this same transaction before acceptance checks it. + task.result = result; + task.resultDigest = digest(result); + await tx.put('runner_task', touch(task)); await this.releases.assertCurrent(tx, release); const evidence = this.deploymentEvidence(actor, release, environment, task.id, result.evidence); await tx.put('evidence', evidence); diff --git a/apps/api/src/http.ts b/apps/api/src/http.ts index a15dc1f..d69fd59 100644 --- a/apps/api/src/http.ts +++ b/apps/api/src/http.ts @@ -91,6 +91,25 @@ const checkpointBody = z .optional(), createdAt: z.string().max(64), sessionId: z.string().max(200).optional(), + providerCompletion: z + .object({ + status: z.enum(['completed', 'failed', 'canceled']), + revision: z.number().int().positive(), + repairCount: z.number().int().nonnegative(), + summary: z.string().max(4000).optional(), + finalUsage: z + .array( + z + .object({ + operationId: z.string().min(1).max(300), + tokens: z.number().int().nonnegative().safe(), + }) + .strict(), + ) + .max(100), + }) + .strict() + .optional(), }) .strict(), }) @@ -152,6 +171,10 @@ export class Errors implements ExceptionFilter { @Controller('v1') export class ApiController { constructor(@Inject(Services) private s: Services) {} + @Get('identity') identity(@Req() req: AuthRequest) { + const { userId, role, kind } = req.actor; + return ok({ userId, role, kind }); + } @Get('dashboard') async dashboard(@Req() req: AuthRequest) { const a = req.actor; const [projects, runs, releases, providers, usage] = await Promise.all([ @@ -312,6 +335,9 @@ export class ApiController { @Get('runs/:id') async run(@Req() r: AuthRequest, @Param('id') id: string) { return ok(await this.s.control.run(r.actor, id)); } + @Patch('runs/:id/budget') async updateBudget(@Req() r: AuthRequest, @Param('id') id: string, @Body() b: unknown) { + return ok(await this.s.control.updateBudget(r.actor, id, b, key(r))); + } @Get('runs/:id/events') async events(@Req() r: AuthRequest, @Param('id') id: string, @Query('after') after?: string) { return ok(await this.s.control.events(r.actor, id, Math.max(0, Number(after) || 0))); } diff --git a/apps/provisioner/README.md b/apps/provisioner/README.md index 9e21aa5..dc175b5 100644 --- a/apps/provisioner/README.md +++ b/apps/provisioner/README.md @@ -34,7 +34,7 @@ executor 与 verifier 各自只拿到自己的运行级令牌(由 API 签发 | `WF_PROVISIONER_TOKEN` | API 调用本服务的令牌(至少 32 字符) | | `WF_TENANT_ID` | 本服务的唯一租户(本地为 `demo`) | | `WF_RESOURCE_GRANT_SECRET` | 与 API 共享的资源授权签名密钥 | -| `WF_LOCAL_RUN_ROOT` | 运行目录,默认 `.wishforge/runs`;每个代次为 `<租户>/<运行>/<代次>/{executor,verifier}` | +| `WF_LOCAL_RUN_ROOT` | 运行目录,默认 `~/.local/share/wishforge/runs`,必须位于 WishForge 源码目录之外;每个代次为 `<租户>/<运行>/<代次>/{executor,verifier}` | | `WF_LOCAL_IDE_URL` | 本机 Theia 地址(`npm run dev:ide` 启动在 `http://127.0.0.1:4300/`);能访问时工作区才变为 ready | | `WF_CONTROL_PLANE_URL`、`TEMPORAL_ADDRESS`、`TEMPORAL_NAMESPACE` | 传给 worker 进程 | diff --git a/apps/provisioner/local.mjs b/apps/provisioner/local.mjs index bff5689..fa99e72 100644 --- a/apps/provisioner/local.mjs +++ b/apps/provisioner/local.mjs @@ -1,9 +1,12 @@ import { spawn } from 'node:child_process'; import { mkdir, rm } from 'node:fs/promises'; +import { homedir } from 'node:os'; import path from 'node:path'; +import { fileURLToPath } from 'node:url'; import { verifyResourceGrant } from './resource-grants.mjs'; const id = /^[A-Za-z0-9_-]{1,128}$/; +const SOURCE_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../..'); /** Process environment a worker inherits from this host; nothing else from the provisioner's own environment. */ const PASSTHROUGH = [ 'PATH', @@ -14,6 +17,7 @@ const PASSTHROUGH = [ 'HTTPS_PROXY', 'NO_PROXY', 'WF_GIT_ALLOW_LOCAL_HTTP', + 'WF_LOCAL_POC_BINDING_FILE', 'WF_CODEBUDDY_BIN', 'WF_CLAUDE_BIN', 'WF_DOCKER_CONFIG', @@ -43,10 +47,11 @@ export function readLocalConfig(env = process.env, cwd = process.cwd()) { controlPlaneUrl: env.WF_CONTROL_PLANE_URL ?? 'http://127.0.0.1:4000', temporalAddress: env.TEMPORAL_ADDRESS ?? '127.0.0.1:7233', temporalNamespace: env.TEMPORAL_NAMESPACE ?? 'default', - runRoot: path.resolve(cwd, env.WF_LOCAL_RUN_ROOT ?? '.wishforge/runs'), + runRoot: path.resolve(cwd, env.WF_LOCAL_RUN_ROOT ?? path.join(homedir(), '.local/share/wishforge/runs')), cwd, workerEntry: path.resolve(cwd, env.WF_LOCAL_WORKER_ENTRY ?? 'apps/worker/src/main.ts'), ideUrl: env.WF_LOCAL_IDE_URL, + claudeAuthHome: env.WF_CLAUDE_LOCAL_AUTH_HOME, passthrough: Object.fromEntries(PASSTHROUGH.filter(name => env[name]).map(name => [name, env[name]])), // Grants are verified like in production, but the host has no image and no fixed caps. acceptAnyImage: true, @@ -54,7 +59,19 @@ export function readLocalConfig(env = process.env, cwd = process.cwd()) { memoryMiBCap: 262144, storageSize: '1024Gi', }; + // Node and TypeScript search ancestor node_modules. A nested project would silently + // inherit WishForge's React/types instead of checking only its own locked dependencies. + const relativeToSource = path.relative(SOURCE_ROOT, config.runRoot); + if ( + !relativeToSource || + (!relativeToSource.startsWith(`..${path.sep}`) && relativeToSource !== '..' && !path.isAbsolute(relativeToSource)) + ) + throw new Error( + 'WF_LOCAL_RUN_ROOT must be outside the WishForge source tree; use ~/.local/share/wishforge/runs and recover old attempts from persisted checkpoints', + ); if (!id.test(config.tenantId)) throw new Error('Invalid WF_TENANT_ID'); + if (config.claudeAuthHome && !path.isAbsolute(config.claudeAuthHome)) + throw new Error('WF_CLAUDE_LOCAL_AUTH_HOME must be an absolute path'); if (config.resourceGrantSecret.length < 32) throw new Error('WF_RESOURCE_GRANT_SECRET must be at least 32 characters'); if (config.ideUrl) { @@ -125,7 +142,10 @@ export function createLocalBackend( WF_DEPLOYMENT_MODE: 'development', WF_WORKER_ROLE: role, ...(role === 'executor' - ? { WF_WORKER_TOKEN: request.executorToken } + ? { + WF_WORKER_TOKEN: request.executorToken, + ...(config.claudeAuthHome ? { WF_CLAUDE_LOCAL_AUTH_HOME: config.claudeAuthHome } : {}), + } : { WF_VERIFIER_TOKEN: request.verifierToken }), WF_SANDBOX_MODE: 'host', WF_SANDBOX_TENANT_ID: request.tenantId, diff --git a/apps/provisioner/test/local.test.mjs b/apps/provisioner/test/local.test.mjs index 404cffb..7bf5659 100644 --- a/apps/provisioner/test/local.test.mjs +++ b/apps/provisioner/test/local.test.mjs @@ -5,6 +5,7 @@ import { createHmac } from 'node:crypto'; import { mkdtemp, rm, stat } from 'node:fs/promises'; import os from 'node:os'; import path from 'node:path'; +import { fileURLToPath } from 'node:url'; import { createLocalBackend, readLocalConfig } from '../local.mjs'; import { resourceGrantPayload } from '../resource-grants.mjs'; @@ -94,8 +95,22 @@ test('refuses to run outside development and requires the grant secret', () => { ); }); +test('places default workspaces outside platform dependencies and rejects nested roots', () => { + const env = { WF_DEPLOYMENT_MODE: 'development', WF_TENANT_ID: 'demo', WF_RESOURCE_GRANT_SECRET: secret }; + const source = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../..'); + assert.equal(readLocalConfig(env, source).runRoot, path.join(os.homedir(), '.local/share/wishforge/runs')); + for (const runRoot of [source, path.join(source, '.wishforge/runs'), '.wishforge/runs']) + assert.throws( + () => readLocalConfig({ ...env, WF_LOCAL_RUN_ROOT: runRoot }, source), + /outside the WishForge source tree/, + ); + assert.equal(readLocalConfig({ ...env, WF_LOCAL_RUN_ROOT: `${source}-runs` }, source).runRoot, `${source}-runs`); + const temporary = path.join(os.tmpdir(), 'standalone-local-test'); + assert.equal(readLocalConfig({ ...env, WF_LOCAL_RUN_ROOT: 'runs' }, temporary).runRoot, path.join(temporary, 'runs')); +}); + test('starts one executor and one verifier per generation with only their own credentials', async () => { - const f = await fixture(); + const f = await fixture({ WF_CLAUDE_LOCAL_AUTH_HOME: '/home/operator' }); try { assert.deepEqual(await f.backend.provisionRun(request()), { status: 'provisioned', @@ -112,6 +127,8 @@ test('starts one executor and one verifier per generation with only their own cr assert.equal(executor.options.env.WF_VERIFIER_TOKEN, undefined); assert.equal(verifier.options.env.WF_VERIFIER_TOKEN, 'verifier-token'); assert.equal(verifier.options.env.WF_WORKER_TOKEN, undefined); + assert.equal(executor.options.env.WF_CLAUDE_LOCAL_AUTH_HOME, '/home/operator'); + assert.equal(verifier.options.env.WF_CLAUDE_LOCAL_AUTH_HOME, undefined); for (const child of f.started) { assert.equal(child.options.env.WF_SANDBOX_MODE, 'host'); assert.equal(child.options.env.WF_SANDBOX_GENERATION, 'generation-1'); diff --git a/apps/runner/src/adapters.ts b/apps/runner/src/adapters.ts new file mode 100644 index 0000000..15a5f08 --- /dev/null +++ b/apps/runner/src/adapters.ts @@ -0,0 +1,40 @@ +import path from 'node:path'; +import { + ComposeDeploymentAdapter, + KubernetesDeploymentAdapter, + DeploymentSecretBroker, + loadPocProfile, + PocRunnerDeploymentAdapter, +} from '@wishforge/runtime'; +import type { RunnerConfig } from './runner.js'; + +/** An adopted POC runner only accepts the operator's fixed Kubernetes profile. */ +export async function createRunnerAdapters(env: Record): Promise { + if (env.WF_POC_PROFILE_FILE) { + if (!path.isAbsolute(env.WF_POC_PROFILE_FILE)) throw new Error('WF_POC_PROFILE_FILE must be an absolute path'); + if (!env.WF_RUNNER_STATE_DIR) throw new Error('WF_RUNNER_STATE_DIR is required'); + const profile = await loadPocProfile(env.WF_POC_PROFILE_FILE); + return { kubernetes: new PocRunnerDeploymentAdapter(profile, path.join(env.WF_RUNNER_STATE_DIR, 'poc')) }; + } + return { + compose: new ComposeDeploymentAdapter({ + secretBroker: new DeploymentSecretBroker(), + dockerConfig: env.WF_DEPLOYMENT_DOCKER_CONFIG, + directory: env.WF_COMPOSE_DIRECTORY, + project: env.WF_COMPOSE_PROJECT, + healthUrl: env.WF_HEALTH_URL, + dockerContext: env.WF_DOCKER_CONTEXT, + candidateHealthUrlTemplate: env.WF_CANDIDATE_HEALTH_URL_TEMPLATE, + proxyAdminUrl: env.WF_CADDY_ADMIN_URL, + proxyConfigPath: env.WF_CADDY_PROXY_CONFIG_PATH, + proxyDialHost: env.WF_CADDY_DIAL_HOST, + }), + kubernetes: new KubernetesDeploymentAdapter({ + secretBroker: new DeploymentSecretBroker(), + context: env.WF_KUBE_CONTEXT, + namespace: env.WF_KUBE_NAMESPACE, + healthUrl: env.WF_HEALTH_URL, + candidateHealthUrlTemplate: env.WF_CANDIDATE_HEALTH_URL_TEMPLATE, + }), + }; +} diff --git a/apps/runner/src/main.ts b/apps/runner/src/main.ts index f397a25..28fe04b 100644 --- a/apps/runner/src/main.ts +++ b/apps/runner/src/main.ts @@ -1,13 +1,14 @@ -import https from 'node:https'; import { readFile } from 'node:fs/promises'; import { - ComposeDeploymentAdapter, - KubernetesDeploymentAdapter, - DeploymentSecretBroker, + loadPocProfile, + profileDigest, type SignedRunnerTask, + type TrustedPocDeliveryPolicy, } from '@wishforge/runtime'; import { requireDeploymentMode } from '@wishforge/contracts'; import { OutboundRunner } from './runner.js'; +import { createRunnerTransport } from './transport.js'; +import { createRunnerAdapters } from './adapters.js'; async function main() { requireDeploymentMode(process.env); @@ -16,90 +17,26 @@ async function main() { 'WF_RUNNER_TOKEN', 'WF_TENANT_ID', 'WF_ENVIRONMENT_ID', - 'WF_RUNNER_CA', - 'WF_RUNNER_CERT', - 'WF_RUNNER_KEY', 'WF_RUNNER_PUBLIC_KEYS', 'WF_RUNNER_STATE_DIR', ]; for (const key of required) if (!process.env[key]) throw new Error(`unconfigured: ${key} is required`); - const base = new URL(process.env.WF_CONTROL_PLANE_URL!); - if (base.protocol !== 'https:') throw new Error('Runner only connects to an HTTPS control plane with mTLS'); - const agent = new https.Agent({ - ca: await readFile(process.env.WF_RUNNER_CA!), - cert: await readFile(process.env.WF_RUNNER_CERT!), - key: await readFile(process.env.WF_RUNNER_KEY!), - rejectUnauthorized: true, - }); - const request = (route: string, body?: unknown): Promise => - new Promise((resolve, reject) => { - const url = new URL(route, base); - if (url.origin !== base.origin) { - reject(new Error('Runner request origin mismatch')); - return; - } - const req = https.request( - url, - { - agent, - method: body ? 'POST' : 'GET', - headers: { - authorization: `Bearer ${process.env.WF_RUNNER_TOKEN!}`, - 'x-wishforge-tenant': process.env.WF_TENANT_ID!, - 'content-type': 'application/json', - }, - timeout: 30_000, - }, - response => { - let output = ''; - response.setEncoding('utf8'); - response.on('data', chunk => { - output += chunk; - if (output.length > 4 * 1024 * 1024) req.destroy(new Error('Response exceeded limit')); - }); - response.on('end', () => { - if ((response.statusCode ?? 500) >= 300) reject(new Error(`Control plane returned ${response.statusCode}`)); - else { - try { - resolve(output ? JSON.parse(output) : null); - } catch (error) { - reject(error); - } - } - }); - }, - ); - req.on('timeout', () => req.destroy(new Error('Control plane request timed out'))); - req.on('error', reject); - req.end(body ? JSON.stringify(body) : undefined); - }); + const { request, close } = await createRunnerTransport(process.env); + let trustedPocDelivery: TrustedPocDeliveryPolicy | undefined; + if (process.env.WF_POC_PROFILE_FILE) { + if (process.env.WF_DEPLOYMENT_MODE !== 'development' || process.env.NODE_ENV === 'production') + throw new Error('Adopted POC delivery requires explicit local development mode'); + const profile = await loadPocProfile(process.env.WF_POC_PROFILE_FILE); + trustedPocDelivery = { profileDigest: profileDigest(profile), applicationUrl: profile.applicationUrl }; + } const runner = new OutboundRunner({ tenantId: process.env.WF_TENANT_ID!, environmentId: process.env.WF_ENVIRONMENT_ID!, publicKeys: JSON.parse(await readFile(process.env.WF_RUNNER_PUBLIC_KEYS!, 'utf8')), stateDirectory: process.env.WF_RUNNER_STATE_DIR!, execute: process.env.WF_RUNNER_EXECUTE === 'true', - adapters: { - compose: new ComposeDeploymentAdapter({ - secretBroker: new DeploymentSecretBroker(), - dockerConfig: process.env.WF_DEPLOYMENT_DOCKER_CONFIG, - directory: process.env.WF_COMPOSE_DIRECTORY, - project: process.env.WF_COMPOSE_PROJECT, - healthUrl: process.env.WF_HEALTH_URL, - dockerContext: process.env.WF_DOCKER_CONTEXT, - candidateHealthUrlTemplate: process.env.WF_CANDIDATE_HEALTH_URL_TEMPLATE, - proxyAdminUrl: process.env.WF_CADDY_ADMIN_URL, - proxyConfigPath: process.env.WF_CADDY_PROXY_CONFIG_PATH, - proxyDialHost: process.env.WF_CADDY_DIAL_HOST, - }), - kubernetes: new KubernetesDeploymentAdapter({ - secretBroker: new DeploymentSecretBroker(), - context: process.env.WF_KUBE_CONTEXT, - namespace: process.env.WF_KUBE_NAMESPACE, - healthUrl: process.env.WF_HEALTH_URL, - candidateHealthUrlTemplate: process.env.WF_CANDIDATE_HEALTH_URL_TEMPLATE, - }), - }, + adapters: await createRunnerAdapters(process.env), + trustedPocDelivery, }); let stopped = false; process.once('SIGTERM', () => { @@ -124,7 +61,7 @@ async function main() { } await new Promise(resolve => setTimeout(resolve, 5_000)); } - agent.destroy(); + close(); } void main().catch(error => { console.error(error.message); diff --git a/apps/runner/src/runner.ts b/apps/runner/src/runner.ts index 303c591..7500d75 100644 --- a/apps/runner/src/runner.ts +++ b/apps/runner/src/runner.ts @@ -9,6 +9,7 @@ import { type DeploymentAdapter, type DeploymentResult, type SignedRunnerTask, + type TrustedPocDeliveryPolicy, } from '@wishforge/runtime'; export interface RunnerConfig { @@ -18,6 +19,7 @@ export interface RunnerConfig { stateDirectory: string; execute: boolean; adapters: Partial>; + trustedPocDelivery?: TrustedPocDeliveryPolicy; } export class OutboundRunner { constructor(private readonly config: RunnerConfig) {} diff --git a/apps/runner/src/transport.ts b/apps/runner/src/transport.ts new file mode 100644 index 0000000..64221c0 --- /dev/null +++ b/apps/runner/src/transport.ts @@ -0,0 +1,86 @@ +import http from 'node:http'; +import https from 'node:https'; +import { readFile } from 'node:fs/promises'; +import { requireDeploymentMode } from '@wishforge/contracts'; + +type Env = Record; + +export function runnerTransportPolicy(env: Env) { + const mode = requireDeploymentMode(env); + const value = env.WF_CONTROL_PLANE_URL; + if (!value) throw new Error('unconfigured: WF_CONTROL_PLANE_URL is required'); + const base = new URL(value); + if (base.username || base.password || base.search || base.hash || base.pathname !== '/') + throw new Error('Runner control plane URL must be an origin without credentials, path, query or fragment'); + // Check the original authority too: URL normalizes alternate IPv4 spellings such as 127.1. + const localHttp = + mode === 'development' && + env.WF_RUNNER_ALLOW_LOCAL_HTTP === 'true' && + /^http:\/\/(?:127\.0\.0\.1|localhost)(?::[0-9]+)?\/?$/.test(value); + if (base.protocol !== 'https:' && !localHttp) + throw new Error('Runner requires HTTPS with mTLS; explicit development HTTP is limited to 127.0.0.1 or localhost'); + if (!localHttp) { + for (const key of ['WF_RUNNER_CA', 'WF_RUNNER_CERT', 'WF_RUNNER_KEY']) + if (!env[key]) throw new Error(`unconfigured: ${key} is required for Runner mTLS`); + } + return { base, localHttp }; +} + +export async function createRunnerTransport(env: Env) { + const { base, localHttp } = runnerTransportPolicy(env); + for (const key of ['WF_RUNNER_TOKEN', 'WF_TENANT_ID']) + if (!env[key]) throw new Error(`unconfigured: ${key} is required`); + const agent = localHttp + ? new http.Agent() + : new https.Agent({ + ca: await readFile(env.WF_RUNNER_CA!), + cert: await readFile(env.WF_RUNNER_CERT!), + key: await readFile(env.WF_RUNNER_KEY!), + rejectUnauthorized: true, + }); + const transportRequest = localHttp ? http.request : https.request; + const request = (route: string, body?: unknown): Promise => + new Promise((resolve, reject) => { + const url = new URL(route, base); + if (url.origin !== base.origin) { + reject(new Error('Runner request origin mismatch')); + return; + } + const req = transportRequest( + url, + { + agent, + method: body === undefined ? 'GET' : 'POST', + headers: { + authorization: `Bearer ${env.WF_RUNNER_TOKEN!}`, + 'x-wishforge-tenant': env.WF_TENANT_ID!, + 'content-type': 'application/json', + }, + timeout: 30_000, + }, + response => { + let output = ''; + response.setEncoding('utf8'); + response.on('data', chunk => { + output += chunk; + if (output.length > 4 * 1024 * 1024) req.destroy(new Error('Response exceeded limit')); + }); + response.on('error', reject); + response.on('end', () => { + if ((response.statusCode ?? 500) >= 300) reject(new Error(`Control plane returned ${response.statusCode}`)); + else { + try { + resolve(output ? JSON.parse(output) : null); + } catch (error) { + reject(error); + } + } + }); + }, + ); + req.on('timeout', () => req.destroy(new Error('Control plane request timed out'))); + req.on('error', reject); + req.end(body === undefined ? undefined : JSON.stringify(body)); + }); + return { request, close: () => agent.destroy() }; +} diff --git a/apps/runner/test/local-entry.test.ts b/apps/runner/test/local-entry.test.ts new file mode 100644 index 0000000..242d087 --- /dev/null +++ b/apps/runner/test/local-entry.test.ts @@ -0,0 +1,147 @@ +import { afterEach, describe, expect, it } from 'vitest'; +import http from 'node:http'; +import { mkdtemp, writeFile, rm } from 'node:fs/promises'; +import { tmpdir } from 'node:os'; +import path from 'node:path'; +import { PocRunnerDeploymentAdapter, KubernetesDeploymentAdapter, ComposeDeploymentAdapter } from '@wishforge/runtime'; +import { createRunnerTransport, runnerTransportPolicy } from '../src/transport.js'; +import { createRunnerAdapters } from '../src/adapters.js'; + +const local = { + WF_DEPLOYMENT_MODE: 'development', + WF_RUNNER_ALLOW_LOCAL_HTTP: 'true', + WF_CONTROL_PLANE_URL: 'http://127.0.0.1:4000', +}; +const dirs: string[] = []; +afterEach(async () => { + await Promise.all(dirs.splice(0).map(directory => rm(directory, { recursive: true, force: true }))); +}); + +describe('local runner transport boundary', () => { + it('requires explicit development and a literal loopback HTTP origin', () => { + expect(runnerTransportPolicy(local).localHttp).toBe(true); + expect(runnerTransportPolicy({ ...local, WF_CONTROL_PLANE_URL: 'http://localhost:4000/' }).localHttp).toBe(true); + for (const value of [ + 'http://192.168.1.2:4000', + 'http://example.test', + 'http://127.1:4000', + 'http://2130706433:4000', + 'http://[::1]:4000', + 'http://localhost.evil.test', + 'https://user:pass@example.test', + 'http://localhost:4000/?x=1', + 'http://localhost:4000/api', + ]) + expect(() => runnerTransportPolicy({ ...local, WF_CONTROL_PLANE_URL: value })).toThrow(); + expect(() => runnerTransportPolicy({ ...local, WF_RUNNER_ALLOW_LOCAL_HTTP: undefined })).toThrow('HTTPS'); + expect(() => runnerTransportPolicy({ ...local, WF_DEPLOYMENT_MODE: 'production' })).toThrow('HTTPS'); + expect(() => runnerTransportPolicy({ ...local, WF_DEPLOYMENT_MODE: undefined })).toThrow('Set WF_DEPLOYMENT_MODE'); + }); + it('retains mandatory mTLS for every HTTPS connection and never inherits global insecure-HTTP opt-in', () => { + expect(() => runnerTransportPolicy({ ...local, WF_CONTROL_PLANE_URL: 'https://localhost:4000' })).toThrow( + 'WF_RUNNER_CA', + ); + expect(() => + runnerTransportPolicy({ ...local, WF_RUNNER_ALLOW_LOCAL_HTTP: undefined, WF_ALLOW_INSECURE_HTTP: 'true' }), + ).toThrow('HTTPS'); + expect( + runnerTransportPolicy({ + ...local, + WF_DEPLOYMENT_MODE: 'production', + WF_CONTROL_PLANE_URL: 'https://control.example.test', + WF_RUNNER_CA: '/ca', + WF_RUNNER_CERT: '/cert', + WF_RUNNER_KEY: '/key', + }).localHttp, + ).toBe(false); + }); + it('keeps registered bearer and tenant headers on local requests, rejects redirects and origin escapes', async () => { + const seen: Array<{ method?: string; url?: string; token?: string; tenant?: string; body: string }> = []; + const server = http.createServer((req, res) => { + let body = ''; + req.on('data', chunk => { + body += String(chunk); + }); + req.on('end', () => { + seen.push({ + method: req.method, + url: req.url, + token: req.headers.authorization, + tenant: String(req.headers['x-wishforge-tenant']), + body, + }); + if (req.url === '/redirect') { + res.writeHead(302, { location: 'http://example.test/leak' }); + res.end(); + } else { + res.setHeader('Content-Type', 'application/json'); + res.end(JSON.stringify({ accepted: true })); + } + }); + }); + await new Promise(resolve => server.listen(0, '127.0.0.1', resolve)); + const address = server.address(); + if (!address || typeof address === 'string') throw new Error('Expected TCP test server'); + const transport = await createRunnerTransport({ + ...local, + WF_CONTROL_PLANE_URL: `http://127.0.0.1:${address.port}`, + WF_RUNNER_TOKEN: 'test-only-registered-runner-token', + WF_TENANT_ID: 'tenant-poc', + }); + try { + expect(await transport.request('/internal/runner/tasks?environmentId=env-poc')).toEqual({ accepted: true }); + await transport.request('/internal/runner/tasks/task-1/result', { result: { status: 'verified' } }); + expect(seen[0]).toMatchObject({ + method: 'GET', + token: 'Bearer test-only-registered-runner-token', + tenant: 'tenant-poc', + }); + expect(JSON.parse(seen[1].body)).toEqual({ result: { status: 'verified' } }); + await expect(transport.request('http://example.test/leak')).rejects.toThrow('origin mismatch'); + await expect(transport.request('/redirect')).rejects.toThrow('302'); + expect(seen).toHaveLength(3); + } finally { + transport.close(); + await new Promise((resolve, reject) => server.close(error => (error ? reject(error) : resolve()))); + } + }); +}); + +describe('operator POC runner adapter wiring', () => { + it('loads the fixed operator profile and enables only the POC Kubernetes adapter', async () => { + const directory = await mkdtemp(path.join(tmpdir(), 'wishforge-runner-entry-')); + dirs.push(directory); + const file = path.join(directory, 'profile.json'); + const uid = '11111111-1111-4111-8111-111111111111'; + await writeFile( + file, + JSON.stringify({ + schemaVersion: 1, + id: 'droboticflow-poc', + repository: 'https://gitea.d-robotics.cc/longtao.wu/droboticflow.git', + branch: 'poc', + kubeconfig: '/operator/poc.kubeconfig', + clusterServer: 'https://120.48.181.105:6443', + namespace: 'droboticflow', + namespaceUid: uid, + deployments: { api: uid, worker: uid, coordinator: uid }, + registry: 'ccr-29eug8s3-pub.cnc.bj.baidubce.com/dataflow-poc', + registrySecret: 'droboticflow-registry', + applicationUrl: 'http://120.48.164.19', + kanikoImage: `registry.test/kaniko@sha256:${'a'.repeat(64)}`, + }), + { mode: 0o600 }, + ); + const adapters = await createRunnerAdapters({ WF_POC_PROFILE_FILE: file, WF_RUNNER_STATE_DIR: directory }); + expect(Object.keys(adapters)).toEqual(['kubernetes']); + expect(adapters.kubernetes).toBeInstanceOf(PocRunnerDeploymentAdapter); + await expect( + createRunnerAdapters({ WF_POC_PROFILE_FILE: 'relative.json', WF_RUNNER_STATE_DIR: directory }), + ).rejects.toThrow('absolute path'); + }); + it('preserves generic adapters only when an adopted POC profile is absent', async () => { + const adapters = await createRunnerAdapters({}); + expect(adapters.compose).toBeInstanceOf(ComposeDeploymentAdapter); + expect(adapters.kubernetes).toBeInstanceOf(KubernetesDeploymentAdapter); + }); +}); diff --git a/apps/web/next.config.ts b/apps/web/next.config.ts index 3566b0c..3f7b5a7 100644 --- a/apps/web/next.config.ts +++ b/apps/web/next.config.ts @@ -1,10 +1,18 @@ import type { NextConfig } from 'next'; const config: NextConfig = { - output: 'standalone', + output: process.env.WF_LOCAL_ACCESS === 'true' ? undefined : 'standalone', poweredByHeader: false, agentRules: false, devIndicators: false, + ...(process.env.WF_LOCAL_ACCESS === 'true' + ? { + allowedDevOrigins: (process.env.WF_LOCAL_ALLOWED_ORIGINS ?? '') + .split(',') + .filter(Boolean) + .map(value => new URL(value.trim()).hostname), + } + : {}), experimental: { optimizePackageImports: ['lucide-react'], // Local development clusters run a development build (the image's WEB_BUILD=development): diff --git a/apps/web/src/app/api/session/route.ts b/apps/web/src/app/api/session/route.ts index cdddf7c..cd01b9b 100644 --- a/apps/web/src/app/api/session/route.ts +++ b/apps/web/src/app/api/session/route.ts @@ -1,12 +1,13 @@ import { NextRequest, NextResponse } from 'next/server'; import { getSession, isDevelopmentAuth, oidcConfigured } from '@/lib/auth'; +import { localAccessEnabled } from '@/lib/local-access'; export async function GET(request: NextRequest) { const session = await getSession(request); return NextResponse.json( { data: { authenticated: isDevelopmentAuth() || Boolean(session), - mode: isDevelopmentAuth() ? 'development' : 'oidc', + mode: localAccessEnabled() ? 'local' : isDevelopmentAuth() ? 'development' : 'oidc', name: session?.name, oidcConfigured: oidcConfigured(), }, diff --git a/apps/web/src/app/login/route.ts b/apps/web/src/app/login/route.ts index c838c40..0bc693e 100644 --- a/apps/web/src/app/login/route.ts +++ b/apps/web/src/app/login/route.ts @@ -10,8 +10,52 @@ import { randomToken, safeReturnTo, seal, + SESSION_COOKIE, } from '@/lib/auth'; +import { + clearLoginFailures, + localAccessEnabled, + localCredentialId, + localCredentials, + LOCAL_SESSION_SECONDS, + localRequestAllowed, + loginRateLimit, + recordLoginFailure, + verifyLocalPassword, +} from '@/lib/local-access'; + +const escapeHtml = (value: string) => + value.replace(/[&<>"']/g, char => ({ '&': '&', '<': '<', '>': '>', '"': '"', "'": ''' })[char]!); + +function localLoginPage(request: NextRequest, message = '', status = 200) { + const returnTo = safeReturnTo(request.nextUrl.searchParams.get('returnTo')); + return new Response( + `登录 · WishForge
✦ WishForge

让愿望成为现实

登录本机工作空间,提交愿望并查看实现与交付进度。

${message ? `` : ''}

仅向获准的协作者提供访问密码。登录会话在 1 小时后失效。

`, + { + status, + headers: { + 'Content-Type': 'text/html; charset=utf-8', + 'Cache-Control': 'no-store', + 'Content-Security-Policy': + "default-src 'none'; style-src 'unsafe-inline'; form-action 'self'; frame-ancestors 'none'; base-uri 'none'", + 'Referrer-Policy': 'no-referrer', + }, + }, + ); +} + export async function GET(request: NextRequest) { + if (localAccessEnabled()) { + if (!localRequestAllowed(request)) return new Response('Forbidden', { status: 403 }); + try { + localCredentials(); + return localLoginPage(request); + } catch { + return localLoginPage(request, '本机访问凭据尚未配置,请联系管理员。', 503); + } + } if (isDevelopmentAuth()) return NextResponse.redirect(new URL('/', publicOrigin(request))); if (!oidcConfigured()) return new Response( @@ -67,3 +111,72 @@ export async function GET(request: NextRequest) { ); } } + +export async function POST(request: NextRequest) { + if (!localAccessEnabled()) return new Response('Method not allowed', { status: 405 }); + if (!localRequestAllowed(request)) return new Response('Forbidden', { status: 403 }); + const retry = loginRateLimit(); + if (retry) { + const response = localLoginPage(request, '登录尝试过多,请稍后重试。', 429); + response.headers.set('Retry-After', String(retry)); + return response; + } + if (!request.headers.get('content-type')?.startsWith('application/x-www-form-urlencoded')) + return new Response('Unsupported content type', { status: 415 }); + // Bound the streamed input, even if Content-Length is omitted or forged. + const reader = request.body?.getReader(); + if (!reader) return new Response('Missing form', { status: 400 }); + let text = ''; + let size = 0; + const decoder = new TextDecoder(); + while (true) { + const chunk = await reader.read(); + if (chunk.done) break; + size += chunk.value.byteLength; + if (size > 4096) { + await reader.cancel(); + return new Response('Form too large', { status: 413 }); + } + text += decoder.decode(chunk.value, { stream: true }); + } + text += decoder.decode(); + const form = new URLSearchParams(text); + const username = form.get('username') ?? ''; + const password = form.get('password') ?? ''; + // Concurrent requests may finish reading after another request exhausted the window. + const currentRetry = loginRateLimit(); + if (currentRetry) { + const response = localLoginPage(request, '登录尝试过多,请稍后重试。', 429); + response.headers.set('Retry-After', String(currentRetry)); + return response; + } + try { + if (username.length > 64 || password.length > 256 || !verifyLocalPassword(username, password)) { + recordLoginFailure(); + return localLoginPage(request, '账号或访问密码不正确。', 401); + } + const expiresAt = Math.floor(Date.now() / 1000) + LOCAL_SESSION_SECONDS; + const cookie = await seal( + { + authMode: 'local', + credentialId: localCredentialId(), + accessToken: '', + expiresAt, + sessionExpiresAt: expiresAt, + sub: 'local-administrator', + name: '本机管理员', + }, + LOCAL_SESSION_SECONDS, + ); + clearLoginFailures(); + const response = NextResponse.redirect( + new URL(safeReturnTo(request.nextUrl.searchParams.get('returnTo')), publicOrigin(request)), + 303, + ); + response.cookies.set(SESSION_COOKIE, cookie, { ...cookieOptions(request), maxAge: LOCAL_SESSION_SECONDS }); + response.headers.set('Cache-Control', 'no-store'); + return response; + } catch { + return localLoginPage(request, '本机访问凭据尚未配置,请联系管理员。', 503); + } +} diff --git a/apps/web/src/features/projects.tsx b/apps/web/src/features/projects.tsx index 26da8be..25b64d3 100644 --- a/apps/web/src/features/projects.tsx +++ b/apps/web/src/features/projects.tsx @@ -23,6 +23,7 @@ import { import { RunTable } from '@/components/run-table'; import { ProjectSettings } from './project-settings'; import { LessonsPanel } from './lessons'; +import { browserId } from '@/lib/browser-id'; export function ProjectsView({ create = false }: { create?: boolean }) { const { data, error, isLoading, mutate } = useResource('/projects'); const [search, setSearch] = useState(''); @@ -400,7 +401,7 @@ function WorkspaceRow({ return; } if (operationKey.current?.action !== action) { - operationKey.current = { action, key: crypto.randomUUID() }; + operationKey.current = { action, key: browserId() }; } setBusy(true); setError(''); diff --git a/apps/web/src/features/releases.tsx b/apps/web/src/features/releases.tsx index f82ed83..76e8f33 100644 --- a/apps/web/src/features/releases.tsx +++ b/apps/web/src/features/releases.tsx @@ -4,6 +4,7 @@ import { useState } from 'react'; import { ArrowRight, ArrowUpRight, Box, Check, ChevronDown, ShieldCheck, X } from 'lucide-react'; import { formatTime, messageOf, mutateApi, shortId, safeUrl, useResource } from '@/lib/api'; import type { Environment, Release } from '@/lib/types'; +import { browserId } from '@/lib/browser-id'; type ReleaseReview = { release: Release; @@ -162,7 +163,7 @@ function ApprovalDialog({ release, onClose, onSaved }: { release: Release; onClo const [confirmed, setConfirmed] = useState(false); const [busy, setBusy] = useState(false); const [error, setError] = useState(''); - const [key] = useState(() => crypto.randomUUID()); + const [key] = useState(browserId); async function decide(decision: 'approve' | 'reject') { setBusy(true); setError(''); diff --git a/apps/web/src/features/runs.tsx b/apps/web/src/features/runs.tsx index c938d1b..396aab0 100644 --- a/apps/web/src/features/runs.tsx +++ b/apps/web/src/features/runs.tsx @@ -49,6 +49,7 @@ import { import { providers as providerIds } from '@wishforge/contracts/providers'; import { providerNames, RunTable, stages } from '@/components/run-table'; import { waitingGuide } from '@/lib/waiting'; +import { browserId } from '@/lib/browser-id'; export function RunsView() { const runs = useResource('/runs', 5000); @@ -125,18 +126,19 @@ export function RunsView() { export function NewWishView() { const projects = useResource('/projects'); const providers = useResource('/providers'); + const session = useResource<{ mode: string }>('/session'); const [projectId, setProjectId] = useState(''); - const [provider, setProvider] = useState('codex'); + const [chosenProvider, setProvider] = useState(); const [goal, setGoal] = useState(''); const [criteria, setCriteria] = useState(''); - // About twenty Codex model turns: each request first reserves one token per byte it sends. - const [maxTokens, setMaxTokens] = useState(300000); + // Keep an explicit edit across project/provider changes; otherwise derive the relevant default. + const [chosenMaxTokens, setMaxTokens] = useState(); const [maxMinutes, setMaxMinutes] = useState(30); const [maxRepairRounds, setMaxRepairRounds] = useState(3); const [sourceBranch, setSourceBranch] = useState(''); const [busy, setBusy] = useState(false); const [error, setError] = useState(''); - const [idempotencyKey] = useState(() => crypto.randomUUID()); + const [idempotencyKey] = useState(browserId); const router = useRouter(); useEffect(() => { const query = new URLSearchParams(window.location.search); @@ -146,6 +148,18 @@ export function NewWishView() { if (branch) setSourceBranch(branch); }, []); const effectiveProject = projectId || projects.data?.[0]?.id || ''; + const project = projects.data?.find(item => item.id === effectiveProject); + const localPoc = + session.data?.mode === 'local' && + project?.targetBranch === 'poc' && + [ + 'https://gitea.d-robotics.cc/longtao.wu/droboticflow.git', + 'git@gitea.d-robotics.cc:longtao.wu/droboticflow.git', + ].includes(project.repositoryUrl ?? ''); + const provider = + chosenProvider ?? + (localPoc && providers.data?.some(item => item.id === 'claude-code' && item.enabled) ? 'claude-code' : 'codex'); + const maxTokens = chosenMaxTokens ?? (localPoc && provider === 'claude-code' ? 1000000 : 300000); const branches = useResource(effectiveProject ? `/projects/${effectiveProject}/branches` : null); const targetBranch = projects.data?.find(project => project.id === effectiveProject)?.targetBranch ?? 'main'; const selectedProvider = providers.data?.find(item => item.id === provider); @@ -195,6 +209,7 @@ export function NewWishView() { onChange={event => { setProjectId(event.target.value); setSourceBranch(''); + setProvider(undefined); }} >