perttool 0.12.1 → 0.12.3
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 +22 -1
- package/README.md +5 -5
- package/dist/application/target-actuals-mutation.d.ts.map +1 -1
- package/dist/application/target-actuals-mutation.js +6 -9
- package/dist/application/target-actuals-mutation.js.map +1 -1
- package/dist/cli.js +11 -3
- package/dist/cli.js.map +1 -1
- package/dist/milestone-acceptance/migration.d.ts +1 -0
- package/dist/milestone-acceptance/migration.d.ts.map +1 -1
- package/dist/milestone-acceptance/migration.js +1 -0
- package/dist/milestone-acceptance/migration.js.map +1 -1
- package/dist/semantic/validator.d.ts.map +1 -1
- package/dist/semantic/validator.js +0 -27
- package/dist/semantic/validator.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,26 @@ This project records its notable changes here. The format is based on [Keep a Ch
|
|
|
4
4
|
|
|
5
5
|
## [Unreleased]
|
|
6
6
|
|
|
7
|
+
## [0.12.3] - 2026-10-29
|
|
8
|
+
|
|
9
|
+
### Fixed
|
|
10
|
+
|
|
11
|
+
- Bind Grammar 7 migration proof to committed HEAD source bytes and report
|
|
12
|
+
final safe-write races as PTMAC-110 with exit 5.
|
|
13
|
+
- Accept VS Code uninstall by independent file-backed inventory readback,
|
|
14
|
+
without parsing localized success output. Retain process errors as warnings
|
|
15
|
+
only when inventory confirms removal; missing or invalid readback fails.
|
|
16
|
+
|
|
17
|
+
## [0.12.2] - 2026-10-22
|
|
18
|
+
|
|
19
|
+
### Fixed
|
|
20
|
+
|
|
21
|
+
- Allow supported remaining-duration and three-point estimate updates after
|
|
22
|
+
task start while retaining the first-start planned baseline. Match identical
|
|
23
|
+
start retries against stored event evidence instead of recalculating the
|
|
24
|
+
baseline from the current residual estimate. Preserve malformed-event,
|
|
25
|
+
lifecycle, same-ID payload conflict and exact unit-conversion safeguards.
|
|
26
|
+
|
|
7
27
|
## [0.12.1] - 2026-10-19
|
|
8
28
|
|
|
9
29
|
### Fixed
|
|
@@ -693,7 +713,8 @@ First public development preview. Intended to evaluate the DSL and CLI, read-onl
|
|
|
693
713
|
- Not published to the npm registry; use the GitHub Release asset
|
|
694
714
|
- Requires Node.js 24 or later
|
|
695
715
|
|
|
696
|
-
[Unreleased]: https://github.com/mako10k/perttool/compare/v0.12.
|
|
716
|
+
[Unreleased]: https://github.com/mako10k/perttool/compare/v0.12.2...HEAD
|
|
717
|
+
[0.12.2]: https://github.com/mako10k/perttool/compare/v0.12.1...v0.12.2
|
|
697
718
|
[0.12.1]: https://github.com/mako10k/perttool/compare/v0.12.0...v0.12.1
|
|
698
719
|
[0.12.0]: https://github.com/mako10k/perttool/compare/v0.11.1...v0.12.0
|
|
699
720
|
[0.11.1]: https://github.com/mako10k/perttool/compare/v0.11.0...v0.11.1
|
package/README.md
CHANGED
|
@@ -5,15 +5,15 @@ reviewable text files. It validates plans, calculates precedence and
|
|
|
5
5
|
resource-constrained schedules, recommends the next task, and previews every
|
|
6
6
|
change before writing it.
|
|
7
7
|
|
|
8
|
-
Registry snapshot on 2026-10-
|
|
9
|
-
`0.12.
|
|
8
|
+
Registry snapshot on 2026-10-29: npm `latest` identifies `0.12.1` and
|
|
9
|
+
`beta` identifies `0.12.2`; no `alpha` channel is present. Node.js 22 or later is required.
|
|
10
10
|
|
|
11
|
-
The `0.12.
|
|
11
|
+
The `0.12.3` package provides the compatible committed-source proof patch.
|
|
12
12
|
Grammar 10 and CLI Contract 11 remain unchanged. Existing Grammar 1 through 9
|
|
13
13
|
documents remain readable; Plan Review operations require explicit migration
|
|
14
|
-
to Grammar 10. Exact `0.12.
|
|
14
|
+
to Grammar 10. Exact `0.12.2` is the rollback pin for this patch.
|
|
15
15
|
See the [migration guide](docs/process/0.11.1-to-0.12.0-migration.md)
|
|
16
|
-
and [patch preparation](docs/process/0.12.
|
|
16
|
+
and [patch preparation](docs/process/0.12.3-release.md).
|
|
17
17
|
|
|
18
18
|
## Install
|
|
19
19
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"target-actuals-mutation.d.ts","sourceRoot":"","sources":["../../src/application/target-actuals-mutation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"target-actuals-mutation.d.ts","sourceRoot":"","sources":["../../src/application/target-actuals-mutation.ts"],"names":[],"mappings":"AAEA,OAAO,EAOL,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,iBAAiB,EAEtB,KAAK,kBAAkB,EACxB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,sBAAsB,CAAC;AAS9B,OAAO,KAAK,EACV,oBAAoB,EACpB,sBAAsB,EACvB,MAAM,wBAAwB,CAAC;AAuChC,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EACV,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,8BAA8B,CAAC;AAQtC,KAAK,uBAAuB,GACxB,wBAAwB,GACxB,wBAAwB,CAAC;AAqB7B,MAAM,WAAW,4BAA6B,SAAQ,eAAe;IACnE,QAAQ,CAAC,UAAU,CAAC,EAAE,sBAAsB,CAAC;CAC9C;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,EAAE,kBAAkB,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,WAAW,GAAG,MAAM,CAAC;IAClD,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC;IAChC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,eAAe,EAAE,aAAa,GAAG,YAAY,CAAC,CAAC;CAC3E;AAED,MAAM,MAAM,4BAA4B,GAAG,sBAAsB,GAAG;IAClE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,eAAe,EAAE,UAAU,GAAG,aAAa,CAAC,CAAC;CACzE,CAAC;AAEF,MAAM,WAAW,6BAA8B,SAAQ,cAAc;IACnE,QAAQ,CAAC,aAAa,EAAE,4BAA4B,CAAC;IACrD,QAAQ,CAAC,UAAU,EAAE,oBAAoB,GAAG,IAAI,CAAC;IACjD,QAAQ,CAAC,SAAS,EAAE,sBAAsB,GAAG,IAAI,CAAC;CACnD;AAoeD,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,iBAAiB,EAC3B,UAAU,EAAE,uBAAuB,EACnC,OAAO,GAAE,4BAAiC,GACzC,6BAA6B,CAqI/B;AAED,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,qBAAqB,EAC/B,UAAU,EAAE,uBAAuB,EACnC,OAAO,GAAE,4BAAiC,GACzC,6BAA6B,CAE/B"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
// R: Plan atomic lifecycle mutations and match retries against stored event evidence.
|
|
1
2
|
import { sha256DigestUtf8 } from "../model/sha256.js";
|
|
2
3
|
import { actualsDiagnostic, normalizeLifecycleMutationRequest, reduceTaskLifecycle, taskStatus, taskStatusSpan, validateStoredLifecycleState, } from "../actuals/lifecycle.js";
|
|
3
4
|
import { projectActualsSourceModel, workEventsForTask, } from "../actuals/source.js";
|
|
@@ -42,7 +43,7 @@ function failure(text, documentId, diagnostics, maximum, alreadyTruncated) {
|
|
|
42
43
|
diagnosticsTruncated: alreadyTruncated || limited.truncated,
|
|
43
44
|
});
|
|
44
45
|
}
|
|
45
|
-
function eventPayloadMatches(event, request
|
|
46
|
+
function eventPayloadMatches(event, request) {
|
|
46
47
|
const activeTime = event.activeTime === null
|
|
47
48
|
? null
|
|
48
49
|
: canonicalizeExactDurationSourceToken(event.activeTime.sourceText)?.token ??
|
|
@@ -53,15 +54,12 @@ function eventPayloadMatches(event, request, plannedValue) {
|
|
|
53
54
|
const eventKind = request.kind === "task.finish.actual"
|
|
54
55
|
? "finish"
|
|
55
56
|
: request.kind.slice("task.".length);
|
|
56
|
-
|
|
57
|
-
? null
|
|
58
|
-
: canonicalizeExactDurationSourceToken(event.plannedValue.sourceText)?.token ?? null;
|
|
57
|
+
// planned_value is generated only for a new start; it is not a request field.
|
|
59
58
|
return (event.model === 1 &&
|
|
60
59
|
event.taskId === request.taskId &&
|
|
61
60
|
event.kind === eventKind &&
|
|
62
61
|
canonicalizeEventDateTimeSourceToken(event.occurredAt.sourceText) ===
|
|
63
62
|
request.event.occurredAt &&
|
|
64
|
-
expectedPlannedValue === plannedValue &&
|
|
65
63
|
activeTime === (request.kind === "task.finish.actual"
|
|
66
64
|
? request.event.activeTime
|
|
67
65
|
: null) &&
|
|
@@ -182,13 +180,12 @@ function validateLifecycleSource(validated, request) {
|
|
|
182
180
|
};
|
|
183
181
|
}
|
|
184
182
|
const fromState = taskStatus(declaration);
|
|
185
|
-
const plannedValue = plannedValueForStart(validated, declaration, request);
|
|
186
183
|
const sameId = validated.document.declarations.find(({ id }) => id === request.event.id);
|
|
187
184
|
const model = projectActualsSourceModel(asGrammar5Actuals(validated));
|
|
188
185
|
if (sameId !== undefined) {
|
|
189
186
|
const existing = model.events.find(({ id }) => id === request.event.id);
|
|
190
187
|
if (existing === undefined ||
|
|
191
|
-
!eventPayloadMatches(existing, request
|
|
188
|
+
!eventPayloadMatches(existing, request)) {
|
|
192
189
|
return {
|
|
193
190
|
task: null,
|
|
194
191
|
fromState: null,
|
|
@@ -216,7 +213,7 @@ function validateLifecycleSource(validated, request) {
|
|
|
216
213
|
task: declaration,
|
|
217
214
|
fromState,
|
|
218
215
|
retryEvent: model.events.find(({ id }) => id === request.event.id),
|
|
219
|
-
plannedValue,
|
|
216
|
+
plannedValue: null,
|
|
220
217
|
diagnostics: Object.freeze([]),
|
|
221
218
|
};
|
|
222
219
|
}
|
|
@@ -293,7 +290,7 @@ function validateLifecycleSource(validated, request) {
|
|
|
293
290
|
task: declaration,
|
|
294
291
|
fromState,
|
|
295
292
|
retryEvent: null,
|
|
296
|
-
plannedValue,
|
|
293
|
+
plannedValue: plannedValueForStart(validated, declaration, request),
|
|
297
294
|
diagnostics: Object.freeze([]),
|
|
298
295
|
};
|
|
299
296
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"target-actuals-mutation.js","sourceRoot":"","sources":["../../src/application/target-actuals-mutation.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"target-actuals-mutation.js","sourceRoot":"","sources":["../../src/application/target-actuals-mutation.ts"],"names":[],"mappings":"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"}
|
package/dist/cli.js
CHANGED
|
@@ -3429,10 +3429,10 @@ async function runDocumentMigration(args) {
|
|
|
3429
3429
|
const baseline = await captureAdvanceHistoryBaseline({ targetPath: sourceOperand, expectedSourceDigest: input.digest });
|
|
3430
3430
|
const toProof = (value) => value.status === "complete" && value.repositorySnapshotId !== null && value.repositoryRelativePath !== null &&
|
|
3431
3431
|
value.objectFormat !== null && value.headCommitId !== null && value.headBlobId !== null &&
|
|
3432
|
-
value.indexBlobId !== null && value.currentSourceDigest !== null
|
|
3432
|
+
value.indexBlobId !== null && value.currentSourceDigest !== null && value.headSourceDigest !== null
|
|
3433
3433
|
? { repositoryId: value.repositorySnapshotId, repositoryRelativePath: value.repositoryRelativePath,
|
|
3434
3434
|
objectFormat: value.objectFormat, headCommit: value.headCommitId, headBlob: value.headBlobId,
|
|
3435
|
-
stage0Blob: value.indexBlobId, sourceDigest: value.
|
|
3435
|
+
stage0Blob: value.indexBlobId, sourceDigest: value.headSourceDigest }
|
|
3436
3436
|
: null;
|
|
3437
3437
|
const proof = toProof(baseline);
|
|
3438
3438
|
let result = proof === null
|
|
@@ -3448,7 +3448,15 @@ async function runDocumentMigration(args) {
|
|
|
3448
3448
|
race = true;
|
|
3449
3449
|
}
|
|
3450
3450
|
else {
|
|
3451
|
-
|
|
3451
|
+
try {
|
|
3452
|
+
await replaceValidatedDocumentFile(sourceOperand, result.candidateText, { initialDigest: input.digest, ...(parsed.values.get("expect-digest") === undefined ? {} : { expectedDigest: parsed.values.get("expect-digest") }) }, (candidate) => ({ ok: parseMilestoneAcceptanceSource(candidate, MILESTONE_ACCEPTANCE_SOURCE_CAPABILITY).ok, diagnostics: [] }));
|
|
3453
|
+
}
|
|
3454
|
+
catch (error) {
|
|
3455
|
+
if (!(error instanceof SafeWriteConflictError))
|
|
3456
|
+
throw error;
|
|
3457
|
+
result = Object.freeze({ ...result, ok: false, diagnostics: Object.freeze(["PTMAC-110"]) });
|
|
3458
|
+
race = true;
|
|
3459
|
+
}
|
|
3452
3460
|
}
|
|
3453
3461
|
}
|
|
3454
3462
|
if (format === "json")
|