@aperant/framework 0.13.0-next.0 → 0.15.0
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/CHANGELOG.md +89 -3
- package/README.md +11 -1
- package/agents/apt-pr-review-i18n.md +190 -0
- package/agents/apt-pr-review-xplatform.md +189 -0
- package/dist/cli/commands/audit-branch-current.d.mts +27 -5
- package/dist/cli/commands/audit-branch-current.d.mts.map +1 -1
- package/dist/cli/commands/audit-branch-current.mjs +3 -3
- package/dist/cli/commands/audit-branch-current.mjs.map +1 -1
- package/dist/cli/commands/event.d.mts.map +1 -1
- package/dist/cli/commands/event.mjs +6 -4
- package/dist/cli/commands/event.mjs.map +1 -1
- package/dist/cli/commands/fan-out.d.mts.map +1 -1
- package/dist/cli/commands/fan-out.mjs +3 -1
- package/dist/cli/commands/fan-out.mjs.map +1 -1
- package/dist/cli/commands/features-audit.d.mts.map +1 -1
- package/dist/cli/commands/features-audit.mjs +6 -1
- package/dist/cli/commands/features-audit.mjs.map +1 -1
- package/dist/cli/commands/followups.d.mts +5 -0
- package/dist/cli/commands/followups.d.mts.map +1 -0
- package/dist/cli/commands/followups.mjs +266 -0
- package/dist/cli/commands/followups.mjs.map +1 -0
- package/dist/cli/commands/health-check.d.mts.map +1 -1
- package/dist/cli/commands/health-check.mjs +3 -1
- package/dist/cli/commands/health-check.mjs.map +1 -1
- package/dist/cli/commands/merge-detect.d.mts +29 -0
- package/dist/cli/commands/merge-detect.d.mts.map +1 -0
- package/dist/cli/commands/merge-detect.mjs +196 -0
- package/dist/cli/commands/merge-detect.mjs.map +1 -0
- package/dist/cli/commands/merge-integrate.d.mts +28 -0
- package/dist/cli/commands/merge-integrate.d.mts.map +1 -0
- package/dist/cli/commands/merge-integrate.mjs +383 -0
- package/dist/cli/commands/merge-integrate.mjs.map +1 -0
- package/dist/cli/commands/pr-review/detect-specialists.d.mts +58 -0
- package/dist/cli/commands/pr-review/detect-specialists.d.mts.map +1 -0
- package/dist/cli/commands/pr-review/detect-specialists.mjs +980 -0
- package/dist/cli/commands/pr-review/detect-specialists.mjs.map +1 -0
- package/dist/cli/commands/pr-review.d.mts.map +1 -1
- package/dist/cli/commands/pr-review.mjs +11 -2
- package/dist/cli/commands/pr-review.mjs.map +1 -1
- package/dist/cli/commands/precompact-hook.d.mts.map +1 -1
- package/dist/cli/commands/precompact-hook.mjs +10 -6
- package/dist/cli/commands/precompact-hook.mjs.map +1 -1
- package/dist/cli/commands/roadmap.d.mts.map +1 -1
- package/dist/cli/commands/roadmap.mjs +24 -11
- package/dist/cli/commands/roadmap.mjs.map +1 -1
- package/dist/cli/commands/seed.d.mts.map +1 -1
- package/dist/cli/commands/seed.mjs +3 -1
- package/dist/cli/commands/seed.mjs.map +1 -1
- package/dist/cli/commands/state.d.mts.map +1 -1
- package/dist/cli/commands/state.mjs +9 -3
- package/dist/cli/commands/state.mjs.map +1 -1
- package/dist/cli/commands/statusline.d.mts.map +1 -1
- package/dist/cli/commands/statusline.mjs +5 -1
- package/dist/cli/commands/statusline.mjs.map +1 -1
- package/dist/cli/commands/task.d.mts.map +1 -1
- package/dist/cli/commands/task.mjs +126 -23
- package/dist/cli/commands/task.mjs.map +1 -1
- package/dist/cli/commands/worktree.d.mts +1 -1
- package/dist/cli/commands/worktree.d.mts.map +1 -1
- package/dist/cli/commands/worktree.mjs +282 -83
- package/dist/cli/commands/worktree.mjs.map +1 -1
- package/dist/cli/config/post-merge-sweep.d.mts.map +1 -1
- package/dist/cli/config/post-merge-sweep.mjs +3 -2
- package/dist/cli/config/post-merge-sweep.mjs.map +1 -1
- package/dist/cli/config/share-policy.d.mts +3 -1
- package/dist/cli/config/share-policy.d.mts.map +1 -1
- package/dist/cli/config/share-policy.mjs +16 -3
- package/dist/cli/config/share-policy.mjs.map +1 -1
- package/dist/cli/config/upgrade-gitignore.d.mts.map +1 -1
- package/dist/cli/config/upgrade-gitignore.mjs +27 -5
- package/dist/cli/config/upgrade-gitignore.mjs.map +1 -1
- package/dist/cli/consistency/parse-qa.mjs +12 -1
- package/dist/cli/consistency/parse-qa.mjs.map +1 -1
- package/dist/cli/consistency/parse-review.d.mts +23 -0
- package/dist/cli/consistency/parse-review.d.mts.map +1 -1
- package/dist/cli/consistency/parse-review.mjs +36 -0
- package/dist/cli/consistency/parse-review.mjs.map +1 -1
- package/dist/cli/consistency/parse-spec.d.mts +16 -0
- package/dist/cli/consistency/parse-spec.d.mts.map +1 -1
- package/dist/cli/consistency/parse-spec.mjs +44 -0
- package/dist/cli/consistency/parse-spec.mjs.map +1 -1
- package/dist/cli/coordination/agent-identity.d.mts +5 -2
- package/dist/cli/coordination/agent-identity.d.mts.map +1 -1
- package/dist/cli/coordination/agent-identity.mjs +6 -4
- package/dist/cli/coordination/agent-identity.mjs.map +1 -1
- package/dist/cli/coordination/store.d.mts +1 -1
- package/dist/cli/dispatch.d.mts.map +1 -1
- package/dist/cli/dispatch.mjs +4 -0
- package/dist/cli/dispatch.mjs.map +1 -1
- package/dist/cli/followups/derive.d.mts +63 -0
- package/dist/cli/followups/derive.d.mts.map +1 -0
- package/dist/cli/followups/derive.mjs +115 -0
- package/dist/cli/followups/derive.mjs.map +1 -0
- package/dist/cli/followups/schema.d.mts +165 -0
- package/dist/cli/followups/schema.d.mts.map +1 -0
- package/dist/cli/followups/schema.mjs +251 -0
- package/dist/cli/followups/schema.mjs.map +1 -0
- package/dist/cli/gate/context.d.mts +1 -1
- package/dist/cli/gate/gates/followups-adjudicated.d.mts +69 -0
- package/dist/cli/gate/gates/followups-adjudicated.d.mts.map +1 -0
- package/dist/cli/gate/gates/followups-adjudicated.mjs +141 -0
- package/dist/cli/gate/gates/followups-adjudicated.mjs.map +1 -0
- package/dist/cli/gate/gates/index.mjs +1 -0
- package/dist/cli/gate/gates/index.mjs.map +1 -1
- package/dist/cli/git/materialize-env.d.mts +39 -0
- package/dist/cli/git/materialize-env.d.mts.map +1 -0
- package/dist/cli/git/materialize-env.mjs +217 -0
- package/dist/cli/git/materialize-env.mjs.map +1 -0
- package/dist/cli/help.d.mts.map +1 -1
- package/dist/cli/help.mjs +9 -1
- package/dist/cli/help.mjs.map +1 -1
- package/dist/cli/install/legacy-paths.d.mts.map +1 -1
- package/dist/cli/install/legacy-paths.mjs +4 -0
- package/dist/cli/install/legacy-paths.mjs.map +1 -1
- package/dist/cli/roadmap/lifecycle.d.mts.map +1 -1
- package/dist/cli/roadmap/lifecycle.mjs +4 -1
- package/dist/cli/roadmap/lifecycle.mjs.map +1 -1
- package/dist/cli/task/ids.d.mts +9 -0
- package/dist/cli/task/ids.d.mts.map +1 -1
- package/dist/cli/task/ids.mjs +9 -0
- package/dist/cli/task/ids.mjs.map +1 -1
- package/dist/cli/task/index-md.d.mts +5 -0
- package/dist/cli/task/index-md.d.mts.map +1 -1
- package/dist/cli/task/index-md.mjs +12 -4
- package/dist/cli/task/index-md.mjs.map +1 -1
- package/dist/cli/util/io.d.mts +6 -0
- package/dist/cli/util/io.d.mts.map +1 -1
- package/dist/cli/util/io.mjs +16 -1
- package/dist/cli/util/io.mjs.map +1 -1
- package/dist/cli/util/project.d.mts +7 -2
- package/dist/cli/util/project.d.mts.map +1 -1
- package/dist/cli/util/project.mjs +11 -14
- package/dist/cli/util/project.mjs.map +1 -1
- package/dist/cli/util/state-paths.d.mts +19 -0
- package/dist/cli/util/state-paths.d.mts.map +1 -0
- package/dist/cli/util/state-paths.mjs +45 -0
- package/dist/cli/util/state-paths.mjs.map +1 -0
- package/dist/plugin/.claude-plugin/plugin.json +4 -1
- package/dist/plugin/agents/apt-pr-review-i18n.md +190 -0
- package/dist/plugin/agents/apt-pr-review-xplatform.md +189 -0
- package/dist/plugin/skills/apt/SKILL.md +13 -6
- package/dist/plugin/skills/apt-close-task/SKILL.md +48 -0
- package/dist/plugin/skills/apt-debug/SKILL.md +19 -9
- package/dist/plugin/skills/apt-execute/SKILL.md +3 -1
- package/dist/plugin/skills/apt-fan-out/SKILL.md +65 -1
- package/dist/plugin/skills/apt-merge-conflict-resolution/SKILL.md +227 -0
- package/dist/plugin/skills/apt-pr-review/SCHEMA.md +4 -2
- package/dist/plugin/skills/apt-pr-review/SKILL.md +117 -29
- package/dist/plugin/skills/apt-quick/SKILL.md +24 -1
- package/dist/plugin/skills/apt-review/SKILL.md +6 -0
- package/dist/plugin/skills/apt-run/SKILL.md +1 -1
- package/dist/plugin/skills/apt-setup/SKILL.md +21 -3
- package/dist/plugin/skills/apt-ship/SKILL.md +32 -11
- package/dist/plugin/skills/apt-terminal/SKILL.md +8 -0
- package/dist/plugin/skills/apt-triage/SKILL.md +4 -0
- package/dist/plugin/skills/apt-verify/SKILL.md +24 -0
- package/dist/plugin/skills/apt-watch-ci/SKILL.md +3 -1
- package/dist/types/config.d.ts +33 -0
- package/dist/types/config.d.ts.map +1 -1
- package/package.json +138 -138
- package/prompts/conductor-framework-context.md +1 -1
- package/prompts/github/pr_i18n_agent.md +279 -0
- package/prompts/github/pr_xplatform_agent.md +283 -0
- package/prompts/inbox-clarification.md +18 -11
- package/skills/apt/SKILL.md +9 -3
- package/skills/apt-close-task/SKILL.md +48 -0
- package/skills/apt-debug/SKILL.md +19 -9
- package/skills/apt-execute/SKILL.md +3 -1
- package/skills/apt-fan-out/SKILL.md +65 -1
- package/skills/apt-merge-conflict-resolution/SKILL.md +227 -0
- package/skills/apt-pr-review/SCHEMA.md +4 -2
- package/skills/apt-pr-review/SKILL.md +117 -29
- package/skills/apt-quick/SKILL.md +24 -1
- package/skills/apt-review/SKILL.md +6 -0
- package/skills/apt-run/SKILL.md +1 -1
- package/skills/apt-setup/SKILL.md +21 -3
- package/skills/apt-ship/SKILL.md +32 -11
- package/skills/apt-terminal/SKILL.md +8 -0
- package/skills/apt-triage/SKILL.md +4 -0
- package/skills/apt-verify/SKILL.md +24 -0
- package/skills/apt-watch-ci/SKILL.md +3 -1
- package/src/cli/commands/audit-branch-current.mjs +3 -3
- package/src/cli/commands/event.mjs +6 -4
- package/src/cli/commands/fan-out.mjs +3 -1
- package/src/cli/commands/features-audit.mjs +6 -1
- package/src/cli/commands/followups.mjs +303 -0
- package/src/cli/commands/health-check.mjs +3 -1
- package/src/cli/commands/merge-detect.mjs +203 -0
- package/src/cli/commands/merge-integrate.mjs +392 -0
- package/src/cli/commands/pr-review/__fixtures__/android-strings/app/src/main/res/values-fr/strings.xml +3 -0
- package/src/cli/commands/pr-review/__fixtures__/babel-js/package.json +4 -0
- package/src/cli/commands/pr-review/__fixtures__/c-ifdef/src/main.c +4 -0
- package/src/cli/commands/pr-review/__fixtures__/ci-matrix/.github/workflows/ci.yml +10 -0
- package/src/cli/commands/pr-review/__fixtures__/cmake-win/CMakeLists.txt +5 -0
- package/src/cli/commands/pr-review/__fixtures__/diffs/add-arb.patch +9 -0
- package/src/cli/commands/pr-review/__fixtures__/diffs/ci-single-os-dep.patch +13 -0
- package/src/cli/commands/pr-review/__fixtures__/diffs/ci-single-os-list-item-dep.patch +17 -0
- package/src/cli/commands/pr-review/__fixtures__/diffs/lone-weak-t.patch +8 -0
- package/src/cli/commands/pr-review/__fixtures__/diffs/monorepo-b.patch +7 -0
- package/src/cli/commands/pr-review/__fixtures__/diffs/two-weak-xpl.patch +12 -0
- package/src/cli/commands/pr-review/__fixtures__/dropped-underscore/src/app.js +2 -0
- package/src/cli/commands/pr-review/__fixtures__/electron-app/package.json +4 -0
- package/src/cli/commands/pr-review/__fixtures__/i18n-locale-file/src/locales/fr.json +1 -0
- package/src/cli/commands/pr-review/__fixtures__/monorepo/packages/a/locales/fr.json +1 -0
- package/src/cli/commands/pr-review/__fixtures__/monorepo/packages/b/src/index.ts +1 -0
- package/src/cli/commands/pr-review/__fixtures__/py-babel/pyproject.toml +3 -0
- package/src/cli/commands/pr-review/__fixtures__/qt-i18n-dir/i18n/app_fr.ts +11 -0
- package/src/cli/commands/pr-review/__fixtures__/rust-cli/Cargo.toml +7 -0
- package/src/cli/commands/pr-review/__fixtures__/rust-cli/src/main.rs +1 -0
- package/src/cli/commands/pr-review/__fixtures__/ts-dir/ts/foo.ts +3 -0
- package/src/cli/commands/pr-review/detect-specialists.mjs +1023 -0
- package/src/cli/commands/pr-review.mjs +12 -2
- package/src/cli/commands/precompact-hook.mjs +10 -6
- package/src/cli/commands/roadmap.mjs +24 -11
- package/src/cli/commands/seed.mjs +3 -1
- package/src/cli/commands/state.mjs +9 -3
- package/src/cli/commands/statusline.mjs +5 -1
- package/src/cli/commands/task.mjs +135 -23
- package/src/cli/commands/worktree.mjs +298 -81
- package/src/cli/config/post-merge-sweep.mjs +3 -2
- package/src/cli/config/share-policy.mjs +16 -3
- package/src/cli/config/upgrade-gitignore.mjs +27 -5
- package/src/cli/consistency/parse-qa.mjs +11 -1
- package/src/cli/consistency/parse-review.mjs +36 -0
- package/src/cli/consistency/parse-spec.mjs +43 -0
- package/src/cli/coordination/agent-identity.mjs +6 -4
- package/src/cli/dispatch.mjs +4 -0
- package/src/cli/followups/derive.mjs +123 -0
- package/src/cli/followups/schema.mjs +264 -0
- package/src/cli/gate/gates/followups-adjudicated.mjs +158 -0
- package/src/cli/gate/gates/index.mjs +1 -0
- package/src/cli/git/materialize-env.mjs +212 -0
- package/src/cli/help.mjs +9 -1
- package/src/cli/install/legacy-paths.mjs +4 -0
- package/src/cli/roadmap/lifecycle.mjs +4 -1
- package/src/cli/task/ids.mjs +9 -0
- package/src/cli/task/index-md.mjs +12 -4
- package/src/cli/util/io.mjs +15 -1
- package/src/cli/util/project.mjs +11 -14
- package/src/cli/util/state-paths.mjs +45 -0
- package/prompts/followup_planner.md +0 -399
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seed.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/seed.mjs"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"seed.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/seed.mjs"],"names":[],"mappings":"AA4GA,sHAuZC"}
|
|
@@ -29,6 +29,7 @@ import { updateTeamMember } from '../team/team.mjs';
|
|
|
29
29
|
import { parseFlags } from '../util/args.mjs';
|
|
30
30
|
import { withFileLock } from '../util/fs-lock.mjs';
|
|
31
31
|
import { err, exitWith, ok } from '../util/result.mjs';
|
|
32
|
+
import { resolveMainRepoRoot } from '../util/state-paths.mjs';
|
|
32
33
|
/**
|
|
33
34
|
* Run validateSeeds against the current on-disk state.
|
|
34
35
|
* Returns { ok, drift } — same shape as validateSeeds().
|
|
@@ -53,7 +54,8 @@ function runValidation(targetDir) {
|
|
|
53
54
|
*/
|
|
54
55
|
function gatherSeedTasks(targetDir, refs) {
|
|
55
56
|
const out = { active: 0, completed: 0, total: 0, tasks: [] };
|
|
56
|
-
|
|
57
|
+
// state-fork-fix: ephemeral state read resolves to the main board.
|
|
58
|
+
const statePath = join(resolveMainRepoRoot(targetDir), '.aperant', 'state.json');
|
|
57
59
|
if (!existsSync(statePath))
|
|
58
60
|
return out;
|
|
59
61
|
let state;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seed.mjs","sourceRoot":"","sources":["../../../src/cli/commands/seed.mjs"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"seed.mjs","sourceRoot":"","sources":["../../../src/cli/commands/seed.mjs"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/state.mjs"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"state.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/state.mjs"],"names":[],"mappings":"AAqCA,sFAyDC;AAED,0GAuBC;AAED,0HAwBC;AAED,uGAgDC;AAED,0GA4DC"}
|
|
@@ -15,6 +15,7 @@ import { parseFlags } from '../util/args.mjs';
|
|
|
15
15
|
import { withFileLock } from '../util/fs-lock.mjs';
|
|
16
16
|
import { atomicWriteJson } from '../util/io.mjs';
|
|
17
17
|
import { err, exitWith, ok } from '../util/result.mjs';
|
|
18
|
+
import { resolveMainRepoRoot } from '../util/state-paths.mjs';
|
|
18
19
|
/**
|
|
19
20
|
* Emit a human-readable preview to stderr when stdout is a TTY. Never throws;
|
|
20
21
|
* downstream consumers can always redirect stderr (`2>/dev/null`) when they
|
|
@@ -39,7 +40,10 @@ export function cmdState(projectDir) {
|
|
|
39
40
|
return err('Usage: apt-tools state <project-dir>');
|
|
40
41
|
const targetDir = resolve(projectDir);
|
|
41
42
|
const aperantDir = join(targetDir, '.aperant');
|
|
42
|
-
|
|
43
|
+
// state-fork-fix: state.json is EPHEMERAL — resolve to the main board so
|
|
44
|
+
// `state .` from a worktree reads the authoritative board (the primary fork
|
|
45
|
+
// victim). config.json is COMMITTABLE — it stays worktree-local on aperantDir.
|
|
46
|
+
const statePath = join(resolveMainRepoRoot(projectDir), '.aperant', 'state.json');
|
|
43
47
|
const configPath = join(aperantDir, 'config.json');
|
|
44
48
|
if (!existsSync(aperantDir)) {
|
|
45
49
|
return ok({
|
|
@@ -134,7 +138,9 @@ export function cmdStateUpdate(projectDir, args) {
|
|
|
134
138
|
if (!projectDir)
|
|
135
139
|
return err('Usage: apt-tools state-update <project-dir> --field <path> --value <json>');
|
|
136
140
|
const targetDir = resolve(projectDir);
|
|
137
|
-
|
|
141
|
+
// state-fork-fix: ephemeral state-update resolves + locks against the main board.
|
|
142
|
+
const stateRoot = resolveMainRepoRoot(projectDir);
|
|
143
|
+
const statePath = join(stateRoot, '.aperant', 'state.json');
|
|
138
144
|
if (!existsSync(statePath))
|
|
139
145
|
return err('No .aperant/state.json found.');
|
|
140
146
|
const fieldIdx = args.indexOf('--field');
|
|
@@ -165,7 +171,7 @@ export function cmdStateUpdate(projectDir, args) {
|
|
|
165
171
|
// Always update last_activity
|
|
166
172
|
state.last_activity = new Date().toISOString();
|
|
167
173
|
atomicWriteJson(statePath, state);
|
|
168
|
-
}, { projectRoot:
|
|
174
|
+
}, { projectRoot: stateRoot });
|
|
169
175
|
return ok({ status: 'ok', command: 'state-update', field, value, projectDir: targetDir });
|
|
170
176
|
}
|
|
171
177
|
export function cmdStateArtifacts(projectDir, args) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.mjs","sourceRoot":"","sources":["../../../src/cli/commands/state.mjs"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AACtE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"state.mjs","sourceRoot":"","sources":["../../../src/cli/commands/state.mjs"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"statusline.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/statusline.mjs"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"statusline.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/statusline.mjs"],"names":[],"mappings":"AAkIA,8JA4GC"}
|
|
@@ -21,6 +21,7 @@ import { formatUpdateChips, readUpdateCache } from '../install/update-chips.mjs'
|
|
|
21
21
|
import { statusLine, supportsColor } from '../output-style/index.mjs';
|
|
22
22
|
import { parseFlags } from '../util/args.mjs';
|
|
23
23
|
import { err, ok, rawText } from '../util/result.mjs';
|
|
24
|
+
import { resolveMainRepoRoot } from '../util/state-paths.mjs';
|
|
24
25
|
/**
|
|
25
26
|
* Normalize `active_tasks` from state.json across the legacy (single object)
|
|
26
27
|
* and modern (map) shapes. Mirrors commands/state.mjs lines 34-41.
|
|
@@ -142,7 +143,10 @@ export function cmdStatusline(projectDir, extraArgs = []) {
|
|
|
142
143
|
stream: process.stdout,
|
|
143
144
|
});
|
|
144
145
|
const aperantDir = join(targetDir, '.aperant');
|
|
145
|
-
|
|
146
|
+
// state-fork-fix: state.json is EPHEMERAL — resolve to the main board (aligns
|
|
147
|
+
// with the createCoordinationStore redirect below). The local aperantDir is
|
|
148
|
+
// kept only for the not-initialized existence check.
|
|
149
|
+
const statePath = join(resolveMainRepoRoot(targetDir), '.aperant', 'state.json');
|
|
146
150
|
// Read SessionStart worker cache once — chips prepend onto every render
|
|
147
151
|
// path (initialized or not).
|
|
148
152
|
const updateCache = readUpdateCache();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"statusline.mjs","sourceRoot":"","sources":["../../../src/cli/commands/statusline.mjs"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AACnE,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAChF,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"statusline.mjs","sourceRoot":"","sources":["../../../src/cli/commands/statusline.mjs"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AACnE,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAChF,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAE7D;;;GAGG;AACH,SAAS,oBAAoB,CAAC,KAAK;IAClC,IAAI,KAAK,EAAE,YAAY,IAAI,OAAO,KAAK,CAAC,YAAY,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC,YAAY,CAAA;IAC5F,IAAI,KAAK,EAAE,WAAW,EAAE,CAAC;QACxB,MAAM,EAAE,GAAG,KAAK,CAAC,WAAW,CAAC,EAAE,IAAI,aAAa,CAAA;QAChD,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,WAAW,EAAE,CAAA;IACnC,CAAC;IACD,OAAO,EAAE,CAAA;AACV,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAS,iBAAiB,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE;IAChD,MAAM,QAAQ,GAAG,UAAU,CAAA;IAC3B,MAAM,WAAW,GAAG,UAAU,CAAA;IAC9B,MAAM,UAAU,GAAG,SAAS,CAAA;IAC5B,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IAE3E,MAAM,OAAO,GAAG,EAAE,CAAA;IAClB,MAAM,MAAM,GAAG,EAAE,CAAA;IACjB,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;QAC5C,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ;YAAE,SAAQ;QACzC,IAAI,CAAC,CAAC,cAAc,KAAK,SAAS,IAAI,CAAC,CAAC,cAAc,KAAK,QAAQ;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACpF,IAAI,CAAC,CAAC,cAAc,KAAK,QAAQ;YAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAClD,CAAC;IAED,MAAM,KAAK,GAAG,EAAE,CAAA;IAChB,MAAM,OAAO,GAAG;QACf,OAAO,EAAE,OAAO,CAAC,MAAM;QACvB,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,gBAAgB,EAAE,IAAI;KACtB,CAAA;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;QACpB,MAAM,GAAG,GACR,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC;YACrE,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACzB,CAAC,CAAC,SAAS,CAAA;QACb,OAAO,CAAC,gBAAgB,GAAG,GAAG,CAAA;QAC9B,IAAI,OAAO,GAAG,CAAC,CAAA;QACf,IAAI,CAAC,CAAC,kBAAkB,EAAE,CAAC;YAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAA;YAChD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;gBAAE,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;QAC7F,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,GAAG,KAAK,OAAO,GAAG,CAAC,CAAC,CAAA;IACjE,CAAC;SAAM,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,kBAAkB,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAA;YAC7D,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,kBAAkB,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAA;YAC7D,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACxB,CAAC,CAAC,CAAA;QACF,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,IAAI,MAAM,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtF,OAAO,CAAC,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAA;QACxD,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,OAAO,CAAC,MAAM,SAAS,CAAC,CAAC,CAAA;IACtE,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAA;IAC7C,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAA;AAC1B,CAAC;AAED;;;GAGG;AACH,SAAS,gBAAgB,CAAC,WAAW;IACpC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;IAC1C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAA;IACrC,MAAM,MAAM,GAAG,OAAO;SACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,CAAC;SACzC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACd,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,IAAI,CAAC,CAAA;QAC7D,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,IAAI,CAAC,CAAA;QAC7D,OAAO,EAAE,GAAG,EAAE,CAAA;IACf,CAAC,CAAC,CAAA;IACH,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,eAAe,IAAI,IAAI,CAAA;AAC1C,CAAC;AAED;;;;GAIG;AACH,SAAS,YAAY,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE;IAC3D,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS,IAAI,GAAG,CAAC,QAAQ,KAAK,EAAE;QAAE,OAAO,KAAK,CAAA;IACnE,IAAI,UAAU;QAAE,OAAO,KAAK,CAAA;IAC5B,IAAI,SAAS;QAAE,OAAO,IAAI,CAAA;IAC1B,OAAO,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;AACtC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,UAAU,EAAE,SAAS,GAAG,EAAE;IACvD,IAAI,CAAC,UAAU;QAAE,OAAO,GAAG,CAAC,mEAAmE,CAAC,CAAA;IAChG,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;IACrC,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,CAAA;IACnC,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAChC,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACnC,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAErC,MAAM,KAAK,GAAG,YAAY,CAAC;QAC1B,SAAS;QACT,UAAU;QACV,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,MAAM,EAAE,OAAO,CAAC,MAAM;KACtB,CAAC,CAAA;IAEF,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;IAC9C,8EAA8E;IAC9E,4EAA4E;IAC5E,qDAAqD;IACrD,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;IAEhF,wEAAwE;IACxE,6BAA6B;IAC7B,MAAM,WAAW,GAAG,eAAe,EAAE,CAAA;IACrC,MAAM,KAAK,GAAG,iBAAiB,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;IACvD,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;IAElE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,UAAU,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;QAC1C,MAAM,IAAI,GAAG,UAAU,GAAG,QAAQ,CAAA;QAClC,IAAI,MAAM,EAAE,CAAC;YACZ,OAAO,EAAE,CAAC;gBACT,MAAM,EAAE,iBAAiB;gBACzB,OAAO,EAAE,YAAY;gBACrB,UAAU,EAAE,SAAS;gBACrB,IAAI;gBACJ,IAAI,EAAE;oBACL,iBAAiB,EAAE,CAAC;oBACpB,eAAe,EAAE,CAAC;oBAClB,aAAa,EAAE,IAAI;oBACnB,UAAU,EAAE,CAAC;oBACb,aAAa,EAAE,IAAI;iBACnB;gBACD,aAAa,EAAE,WAAW;gBAC1B,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACpC,CAAC,CAAA;QACH,CAAC;QACD,OAAO,OAAO,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC,CAAA;IAC/B,CAAC;IAED,IAAI,KAAK,GAAG,IAAI,CAAA;IAChB,IAAI,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,IAAI,CAAC;YACJ,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAA;QACrD,CAAC;QAAC,MAAM,CAAC;YACR,KAAK,GAAG,IAAI,CAAA;QACb,CAAC;IACF,CAAC;IAED,MAAM,WAAW,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,CAAA;IACzD,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;IAChG,MAAM,aAAa,GAAG,KAAK,EAAE,aAAa,IAAI,IAAI,CAAA;IAClD,MAAM,aAAa,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAA;IAEnD,yEAAyE;IACzE,2EAA2E;IAC3E,IAAI,UAAU,GAAG,CAAC,CAAA;IAClB,IAAI,CAAC;QACJ,MAAM,KAAK,GAAG,uBAAuB,CAAC,SAAS,CAAC,CAAA;QAChD,MAAM,OAAO,GAAG,KAAK,CAAC,cAAc,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAA;QAC7D,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;IACzD,CAAC;IAAC,MAAM,CAAC;QACR,UAAU,GAAG,CAAC,CAAA;IACf,CAAC;IAED,yEAAyE;IACzE,6CAA6C;IAC7C,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;IACpE,MAAM,iBAAiB,GACtB,kBAAkB,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;IAEtF,MAAM,QAAQ,GAAG,UAAU,CAC1B,EAAE,YAAY,EAAE,iBAAiB,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,EAC7E,EAAE,KAAK,EAAE,CACT,CAAA;IACD,MAAM,IAAI,GAAG,iBAAiB,GAAG,UAAU,GAAG,QAAQ,CAAA;IAEtD,IAAI,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,CAAC;YACT,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE,YAAY;YACrB,UAAU,EAAE,SAAS;YACrB,IAAI;YACJ,IAAI,EAAE;gBACL,iBAAiB;gBACjB,eAAe;gBACf,aAAa;gBACb,UAAU;gBACV,aAAa;gBACb,sBAAsB,EAAE,kBAAkB,CAAC,OAAO;aAClD;YACD,aAAa,EAAE,WAAW;YAC1B,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CAAC,CAAA;IACH,CAAC;IAED,OAAO,OAAO,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC,CAAA;AAC/B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/task.mjs"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"task.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/task.mjs"],"names":[],"mappings":"AAkDA,6HA8xDC"}
|
|
@@ -16,6 +16,7 @@ import { join, resolve } from 'node:path';
|
|
|
16
16
|
import { getTaskIsolationConfig, loadMergedProjectConfig, loadProjectConfig, } from '../config/load.mjs';
|
|
17
17
|
import { findMostRecentEventForTask } from '../coordination/event-log.mjs';
|
|
18
18
|
import { createCoordinationStore } from '../coordination/store.mjs';
|
|
19
|
+
import { listBlockingRowsForClose, parseFollowups } from '../followups/schema.mjs';
|
|
19
20
|
import { getGitIdentity } from '../git/identity.mjs';
|
|
20
21
|
import { detectWorktree } from '../git/worktree-detect.mjs';
|
|
21
22
|
import { buildDependsOnMap, collectBlockedByTaskIds, detectDependsOnCycle, } from '../graph/depends-on.mjs';
|
|
@@ -35,6 +36,7 @@ import { parseDuration } from '../util/duration.mjs';
|
|
|
35
36
|
import { withFileLock } from '../util/fs-lock.mjs';
|
|
36
37
|
import { atomicWriteJson } from '../util/io.mjs';
|
|
37
38
|
import { err, exitWith, ok } from '../util/result.mjs';
|
|
39
|
+
import { resolveMainRepoRoot } from '../util/state-paths.mjs';
|
|
38
40
|
import { cmdCiWatch } from './ci-watch.mjs';
|
|
39
41
|
export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
40
42
|
if (!subcommand)
|
|
@@ -42,7 +44,14 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
42
44
|
if (!projectDir)
|
|
43
45
|
return err(`Usage: apt-tools task ${subcommand} <project-dir> [flags]`);
|
|
44
46
|
const targetDir = resolve(projectDir);
|
|
45
|
-
|
|
47
|
+
// state-fork-fix ID-01/ID-04: ephemeral state (state.json + tasks/) resolves
|
|
48
|
+
// to the MAIN repo from any worktree cwd, so the task board never forks into
|
|
49
|
+
// a worktree's gitignored .aperant/. task.mjs touches ONLY ephemeral state
|
|
50
|
+
// (the mechanical exception in ID-01), so threading one stateRoot is correct.
|
|
51
|
+
// Committable roadmap path-builds in this file (the milestones.json reads)
|
|
52
|
+
// deliberately stay on the raw targetDir — they MUST ride the task branch.
|
|
53
|
+
const stateRoot = resolveMainRepoRoot(projectDir);
|
|
54
|
+
const statePath = join(stateRoot, '.aperant', 'state.json');
|
|
46
55
|
const flags = parseFlags(extraArgs);
|
|
47
56
|
// R8 — @internal CoordinationStore seam. V1 is a thin wrapper over the
|
|
48
57
|
// existing filesystem helpers so behavior is unchanged; subtask 4 (R10)
|
|
@@ -151,8 +160,8 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
151
160
|
// but allows `.` and `..` as valid characters. A lone `..` id would
|
|
152
161
|
// escape via getTaskDir's join: `tasks/..` resolves to `.aperant/`.
|
|
153
162
|
if (explicitIdRaw) {
|
|
154
|
-
const tasksBase = resolve(join(
|
|
155
|
-
const candidateDir = resolve(getTaskDir(
|
|
163
|
+
const tasksBase = resolve(join(stateRoot, '.aperant', 'tasks'));
|
|
164
|
+
const candidateDir = resolve(getTaskDir(stateRoot, explicitIdRaw));
|
|
156
165
|
if (!candidateDir.startsWith(`${tasksBase}/`) && candidateDir !== tasksBase) {
|
|
157
166
|
return err('[apt-tools] Invalid task id: path escapes the tasks directory', 1, {
|
|
158
167
|
command: 'task-create',
|
|
@@ -192,7 +201,7 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
192
201
|
? state.completed_tasks.map((row) => row?.id).filter(Boolean)
|
|
193
202
|
: [];
|
|
194
203
|
const known = new Set([...activeIds, ...completedIds]);
|
|
195
|
-
const isTaken = (candidate) => known.has(candidate) || existsSync(getTaskDir(
|
|
204
|
+
const isTaken = (candidate) => known.has(candidate) || existsSync(getTaskDir(stateRoot, candidate));
|
|
196
205
|
let candidate = base;
|
|
197
206
|
let counter = 2;
|
|
198
207
|
while (isTaken(candidate)) {
|
|
@@ -207,7 +216,7 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
207
216
|
}
|
|
208
217
|
// Create task directory under the lock so a concurrent
|
|
209
218
|
// run can't observe (and then re-pick) a half-created id.
|
|
210
|
-
taskDir = getTaskDir(
|
|
219
|
+
taskDir = getTaskDir(stateRoot, taskId);
|
|
211
220
|
mkdirSync(taskDir, { recursive: true });
|
|
212
221
|
for (const subdir of ['events', 'locks']) {
|
|
213
222
|
mkdirSync(join(taskDir, subdir), { recursive: true });
|
|
@@ -267,6 +276,10 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
267
276
|
if (isolation.from_branch && isolation.from_branch !== 'current') {
|
|
268
277
|
wtArgs.push('--from', isolation.from_branch);
|
|
269
278
|
}
|
|
279
|
+
// state-fork-fix ID-09b: forward the task's effective autonomy
|
|
280
|
+
// so `worktree create` can pick the 0-1 confirm vs. 2-3 log
|
|
281
|
+
// branch for a non-default `from_branch: current` base.
|
|
282
|
+
wtArgs.push('--autonomy', String(autonomy));
|
|
270
283
|
// Invoke inline so we capture the structured payload
|
|
271
284
|
// without shelling back out. We cheat by calling the
|
|
272
285
|
// worktree creator directly as a subprocess to keep
|
|
@@ -278,6 +291,19 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
278
291
|
const createRes = spawnSync(process.execPath, [aptToolsBin, 'worktree', 'create', targetDir, ...wtArgs], { encoding: 'utf-8' });
|
|
279
292
|
if (createRes.status === 0 && createRes.stdout) {
|
|
280
293
|
const wtOut = JSON.parse(createRes.stdout);
|
|
294
|
+
// state-fork-fix ID-09b: a requires_input non-default-base
|
|
295
|
+
// return (autonomy <= 1) is NOT a created worktree — degrade
|
|
296
|
+
// it to a worktree_warning so task-create still SUCCEEDS
|
|
297
|
+
// (task created, worktree deferred) instead of recording a
|
|
298
|
+
// bogus undefined worktree_path. The operator re-runs
|
|
299
|
+
// `worktree create` with an explicit --from.
|
|
300
|
+
if (wtOut.status === 'requires_input' || wtOut.reason === 'non_default_base') {
|
|
301
|
+
state.active_tasks[taskId].worktree_warning =
|
|
302
|
+
`worktree deferred: non-default base — re-run worktree create with explicit --from (base would be '${wtOut.base_branch}', default '${wtOut.default_branch}')`;
|
|
303
|
+
state.last_activity = new Date().toISOString();
|
|
304
|
+
atomicWriteJson(statePath, state);
|
|
305
|
+
return;
|
|
306
|
+
}
|
|
281
307
|
state.active_tasks[taskId].worktree_path = wtOut.worktree_path;
|
|
282
308
|
state.active_tasks[taskId].branch = wtOut.branch;
|
|
283
309
|
state.active_tasks[taskId].base_branch = wtOut.base_branch;
|
|
@@ -338,10 +364,10 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
338
364
|
}
|
|
339
365
|
state.last_activity = new Date().toISOString();
|
|
340
366
|
atomicWriteJson(statePath, state);
|
|
341
|
-
}, { projectRoot:
|
|
367
|
+
}, { projectRoot: stateRoot });
|
|
342
368
|
if (collisionOverflowErr)
|
|
343
369
|
return collisionOverflowErr;
|
|
344
|
-
regenerateTaskIndex(
|
|
370
|
+
regenerateTaskIndex(stateRoot);
|
|
345
371
|
// Team collaboration: register user + add to active board
|
|
346
372
|
updateTeamMember(targetDir);
|
|
347
373
|
store.upsertTeamStatus(taskId, {
|
|
@@ -473,14 +499,14 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
473
499
|
freshState.last_activity = new Date().toISOString();
|
|
474
500
|
atomicWriteJson(statePath, freshState);
|
|
475
501
|
}
|
|
476
|
-
}, { projectRoot:
|
|
502
|
+
}, { projectRoot: stateRoot });
|
|
477
503
|
}
|
|
478
504
|
catch {
|
|
479
505
|
/* best-effort — the in-memory `task` is already rewritten */
|
|
480
506
|
}
|
|
481
507
|
}
|
|
482
508
|
}
|
|
483
|
-
const taskDir = getTaskDir(
|
|
509
|
+
const taskDir = getTaskDir(stateRoot, taskId);
|
|
484
510
|
const hasSpec = existsSync(join(taskDir, 'spec.md'));
|
|
485
511
|
const hasPlan = existsSync(join(taskDir, 'implementation_plan.json'));
|
|
486
512
|
const hasProgress = existsSync(join(taskDir, 'build-progress.json'));
|
|
@@ -502,6 +528,15 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
502
528
|
// computeWorktreeCleanup so cleanup skips local merge-back and
|
|
503
529
|
// runs fetch + ff-only instead.
|
|
504
530
|
const prMerged = flags.has('pr-merged-remotely');
|
|
531
|
+
// G45 — followups disposition gate. `--force --reason "<text>"`
|
|
532
|
+
// bypasses it with an audit event (G42 Phase 1 pattern). Reject
|
|
533
|
+
// --force without --reason, mirroring gate.mjs:88.
|
|
534
|
+
const closeForce = flags.get('force') === true;
|
|
535
|
+
const closeReasonRaw = flags.get('reason');
|
|
536
|
+
const closeReason = typeof closeReasonRaw === 'string' ? closeReasonRaw : null;
|
|
537
|
+
if (closeForce && !closeReason) {
|
|
538
|
+
return err('--force requires --reason "<explanation>" (the override is logged to the audit trail)');
|
|
539
|
+
}
|
|
505
540
|
if (!existsSync(statePath))
|
|
506
541
|
return err('No state.json found');
|
|
507
542
|
// withFileLock callback can produce either an error envelope (early
|
|
@@ -510,20 +545,85 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
510
545
|
let closeError = null;
|
|
511
546
|
withFileLock(statePath, () => {
|
|
512
547
|
const state = JSON.parse(readFileSync(statePath, 'utf-8'));
|
|
513
|
-
//
|
|
548
|
+
// Locate the task WITHOUT mutating yet — the G45 disposition
|
|
549
|
+
// gate (below) must run before any state mutation so a refused
|
|
550
|
+
// close leaves active_tasks intact.
|
|
514
551
|
let task = null;
|
|
552
|
+
let taskInActiveMap = false;
|
|
515
553
|
if (state.active_tasks?.[taskId]) {
|
|
516
554
|
task = state.active_tasks[taskId];
|
|
517
|
-
|
|
555
|
+
taskInActiveMap = true;
|
|
518
556
|
}
|
|
519
557
|
else if (state.active_task?.id === taskId) {
|
|
520
558
|
task = state.active_task;
|
|
521
|
-
state.active_task = null;
|
|
522
559
|
}
|
|
523
560
|
if (!task) {
|
|
524
561
|
closeError = err(`Task "${taskId}" not found in active tasks`);
|
|
525
562
|
return;
|
|
526
563
|
}
|
|
564
|
+
// G45 — followups disposition gate (ID-06 / ID-13). Runs at the
|
|
565
|
+
// TOP of the lock, before any state mutation, so close-merged
|
|
566
|
+
// (:1476 spawns `task close`) + the passive sweep inherit it.
|
|
567
|
+
// Skipped for verdict 'rejected' (abandoned work has moot
|
|
568
|
+
// follow-ups). Absent/malformed followups.json → no gating
|
|
569
|
+
// (byte-identical close; malformed is `followups check`'s
|
|
570
|
+
// problem, not close's). `--force --reason` bypasses with an
|
|
571
|
+
// audited task.close.followups-override event.
|
|
572
|
+
if (verdict !== 'rejected') {
|
|
573
|
+
const followupsPath = join(getTaskDir(stateRoot, taskId), 'followups.json');
|
|
574
|
+
let ledgerDoc = null;
|
|
575
|
+
if (existsSync(followupsPath)) {
|
|
576
|
+
try {
|
|
577
|
+
ledgerDoc = JSON.parse(readFileSync(followupsPath, 'utf-8'));
|
|
578
|
+
}
|
|
579
|
+
catch {
|
|
580
|
+
ledgerDoc = null; // malformed → no gating
|
|
581
|
+
}
|
|
582
|
+
}
|
|
583
|
+
if (ledgerDoc !== null) {
|
|
584
|
+
const parsed = parseFollowups(ledgerDoc);
|
|
585
|
+
const blocking = listBlockingRowsForClose(parsed);
|
|
586
|
+
if (blocking.length > 0) {
|
|
587
|
+
const blockingSummary = blocking.map((r) => ({
|
|
588
|
+
id: r.id,
|
|
589
|
+
title: r.title ?? null,
|
|
590
|
+
status: r.status,
|
|
591
|
+
verdict: r.adjudication?.verdict ?? 'unadjudicated',
|
|
592
|
+
disposition_kind: r.disposition?.kind ?? null,
|
|
593
|
+
}));
|
|
594
|
+
if (!closeForce) {
|
|
595
|
+
closeError = err(`Task "${taskId}" has ${blocking.length} open follow-up row(s) without a durable disposition — disposition them (\`apt-tools followups disposition\`) or re-run with --force --reason "<text>"`, 1, {
|
|
596
|
+
command: 'task-close',
|
|
597
|
+
task_id: taskId,
|
|
598
|
+
blocking_followups: blockingSummary,
|
|
599
|
+
});
|
|
600
|
+
return;
|
|
601
|
+
}
|
|
602
|
+
// Forced bypass — audit the override. `appendEvent` is
|
|
603
|
+
// best-effort (it swallows I/O errors so a full disk
|
|
604
|
+
// can't block a lifecycle transition). For this
|
|
605
|
+
// accountability event specifically, surface a stderr
|
|
606
|
+
// warning when the write does not land so the bypass
|
|
607
|
+
// is never SILENTLY unaudited — without re-introducing
|
|
608
|
+
// a hard block on the close.
|
|
609
|
+
const auditLogged = store.appendEvent({
|
|
610
|
+
op: 'task.close.followups-override',
|
|
611
|
+
task: taskId,
|
|
612
|
+
data: { rows: blockingSummary, reason: closeReason },
|
|
613
|
+
});
|
|
614
|
+
if (!auditLogged) {
|
|
615
|
+
process.stderr.write(`[task-close] WARNING: forced followups override for "${taskId}" could not be written to the audit log — the bypass proceeded UNAUDITED.\n`);
|
|
616
|
+
}
|
|
617
|
+
}
|
|
618
|
+
}
|
|
619
|
+
}
|
|
620
|
+
// Gate passed (or bypassed) — now mutate.
|
|
621
|
+
if (taskInActiveMap) {
|
|
622
|
+
delete state.active_tasks[taskId];
|
|
623
|
+
}
|
|
624
|
+
else {
|
|
625
|
+
state.active_task = null;
|
|
626
|
+
}
|
|
527
627
|
if (!state.completed_tasks)
|
|
528
628
|
state.completed_tasks = [];
|
|
529
629
|
// C28 — preserve scope + lifecycle_phase on the completed row so
|
|
@@ -540,7 +640,7 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
540
640
|
});
|
|
541
641
|
state.last_activity = new Date().toISOString();
|
|
542
642
|
atomicWriteJson(statePath, state);
|
|
543
|
-
regenerateTaskIndex(
|
|
643
|
+
regenerateTaskIndex(stateRoot);
|
|
544
644
|
// Team collaboration: remove from active board
|
|
545
645
|
updateTeamMember(targetDir);
|
|
546
646
|
store.removeTeamStatus(taskId);
|
|
@@ -682,7 +782,7 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
682
782
|
}
|
|
683
783
|
}
|
|
684
784
|
closeResult = ok(closeOut);
|
|
685
|
-
}, { projectRoot:
|
|
785
|
+
}, { projectRoot: stateRoot });
|
|
686
786
|
return closeError ?? closeResult;
|
|
687
787
|
}
|
|
688
788
|
case 'update': {
|
|
@@ -969,7 +1069,7 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
969
1069
|
ciWatchResult = armCiWatchAfterPrUrl(targetDir, task, prUrlForCiWatch);
|
|
970
1070
|
}
|
|
971
1071
|
}
|
|
972
|
-
regenerateTaskIndex(
|
|
1072
|
+
regenerateTaskIndex(stateRoot);
|
|
973
1073
|
// Team collaboration: sync active board with updated state
|
|
974
1074
|
updateTeamMember(targetDir);
|
|
975
1075
|
const progressFraction = task.progress.subtasks_total > 0
|
|
@@ -997,7 +1097,7 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
997
1097
|
updateOut.scheduler_handle = ciWatchResult.scheduler_handle ?? null;
|
|
998
1098
|
}
|
|
999
1099
|
updateResult = ok(updateOut);
|
|
1000
|
-
}, { projectRoot:
|
|
1100
|
+
}, { projectRoot: stateRoot });
|
|
1001
1101
|
return updateError ?? updateResult;
|
|
1002
1102
|
}
|
|
1003
1103
|
case 'move': {
|
|
@@ -1119,7 +1219,7 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
1119
1219
|
task.roadmap_ref_url = to.roadmap_ref_url;
|
|
1120
1220
|
state.last_activity = new Date().toISOString();
|
|
1121
1221
|
atomicWriteJson(statePath, state);
|
|
1122
|
-
regenerateTaskIndex(
|
|
1222
|
+
regenerateTaskIndex(stateRoot);
|
|
1123
1223
|
updateTeamMember(targetDir);
|
|
1124
1224
|
store.upsertTeamStatus(taskId, {
|
|
1125
1225
|
description: task.description,
|
|
@@ -1134,7 +1234,7 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
1134
1234
|
to,
|
|
1135
1235
|
task,
|
|
1136
1236
|
});
|
|
1137
|
-
}, { projectRoot:
|
|
1237
|
+
}, { projectRoot: stateRoot });
|
|
1138
1238
|
return moveError ?? moveResult;
|
|
1139
1239
|
}
|
|
1140
1240
|
case 'complete-subtask': {
|
|
@@ -1153,7 +1253,10 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
1153
1253
|
const notes = flags.get('notes') || null;
|
|
1154
1254
|
try {
|
|
1155
1255
|
const result = completeSubtask({
|
|
1156
|
-
|
|
1256
|
+
// state-fork-fix: tasks/<id>/ (plan + build-progress.json) is
|
|
1257
|
+
// EPHEMERAL — resolve to the main board so a complete-subtask
|
|
1258
|
+
// issued from a worktree updates the one authoritative task dir.
|
|
1259
|
+
projectDir: stateRoot,
|
|
1157
1260
|
taskId,
|
|
1158
1261
|
subtaskId: subtaskIdFlag,
|
|
1159
1262
|
commit,
|
|
@@ -1335,7 +1438,7 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
1335
1438
|
if (!live || live.pr_url !== task.pr_url) {
|
|
1336
1439
|
prUrlMutated = true;
|
|
1337
1440
|
}
|
|
1338
|
-
}, { projectRoot:
|
|
1441
|
+
}, { projectRoot: stateRoot });
|
|
1339
1442
|
}
|
|
1340
1443
|
}
|
|
1341
1444
|
catch {
|
|
@@ -1461,7 +1564,7 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
1461
1564
|
pr_number: parsed.number ?? null,
|
|
1462
1565
|
});
|
|
1463
1566
|
atomicWriteJson(statePath, fresh);
|
|
1464
|
-
}, { projectRoot:
|
|
1567
|
+
}, { projectRoot: stateRoot });
|
|
1465
1568
|
}
|
|
1466
1569
|
catch (e) {
|
|
1467
1570
|
errors.push({
|
|
@@ -1510,7 +1613,7 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
1510
1613
|
atomicWriteJson(statePath, state);
|
|
1511
1614
|
}
|
|
1512
1615
|
remaining = ledger.length;
|
|
1513
|
-
}, { projectRoot:
|
|
1616
|
+
}, { projectRoot: stateRoot });
|
|
1514
1617
|
return ok({
|
|
1515
1618
|
status: 'ok',
|
|
1516
1619
|
command: 'task-narration-drain',
|
|
@@ -1572,7 +1675,7 @@ export function cmdTask(subcommand, projectDir, extraArgs) {
|
|
|
1572
1675
|
skipped.push({ id: row.id, reason: 'worktree-active' });
|
|
1573
1676
|
continue;
|
|
1574
1677
|
}
|
|
1575
|
-
const taskDir = getTaskDir(
|
|
1678
|
+
const taskDir = getTaskDir(stateRoot, row.id);
|
|
1576
1679
|
if (!existsSync(taskDir)) {
|
|
1577
1680
|
skipped.push({ id: row.id, reason: 'dir-missing' });
|
|
1578
1681
|
continue;
|