specdojo 0.3.1 → 0.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/agents/specdojo-orchestrator.md +61 -2
- package/CHANGELOG.md +90 -0
- package/README.md +85 -25
- package/dist/{catalog-build-references.js → catalog/build-references.js} +4 -4
- package/dist/catalog/build-render.js +32 -0
- package/dist/{catalog-build.js → catalog/build.js} +9 -9
- package/dist/{catalog.js → catalog/catalog.js} +10 -10
- package/dist/{catalog-generate.js → catalog/generate.js} +8 -8
- package/dist/catalog/paths.js +1 -0
- package/dist/{catalog-plan-generate.js → catalog/plan-generate.js} +4 -4
- package/dist/{catalog-plan.js → catalog/plan.js} +4 -4
- package/dist/{catalog-scaffold.js → catalog/scaffold.js} +3 -3
- package/dist/{agent.js → commands/agent.js} +11 -11
- package/dist/{build-command.js → commands/build.js} +2 -2
- package/dist/{init-command.js → commands/init.js} +168 -45
- package/dist/commands/night-orchestrator.js +287 -0
- package/dist/{orchestrator.js → commands/orchestrator.js} +12 -5
- package/dist/{watch.js → commands/watch.js} +3 -3
- package/dist/{dashboard-timeline.js → dashboard/dashboard-timeline.js} +2 -2
- package/dist/{dashboard.js → dashboard/dashboard.js} +11 -10
- package/dist/{dashboard-exec-records.js → dashboard/exec-records.js} +2 -2
- package/dist/{dashboard-routines.js → dashboard/routines.js} +6 -5
- package/dist/{dashboard-shared.js → dashboard/shared.js} +1 -1
- package/dist/{timeline-build.js → dashboard/timeline-build.js} +2 -1
- package/dist/{timeline.js → dashboard/timeline.js} +1 -1
- package/dist/{deliverable.js → deliverable/deliverable.js} +5 -5
- package/dist/{deliverable-trash.js → deliverable/trash.js} +5 -5
- package/dist/{devcontainer-command.js → devcontainer/command.js} +8 -4
- package/dist/devcontainer/scaffold.js +418 -0
- package/dist/{doc-index.js → docs/doc-index.js} +1 -1
- package/dist/{frontmatter-namespace.js → docs/frontmatter-namespace.js} +1 -1
- package/dist/{index-command.js → docs/index-command.js} +1 -1
- package/dist/docs/template-resolution.js +1 -0
- package/dist/{viewpoint-document-kinds-check.js → docs/viewpoint-document-kinds-check.js} +1 -1
- package/dist/{yaml-pages-command.js → docs/yaml-pages-command.js} +1 -1
- package/dist/{yaml-pages.js → docs/yaml-pages.js} +2 -2
- package/dist/{exec-agent-config.js → exec/agent-config.js} +92 -5
- package/dist/{exec-agent-git-state.js → exec/agent-git-state.js} +1 -1
- package/dist/{exec-agent-protected-config.js → exec/agent-protected-config.js} +1 -1
- package/dist/{exec-commands.js → exec/commands.js} +22 -18
- package/dist/{exec-core.js → exec/core.js} +11 -11
- package/dist/{exec-events.js → exec/events.js} +2 -2
- package/dist/{exec-evidence.js → exec/evidence.js} +11 -6
- package/dist/exec/exec.js +2 -0
- package/dist/exec/format.js +1 -0
- package/dist/{exec-handoff.js → exec/handoff.js} +13 -12
- package/dist/{exec-limit.js → exec/limit.js} +93 -12
- package/dist/{exec-parent-validation.js → exec/parent-validation.js} +18 -4
- package/dist/{exec-pipeline-state.js → exec/pipeline-state.js} +29 -2
- package/dist/{exec-plans-core.js → exec/plans-core.js} +68 -114
- package/dist/{exec-plans-generation.js → exec/plans-generation.js} +53 -10
- package/dist/{exec-plans-storage.js → exec/plans-storage.js} +5 -5
- package/dist/{exec-plans.js → exec/plans.js} +3 -3
- package/dist/{exec-project.js → exec/project.js} +1 -1
- package/dist/{exec-protection-handoff.js → exec/protection-handoff.js} +3 -3
- package/dist/{exec-register-resume.js → exec/register-resume.js} +2 -2
- package/dist/{exec-register.js → exec/register.js} +114 -9
- package/dist/{exec-repo-integration-git.js → exec/repo-integration-git.js} +2 -2
- package/dist/{exec-repo-integration-sync.js → exec/repo-integration-sync.js} +4 -4
- package/dist/{exec-repo-integration.js → exec/repo-integration.js} +14 -11
- package/dist/{exec-repo-trace.js → exec/repo-trace.js} +3 -3
- package/dist/{exec-reporter-output.js → exec/reporter-output.js} +2 -2
- package/dist/{exec-reporter.js → exec/reporter.js} +142 -25
- package/dist/{exec-results.js → exec/results.js} +287 -31
- package/dist/{exec-run-agent-pipeline.js → exec/run/agent-pipeline.js} +35 -12
- package/dist/{exec-run-agent.js → exec/run/agent.js} +115 -28
- package/dist/{exec-run-in-place.js → exec/run/in-place.js} +56 -27
- package/dist/{exec-run-job.js → exec/run/job.js} +65 -36
- package/dist/{exec-run-lifecycle-commands.js → exec/run/lifecycle-commands.js} +30 -22
- package/dist/{exec-run-lock.js → exec/run/lock.js} +4 -3
- package/dist/{exec-run-mode-shared.js → exec/run/mode-shared.js} +3 -3
- package/dist/{exec-run-register-command.js → exec/run/register-command.js} +38 -11
- package/dist/{exec-run-register-core.js → exec/run/register-core.js} +63 -21
- package/dist/{exec-run-register-mode.js → exec/run/register-mode.js} +58 -31
- package/dist/exec/run/register-post-review.js +420 -0
- package/dist/{exec-run-register-resume.js → exec/run/register-resume.js} +48 -27
- package/dist/{exec-run-register-state.js → exec/run/register-state.js} +13 -10
- package/dist/{exec-run-register-worktree.js → exec/run/register-worktree.js} +119 -24
- package/dist/{exec-run.js → exec/run/run.js} +11 -11
- package/dist/{exec-run-schedule-mode.js → exec/run/schedule-mode.js} +17 -17
- package/dist/{exec-run-schedule-prepare.js → exec/run/schedule-prepare.js} +31 -18
- package/dist/{exec-run-schedule-task.js → exec/run/schedule-task.js} +45 -18
- package/dist/{exec-run-shared.js → exec/run/shared.js} +78 -30
- package/dist/{exec-schedule-calendar.js → exec/schedule/calendar.js} +1 -1
- package/dist/{exec-schedule-cpm.js → exec/schedule/cpm.js} +2 -2
- package/dist/{exec-schedule-gantt-chart-render.js → exec/schedule/gantt-chart-render.js} +2 -2
- package/dist/exec/schedule/gantt-chart.js +2 -0
- package/dist/{exec-schedule-hash.js → exec/schedule/hash.js} +2 -2
- package/dist/exec/schedule/index.js +1 -0
- package/dist/{exec-schedule-initial.js → exec/schedule/initial.js} +2 -2
- package/dist/{exec-schedule-progress.js → exec/schedule/progress.js} +2 -2
- package/dist/{exec-schedule-ready.js → exec/schedule/ready.js} +2 -2
- package/dist/{exec-schedule.js → exec/schedule/schedule.js} +11 -11
- package/dist/exec/shared.js +63 -0
- package/dist/exec/slot-lock.js +1 -0
- package/dist/{exec-strategy.js → exec/strategy.js} +2 -2
- package/dist/{exec-task-repos.js → exec/task-repos.js} +104 -17
- package/dist/{exec-task-view.js → exec/task-view.js} +4 -4
- package/dist/{exec-trial-commands.js → exec/trial-commands.js} +20 -22
- package/dist/{exec-trial-core.js → exec/trial-core.js} +6 -6
- package/dist/{exec-trial.js → exec/trial.js} +2 -2
- package/dist/{exec-worktree-command.js → exec/worktree-command.js} +25 -23
- package/dist/{exec-worktree-ops-commit.js → exec/worktree-ops-commit.js} +25 -60
- package/dist/{exec-worktree-ops-lifecycle.js → exec/worktree-ops-lifecycle.js} +13 -8
- package/dist/{exec-worktree-ops-merge.js → exec/worktree-ops-merge.js} +48 -7
- package/dist/{exec-worktree-ops.js → exec/worktree-ops.js} +3 -3
- package/dist/exec/worktree.js +305 -0
- package/dist/{grade-apply.js → grade/apply.js} +9 -9
- package/dist/{grade-command-apply.js → grade/command-apply.js} +7 -7
- package/dist/{grade-command-inspect.js → grade/command-inspect.js} +6 -6
- package/dist/{grade-command-plan.js → grade/command-plan.js} +5 -5
- package/dist/{grade-core.js → grade/core.js} +3 -3
- package/dist/grade/grade.js +19 -0
- package/dist/{grade-markdown.js → grade/markdown.js} +6 -6
- package/dist/{grade-pipeline-state.js → grade/pipeline-state.js} +4 -4
- package/dist/{grade-plan.js → grade/plan.js} +5 -5
- package/dist/{grade-result.js → grade/result.js} +5 -94
- package/dist/{grade-target-discovery.js → grade/target-discovery.js} +7 -7
- package/dist/{grade-targets.js → grade/targets.js} +11 -8
- package/dist/{job-definition.js → job/definition.js} +25 -6
- package/dist/{job.js → job/job.js} +12 -11
- package/dist/{kata-command.js → kata/command.js} +3 -3
- package/dist/{kata.js → kata/kata.js} +5 -5
- package/dist/register/approach.js +134 -0
- package/dist/{register-core.js → register/core.js} +26 -8
- package/dist/{register-create-commands.js → register/create-commands.js} +171 -8
- package/dist/{register-date.js → register/date.js} +1 -1
- package/dist/register/derivation.js +163 -0
- package/dist/{register-event-merge.js → register/event-merge.js} +44 -3
- package/dist/{register-events.js → register/events.js} +13 -3
- package/dist/{register-history.js → register/history.js} +7 -6
- package/dist/{register-item.js → register/item.js} +32 -5
- package/dist/register/lifecycle-lock.js +5 -0
- package/dist/{register-maintenance-commands.js → register/maintenance-commands.js} +13 -7
- package/dist/{register-migrate-timestamps.js → register/migrate-timestamps.js} +3 -3
- package/dist/{register-migration.js → register/migration.js} +5 -4
- package/dist/{register.js → register/register.js} +32 -27
- package/dist/{register-renumber.js → register/renumber.js} +38 -11
- package/dist/{register-transition-commands.js → register/transition-commands.js} +3 -3
- package/dist/{register-update.js → register/update.js} +5 -5
- package/dist/{register-views.js → register/views.js} +47 -7
- package/dist/{review-grade.js → review/grade.js} +2 -2
- package/dist/{review-plan.js → review/plan.js} +3 -3
- package/dist/{routine-definition.js → routine/definition.js} +2 -2
- package/dist/{routine.js → routine/routine.js} +49 -22
- package/dist/{schedule-approach.js → schedule/approach.js} +8 -8
- package/dist/{schedule-build.js → schedule/build.js} +7 -4
- package/dist/{schedule.js → schedule/schedule.js} +6 -6
- package/dist/{schedule-strategy-generate-document.js → schedule/strategy-generate-document.js} +2 -2
- package/dist/{schedule-strategy-generate-scope.js → schedule/strategy-generate-scope.js} +4 -4
- package/dist/{schedule-strategy-generate.js → schedule/strategy-generate.js} +10 -10
- package/dist/shared/agent-types.js +23 -0
- package/dist/shared/artifact-path.js +9 -0
- package/dist/{build-if-stale.js → shared/build-if-stale.js} +1 -1
- package/dist/{catalog-build-render.js → shared/catalog-render.js} +3 -32
- package/dist/{exec-slot-lock.js → shared/cross-process-lock.js} +3 -1
- package/dist/shared/fs.js +30 -0
- package/dist/shared/git.js +346 -0
- package/dist/shared/grade-result.js +94 -0
- package/dist/{package-paths.js → shared/package-paths.js} +3 -3
- package/dist/shared/plan-templates.js +114 -0
- package/dist/{exec-provider-scaffold.js → shared/provider-scaffold.js} +6 -3
- package/dist/shared/random.js +4 -0
- package/dist/{exec-schedule-index.js → shared/schedule-index.js} +3 -1
- package/dist/shared/schedule-paths.js +9 -0
- package/dist/{specdojo-config.js → shared/specdojo-config.js} +162 -21
- package/dist/{exec-shared.js → shared/text.js} +4 -135
- package/dist/shared/time.js +28 -0
- package/dist/shared/workspace-scaffold.js +69 -0
- package/dist/specdojo.js +22 -22
- package/docs/ja/specdojo/exec-templates/xep-common-conventions-template.md +31 -18
- package/docs/ja/specdojo/exec-templates/xep-register-investigate-template.md +1 -2
- package/docs/ja/specdojo/exec-templates/xep-register-template.md +3 -2
- package/docs/ja/specdojo/exec-templates/xer-template.md +1 -3
- package/docs/ja/specdojo/exec-templates/xrp-job-template.md +6 -4
- package/docs/ja/specdojo/exec-templates/xrp-register-post-run-template.md +46 -0
- package/docs/ja/specdojo/guides/branch-workflow-guide.md +34 -1
- package/docs/ja/specdojo/guides/docs-structure-guide.md +2 -0
- package/docs/ja/specdojo/guides/exec-config-guide.md +169 -26
- package/docs/ja/specdojo/guides/exec-operation-guide.md +184 -13
- package/docs/ja/specdojo/guides/exec-worktree-guide.md +2 -0
- package/docs/ja/specdojo/guides/orchestrator-operation-guide.md +40 -3
- package/docs/ja/specdojo/guides/quick-start-guide.md +89 -21
- package/docs/ja/specdojo/guides/register-operation-guide.md +44 -1
- package/docs/ja/specdojo/guides/remote-host-development-guide.md +61 -6
- package/docs/ja/specdojo/guides/review-guide.md +1 -1
- package/docs/ja/specdojo/guides/routine-operation-guide.md +5 -5
- package/docs/ja/specdojo/guides/specdojo-overview-guide.md +1 -1
- package/docs/ja/specdojo/guides/use-case-guide.md +1 -1
- package/docs/ja/specdojo/guides/waza-guide.md +1 -1
- package/docs/ja/specdojo/references/command-reference.md +124 -55
- package/docs/ja/specdojo/references/specdojo-config-reference.md +33 -7
- package/docs/ja/specdojo/rulebooks/pjr-rulebook.md +22 -13
- package/docs/ja/specdojo/standards/job-definition-standard.md +20 -18
- package/docs/ja/specdojo/standards/rulebook-authoring-standard.md +2 -2
- package/docs/ja/specdojo/templates/pjr-derived-items-template.md +22 -0
- package/docs/ja/specdojo/templates/pjr-index-template.md +1 -0
- package/docs/specdojo/schemas/v1/agent-members.schema.yaml +29 -2
- package/docs/specdojo/schemas/v1/exec-defaults.schema.yaml +111 -17
- package/docs/specdojo/schemas/v1/exec-evidence.schema.yaml +28 -0
- package/docs/specdojo/schemas/v1/job-run.schema.yaml +2 -2
- package/docs/specdojo/schemas/v1/job.schema.yaml +7 -0
- package/docs/specdojo/schemas/v1/pipeline-state.schema.yaml +38 -0
- package/docs/specdojo/schemas/v1/register-events.schema.yaml +5 -0
- package/docs/specdojo/schemas/v1/register-item-frontmatter.schema.yaml +91 -7
- package/docs/specdojo/schemas/v1/routine-run.schema.yaml +1 -1
- package/docs/specdojo/schemas/v1/specdojo-config.schema.yaml +36 -1
- package/package.json +17 -17
- package/templates/antigravity/README.md +6 -2
- package/templates/antigravity/agent-members-snippet.yaml +108 -12
- package/templates/antigravity/exec-defaults-snippet.yaml +8 -13
- package/templates/antigravity/orchestrator.md +61 -2
- package/templates/claude/README.md +27 -3
- package/templates/claude/agents/claude-executor.md +0 -1
- package/templates/claude/agents/claude-reporter.md +2 -1
- package/templates/claude/agents/claude-review-executor.md +0 -1
- package/templates/claude/agents/specdojo-orchestrator.md +61 -2
- package/templates/codex/README.md +40 -4
- package/templates/codex/agents/specdojo-orchestrator.toml +61 -2
- package/templates/codex/orchestrator.md +61 -2
- package/templates/devcontainer/devcontainer.json +5 -2
- package/templates/devcontainer/post-create.sh +15 -7
- package/templates/devcontainer/remote-host/specdojo-tmux.sh.sample +102 -0
- package/templates/devcontainer/remote-host/ssh-config.sample +19 -0
- package/templates/devcontainer/vim/vimrc +37 -0
- package/templates/init-agent-members.yaml +75 -25
- package/templates/init-exec-defaults.yaml +44 -9
- package/templates/opencode/README.md +17 -3
- package/templates/opencode/agents/opencode-executor.md +0 -1
- package/templates/opencode/agents/opencode-reporter.md +2 -1
- package/templates/opencode/agents/opencode-review-executor.md +0 -1
- package/templates/opencode/agents/specdojo-orchestrator.md +61 -2
- package/dist/devcontainer-scaffold.js +0 -165
- package/dist/exec-schedule-gantt-chart.js +0 -2
- package/dist/exec-worktree.js +0 -474
- package/dist/exec.js +0 -2
- package/dist/grade.js +0 -19
- package/templates/claude/agents/claude-expert-review-executor.md +0 -14
- /package/dist/{catalog-plan-prompt.js → catalog/plan-prompt.js} +0 -0
- /package/dist/{catalog-types.js → catalog/types.js} +0 -0
- /package/dist/{template-frontmatter.js → docs/template-frontmatter.js} +0 -0
- /package/dist/{role-types.js → exec/role-types.js} +0 -0
- /package/dist/{exec-schedule-gantt-chart-scope.js → exec/schedule/gantt-chart-scope.js} +0 -0
- /package/dist/{exec-types.js → exec/types.js} +0 -0
- /package/dist/{grade-command-shared.js → grade/command-shared.js} +0 -0
- /package/dist/{register-command-types.js → register/command-types.js} +0 -0
- /package/dist/{review-types.js → review/types.js} +0 -0
- /package/dist/{schedule-phase-sets.js → schedule/phase-sets.js} +0 -0
- /package/dist/{schedule-strategy-profiles.js → schedule/strategy-profiles.js} +0 -0
- /package/dist/{agent-response.js → shared/agent-response.js} +0 -0
- /package/dist/{catalog-paths.js → shared/catalog-paths.js} +0 -0
- /package/dist/{dist-freshness.js → shared/dist-freshness.js} +0 -0
- /package/dist/{git-environment.js → shared/git-environment.js} +0 -0
- /package/dist/{exec-format.js → shared/markdown-format.js} +0 -0
- /package/dist/{practice-id.js → shared/practice-id.js} +0 -0
- /package/dist/{spawn-self.js → shared/spawn-self.js} +0 -0
- /package/dist/{specdojo-gitignore.js → shared/specdojo-gitignore.js} +0 -0
- /package/dist/{template-resolution.js → shared/template-resolution.js} +0 -0
- /package/dist/{yaml-schema-modeline.js → shared/yaml-schema-modeline.js} +0 -0
- /package/dist/{yaml.js → shared/yaml.js} +0 -0
|
@@ -1,22 +1,25 @@
|
|
|
1
1
|
import { existsSync, readFileSync } from "node:fs";
|
|
2
2
|
import { resolve } from "node:path";
|
|
3
|
-
import { qualifyTaskId, randomHex } from "
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
12
|
-
import {
|
|
13
|
-
import {
|
|
14
|
-
import {
|
|
15
|
-
import {
|
|
16
|
-
import {
|
|
17
|
-
import {
|
|
18
|
-
import {
|
|
19
|
-
import {
|
|
3
|
+
import { qualifyTaskId, randomHex } from "../shared.js";
|
|
4
|
+
import { resolveAgentMember } from "../../shared/specdojo-config.js";
|
|
5
|
+
import { buildInPlaceStem } from "../plans.js";
|
|
6
|
+
import { generateRegisterPlan, requireRunnableRegisterItem, resolveRegisterRunTarget, sanitizeRegisterConclusion, ticketPathFromItem, } from "../register.js";
|
|
7
|
+
import { readResultFrontmatterSnapshot, scaffoldResult, updateResultStatus } from "../results.js";
|
|
8
|
+
import { findExecWorktree, gitOutput } from "../worktree.js";
|
|
9
|
+
import { configuredProductRepos, integrationBranchOverrideRecord, withProductRepoPrompt, } from "../task-repos.js";
|
|
10
|
+
import { checkpointAndEnsureWorktree, commitTargetPaths, commitWorktreeChanges, discardStaleExecWorktree, isExecBranchMergedIntoCurrent, mergeWorktreeIntoCurrent, removeWorktree, taskTargetsAtHead, WorktreeRemovedBranchDeletionError, worktreeStatusPaths, } from "../worktree-ops.js";
|
|
11
|
+
import { commitProductWorktrees, integrateTaskRepositories, projectMergeBlockers, PROJECT_REPO_NAME, RepoIntegrationError, } from "../repo-integration.js";
|
|
12
|
+
import { productIntegrationTrace, recordResultTrace, refsTrailer, registerProjectMergeMessage, traceKey, withCommitTrailers, } from "../repo-trace.js";
|
|
13
|
+
import { pipelineStateLocation, readPipelineState } from "../pipeline-state.js";
|
|
14
|
+
import { findResumableRegisterRun } from "../register-resume.js";
|
|
15
|
+
import { resolvePinnedRateLimitRunOptions, rateLimitRecoveryReason, } from "./shared.js";
|
|
16
|
+
import { agentEnvironment, expandPromptRefs, extractBlockReason, pathInsideWorktree, reportProductWorktrees, runWithRetry, } from "./agent.js";
|
|
17
|
+
import { runAgentPipeline } from "./agent-pipeline.js";
|
|
18
|
+
import { downgradeUnfilledResult } from "./schedule-prepare.js";
|
|
19
|
+
import { commitSubject, integrateLogPath, recordIntegrateStage, recordRepoIntegration, repoRelativePath, } from "./mode-shared.js";
|
|
20
|
+
import { resolveRegisterCommand, isRegisterPipelineRequested, resolveRegisterPipelineCommand, spawnRegisterTransition, registerRunnerManagedPaths, registerReporterManagedPaths, } from "./register-core.js";
|
|
21
|
+
import { commitRegisterState, registerPathsInsideWorktree, rebuildRootRegisterViews, registerWaitSummary, } from "./register-state.js";
|
|
22
|
+
import { runRegisterPostReview } from "./register-post-review.js";
|
|
20
23
|
// 全体再実行が既存 run の未統合成果を破棄しないための保護。既存 worktree に再開可能な run
|
|
21
24
|
// (executor 成功済みで reporter か統合が未完了)が残っている場合だけ理由を返し、呼び出し側が
|
|
22
25
|
// 破壊的操作(discardStaleExecWorktree)の手前で中断できるようにする。--force-restart で無効化できる。
|
|
@@ -44,6 +47,26 @@ export function protectResumableRegisterWorktree(context, opts, taskId, worktree
|
|
|
44
47
|
`its changes are still unintegrated in ${worktree.path}. ` +
|
|
45
48
|
`Resume the ${stage} stage with --resume, or discard the worktree with --force-restart.`);
|
|
46
49
|
}
|
|
50
|
+
// cleanup の再開までに別項目の commit が積まれても、対象 exec branch を最初に取り込んだ
|
|
51
|
+
// first-parent commit(runner が作った merge commit)だけを post-review の差分範囲にする。
|
|
52
|
+
function integratedRegisterCommitRange(repoRoot, branch) {
|
|
53
|
+
const tip = gitOutput(repoRoot, ["rev-parse", "--verify", `${branch}^{commit}`]).trim();
|
|
54
|
+
const outputCommit = gitOutput(repoRoot, [
|
|
55
|
+
"rev-list",
|
|
56
|
+
"--first-parent",
|
|
57
|
+
"--ancestry-path",
|
|
58
|
+
`${tip}..HEAD`,
|
|
59
|
+
])
|
|
60
|
+
.split("\n")
|
|
61
|
+
.map((line) => line.trim())
|
|
62
|
+
.filter(Boolean)
|
|
63
|
+
.at(-1);
|
|
64
|
+
if (!outputCommit) {
|
|
65
|
+
throw new Error(`could not locate integrated commit for register branch: ${branch}`);
|
|
66
|
+
}
|
|
67
|
+
const baseCommit = gitOutput(repoRoot, ["rev-parse", `${outputCommit}^1`]).trim();
|
|
68
|
+
return { baseCommit, outputCommit };
|
|
69
|
+
}
|
|
47
70
|
// register worktree 実行の Phase 3(成果物統合と状態遷移)。成功なら worktree の成果物を
|
|
48
71
|
// commit → worktree 側で register review → 統合ブランチへ merge commit 1件 → worktree 撤去、
|
|
49
72
|
// 失敗なら worktree を保持したまま waiting へ戻す(wait commit 1件)。通常実行・reporter 再開・
|
|
@@ -68,6 +91,36 @@ export async function finalizeRegisterWorktreeRun(params) {
|
|
|
68
91
|
worktree,
|
|
69
92
|
bookkeepingPaths: params.bookkeepingPaths,
|
|
70
93
|
});
|
|
94
|
+
const postReview = async (baseCommit, outputCommit) => {
|
|
95
|
+
if (!context.postReview)
|
|
96
|
+
return undefined;
|
|
97
|
+
if (!ticketPath) {
|
|
98
|
+
throw new Error(`register post-review requires an item ticket: ${item.id}`);
|
|
99
|
+
}
|
|
100
|
+
const reviewed = await runRegisterPostReview({
|
|
101
|
+
context,
|
|
102
|
+
opts: params.opts,
|
|
103
|
+
registerPaths,
|
|
104
|
+
item,
|
|
105
|
+
ticketPath,
|
|
106
|
+
stem,
|
|
107
|
+
editPlanPath: resolve(context.executionPath, "exec", "plans", `${stem}-plan.md`),
|
|
108
|
+
editResultPath: resolve(repoRoot, repoRelativePath(worktree.path, params.worktreeResultPath)),
|
|
109
|
+
baseCommit,
|
|
110
|
+
outputCommit,
|
|
111
|
+
worktreePath: worktree.path,
|
|
112
|
+
editPipelineStatePath: params.pipelineStatePath,
|
|
113
|
+
});
|
|
114
|
+
process.stdout.write(`post-review done: ${item.id} (verdict transition: ${reviewed.transition})\n`);
|
|
115
|
+
return {
|
|
116
|
+
id: item.id,
|
|
117
|
+
title: item.title,
|
|
118
|
+
outcome: reviewed.outcome,
|
|
119
|
+
transition: reviewed.transition,
|
|
120
|
+
commit: reviewed.commit ?? `committed ${outputCommit.slice(0, 12)}`,
|
|
121
|
+
reason: reviewed.reason,
|
|
122
|
+
};
|
|
123
|
+
};
|
|
71
124
|
const completedAt = new Date().toISOString();
|
|
72
125
|
const worktreeResultPath = params.worktreeResultPath;
|
|
73
126
|
const { result: effectiveResult, unfilledBlock } = downgradeUnfilledResult(agentResult, worktreeResultPath, "edit", params.resultScaffold);
|
|
@@ -78,6 +131,7 @@ export async function finalizeRegisterWorktreeRun(params) {
|
|
|
78
131
|
// exec branch here would force a second merge commit for the same task.
|
|
79
132
|
if (params.resumedIntegration &&
|
|
80
133
|
isExecBranchMergedIntoCurrent({ context: wtContext, worktree })) {
|
|
134
|
+
const { baseCommit, outputCommit } = integratedRegisterCommitRange(repoRoot, worktree.branch);
|
|
81
135
|
try {
|
|
82
136
|
const lifecyclePaths = new Set([worktreeResultPath, params.pipelineStatePath]
|
|
83
137
|
.filter((path) => !!path)
|
|
@@ -123,6 +177,9 @@ export async function finalizeRegisterWorktreeRun(params) {
|
|
|
123
177
|
}
|
|
124
178
|
}
|
|
125
179
|
rebuildRootRegisterViews(projectId, item.id);
|
|
180
|
+
const reviewed = await postReview(baseCommit, outputCommit);
|
|
181
|
+
if (reviewed)
|
|
182
|
+
return reviewed;
|
|
126
183
|
const sha = gitOutput(repoRoot, ["rev-parse", "--short", "HEAD"]).trim();
|
|
127
184
|
process.stdout.write(`run done: ${item.id} (status: review — confirm and close with "register close")\n`);
|
|
128
185
|
return {
|
|
@@ -134,6 +191,7 @@ export async function finalizeRegisterWorktreeRun(params) {
|
|
|
134
191
|
};
|
|
135
192
|
}
|
|
136
193
|
await updateResultStatus(worktreeResultPath, "complete", completedAt);
|
|
194
|
+
const baseCommit = gitOutput(repoRoot, ["rev-parse", "HEAD"]).trim();
|
|
137
195
|
const subject = commitSubject(`exec(register ${item.id}): `, item.title);
|
|
138
196
|
// PJR-30SW: プロダクト側の commit と merge commit、プロジェクト側の merge commit に
|
|
139
197
|
// `Refs: <project-id>:<item-id>` を付ける(PJR-1SXK)。
|
|
@@ -212,7 +270,14 @@ export async function finalizeRegisterWorktreeRun(params) {
|
|
|
212
270
|
beforeProjectMerge: () => {
|
|
213
271
|
// review は exec branch 側(worktree)で記録し、最後の project merge commit に
|
|
214
272
|
// 同梱する。統合ブランチで遷移すると first-parent に独立した commit が増える。
|
|
215
|
-
if (!spawnRegisterTransition(projectId, [
|
|
273
|
+
if (!spawnRegisterTransition(projectId, [
|
|
274
|
+
"review",
|
|
275
|
+
"--id",
|
|
276
|
+
item.id,
|
|
277
|
+
"--by",
|
|
278
|
+
actor,
|
|
279
|
+
...(params.transitionReason ? ["--reason", params.transitionReason] : []),
|
|
280
|
+
], worktree.path)) {
|
|
216
281
|
throw new Error(`register review transition failed: ${item.id}`);
|
|
217
282
|
}
|
|
218
283
|
// プロダクトの統合後・プロジェクトの統合前に、統合先の commit snapshot を result の
|
|
@@ -292,6 +357,10 @@ export async function finalizeRegisterWorktreeRun(params) {
|
|
|
292
357
|
}
|
|
293
358
|
// review は merge で root の個票に入る。非追跡の派生ビューだけ root で作り直す。
|
|
294
359
|
rebuildRootRegisterViews(projectId, item.id);
|
|
360
|
+
const outputCommit = gitOutput(repoRoot, ["rev-parse", "HEAD"]).trim();
|
|
361
|
+
const reviewed = await postReview(baseCommit, outputCommit);
|
|
362
|
+
if (reviewed)
|
|
363
|
+
return reviewed;
|
|
295
364
|
const sha = gitOutput(repoRoot, ["rev-parse", "--short", "HEAD"]).trim();
|
|
296
365
|
process.stdout.write(`run done: ${item.id} (status: review — confirm and close with "register close")\n`);
|
|
297
366
|
return {
|
|
@@ -303,13 +372,14 @@ export async function finalizeRegisterWorktreeRun(params) {
|
|
|
303
372
|
};
|
|
304
373
|
}
|
|
305
374
|
// 失敗 / rate limit: worktree は保持し(調査・再開のため)、waiting へ遷移する。
|
|
306
|
-
const
|
|
375
|
+
const baseReason = params.runnerBlockReason
|
|
307
376
|
? params.runnerBlockReason
|
|
308
377
|
: unfilledBlock
|
|
309
378
|
? "agent exited 0 but result is incomplete or its frontmatter differs from the scaffold (treated as blocked)"
|
|
310
379
|
: agentResult === "rate_limit"
|
|
311
380
|
? "rate limit reached"
|
|
312
381
|
: extractBlockReason(params.stderr);
|
|
382
|
+
const reason = [baseReason, params.transitionReason].filter(Boolean).join("; ");
|
|
313
383
|
await updateResultStatus(worktreeResultPath, "blocked", completedAt, sanitizeRegisterConclusion(reason));
|
|
314
384
|
process.stdout.write(`run failed: ${item.id} (status: waiting; worktree kept: ${worktree.path})\n`);
|
|
315
385
|
return waitSummary(reason);
|
|
@@ -341,15 +411,16 @@ export async function runSingleRegisterItemWorktree(context, opts, pjrId, lifecy
|
|
|
341
411
|
...resolveRegisterCommand(item, context.roster, opts, context.execDefaults),
|
|
342
412
|
provider: undefined,
|
|
343
413
|
};
|
|
344
|
-
const resolvedProvider = provider ??
|
|
345
|
-
context.roster?.members.find((m) => m.nickname === actor && m.type === "agent")?.provider;
|
|
414
|
+
const resolvedProvider = provider ?? resolveAgentMember(context.roster, actor)?.provider;
|
|
346
415
|
const stem = buildInPlaceStem(pjrId.toLowerCase());
|
|
347
416
|
const worktreeTaskId = qualifyTaskId(projectId, item.id);
|
|
348
417
|
const pipelineRunId = pipelineAgents
|
|
349
418
|
? `${new Date().toISOString().replace(/[-:.]/g, "")}-${randomHex(4)}`
|
|
350
419
|
: undefined;
|
|
351
420
|
// PJR-98G4: repos を宣言した project では、プロダクトの worktree も同じタスクの下に作る。
|
|
352
|
-
|
|
421
|
+
// PJR-XRAB: --integration-branch は設定の integration_branch より優先する。
|
|
422
|
+
const products = configuredProductRepos(schedulePath, opts.integrationBranch);
|
|
423
|
+
const integrationBranchOverrides = integrationBranchOverrideRecord(opts.integrationBranch);
|
|
353
424
|
// Phase 1: plan/result 生成 → register start → checkpoint → worktree 作成(root で直列化)。
|
|
354
425
|
const setup = async () => {
|
|
355
426
|
// executor が成功した run の worktree を、全体再実行が破棄しないよう保護する。
|
|
@@ -373,6 +444,10 @@ export async function runSingleRegisterItemWorktree(context, opts, pjrId, lifecy
|
|
|
373
444
|
const { planPath } = await generateRegisterPlan({
|
|
374
445
|
executionPath,
|
|
375
446
|
projectId,
|
|
447
|
+
...(context.catalogPath ? { catalogPath: context.catalogPath } : {}),
|
|
448
|
+
...(context.rolesPath ? { rolesPath: context.rolesPath } : {}),
|
|
449
|
+
...(context.viewpointsPath ? { viewpointsPath: context.viewpointsPath } : {}),
|
|
450
|
+
...(context.projectContext ? { projectContext: context.projectContext } : {}),
|
|
376
451
|
registerPaths,
|
|
377
452
|
item,
|
|
378
453
|
stem,
|
|
@@ -388,6 +463,8 @@ export async function runSingleRegisterItemWorktree(context, opts, pjrId, lifecy
|
|
|
388
463
|
agent: actor,
|
|
389
464
|
startedAt: new Date().toISOString(),
|
|
390
465
|
stem,
|
|
466
|
+
...(item.approach ? { approach: item.approach } : {}),
|
|
467
|
+
...(item.targets && item.targets.length > 0 ? { targets: item.targets } : {}),
|
|
391
468
|
});
|
|
392
469
|
const resultScaffold = readResultFrontmatterSnapshot(resultPath);
|
|
393
470
|
process.stdout.write(`Register item: ${item.id} — ${item.title} [${item.type}]\n`);
|
|
@@ -459,6 +536,8 @@ export async function runSingleRegisterItemWorktree(context, opts, pjrId, lifecy
|
|
|
459
536
|
let stderr = "";
|
|
460
537
|
// pipeline 実行のみ run state を持つ。統合段の記録先として Phase 3 へ渡す。
|
|
461
538
|
let pipelineStatePath;
|
|
539
|
+
let transitionReason;
|
|
540
|
+
let completionActor = actor;
|
|
462
541
|
if (pipelineAgents) {
|
|
463
542
|
process.stdout.write(`Running ${item.id} in worktree (executor/reporter pipeline)\n CWD: ${worktree.path}\n`);
|
|
464
543
|
const worktreeResultPathForPipeline = pathInsideWorktree(repoRoot, worktree.path, resultPath);
|
|
@@ -477,21 +556,36 @@ export async function runSingleRegisterItemWorktree(context, opts, pjrId, lifecy
|
|
|
477
556
|
execDefaults: context.execDefaults,
|
|
478
557
|
providerConcurrencyGate: context.providerConcurrencyGate,
|
|
479
558
|
productWorktrees: worktree.repos,
|
|
559
|
+
...(integrationBranchOverrides ? { integrationBranchOverrides } : {}),
|
|
480
560
|
runId: pipelineRunId,
|
|
561
|
+
executorRateLimitOptions: opts.executorBy
|
|
562
|
+
? resolvePinnedRateLimitRunOptions(opts, context.execDefaults, context.roster, "executor", pipelineAgents.executor)
|
|
563
|
+
: undefined,
|
|
564
|
+
reporterRateLimitOptions: opts.reporterBy
|
|
565
|
+
? resolvePinnedRateLimitRunOptions(opts, context.execDefaults, context.roster, "reporter", pipelineAgents.reporterCandidates[0])
|
|
566
|
+
: undefined,
|
|
481
567
|
});
|
|
482
568
|
agentResult = pipelineOutcome.runResult;
|
|
483
569
|
stderr = pipelineOutcome.blockReason ?? "";
|
|
484
570
|
pipelineStatePath = resolve(worktree.path, pipelineOutcome.stateRef);
|
|
571
|
+
transitionReason = rateLimitRecoveryReason(pipelineOutcome.rateLimitEvents) || undefined;
|
|
485
572
|
}
|
|
486
573
|
else {
|
|
487
574
|
process.stdout.write(`Running ${item.id} in worktree: ${command}\n CWD: ${worktree.path}\n`);
|
|
488
|
-
const outcome = await runWithRetry([{ command, actor, provider: resolvedProvider }], withProductRepoPrompt(prompt, worktree.repos), context.execDefaults, worktree.path, env, pathInsideWorktree(repoRoot, worktree.path, resultPath)
|
|
575
|
+
const outcome = await runWithRetry([{ command, actor, provider: resolvedProvider }], withProductRepoPrompt(prompt, worktree.repos), context.execDefaults, worktree.path, env, pathInsideWorktree(repoRoot, worktree.path, resultPath), resolvePinnedRateLimitRunOptions(opts, context.execDefaults, context.roster, "executor", {
|
|
576
|
+
command,
|
|
577
|
+
actor,
|
|
578
|
+
provider: resolvedProvider,
|
|
579
|
+
}));
|
|
489
580
|
agentResult = outcome.result;
|
|
490
581
|
stderr = outcome.stderr;
|
|
582
|
+
completionActor = outcome.actor ?? actor;
|
|
583
|
+
transitionReason = rateLimitRecoveryReason(outcome.rateLimitEvents) || undefined;
|
|
491
584
|
}
|
|
492
585
|
// Phase 3: 成果物統合と状態遷移(root で直列化)。通常実行と再開経路で共通化する。
|
|
493
586
|
const finalize = async () => finalizeRegisterWorktreeRun({
|
|
494
587
|
context,
|
|
588
|
+
opts,
|
|
495
589
|
registerPaths,
|
|
496
590
|
item,
|
|
497
591
|
ticketPath,
|
|
@@ -501,9 +595,10 @@ export async function runSingleRegisterItemWorktree(context, opts, pjrId, lifecy
|
|
|
501
595
|
resultScaffold,
|
|
502
596
|
agentResult,
|
|
503
597
|
stderr,
|
|
504
|
-
actor,
|
|
598
|
+
actor: completionActor,
|
|
505
599
|
bookkeepingPaths,
|
|
506
600
|
pipelineStatePath,
|
|
601
|
+
transitionReason,
|
|
507
602
|
});
|
|
508
603
|
return lifecycleLock ? lifecycleLock.runExclusive(finalize) : finalize();
|
|
509
604
|
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
export { buildTaskPhaseMap, isRateLimitError, parseExecRunBusyPolicy, resolveAgentOverride, resolveRegisterWorktree, resolveTaskPhaseContext, runCompletionDrivenWorkerPool, selectCandidates, } from "./
|
|
2
|
-
export { buildExecutorPrompt, executeAgent, executorRequirements, expandPromptRefs, extractBlockReason, loadPrompt, loadRosterForExecutionPath, reporterRequirements, resolveResumedCoverageTargets, runConfiguredParentValidationBatch, runConfiguredParentValidations, } from "./
|
|
3
|
-
export { checkCompletionBeforeIntegration, downgradeUnfilledResult
|
|
4
|
-
export { rebuildStaleGeneratedTracksForCycle, resolveClaimingActor
|
|
5
|
-
export { resolveInPlaceAgentPipeline, resolveInPlaceCommand } from "./
|
|
6
|
-
export { commitSubject, pipelineRecoveryMeta } from "./
|
|
7
|
-
export { commitRegisterItemChanges, isRegisterPipelineRequested, parseRegisterExecutorSelection, resolveRegisterCommand, resolveRegisterPipelineCommand, } from "./
|
|
8
|
-
export { registerStatePaths } from "./
|
|
9
|
-
export { resolveRegisterResumeExecutor, resolveRegisterResumeReporter
|
|
10
|
-
export { registerRunCommand } from "./
|
|
11
|
-
export { formatExecSlotsReport, registerCycleCommand, registerResumeCommand, registerSlotsCommand, } from "./
|
|
1
|
+
export { buildTaskPhaseMap, isRateLimitError, parseExecRunBusyPolicy, resolveAgentOverride, resolveRegisterWorktree, resolveTaskPhaseContext, runCompletionDrivenWorkerPool, selectCandidates, } from "./shared.js";
|
|
2
|
+
export { buildExecutorPrompt, executeAgent, executorRequirements, expandPromptRefs, extractBlockReason, loadPrompt, loadRosterForExecutionPath, reporterRequirements, resolveResumedCoverageTargets, runConfiguredParentValidationBatch, runConfiguredParentValidations, } from "./agent.js";
|
|
3
|
+
export { checkCompletionBeforeIntegration, downgradeUnfilledResult } from "./schedule-prepare.js";
|
|
4
|
+
export { rebuildStaleGeneratedTracksForCycle, resolveClaimingActor } from "./schedule-mode.js";
|
|
5
|
+
export { resolveInPlaceAgentPipeline, resolveInPlaceCommand } from "./in-place.js";
|
|
6
|
+
export { commitSubject, pipelineRecoveryMeta } from "./mode-shared.js";
|
|
7
|
+
export { applyRegisterDifficultyRouting, commitRegisterItemChanges, isRegisterPipelineRequested, parseRegisterExecutorSelection, resolveRegisterCommand, resolveRegisterPipelineCommand, } from "./register-core.js";
|
|
8
|
+
export { registerStatePaths } from "./register-state.js";
|
|
9
|
+
export { resolveRegisterResumeExecutor, resolveRegisterResumeReporter } from "./register-resume.js";
|
|
10
|
+
export { registerRunCommand } from "./register-command.js";
|
|
11
|
+
export { formatExecSlotsReport, registerCycleCommand, registerResumeCommand, registerSlotsCommand, } from "./lifecycle-commands.js";
|
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
import { existsSync } from "node:fs";
|
|
2
2
|
import { basename, join } from "node:path";
|
|
3
|
-
import { createProviderCapacityTracker, loadExecDefaultsConfig } from "
|
|
4
|
-
import { activateResolvedProjectPaths, resolveProjectPaths } from "
|
|
5
|
-
import { readAllEventFiles, foldEventsToState } from "
|
|
6
|
-
import { buildScheduleIndex, findStaleGeneratedTracks } from "
|
|
7
|
-
import { buildInitialStateFromStrategy } from "
|
|
8
|
-
import { readReadySnapshot } from "
|
|
9
|
-
import { specdojoRootDir } from "
|
|
10
|
-
import { extractLocalId, extractPhaseSuffix } from "
|
|
11
|
-
import { resolveWorktreeBase } from "
|
|
12
|
-
import { buildPhaseModeIndex, resolveAgentAssignment, resolveAgentPipeline, resolveApproach, resolveTaskCapabilities, resolveTaskExecution, resolveTaskMode, resolveTaskProficiency, } from "
|
|
13
|
-
import { SerialAsyncLock, buildTaskPhaseMap, configuredWorktreeBase, parseParallel, resolveExecDefaultsPath, runCompletionDrivenWorkerPool, } from "./
|
|
14
|
-
import { loadRosterForExecutionPath } from "./
|
|
15
|
-
import { prepareSingleTask
|
|
16
|
-
import { runPreparedTask, runPreparedTaskSafely, } from "./
|
|
17
|
-
import { spawnIndexBuild, spawnRefresh, spawnScheduleBuild } from "./
|
|
3
|
+
import { createProviderCapacityTracker, loadExecDefaultsConfig } from "../agent-config.js";
|
|
4
|
+
import { activateResolvedProjectPaths, resolveProjectPaths } from "../project.js";
|
|
5
|
+
import { readAllEventFiles, foldEventsToState } from "../events.js";
|
|
6
|
+
import { buildScheduleIndex, findStaleGeneratedTracks } from "../schedule/schedule.js";
|
|
7
|
+
import { buildInitialStateFromStrategy } from "../schedule/initial.js";
|
|
8
|
+
import { readReadySnapshot } from "../schedule/ready.js";
|
|
9
|
+
import { specdojoRootDir } from "../../shared/specdojo-config.js";
|
|
10
|
+
import { extractLocalId, extractPhaseSuffix } from "../../schedule/phase-sets.js";
|
|
11
|
+
import { resolveWorktreeBase } from "../worktree.js";
|
|
12
|
+
import { buildPhaseModeIndex, resolveAgentAssignment, resolveAgentPipeline, resolveApproach, resolveTaskCapabilities, resolveTaskExecution, resolveTaskMode, resolveTaskProficiency, } from "../strategy.js";
|
|
13
|
+
import { SerialAsyncLock, buildTaskPhaseMap, configuredWorktreeBase, parseParallel, resolveExecDefaultsPath, runCompletionDrivenWorkerPool, } from "./shared.js";
|
|
14
|
+
import { loadRosterForExecutionPath } from "./agent.js";
|
|
15
|
+
import { prepareSingleTask } from "./schedule-prepare.js";
|
|
16
|
+
import { runPreparedTask, runPreparedTaskSafely, } from "./schedule-task.js";
|
|
17
|
+
import { spawnIndexBuild, spawnRefresh, spawnScheduleBuild } from "./mode-shared.js";
|
|
18
18
|
// Rebuild only generated tracks whose strategy input is missing a generated track or has a newer
|
|
19
19
|
// mtime. The same structured detector feeds exec validate warnings, keeping manual validation and
|
|
20
20
|
// cycle automation on one freshness rule. No output is emitted when every track is fresh.
|
|
@@ -81,7 +81,7 @@ export async function runBatchMode(opts) {
|
|
|
81
81
|
if (!task)
|
|
82
82
|
continue;
|
|
83
83
|
try {
|
|
84
|
-
const prepared = await prepareSingleTask(task, projectId, repoRoot, schedulePath, executionPath, roster, localIdToPhaseSets, phaseSetSuffixToId, opts.by, { edit: opts.editBy, review: opts.reviewBy }, { executor: opts.executorBy, reporter: opts.reporterBy }, opts.by, dryRun, false, worktreeBase, planGenPaths, execDefaults, capacity.hasCapacity);
|
|
84
|
+
const prepared = await prepareSingleTask(task, projectId, repoRoot, schedulePath, executionPath, roster, localIdToPhaseSets, phaseSetSuffixToId, opts.by, { edit: opts.editBy, review: opts.reviewBy }, { executor: opts.executorBy, reporter: opts.reporterBy }, opts.by, dryRun, false, worktreeBase, planGenPaths, execDefaults, capacity.hasCapacity, undefined, opts);
|
|
85
85
|
// "deferred": every candidate provider is at its cap; try it again after a slot frees.
|
|
86
86
|
if (prepared === "deferred")
|
|
87
87
|
continue;
|
|
@@ -282,7 +282,7 @@ export async function runManualMode(opts) {
|
|
|
282
282
|
// ignore errors reading state; fall through to normal agent selection
|
|
283
283
|
}
|
|
284
284
|
}
|
|
285
|
-
const prepared = await prepareSingleTask(task, projectId, repoRoot, schedulePath, executionPath, roster, localIdToPhaseSets, phaseSetSuffixToId, actorOverride, { edit: opts.editBy, review: opts.reviewBy }, { executor: opts.executorBy, reporter: opts.reporterBy }, actorOverride, !!opts.dryRun, alreadyClaimed, worktreeBase, planGenPaths, execDefaults);
|
|
285
|
+
const prepared = await prepareSingleTask(task, projectId, repoRoot, schedulePath, executionPath, roster, localIdToPhaseSets, phaseSetSuffixToId, actorOverride, { edit: opts.editBy, review: opts.reviewBy }, { executor: opts.executorBy, reporter: opts.reporterBy }, actorOverride, !!opts.dryRun, alreadyClaimed, worktreeBase, planGenPaths, execDefaults, undefined, undefined, opts);
|
|
286
286
|
if (typeof prepared === "string") {
|
|
287
287
|
if (prepared === "failure")
|
|
288
288
|
process.exitCode = 1;
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
import { join } from "node:path";
|
|
2
|
-
import { resolveMemberCommand } from "
|
|
3
|
-
import { canCompleteTask, readAllEventFiles, foldEventsToState } from "
|
|
4
|
-
import { buildScheduleIndex } from "
|
|
5
|
-
import { buildInitialStateFromStrategy } from "
|
|
6
|
-
import { qualifyTaskId, randomHex } from "
|
|
7
|
-
import { generateSinglePlan, finalizeResultSectionsForDeliverable, targetDocIdsForScheduledTask, reviewGradeSubject, } from "
|
|
8
|
-
import { ensureReviewGrade } from "
|
|
9
|
-
import { isResultUnfilled, readResultFrontmatterSnapshot, scaffoldResult } from "
|
|
10
|
-
import { worktreeNameFromTaskId } from "
|
|
11
|
-
import { configuredProductRepos, plannedProjectWorktreePath } from "
|
|
12
|
-
import { checkpointAndEnsureWorktree, discardStaleExecWorktree } from "
|
|
13
|
-
import { pipelineStateLocation } from "
|
|
14
|
-
import { collectBusyActors, pinnedExecutor, pinnedReporter, resolveAgentOverride, resolveTaskPhaseContext, selectCandidates, } from "./
|
|
15
|
-
import { buildExecutorPrompt, executorRequirements, loadPrompt, reportProductWorktrees, reporterRequirements, resolveReporterAgentCandidates, } from "./
|
|
16
|
-
import { integrateLogPath, spawnClaim, spawnRelease } from "./
|
|
2
|
+
import { resolveMemberCommand } from "../agent-config.js";
|
|
3
|
+
import { canCompleteTask, readAllEventFiles, foldEventsToState } from "../events.js";
|
|
4
|
+
import { buildScheduleIndex } from "../schedule/schedule.js";
|
|
5
|
+
import { buildInitialStateFromStrategy } from "../schedule/initial.js";
|
|
6
|
+
import { qualifyTaskId, randomHex } from "../shared.js";
|
|
7
|
+
import { generateSinglePlan, finalizeResultSectionsForDeliverable, targetDocIdsForScheduledTask, reviewGradeSubject, } from "../plans.js";
|
|
8
|
+
import { ensureReviewGrade } from "../../review/grade.js";
|
|
9
|
+
import { isResultUnfilled, readResultFrontmatterSnapshot, scaffoldResult } from "../results.js";
|
|
10
|
+
import { worktreeNameFromTaskId } from "../worktree.js";
|
|
11
|
+
import { configuredProductRepos, plannedProjectWorktreePath } from "../task-repos.js";
|
|
12
|
+
import { checkpointAndEnsureWorktree, discardStaleExecWorktree } from "../worktree-ops.js";
|
|
13
|
+
import { pipelineStateLocation } from "../pipeline-state.js";
|
|
14
|
+
import { collectBusyActors, pinnedExecutor, pinnedReporter, resolveAgentOverride, resolvePinnedRateLimitRunOptions, resolveTaskPhaseContext, selectCandidates, } from "./shared.js";
|
|
15
|
+
import { buildExecutorPrompt, executorRequirements, loadPrompt, reportProductWorktrees, reporterRequirements, resolveReporterAgentCandidates, } from "./agent.js";
|
|
16
|
+
import { integrateLogPath, spawnClaim, spawnRelease } from "./mode-shared.js";
|
|
17
17
|
export function findClaimEventPath(schedulePath, taskId) {
|
|
18
18
|
const claims = readAllEventFiles(schedulePath).filter((item) => item.event.task_id === taskId && item.event.type === "claim");
|
|
19
19
|
return claims[claims.length - 1]?.path ?? null;
|
|
@@ -49,7 +49,7 @@ export async function gradeBeforeReviewPlan(params) {
|
|
|
49
49
|
process.stdout.write(` [grade] ${summary}\n`);
|
|
50
50
|
return outcome;
|
|
51
51
|
}
|
|
52
|
-
export async function prepareSingleTask(task, projectId, repoRoot, schedulePath, executionPath, roster, localIdToPhaseSets, phaseSetSuffixToId, agentNicknameOverride, modeAgentOverrides, stageAgentOverrides, actorOverride, dryRun, skipClaim, worktreeBase, planGenPaths, execDefaults, hasProviderCapacity, pipelineResume) {
|
|
52
|
+
export async function prepareSingleTask(task, projectId, repoRoot, schedulePath, executionPath, roster, localIdToPhaseSets, phaseSetSuffixToId, agentNicknameOverride, modeAgentOverrides, stageAgentOverrides, actorOverride, dryRun, skipClaim, worktreeBase, planGenPaths, execDefaults, hasProviderCapacity, pipelineResume, rateLimitOverrides = {}) {
|
|
53
53
|
const mode = task.mode ?? "edit";
|
|
54
54
|
process.stdout.write(`Task: ${task.id}${task.name ? ` — ${task.name}` : ""} [${mode}]\n`);
|
|
55
55
|
if (!task.agent_pipeline && (stageAgentOverrides.executor || stageAgentOverrides.reporter)) {
|
|
@@ -77,7 +77,7 @@ export async function prepareSingleTask(task, projectId, repoRoot, schedulePath,
|
|
|
77
77
|
]
|
|
78
78
|
: [];
|
|
79
79
|
let actor = actorOverride ?? "auto-agent";
|
|
80
|
-
if (
|
|
80
|
+
if (overrideResolution.kind === "command" && overrideResolution.actor && !skipClaim) {
|
|
81
81
|
actor = overrideResolution.actor;
|
|
82
82
|
}
|
|
83
83
|
if (agentCandidates.length === 0) {
|
|
@@ -142,14 +142,23 @@ export async function prepareSingleTask(task, projectId, repoRoot, schedulePath,
|
|
|
142
142
|
process.stdout.write(` Phase: ${phaseCtx.phaseSet}/${phaseCtx.phaseId} Mode: ${mode} Agent: ${runnable[0].nickname}\n`);
|
|
143
143
|
}
|
|
144
144
|
let reporterCandidates;
|
|
145
|
+
let reporterPinned = false;
|
|
145
146
|
if (task.agent_pipeline) {
|
|
146
147
|
const requirements = reporterRequirements(task);
|
|
147
|
-
|
|
148
|
+
const reporterNickname = stageAgentOverrides.reporter ?? pinnedReporter(task);
|
|
149
|
+
reporterPinned = !!reporterNickname || !!pipelineResume;
|
|
150
|
+
reporterCandidates = resolveReporterAgentCandidates(task, roster, execDefaults, collectBusyActors(schedulePath), reporterNickname);
|
|
148
151
|
if (reporterCandidates.length === 0) {
|
|
149
152
|
process.stdout.write(` No agents found for reporter stage${requirements?.proficiency ? `, proficiency: ${requirements.proficiency}` : ""}\n`);
|
|
150
153
|
return "failure";
|
|
151
154
|
}
|
|
152
155
|
}
|
|
156
|
+
const executorRateLimitOptions = overrideResolution.kind === "command" || !!pipelineResume
|
|
157
|
+
? resolvePinnedRateLimitRunOptions(rateLimitOverrides, execDefaults, roster, "executor", agentCandidates[0])
|
|
158
|
+
: undefined;
|
|
159
|
+
const reporterRateLimitOptions = reporterPinned && reporterCandidates?.[0]
|
|
160
|
+
? resolvePinnedRateLimitRunOptions(rateLimitOverrides, execDefaults, roster, "reporter", reporterCandidates[0])
|
|
161
|
+
: undefined;
|
|
153
162
|
const reviewGradeOutcome = await gradeBeforeReviewPlan({
|
|
154
163
|
task,
|
|
155
164
|
projectId,
|
|
@@ -213,6 +222,8 @@ export async function prepareSingleTask(task, projectId, repoRoot, schedulePath,
|
|
|
213
222
|
pipelineResumeStage: pipelineResume?.stage,
|
|
214
223
|
pipelineStateRef: pipelineResume?.stateRef,
|
|
215
224
|
reporterCandidates,
|
|
225
|
+
executorRateLimitOptions,
|
|
226
|
+
reporterRateLimitOptions,
|
|
216
227
|
};
|
|
217
228
|
}
|
|
218
229
|
if (skipClaim) {
|
|
@@ -317,6 +328,8 @@ export async function prepareSingleTask(task, projectId, repoRoot, schedulePath,
|
|
|
317
328
|
pipelineResumeStage: pipelineResume?.stage,
|
|
318
329
|
pipelineStateRef: pipelineResume?.stateRef,
|
|
319
330
|
reporterCandidates,
|
|
331
|
+
executorRateLimitOptions,
|
|
332
|
+
reporterRateLimitOptions,
|
|
320
333
|
};
|
|
321
334
|
}
|
|
322
335
|
// An agent can exit 0 without doing the work (e.g. a permission-denied tool call is fed back as a
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { relative, resolve, sep } from "node:path";
|
|
2
|
-
import { limitEventMeta } from "
|
|
3
|
-
import { readResultFrontmatterSnapshot, renderReporterResult, updateResultStatus, } from "
|
|
4
|
-
import { gitOutput } from "
|
|
5
|
-
import { withProductRepoPrompt } from "
|
|
6
|
-
import { commitTargetPaths, commitWorktreeChanges, isExecBranchMergedIntoCurrent, mergeWorktreeIntoCurrent, releaseRootWorkingCopies, removeWorktree, taskTargetsAtHead, WorktreeRemovedBranchDeletionError, worktreeStatusPaths, } from "
|
|
7
|
-
import { commitProductWorktrees, integrateTaskRepositories, projectMergeBlockers, PROJECT_REPO_NAME, RepoIntegrationError, } from "
|
|
8
|
-
import { recordExecutorEvidence, recordReporterFailureOutput } from "
|
|
9
|
-
import { deriveReporterFacts, evidenceForReporter, runReporterWithFormatRetry, } from "
|
|
10
|
-
import { createPipelineState, loadPipelineResumeCheckpoint, pipelineStateLocation, updatePipelineStage, writePipelineState, } from "
|
|
11
|
-
import { agentEnvironment, appendParentValidationsToExecutorEvidence, buildExecutorPrompt, extractBlockReason, pathInsideWorktree, resumedTargetCoverageFailure, runWithRetry, } from "./
|
|
12
|
-
import { refreshParentValidationsForReporterResume } from "./
|
|
13
|
-
import { downgradeUnfilledResult, readCompletionPreflight, } from "./
|
|
14
|
-
import { commitSubject, integrateLogPath, pipelineRecoveryMeta, recordIntegrateStage, recordRepoIntegration, repoRelativePath, spawnBlock, spawnComplete, } from "./
|
|
2
|
+
import { limitEventMeta } from "../limit.js";
|
|
3
|
+
import { readResultFrontmatterSnapshot, renderReporterResult, updateResultStatus, } from "../results.js";
|
|
4
|
+
import { gitOutput } from "../worktree.js";
|
|
5
|
+
import { withProductRepoPrompt } from "../task-repos.js";
|
|
6
|
+
import { commitTargetPaths, commitWorktreeChanges, isExecBranchMergedIntoCurrent, mergeWorktreeIntoCurrent, releaseRootWorkingCopies, removeWorktree, taskTargetsAtHead, WorktreeRemovedBranchDeletionError, worktreeStatusPaths, } from "../worktree-ops.js";
|
|
7
|
+
import { commitProductWorktrees, integrateTaskRepositories, projectMergeBlockers, PROJECT_REPO_NAME, RepoIntegrationError, } from "../repo-integration.js";
|
|
8
|
+
import { recordExecutorEvidence, recordReporterFailureOutput, writeExecutorEvidence, } from "../evidence.js";
|
|
9
|
+
import { deriveReporterFacts, evidenceForReporter, runReporterWithFormatRetry, } from "../reporter.js";
|
|
10
|
+
import { createPipelineState, loadPipelineResumeCheckpoint, pipelineStateLocation, updatePipelineStage, writePipelineState, } from "../pipeline-state.js";
|
|
11
|
+
import { agentEnvironment, appendParentValidationsToExecutorEvidence, buildExecutorPrompt, extractBlockReason, pathInsideWorktree, resumedTargetCoverageFailure, runWithRetry, } from "./agent.js";
|
|
12
|
+
import { refreshParentValidationsForReporterResume } from "./agent-pipeline.js";
|
|
13
|
+
import { downgradeUnfilledResult, readCompletionPreflight, } from "./schedule-prepare.js";
|
|
14
|
+
import { commitSubject, integrateLogPath, pipelineRecoveryMeta, recordIntegrateStage, recordRepoIntegration, repoRelativePath, spawnBlock, spawnComplete, } from "./mode-shared.js";
|
|
15
15
|
export async function runPreparedTask(prepared, projectId, repoRoot, schedulePath, executionPath, catalogPath, execDefaults, dryRun, lifecycleLock) {
|
|
16
16
|
if (dryRun)
|
|
17
17
|
return "success";
|
|
@@ -38,6 +38,8 @@ export async function runPreparedTask(prepared, projectId, repoRoot, schedulePat
|
|
|
38
38
|
let pipelineBlockReason;
|
|
39
39
|
let reporterLimit;
|
|
40
40
|
let reporterAttempts = 0;
|
|
41
|
+
let reporterActor = prepared.reporterCandidates?.[0]?.actor;
|
|
42
|
+
const reporterRateLimitEvents = [];
|
|
41
43
|
let pipelineState;
|
|
42
44
|
let pipelineStatePath;
|
|
43
45
|
let pipelineStateRef;
|
|
@@ -45,13 +47,14 @@ export async function runPreparedTask(prepared, projectId, repoRoot, schedulePat
|
|
|
45
47
|
let resumeIntegration = false;
|
|
46
48
|
if (!prepared.pipelineRunId) {
|
|
47
49
|
process.stdout.write(` Running: ${prepared.agentCandidates[0]?.command ?? ""}\n`);
|
|
48
|
-
const outcome = await runWithRetry(prepared.agentCandidates, withProductRepoPrompt(prepared.prompt, prepared.worktree.repos), execDefaults, prepared.worktree.path, agentEnvironment(repoRoot, prepared.worktree.path, schedulePath, executionPath, prepared.worktree.repos), worktreeResultPath);
|
|
50
|
+
const outcome = await runWithRetry(prepared.agentCandidates, withProductRepoPrompt(prepared.prompt, prepared.worktree.repos), execDefaults, prepared.worktree.path, agentEnvironment(repoRoot, prepared.worktree.path, schedulePath, executionPath, prepared.worktree.repos), worktreeResultPath, prepared.executorRateLimitOptions);
|
|
49
51
|
result = outcome.result;
|
|
50
52
|
stderr = outcome.stderr;
|
|
51
53
|
exitCode = outcome.exitCode;
|
|
52
54
|
stdout = outcome.stdout;
|
|
53
55
|
attempts = outcome.attempts;
|
|
54
56
|
limit = outcome.limit;
|
|
57
|
+
prepared.actor = outcome.actor ?? prepared.actor;
|
|
55
58
|
}
|
|
56
59
|
if (prepared.pipelineRunId && prepared.pipelineStateRef) {
|
|
57
60
|
const checkpoint = loadPipelineResumeCheckpoint({
|
|
@@ -139,20 +142,21 @@ export async function runPreparedTask(prepared, projectId, repoRoot, schedulePat
|
|
|
139
142
|
existingChanges: worktreeStatusPaths(prepared.worktree.path),
|
|
140
143
|
})
|
|
141
144
|
: prepared.prompt;
|
|
142
|
-
const executorOutcome = await runWithRetry(prepared.agentCandidates, withProductRepoPrompt(executorPrompt, prepared.worktree.repos), execDefaults, prepared.worktree.path, agentEnvironment(repoRoot, prepared.worktree.path, schedulePath, executionPath, prepared.worktree.repos), worktreeResultPath);
|
|
145
|
+
const executorOutcome = await runWithRetry(prepared.agentCandidates, withProductRepoPrompt(executorPrompt, prepared.worktree.repos), execDefaults, prepared.worktree.path, agentEnvironment(repoRoot, prepared.worktree.path, schedulePath, executionPath, prepared.worktree.repos), worktreeResultPath, prepared.executorRateLimitOptions);
|
|
143
146
|
result = executorOutcome.result;
|
|
144
147
|
stderr = executorOutcome.stderr;
|
|
145
148
|
exitCode = executorOutcome.exitCode;
|
|
146
149
|
stdout = executorOutcome.stdout;
|
|
147
150
|
attempts = executorOutcome.attempts;
|
|
148
151
|
limit = executorOutcome.limit;
|
|
152
|
+
prepared.actor = executorOutcome.actor ?? prepared.actor;
|
|
149
153
|
const recorded = recordExecutorEvidence({
|
|
150
154
|
repoRoot,
|
|
151
155
|
worktreePath: prepared.worktree.path,
|
|
152
156
|
executionPath,
|
|
153
157
|
taskId: prepared.task.id,
|
|
154
158
|
runId: pipelineState.run_id,
|
|
155
|
-
actor: prepared.actor,
|
|
159
|
+
actor: executorOutcome.actor ?? prepared.actor,
|
|
156
160
|
status: result === "success" ? "succeeded" : result === "rate_limit" ? "rate_limited" : "failed",
|
|
157
161
|
startedAt: executorStartedAt,
|
|
158
162
|
completedAt: new Date().toISOString(),
|
|
@@ -161,6 +165,7 @@ export async function runPreparedTask(prepared, projectId, repoRoot, schedulePat
|
|
|
161
165
|
stdout,
|
|
162
166
|
stderr,
|
|
163
167
|
productWorktrees: prepared.worktree.repos,
|
|
168
|
+
rateLimitEvents: executorOutcome.rateLimitEvents,
|
|
164
169
|
});
|
|
165
170
|
executorEvidenceRef = relative(prepared.worktree.path, recorded.evidencePath)
|
|
166
171
|
.split(sep)
|
|
@@ -190,8 +195,12 @@ export async function runPreparedTask(prepared, projectId, repoRoot, schedulePat
|
|
|
190
195
|
? "rate_limited"
|
|
191
196
|
: "failed",
|
|
192
197
|
attempts: pipelineState.stages.executor.attempts + attempts,
|
|
198
|
+
actor: executorOutcome.actor ?? prepared.actor,
|
|
193
199
|
completed_at: executorCompletedAt,
|
|
194
200
|
artifact_ref: executorEvidenceRef,
|
|
201
|
+
...(executorOutcome.rateLimitEvents.length > 0
|
|
202
|
+
? { rate_limit_events: executorOutcome.rateLimitEvents }
|
|
203
|
+
: {}),
|
|
195
204
|
}, executorCompletedAt);
|
|
196
205
|
writePipelineState(pipelineStatePath, pipelineState);
|
|
197
206
|
process.stdout.write(` Executor evidence: ${executorEvidenceRef}\n`);
|
|
@@ -237,13 +246,23 @@ export async function runPreparedTask(prepared, projectId, repoRoot, schedulePat
|
|
|
237
246
|
evidence: reporterEvidence,
|
|
238
247
|
mode: prepared.task.mode ?? "edit",
|
|
239
248
|
invoke: async (reporterPrompt) => {
|
|
240
|
-
const outcome = await runWithRetry(prepared.reporterCandidates ?? [], reporterPrompt, execDefaults, prepared.worktree.path, agentEnvironment(repoRoot, prepared.worktree.path, schedulePath, executionPath, prepared.worktree.repos), worktreeResultPath);
|
|
249
|
+
const outcome = await runWithRetry(prepared.reporterCandidates ?? [], reporterPrompt, execDefaults, prepared.worktree.path, agentEnvironment(repoRoot, prepared.worktree.path, schedulePath, executionPath, prepared.worktree.repos), worktreeResultPath, prepared.reporterRateLimitOptions);
|
|
241
250
|
reporterAttempts += outcome.attempts;
|
|
251
|
+
reporterActor = outcome.actor ?? reporterActor;
|
|
252
|
+
reporterRateLimitEvents.push(...outcome.rateLimitEvents);
|
|
242
253
|
if (outcome.limit)
|
|
243
254
|
reporterLimit = outcome.limit;
|
|
244
255
|
return { result: outcome.result, stdout: outcome.stdout, stderr: outcome.stderr };
|
|
245
256
|
},
|
|
246
257
|
});
|
|
258
|
+
if (reporterRateLimitEvents.length > 0 && executorEvidence && executorEvidencePath) {
|
|
259
|
+
executorEvidence.rate_limit_events = [
|
|
260
|
+
...(executorEvidence.rate_limit_events ?? []),
|
|
261
|
+
...reporterRateLimitEvents,
|
|
262
|
+
];
|
|
263
|
+
reporterEvidence.rate_limit_events = executorEvidence.rate_limit_events;
|
|
264
|
+
writeExecutorEvidence(executorEvidencePath, executorEvidence);
|
|
265
|
+
}
|
|
247
266
|
if (reporter.result === "success") {
|
|
248
267
|
try {
|
|
249
268
|
await renderReporterResult(worktreeResultPath, reporter.output, reporterEvidence);
|
|
@@ -254,16 +273,20 @@ export async function runPreparedTask(prepared, projectId, repoRoot, schedulePat
|
|
|
254
273
|
pipelineBlockReason = facts.block_reason || undefined;
|
|
255
274
|
if (pipelineBlockReason)
|
|
256
275
|
stderr = pipelineBlockReason;
|
|
257
|
-
process.stdout.write(` Reporter complete: ${
|
|
276
|
+
process.stdout.write(` Reporter complete: ${reporterActor ?? "reporter"} (format attempts: ${reporter.formatAttempts})\n`);
|
|
258
277
|
if (result === "success") {
|
|
259
278
|
const reporterCompletedAt = new Date().toISOString();
|
|
260
279
|
pipelineState = updatePipelineStage(pipelineState, "reporter", {
|
|
261
280
|
status: "succeeded",
|
|
262
281
|
attempts: pipelineState.stages.reporter.attempts + reporterAttempts,
|
|
282
|
+
actor: reporterActor ?? null,
|
|
263
283
|
completed_at: reporterCompletedAt,
|
|
264
284
|
artifact_ref: relative(prepared.worktree.path, worktreeResultPath)
|
|
265
285
|
.split(sep)
|
|
266
286
|
.join("/"),
|
|
287
|
+
...(reporterRateLimitEvents.length > 0
|
|
288
|
+
? { rate_limit_events: reporterRateLimitEvents }
|
|
289
|
+
: {}),
|
|
267
290
|
}, reporterCompletedAt);
|
|
268
291
|
writePipelineState(pipelineStatePath, pipelineState);
|
|
269
292
|
}
|
|
@@ -295,10 +318,14 @@ export async function runPreparedTask(prepared, projectId, repoRoot, schedulePat
|
|
|
295
318
|
pipelineState = updatePipelineStage(pipelineState, "reporter", {
|
|
296
319
|
status: result === "rate_limit" ? "rate_limited" : "failed",
|
|
297
320
|
attempts: pipelineState.stages.reporter.attempts + reporterAttempts,
|
|
321
|
+
actor: reporterActor ?? null,
|
|
298
322
|
completed_at: reporterCompletedAt,
|
|
299
323
|
artifact_ref: reporter.result === "success"
|
|
300
324
|
? relative(prepared.worktree.path, worktreeResultPath).split(sep).join("/")
|
|
301
325
|
: pipelineState.stages.reporter.artifact_ref,
|
|
326
|
+
...(reporterRateLimitEvents.length > 0
|
|
327
|
+
? { rate_limit_events: reporterRateLimitEvents }
|
|
328
|
+
: {}),
|
|
302
329
|
}, reporterCompletedAt);
|
|
303
330
|
writePipelineState(pipelineStatePath, pipelineState);
|
|
304
331
|
}
|