perttool 0.4.0 → 0.5.0

package/CHANGELOG.md

@@ -4,6 +4,48 @@ This project records its notable changes here. The format is based on [Keep a Ch
 
 ## [Unreleased]
 
+## [0.5.0] - 2026-07-29
+
+Contract 6 beta release. This version atomically publishes Grammar 5,
+explicit task lifecycle evidence, read-only Git history and velocity
+observation, and the English repository baseline. It intentionally changes
+every CLI JSON envelope and several result identities while retaining
+suffix-free `0.x.x` beta product maturity.
+
+### Added
+
+- Activated Grammar 5 task-owned work events and preview-first
+  `task start|suspend|resume` plus eventful `task finish` with explicit event
+  time, exact active time, exact person effort, deterministic event identity,
+  governance, and safe-write controls.
+- Added read-only first-parent `project history` and
+  `project observe-velocity`, including explicit-event reconstruction,
+  qualified Git-recorded transitions, exact task summaries, and separate
+  elapsed-hour, active-date, effort-productivity, and recorded-evidence
+  candidates.
+- Added public actuals/history/observation Core exports, Contract 6 command
+  discovery and Guide topics, Grammar 5 examples, and isolated installed
+  lifecycle/history/observation checks.
+
+### Changed
+
+- Activated CLI Contract 6 in the current source. Every JSON envelope now
+  reports `cli_contract_version=6`; check, analysis, next, mutation/advance,
+  and unit migration use result versions 3, 4, 5, 3, and 3 respectively.
+- Added suspended-state analysis and `groups.suspended`, while retaining the
+  Recommendation version 1 ranking and
+  `recommendation_v1_plus_release_gate` start-authority policy.
+- Extended exact unit migration through Grammar 5
+  `work_event.planned_value` without changing event time, active time, effort,
+  or declared velocity. The prior `0.4.0` artifact remains available as the
+  Grammar 4 and CLI Contract 5 compatibility pin.
+
+### Fixed
+
+- Merged adjacent zero-length task-status and work-event insertions so a
+  lifecycle mutation can atomically start a task whose declaration ends at
+  end of file.
+
 ## [0.4.0] - 2026-07-28
 
 Contract 5 beta release. This version atomically publishes Grammar 4 and
@@ -174,7 +216,8 @@ First public development preview. Intended to evaluate the DSL and CLI, read-onl
 - Not published to the npm registry; use the GitHub Release asset
 - Requires Node.js 24 or later
 
-[Unreleased]: https://github.com/mako10k/perttool/compare/v0.4.0...HEAD
+[Unreleased]: https://github.com/mako10k/perttool/compare/v0.5.0...HEAD
+[0.5.0]: https://github.com/mako10k/perttool/compare/v0.4.0...v0.5.0
 [0.4.0]: https://github.com/mako10k/perttool/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/mako10k/perttool/compare/v0.2.0...v0.3.0
 [0.2.0]: https://github.com/mako10k/perttool/compare/v0.1.0...v0.2.0

package/README.md

@@ -5,54 +5,56 @@ It validates an Activity-on-Arrow plan, calculates precedence and
 resource-constrained schedules, recommends the next task, and applies
 source-preserving changes through preview-first commands.
 
-The prepared `0.4.0` source implements Grammar 4 and CLI Contract 5. Its
-publication remains a separate operation; npm `beta` and `latest` still
-resolve to Contract 4 `0.3.0` until that operation is explicitly authorized.
-Beta releases may contain breaking CLI or schema changes. Version `0.4.0`
-requires Node.js 22 or later. Contract 4 and Contract 3 remain available by
-pinning `0.3.0` and `0.2.0`, respectively.
+The prepared `0.5.0` source implements Grammar 5 and CLI Contract 6,
+including explicit task work events, lifecycle commands, read-only Git
+history, observed velocity, AnalysisResult v4, and NextResult v5. Publication
+remains a gated operation; npm `beta` and `latest` still resolve to Contract 5
+`0.4.0` until that operation completes. Beta releases may contain breaking
+CLI or schema changes. Version `0.5.0` requires Node.js 22 or later. Contract
+5, Contract 4, and Contract 3 remain available by pinning `0.4.0`, `0.3.0`,
+and `0.2.0`, respectively.
 
 ## Run without installing
 
-Use `npx` for an occasional invocation and select Contract 5 explicitly:
+Use `npx` for an occasional invocation and select Contract 6 explicitly:
 
 ```sh
-npx --yes --package=perttool@0.4.0 -- perttool --version
-npx --yes --package=perttool@0.4.0 -- perttool document check PLAN.pert
-npx --yes --package=perttool@0.4.0 -- perttool dag next PLAN.pert --format json
-npx --yes --package=perttool@0.4.0 -- perttool project migrate-unit PLAN.pert --to-unit day --diff
+npx --yes --package=perttool@0.5.0 -- perttool --version
+npx --yes --package=perttool@0.5.0 -- perttool document check PLAN.pert
+npx --yes --package=perttool@0.5.0 -- perttool dag next PLAN.pert --format json
+npx --yes --package=perttool@0.5.0 -- perttool project history PLAN.pert --format json
 ```
 
 The equivalent explicit `npm exec` form is:
 
 ```sh
-npm exec --yes --package=perttool@0.4.0 -- perttool --version
-npm exec --yes --package=perttool@0.4.0 -- perttool document check PLAN.pert
-npm exec --yes --package=perttool@0.4.0 -- perttool dag analyze PLAN.pert
-npm exec --yes --package=perttool@0.4.0 -- perttool project migrate-unit PLAN.pert --to-unit day --diff
+npm exec --yes --package=perttool@0.5.0 -- perttool --version
+npm exec --yes --package=perttool@0.5.0 -- perttool document check PLAN.pert
+npm exec --yes --package=perttool@0.5.0 -- perttool dag analyze PLAN.pert
+npm exec --yes --package=perttool@0.5.0 -- perttool project history PLAN.pert --format json
 ```
 
 `npx` and `npm exec` may download the selected package version into the npm
-cache. The `0.4.0` registry commands become available only after the
-separately authorized publication. Pinning `0.3.0` selects Contract 4 and
-therefore does not accept the governance surface in this README; pinning
-`0.2.0` selects Contract 3 and also omits the temporal and migration surface.
+cache. The `0.5.0` registry commands become available only after the gated
+publication. Pinning `0.4.0` selects Contract 5 and therefore omits Grammar 5
+lifecycle and history; `0.3.0` selects Contract 4, and `0.2.0` selects
+Contract 3.
 
 ## Install
 
 Install the CLI globally when it is used regularly:
 
 ```sh
-npm install --global perttool@0.4.0
+npm install --global perttool@0.5.0
 perttool --version
 ```
 
-The prepared release will move npm `beta` to Contract 5 `0.4.0` while leaving
-`latest` on Contract 4 `0.3.0`. Before publication, both tags still resolve
-to `0.3.0`, so use a locally packed `0.4.0` artifact for candidate testing.
-After publication, `perttool@beta` follows Contract 5. Contract 4 and
-Contract 3 remain available as exact pins `perttool@0.3.0` and
-`perttool@0.2.0`.
+The prepared release will move npm `beta` to Contract 6 `0.5.0` while leaving
+`latest` on Contract 5 `0.4.0`. Before publication, both tags still resolve
+to `0.4.0`, so use a locally packed `0.5.0` artifact for candidate testing.
+After publication, `perttool@beta` follows Contract 6. Contract 5, Contract 4,
+and Contract 3 remain available as exact pins `perttool@0.4.0`,
+`perttool@0.3.0`, and `perttool@0.2.0`.
 
 ## Plan files
 
@@ -95,7 +97,8 @@ Task duration can use deterministic `day`, `hour`, or relative `point` units.
 Point plans declare a project-wide velocity such as `20p/10d`. Analysis keeps
 the exact point result and reports the time conversion separately as a velocity
 forecast. Grammar version 3 also accepts an exact Fraction such as `1/3d`;
-versions 1 and 2 continue to accept Decimal duration tokens.
+versions 1 and 2 continue to accept Decimal duration tokens. Grammar version 5
+adds explicit task-owned work events and the `suspended` lifecycle state.
 
 ## Maintain a plan through the CLI
 
@@ -202,7 +205,7 @@ perttool gate add PLAN.pert APPROVAL NOW DONE \
   --expect-digest 'sha256:...'
 ```
 
-Generated Contract 5 projects carry this maintenance warning:
+Generated Contract 6 source projects carry this maintenance warning:
 
 ```pert
 # Existing .pert plans should normally be maintained through perttool commands; direct DSL editing bypasses goal/DAG owner-confirmation checks.
@@ -233,6 +236,45 @@ perttool project migrate-unit PLAN.pert \
 Migration is not a `batch apply` member. Re-read and reanalyze the written
 candidate before making a separate mutation.
 
+### Task actuals and Git history
+
+Grammar 5 records each lifecycle transition as a task state change and a
+task-owned work event in one preview-first candidate. Event time is always an
+explicit caller input; perttool does not substitute the system clock or Git
+commit time.
+
+```sh
+perttool task start PLAN.pert WORK \
+  --at 2026-07-29T09:00:00+09:00 --diff
+perttool task suspend PLAN.pert WORK \
+  --at 2026-07-29T11:00:00+09:00 --reason "review" --diff
+perttool task resume PLAN.pert WORK \
+  --at 2026-07-29T12:00:00+09:00 --diff
+perttool task finish PLAN.pert WORK \
+  --at 2026-07-29T15:00:00+09:00 \
+  --active-time 5 --effort 6 --diff
+```
+
+Use the ordinary governance, `--write`, and `--expect-digest` controls after
+reviewing each candidate. `--active-time` is hours and `--effort` is
+person-hours; suffix-free CLI values are normalized to `h` and `ph`.
+
+History is a read-only first-parent Git reconstruction. It distinguishes
+explicit actual event time from Git-recorded transition time and never changes
+Git or declared project velocity:
+
+```sh
+perttool project history PLAN.pert --task WORK --format json
+perttool project observe-velocity PLAN.pert \
+  --task WORK --evidence declared --format json
+```
+
+Observed candidates are evidence, not automatic project metadata changes.
+Adoption, if desired, is a separate reviewed `project set --velocity` write.
+See the [Contract 5-to-6 migration
+guide](docs/process/cli-contract-6-migration.md) for schema and compatibility
+details.
+
 ## Command map
 
 | Goal | Command |
@@ -243,13 +285,15 @@ candidate before making a separate mutation.
 | Canonically format it | `perttool document format <file>` |
 | Initialize a project | `perttool project init ...` |
 | Read project metadata | `perttool project show <file>` |
+| Reconstruct task actuals | `perttool project history <file> ...` |
+| Observe project performance | `perttool project observe-velocity <file> ...` |
 | Change project metadata | `perttool project set <file> ...` |
 | Migrate project units exactly | `perttool project migrate-unit <file> ...` |
 | Analyze schedules | `perttool dag analyze <file>` |
 | Select next work | `perttool dag next <file>` |
 | Remove completed history | `perttool dag advance <file>` |
 | Export or import Mermaid | `perttool dag render`, `perttool dag import` |
-| Maintain tasks | `perttool task add|set|remove|finish` |
+| Maintain tasks | `perttool task add|set|remove|start|suspend|resume|finish` |
 | Maintain gates | `perttool gate add|set|remove` |
 | Maintain milestones | `perttool milestone add|set|remove` |
 | Maintain resources | `perttool resource add|set|remove` |
@@ -268,14 +312,18 @@ perttool guide editing --level detail --format json
 
 ## LLM and automation use
 
-Use `--format json` for machine consumers. Contract 5 consumers must check
-`cli_contract_version == 5`; consumers pinned to `0.3.0` must continue to
-require Contract 4. In both cases, check the result-specific `schema_version`
-before reading the rest of a result.
-A complete, known, non-truncated `Perttool.NextResult.v4` with temporal policy
+Use `--format json` for machine consumers. Prepared `0.5.0` consumers must
+check `cli_contract_version == 6`; consumers of published `0.4.0` must
+continue to require Contract 5, and consumers pinned to `0.3.0` must require
+Contract 4.
+In every case, check the result-specific `schema_version` before reading the
+rest of a result.
+A complete, known, non-truncated `Perttool.NextResult.v5` with temporal policy
 `recommendation_v1_plus_release_gate` is required. Start only task IDs in
 `temporal.authority.startable_recommended_task_ids`; do not infer start
 authority from the raw recommended set, the text summary, or `ready` alone.
+Suspended tasks are reported separately and require an explicit `task resume`;
+they are not new-start recommendations.
 
 Mutation JSON returns the candidate text, unified diff, UTF-16 text edits,
 source digest, updated digest, diagnostics, and write result in one envelope.
@@ -286,6 +334,8 @@ diagnostics, and future or unavailable temporal eligibility must fail closed.
 
 - [Temporal and Unit Interface Contract (CLI Contract 4)](docs/specs/temporal-unit-interface.md)
 - [Owner-Aware Governance Interface Contract (CLI Contract 5)](docs/specs/governance-interface.md)
+- [Project Actuals and Git History Contract (CLI Contract 6)](docs/specs/project-actuals.md)
+- [Contract 5-to-6 migration](docs/process/cli-contract-6-migration.md)
 - [Contract 4-to-5 migration](docs/process/cli-contract-5-migration.md)
 - [Issue #4 governance implementation acceptance](docs/process/governance-acceptance.md)
 - [CLI Contract 3 compatibility baseline](docs/specs/cli-contract-3.md)

package/dist/actuals/lifecycle.d.ts

@@ -0,0 +1,101 @@
+import type { Diagnostic, SourceSpan } from "../model/diagnostics.js";
+import { type Rational } from "../model/rational.js";
+import type { DeclarationNode, TargetDeclarationKind, WorkEventKind } from "../model/syntax.js";
+import { type ActualWorkEvent } from "./source.js";
+import type { TargetGrammar5ValidatedDocument } from "../semantic/target-validator.js";
+export type TaskLifecycleState = "planned" | "active" | "blocked" | "suspended" | "done";
+export type ActualsCoverage = "complete" | "open" | "finish_only" | "unrecorded" | "unavailable";
+export interface LifecycleEventInput {
+    readonly id?: string;
+    readonly occurredAt: string;
+    readonly reason?: string;
+    readonly activeTime?: string;
+    readonly effort?: string;
+}
+export interface FinishActualsMutation {
+    readonly kind: "task.finish.actual";
+    readonly taskId: string;
+    readonly event: LifecycleEventInput;
+}
+export interface StartActualsMutation {
+    readonly kind: "task.start";
+    readonly taskId: string;
+    readonly event: LifecycleEventInput;
+}
+export interface SuspendActualsMutation {
+    readonly kind: "task.suspend";
+    readonly taskId: string;
+    readonly event: LifecycleEventInput;
+}
+export interface ResumeActualsMutation {
+    readonly kind: "task.resume";
+    readonly taskId: string;
+    readonly event: LifecycleEventInput;
+}
+export type LifecycleMutation = StartActualsMutation | SuspendActualsMutation | ResumeActualsMutation | FinishActualsMutation;
+export type LifecycleMutationKind = LifecycleMutation["kind"];
+interface NormalizedLifecycleEventBase {
+    readonly id: string;
+    readonly occurredAt: string;
+}
+export type NormalizedLifecycleMutationRequest = {
+    readonly kind: "task.start";
+    readonly taskId: string;
+    readonly event: NormalizedLifecycleEventBase;
+} | {
+    readonly kind: "task.suspend";
+    readonly taskId: string;
+    readonly event: NormalizedLifecycleEventBase & {
+        readonly reason: string | null;
+    };
+} | {
+    readonly kind: "task.resume";
+    readonly taskId: string;
+    readonly event: NormalizedLifecycleEventBase;
+} | {
+    readonly kind: "task.finish.actual";
+    readonly taskId: string;
+    readonly event: NormalizedLifecycleEventBase & {
+        readonly activeTime: string | null;
+        readonly effort: string | null;
+    };
+};
+export type NormalizedFinishActualsRequest = Extract<NormalizedLifecycleMutationRequest, {
+    readonly kind: "task.finish.actual";
+}>;
+export type NormalizedStartActualsRequest = Extract<NormalizedLifecycleMutationRequest, {
+    readonly kind: "task.start";
+}>;
+export type NormalizedSuspendActualsRequest = Extract<NormalizedLifecycleMutationRequest, {
+    readonly kind: "task.suspend";
+}>;
+export type NormalizedResumeActualsRequest = Extract<NormalizedLifecycleMutationRequest, {
+    readonly kind: "task.resume";
+}>;
+export interface LifecycleMutationRequestNormalization {
+    readonly ok: boolean;
+    readonly request: NormalizedLifecycleMutationRequest | null;
+    readonly diagnostics: readonly Diagnostic[];
+}
+export interface FinishActualsRequestNormalization {
+    readonly ok: boolean;
+    readonly request: NormalizedFinishActualsRequest | null;
+    readonly diagnostics: readonly Diagnostic[];
+}
+export interface LifecycleReduction {
+    readonly ok: boolean;
+    readonly coverage: ActualsCoverage;
+    readonly state: "active" | "suspended" | "done" | null;
+    readonly derivedActiveTime: Rational | null;
+    readonly diagnostics: readonly Diagnostic[];
+}
+export declare function actualsDiagnostic(code: "PTACT-104" | "PTACT-105" | "PTACT-106" | "PTACT-107" | "PTACT-108", message: string, cause: string, entityId: string | null, span?: SourceSpan, data?: Readonly<Record<string, unknown>>): Diagnostic;
+export declare function deriveWorkEventId(taskId: string, kind: WorkEventKind, canonicalOccurredAt: string): string;
+export declare function normalizeLifecycleMutationRequest(input: unknown): LifecycleMutationRequestNormalization;
+export declare function normalizeFinishActualsRequest(input: unknown): FinishActualsRequestNormalization;
+export declare function reduceTaskLifecycle(events: readonly ActualWorkEvent[]): LifecycleReduction;
+export declare function taskStatus(task: DeclarationNode<TargetDeclarationKind>): TaskLifecycleState;
+export declare function taskStatusSpan(task: DeclarationNode<TargetDeclarationKind>): SourceSpan;
+export declare function validateStoredLifecycleState(validated: TargetGrammar5ValidatedDocument): readonly Diagnostic[];
+export {};
+//# sourceMappingURL=lifecycle.d.ts.map

package/dist/actuals/lifecycle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../src/actuals/lifecycle.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAItE,OAAO,EAOL,KAAK,QAAQ,EACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EACV,eAAe,EACf,qBAAqB,EACrB,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EACV,+BAA+B,EAChC,MAAM,iCAAiC,CAAC;AAUzC,MAAM,MAAM,kBAAkB,GAC1B,SAAS,GACT,QAAQ,GACR,SAAS,GACT,WAAW,GACX,MAAM,CAAC;AAEX,MAAM,MAAM,eAAe,GACvB,UAAU,GACV,MAAM,GACN,aAAa,GACb,YAAY,GACZ,aAAa,CAAC;AAElB,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;CACrC;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;CACrC;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;CACrC;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;CACrC;AAED,MAAM,MAAM,iBAAiB,GACzB,oBAAoB,GACpB,sBAAsB,GACtB,qBAAqB,GACrB,qBAAqB,CAAC;AAE1B,MAAM,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;AAE9D,UAAU,4BAA4B;IACpC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,MAAM,kCAAkC,GAC1C;IACE,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,4BAA4B,CAAC;CAC9C,GACD;IACE,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,4BAA4B,GAAG;QAC7C,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;KAChC,CAAC;CACH,GACD;IACE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,4BAA4B,CAAC;CAC9C,GACD;IACE,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,4BAA4B,GAAG;QAC7C,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;QACnC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;KAChC,CAAC;CACH,CAAC;AAEN,MAAM,MAAM,8BAA8B,GAAG,OAAO,CAClD,kCAAkC,EAClC;IAAE,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAA;CAAE,CACxC,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,OAAO,CACjD,kCAAkC,EAClC;IAAE,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAA;CAAE,CAChC,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,OAAO,CACnD,kCAAkC,EAClC;IAAE,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAA;CAAE,CAClC,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG,OAAO,CAClD,kCAAkC,EAClC;IAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAA;CAAE,CACjC,CAAC;AAEF,MAAM,WAAW,qCAAqC;IACpD,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,OAAO,EAAE,kCAAkC,GAAG,IAAI,CAAC;IAC5D,QAAQ,CAAC,WAAW,EAAE,SAAS,UAAU,EAAE,CAAC;CAC7C;AAED,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,OAAO,EAAE,8BAA8B,GAAG,IAAI,CAAC;IACxD,QAAQ,CAAC,WAAW,EAAE,SAAS,UAAU,EAAE,CAAC;CAC7C;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,WAAW,GAAG,MAAM,GAAG,IAAI,CAAC;IACvD,QAAQ,CAAC,iBAAiB,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC5C,QAAQ,CAAC,WAAW,EAAE,SAAS,UAAU,EAAE,CAAC;CAC7C;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,EACA,WAAW,GACX,WAAW,GACX,WAAW,GACX,WAAW,GACX,WAAW,EACf,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,IAAI,CAAC,EAAE,UAAU,EACjB,IAAI,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM,GAC3C,UAAU,CAUZ;AAsBD,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,aAAa,EACnB,mBAAmB,EAAE,MAAM,GAC1B,MAAM,CAKR;AAED,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,OAAO,GACb,qCAAqC,CAgJvC;AAED,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,OAAO,GACb,iCAAiC,CAoBnC;AAoCD,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,SAAS,eAAe,EAAE,GACjC,kBAAkB,CA4FpB;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,eAAe,CAAC,qBAAqB,CAAC,GAC3C,kBAAkB,CAEpB;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,eAAe,CAAC,qBAAqB,CAAC,GAC3C,UAAU,CAEZ;AAED,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,+BAA+B,GACzC,SAAS,UAAU,EAAE,CAwDvB"}