phronomy 0.26.0 → 0.27.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.
- checksums.yaml +4 -4
- data/CHANGELOG.md +40 -0
- data/README.md +4 -0
- data/VERIFY.sh +27 -27
- data/benchmark/bench_agent_invoke.rb +26 -22
- data/benchmark/bench_context_assembler.rb +4 -5
- data/docs/architecture/agent-chat-and-state-ownership.md +147 -0
- data/docs/architecture/agent-configuration-and-tool-binding.md +139 -0
- data/docs/architecture/agent-context.md +4 -2
- data/docs/architecture/agent-transition-ownership.md +89 -0
- data/docs/architecture/before-llm-input.md +6 -0
- data/docs/architecture/context-management.md +30 -0
- data/docs/architecture/context-preparation-steps.md +90 -0
- data/docs/architecture/entry-action-and-team-wording.md +72 -0
- data/docs/architecture/execution-metadata-and-values.md +80 -0
- data/docs/architecture/generator-verifier-ownership.md +111 -0
- data/docs/architecture/multi-agent-handoff.md +8 -2
- data/docs/architecture/persistence-refactoring-plan.md +50 -0
- data/docs/architecture/persistence.md +27 -4
- data/docs/architecture/refactoring-closure.md +334 -0
- data/docs/architecture/remaining-refactoring-plan.md +374 -0
- data/docs/architecture/rubyllm-2-token-ownership.md +82 -0
- data/docs/architecture/tool-schema-recording-gap.md +50 -0
- data/docs/architecture/tracing.md +1 -1
- data/docs/architecture/workflow-terminal-ownership-design.md +104 -0
- data/docs/architecture.md +209 -0
- data/docs/decisions/014-unified-persistence-durable-state.md +11 -0
- data/docs/decisions/024-event-loop-single-writer-agent-runtime.md +5 -1
- data/docs/decisions/025-process-local-agent-ownership-and-runtime-admission.md +13 -3
- data/docs/decisions/026-workflow-runtime-admission-and-durable-terminal-barrier.md +5 -1
- data/docs/decisions/030-agent-handoff-domain-and-durable-responsibility.md +5 -0
- data/docs/decisions/031-durable-multi-agent-coordination.md +5 -0
- data/docs/decisions/032-storage-backend-composition.md +80 -0
- data/docs/decisions/033-domain-persistence-ownership.md +79 -0
- data/docs/decisions/034-handoff-runner-coordination-ownership.md +76 -0
- data/docs/decisions/035-tool-executor-capability-ownership.md +68 -0
- data/docs/decisions/036-context-contract-ownership.md +86 -0
- data/docs/decisions/037-common-definition-ownership.md +62 -0
- data/docs/decisions/038-responsibility-based-source-layout.md +131 -0
- data/docs/decisions/039-runtime-configuration-lifecycle-ownership.md +74 -0
- data/docs/decisions/040-configuration-default-composition.md +94 -0
- data/docs/decisions/041-feature-owned-identity-registries.md +100 -0
- data/docs/decisions/042-feature-owned-execution-state.md +106 -0
- data/docs/decisions/043-storage-execution-constraint-notifications.md +75 -0
- data/docs/decisions/044-agent-default-and-one-shot-composition.md +106 -0
- data/docs/decisions/045-worker-input-restriction-ownership.md +100 -0
- data/docs/decisions/046-agent-responsibility-layout-and-shared-records.md +110 -0
- data/docs/decisions/047-recovered-execution-continuation-contract.md +116 -0
- data/docs/decisions/048-dispatch-preparation-worker-ownership.md +120 -0
- data/docs/decisions/049-initial-preparation-worker-ownership.md +111 -0
- data/docs/decisions/050-approval-resume-snapshot-and-commit-ownership.md +98 -0
- data/docs/decisions/051-execution-outcome-worker-ownership.md +151 -0
- data/docs/decisions/052-tool-invocation-restoration-ownership.md +92 -0
- data/docs/decisions/053-shared-state-coordination-ownership.md +71 -0
- data/docs/decisions/054-workflow-terminal-save-single-owner.md +76 -0
- data/docs/decisions/055-terminal-observer-failure-settlement.md +60 -0
- data/docs/decisions/056-workflow-terminal-policy-ownership.md +87 -0
- data/docs/decisions/057-storage-transaction-boundaries.md +73 -0
- data/docs/decisions/058-neutral-storage-primitives.md +78 -0
- data/docs/decisions/README.md +35 -6
- data/docs/design/durable-semantic-coordination/IMPLEMENTATION_DESIGN_V2.md +6 -0
- data/docs/design/durable-semantic-coordination/IMPLEMENTATION_REPORT.md +6 -0
- data/docs/features.md +9 -3
- data/docs/getting-started.md +4 -4
- data/docs/migrations/0.15.md +5 -0
- data/docs/migrations/durable-semantic-coordination-v2.md +6 -0
- data/docs/migrations/handoff-runner-multi-agent.md +35 -0
- data/docs/migrations/neutral-storage-spi.md +43 -0
- data/docs/migrations/parallel-tool-chat-removal.md +49 -0
- data/docs/migrations/shared-state-multi-agent.md +44 -0
- data/docs/migrations/storage-backend-composition.md +117 -0
- data/docs/migrations/storage-transaction-boundaries.md +74 -0
- data/docs/persistence-backends.md +162 -204
- data/docs/runtime-and-concurrency.md +117 -32
- data/lib/phronomy/agent/api/agent.rb +17 -0
- data/lib/phronomy/agent/async_event_api.rb +2 -2
- data/lib/phronomy/agent/base.rb +51 -241
- data/lib/phronomy/{agent.rb → agent/composition/run_once.rb} +4 -13
- data/lib/phronomy/agent/context/capability/base.rb +67 -26
- data/lib/phronomy/agent/context/capability/tool_executor.rb +62 -0
- data/lib/phronomy/agent/{context_assembler.rb → context_assembly/context_assembler.rb} +143 -88
- data/lib/phronomy/agent/{context_importer.rb → context_assembly/context_importer.rb} +2 -2
- data/lib/phronomy/agent/{ruby_llm_materializer.rb → context_assembly/ruby_llm_materializer.rb} +4 -7
- data/lib/phronomy/agent/context_assembly/runtime_chat_builder.rb +36 -0
- data/lib/phronomy/agent/context_assembly/saved_context_reader.rb +53 -0
- data/lib/phronomy/agent/context_assembly/state_writer.rb +165 -0
- data/lib/phronomy/agent/context_assembly/token_budget_resolver.rb +22 -0
- data/lib/phronomy/agent/{context_plan.rb → context_contract/context_plan.rb} +1 -1
- data/lib/phronomy/agent/{context_policy_input.rb → context_contract/context_policy_input.rb} +6 -6
- data/lib/phronomy/agent/{llm_input_build_context.rb → context_contract/llm_input_build_context.rb} +1 -1
- data/lib/phronomy/agent/{llm_input_manifest.rb → context_contract/llm_input_manifest.rb} +20 -20
- data/lib/phronomy/agent/{llm_input_patch.rb → context_contract/llm_input_patch.rb} +2 -2
- data/lib/phronomy/agent/{agent_execution.rb → execution/agent_execution.rb} +8 -4
- data/lib/phronomy/agent/{agent_invocation.rb → execution/agent_invocation.rb} +8 -13
- data/lib/phronomy/agent/{agent_invocation_session_builder.rb → execution/agent_invocation_session_builder.rb} +19 -95
- data/lib/phronomy/agent/execution/approval_resume_commit.rb +108 -0
- data/lib/phronomy/agent/execution/dispatch_preparation.rb +305 -0
- data/lib/phronomy/agent/{exact_execution.rb → execution/exact_execution.rb} +9 -10
- data/lib/phronomy/agent/{execution_cancellation.rb → execution/execution_cancellation.rb} +2 -3
- data/lib/phronomy/agent/execution/execution_coordinator.rb +1925 -0
- data/lib/phronomy/agent/execution/execution_failure.rb +30 -0
- data/lib/phronomy/agent/execution/execution_metadata.rb +53 -0
- data/lib/phronomy/agent/execution/execution_outcome_committer.rb +344 -0
- data/lib/phronomy/agent/execution/execution_registry.rb +459 -0
- data/lib/phronomy/agent/execution/execution_session_runner.rb +118 -0
- data/lib/phronomy/agent/execution/initial_preparation.rb +421 -0
- data/lib/phronomy/agent/execution/invocation_transitions.rb +86 -0
- data/lib/phronomy/agent/{phase_machine_builder.rb → execution/phase_machine_builder.rb} +20 -71
- data/lib/phronomy/agent/{provider_call_outcome.rb → execution/provider_call_outcome.rb} +9 -9
- data/lib/phronomy/agent/execution/runtime_record_encoder.rb +210 -0
- data/lib/phronomy/agent/{handoff_context.rb → handoff/handoff_context.rb} +2 -2
- data/lib/phronomy/agent/handoff/handoff_execution_coordinator.rb +15 -0
- data/lib/phronomy/agent/handoff/handoff_outcome_committer.rb +131 -0
- data/lib/phronomy/agent/{handoff_state.rb → handoff/handoff_state.rb} +1 -1
- data/lib/phronomy/agent/{journal_projection.rb → journal/journal_projection.rb} +4 -0
- data/lib/phronomy/agent/{journal_record.rb → journal/journal_record.rb} +3 -3
- data/lib/phronomy/agent/{llm_call_record.rb → journal/llm_call_record.rb} +2 -2
- data/lib/phronomy/agent/{agent_root.rb → lifecycle/agent_root.rb} +6 -2
- data/lib/phronomy/agent/lifecycle/default_persistence.rb +29 -0
- data/lib/phronomy/{engine/runtime/agent_ownership_registry.rb → agent/lifecycle/ownership_registry.rb} +24 -10
- data/lib/phronomy/{agent_already_exists_error.rb → agent/lifecycle_contract/agent_already_exists_error.rb} +2 -0
- data/lib/phronomy/{agent_busy_error.rb → agent/lifecycle_contract/agent_busy_error.rb} +2 -0
- data/lib/phronomy/{agent_purged_error.rb → agent/lifecycle_contract/agent_purged_error.rb} +2 -0
- data/lib/phronomy/agent/lifecycle_contract/handoff_error.rb +7 -0
- data/lib/phronomy/{stream_callback_error.rb → agent/lifecycle_contract/stream_callback_error.rb} +2 -0
- data/lib/phronomy/agent/persistence/agent_repository.rb +61 -0
- data/lib/phronomy/agent/persistence/codec.rb +358 -0
- data/lib/phronomy/agent/persistence/execution_repository.rb +108 -0
- data/lib/phronomy/agent/persistence/handoff_state_repository.rb +58 -0
- data/lib/phronomy/agent/persistence/journal_repository.rb +54 -0
- data/lib/phronomy/agent/persistence/queries.rb +61 -0
- data/lib/phronomy/agent/persistence/storage_schema.rb +24 -0
- data/lib/phronomy/agent/persistence/watermark.rb +27 -0
- data/lib/phronomy/agent/recovery/invocation_restorer.rb +132 -0
- data/lib/phronomy/agent/{recovery_coordinator → recovery/recovery_coordinator}/continuation.rb +21 -45
- data/lib/phronomy/agent/{recovery_coordinator → recovery/recovery_coordinator}/installation.rb +32 -37
- data/lib/phronomy/agent/{recovery_coordinator → recovery/recovery_coordinator}/resolution.rb +37 -40
- data/lib/phronomy/agent/{recovery_coordinator.rb → recovery/recovery_coordinator.rb} +6 -10
- data/lib/phronomy/agent/recovery/recovery_support.rb +227 -0
- data/lib/phronomy/agent/selection/candidate.rb +1 -1
- data/lib/phronomy/agent/{approval_evaluation_request.rb → tool_execution/approval_evaluation_request.rb} +1 -12
- data/lib/phronomy/agent/{tool_approval_request.rb → tool_execution/tool_approval_request.rb} +1 -10
- data/lib/phronomy/agent/tool_execution/tool_binding.rb +90 -0
- data/lib/phronomy/agent/{tool_call_intercepted.rb → tool_execution/tool_call_intercepted.rb} +2 -2
- data/lib/phronomy/agent/{tool_definition_set.rb → tool_execution/tool_definition_set.rb} +9 -4
- data/lib/phronomy/agent/{tool_invocation.rb → tool_execution/tool_invocation.rb} +69 -34
- data/lib/phronomy/common/configuration_error.rb +7 -0
- data/lib/phronomy/common/error.rb +5 -0
- data/lib/phronomy/{agent → common/values}/immutable.rb +9 -1
- data/lib/phronomy/common/values/serializable.rb +32 -0
- data/lib/phronomy/{configuration.rb → configuration/configuration.rb} +14 -5
- data/lib/phronomy/configuration/global_configuration.rb +26 -0
- data/lib/phronomy/content_store/storage_schema.rb +11 -0
- data/lib/phronomy/content_store/stored_contents.rb +43 -0
- data/lib/phronomy/engine/backpressure_error.rb +7 -0
- data/lib/phronomy/{blocking.rb → engine/blocking.rb} +1 -1
- data/lib/phronomy/engine/cancellation_error.rb +7 -0
- data/lib/phronomy/engine/concurrency/cancellation_token.rb +4 -0
- data/lib/phronomy/engine/concurrency/offload_pool.rb +4 -0
- data/lib/phronomy/engine/concurrency/operation_binding.rb +1 -1
- data/lib/phronomy/engine/concurrency/worker_input_restricted.rb +14 -0
- data/lib/phronomy/engine/event_loop.rb +158 -624
- data/lib/phronomy/engine/event_loop_reentrancy_error.rb +8 -0
- data/lib/phronomy/{execution.rb → engine/execution.rb} +0 -7
- data/lib/phronomy/{execution_cancellation_error.rb → engine/execution_cancellation_error.rb} +2 -0
- data/lib/phronomy/engine/execution_receiver.rb +65 -0
- data/lib/phronomy/{execution_timeout_error.rb → engine/execution_timeout_error.rb} +2 -0
- data/lib/phronomy/engine/fsm_protocol.rb +14 -0
- data/lib/phronomy/engine/fsm_session.rb +35 -28
- data/lib/phronomy/{invalid_async_entry_action_error.rb → engine/invalid_async_entry_action_error.rb} +2 -0
- data/lib/phronomy/{invalid_async_transition_action_error.rb → engine/invalid_async_transition_action_error.rb} +2 -0
- data/lib/phronomy/{invalid_async_workflow_action_error.rb → engine/invalid_async_workflow_action_error.rb} +2 -0
- data/lib/phronomy/engine/pool_shutdown_error.rb +7 -0
- data/lib/phronomy/engine/recursion_limit_error.rb +7 -0
- data/lib/phronomy/engine/runtime.rb +80 -84
- data/lib/phronomy/engine/runtime_shutdown_error.rb +7 -0
- data/lib/phronomy/engine/runtime_shutdown_reentrancy_error.rb +7 -0
- data/lib/phronomy/engine/scheduler_reentrancy_error.rb +9 -0
- data/lib/phronomy/engine/task_result.rb +4 -0
- data/lib/phronomy/engine/timeout_error.rb +7 -0
- data/lib/phronomy/filter/contract/filter_block_error.rb +14 -0
- data/lib/phronomy/generation/generator_verifier/agent_result_receiver.rb +89 -0
- data/lib/phronomy/generation/generator_verifier/pipeline_state.rb +57 -0
- data/lib/phronomy/generation/generator_verifier/workflow_builder.rb +112 -0
- data/lib/phronomy/generation/generator_verifier.rb +118 -0
- data/lib/phronomy/generation/low_confidence_error.rb +14 -0
- data/lib/phronomy/llm_context_window/token_budget.rb +6 -7
- data/lib/phronomy/llm_contract/authentication_error.rb +7 -0
- data/lib/phronomy/{context_budget_exceeded_error.rb → llm_contract/context_budget_exceeded_error.rb} +2 -0
- data/lib/phronomy/llm_contract/context_length_error.rb +7 -0
- data/lib/phronomy/llm_contract/rate_limit_error.rb +7 -0
- data/lib/phronomy/{token_usage.rb → llm_contract/token_usage.rb} +2 -2
- data/lib/phronomy/llm_contract/transport_error.rb +7 -0
- data/lib/phronomy/multi_agent/admission_registry.rb +22 -2
- data/lib/phronomy/multi_agent/durable_subagent_coordinator.rb +5 -5
- data/lib/phronomy/{agent → multi_agent}/handoff_runner.rb +18 -17
- data/lib/phronomy/multi_agent/orchestrator.rb +2 -2
- data/lib/phronomy/multi_agent/persistence/codec.rb +55 -0
- data/lib/phronomy/multi_agent/persistence/queries.rb +30 -0
- data/lib/phronomy/multi_agent/persistence/team_execution_repository.rb +108 -0
- data/lib/phronomy/multi_agent/persistence/team_repository.rb +61 -0
- data/lib/phronomy/{agent → multi_agent}/shared_state.rb +56 -39
- data/lib/phronomy/multi_agent/storage_contract/team_storage_schema.rb +15 -0
- data/lib/phronomy/multi_agent/team_coordinator.rb +21 -18
- data/lib/phronomy/multi_agent/team_execution.rb +1 -1
- data/lib/phronomy/{engine/runtime → multi_agent}/team_ownership_registry.rb +14 -4
- data/lib/phronomy/multi_agent/team_root.rb +1 -1
- data/lib/phronomy/output_parser/contract/parse_error.rb +7 -0
- data/lib/phronomy/persistence/api/persistence.rb +140 -0
- data/lib/phronomy/persistence/migration/initial_format_migration.rb +19 -19
- data/lib/phronomy/persistence_composition/repositories.rb +77 -0
- data/lib/phronomy/persistence_composition/storage_schema.rb +24 -0
- data/lib/phronomy/{execution_rehydration_required_error.rb → recovery/execution_rehydration_required_error.rb} +2 -0
- data/lib/phronomy/{recovery.rb → recovery/recovery.rb} +1 -1
- data/lib/phronomy/runtime_composition/agent_defaults.rb +7 -0
- data/lib/phronomy/runtime_composition/configuration_defaults.rb +9 -0
- data/lib/phronomy/runtime_composition/global_runtime.rb +19 -0
- data/lib/phronomy/storage/backend.rb +101 -0
- data/lib/phronomy/storage/backends/in_memory.rb +157 -0
- data/lib/phronomy/storage/blob_conflict_error.rb +10 -0
- data/lib/phronomy/storage/blobs.rb +31 -0
- data/lib/phronomy/storage/condition.rb +25 -0
- data/lib/phronomy/storage/condition_failed_error.rb +16 -0
- data/lib/phronomy/storage/conflict_error.rb +9 -0
- data/lib/phronomy/{persistence → storage}/durable_record.rb +12 -12
- data/lib/phronomy/storage/entry.rb +33 -0
- data/lib/phronomy/storage/guard_ref.rb +13 -0
- data/lib/phronomy/storage/not_found_error.rb +9 -0
- data/lib/phronomy/storage/record_codec.rb +177 -0
- data/lib/phronomy/storage/records.rb +61 -0
- data/lib/phronomy/storage/resource.rb +126 -0
- data/lib/phronomy/storage/scope.rb +25 -0
- data/lib/phronomy/storage/serialization_error.rb +9 -0
- data/lib/phronomy/storage/streams.rb +44 -0
- data/lib/phronomy/storage/transaction_error.rb +10 -0
- data/lib/phronomy/storage/unique_constraint_error.rb +17 -0
- data/lib/phronomy/storage/unsupported_backend_error.rb +9 -0
- data/lib/phronomy/storage/validation.rb +53 -0
- data/lib/phronomy/storage/view.rb +131 -0
- data/lib/phronomy/testing/persistence_contract/a_content_store.rb +1 -1
- data/lib/phronomy/testing/persistence_contract/a_journal_repository.rb +4 -4
- data/lib/phronomy/testing/persistence_contract/a_persistence_backend.rb +10 -7
- data/lib/phronomy/testing/persistence_contract/a_workflow_state_repository.rb +2 -2
- data/lib/phronomy/testing/persistence_contract/an_agent_repository.rb +6 -6
- data/lib/phronomy/testing/persistence_contract/an_execution_repository.rb +6 -6
- data/lib/phronomy/testing/persistence_contract/coordination_repositories.rb +8 -8
- data/lib/phronomy/testing/persistence_contract/neutral_storage_primitives.rb +263 -0
- data/lib/phronomy/testing/persistence_contract/storage_transaction_boundaries.rb +123 -0
- data/lib/phronomy/testing/persistence_contract.rb +4 -0
- data/lib/phronomy/tool/contract/tool_error.rb +7 -0
- data/lib/phronomy/tools/agent.rb +1 -1
- data/lib/phronomy/version.rb +1 -1
- data/lib/phronomy/{workflow.rb → workflow/execution/workflow.rb} +8 -6
- data/lib/phronomy/{workflow_context.rb → workflow/execution/workflow_context.rb} +4 -0
- data/lib/phronomy/workflow/execution/workflow_context_ownership_error.rb +7 -0
- data/lib/phronomy/workflow/execution/workflow_execution_registry.rb +188 -0
- data/lib/phronomy/{workflow_runner.rb → workflow/execution/workflow_runner.rb} +122 -71
- data/lib/phronomy/workflow/execution/workflow_terminal_policy.rb +40 -0
- data/lib/phronomy/workflow/persistence/codec.rb +153 -0
- data/lib/phronomy/workflow/persistence/state_repository.rb +57 -0
- data/lib/phronomy/workflow/phase_machine_builder.rb +2 -2
- data/lib/phronomy/workflow/storage_contract/workflow_storage_schema.rb +9 -0
- data/lib/phronomy.rb +52 -94
- data/scripts/api_snapshot.rb +1 -1
- data/scripts/storage_spi_snapshot.rb +36 -0
- data/sig/phronomy/agent.rbs +0 -1
- data/sig/phronomy/execution_receiver.rbs +34 -0
- data/sig/phronomy/handoff.rbs +4 -2
- data/sig/phronomy/multi_agent.rbs +18 -0
- data/sig/phronomy/persistence.rbs +7 -91
- data/sig/phronomy/storage.rbs +174 -0
- data/sig/phronomy/tool.rbs +10 -1
- metadata +230 -99
- data/lib/phronomy/agent/execution_coordinator.rb +0 -3151
- data/lib/phronomy/agent/handoff_execution_coordinator.rb +0 -143
- data/lib/phronomy/agent/recovery_support.rb +0 -504
- data/lib/phronomy/agent/token_budget_resolver.rb +0 -70
- data/lib/phronomy/agent/tool_executor.rb +0 -55
- data/lib/phronomy/generator_verifier.rb +0 -369
- data/lib/phronomy/invalid_context_budget_configuration_error.rb +0 -8
- data/lib/phronomy/multi_agent/parallel_tool_chat.rb +0 -116
- data/lib/phronomy/persistence/durable_codec.rb +0 -706
- data/lib/phronomy/persistence/in_memory.rb +0 -690
- data/lib/phronomy/persistence/repository_facades.rb +0 -535
- data/lib/phronomy/persistence.rb +0 -276
- data/lib/phronomy/ruby_llm_patches.rb +0 -24
- data/lib/phronomy/workflow_recovery.rb +0 -123
- /data/lib/phronomy/agent/{context_candidate_resolver.rb → context_assembly/context_candidate_resolver.rb} +0 -0
- /data/lib/phronomy/agent/{context_policy_input_builder.rb → context_assembly/context_policy_input_builder.rb} +0 -0
- /data/lib/phronomy/agent/{context_plan_validator.rb → context_contract/context_plan_validator.rb} +0 -0
- /data/lib/phronomy/agent/{context_policy.rb → context_contract/context_policy.rb} +0 -0
- /data/lib/phronomy/agent/{llm_operation_result.rb → execution/llm_operation_result.rb} +0 -0
- /data/lib/phronomy/agent/{handoff.rb → handoff/handoff.rb} +0 -0
- /data/lib/phronomy/agent/{handoff_capability_factory.rb → handoff/handoff_capability_factory.rb} +0 -0
- /data/lib/phronomy/agent/{handoff_policy.rb → handoff/handoff_policy.rb} +0 -0
- /data/lib/phronomy/agent/{handoff_projection.rb → handoff/handoff_projection.rb} +0 -0
- /data/lib/phronomy/agent/{handoff_request.rb → handoff/handoff_request.rb} +0 -0
- /data/lib/phronomy/agent/{tool_invocation_session_builder.rb → tool_execution/tool_invocation_session_builder.rb} +0 -0
- /data/lib/phronomy/{canonical_json.rb → common/canonical_json.rb} +0 -0
- /data/lib/phronomy/{diagnostics.rb → engine/diagnostics.rb} +0 -0
- /data/lib/phronomy/{event.rb → engine/event.rb} +0 -0
- /data/lib/phronomy/{invocation_context.rb → engine/invocation_context.rb} +0 -0
- /data/lib/phronomy/{metrics.rb → engine/metrics.rb} +0 -0
- /data/lib/phronomy/{runnable.rb → engine/runnable.rb} +0 -0
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Phronomy
|
|
4
|
+
module Agent
|
|
5
|
+
# Classifies failed execution outcomes without owning persistence or delivery.
|
|
6
|
+
# @api private
|
|
7
|
+
module ExecutionFailure
|
|
8
|
+
# @api private
|
|
9
|
+
def self.status_for(error)
|
|
10
|
+
if defined?(Phronomy::CancellationError) && error.is_a?(Phronomy::CancellationError)
|
|
11
|
+
return :cancelled
|
|
12
|
+
end
|
|
13
|
+
if defined?(Phronomy::FilterBlockError) && error.is_a?(Phronomy::FilterBlockError)
|
|
14
|
+
return :blocked
|
|
15
|
+
end
|
|
16
|
+
|
|
17
|
+
:failed
|
|
18
|
+
end
|
|
19
|
+
|
|
20
|
+
# @api private
|
|
21
|
+
def self.journal_kind_for(status)
|
|
22
|
+
{
|
|
23
|
+
cancelled: :execution_cancelled,
|
|
24
|
+
blocked: :execution_blocked,
|
|
25
|
+
failed: :execution_failed
|
|
26
|
+
}.fetch(status)
|
|
27
|
+
end
|
|
28
|
+
end
|
|
29
|
+
end
|
|
30
|
+
end
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Phronomy
|
|
4
|
+
module Agent
|
|
5
|
+
# Durable metadata shared by ordinary execution and recovery.
|
|
6
|
+
# Keys and version values retain their existing stored representation.
|
|
7
|
+
# @api private
|
|
8
|
+
module ExecutionMetadata
|
|
9
|
+
CONTRACT_VERSION = 1
|
|
10
|
+
RECOVERY_METADATA_KEY = "recovery"
|
|
11
|
+
TOOL_BATCH_METADATA_KEY = "recovery_tool_batch"
|
|
12
|
+
PENDING_LLM_ID_KEY = "pending_llm_call_id"
|
|
13
|
+
PENDING_LLM_STARTED_AT_KEY = "pending_llm_started_at"
|
|
14
|
+
INVOCATION_MODE_KEY = "invocation_mode"
|
|
15
|
+
CONTRACT_VERSION_KEY = "recovery_contract_version"
|
|
16
|
+
|
|
17
|
+
module_function
|
|
18
|
+
|
|
19
|
+
def build_tool_batch_snapshot(invocation)
|
|
20
|
+
Array(invocation.tool_invocations).map do |child|
|
|
21
|
+
entry = {
|
|
22
|
+
"tool_invocation_id" => child.id.to_s,
|
|
23
|
+
"tool_call_id" => child.tool_call_id&.to_s,
|
|
24
|
+
"tool_name" => child.tool_name.to_s,
|
|
25
|
+
"llm_call_id" => invocation.tool_batch_llm_call_id&.to_s,
|
|
26
|
+
"raw_arguments" => serializable_value(child.raw_arguments || {}),
|
|
27
|
+
"arguments" => serializable_value(child.raw_arguments || {}),
|
|
28
|
+
"status" => child.status.to_s
|
|
29
|
+
}
|
|
30
|
+
if child.execution_completed?
|
|
31
|
+
entry["result"] = serializable_value(child.result)
|
|
32
|
+
end
|
|
33
|
+
entry.compact
|
|
34
|
+
end.freeze
|
|
35
|
+
end
|
|
36
|
+
|
|
37
|
+
def with_values(execution, values)
|
|
38
|
+
execution.with(
|
|
39
|
+
execution_revision: execution.execution_revision,
|
|
40
|
+
metadata: execution.metadata.merge(values)
|
|
41
|
+
)
|
|
42
|
+
end
|
|
43
|
+
|
|
44
|
+
# Retain the diagnostic used by existing snapshot writers. Conversion
|
|
45
|
+
# prepares the tree; canonical JSON validation belongs to persistence.
|
|
46
|
+
def serializable_value(value)
|
|
47
|
+
Phronomy::Values::Serializable.convert(value,
|
|
48
|
+
unsupported_message: "Recovery value is not canonically serializable")
|
|
49
|
+
end
|
|
50
|
+
private_class_method :serializable_value
|
|
51
|
+
end
|
|
52
|
+
end
|
|
53
|
+
end
|
|
@@ -0,0 +1,344 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
require_relative "../../engine/concurrency/worker_input_restricted"
|
|
4
|
+
|
|
5
|
+
module Phronomy
|
|
6
|
+
module Agent
|
|
7
|
+
# Persists a completed, failed or waiting execution from captured facts.
|
|
8
|
+
# Live state, admission and result delivery stay with ExecutionCoordinator.
|
|
9
|
+
# @api private
|
|
10
|
+
class ExecutionOutcomeCommitter
|
|
11
|
+
include Phronomy::Concurrency::WorkerInputRestricted
|
|
12
|
+
|
|
13
|
+
HandoffTerminalView = Data.define(
|
|
14
|
+
:target_agent_id, :responsibility, :selection_intent,
|
|
15
|
+
:llm_call_id, :tool_call_id, :policy
|
|
16
|
+
)
|
|
17
|
+
TerminalView = Data.define(
|
|
18
|
+
:phase, :output, :usage, :approval_request, :rejected,
|
|
19
|
+
:input_blocked, :output_blocked, :block_error,
|
|
20
|
+
:invocation_error, :handoff, :callback_failure, :source_error, :cancel_requested
|
|
21
|
+
)
|
|
22
|
+
Command = Data.define(
|
|
23
|
+
:execution_id, :fsm_session_id, :expected_execution_revision,
|
|
24
|
+
:root, :journal_records, :execution, :runtime_snapshot,
|
|
25
|
+
:terminal_view, :state_required
|
|
26
|
+
)
|
|
27
|
+
Outcome = Data.define(
|
|
28
|
+
:type, :execution, :root, :appended_records,
|
|
29
|
+
:result, :error, :approval_request
|
|
30
|
+
)
|
|
31
|
+
|
|
32
|
+
# @api private
|
|
33
|
+
def initialize(agent:, persistence:)
|
|
34
|
+
@agent = agent
|
|
35
|
+
@persistence = persistence
|
|
36
|
+
end
|
|
37
|
+
|
|
38
|
+
# @api private
|
|
39
|
+
def commit_outcome(operation)
|
|
40
|
+
view = operation.terminal_view
|
|
41
|
+
error = view.callback_failure&.to_stream_callback_error || view.source_error ||
|
|
42
|
+
view.block_error || view.invocation_error
|
|
43
|
+
if operation.execution.metadata["multi_agent_coordination_ref"] &&
|
|
44
|
+
(error.is_a?(Phronomy::ExecutionRehydrationRequiredError) || view.cancel_requested)
|
|
45
|
+
waiting = commit_coordination_wait(operation, error)
|
|
46
|
+
return waiting if waiting
|
|
47
|
+
end
|
|
48
|
+
raise error if error.is_a?(Phronomy::ExecutionRehydrationRequiredError)
|
|
49
|
+
return commit_failed_outcome(operation, error) if error
|
|
50
|
+
return commit_suspended(operation) if view.phase == :suspended
|
|
51
|
+
commit_completed(operation)
|
|
52
|
+
rescue => caught
|
|
53
|
+
reconcile_terminal_error(operation, caught)
|
|
54
|
+
end
|
|
55
|
+
|
|
56
|
+
private
|
|
57
|
+
|
|
58
|
+
# Reuse the Agent barrier to retain unfinished owned children. This is an
|
|
59
|
+
# active AgentExecution snapshot, not a second scheduler or terminal state.
|
|
60
|
+
def commit_coordination_wait(operation, error)
|
|
61
|
+
current = operation.execution
|
|
62
|
+
waiting = nil
|
|
63
|
+
@persistence.transaction do |tx|
|
|
64
|
+
refreshed = @agent.__prepare_coordination_record(current, tx: tx)
|
|
65
|
+
snapshot = tx.contents.fetch_json(refreshed.metadata.fetch("multi_agent_coordination_ref"))
|
|
66
|
+
unresolved = snapshot.fetch("children").any? do |child|
|
|
67
|
+
!%w[completed failed cancelled rejected blocked handed_off].include?(child.fetch("state")) &&
|
|
68
|
+
!(operation.terminal_view.cancel_requested && child.fetch("state") == "reserved")
|
|
69
|
+
end
|
|
70
|
+
next unless unresolved
|
|
71
|
+
waiting = current.with(metadata: refreshed.metadata.merge(
|
|
72
|
+
"coordination_cancel_requested" => operation.terminal_view.cancel_requested || current.metadata["coordination_cancel_requested"] == true
|
|
73
|
+
))
|
|
74
|
+
tx.executions.save(current.execution_id, expected_revision: current.execution_revision, execution: waiting)
|
|
75
|
+
end
|
|
76
|
+
return unless waiting
|
|
77
|
+
coordination_wait_outcome(operation, waiting, error)
|
|
78
|
+
rescue => failure
|
|
79
|
+
confirmed = @persistence.executions.load(current.execution_id)
|
|
80
|
+
raise failure unless waiting && confirmed.to_h == waiting.to_h
|
|
81
|
+
coordination_wait_outcome(operation, confirmed, error)
|
|
82
|
+
end
|
|
83
|
+
|
|
84
|
+
def coordination_wait_outcome(operation, execution, error)
|
|
85
|
+
Outcome.new(type: :coordination_wait, execution: execution, root: operation.root,
|
|
86
|
+
appended_records: [].freeze, result: nil,
|
|
87
|
+
error: error.is_a?(Phronomy::ExecutionRehydrationRequiredError) ? error :
|
|
88
|
+
Phronomy::ExecutionRehydrationRequiredError.new("Execution #{execution.execution_id} retains unfinished children for cancellation/recovery"),
|
|
89
|
+
approval_request: nil)
|
|
90
|
+
end
|
|
91
|
+
|
|
92
|
+
# F1: terminal atomicity alone does not establish commit outcome certainty.
|
|
93
|
+
# Reuse an exact committed outcome; an absent/active/read-failed result is
|
|
94
|
+
# never permission to write a second terminal transition.
|
|
95
|
+
def reconcile_terminal_error(operation, error)
|
|
96
|
+
confirmed = @persistence.executions.load(operation.execution_id)
|
|
97
|
+
raise error unless confirmed.terminal? &&
|
|
98
|
+
confirmed.agent_id == @agent.agent_id &&
|
|
99
|
+
confirmed.execution_revision == operation.expected_execution_revision + 1
|
|
100
|
+
root = @persistence.agents.load(@agent.agent_id)
|
|
101
|
+
records = @persistence.journals.read(@agent.agent_id,
|
|
102
|
+
after: operation.root.journal_position, limit: root.journal_position - operation.root.journal_position)
|
|
103
|
+
result = @persistence.execution_result(confirmed.execution_id)
|
|
104
|
+
failure = result[:error] && RecoverySupport.error_from_failure(result[:error])
|
|
105
|
+
type = if failure
|
|
106
|
+
:failed
|
|
107
|
+
else
|
|
108
|
+
((confirmed.status == :handed_off) ? :handed_off : :completed)
|
|
109
|
+
end
|
|
110
|
+
Outcome.new(type: type, execution: confirmed, root: root,
|
|
111
|
+
appended_records: records.freeze,
|
|
112
|
+
result: failure ? nil : result_base(confirmed, root).merge(output: result[:result]).freeze,
|
|
113
|
+
error: failure, approval_request: nil)
|
|
114
|
+
end
|
|
115
|
+
|
|
116
|
+
def commit_suspended(operation)
|
|
117
|
+
suspended = next_root = nil
|
|
118
|
+
@persistence.transaction do |tx|
|
|
119
|
+
suspended = encode_suspension(tx, operation)
|
|
120
|
+
save_execution(tx, operation.execution, suspended)
|
|
121
|
+
next_root = save_suspended_root(tx, operation.root)
|
|
122
|
+
end
|
|
123
|
+
request = operation.terminal_view.approval_request
|
|
124
|
+
Outcome.new(type: :suspended, execution: suspended, root: next_root,
|
|
125
|
+
appended_records: [].freeze,
|
|
126
|
+
result: result_base(suspended, next_root).merge(suspended: true, approval_request: request).freeze,
|
|
127
|
+
error: nil, approval_request: request)
|
|
128
|
+
end
|
|
129
|
+
|
|
130
|
+
def commit_completed(operation)
|
|
131
|
+
completed = next_root = appended = messages = nil
|
|
132
|
+
@persistence.transaction do |tx|
|
|
133
|
+
records, completed = encode_completion(tx, operation)
|
|
134
|
+
appended = append_journal(tx, operation.root, records)
|
|
135
|
+
completed = save_coordinated_execution(tx, operation.execution, completed)
|
|
136
|
+
next_root = save_terminal_root(tx, operation.root, appended)
|
|
137
|
+
|
|
138
|
+
# Materialization stays inside the transaction. A failure rolls back
|
|
139
|
+
# the terminal transition instead of writing again from a stale base.
|
|
140
|
+
messages = transcript_messages(next_root,
|
|
141
|
+
operation.journal_records + Array(appended), persistence: tx)
|
|
142
|
+
end
|
|
143
|
+
completed_outcome(operation.terminal_view, completed, next_root, appended, messages)
|
|
144
|
+
end
|
|
145
|
+
|
|
146
|
+
def commit_failed_outcome(operation, error)
|
|
147
|
+
translated_error = @agent.send(:_translated_error, error)
|
|
148
|
+
failed = next_root = appended = nil
|
|
149
|
+
@persistence.transaction do |tx|
|
|
150
|
+
records, failed = encode_failure(tx, operation, translated_error)
|
|
151
|
+
appended = append_journal(tx, operation.root, records)
|
|
152
|
+
failed = save_coordinated_execution(tx, operation.execution, failed)
|
|
153
|
+
next_root = save_terminal_root(tx, operation.root, appended)
|
|
154
|
+
end
|
|
155
|
+
Outcome.new(type: :failed, execution: failed, root: next_root,
|
|
156
|
+
appended_records: Array(appended).freeze,
|
|
157
|
+
result: nil, error: translated_error, approval_request: nil)
|
|
158
|
+
end
|
|
159
|
+
|
|
160
|
+
def encode_suspension(tx, operation)
|
|
161
|
+
current = operation.execution
|
|
162
|
+
request = operation.terminal_view.approval_request
|
|
163
|
+
encoded_records, call_records = encode_runtime_records(tx, operation, context_candidate: true)
|
|
164
|
+
request_ref = tx.contents.put_json(RuntimeRecordEncoder.json_value(request.to_h))
|
|
165
|
+
approval_record = JournalRecord.new(
|
|
166
|
+
agent_id: @agent.agent_id,
|
|
167
|
+
execution_id: current.execution_id,
|
|
168
|
+
kind: :approval_required,
|
|
169
|
+
channel: :approval,
|
|
170
|
+
content_ref: request_ref,
|
|
171
|
+
context_generation: operation.root.transcript_generation,
|
|
172
|
+
context_candidate: false
|
|
173
|
+
)
|
|
174
|
+
current.with(
|
|
175
|
+
status: :suspended,
|
|
176
|
+
phase: :approval,
|
|
177
|
+
working_records: current.working_records + encoded_records + [approval_record],
|
|
178
|
+
llm_calls: current.llm_calls + call_records,
|
|
179
|
+
approval_request: RuntimeRecordEncoder.json_value(request.to_h)
|
|
180
|
+
)
|
|
181
|
+
end
|
|
182
|
+
|
|
183
|
+
def encode_completion(tx, operation)
|
|
184
|
+
current = operation.execution
|
|
185
|
+
view = operation.terminal_view
|
|
186
|
+
encoded_records, call_records = encode_runtime_records(tx, operation, context_candidate: true)
|
|
187
|
+
output_ref = tx.contents.put_text(view.output.to_s)
|
|
188
|
+
records = current.working_records + encoded_records + completion_records(operation, output_ref)
|
|
189
|
+
completed = current.with(
|
|
190
|
+
status: view.rejected ? :rejected : :completed,
|
|
191
|
+
phase: :completed,
|
|
192
|
+
working_records: [],
|
|
193
|
+
llm_calls: current.llm_calls + call_records,
|
|
194
|
+
approval_request: nil,
|
|
195
|
+
result_ref: output_ref,
|
|
196
|
+
terminal_reason: view.rejected ? "rejected" : "completed"
|
|
197
|
+
)
|
|
198
|
+
[records, completed]
|
|
199
|
+
end
|
|
200
|
+
|
|
201
|
+
def completion_records(operation, output_ref)
|
|
202
|
+
final_output = JournalRecord.new(
|
|
203
|
+
agent_id: @agent.agent_id,
|
|
204
|
+
execution_id: operation.execution.execution_id,
|
|
205
|
+
kind: :final_output,
|
|
206
|
+
channel: :audit,
|
|
207
|
+
role: :assistant,
|
|
208
|
+
content_ref: output_ref,
|
|
209
|
+
context_generation: operation.root.transcript_generation,
|
|
210
|
+
context_candidate: false
|
|
211
|
+
)
|
|
212
|
+
completed = JournalRecord.new(
|
|
213
|
+
agent_id: @agent.agent_id,
|
|
214
|
+
execution_id: operation.execution.execution_id,
|
|
215
|
+
kind: operation.terminal_view.rejected ? :execution_rejected : :execution_completed,
|
|
216
|
+
channel: :audit,
|
|
217
|
+
content_ref: output_ref,
|
|
218
|
+
context_generation: operation.root.transcript_generation,
|
|
219
|
+
context_candidate: false
|
|
220
|
+
)
|
|
221
|
+
[final_output, completed]
|
|
222
|
+
end
|
|
223
|
+
|
|
224
|
+
def encode_failure(tx, operation, error)
|
|
225
|
+
current = operation.execution
|
|
226
|
+
encoded_records, call_records = encode_runtime_records(tx, operation, context_candidate: false)
|
|
227
|
+
error_ref = tx.contents.put_json("class" => error.class.name, "message" => error.message)
|
|
228
|
+
terminal_status = ExecutionFailure.status_for(error)
|
|
229
|
+
records = failure_records(operation, encoded_records, terminal_status, error_ref)
|
|
230
|
+
failed = current.with(
|
|
231
|
+
status: terminal_status,
|
|
232
|
+
phase: terminal_status,
|
|
233
|
+
working_records: [],
|
|
234
|
+
llm_calls: current.llm_calls + call_records,
|
|
235
|
+
error_ref: error_ref,
|
|
236
|
+
terminal_reason: error.class.name
|
|
237
|
+
)
|
|
238
|
+
[records, failed]
|
|
239
|
+
end
|
|
240
|
+
|
|
241
|
+
def failure_records(operation, encoded_records, status, error_ref)
|
|
242
|
+
audit_records = (operation.execution.working_records + encoded_records).map do |record|
|
|
243
|
+
JournalRecord.from_h(record.to_h.merge("context_candidate" => false))
|
|
244
|
+
end
|
|
245
|
+
audit_records << JournalRecord.new(
|
|
246
|
+
agent_id: @agent.agent_id,
|
|
247
|
+
execution_id: operation.execution.execution_id,
|
|
248
|
+
kind: ExecutionFailure.journal_kind_for(status),
|
|
249
|
+
channel: :audit,
|
|
250
|
+
content_ref: error_ref,
|
|
251
|
+
context_generation: operation.root.transcript_generation,
|
|
252
|
+
context_candidate: false
|
|
253
|
+
)
|
|
254
|
+
end
|
|
255
|
+
|
|
256
|
+
def encode_runtime_records(tx, operation, context_candidate:)
|
|
257
|
+
RuntimeRecordEncoder.encode(operation.execution,
|
|
258
|
+
agent_id: @agent.agent_id, tx: tx, snapshot: operation.runtime_snapshot,
|
|
259
|
+
context_candidate: context_candidate, agent_root: operation.root)
|
|
260
|
+
end
|
|
261
|
+
|
|
262
|
+
def append_journal(tx, root, records)
|
|
263
|
+
tx.journals.append(root.agent_id,
|
|
264
|
+
expected_position: root.journal_position, records: records)
|
|
265
|
+
end
|
|
266
|
+
|
|
267
|
+
def save_coordinated_execution(tx, current, updated)
|
|
268
|
+
coordinated = @agent.__prepare_coordination_record(updated, tx: tx)
|
|
269
|
+
synchronize_handoff_target(tx, coordinated)
|
|
270
|
+
save_execution(tx, current, coordinated)
|
|
271
|
+
coordinated
|
|
272
|
+
end
|
|
273
|
+
|
|
274
|
+
def synchronize_handoff_target(tx, execution)
|
|
275
|
+
coordination = execution.metadata["coordination"]
|
|
276
|
+
return unless coordination && coordination["kind"] == "handoff"
|
|
277
|
+
routing = tx.handoff_states.load(coordination.fetch("main_agent_id"))
|
|
278
|
+
return unless routing && routing.pending_target_execution_id == execution.execution_id && routing.phase != "stable"
|
|
279
|
+
unless routing.active_agent_id == execution.agent_id
|
|
280
|
+
raise Phronomy::Storage::ConflictError, "Handoff Target owner mismatch"
|
|
281
|
+
end
|
|
282
|
+
tx.handoff_states.save(routing.main_agent_id, expected_revision: routing.handoff_revision,
|
|
283
|
+
state: routing.with(phase: "stable"))
|
|
284
|
+
end
|
|
285
|
+
|
|
286
|
+
def save_execution(tx, current, updated)
|
|
287
|
+
tx.executions.save(current.execution_id,
|
|
288
|
+
expected_revision: current.execution_revision, execution: updated)
|
|
289
|
+
end
|
|
290
|
+
|
|
291
|
+
def save_suspended_root(tx, root)
|
|
292
|
+
updated = root.with(agent_revision: root.agent_revision + 1, lifecycle_status: :suspended)
|
|
293
|
+
tx.agents.save(root.agent_id, expected_revision: root.agent_revision, root: updated)
|
|
294
|
+
updated
|
|
295
|
+
end
|
|
296
|
+
|
|
297
|
+
def save_terminal_root(tx, root, appended)
|
|
298
|
+
updated = root.with(
|
|
299
|
+
agent_revision: root.agent_revision + 1,
|
|
300
|
+
context_revision: root.context_revision + (appended.any?(&:context_candidate) ? 1 : 0),
|
|
301
|
+
journal_position: root.journal_position + appended.length,
|
|
302
|
+
lifecycle_status: :idle
|
|
303
|
+
)
|
|
304
|
+
tx.agents.save(root.agent_id, expected_revision: root.agent_revision, root: updated)
|
|
305
|
+
updated
|
|
306
|
+
end
|
|
307
|
+
|
|
308
|
+
def completed_outcome(view, execution, root, appended, messages)
|
|
309
|
+
result = result_base(execution, root).merge(
|
|
310
|
+
output: view.output,
|
|
311
|
+
rejected: view.rejected || nil,
|
|
312
|
+
usage: view.usage,
|
|
313
|
+
messages: messages
|
|
314
|
+
).compact
|
|
315
|
+
Outcome.new(type: :completed, execution: execution, root: root,
|
|
316
|
+
appended_records: Array(appended).freeze,
|
|
317
|
+
result: result.freeze, error: nil, approval_request: nil)
|
|
318
|
+
end
|
|
319
|
+
|
|
320
|
+
def transcript_messages(root, journal_records, persistence: @persistence)
|
|
321
|
+
materializer = RubyLLMMaterializer.new(
|
|
322
|
+
agent: @agent,
|
|
323
|
+
persistence: persistence
|
|
324
|
+
)
|
|
325
|
+
materializer.materialize_journal_records(
|
|
326
|
+
JournalProjection.new(
|
|
327
|
+
agent_root: root,
|
|
328
|
+
records: journal_records
|
|
329
|
+
).transcript_records
|
|
330
|
+
)
|
|
331
|
+
end
|
|
332
|
+
|
|
333
|
+
def result_base(execution, root)
|
|
334
|
+
{
|
|
335
|
+
agent_id: root.agent_id,
|
|
336
|
+
execution_id: execution.execution_id,
|
|
337
|
+
agent_revision: root.agent_revision,
|
|
338
|
+
context_revision: root.context_revision,
|
|
339
|
+
journal_position: root.journal_position
|
|
340
|
+
}
|
|
341
|
+
end
|
|
342
|
+
end
|
|
343
|
+
end
|
|
344
|
+
end
|